Skip to content

Commit f0808bf

Browse files
YuvalShAzYuvalShAz
authored
Update to Go 1.25 (#559)
1 parent 072ee2d commit f0808bf

File tree

8 files changed

+208
-202
lines changed

8 files changed

+208
-202
lines changed

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v6
2424
with:
25-
go-version: "1.24"
25+
go-version: "1.25"
2626

2727
- name: Check Formatting
2828
run: |

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/docker/library/golang:1.24-alpine AS go
1+
FROM public.ecr.aws/docker/library/golang:1.25-alpine AS go
22
ARG BUILDPLATFORM
33
ARG TARGETPLATFORM
44
RUN echo "Running on ${BUILDPLATFORM}, building for ${TARGETPLATFORM}."

‎auth/auth_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestNewAuth(t *testing.T) {
8888

8989
for _, tt := range tests {
9090
t.Run(tt.name, func(t *testing.T) {
91-
k8sClient := fake.NewSimpleClientset().CoreV1()
91+
k8sClient := fake.NewClientset().CoreV1()
9292

9393
auth, err := NewAuth(
9494
tt.region,
@@ -156,7 +156,7 @@ func TestGetAWSConfig(t *testing.T) {
156156
podName: "somepod",
157157
usePodIdentity: tstData.testPodIdentity,
158158
podIdentityHttpTimeout: &timeout,
159-
k8sClient: fake.NewSimpleClientset().CoreV1(),
159+
k8sClient: fake.NewClientset().CoreV1(),
160160
stsClient: &mockSTS{},
161161
}
162162

@@ -208,7 +208,7 @@ func TestAppID(t *testing.T) {
208208
eksAddonVersion: tt.eksAddonVersion,
209209
usePodIdentity: true,
210210
podIdentityHttpTimeout: &timeout,
211-
k8sClient: fake.NewSimpleClientset().CoreV1(),
211+
k8sClient: fake.NewClientset().CoreV1(),
212212
}
213213

214214
// Test getAppID directly

‎credential_provider/irsa_credential_provider_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func newIRSACredentialProviderWithMock(tstData irsaCredentialTest) *IRSACredenti
3232
sa.Annotations = map[string]string{roleArnAnnotationKey: tstData.roleARN}
3333
}
3434
}
35-
clientset := fake.NewSimpleClientset(sa)
35+
clientset := fake.NewClientset(sa)
3636
if tstData.testToken {
3737
k8sClient = &mockK8sV1{
3838
CoreV1Interface: clientset.CoreV1(),
@@ -140,7 +140,7 @@ var irsaTokenTests []irsaCredentialTest = []irsaCredentialTest{
140140

141141
func TestNewIRSACredentialProvider_AppID(t *testing.T) {
142142
expectedAppID := "test-app-id"
143-
k8sClient := fake.NewSimpleClientset().CoreV1()
143+
k8sClient := fake.NewClientset().CoreV1()
144144

145145
provider := NewIRSACredentialProvider(
146146
&mockSTS{},

‎credential_provider/pod_identity_credential_provider_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ func setupMockPodIdentityAgent(t *testing.T, isIPv4, shouldFail bool) *httptest.
7979

8080
func newPodIdentityCredentialWithMock(t *testing.T, isIPv4 bool, tstData podIdentityCredentialTest) (*PodIdentityCredentialProvider, chan<- struct{}) {
8181
k8sClient := &mockK8sV1{
82-
CoreV1Interface: fake.NewSimpleClientset().CoreV1(),
83-
fake: fake.NewSimpleClientset().CoreV1(),
82+
CoreV1Interface: fake.NewClientset().CoreV1(),
83+
fake: fake.NewClientset().CoreV1(),
8484
k8CTOneShotError: tstData.k8CTOneShotError,
8585
}
8686

@@ -401,7 +401,7 @@ func TestNewPodIdentityCredentialProviderTimeout(t *testing.T) {
401401

402402
for _, tt := range tests {
403403
t.Run(tt.name, func(t *testing.T) {
404-
k8sClient := fake.NewSimpleClientset().CoreV1()
404+
k8sClient := fake.NewClientset().CoreV1()
405405

406406
provider, err := NewPodIdentityCredentialProvider(
407407
testRegion, testNamespace, testServiceAccount, testPodName, "", tt.podIdentityHttpTimeout, "test-app-id", k8sClient)
@@ -436,7 +436,7 @@ func TestNewPodIdentityCredentialProviderValidation(t *testing.T) {
436436
{
437437
name: "Empty region",
438438
region: "",
439-
k8sClient: fake.NewSimpleClientset().CoreV1(),
439+
k8sClient: fake.NewClientset().CoreV1(),
440440
expectedErrorPrefix: "region cannot be empty",
441441
},
442442
{
@@ -448,7 +448,7 @@ func TestNewPodIdentityCredentialProviderValidation(t *testing.T) {
448448
{
449449
name: "Valid parameters",
450450
region: testRegion,
451-
k8sClient: fake.NewSimpleClientset().CoreV1(),
451+
k8sClient: fake.NewClientset().CoreV1(),
452452
expectedErrorPrefix: "",
453453
},
454454
}
@@ -481,7 +481,7 @@ func TestNewPodIdentityCredentialProviderValidation(t *testing.T) {
481481

482482
func TestNewPodIdentityCredentialProvider_AppID(t *testing.T) {
483483
expectedAppID := "test-app-id"
484-
k8sClient := fake.NewSimpleClientset().CoreV1()
484+
k8sClient := fake.NewClientset().CoreV1()
485485

486486
provider, err := NewPodIdentityCredentialProvider(
487487
testRegion,

‎go.mod‎

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,76 @@
11
module github.com/aws/secrets-store-csi-driver-provider-aws
22

3-
go 1.24.0
4-
5-
toolchain go1.24.4
3+
go 1.25.0
64

75
require (
8-
github.com/aws/aws-sdk-go-v2 v1.39.0
9-
github.com/aws/aws-sdk-go-v2/config v1.31.8
10-
github.com/aws/aws-sdk-go-v2/credentials v1.18.12
11-
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.4
12-
github.com/aws/aws-sdk-go-v2/service/ssm v1.64.4
13-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.4
14-
github.com/aws/smithy-go v1.23.0
6+
github.com/aws/aws-sdk-go-v2 v1.41.1
7+
github.com/aws/aws-sdk-go-v2/config v1.32.7
8+
github.com/aws/aws-sdk-go-v2/credentials v1.19.7
9+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.1
10+
github.com/aws/aws-sdk-go-v2/service/ssm v1.67.8
11+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.6
12+
github.com/aws/smithy-go v1.24.0
1513
github.com/jmespath/go-jmespath v0.4.0
16-
google.golang.org/grpc v1.75.1
17-
k8s.io/api v0.34.1
18-
k8s.io/apimachinery v0.34.1
19-
k8s.io/client-go v0.34.1
14+
google.golang.org/grpc v1.78.0
15+
k8s.io/api v0.35.0
16+
k8s.io/apimachinery v0.35.0
17+
k8s.io/client-go v0.35.0
2018
k8s.io/klog/v2 v2.130.1
21-
sigs.k8s.io/secrets-store-csi-driver v1.5.3
19+
sigs.k8s.io/secrets-store-csi-driver v1.5.5
2220
sigs.k8s.io/yaml v1.6.0
2321
)
2422

2523
require (
26-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 // indirect
27-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect
28-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect
29-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
30-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
31-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect
32-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 // indirect
33-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect
24+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
25+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect
27+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 // indirect
3433
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
35-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
34+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
3635
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3736
github.com/go-logr/logr v1.4.3 // indirect
38-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
39-
github.com/go-openapi/jsonreference v0.21.0 // indirect
40-
github.com/go-openapi/swag v0.23.1 // indirect
41-
github.com/gogo/protobuf v1.3.2 // indirect
42-
github.com/google/gnostic-models v0.7.0 // indirect
37+
github.com/go-openapi/jsonpointer v0.22.4 // indirect
38+
github.com/go-openapi/jsonreference v0.21.4 // indirect
39+
github.com/go-openapi/swag v0.25.4 // indirect
40+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
41+
github.com/go-openapi/swag/conv v0.25.4 // indirect
42+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
43+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
44+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
45+
github.com/go-openapi/swag/loading v0.25.4 // indirect
46+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
47+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
48+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
49+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
50+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
51+
github.com/google/gnostic-models v0.7.1 // indirect
4352
github.com/google/uuid v1.6.0 // indirect
44-
github.com/josharian/intern v1.0.0 // indirect
4553
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/mailru/easyjson v0.9.0 // indirect
54+
github.com/kr/text v0.2.0 // indirect
4755
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4856
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4957
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
50-
github.com/pkg/errors v0.9.1 // indirect
5158
github.com/x448/float16 v0.8.4 // indirect
52-
go.yaml.in/yaml/v2 v2.4.2 // indirect
59+
go.yaml.in/yaml/v2 v2.4.3 // indirect
5360
go.yaml.in/yaml/v3 v3.0.4 // indirect
54-
golang.org/x/net v0.41.0 // indirect
55-
golang.org/x/oauth2 v0.30.0 // indirect
56-
golang.org/x/sys v0.33.0 // indirect
57-
golang.org/x/term v0.32.0 // indirect
58-
golang.org/x/text v0.26.0 // indirect
59-
golang.org/x/time v0.12.0 // indirect
60-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
61-
google.golang.org/protobuf v1.36.6 // indirect
62-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
61+
golang.org/x/net v0.49.0 // indirect
62+
golang.org/x/oauth2 v0.34.0 // indirect
63+
golang.org/x/sys v0.40.0 // indirect
64+
golang.org/x/term v0.39.0 // indirect
65+
golang.org/x/text v0.33.0 // indirect
66+
golang.org/x/time v0.14.0 // indirect
67+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
68+
google.golang.org/protobuf v1.36.11 // indirect
69+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
6370
gopkg.in/inf.v0 v0.9.1 // indirect
64-
gopkg.in/yaml.v3 v3.0.1 // indirect
65-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
66-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
67-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
71+
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
72+
k8s.io/utils v0.0.0-20260108192941-914a6e750570 // indirect
73+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
6874
sigs.k8s.io/randfill v1.0.0 // indirect
69-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
75+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
7076
)

0 commit comments

Comments
 (0)