fix: go linting issues

.golangci.yml

@@ -41,6 +41,12 @@ linters:
     govet:
       disable:
         - composites
+    staticcheck:
+      checks:
+        - all
+        - -QF1001 # De Morgan's law simplifications
+        - -QF1008 # Embedded field selector simplifications
+        - -ST1003 # Naming conventions (ID vs Id, URL vs Url, etc.)
   exclusions:
     generated: lax
     presets:

cmd/src/batch_common.go

@@ -632,7 +632,7 @@ func getBatchSpecDirectory(file string) (string, error) {
 func checkExecutable(cmd string, args ...string) error {
 	if err := exec.Command(cmd, args...).Run(); err != nil {
 		return fmt.Errorf(
-			"failed to execute \"%s %s\":\n\t%s\n\n'src batch' requires %q to be available.",
+			"failed to execute \"%s %s\":\n\t%s\n\n'src batch' requires %q to be available",
 			cmd,
 			strings.Join(args, " "),
 			err,

cmd/src/search.go

@@ -457,9 +457,10 @@ func applyHighlightsForFile(fileContent string, highlights []highlight) string {
 	for _, highlight := range highlights {
 		line := lines[highlight.line]
 		for characterIndex, character := range []rune(line + "\n") {
-			if characterIndex == highlight.character {
+			switch characterIndex {
+			case highlight.character:
 				result = append(result, []rune(start)...)
-			} else if characterIndex == highlight.character+highlight.length {
+			case highlight.character + highlight.length:
 				result = append(result, []rune(end)...)
 			}
 			result = append(result, character)
@@ -478,9 +479,10 @@ func applyHighlights(input string, highlights []highlight, start, end string) st
 		for characterIndex, character := range []rune(line + "\n") {
 			for _, highlight := range highlights {
 				if highlight.line == lineNumber {
-					if characterIndex == highlight.character {
+					switch characterIndex {
+					case highlight.character:
 						result = append(result, []rune(start)...)
-					} else if characterIndex == highlight.character+highlight.length {
+					case highlight.character + highlight.length:
 						result = append(result, []rune(end)...)
 					}
 				}

cmd/src/signature_fetch.go

@@ -174,7 +174,7 @@ func (c cosignConfig) verifySignatureForImageHash(image string, hash string) err
 
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("Signature verification failed: %w\nOutput: %s", err, output)
+		return fmt.Errorf("signature verification failed: %w\nOutput: %s", err, output)
 	}
 
 	return nil

internal/api/api.go

@@ -236,8 +236,7 @@ func (r *request) do(ctx context.Context, result interface{}) (bool, error) {
 
 	// Check trace header before we potentially early exit
 	if *r.client.opts.Flags.trace {
-		_, err := r.client.opts.Out.Write([]byte(fmt.Sprintf("x-trace: %s\n", resp.Header.Get("x-trace"))))
-		if err != nil {
+		if _, err := fmt.Fprintf(r.client.opts.Out, "x-trace: %s\n", resp.Header.Get("x-trace")); err != nil {
 			return false, err
 		}
 	}

internal/api/proxy.go

@@ -54,12 +54,12 @@ func applyProxy(transport *http.Transport, proxyURL *url.URL, proxyPath string)
 		transport.Proxy = nil
 		proxyApplied = true
 	} else if proxyURL != nil {
-		if proxyURL.Scheme == "socks5" ||
-			proxyURL.Scheme == "socks5h" {
+		switch proxyURL.Scheme {
+		case "socks5", "socks5h":
 			// SOCKS proxies work out of the box - no need to manually dial
 			transport.Proxy = http.ProxyURL(proxyURL)
 			proxyApplied = true
-		} else if proxyURL.Scheme == "http" || proxyURL.Scheme == "https" {
+		case "http", "https":
 			dial := func(ctx context.Context, network, addr string) (net.Conn, error) {
 				// Dial the proxy
 				d := net.Dialer{}

internal/batches/debug.go

@@ -1,5 +1,4 @@
 //go:build debug
-// +build debug
 
 package batches
 

internal/batches/docker/version.go

@@ -12,7 +12,7 @@ func CheckVersion(ctx context.Context) error {
 	_, err := executeFastCommand(ctx, "version")
 	if err != nil {
 		return fmt.Errorf(
-			"failed to execute \"docker version\":\n\t%s\n\n'src batch' requires \"docker\" to be available.",
+			"failed to execute \"docker version\":\n\t%s\n\n'src batch' requires \"docker\" to be available",
 			err,
 		)
 	}

internal/batches/executor/execution_cache_test.go

@@ -6,22 +6,21 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/sourcegraph/sourcegraph/lib/batches"
 	batcheslib "github.com/sourcegraph/sourcegraph/lib/batches"
 	"github.com/sourcegraph/sourcegraph/lib/batches/execution"
 	"github.com/sourcegraph/sourcegraph/lib/batches/execution/cache"
 	"github.com/sourcegraph/sourcegraph/lib/batches/git"
 )
 
-var cacheRepo1 = batches.Repository{
+var cacheRepo1 = batcheslib.Repository{
 	ID:          "src-cli",
 	Name:        "github.com/sourcegraph/src-cli",
 	BaseRef:     "refs/heads/main",
 	BaseRev:     "d34db33f",
 	FileMatches: []string{"README.md", "main.go"},
 }
 
-var cacheRepo2 = batches.Repository{
+var cacheRepo2 = batcheslib.Repository{
 	ID:          "sourcegraph",
 	Name:        "github.com/sourcegraph/sourcegraph",
 	BaseRef:     "refs/heads/main-2",

internal/batches/workspace/bind_workspace_nonwin_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package workspace
 

internal/batches/workspace/workspace.go

@@ -56,11 +56,12 @@ const (
 
 func NewCreator(ctx context.Context, preference, cacheDir, tempDir string, images map[string]docker.Image) (Creator, CreatorType) {
 	var workspaceType CreatorType
-	if preference == "volume" {
+	switch preference {
+	case "volume":
 		workspaceType = CreatorTypeVolume
-	} else if preference == "bind" {
+	case "bind":
 		workspaceType = CreatorTypeBind
-	} else {
+	default:
 		workspaceType = BestCreatorType(ctx, images)
 	}
 

internal/validate/kube/kube.go

@@ -379,13 +379,14 @@ func CurrentContextSetTo(clusterService string) error {
 		return err
 	}
 
-	if clusterService == "gke" {
+	switch clusterService {
+	case "gke":
 		got := strings.Split(currentContext, "_")[0]
 		want := clusterService
 		if got != want {
 			return errors.New("no gke cluster configured")
 		}
-	} else if clusterService == "eks" {
+	case "eks":
 		got := strings.Split(currentContext, ":")
 		want := []string{"arn", "aws", clusterService}
 
@@ -399,7 +400,7 @@ func CurrentContextSetTo(clusterService string) error {
 				return errors.New("no eks cluster configured")
 			}
 		}
-	} else if clusterService == "aks" {
+	case "aks":
 		colons := strings.Split(currentContext, ":")      // aws string
 		underscores := strings.Split(currentContext, "_") // gke string