chore(autocomplete): use os.UserHomeDir (#844)

Author: kindermoumoute

internal/core/context.go

@@ -81,5 +81,15 @@ func ExtractEnv(ctx context.Context, envKey string) string {
 	if value, exist := meta.OverrideEnv[envKey]; exist {
 		return value
 	}
+
+	if envKey == "HOME" {
+		homeDir, _ := os.UserHomeDir()
+		return homeDir
+	}
+
 	return os.Getenv(envKey)
 }
+
+func ExtractUserHomeDir(ctx context.Context) string {
+	return ExtractEnv(ctx, "HOME")
+}

internal/namespaces/account/custom.go

@@ -49,7 +49,7 @@ func initCommand() *core.Command {
 func InitRun(ctx context.Context, argsI interface{}) (i interface{}, e error) {
 	// Get default local SSH key
 	relativePath := path.Join(".ssh", "id_rsa.pub")
-	filename := path.Join(core.ExtractEnv(ctx, "HOME"), relativePath)
+	filename := path.Join(core.ExtractUserHomeDir(ctx), relativePath)
 	shortenedFilename := "~/" + relativePath
 	localSSHKeyContent, err := ioutil.ReadFile(filename)
 

internal/namespaces/account/custom_test.go

@@ -10,10 +10,10 @@ import (
 )
 
 func Test_initCommand(t *testing.T) {
+	tmpDir := os.TempDir()
 	t.Run("simple", core.Test(&core.TestConfig{
 		Commands: GetCommands(),
 		BeforeFunc: func(ctx *core.BeforeFuncCtx) error {
-			tmpDir := os.TempDir()
 			pathToPublicKey := path.Join(tmpDir, ".ssh", "id_rsa.pub")
 			_, err := os.Stat(pathToPublicKey)
 			if err != nil {
@@ -33,7 +33,7 @@ func Test_initCommand(t *testing.T) {
 			core.TestCheckExitCode(0),
 		),
 		OverrideEnv: map[string]string{
-			"HOME": os.TempDir(),
+			"HOME": tmpDir,
 		},
 	}))
 }

internal/namespaces/autocomplete/autocomplete.go

@@ -34,6 +34,8 @@ type autocompleteScript struct {
 	ShellConfigurationFile map[string]string
 }
 
+var homePath, _ = os.UserHomeDir()
+
 // autocompleteScripts regroups the autocomplete scripts for the different shells
 // The key is the path of the shell.
 var autocompleteScripts = map[string]autocompleteScript{
@@ -63,8 +65,8 @@ var autocompleteScripts = map[string]autocompleteScript{
 		`,
 		CompleteScript: `eval "$(scw autocomplete script shell=bash)"`,
 		ShellConfigurationFile: map[string]string{
-			"darwin": path.Join(os.Getenv("HOME"), ".bash_profile"),
-			"linux":  path.Join(os.Getenv("HOME"), ".bashrc"),
+			"darwin": path.Join(homePath, ".bash_profile"),
+			"linux":  path.Join(homePath, ".bashrc"),
 		},
 	},
 	"fish": {
@@ -87,8 +89,8 @@ var autocompleteScripts = map[string]autocompleteScript{
 		`,
 		CompleteScript: `eval (scw autocomplete script shell=fish)`,
 		ShellConfigurationFile: map[string]string{
-			"darwin": path.Join(os.Getenv("HOME"), ".config/fish/config.fish"),
-			"linux":  path.Join(os.Getenv("HOME"), ".config/fish/config.fish"),
+			"darwin": path.Join(homePath, ".config/fish/config.fish"),
+			"linux":  path.Join(homePath, ".config/fish/config.fish"),
 		},
 	},
 	"zsh": {
@@ -109,8 +111,8 @@ var autocompleteScripts = map[string]autocompleteScript{
 		`,
 		CompleteScript: `eval "$(scw autocomplete script shell=zsh)"`,
 		ShellConfigurationFile: map[string]string{
-			"darwin": path.Join(os.Getenv("HOME"), ".zshrc"),
-			"linux":  path.Join(os.Getenv("HOME"), ".zshrc"),
+			"darwin": path.Join(homePath, ".zshrc"),
+			"linux":  path.Join(homePath, ".zshrc"),
 		},
 	},
 }