From 3d3649832ef0956cbbb51d3c88761ab198521b5a Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Thu, 30 Nov 2023 16:22:25 +0100
Subject: Fix some staticcheck complaints

---
 client/go/internal/osutil/fix_fs.go       | 4 ++--
 client/go/internal/osutil/fix_fs_test.go  | 2 ++
 client/go/internal/vespa/load_env.go      | 4 ++--
 client/go/internal/vespa/load_env_test.go | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/go/internal/osutil/fix_fs.go b/client/go/internal/osutil/fix_fs.go
index 837624cc05b..f59ee8bca83 100644
--- a/client/go/internal/osutil/fix_fs.go
+++ b/client/go/internal/osutil/fix_fs.go
@@ -68,7 +68,7 @@ func (spec *FixSpec) FixDir(dirName string) {
 		spec.complainAndExit(err, dirName, spec.DirMode)
 	}
 	if !info.IsDir() {
-		err = fmt.Errorf("Not a directory: '%s'", dirName)
+		err = fmt.Errorf("not a directory: '%s'", dirName)
 		spec.complainAndExit(err, dirName, spec.DirMode)
 	}
 	trace.SpamDebug("chown: ", dirName, spec.UserId, spec.GroupId)
@@ -95,7 +95,7 @@ func (spec *FixSpec) FixFile(fileName string) {
 		return
 	}
 	if info.IsDir() {
-		err = fmt.Errorf("Should not be a directory: '%s'", fileName)
+		err = fmt.Errorf("should not be a directory: '%s'", fileName)
 		spec.complainAndExit(err, fileName, spec.FileMode)
 	}
 	trace.SpamDebug("chown: ", fileName, spec.UserId, spec.GroupId)
diff --git a/client/go/internal/osutil/fix_fs_test.go b/client/go/internal/osutil/fix_fs_test.go
index 792986d7996..a59f1361b1f 100644
--- a/client/go/internal/osutil/fix_fs_test.go
+++ b/client/go/internal/osutil/fix_fs_test.go
@@ -23,6 +23,7 @@ func setup(t *testing.T) string {
 	err = os.WriteFile(tmpDir+"/a/f1", []byte{10}, 0644)
 	assert.Nil(t, err)
 	err = os.WriteFile(tmpDir+"/a/f2", []byte{10}, 0111)
+	assert.Nil(t, err)
 	return tmpDir
 }
 
@@ -91,6 +92,7 @@ func TestSuperUserOnly(t *testing.T) {
 		return
 	}
 	u, err := user.Current()
+	assert.Nil(t, err)
 	if u.Username != "root" {
 		trace.Trace("skip TestSuperUserOnly, user != root")
 		return
diff --git a/client/go/internal/vespa/load_env.go b/client/go/internal/vespa/load_env.go
index a799cbf4f9a..5cae03694bc 100644
--- a/client/go/internal/vespa/load_env.go
+++ b/client/go/internal/vespa/load_env.go
@@ -93,7 +93,7 @@ func loadDefaultEnvTo(r loadEnvReceiver) error {
 		varName := fields[1]
 		varVal := fields[2]
 		if !isValidShellVariableName(varName) {
-			err = fmt.Errorf("Not a valid environment variable name: '%s'", varName)
+			err = fmt.Errorf("not a valid environment variable name: '%s'", varName)
 			continue
 		}
 		if strings.HasPrefix(varVal, `"`) && strings.HasSuffix(varVal, `"`) {
@@ -259,7 +259,7 @@ func (p *shellEnvExporter) dump(w io.Writer) {
 		fmt.Fprintf(w, "%s=%s\n", vn, vv)
 		fmt.Fprintf(w, "export %s\n", vn)
 	}
-	for vn, _ := range p.unsetVars {
+	for vn := range p.unsetVars {
 		fmt.Fprintf(w, "unset %s\n", vn)
 	}
 }
diff --git a/client/go/internal/vespa/load_env_test.go b/client/go/internal/vespa/load_env_test.go
index ffd553e041d..723354bd1cb 100644
--- a/client/go/internal/vespa/load_env_test.go
+++ b/client/go/internal/vespa/load_env_test.go
@@ -106,7 +106,7 @@ override VESPA_V2 v2
 	assert.Equal(t, os.Getenv("VESPA_V1"), "v1")
 	assert.Equal(t, os.Getenv("VESPA_V2"), "v2")
 	assert.NotNil(t, err)
-	assert.Equal(t, err.Error(), "Not a valid environment variable name: '.A'")
+	assert.Equal(t, err.Error(), "not a valid environment variable name: '.A'")
 }
 
 func TestFindUser(t *testing.T) {
-- 
cgit v1.2.3