Extract vespaCliHome function

2 files changed, 18 insertions, 10 deletions

diff --git a/client/go/cmd/config.go b/client/go/cmd/config.go
index 3753d9a9390..408007d74e8 100644
--- a/client/go/cmd/config.go
+++ b/client/go/cmd/config.go
@@ -100,16 +100,8 @@ type Config struct {
 }
 
 func LoadConfig() (*Config, error) {
-	home := os.Getenv("VESPA_CLI_HOME")
-	if home == "" {
-		var err error
-		home, err = os.UserHomeDir()
-		if err != nil {
-			return nil, err
-		}
-		home = filepath.Join(home, ".vespa")
-	}
-	if err := os.MkdirAll(home, 0700); err != nil {
+	home, err := vespaCliHome()
+	if err != nil {
 		return nil, err
 	}
 	c := &Config{Home: home, createDirs: true}
diff --git a/client/go/cmd/helpers.go b/client/go/cmd/helpers.go
index f29a842aed2..9c3d9f3c0eb 100644
--- a/client/go/cmd/helpers.go
+++ b/client/go/cmd/helpers.go
@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -50,6 +51,21 @@ func printSuccess(msg ...interface{}) {
 	log.Print(color.Green("Success: "), fmt.Sprint(msg...))
 }
 
+func vespaCliHome() (string, error) {
+	home := os.Getenv("VESPA_CLI_HOME")
+	if home == "" {
+		userHome, err := os.UserHomeDir()
+		if err != nil {
+			return "", err
+		}
+		home = filepath.Join(userHome, ".vespa")
+	}
+	if err := os.MkdirAll(home, 0700); err != nil {
+		return "", err
+	}
+	return home, nil
+}
+
 func deploymentFromArgs() vespa.Deployment {
 	zone, err := vespa.ZoneFromString(zoneArg)
 	if err != nil {