Merge pull request #21007 from vespa-engine/mpolden/write-tempfile-to-same-path

Write temporary file to same directory as final file

2 files changed, 6 insertions, 5 deletions

diff --git a/client/go/cmd/test_test.go b/client/go/cmd/test_test.go
index 6649353df77..490527df224 100644
--- a/client/go/cmd/test_test.go
+++ b/client/go/cmd/test_test.go
@@ -5,9 +5,6 @@
 package cmd
 
 import (
-	"fmt"
-	"github.com/vespa-engine/vespa/client/go/util"
-	"github.com/vespa-engine/vespa/client/go/vespa"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -16,6 +13,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/vespa-engine/vespa/client/go/util"
+	"github.com/vespa-engine/vespa/client/go/vespa"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,7 +40,6 @@ func TestSuite(t *testing.T) {
 		requests = append(requests, createSearchRequest(baseUrl+"/search/"))
 	}
 	assertRequests(requests, client, t)
-	fmt.Println(outBytes)
 	assert.Equal(t, string(expectedBytes), outBytes)
 	assert.Equal(t, "", errBytes)
 }
diff --git a/client/go/util/io.go b/client/go/util/io.go
index 23bfec84879..68b50733006 100644
--- a/client/go/util/io.go
+++ b/client/go/util/io.go
@@ -11,6 +11,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 )
 
@@ -53,7 +54,8 @@ func ReaderToJSON(reader io.Reader) string {
 
 // AtomicWriteFile atomically writes data to filename.
 func AtomicWriteFile(filename string, data []byte) error {
-	tmpFile, err := ioutil.TempFile("", "vespa")
+	dir := filepath.Dir(filename)
+	tmpFile, err := ioutil.TempFile(dir, "vespa")
 	if err != nil {
 		return err
 	}