chore: Add golangci-lint and fix most issues

Makefile

@@ -20,14 +20,25 @@ ANALYTICS_WRITE_KEY ?=
 LDFLAGS := -ldflags='-X "main.Version=$(VERSION)" -X "main.AnalyticsWriteKey=$(ANALYTICS_WRITE_KEY)"'
 MOQ := $(shell command -v moq 2> /dev/null)
 SRC := $(shell find . -name '*.go')
+GOLANGCI_LINT := $(shell command -v golangci-lint 2> /dev/null)
+
+vet:
+	go vet ./...
 
 test: store/awsapi_mock.go
 	go test -v ./...
 
-.PHONY: coverage
 coverage:
 	go test -coverpkg ./... -coverprofile coverage.out ./...
 
+lint: vet
+ifdef GOLANGCI_LINT
+	@golangci-lint run --max-same-issues 0 --max-issues-per-linter 0
+else
+	@echo "Please install golangci-lint: brew install golangci-lint"
+	@false
+endif
+
 store/awsapi_mock.go: store/awsapi.go
 ifdef MOQ
 	rm -f $@
@@ -71,4 +82,4 @@ dist/chamber-$(VERSION)-linux-arm64 dist/chamber-$(VERSION)-linux-aarch64: | dis
 dist/chamber-$(VERSION)-windows-amd64.exe: | dist/
 	GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -trimpath $(LDFLAGS) -o $@
 
-.PHONY: clean all fmt build linux
+.PHONY: vet test coverage lint clean all fmt build linux

cmd/delete.go

@@ -40,7 +40,7 @@
 	}
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().

cmd/env.go

@@ -75,7 +75,7 @@
 	}
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().

cmd/env_test.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -35,7 +34,7 @@ func Test_sanitizeKey(t *testing.T) {
 	}{
 		{given: "invalid strings", expected: "invalid_strings"},
 		{given: "extremely  invalid  strings", expected: "extremely__invalid__strings"},
-		{given: fmt.Sprintf("\nunbelievably\tinvalid\tstrings\n"), expected: "unbelievably_invalid_strings"},
+		{given: "\nunbelievably\tinvalid\tstrings\n", expected: "unbelievably_invalid_strings"},
 		{given: "valid_string", expected: "valid_string"},
 		{given: "validish-string", expected: "validish_string"},
 		{given: "valid.string", expected: "valid_string"},

cmd/exec.go

@@ -75,7 +75,7 @@
 	services, command, commandArgs := args[:dashIx], args[dashIx], args[dashIx+1:]
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().
@@ -118,9 +118,8 @@
 		}
 		for _, service := range services {
 			collisions := make([]string, 0)
-			var err error
 			// TODO: these interfaces should look the same as Strict*, so move pristine in there
-			err = env.Load(cmd.Context(), secretStore, service, &collisions)
+			err := env.Load(cmd.Context(), secretStore, service, &collisions)
 			if err != nil {
 				return fmt.Errorf("Failed to list store contents: %w", err)
 			}

cmd/export.go

@@ -42,7 +42,7 @@
 	var err error
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().
@@ -82,6 +82,7 @@
 		if file, err = os.OpenFile(exportOutput, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644); err != nil {
 			return fmt.Errorf("Failed to open output file for writing: %w", err)
 		}
+		// TODO: check for errors flushing, syncing, or closing
 		defer file.Close()
 		defer file.Sync()
 	}
@@ -144,7 +145,10 @@
 	for _, k := range sortedKeys(params) {
 		key := sanitizeKey(strings.TrimPrefix(k, "tf_var_"))
 
-		w.Write([]byte(fmt.Sprintf(`%s = "%s"`+"\n", key, doubleQuoteEscape(params[k]))))
+		_, err := w.Write([]byte(fmt.Sprintf(`%s = "%s"`+"\n", key, doubleQuoteEscape(params[k]))))
+		if err != nil {
+			return fmt.Errorf("failed to write variable with key %s: %v", k, err)
+		}
 	}
 	return nil
 }
@@ -170,7 +174,10 @@
 	p := properties.NewProperties()
 	p.DisableExpansion = true
 	for _, k := range sortedKeys(params) {
-		p.Set(k, params[k])
+		_, _, err := p.Set(k, params[k])
+		if err != nil {
+			return fmt.Errorf("failed to set property %s: %v", k, err)
+		}
 	}
 
 	// Java expects properties in ISO-8859-1 by default

cmd/history.go

@@ -35,7 +35,7 @@
 	}
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().

cmd/import.go

@@ -54,7 +54,7 @@
 	}
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().

cmd/list.go

@@ -43,7 +43,7 @@
 	}
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().

cmd/read.go

@@ -42,7 +42,7 @@
 	}
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().

cmd/root.go

@@ -105,7 +105,7 @@
 
 	if cmd, err := RootCmd.ExecuteC(); err != nil {
 		if strings.Contains(err.Error(), "arg(s)") || strings.Contains(err.Error(), "usage") {
-			cmd.Usage()
+			_ = cmd.Usage()
 		}
 		os.Exit(1)
 	}
@@ -206,7 +206,8 @@
 			return nil, errors.New("Unable to use --kms-key-alias with this backend. Use CHAMBER_KMS_KEY_ALIAS instead.")
 		}
 
-		parsedRetryMode, err := aws.ParseRetryMode(retryMode)
+		var parsedRetryMode aws.RetryMode
+		parsedRetryMode, err = aws.ParseRetryMode(retryMode)
 		if err != nil {
 			return nil, fmt.Errorf("Invalid retry mode %s", retryMode)
 		}
@@ -225,7 +226,7 @@
 		})
 
 		username = os.Getenv("USER")
-		analyticsClient.Enqueue(analytics.Identify{
+		_ = analyticsClient.Enqueue(analytics.Identify{
 			UserId: username,
 			Traits: analytics.NewTraits().
 				Set("chamber-version", chamberVersion),

cmd/version.go

@@ -22,7 +22,7 @@
 func versionRun(cmd *cobra.Command, args []string) error {
 	fmt.Fprintf(os.Stdout, "chamber %s\n", chamberVersion)
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().

cmd/write.go

@@ -3,7 +3,7 @@
 import (
 	"bufio"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 
@@ -44,7 +44,7 @@
 	}
 
 	if analyticsEnabled && analyticsClient != nil {
-		analyticsClient.Enqueue(analytics.Track{
+		_ = analyticsClient.Enqueue(analytics.Track{
 			UserId: username,
 			Event:  "Ran Command",
 			Properties: analytics.NewProperties().
@@ -67,7 +67,7 @@
 			}
 			value = strings.TrimSuffix(v, "\n")
 		} else {
-			v, err := ioutil.ReadAll(os.Stdin)
+			v, err := io.ReadAll(os.Stdin)
 			if err != nil {
 				return err
 			}

environ/environ.go

@@ -89,12 +89,9 @@ func (e *Environ) load(ctx context.Context, s store.Store, service string, colli
 	if err != nil {
 		return err
 	}
-	envVarKeys := make([]string, 0)
 	for _, rawSecret := range rawSecrets {
 		envVarKey := secretKeyToEnvVarName(rawSecret.Key)
 
-		envVarKeys = append(envVarKeys, envVarKey)
-
 		if e.IsSet(envVarKey) {
 			*collisions = append(*collisions, envVarKey)
 		}

store/backendbenchmarks_test.go

@@ -8,6 +8,8 @@ import (
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
 // This file contains some tests which can be used to benchmark
@@ -49,11 +51,13 @@ func benchmarkStore(t *testing.T, store Store, services []string) {
 
 		for i := 0; i < concurrency; i++ {
 			wg.Add(1)
-			go emulateExec(t, ctx, &wg, store, services)
-
+			go func() {
+				// TODO: collect errors in a channel
+				_ = emulateExec(t, ctx, &wg, store, services)
+			}()
 		}
 		wg.Wait()
-		elapsed := time.Now().Sub(start)
+		elapsed := time.Since(start)
 		t.Logf("Concurrently started %d services in %s", concurrency, elapsed)
 	}
 }
@@ -106,7 +110,7 @@ func setupStore(t *testing.T, ctx context.Context, store Store, services []strin
 				Key:     key,
 			}
 
-			store.Write(ctx, id, RandStringRunes(100))
+			require.NoError(t, store.Write(ctx, id, RandStringRunes(100)))
 		}
 	}
 }
@@ -120,7 +124,7 @@ func cleanupStore(t *testing.T, ctx context.Context, store Store, services []str
 				Key:     key,
 			}
 
-			store.Delete(ctx, id)
+			require.NoError(t, store.Delete(ctx, id))
 		}
 	}
 }

store/s3store.go

@@ -6,7 +6,7 @@
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"sort"
 	"time"
 
@@ -258,9 +258,7 @@
 		return err
 	}
 
-	if _, ok := index.Latest[id.Key]; ok {
-		delete(index.Latest, id.Key)
-	}
+	delete(index.Latest, id.Key)
 
 	if err := s.deleteObjectById(ctx, id); err != nil {
 		return err
@@ -317,7 +315,7 @@
 		return secretObject{}, false, err
 	}
 
-	raw, err := ioutil.ReadAll(resp.Body)
+	raw, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return secretObject{}, false, err
 	}
@@ -366,7 +364,7 @@
 		return latest{}, err
 	}
 
-	raw, err := ioutil.ReadAll(resp.Body)
+	raw, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return latest{}, err
 	}
@@ -390,15 +388,6 @@
 	return s.puts3raw(ctx, path, raw)
 }
 
-func stringInSlice(val string, sl []string) bool {
-	for _, v := range sl {
-		if v == val {
-			return true
-		}
-	}
-	return false
-}
-
 func getObjectPath(id SecretId) string {
 	return fmt.Sprintf("%s/%s.json", id.Service, id.Key)
 }