From e1e876f2ab7ba8c17fc7b70718453929129ec64b Mon Sep 17 00:00:00 2001 From: Luna Xu <10015938+xuluna@users.noreply.github.com> Date: Mon, 4 Mar 2024 09:43:43 -0600 Subject: [PATCH] Update goscaleio version (#164) * update version * fix linting * fix linting * fix lint * add back copyright * add back copyright * add back copyright --- .github/workflows/linters.yaml | 6 ++-- cmd/metrics-powerflex/main.go | 4 +-- go.mod | 2 +- go.sum | 4 +-- internal/k8s/k8sapi_test.go | 34 +++++++++---------- internal/k8s/leader_elector.go | 2 +- internal/k8s/leader_elector_test.go | 6 ++-- internal/k8s/mocks/kubernetes_api_mocks.go | 16 --------- .../k8s/mocks/leader_elector_getter_mocks.go | 16 --------- internal/k8s/mocks/node_getter_mocks.go | 16 --------- .../k8s/mocks/storage_class_getter_mocks.go | 16 --------- internal/k8s/mocks/volume_getter_mocks.go | 16 --------- internal/k8s/node_finder_test.go | 6 ++-- internal/k8s/sdc_finder_test.go | 6 ++-- internal/k8s/storageclass_finder_test.go | 6 ++-- internal/k8s/volume_finder_test.go | 6 ++-- internal/service/configuration_reader_test.go | 6 ++-- internal/service/service_test.go | 18 +++++----- 18 files changed, 53 insertions(+), 133 deletions(-) diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml index ed5ac05..3380366 100644 --- a/.github/workflows/linters.yaml +++ b/.github/workflows/linters.yaml @@ -14,7 +14,7 @@ jobs: name: golangci-lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: go-version: "1.22" cache: false @@ -24,7 +24,7 @@ jobs: run: | go mod vendor - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: - version: v1.53 + version: latest skip-cache: true diff --git a/cmd/metrics-powerflex/main.go b/cmd/metrics-powerflex/main.go index 8f4be89..8c4117d 100644 --- a/cmd/metrics-powerflex/main.go +++ b/cmd/metrics-powerflex/main.go @@ -133,7 +133,7 @@ func main() { updateService(pflexSvc, logger) viper.WatchConfig() - viper.OnConfigChange(func(e fsnotify.Event) { + viper.OnConfigChange(func(_ fsnotify.Event) { updateLoggingSettings(logger) updateCollectorAddress(config, exporter, logger) updateProvisionerNames(sdcFinder, storageClassFinder, volumeFinder, logger) @@ -143,7 +143,7 @@ func main() { }) configFileListener.WatchConfig() - configFileListener.OnConfigChange(func(e fsnotify.Event) { + configFileListener.OnConfigChange(func(_ fsnotify.Event) { updatePowerFlexConnection(config, sdcFinder, storageClassFinder, volumeFinder, logger) }) diff --git a/go.mod b/go.mod index b328918..5307bbc 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/dell/karavi-metrics-powerflex go 1.22 require ( - github.com/dell/goscaleio v1.13.0 + github.com/dell/goscaleio v1.14.0 github.com/fsnotify/fsnotify v1.6.0 github.com/golang/mock v1.6.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 0e123c8..748e046 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 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/goscaleio v1.13.0 h1:L9hXj+teAE/nLZyN02OMHYSJkAkVAlngy7QYEB5aOT4= -github.com/dell/goscaleio v1.13.0/go.mod h1:dt4Xy5Pnx8MEBza+ODOKiwNFBipcnzEXWgTnFy0+jTw= +github.com/dell/goscaleio v1.14.0 h1:oMfxKQRKLntaDJxWEz/si2CzqVbYOv1fFQ39bTb/VpQ= +github.com/dell/goscaleio v1.14.0/go.mod h1:h7SCmReARG/szFWBMQGETGkZObknhS45lQipQbtdmJ8= 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/k8s/k8sapi_test.go b/internal/k8s/k8sapi_test.go index e8a9a67..19ac9a8 100644 --- a/internal/k8s/k8sapi_test.go +++ b/internal/k8s/k8sapi_test.go @@ -39,19 +39,19 @@ func Test_GetCSINodes(t *testing.T) { type configFn func() (*rest.Config, error) check := func(fns ...checkFn) []checkFn { return fns } - hasNoError := func(t *testing.T, nodes *v1.CSINodeList, err error) { + hasNoError := func(t *testing.T, _ *v1.CSINodeList, err error) { if err != nil { t.Fatalf("expected no error") } } checkExpectedOutput := func(expectedOutput *v1.CSINodeList) func(t *testing.T, nodes *v1.CSINodeList, err error) { - return func(t *testing.T, nodes *v1.CSINodeList, err error) { + return func(t *testing.T, nodes *v1.CSINodeList, _ error) { assert.Equal(t, expectedOutput, nodes) } } - hasError := func(t *testing.T, nodes *v1.CSINodeList, err error) { + hasError := func(t *testing.T, _ *v1.CSINodeList, err error) { if err == nil { t.Fatalf("expected error") } @@ -84,7 +84,7 @@ func Test_GetCSINodes(t *testing.T) { return connect, nil, check(hasNoError, checkExpectedOutput(nodes)) }, "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) @@ -125,19 +125,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") } @@ -161,7 +161,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) @@ -201,19 +201,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") } @@ -242,7 +242,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) @@ -282,19 +282,19 @@ func Test_GetNodes(t *testing.T) { type configFn func() (*rest.Config, error) check := func(fns ...checkFn) []checkFn { return fns } - hasNoError := func(t *testing.T, nodes *corev1.NodeList, err error) { + hasNoError := func(t *testing.T, _ *corev1.NodeList, err error) { if err != nil { t.Fatalf("expected no error") } } checkExpectedOutput := func(expectedOutput *corev1.NodeList) func(t *testing.T, nodes *corev1.NodeList, err error) { - return func(t *testing.T, nodes *corev1.NodeList, err error) { + return func(t *testing.T, nodes *corev1.NodeList, _ error) { assert.Equal(t, expectedOutput, nodes) } } - hasError := func(t *testing.T, nodes *corev1.NodeList, err error) { + hasError := func(t *testing.T, _ *corev1.NodeList, err error) { if err == nil { t.Fatalf("expected error") } @@ -319,7 +319,7 @@ func Test_GetNodes(t *testing.T) { return connect, nil, check(hasNoError, checkExpectedOutput(nodes)) }, "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) @@ -372,7 +372,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 index 7cb0a8f..e31b130 100644 --- 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 index 23d7000..e619328 100644 --- 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/mocks/kubernetes_api_mocks.go b/internal/k8s/mocks/kubernetes_api_mocks.go index c304ad8..ceed696 100644 --- a/internal/k8s/mocks/kubernetes_api_mocks.go +++ b/internal/k8s/mocks/kubernetes_api_mocks.go @@ -1,19 +1,3 @@ -/* - Copyright (c) 2020-2022 Dell Inc. or its subsidiaries. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Code generated by MockGen. DO NOT EDIT. // Source: github.com/dell/karavi-metrics-powerflex/internal/k8s (interfaces: KubernetesAPI) diff --git a/internal/k8s/mocks/leader_elector_getter_mocks.go b/internal/k8s/mocks/leader_elector_getter_mocks.go index c40bb4c..dbfa5f0 100644 --- a/internal/k8s/mocks/leader_elector_getter_mocks.go +++ b/internal/k8s/mocks/leader_elector_getter_mocks.go @@ -1,19 +1,3 @@ -/* - Copyright (c) 2020-2022 Dell Inc. or its subsidiaries. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Code generated by MockGen. DO NOT EDIT. // Source: github.com/dell/karavi-metrics-powerflex/internal/k8s (interfaces: LeaderElectorGetter) diff --git a/internal/k8s/mocks/node_getter_mocks.go b/internal/k8s/mocks/node_getter_mocks.go index 8402863..20849ec 100644 --- a/internal/k8s/mocks/node_getter_mocks.go +++ b/internal/k8s/mocks/node_getter_mocks.go @@ -1,19 +1,3 @@ -/* - Copyright (c) 2020-2022 Dell Inc. or its subsidiaries. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Code generated by MockGen. DO NOT EDIT. // Source: github.com/dell/karavi-metrics-powerflex/internal/k8s (interfaces: NodeGetter) diff --git a/internal/k8s/mocks/storage_class_getter_mocks.go b/internal/k8s/mocks/storage_class_getter_mocks.go index 2d7eebb..3686501 100644 --- a/internal/k8s/mocks/storage_class_getter_mocks.go +++ b/internal/k8s/mocks/storage_class_getter_mocks.go @@ -1,19 +1,3 @@ -/* - Copyright (c) 2020-2022 Dell Inc. or its subsidiaries. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Code generated by MockGen. DO NOT EDIT. // Source: github.com/dell/karavi-metrics-powerflex/internal/k8s (interfaces: StorageClassGetter) diff --git a/internal/k8s/mocks/volume_getter_mocks.go b/internal/k8s/mocks/volume_getter_mocks.go index cc02fd7..c2202c3 100644 --- a/internal/k8s/mocks/volume_getter_mocks.go +++ b/internal/k8s/mocks/volume_getter_mocks.go @@ -1,19 +1,3 @@ -/* - Copyright (c) 2020-2022 Dell Inc. or its subsidiaries. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Code generated by MockGen. DO NOT EDIT. // Source: github.com/dell/karavi-metrics-powerflex/internal/k8s (interfaces: VolumeGetter) diff --git a/internal/k8s/node_finder_test.go b/internal/k8s/node_finder_test.go index 23de2f2..1a4a4a9 100644 --- a/internal/k8s/node_finder_test.go +++ b/internal/k8s/node_finder_test.go @@ -33,19 +33,19 @@ func Test_K8sNodeFinder(t *testing.T) { type checkFn func(*testing.T, []corev1.Node, error) check := func(fns ...checkFn) []checkFn { return fns } - hasNoError := func(t *testing.T, nodes []corev1.Node, err error) { + hasNoError := func(t *testing.T, _ []corev1.Node, err error) { if err != nil { t.Fatalf("expected no error") } } checkExpectedOutput := func(expectedOutput []corev1.Node) func(t *testing.T, nodes []corev1.Node, err error) { - return func(t *testing.T, nodes []corev1.Node, err error) { + return func(t *testing.T, nodes []corev1.Node, _ error) { assert.Equal(t, expectedOutput, nodes) } } - hasError := func(t *testing.T, nodes []corev1.Node, err error) { + hasError := func(t *testing.T, _ []corev1.Node, err error) { if err == nil { t.Fatalf("expected error") } diff --git a/internal/k8s/sdc_finder_test.go b/internal/k8s/sdc_finder_test.go index b256cd1..cedb70e 100644 --- a/internal/k8s/sdc_finder_test.go +++ b/internal/k8s/sdc_finder_test.go @@ -33,19 +33,19 @@ func Test_K8sSDCFinder(t *testing.T) { type checkFn func(*testing.T, []string, error) check := func(fns ...checkFn) []checkFn { return fns } - hasNoError := func(t *testing.T, sdcGuids []string, err error) { + hasNoError := func(t *testing.T, _ []string, err error) { if err != nil { t.Fatalf("expected no error") } } checkExpectedOutput := func(expectedOutput []string) func(t *testing.T, sdcGuids []string, err error) { - return func(t *testing.T, sdcGuids []string, err error) { + return func(t *testing.T, sdcGuids []string, _ error) { assert.Equal(t, expectedOutput, sdcGuids) } } - hasError := func(t *testing.T, sdcGuids []string, err error) { + hasError := func(t *testing.T, _ []string, err error) { if err == nil { t.Fatalf("expected error") } diff --git a/internal/k8s/storageclass_finder_test.go b/internal/k8s/storageclass_finder_test.go index bfc6edc..315bbf5 100644 --- a/internal/k8s/storageclass_finder_test.go +++ b/internal/k8s/storageclass_finder_test.go @@ -33,19 +33,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 index 8c77fe0..0946a42 100644 --- 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") } diff --git a/internal/service/configuration_reader_test.go b/internal/service/configuration_reader_test.go index d42017a..11eedc1 100644 --- a/internal/service/configuration_reader_test.go +++ b/internal/service/configuration_reader_test.go @@ -27,19 +27,19 @@ func Test_ConfigurationReader(t *testing.T) { type checkFn func(*testing.T, []service.ArrayConnectionData, error) check := func(fns ...checkFn) []checkFn { return fns } - hasNoError := func(t *testing.T, result []service.ArrayConnectionData, err error) { + hasNoError := func(t *testing.T, _ []service.ArrayConnectionData, err error) { if err != nil { t.Fatalf("expected no error") } } checkExpectedOutput := func(expectedOutput []service.ArrayConnectionData) func(t *testing.T, result []service.ArrayConnectionData, err error) { - return func(t *testing.T, result []service.ArrayConnectionData, err error) { + return func(t *testing.T, result []service.ArrayConnectionData, _ error) { assert.Equal(t, expectedOutput, result) } } - hasError := func(t *testing.T, result []service.ArrayConnectionData, err error) { + hasError := func(t *testing.T, _ []service.ArrayConnectionData, err error) { if err == nil { t.Fatalf("expected error") } diff --git a/internal/service/service_test.go b/internal/service/service_test.go index 4382332..608b406 100644 --- a/internal/service/service_test.go +++ b/internal/service/service_test.go @@ -320,19 +320,19 @@ func Test_GetSDCs(t *testing.T) { type checkFn func(*testing.T, []service.StatisticsGetter, error) check := func(fns ...checkFn) []checkFn { return fns } - hasNoError := func(t *testing.T, sdcs []service.StatisticsGetter, err error) { + hasNoError := func(t *testing.T, _ []service.StatisticsGetter, err error) { if err != nil { t.Fatalf("expected no error") } } checkSdcLength := func(length int) func(t *testing.T, sdcs []service.StatisticsGetter, err error) { - return func(t *testing.T, sdcs []service.StatisticsGetter, err error) { + return func(t *testing.T, sdcs []service.StatisticsGetter, _ error) { assert.Equal(t, length, len(sdcs)) } } - hasError := func(t *testing.T, sdc []service.StatisticsGetter, err error) { + hasError := func(t *testing.T, _ []service.StatisticsGetter, err error) { if err == nil { t.Fatalf("expected error") } @@ -479,14 +479,14 @@ func Test_GetStorageClasses(t *testing.T) { type checkFn func(*testing.T, []service.StorageClassMeta, error) check := func(fns ...checkFn) []checkFn { return fns } - hasNoError := func(t *testing.T, classes []service.StorageClassMeta, err error) { + hasNoError := func(t *testing.T, _ []service.StorageClassMeta, err error) { if err != nil { t.Fatalf("expected no error, got %v", err) } } checkPoolLength := func(class string, length int) func(t *testing.T, classes []service.StorageClassMeta, err error) { - return func(t *testing.T, classes []service.StorageClassMeta, err error) { + return func(t *testing.T, classes []service.StorageClassMeta, _ error) { if class == "" { assert.Equal(t, 0, len(classes)) return @@ -500,7 +500,7 @@ func Test_GetStorageClasses(t *testing.T) { } } - hasError := func(t *testing.T, classes []service.StorageClassMeta, err error) { + hasError := func(t *testing.T, _ []service.StorageClassMeta, err error) { if err == nil { t.Fatalf("expected error") } @@ -914,18 +914,18 @@ func Test_GetVolumes(t *testing.T) { type checkFn func(*testing.T, []service.VolumeStatisticsGetter, error) check := func(fns ...checkFn) []checkFn { return fns } - hasError := func(t *testing.T, vols []service.VolumeStatisticsGetter, err error) { + hasError := func(t *testing.T, _ []service.VolumeStatisticsGetter, err error) { if err == nil { t.Fatalf("expected error") } } - hasNoError := func(t *testing.T, vols []service.VolumeStatisticsGetter, err error) { + hasNoError := func(t *testing.T, _ []service.VolumeStatisticsGetter, err error) { if err != nil { t.Fatalf("did not expected error but got %v", err) } } checkVolumeLength := func(length int) func(t *testing.T, vols []service.VolumeStatisticsGetter, err error) { - return func(t *testing.T, vols []service.VolumeStatisticsGetter, err error) { + return func(t *testing.T, vols []service.VolumeStatisticsGetter, _ error) { assert.Equal(t, length, len(vols)) } }