Skip to content

Commit

Permalink
Merge pull request #1589 from andyzhangx/trivy-go-1.23
Browse files Browse the repository at this point in the history
[release-1.23] chore: upgrade golang version
  • Loading branch information
andyzhangx authored Sep 10, 2024
2 parents bff20c6 + 3279fb3 commit b7a9f3e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: 1.22.5
go-version: 1.23.1
id: go

- name: Checkout code
Expand Down
3 changes: 3 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CVE-2024-34156
CVE-2024-34158
CVE-2024-34155
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module sigs.k8s.io/blob-csi-driver

go 1.21

toolchain go1.21.4
go 1.23.1

require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
Expand Down
4 changes: 2 additions & 2 deletions pkg/blob/controllerserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ func TestValidateVolumeCapabilities(t *testing.T) {
clientErr: DATAPLANE,
containerProp: &storage.ContainerProperties{},
expectedRes: nil,
expectedErr: status.Errorf(codes.Internal, retry.GetError(&http.Response{}, fmt.Errorf(containerBeingDeletedDataplaneAPIError)).Error().Error()),
expectedErr: status.Error(codes.Internal, fmt.Sprintf("ContainerProperties of volume(%s) is nil", "unit#test#test")),
},
{
name: "Requested Volume does not exist",
Expand All @@ -1088,7 +1088,7 @@ func TestValidateVolumeCapabilities(t *testing.T) {
clientErr: NULL,
containerProp: &storage.ContainerProperties{},
expectedRes: nil,
expectedErr: status.Errorf(codes.NotFound, fmt.Sprintf("requested volume(%s) does not exist", "unit#test#test")),
expectedErr: status.Errorf(codes.Internal, retry.GetError(&http.Response{}, fmt.Errorf(containerBeingDeletedDataplaneAPIError)).Error().Error()),
},
/*{ //Volume being shown as not existing. ContainerProperties.Deleted not setting correctly??
name: "Successful I/O",
Expand Down

This file was deleted.

0 comments on commit b7a9f3e

Please sign in to comment.