From 5459bb241e03f5d20f1a0f3d8d4a2d2980f2d83e Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Thu, 23 Mar 2023 10:47:55 +0100
Subject: Create dir to persist vespa-deploy data in temp dir

Create dir in os temp dir, per user and use another name for
dir, as this dir is only used by vespa-deploy
---
 client/go/internal/admin/deploy/persist.go | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'client/go/internal/admin')

diff --git a/client/go/internal/admin/deploy/persist.go b/client/go/internal/admin/deploy/persist.go
index e52642693fb..6c038d6b1f7 100644
--- a/client/go/internal/admin/deploy/persist.go
+++ b/client/go/internal/admin/deploy/persist.go
@@ -6,6 +6,7 @@ package deploy
 
 import (
 	"os"
+	"os/user"
 	"path/filepath"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
@@ -13,37 +14,38 @@ import (
 )
 
 const (
-	cloudconfigDir              = ".cloudconfig"
+	vespaDeployDir              = "vespa-deploy"
 	configsourceUrlUsedFileName = "deploy-configsource-url-used"
 	sessionIdFileName           = "deploy-session-id"
 )
 
-func createCloudconfigDir() (string, error) {
-	userHome, err := os.UserHomeDir()
+func createVespaDeployDir() (string, error) {
+	tempDir := os.TempDir()
+	currentUser, err := user.Current()
 	if err != nil {
 		return "", err
 	}
-	home := filepath.Join(userHome, cloudconfigDir)
-	if err := os.MkdirAll(home, 0700); err != nil {
+	vespaDeployTempDir := filepath.Join(tempDir, vespaDeployDir, currentUser.Username)
+	if err := os.MkdirAll(vespaDeployTempDir, 0700); err != nil {
 		return "", err
 	}
-	return home, nil
+	return vespaDeployTempDir, nil
 }
 
 func configsourceUrlUsedFile() string {
-	home, err := createCloudconfigDir()
+	vespaDeployTempDir, err := createVespaDeployDir()
 	if err != nil {
-		home = "/tmp"
+		vespaDeployTempDir = "/tmp"
 	}
-	return filepath.Join(home, configsourceUrlUsedFileName)
+	return filepath.Join(vespaDeployTempDir, configsourceUrlUsedFileName)
 }
 
 func createTenantDir(tenant string) string {
-	home, err := createCloudconfigDir()
+	vespaDeployTempDir, err := createVespaDeployDir()
 	if err != nil {
 		util.JustExitWith(err)
 	}
-	tdir := filepath.Join(home, tenant)
+	tdir := filepath.Join(vespaDeployTempDir, tenant)
 	if err := os.MkdirAll(tdir, 0700); err != nil {
 		util.JustExitWith(err)
 	}
-- 
cgit v1.2.3