chore: upgrade go to 1.26 and tidy go.mod (#1066)

Author: loderunner

.github/workflows/build.yml

@@ -57,15 +57,13 @@ jobs:
     permissions: {}
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.18
+          go-version: '1.26'
       - name: Checkout
         uses: actions/checkout@v5
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: v1.45.2
+        uses: golangci/golangci-lint-action@v9
 
   test:
     runs-on: ubuntu-latest
@@ -74,9 +72,9 @@ jobs:
       - lint
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.18
+          go-version: '1.26'
       - name: Checkout
         uses: actions/checkout@v5
       - name: Cache Go modules
@@ -106,9 +104,9 @@ jobs:
     steps:
       # Setup Go and checkout
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.18
+          go-version: '1.26'
       - name: Checkout
         uses: actions/checkout@v5
       - name: Cache Go modules
@@ -208,9 +206,9 @@ jobs:
       - lint
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.18
+          go-version: '1.26'
       - name: Checkout
         uses: actions/checkout@v5
       - name: Cache Go modules

.golangci.yml

@@ -1,29 +1,31 @@
-run:
-  skip-dirs-use-default: false
+version: '2'
 
 linters:
+  settings:
+    lll:
+      line-length: 80
+      tab-width: 4
   enable:
-    - deadcode
     - errcheck
-    - gosimple
     - govet
-    - ineffassign
     - staticcheck
-    - structcheck
-    - typecheck
+    - ineffassign
     - unused
-    - varcheck
-    - errchkjson
-    - errorlint
-    - godot
-    - gofmt
-    - goimports
-    - misspell
-    - prealloc
-    - revive
-    - unconvert
-    - whitespace
+    - lll
 
-issues:
-  include:
-    - EXC0002
+formatters:
+  enable:
+    - gofumpt
+    - golines
+    - gci
+  settings:
+    golines:
+      max-len: 80
+      tab-len: 4
+      shorten-comments: true
+      reformat-tags: false
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/loderunner/scrt)

backend/git.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"time"
 
@@ -42,10 +42,26 @@ const defaultCommitMessage = "update secrets"
 func init() {
 	gitFlagSet = pflag.NewFlagSet("git", pflag.ContinueOnError)
 	gitFlagSet.String("git-url", "", "URL of the git repository (required)")
-	gitFlagSet.String("git-path", "", "path of the store in the repository (required)")
-	gitFlagSet.String("git-branch", "", "branch to checkout, commit and push to on updates")
-	gitFlagSet.String("git-checkout", "", "tree-ish revision to checkout, e.g. commit or tag")
-	gitFlagSet.String("git-message", "", "commit message when updating the store")
+	gitFlagSet.String(
+		"git-path",
+		"",
+		"path of the store in the repository (required)",
+	)
+	gitFlagSet.String(
+		"git-branch",
+		"",
+		"branch to checkout, commit and push to on updates",
+	)
+	gitFlagSet.String(
+		"git-checkout",
+		"",
+		"tree-ish revision to checkout, e.g. commit or tag",
+	)
+	gitFlagSet.String(
+		"git-message",
+		"",
+		"commit message when updating the store",
+	)
 }
 
 type gitBackend struct {
@@ -61,7 +77,10 @@ func (f gitFactory) New(conf map[string]interface{}) (Backend, error) {
 	return f.NewContext(context.Background(), conf)
 }
 
-func (f gitFactory) NewContext(ctx context.Context, conf map[string]interface{}) (Backend, error) {
+func (f gitFactory) NewContext(
+	ctx context.Context,
+	conf map[string]interface{},
+) (Backend, error) {
 	return newGit(ctx, conf)
 }
 
@@ -90,7 +109,11 @@ func newGit(ctx context.Context, conf map[string]interface{}) (Backend, error) {
 	}
 	url, ok := opt.(string)
 	if !ok {
-		return nil, fmt.Errorf("repository URL is not a string: (%T)%s", opt, opt)
+		return nil, fmt.Errorf(
+			"repository URL is not a string: (%T)%s",
+			opt,
+			opt,
+		)
 	}
 	logger = logger.WithField("url", url)
 
@@ -163,6 +186,7 @@ func newGit(ctx context.Context, conf map[string]interface{}) (Backend, error) {
 func (g gitBackend) Exists() (bool, error) {
 	return g.ExistsContext(context.Background())
 }
+
 func (g gitBackend) ExistsContext(ctx context.Context) (bool, error) {
 	logger := getLogger(ctx)
 
@@ -183,17 +207,18 @@ func (g gitBackend) ExistsContext(ctx context.Context) (bool, error) {
 func (g gitBackend) Save(data []byte) error {
 	return g.SaveContext(context.Background(), data)
 }
+
 func (g gitBackend) SaveContext(ctx context.Context, data []byte) error {
 	logger := getLogger(ctx)
 
 	logger = logger.WithField("path", g.path)
 
 	logger.Info("opening file in git repository")
-	f, err := g.fs.OpenFile(g.path, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0700)
+	f, err := g.fs.OpenFile(g.path, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0o700)
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 
 	logger.Info("writing encrypted data to git repository")
 	n, err := f.Write(data)
@@ -232,7 +257,10 @@ func (g gitBackend) SaveContext(ctx context.Context, data []byte) error {
 	}
 
 	logger.
-		WithField("committer", fmt.Sprintf("%s <%s>", authorCommitter.Name, authorCommitter.Email)).
+		WithField(
+			"committer",
+			fmt.Sprintf("%s <%s>", authorCommitter.Name, authorCommitter.Email),
+		).
 		Infof("committing changes to git repository: \"%s\"", g.message)
 	_, err = w.Commit(
 		g.message,
@@ -259,6 +287,7 @@ func (g gitBackend) SaveContext(ctx context.Context, data []byte) error {
 func (g gitBackend) Load() ([]byte, error) {
 	return g.LoadContext(context.Background())
 }
+
 func (g gitBackend) LoadContext(ctx context.Context) ([]byte, error) {
 	logger := getLogger(ctx)
 
@@ -270,9 +299,9 @@ func (g gitBackend) LoadContext(ctx context.Context) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}

backend/local.go

@@ -29,7 +29,11 @@ var localFlagSet *pflag.FlagSet
 
 func init() {
 	localFlagSet = pflag.NewFlagSet("local", pflag.ContinueOnError)
-	localFlagSet.String("local-path", "", "path to the store in the local filesystem (required)")
+	localFlagSet.String(
+		"local-path",
+		"",
+		"path to the store in the local filesystem (required)",
+	)
 }
 
 type local struct {
@@ -42,7 +46,11 @@ type localFactory struct{}
 func (f localFactory) New(conf map[string]interface{}) (Backend, error) {
 	return f.NewContext(context.Background(), conf)
 }
-func (f localFactory) NewContext(ctx context.Context, conf map[string]interface{}) (Backend, error) {
+
+func (f localFactory) NewContext(
+	ctx context.Context,
+	conf map[string]interface{},
+) (Backend, error) {
 	return newLocal(ctx, conf)
 }
 
@@ -62,7 +70,10 @@ func init() {
 	Backends["local"] = localFactory{}
 }
 
-func newLocal(ctx context.Context, conf map[string]interface{}) (Backend, error) {
+func newLocal(
+	ctx context.Context,
+	conf map[string]interface{},
+) (Backend, error) {
 	logger := getLogger(ctx)
 
 	opt := readOpt("local", "path", conf)
@@ -114,8 +125,9 @@ func (l local) Save(data []byte) error {
 
 func (l local) SaveContext(ctx context.Context, data []byte) error {
 	logger := getLogger(ctx)
-	logger.WithField("path", l.path).Info("writing encrypted data to local storage")
-	return afero.WriteFile(l.fs, l.path, data, 0600)
+	logger.WithField("path", l.path).
+		Info("writing encrypted data to local storage")
+	return afero.WriteFile(l.fs, l.path, data, 0o600)
 }
 
 func (l local) Load() ([]byte, error) {
@@ -124,6 +136,7 @@ func (l local) Load() ([]byte, error) {
 
 func (l local) LoadContext(ctx context.Context) ([]byte, error) {
 	logger := getLogger(ctx)
-	logger.WithField("path", l.path).Info("reading encrypted data from local storage")
+	logger.WithField("path", l.path).
+		Info("reading encrypted data from local storage")
 	return afero.ReadFile(l.fs, l.path)
 }

backend/local_test.go

@@ -19,18 +19,21 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/loderunner/scrt/store"
 	"github.com/spf13/afero"
+
+	"github.com/loderunner/scrt/store"
 )
 
 func TestLocalExists(t *testing.T) {
 	path := "/tmp/store.scrt"
 	fs := afero.NewMemMapFs()
-	f, err := fs.OpenFile(path, os.O_CREATE, 0600)
+	f, err := fs.OpenFile(path, os.O_CREATE, 0o600)
 	if err != nil {
 		t.Fatal(err)
 	}
-	f.Close()
+	if err = f.Close(); err != nil {
+		t.Fatal(err)
+	}
 
 	b := local{path: "/tmp/nonexistent.scrt", fs: fs}
 	exists, err := b.Exists()

backend/main.go

@@ -48,7 +48,10 @@ type Backend interface {
 type Factory interface {
 	// New returns an initialized backend from the given configuration
 	New(conf map[string]interface{}) (Backend, error)
-	NewContext(ctx context.Context, conf map[string]interface{}) (Backend, error)
+	NewContext(
+		ctx context.Context,
+		conf map[string]interface{},
+	) (Backend, error)
 
 	// Name returns a human-readable name for the backend
 	Name() string