From 2595b5dba5dced8ab0aeb4f31698d059c92d6133 Mon Sep 17 00:00:00 2001
From: Tudor Macari <tudor.macari@harness.io>
Date: Mon, 26 Aug 2024 06:41:28 +0000
Subject: [PATCH] fix: [AH-313]: fix client setup details to contain only root
 space ref (#2583)

* fix: [AH-313]: fix lint
* fix: [AH-313]: fix client setup details to contain only root space ref
---
 .../controller/metadata/get_client_setup_details.go    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/registry/app/api/controller/metadata/get_client_setup_details.go b/registry/app/api/controller/metadata/get_client_setup_details.go
index 63b440326..da160ec4a 100644
--- a/registry/app/api/controller/metadata/get_client_setup_details.go
+++ b/registry/app/api/controller/metadata/get_client_setup_details.go
@@ -21,9 +21,9 @@ import (
 
 	apiauth "github.com/harness/gitness/app/api/auth"
 	"github.com/harness/gitness/app/api/request"
+	"github.com/harness/gitness/app/paths"
 	"github.com/harness/gitness/registry/app/api/openapi/contracts/artifact"
 	"github.com/harness/gitness/registry/app/common"
-	"github.com/harness/gitness/registry/types"
 	"github.com/harness/gitness/types/enum"
 )
 
@@ -95,7 +95,7 @@ func (c *APIController) GetClientSetupDetails(
 
 	return artifact.GetClientSetupDetails200JSONResponse{
 		ClientSetupDetailsResponseJSONResponse: *GetClientSetupDetails(
-			ctx, packageType, regInfo, reg,
+			ctx, packageType, regInfo,
 			string(r.RegistryRef), imageParam, tagParam, c.URLProvider.RegistryURL(),
 		),
 	}, nil
@@ -105,7 +105,6 @@ func GetClientSetupDetails(
 	ctx context.Context,
 	packageType string,
 	_ *RegistryRequestBaseInfo,
-	_ *types.Registry,
 	regRef string,
 	image *artifact.ArtifactParam,
 	tag *artifact.VersionParam,
@@ -292,6 +291,9 @@ func replaceText(
 	image *artifact.ArtifactParam,
 	tag *artifact.VersionParam,
 ) {
+	rootSpace, _, _ := paths.DisectRoot(regRef)
+	_, registryName, _ := paths.DisectLeaf(regRef)
+	repoRef := rootSpace + "/" + registryName
 	if username != "" {
 		(*st.Commands)[i] = strings.ReplaceAll((*st.Commands)[i], "<USERNAME>", username)
 	}
@@ -301,7 +303,7 @@ func replaceText(
 	if regRef != "" {
 		(*st.Commands)[i] = strings.ReplaceAll(
 			(*st.Commands)[i],
-			"<REPOSITORY_REFERENCE>", regRef,
+			"<REPOSITORY_REFERENCE>", repoRef,
 		)
 	}
 	if image != nil {