Skip to content

Commit b7a9f3e

Browse files
authored
Merge pull request #1589 from andyzhangx/trivy-go-1.23
[release-1.23] chore: upgrade golang version
2 parents bff20c6 + 3279fb3 commit b7a9f3e

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/trivy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go 1.x
1313
uses: actions/setup-go@v4
1414
with:
15-
go-version: 1.22.5
15+
go-version: 1.23.1
1616
id: go
1717

1818
- name: Checkout code

.trivyignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CVE-2024-34156
2+
CVE-2024-34158
3+
CVE-2024-34155

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module sigs.k8s.io/blob-csi-driver
22

3-
go 1.21
4-
5-
toolchain go1.21.4
3+
go 1.23.1
64

75
require (
86
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible

pkg/blob/controllerserver_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ func TestValidateVolumeCapabilities(t *testing.T) {
10761076
clientErr: DATAPLANE,
10771077
containerProp: &storage.ContainerProperties{},
10781078
expectedRes: nil,
1079-
expectedErr: status.Errorf(codes.Internal, retry.GetError(&http.Response{}, fmt.Errorf(containerBeingDeletedDataplaneAPIError)).Error().Error()),
1079+
expectedErr: status.Error(codes.Internal, fmt.Sprintf("ContainerProperties of volume(%s) is nil", "unit#test#test")),
10801080
},
10811081
{
10821082
name: "Requested Volume does not exist",
@@ -1088,7 +1088,7 @@ func TestValidateVolumeCapabilities(t *testing.T) {
10881088
clientErr: NULL,
10891089
containerProp: &storage.ContainerProperties{},
10901090
expectedRes: nil,
1091-
expectedErr: status.Errorf(codes.NotFound, fmt.Sprintf("requested volume(%s) does not exist", "unit#test#test")),
1091+
expectedErr: status.Errorf(codes.Internal, retry.GetError(&http.Response{}, fmt.Errorf(containerBeingDeletedDataplaneAPIError)).Error().Error()),
10921092
},
10931093
/*{ //Volume being shown as not existing. ContainerProperties.Deleted not setting correctly??
10941094
name: "Successful I/O",

vendor/k8s.io/kubernetes/test/e2e/framework/testfiles/testdata/a/foo.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)