Upgrade go library version and lint fixes (#37)

* Upgrade go library version and =lint fixes * upgarde linter version
dell · Mar 1, 2024 · 5f76b9d · 5f76b9d
1 parent c723a2f
commit 5f76b9d
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 29 deletions.
diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -26,5 +26,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.53
+          version: latest
           skip-cache: true
diff --git a/cmd/metrics-powermax/main.go b/cmd/metrics-powermax/main.go
@@ -139,7 +139,7 @@ func main() {
 	updateMaxConnections(powerMaxSvc)
 
 	viper.WatchConfig()
-	viper.OnConfigChange(func(e fsnotify.Event) {
+	viper.OnConfigChange(func(_ fsnotify.Event) {
 		updateLoggingSettings(logger)
 		updateCollectorAddress(config, exporter)
 		updatePowerMaxConnection(ctx, powerMaxSvc, storageClassFinder, volumeFinder)
@@ -149,7 +149,7 @@ func main() {
 	})
 
 	configFileListener.WatchConfig()
-	configFileListener.OnConfigChange(func(e fsnotify.Event) {
+	configFileListener.OnConfigChange(func(_ fsnotify.Event) {
 		updatePowerMaxConnection(ctx, powerMaxSvc, storageClassFinder, volumeFinder)
 	})
 

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/dell/csm-metrics-powermax
 go 1.22
 
 require (
-	github.com/dell/gopowermax/v2 v2.5.1
+	github.com/dell/gopowermax/v2 v2.6.0
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/golang/mock v1.6.0
 	github.com/gorilla/mux v1.8.0

diff --git a/go.sum b/go.sum
@@ -84,8 +84,8 @@ github.com/cucumber/messages-go/v16 v16.0.1/go.mod h1:EJcyR5Mm5ZuDsKJnT2N9KRnBK3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dell/gopowermax/v2 v2.5.1 h1:TCDDq5rCoIJtcKwdN9bD33YVce+WwY/RUuAUfGXueP8=
-github.com/dell/gopowermax/v2 v2.5.1/go.mod h1:IvFKMvXw35EiuBKig9v4eDf2tYX5up/0LqDBLzvwGZ4=
+github.com/dell/gopowermax/v2 v2.6.0 h1:MyenUGEt1EkGoBRwC1nYAC43yBd9LsowIIqiHOMqq5o=
+github.com/dell/gopowermax/v2 v2.6.0/go.mod h1:Z/DqRsmKztpvgkWnMzm/aHBvdbnoTfpzYhpsSQnLX7k=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=

diff --git a/internal/common/common.go b/internal/common/common.go
@@ -118,7 +118,6 @@ func InitK8sUtils(logger *logrus.Logger, callback func(k8sutils.UtilsInterface,
 
 	var err error
 	k8sUtils, err = k8sutils.Init(powerMaxNamespace, defaultUnisphereCertDir, true, time.Second*30)
-
 	if err != nil {
 		logger.WithError(err).Errorf("cannot initialize k8sUtils")
 	}
@@ -167,7 +166,6 @@ func GetPowerMaxArrays(ctx context.Context, k8sUtils k8sutils.UtilsInterface, fi
 			}
 
 			err = Authenticate(ctx, c, array)
-
 			if err != nil {
 				logger.WithError(err).Errorf("authentication failed to PowerMax array %s, %s", arrayID, array.Endpoint)
 				continue

diff --git a/internal/common/common_test.go b/internal/common/common_test.go
@@ -161,7 +161,7 @@ func getHandler(router http.Handler) http.Handler {
 // getRouter return a valid REST response
 func getRouter() http.Handler {
 	router := mux.NewRouter()
-	router.HandleFunc("/univmax/restapi/version", func(w http.ResponseWriter, r *http.Request) {
+	router.HandleFunc("/univmax/restapi/version", func(w http.ResponseWriter, _ *http.Request) {
 		w.Write([]byte("{\"version\": \"T10.0.0.1311\"}"))
 	})
 	return router
@@ -170,7 +170,7 @@ func getRouter() http.Handler {
 // getRouter return an invalid REST response
 func getUnauthorizedRouter() http.Handler {
 	router := mux.NewRouter()
-	router.HandleFunc("/univmax/restapi/version", func(w http.ResponseWriter, r *http.Request) {
+	router.HandleFunc("/univmax/restapi/version", func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(401)
 		w.Write([]byte("<html><head><title>Error</title></head><body>Unauthorized</body></html>"))
 	})

diff --git a/internal/k8s/k8sapi_test.go b/internal/k8s/k8sapi_test.go
@@ -39,19 +39,19 @@ func Test_GetPersistentVolumes(t *testing.T) {
 	type configFn func() (*rest.Config, error)
 	check := func(fns ...checkFn) []checkFn { return fns }
 
-	hasNoError := func(t *testing.T, volumes *corev1.PersistentVolumeList, err error) {
+	hasNoError := func(t *testing.T, _ *corev1.PersistentVolumeList, err error) {
 		if err != nil {
 			t.Fatalf("expected no error")
 		}
 	}
 
 	checkExpectedOutput := func(expectedOutput *corev1.PersistentVolumeList) func(t *testing.T, volumes *corev1.PersistentVolumeList, err error) {
-		return func(t *testing.T, volumes *corev1.PersistentVolumeList, err error) {
+		return func(t *testing.T, volumes *corev1.PersistentVolumeList, _ error) {
 			assert.Equal(t, expectedOutput, volumes)
 		}
 	}
 
-	hasError := func(t *testing.T, volumes *corev1.PersistentVolumeList, err error) {
+	hasError := func(t *testing.T, _ *corev1.PersistentVolumeList, err error) {
 		if err == nil {
 			t.Fatalf("expected error")
 		}
@@ -75,7 +75,7 @@ func Test_GetPersistentVolumes(t *testing.T) {
 			return connect, nil, check(hasNoError, checkExpectedOutput(volumes))
 		},
 		"error connecting": func(*testing.T) (connectFn, configFn, []checkFn) {
-			connect := func(api *k8s.API) error {
+			connect := func(_ *k8s.API) error {
 				return errors.New("error")
 			}
 			return connect, nil, check(hasError)
@@ -115,19 +115,19 @@ func Test_GetStorageClasses(t *testing.T) {
 	type configFn func() (*rest.Config, error)
 	check := func(fns ...checkFn) []checkFn { return fns }
 
-	hasNoError := func(t *testing.T, volumes *v1.StorageClassList, err error) {
+	hasNoError := func(t *testing.T, _ *v1.StorageClassList, err error) {
 		if err != nil {
 			t.Fatalf("expected no error")
 		}
 	}
 
 	checkExpectedOutput := func(expectedOutput *v1.StorageClassList) func(t *testing.T, volumes *v1.StorageClassList, err error) {
-		return func(t *testing.T, volumes *v1.StorageClassList, err error) {
+		return func(t *testing.T, volumes *v1.StorageClassList, _ error) {
 			assert.Equal(t, expectedOutput, volumes)
 		}
 	}
 
-	hasError := func(t *testing.T, volumes *v1.StorageClassList, err error) {
+	hasError := func(t *testing.T, _ *v1.StorageClassList, err error) {
 		if err == nil {
 			t.Fatalf("expected error")
 		}
@@ -159,7 +159,7 @@ func Test_GetStorageClasses(t *testing.T) {
 			return connect, nil, check(hasNoError, checkExpectedOutput(storageClasses))
 		},
 		"error connecting": func(*testing.T) (connectFn, configFn, []checkFn) {
-			connect := func(api *k8s.API) error {
+			connect := func(_ *k8s.API) error {
 				return errors.New("error")
 			}
 			return connect, nil, check(hasError)
@@ -212,7 +212,7 @@ func Test_NewForConfigError(t *testing.T) {
 	oldNewConfigFn := k8s.NewConfigFn
 	defer func() { k8s.NewConfigFn = oldNewConfigFn }()
 	expected := "could not create Clientset from KubeConfig"
-	k8s.NewConfigFn = func(config *rest.Config) (*kubernetes.Clientset, error) {
+	k8s.NewConfigFn = func(_ *rest.Config) (*kubernetes.Clientset, error) {
 		return nil, fmt.Errorf(expected)
 	}
 

diff --git a/internal/k8s/leader_elector.go b/internal/k8s/leader_elector.go
@@ -63,7 +63,7 @@ func (elect *LeaderElector) InitLeaderElection(endpoint string, namespace string
 		Callbacks: leaderelection.LeaderCallbacks{
 			OnStartedLeading: func(context.Context) {},
 			OnStoppedLeading: func() {},
-			OnNewLeader:      func(identity string) {},
+			OnNewLeader:      func(_ string) {},
 		},
 		Lock: &resourcelock.EndpointsLock{
 			EndpointsMeta: metav1.ObjectMeta{

diff --git a/internal/k8s/leader_elector_test.go b/internal/k8s/leader_elector_test.go
@@ -53,7 +53,7 @@ func Test_InitLeaderElection(t *testing.T) {
 				return nil, nil
 			}
 
-			clientset := func(config *rest.Config) (*kubernetes.Clientset, error) {
+			clientset := func(_ *rest.Config) (*kubernetes.Clientset, error) {
 				return nil, errors.New("error")
 			}
 
@@ -64,11 +64,11 @@ func Test_InitLeaderElection(t *testing.T) {
 				return nil, nil
 			}
 
-			clientset := func(config *rest.Config) (*kubernetes.Clientset, error) {
+			clientset := func(_ *rest.Config) (*kubernetes.Clientset, error) {
 				mockClientset := &kubernetes.Clientset{}
 				return mockClientset, nil
 			}
-			leaderelection := func(lec leaderelection.LeaderElectionConfig) (*leaderelection.LeaderElector, error) {
+			leaderelection := func(_ leaderelection.LeaderElectionConfig) (*leaderelection.LeaderElector, error) {
 				return nil, errors.New("error")
 			}
 			return configFn, clientset, leaderelection, check(hasError)

diff --git a/internal/k8s/storageclass_finder_test.go b/internal/k8s/storageclass_finder_test.go
@@ -35,19 +35,19 @@ func Test_K8sStorageClassFinder(t *testing.T) {
 	type checkFn func(*testing.T, []v1.StorageClass, error)
 	check := func(fns ...checkFn) []checkFn { return fns }
 
-	hasNoError := func(t *testing.T, storageClasses []v1.StorageClass, err error) {
+	hasNoError := func(t *testing.T, _ []v1.StorageClass, err error) {
 		if err != nil {
 			t.Fatalf("expected no error")
 		}
 	}
 
 	checkExpectedOutput := func(expectedOutput []v1.StorageClass) func(t *testing.T, storageClasses []v1.StorageClass, err error) {
-		return func(t *testing.T, storageClasses []v1.StorageClass, err error) {
+		return func(t *testing.T, storageClasses []v1.StorageClass, _ error) {
 			assert.Equal(t, expectedOutput, storageClasses)
 		}
 	}
 
-	hasError := func(t *testing.T, volumes []v1.StorageClass, err error) {
+	hasError := func(t *testing.T, _ []v1.StorageClass, err error) {
 		if err == nil {
 			t.Fatalf("expected error")
 		}

diff --git a/internal/k8s/volume_finder_test.go b/internal/k8s/volume_finder_test.go
@@ -38,19 +38,19 @@ func Test_K8sPersistentVolumeFinder(t *testing.T) {
 	type checkFn func(*testing.T, []k8s.VolumeInfo, error)
 	check := func(fns ...checkFn) []checkFn { return fns }
 
-	hasNoError := func(t *testing.T, volumes []k8s.VolumeInfo, err error) {
+	hasNoError := func(t *testing.T, _ []k8s.VolumeInfo, err error) {
 		if err != nil {
 			t.Fatalf("expected no error")
 		}
 	}
 
 	checkExpectedOutput := func(expectedOutput []k8s.VolumeInfo) func(t *testing.T, volumes []k8s.VolumeInfo, err error) {
-		return func(t *testing.T, volumes []k8s.VolumeInfo, err error) {
+		return func(t *testing.T, volumes []k8s.VolumeInfo, _ error) {
 			assert.Equal(t, expectedOutput, volumes)
 		}
 	}
 
-	hasError := func(t *testing.T, volumes []k8s.VolumeInfo, err error) {
+	hasError := func(t *testing.T, _ []k8s.VolumeInfo, err error) {
 		if err == nil {
 			t.Fatalf("expected error")
 		}