Skip to content

Commit ccf8db6

Browse files
authored
Merge pull request #400 from authzed/dependabot/docker/docker-version-85d05324cb
Bump golang from 1.25.6-alpine to 1.26.0-alpine in the docker-version group
2 parents 4d78008 + f3533b5 commit ccf8db6

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25.6-alpine AS builder
1+
FROM golang:1.26.0-alpine AS builder
22
WORKDIR /go/src/app
33
ENV CGO_ENABLED=0
44

e2e/databases/database.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/fluxcd/cli-utils/pkg/kstatus/polling"
1212
"github.com/fluxcd/pkg/ssa"
13+
1314
//revive:disable:dot-imports convention is dot-import
1415
. "github.com/onsi/ginkgo/v2"
1516
. "github.com/onsi/gomega"

pkg/config/config_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,7 +1907,7 @@ func TestNewConfig(t *testing.T) {
19071907
},
19081908
wantWarnings: []error{fmt.Errorf("no TLS configured, consider setting \"tlsSecretName\"")},
19091909
want: &Config{
1910-
MigrationConfig: MigrationConfig{
1910+
MigrationConfig: MigrationConfig{ //nolint:gosec // this is a test
19111911
MigrationLogLevel: "debug",
19121912
DatastoreEngine: "spanner",
19131913
DatastoreURI: "uri",
@@ -1942,7 +1942,7 @@ func TestNewConfig(t *testing.T) {
19421942
MigrationSecretsRef: ResolvedCredentialRef{SecretName: "test-secret", Key: "migration_secrets"},
19431943
ProjectLabels: true,
19441944
ProjectAnnotations: true,
1945-
Passthrough: map[string]string{
1945+
Passthrough: map[string]string{ //nolint:gosec // this is a test
19461946
"datastoreEngine": "spanner",
19471947
"dispatchClusterEnabled": "true",
19481948
"datastoreSpannerCredentials": "/spanner-credentials/credentials.json",

pkg/config/patch_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ spec:
722722
WithCSI(applycorev1.CSIVolumeSource().
723723
WithDriver("secrets-store.csi.k8s.io").
724724
WithReadOnly(true).
725-
WithVolumeAttributes(map[string]string{"secretProviderClass": "spicedb-aws-secrets"}))).
725+
WithVolumeAttributes(map[string]string{"secretProviderClass": "spicedb-aws-secrets"}))). //nolint:gosec // this is a test
726726
WithContainers(applycorev1.Container().
727727
WithName("container").WithVolumeMounts(
728728
applycorev1.VolumeMount().
@@ -815,7 +815,7 @@ spec:
815815
WithCSI(applycorev1.CSIVolumeSource().
816816
WithDriver("secrets-store.csi.k8s.io").
817817
WithReadOnly(true).
818-
WithVolumeAttributes(map[string]string{"secretProviderClass": "spicedb-aws-secrets"})),
818+
WithVolumeAttributes(map[string]string{"secretProviderClass": "spicedb-aws-secrets"})), //nolint:gosec // this is a test
819819
applycorev1.Volume().
820820
WithName("config-volume").
821821
WithConfigMap(applycorev1.ConfigMapVolumeSource().

0 commit comments

Comments
 (0)