fix: address PR 609 review feedback

Author: skevetter

cmd/agent/container/setup.go

@@ -349,7 +349,8 @@ func (cmd *SetupContainerCmd) startContainerDaemon(
 
 	return command.StartBackgroundOnce(config2.BinaryName+".daemon", func() (*exec.Cmd, error) {
 		logger.Debugf(
-			"start devpod container daemon with inactivity timeout %s",
+			"start %s container daemon with inactivity timeout %s",
+			config2.BinaryName,
 			workspaceInfo.ContainerTimeout,
 		)
 		binaryPath, err := os.Executable()

cmd/pro/provider/get/version.go

@@ -69,7 +69,7 @@ func (cmd *VersionCmd) Run(
 	}
 	providerID := os.Getenv(config.EnvProviderID)
 	if providerID == "" {
-		return fmt.Errorf("provider ID %s not defined", providerID)
+		return fmt.Errorf("provider ID env var %s not defined", config.EnvProviderID)
 	}
 
 	// get our own version

cmd/pro/provider/up.go

@@ -112,7 +112,7 @@ func (cmd *UpCmd) up(
 	client client.Client,
 ) error {
 	options := platform.OptionsFromEnv(storagev1.DevPodFlagsUp)
-	if options != nil && os.Getenv("DEBUG") == config.BoolTrue {
+	if options != nil && os.Getenv(config.EnvDebug) == config.BoolTrue {
 		options.Add("debug", config.BoolTrue)
 	}
 

desktop/src/components/useInstallCLI.tsx

@@ -116,7 +116,7 @@ export function useInstallCLI() {
         Adds the DevPod CLI to your <Code>$PATH</Code>.{" "}
         {isWindows ? (
           <>
-            It will be placed in <Code>{`%APP_DATA%\\${FLATPAK_ID}\\bin`}</Code>
+            It will be placed in <Code>{`%APPDATA%\\${FLATPAK_ID}\\bin`}</Code>
           </>
         ) : (
           <>

desktop/src/views/Pro/Workspace/WorkspaceDetails.tsx

@@ -439,7 +439,7 @@ function PodStatus({ podStatus }: { podStatus: StorageV1DevPodWorkspaceInstanceP
     // check container status first
     const containerStatus = podStatus.containerStatuses?.find(
       (container) =>
-        container.name === "devpod" &&
+        container.name === CONTAINER_NAME &&
         (container.state?.waiting?.reason || container.state?.terminated?.reason)
     )
     if (containerStatus) {

desktop/src/views/Providers/AddProvider/SetupProviderSourceForm.tsx

@@ -559,7 +559,9 @@ function mapCommunityProviderInfo(
 }
 
 function stripDevpodPrefix(rawCommunityProvider: string): string {
-  return rawCommunityProvider.replace(PROVIDER_PREFIX, "")
+  return rawCommunityProvider.startsWith(PROVIDER_PREFIX)
+    ? rawCommunityProvider.slice(PROVIDER_PREFIX.length)
+    : rawCommunityProvider
 }
 
 function sortCommunityProviderInfo(a: TCommunityProviderInfo, b: TCommunityProviderInfo): number {

pkg/client/clientimplementation/workspace_client.go

@@ -794,7 +794,7 @@ func RunCommand(opts RunCommandOptions) error {
 
 	// Add debug env var if logger provided and in debug mode
 	if opts.Log != nil && opts.Log.GetLevel() == logrus.DebugLevel {
-		opts.Environ = append(opts.Environ, config.EnvDebug+"=true")
+		opts.Environ = append(opts.Environ, config.EnvDebug+"="+config.BoolTrue)
 	}
 
 	// use shell if command length is equal 1

pkg/driver/custom/custom.go

@@ -318,7 +318,7 @@ func (c *customDriver) runCommand(
 
 	// set debug level
 	if log.GetLevel() == logrus.DebugLevel {
-		environ = append(environ, pkgconfig.EnvDebug+"=true")
+		environ = append(environ, pkgconfig.EnvDebug+"="+pkgconfig.BoolTrue)
 	}
 
 	// run the command

pkg/gitsshsigning/helper.go

@@ -210,7 +210,7 @@ func filterGpgSSHSection(lines []string) []string {
 	var kept []string
 	for _, line := range lines[1:] {
 		trimmed := strings.TrimSpace(line)
-		if !strings.HasPrefix(trimmed, "program = devpod-ssh-signature") {
+		if !strings.HasPrefix(trimmed, "program = "+pkgconfig.SSHSignatureHelperName) {
 			kept = append(kept, line)
 		}
 	}

pkg/loftconfig/config.go

@@ -20,11 +20,16 @@ func AuthDevpodCliToPlatform(config *client.Config, logger log.Logger) error {
 	)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		logger.Debugf("Failed executing `devpod pro login`: %w, output: %s", err, out)
+		logger.Debugf(
+			"Failed executing `%s pro login`: %w, output: %s",
+			pkgconfig.BinaryName,
+			err,
+			out,
+		)
 		return fmt.Errorf(
-			"error executing 'devpod pro login' command: %w, access key: %v, host: %v",
+			"error executing '%s pro login' command: %w, host: %v",
+			pkgconfig.BinaryName,
 			err,
-			config.AccessKey,
 			config.Host,
 		)
 	}