From 57376e3d3492f0b06e56c5f91dab80cfe8091470 Mon Sep 17 00:00:00 2001 From: Gaurav Mehta Date: Wed, 14 Sep 2022 17:12:03 +1000 Subject: [PATCH] changes to server to use a predefined persistent path --- pkg/server/server.go | 14 +++++++++----- pkg/server/server_test.go | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkg/server/server.go b/pkg/server/server.go index a81ab5e..b1825f5 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -3,7 +3,6 @@ package server import ( "context" "fmt" - "io/ioutil" "net/http" "os" @@ -12,11 +11,11 @@ import ( const defaultPort = 8080 -var tmpDir string +const tmpDir = "/tmp/vm-import-controller" func NewServer(ctx context.Context) error { var err error - tmpDir, err = createTmpDir() + err = createTmpDir() if err != nil { return err } @@ -43,8 +42,13 @@ func newServer(ctx context.Context, path string) error { return eg.Wait() } -func createTmpDir() (string, error) { - return ioutil.TempDir("/tmp", "vm-import-controller-") +func createTmpDir() error { + if _, err := os.Stat(tmpDir); os.IsNotExist(err) { + return os.Mkdir("/tmp/vm-import-controller", 0755) + } else { + return err + } + return nil } func DefaultPort() int { diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go index f7dce34..7c97f9a 100644 --- a/pkg/server/server_test.go +++ b/pkg/server/server_test.go @@ -17,7 +17,7 @@ func Test_NewServer(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) assert := require.New(t) var err error - tmpDir, err = createTmpDir() + err = createTmpDir() assert.NoError(err, "expected no error during creation of tmp dir") go func() { err = newServer(ctx, tmpDir)