Upgrade Go, dependencies, golangci-lint (#105)

* go: update supported versions

* upgrade golangci-lint

* github workflow: use supported go versions

* go: upgrade toolchain and all dependencies

* go: upgrade golangci-lint, disable lll, enable gofmt, govet

* add linters to golangci config

* add gosec linter

* add misspell linter

* more upgrades

* ci: update go and actions versions

Author: ahouene

.github/workflows/go.yml

@@ -12,13 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.23', '1.22' ]
+        go: [ '1.25', '1.24' ]
 
     name: Go ${{ matrix.go }} tests
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go }}
       - name: Test

.golangci.toml

@@ -0,0 +1,28 @@
+version = "2"
+
+[linters]
+enable = [
+  "whitespace",
+  "gosec",
+  "gocritic",
+  "bodyclose",
+  "intrange",
+  "misspell",
+]
+
+[linters.exclusions]
+generated = "lax"
+presets = [
+  "comments",
+  "common-false-positives",
+  "legacy",
+  "std-error-handling"
+]
+paths = [ "third_party$", "builtin$", "examples$" ]
+
+[formatters]
+enable = [ "goimports", "gofmt" ]
+
+[formatters.exclusions]
+generated = "lax"
+paths = [ "third_party$", "builtin$", "examples$" ]

.golangci.yml

@@ -62,6 +62,6 @@ If not, a convenience wrapper for the storage is returned.
 
 ## API Stability
 
-We support the last two stable Go versions, currently 1.22 and 1.23.
+We support the last two stable Go versions, currently 1.24 and 1.25.
 
 From a API consumer point of view, we do not plan any backward incompatible changes before a v1.0.

README.md

@@ -29,6 +29,13 @@ type FileSecretsCredentials struct {
 // Retrieve implements credentials.Provider.
 // It reads files pointed to by p.AccessKeyFilename and p.SecretKeyFilename.
 func (c *FileSecretsCredentials) Retrieve() (credentials.Value, error) {
+	return c.RetrieveWithCredContext(nil)
+}
+
+// RetrieveWithCredContext implements credentials.Provider.
+// It reads files pointed to by p.AccessKeyFilename and p.SecretKeyFilename.
+// The [*credentials.CredContext] argument is ignored.
+func (c *FileSecretsCredentials) RetrieveWithCredContext(*credentials.CredContext) (credentials.Value, error) {
 	keyId, err := os.ReadFile(c.AccessKeyFile)
 	if err != nil {
 		return credentials.Value{}, err

backends/s3/credentials.go

@@ -22,7 +22,7 @@ func TestFileSecretsCredentials(t *testing.T) {
 
 	access, secret := secretsPaths(tempDir)
 
-	// Instanciate provider (what we're testing).
+	// Instantiate provider (what we're testing).
 	provider := &s3.FileSecretsCredentials{
 		AccessKeyFile: access,
 		SecretKeyFile: secret,
@@ -169,11 +169,11 @@ func secretsPaths(dir string) (access, secret string) {
 // in dir.
 func writeSecrets(t testing.TB, dir, adminUser, password string) {
 	access, secret := secretsPaths(dir)
-	err := os.WriteFile(access, []byte(adminUser), 0666)
+	err := os.WriteFile(access, []byte(adminUser), 0600)
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = os.WriteFile(secret, []byte(password), 0666)
+	err = os.WriteFile(secret, []byte(password), 0600)
 	if err != nil {
 		t.Fatal(err)
 	}

backends/s3/credentials_test.go

@@ -64,7 +64,7 @@ type writerWrapper struct {
 }
 
 func (w *writerWrapper) Write(p []byte) (int, error) {
-	// Not checking the status of ctx explicitely because it will be propagated
+	// Not checking the status of ctx explicitly because it will be propagated
 	// from the reader goroutine.
 	return w.pw.Write(p)
 }

backends/s3/stream.go

@@ -1,79 +1,87 @@
 module github.com/PowerDNS/simpleblob
 
-go 1.22
+go 1.24.0
 
-toolchain go1.23.2
+toolchain go1.25.1
 
 require (
 	github.com/PowerDNS/go-tlsconfig v0.0.0-20221101135152-0956853b28df
-	github.com/go-logr/logr v1.4.2
-	github.com/minio/minio-go/v7 v7.0.78
-	github.com/prometheus/client_golang v1.20.4
-	github.com/stretchr/testify v1.9.0
-	github.com/testcontainers/testcontainers-go v0.35.0
-	github.com/testcontainers/testcontainers-go/modules/minio v0.35.0
+	github.com/go-logr/logr v1.4.3
+	github.com/minio/minio-go/v7 v7.0.95
+	github.com/prometheus/client_golang v1.23.0
+	github.com/stretchr/testify v1.11.1
+	github.com/testcontainers/testcontainers-go v0.38.0
+	github.com/testcontainers/testcontainers-go/modules/minio v0.38.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	dario.cat/mergo v1.0.0 // indirect
+	dario.cat/mergo v1.0.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/containerd/containerd v1.7.18 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/cpuguy83/dockercfg v0.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v27.1.1+incompatible // indirect
+	github.com/docker/docker v28.2.2+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/ebitengine/purego v0.8.4 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.11 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/magiconair/properties v1.8.10 // indirect
+	github.com/minio/crc64nvme v1.0.2 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/go-archive v0.1.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/sys/user v0.1.0 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
+	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
+	github.com/philhofer/fwd v1.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.65.0 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/rs/xid v1.6.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.23.12 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/shirou/gopsutil/v4 v4.25.5 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/tinylib/msgp v1.3.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.24.0 // indirect
-	go.opentelemetry.io/otel/metric v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )