utils -> util

14 files changed, 73 insertions, 73 deletions

diff --git a/client/go/src/cmd/command_tester.go b/client/go/src/cmd/command_tester.go
index bd77e7cdcaa..f1d4b52d0bb 100644
--- a/client/go/src/cmd/command_tester.go
+++ b/client/go/src/cmd/command_tester.go
@@ -6,7 +6,7 @@ package cmd
 
 import (
     "bytes"
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "github.com/stretchr/testify/assert"
 	"io/ioutil"
     "net/http"
@@ -16,14 +16,14 @@ import (
 )
 
 func executeCommand(t *testing.T, client *mockHttpClient, args []string, moreArgs []string) (standardout string) {
-    utils.ActiveHttpClient = client
+    util.ActiveHttpClient = client
 
     // Reset - persistent flags in Cobra persists over tests
 	rootCmd.SetArgs([]string{"status", "-t", ""})
 	rootCmd.Execute()
 
 	b := bytes.NewBufferString("")
-    utils.Out = b
+    util.Out = b
 	rootCmd.SetArgs(append(args, moreArgs...))
 	rootCmd.Execute()
 	out, err := ioutil.ReadAll(b)
diff --git a/client/go/src/cmd/config.go b/client/go/src/cmd/config.go
index 647d13939b1..2c10eaf8f02 100644
--- a/client/go/src/cmd/config.go
+++ b/client/go/src/cmd/config.go
@@ -7,7 +7,7 @@ package cmd
 import (
     "github.com/spf13/cobra"
 	"github.com/spf13/viper"
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "os"
     "path/filepath"
 )
@@ -52,12 +52,12 @@ func writeConfig() {
     _, statErr := os.Stat(configPath)
     if !os.IsExist(statErr) {
         if _, createErr := os.Create(configPath); createErr != nil {
-            utils.Error("Warning: Can not remember flag parameters: " + createErr.Error())
+            util.Error("Warning: Can not remember flag parameters: " + createErr.Error())
         }
     }
 
 	writeErr := viper.WriteConfig()
 	if writeErr != nil {
-	    utils.Error("Could not write config:", writeErr.Error())
+	    util.Error("Could not write config:", writeErr.Error())
 	}
 }
\ No newline at end of file
diff --git a/client/go/src/cmd/deploy.go b/client/go/src/cmd/deploy.go
index 7d3475cd178..bfd3837cd5a 100644
--- a/client/go/src/cmd/deploy.go
+++ b/client/go/src/cmd/deploy.go
@@ -8,7 +8,7 @@ import (
     "archive/zip"
     "errors"
     "github.com/spf13/cobra"
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "io"
     "io/ioutil"
     "net/http"
@@ -30,7 +30,7 @@ var deployCmd = &cobra.Command{
     Short: "Deploys an application package",
     Long:  `TODO: Use prepare or deploy activate`,
     Run: func(cmd *cobra.Command, args []string) {
-        utils.Error("Use either deploy prepare or deploy activate")
+        util.Error("Use either deploy prepare or deploy activate")
     },
 }
 
@@ -81,14 +81,14 @@ func deploy(prepare bool, application string) {
     if filepath.Ext(application) != ".zip" {
         tempZip, error := ioutil.TempFile("", "application.zip")
         if error != nil {
-            utils.Error("Could not create a temporary zip file for the application package")
-            utils.Detail(error.Error())
+            util.Error("Could not create a temporary zip file for the application package")
+            util.Detail(error.Error())
             return
         }
 
         error = zipDir(application, tempZip.Name())
         if (error != nil) {
-            utils.Error(error.Error())
+            util.Error(error.Error())
             return
         }
         defer os.Remove(tempZip.Name())
@@ -97,8 +97,8 @@ func deploy(prepare bool, application string) {
 
     zipFileReader, zipFileError := os.Open(application)
     if zipFileError != nil {
-        utils.Error("Could not open application package at " + application)
-        utils.Detail(zipFileError.Error())
+        util.Error("Could not open application package at " + application)
+        util.Detail(zipFileError.Error())
         return
     }
 
@@ -120,20 +120,20 @@ func deploy(prepare bool, application string) {
         Body: ioutil.NopCloser(zipFileReader),
     }
     serviceDescription := "Deploy service"
-    response := utils.HttpDo(request, time.Minute * 10, serviceDescription)
+    response := util.HttpDo(request, time.Minute * 10, serviceDescription)
     if (response == nil) {
         return
     }
 
     defer response.Body.Close()
     if response.StatusCode == 200 {
-        utils.Success("Success")
+        util.Success("Success")
     } else if response.StatusCode / 100 == 4 {
-        utils.Error("Invalid application package", "(" + response.Status + "):")
-        utils.PrintReader(response.Body)
+        util.Error("Invalid application package", "(" + response.Status + "):")
+        util.PrintReader(response.Body)
     } else {
-        utils.Error("Error from", strings.ToLower(serviceDescription), "at", request.URL.Host, "(" + response.Status + "):")
-        utils.PrintReader(response.Body)
+        util.Error("Error from", strings.ToLower(serviceDescription), "at", request.URL.Host, "(" + response.Status + "):")
+        util.PrintReader(response.Body)
     }
 }
 
@@ -142,11 +142,11 @@ func zipDir(dir string, destination string) error {
         message := "Path must be relative, but '" + dir + "'"
         return errors.New(message)
     }
-    if ! utils.PathExists(dir) {
+    if ! util.PathExists(dir) {
         message := "'" + dir + "' should be an application package zip or dir, but does not exist"
         return errors.New(message)
     }
-    if ! utils.IsDirectory(dir) {
+    if ! util.IsDirectory(dir) {
         message := "'" + dir + "' should be an application package dir, but is a (non-zip) file"
         return errors.New(message)
     }
diff --git a/client/go/src/cmd/document.go b/client/go/src/cmd/document.go
index 62ff1e0c06c..f48a3965d01 100644
--- a/client/go/src/cmd/document.go
+++ b/client/go/src/cmd/document.go
@@ -6,7 +6,7 @@ package cmd
 
 import (
     "github.com/spf13/cobra"
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "io/ioutil"
     "net/http"
     "net/url"
@@ -66,8 +66,8 @@ func put(documentId string, jsonFile string) {
 
     fileReader, fileError := os.Open(jsonFile)
     if fileError != nil {
-        utils.Error("Could not open file at " + jsonFile)
-        utils.Detail(fileError.Error())
+        util.Error("Could not open file at " + jsonFile)
+        util.Detail(fileError.Error())
         return
     }
 
@@ -78,19 +78,19 @@ func put(documentId string, jsonFile string) {
         Body: ioutil.NopCloser(fileReader),
     }
     serviceDescription := "Container (document API)"
-    response := utils.HttpDo(request, time.Second * 60, serviceDescription)
+    response := util.HttpDo(request, time.Second * 60, serviceDescription)
     if (response == nil) {
         return
     }
 
     defer response.Body.Close()
     if response.StatusCode == 200 {
-        utils.Success("Success") // TODO: Change to something including document id
+        util.Success("Success") // TODO: Change to something including document id
     } else if response.StatusCode / 100 == 4 {
-        utils.Error("Invalid document (" + response.Status + "):")
-        utils.PrintReader(response.Body)
+        util.Error("Invalid document (" + response.Status + "):")
+        util.PrintReader(response.Body)
     } else {
-        utils.Error("Error from", strings.ToLower(serviceDescription), "at", request.URL.Host, "(" + response.Status + "):")
-        utils.PrintReader(response.Body)
+        util.Error("Error from", strings.ToLower(serviceDescription), "at", request.URL.Host, "(" + response.Status + "):")
+        util.PrintReader(response.Body)
     }
 }
\ No newline at end of file
diff --git a/client/go/src/cmd/document_test.go b/client/go/src/cmd/document_test.go
index a177aa87d82..9d0ae6e505e 100644
--- a/client/go/src/cmd/document_test.go
+++ b/client/go/src/cmd/document_test.go
@@ -6,7 +6,7 @@ package cmd
 
 import (
     "github.com/stretchr/testify/assert"
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "io/ioutil"
     "strconv"
     "testing"
@@ -35,7 +35,7 @@ func assertDocumentPut(documentId string, jsonFile string, t *testing.T) {
     assert.Equal(t, "POST", client.lastRequest.Method)
 
     fileContent, _ := ioutil.ReadFile(jsonFile)
-    assert.Equal(t, string(fileContent), utils.ReaderToString(client.lastRequest.Body))
+    assert.Equal(t, string(fileContent), util.ReaderToString(client.lastRequest.Body))
 }
 
 func assertDocumentError(t *testing.T, status int, errorMessage string) {
diff --git a/client/go/src/cmd/init.go b/client/go/src/cmd/init.go
index 7a5a7729246..64e8b342309 100644
--- a/client/go/src/cmd/init.go
+++ b/client/go/src/cmd/init.go
@@ -9,7 +9,7 @@ import (
     "errors"
     "path/filepath"
     "github.com/spf13/cobra"
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "io"
     "io/ioutil"
     "net/http"
@@ -54,15 +54,15 @@ func initApplication(name string, source string) {
 
     createErr := os.Mkdir(name, 0755)
     if createErr != nil {
-        utils.Error("Could not create directory '" + name + "'")
-        utils.Detail(createErr.Error())
+        util.Error("Could not create directory '" + name + "'")
+        util.Detail(createErr.Error())
         return
     }
 
 	zipReader, zipOpenError := zip.OpenReader(zipFile.Name())
 	if zipOpenError != nil {
-        utils.Error("Could not open sample apps zip '" + zipFile.Name() + "'")
-        utils.Detail(zipOpenError.Error())
+        util.Error("Could not open sample apps zip '" + zipFile.Name() + "'")
+        util.Detail(zipOpenError.Error())
 	}
 	defer zipReader.Close()
 
@@ -73,16 +73,16 @@ func initApplication(name string, source string) {
  	        found = true
 	        copyError := copy(f, name, zipEntryPrefix)
 	        if copyError != nil {
-                utils.Error("Could not copy zip entry '" + f.Name + "' to " + name)
-                utils.Detail(copyError.Error())
+                util.Error("Could not copy zip entry '" + f.Name + "' to " + name)
+                util.Detail(copyError.Error())
                 return
 	        }
         }
 	}
 	if !found {
-	    utils.Error("Could not find source application '" + source + "'")
+	    util.Error("Could not find source application '" + source + "'")
 	} else {
-        utils.Success("Created " + name)
+        util.Success("Created " + name)
     }
 }
 
@@ -90,38 +90,38 @@ func getSampleAppsZip() *os.File {
     if existingSampleAppsZip != "" {
         existing, openExistingError := os.Open(existingSampleAppsZip)
         if openExistingError != nil {
-            utils.Error("Could not open existing sample apps zip file '" + existingSampleAppsZip + "'")
-            utils.Detail(openExistingError.Error())
+            util.Error("Could not open existing sample apps zip file '" + existingSampleAppsZip + "'")
+            util.Detail(openExistingError.Error())
         }
         return existing
     }
 
     // TODO: Cache it?
-    utils.Detail("Downloading sample apps ...") // TODO: Spawn thread to indicate progress
+    util.Detail("Downloading sample apps ...") // TODO: Spawn thread to indicate progress
     zipUrl, _ := url.Parse("https://github.com/vespa-engine/sample-apps/archive/refs/heads/master.zip")
     request := &http.Request{
         URL: zipUrl,
         Method: "GET",
     }
-    response := utils.HttpDo(request, time.Minute * 60, "GitHub")
+    response := util.HttpDo(request, time.Minute * 60, "GitHub")
     defer response.Body.Close()
     if response.StatusCode != 200 {
-        utils.Error("Could not download sample apps from github")
-        utils.Detail(response.Status)
+        util.Error("Could not download sample apps from github")
+        util.Detail(response.Status)
         return nil
     }
 
     destination, tempFileError := ioutil.TempFile("", "prefix")
     if tempFileError != nil {
-        utils.Error("Could not create a temp file to hold sample apps")
-        utils.Detail(tempFileError.Error())
+        util.Error("Could not create a temp file to hold sample apps")
+        util.Detail(tempFileError.Error())
     }
     // destination, _ := os.Create("./" + name + "/sample-apps.zip")
     // defer destination.Close()
     _, err := io.Copy(destination, response.Body)
     if err != nil {
-        utils.Error("Could not download sample apps from GitHub")
-        utils.Detail(err.Error())
+        util.Error("Could not download sample apps from GitHub")
+        util.Detail(err.Error())
         return nil
     }
     return destination
diff --git a/client/go/src/cmd/init_test.go b/client/go/src/cmd/init_test.go
index f0f832293a7..3cb526ad0f1 100644
--- a/client/go/src/cmd/init_test.go
+++ b/client/go/src/cmd/init_test.go
@@ -5,7 +5,7 @@
 package cmd
 
 import (
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "github.com/stretchr/testify/assert"
     "os"
     "testing"
@@ -21,9 +21,9 @@ func assertCreated(app string, sampleAppName string, t *testing.T) {
     standardOut := executeCommand(t, &mockHttpClient{}, []string{"init", app, sampleAppName}, []string{})
 	defer os.RemoveAll(app)
 	assert.Equal(t, "\x1b[32mCreated " + app + "\n", standardOut)
-	assert.True(t, utils.PathExists(filepath.Join(app, "README.md")))
-	assert.True(t, utils.PathExists(filepath.Join(app, "src", "main", "application")))
-	assert.True(t, utils.IsDirectory(filepath.Join(app, "src", "main", "application")))
+	assert.True(t, util.PathExists(filepath.Join(app, "README.md")))
+	assert.True(t, util.PathExists(filepath.Join(app, "src", "main", "application")))
+	assert.True(t, util.IsDirectory(filepath.Join(app, "src", "main", "application")))
 
     servicesStat, _ := os.Stat(filepath.Join(app, "src", "main", "application", "services.xml"))
     var servicesSize int64
diff --git a/client/go/src/cmd/query.go b/client/go/src/cmd/query.go
index b4380cc81b9..58828dbb7cf 100644
--- a/client/go/src/cmd/query.go
+++ b/client/go/src/cmd/query.go
@@ -7,7 +7,7 @@ package cmd
 import (
     "errors"
     "github.com/spf13/cobra"
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "strings"
     "net/http"
     "net/url"
@@ -43,20 +43,20 @@ func query(arguments []string) {
     }
     url.RawQuery = urlQuery.Encode()
 
-    response := utils.HttpDo(&http.Request{URL: url,}, time.Second * 10, "Container")
+    response := util.HttpDo(&http.Request{URL: url,}, time.Second * 10, "Container")
     if (response == nil) {
         return
     }
     defer response.Body.Close()
 
     if (response.StatusCode == 200) {
-        utils.PrintReader(response.Body)
+        util.PrintReader(response.Body)
     } else if response.StatusCode / 100 == 4 {
-        utils.Error("Invalid query (" + response.Status + "):")
-        utils.PrintReader(response.Body)
+        util.Error("Invalid query (" + response.Status + "):")
+        util.PrintReader(response.Body)
     } else {
-        utils.Error("Error from container at", url.Host, "(" + response.Status + "):")
-        utils.PrintReader(response.Body)
+        util.Error("Error from container at", url.Host, "(" + response.Status + "):")
+        util.PrintReader(response.Body)
     }
 }
 
diff --git a/client/go/src/cmd/status.go b/client/go/src/cmd/status.go
index cb4df072c8d..a011678be09 100644
--- a/client/go/src/cmd/status.go
+++ b/client/go/src/cmd/status.go
@@ -6,7 +6,7 @@ package cmd
 
 import (
     "github.com/spf13/cobra"
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
 )
 
 func init() {
@@ -44,16 +44,16 @@ var statusConfigServerCmd = &cobra.Command{
 
 func status(target string, description string) {
     path := "/ApplicationStatus"
-    response := utils.HttpGet(target, path, description)
+    response := util.HttpGet(target, path, description)
     if (response == nil) {
         return
     }
     defer response.Body.Close()
 
     if response.StatusCode != 200 {
-        utils.Error(description, "at", target, "is not ready")
-        utils.Detail(response.Status)
+        util.Error(description, "at", target, "is not ready")
+        util.Detail(response.Status)
     } else {
-        utils.Success(description, "at", target, "is ready")
+        util.Success(description, "at", target, "is ready")
     }
 }
diff --git a/client/go/src/cmd/target.go b/client/go/src/cmd/target.go
index 1d56c39540a..4c1ead7f74e 100644
--- a/client/go/src/cmd/target.go
+++ b/client/go/src/cmd/target.go
@@ -5,7 +5,7 @@
 package cmd
 
 import (
-    "github.com/vespa-engine/vespa/utils"
+    "github.com/vespa-engine/vespa/util"
     "strings"
 )
 
@@ -55,6 +55,6 @@ func getTarget(targetContext context) *target {
         return nil // TODO
     }
 
-    utils.Error("Unknown target argument '" + targetArgument + ": Use 'local', 'cloud' or an URL")
+    util.Error("Unknown target argument '" + targetArgument + ": Use 'local', 'cloud' or an URL")
     return nil
 }
\ No newline at end of file
diff --git a/client/go/src/utils/http.go b/client/go/src/util/http.go
index 159ffb8d11a..24e2416117c 100644
--- a/client/go/src/utils/http.go
+++ b/client/go/src/util/http.go
@@ -2,7 +2,7 @@
 // A HTTP wrapper which handles some errors and provides a way to replace the HTTP client by a mock.
 // Author: bratseth
 
-package utils
+package util
 
 import (
     "net/http"
diff --git a/client/go/src/utils/http_test.go b/client/go/src/util/http_test.go
index 0383f5c9257..03b155488d9 100644
--- a/client/go/src/utils/http_test.go
+++ b/client/go/src/util/http_test.go
@@ -2,7 +2,7 @@
 // Basic testing of our HTTP client wrapper
 // Author: bratseth
 
-package utils
+package util
 
 import (
     "bytes"
diff --git a/client/go/src/utils/io.go b/client/go/src/util/io.go
index 5ea4fbf7fa6..217beb085d1 100644
--- a/client/go/src/utils/io.go
+++ b/client/go/src/util/io.go
@@ -2,7 +2,7 @@
 // File utilities.
 // Author: bratseth
 
-package utils
+package util
 
 import (
     "errors"
diff --git a/client/go/src/utils/print.go b/client/go/src/util/print.go
index f3a57c4ba2f..76912094f6e 100644
--- a/client/go/src/utils/print.go
+++ b/client/go/src/util/print.go
@@ -2,7 +2,7 @@
 // Print functions for color-coded text.
 // Author: bratseth
 
-package utils
+package util
 
 import (
     "bufio"