feat: [CDE-573]: refactor to reduce number of utils. (#3208)

* feat: [CDE-573]: refactor to reduce number of utils.
* feat: [CDE-573]: refactor to reduce number of utils.

app/gitspace/orchestrator/container/embedded_docker_container_orchestrator.go

@@ -419,8 +419,8 @@ func (e *EmbeddedDockerOrchestrator) runGitspaceSetupSteps(
 		gitspaceLogger.Info(fmt.Sprintf("Setting Environment : %v", environment))
 	}
 
-	containerUser := getContainerUser(runArgsMap, devcontainerConfig, metadataFromImage, imageUser)
+	containerUser := GetContainerUser(runArgsMap, devcontainerConfig, metadataFromImage, imageUser)
-	remoteUser := getRemoteUser(devcontainerConfig, metadataFromImage, containerUser)
+	remoteUser := GetRemoteUser(devcontainerConfig, metadataFromImage, containerUser)
 
 	homeDir := GetUserHomeDir(remoteUser)
 
@@ -722,38 +722,6 @@ func (e *EmbeddedDockerOrchestrator) flushLogStream(logStreamInstance *logutil.L
 	}
 }
 
-func getRemoteUser(
-	devcontainerConfig types.DevcontainerConfig,
-	metadataFromImage map[string]any,
-	containerUser string,
-) string {
-	if devcontainerConfig.RemoteUser != "" {
-		return devcontainerConfig.RemoteUser
-	}
-	if remoteUser, ok := metadataFromImage["remoteUser"].(string); ok {
-		return remoteUser
-	}
-	return containerUser
-}
-
-func getContainerUser(
-	runArgsMap map[types.RunArg]*types.RunArgValue,
-	devcontainerConfig types.DevcontainerConfig,
-	metadataFromImage map[string]any,
-	imageUser string,
-) string {
-	if containerUser := getUser(runArgsMap); containerUser != "" {
-		return containerUser
-	}
-	if devcontainerConfig.ContainerUser != "" {
-		return devcontainerConfig.ContainerUser
-	}
-	if containerUser, ok := metadataFromImage["containerUser"].(string); ok {
-		return containerUser
-	}
-	return imageUser
-}
-
 func getImage(devcontainerConfig types.DevcontainerConfig, defaultBaseImage string) string {
 	imageName := devcontainerConfig.Image
 	if imageName == "" {

app/gitspace/orchestrator/container/util.go

@@ -44,6 +44,38 @@ func GetUserHomeDir(userIdentifier string) string {
 	return filepath.Join(linuxHome, userIdentifier)
 }
 
+func GetContainerUser(
+	runArgsMap map[types.RunArg]*types.RunArgValue,
+	devcontainerConfig types.DevcontainerConfig,
+	metadataFromImage map[string]any,
+	imageUser string,
+) string {
+	if containerUser := getUser(runArgsMap); containerUser != "" {
+		return containerUser
+	}
+	if devcontainerConfig.ContainerUser != "" {
+		return devcontainerConfig.ContainerUser
+	}
+	if containerUser, ok := metadataFromImage["containerUser"].(string); ok {
+		return containerUser
+	}
+	return imageUser
+}
+
+func GetRemoteUser(
+	devcontainerConfig types.DevcontainerConfig,
+	metadataFromImage map[string]any,
+	containerUser string,
+) string {
+	if devcontainerConfig.RemoteUser != "" {
+		return devcontainerConfig.RemoteUser
+	}
+	if remoteUser, ok := metadataFromImage["remoteUser"].(string); ok {
+		return remoteUser
+	}
+	return containerUser
+}
+
 func ExtractRemoteUserFromLabels(inspectResp dockerTypes.ContainerJSON) string {
 	remoteUser := deprecatedRemoteUser