Upgrade k8s and other dependencies from 1.28 to 1.30 (#74)

* Upgrade k8s and other dependencies from 1.28 to 1.30 Signed-off-by: Sameer Shaikh <[email protected]> * Upgrade k8s and other dependencies from 1.28 to 1.30 Signed-off-by: Sameer Shaikh <[email protected]> --------- Signed-off-by: Sameer Shaikh <[email protected]>
IBM · Aug 20, 2024 · dc0f110 · dc0f110
1 parent 31ce700
commit dc0f110
Show file tree

Hide file tree

Showing 12 changed files with 196 additions and 293 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -30,7 +30,6 @@ issues:
 linters:
     # enable or disable analyzers by name
     enable:
-      - golint
       - gofmt
       - gosec
       - whitespace
@@ -39,11 +38,6 @@ linters:
       - goimports
       - unused
       - gosimple
-      - varcheck
-      - structcheck
-      - bodyclose
-      - deadcode
-      - depguard
       - govet
       - typecheck
       - staticcheck

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-- 1.20.11
+- 1.22.0
 - tip
 
 group: bluezone

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 GOPACKAGES=$(shell go list ./... | grep -v /vendor/ | grep -v /samples)
 GOFILES=$(shell find . -type f -name '*.go' -not -path "./vendor/*")
 ARCH = $(shell uname -m)
-LINT_VERSION="1.51.2"
+LINT_VERSION="1.60.1"
 
 .PHONY: all
 all: deps dofmt vet test

diff --git a/block/provider/create_volume_test.go b/block/provider/create_volume_test.go
@@ -309,7 +309,7 @@ func TestCreateVolume(t *testing.T) {
 			expectedErr:        "{Code:SnapshotIDNotFound, Type:RetrivalFailed, Description:'Not a valid snapshot ID'}",
 			expectedReasonCode: "SnapshotIDNotFound",
 			errorCode: &models.Error{
-				Errors: []models.ErrorItem{models.ErrorItem{
+				Errors: []models.ErrorItem{{
 					Code: models.ErrorCode(SnapshotIDNotFound),
 				}},
 			},

diff --git a/block/provider/delete_snapshot.go b/block/provider/delete_snapshot.go
@@ -29,16 +29,17 @@ import (
 
 // DeleteSnapshot delete snapshot
 func (vpcs *VPCSession) DeleteSnapshot(snapshot *provider.Snapshot) error {
-	vpcs.Logger.Info("Entry DeleteSnapshot", zap.Reflect("snapshotID", snapshot.SnapshotID))
-	defer vpcs.Logger.Info("Exit DeleteSnapshot", zap.Reflect("snapshotID", snapshot.SnapshotID))
-	defer metrics.UpdateDurationFromStart(vpcs.Logger, "DeleteSnapshot", time.Now())
+	vpcs.Logger.Info("Entry DeleteSnapshot", zap.Reflect("snapshot", snapshot))
 
 	var err error
 	if snapshot == nil {
 		err = userError.GetUserError("InvalidSnapshotID", nil, nil)
 		return err
 	}
 
+	defer vpcs.Logger.Info("Exit DeleteSnapshot", zap.Reflect("snapshotID", snapshot.SnapshotID))
+	defer metrics.UpdateDurationFromStart(vpcs.Logger, "DeleteSnapshot", time.Now())
+
 	vpcs.Logger.Info("Deleting snapshot from VPC provider...")
 	err = retry(vpcs.Logger, func() error {
 		err = vpcs.Apiclient.SnapshotService().DeleteSnapshot(snapshot.SnapshotID, vpcs.Logger)

diff --git a/block/provider/provider_test.go b/block/provider/provider_test.go
@@ -50,7 +50,7 @@ const (
 	IamURL                  = "test-iam-url"
 	IamClientID             = "test-iam_client_id"
 	IamClientSecret         = "test-iam_client_secret"
-	IamAPIKey               = "test-iam_api_key"
+	IamAPIKey               = "test-iam_api_key" // #nosec G101: Test code
 	RefreshToken            = "test-refresh_token"
 	TestEndpointURL         = "http://some_endpoint"
 	TestAPIVersion          = "2019-07-02"
@@ -111,7 +111,7 @@ func TestNewProvider(t *testing.T) {
 	kc, _ := k8s_utils.FakeGetk8sClientSet()
 	pwd, _ := os.Getwd()
 	file := filepath.Join(pwd, "..", "..", "etc", "libconfig.toml")
-	err = k8s_utils.FakeCreateSecret(kc, "DEFAULT", file)
+	_ = k8s_utils.FakeCreateSecret(kc, "DEFAULT", file)
 	prov, err := NewProvider(conf, &kc, logger)
 	assert.NotNil(t, prov)
 	assert.Nil(t, err)

diff --git a/common/iam/token_exchange_iks.go b/common/iam/token_exchange_iks.go
@@ -61,6 +61,10 @@ func NewTokenExchangeIKSService(iksAuthConfig *IksAuthConfiguration, k8sClient *
 		secret_provider.ProviderType: secret_provider.VPC,
 	}
 	spObject, err := secret_provider.NewSecretProvider(k8sClient, providerType)
+	if err != nil {
+		return nil, err
+	}
+
 	return &tokenExchangeIKSService{
 		iksAuthConfig: iksAuthConfig,
 		httpClient:    httpClient,

diff --git a/common/vpcclient/client/client.go b/common/vpcclient/client/client.go
@@ -32,7 +32,8 @@ type handler interface {
 }
 
 // SessionClient provides an interface for a REST API client
-// go:generate counterfeiter -o fakes/client.go --fake-name SessionClient . SessionClient
+//
+//go:generate counterfeiter -o fakes/client.go --fake-name SessionClient . SessionClient
 type SessionClient interface {
 	NewRequest(operation *Operation) *Request
 	WithDebug(writer io.Writer) SessionClient

diff --git a/go.mod b/go.mod
@@ -1,90 +1,86 @@
 module github.com/IBM/ibmcloud-volume-vpc
 
-go 1.20
+go 1.22.0
 
 require (
 	github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7
-	github.com/IBM/ibm-csi-common v1.1.13
-	github.com/IBM/ibmcloud-volume-interface v1.2.5
-	github.com/IBM/secret-common-lib v1.1.8
-	github.com/IBM/secret-utils-lib v1.1.8
+	github.com/IBM/ibm-csi-common v1.1.15
+	github.com/IBM/ibmcloud-volume-interface v1.2.6
+	github.com/IBM/secret-common-lib v1.1.11
+	github.com/IBM/secret-utils-lib v1.1.11
 	github.com/fatih/structs v1.1.0
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/golang-jwt/jwt/v4 v4.5.0
-	github.com/stretchr/testify v1.8.2
-	go.uber.org/zap v1.20.0
-	golang.org/x/net v0.19.0
+	github.com/stretchr/testify v1.9.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/net v0.26.0
 )
 
 require (
 	github.com/BurntSushi/toml v1.0.0 // indirect
-	github.com/IBM/go-sdk-core/v5 v5.9.1 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
+	github.com/IBM/go-sdk-core/v5 v5.17.4 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-openapi/errors v0.19.8 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/errors v0.21.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/strfmt v0.21.1 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-playground/validator/v10 v10.11.1 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/go-openapi/strfmt v0.22.1 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.19.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
-	go.mongodb.org/mongo-driver v1.7.5 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.19.1 // 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
+	go.mongodb.org/mongo-driver v1.14.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.16.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
-	google.golang.org/grpc v1.56.3 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.6 // indirect
-	k8s.io/apimachinery v0.28.6 // indirect
-	k8s.io/client-go v0.28.6 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
+	k8s.io/api v0.30.4 // indirect
+	k8s.io/apimachinery v0.30.4 // indirect
+	k8s.io/client-go v0.30.4 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )