Skip to content

Commit 14a77e4

Browse files
grant-hegrant-he
committed
Address various linter (staticcheck, modernize, etc.) comments.
1 parent f28f38b commit 14a77e4

File tree

9 files changed

+40
-48
lines changed

9 files changed

+40
-48
lines changed

‎pkg/controller/controller.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,31 +145,31 @@ func NewResizeController(
145145
return ctrl
146146
}
147147

148-
func (ctrl *resizeController) addPVC(obj interface{}) {
148+
func (ctrl *resizeController) addPVC(obj any) {
149149
objKey, err := util.GetObjectKey(obj)
150150
if err != nil {
151151
return
152152
}
153153
ctrl.claimQueue.Add(objKey)
154154
}
155155

156-
func (ctrl *resizeController) addPod(obj interface{}) {
156+
func (ctrl *resizeController) addPod(obj any) {
157157
pod := parsePod(obj)
158158
if pod == nil {
159159
return
160160
}
161161
ctrl.usedPVCs.addPod(pod)
162162
}
163163

164-
func (ctrl *resizeController) deletePod(obj interface{}) {
164+
func (ctrl *resizeController) deletePod(obj any) {
165165
pod := parsePod(obj)
166166
if pod == nil {
167167
return
168168
}
169169
ctrl.usedPVCs.removePod(pod)
170170
}
171171

172-
func (ctrl *resizeController) updatePod(oldObj, newObj interface{}) {
172+
func (ctrl *resizeController) updatePod(oldObj, newObj any) {
173173
pod := parsePod(newObj)
174174
if pod == nil {
175175
return
@@ -182,7 +182,7 @@ func (ctrl *resizeController) updatePod(oldObj, newObj interface{}) {
182182
}
183183
}
184184

185-
func (ctrl *resizeController) updatePVC(oldObj, newObj interface{}) {
185+
func (ctrl *resizeController) updatePVC(oldObj, newObj any) {
186186
oldPVC, ok := oldObj.(*v1.PersistentVolumeClaim)
187187
if !ok || oldPVC == nil {
188188
return
@@ -261,7 +261,7 @@ func (ctrl *resizeController) updatePVC(oldObj, newObj interface{}) {
261261
}
262262
}
263263

264-
func (ctrl *resizeController) deletePVC(obj interface{}) {
264+
func (ctrl *resizeController) deletePVC(obj any) {
265265
objKey, err := util.GetObjectKey(obj)
266266
if err != nil {
267267
return
@@ -291,7 +291,7 @@ func (ctrl *resizeController) Run(workers int, ctx context.Context) {
291291
go ctrl.slowSet.Run(stopCh)
292292
}
293293

294-
for i := 0; i < workers; i++ {
294+
for range workers {
295295
go wait.Until(ctrl.syncPVCs, 0, stopCh)
296296
}
297297

@@ -566,7 +566,7 @@ func (ctrl *resizeController) markPVCResizeInProgress(pvc *v1.PersistentVolumeCl
566566

567567
updatedPVC, err := util.PatchClaim(ctrl.kubeClient, pvc, newPVC, true /* addResourceVersionCheck */)
568568
if err != nil {
569-
return updatedPVC, fmt.Errorf("Mark PVC %q as resize as in progress failed: %v", klog.KObj(pvc), err)
569+
return updatedPVC, fmt.Errorf("mark PVC %q as resize as in progress failed: %v", klog.KObj(pvc), err)
570570
}
571571
err = ctrl.claims.Update(updatedPVC)
572572
if err != nil {
@@ -584,7 +584,7 @@ func (ctrl *resizeController) markPVCResizeFinished(
584584

585585
updatedPVC, err := util.PatchClaim(ctrl.kubeClient, pvc, newPVC, true /* addResourceVersionCheck */)
586586
if err != nil {
587-
return fmt.Errorf("Mark PVC %q as resize finished failed: %w", klog.KObj(pvc), err)
587+
return fmt.Errorf("mark PVC %q as resize finished failed: %w", klog.KObj(pvc), err)
588588
}
589589

590590
err = ctrl.claims.Update(updatedPVC)
@@ -636,7 +636,7 @@ func (ctrl *resizeController) updatePVCapacity(
636636
return updatedPV, nil
637637
}
638638

639-
func parsePod(obj interface{}) *v1.Pod {
639+
func parsePod(obj any) *v1.Pod {
640640
if obj == nil {
641641
return nil
642642
}

‎pkg/csi/mock_client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (c *MockClient) Expand(
9898
additionalInfoVal := additionalInfo.(connection.AdditionalInfo)
9999
migrated := additionalInfoVal.Migrated
100100
if migrated != "true" {
101-
err := fmt.Errorf("Expected value of migrated label: true, Actual value: %s", migrated)
101+
err := fmt.Errorf("migrated label expected value: true, actual value: %s", migrated)
102102
return requestBytes, c.supportsNodeResize, err
103103
}
104104
}

‎pkg/modifier/csi_modifier_test.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package modifier
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/kubernetes-csi/external-resizer/pkg/csi"
@@ -10,10 +9,6 @@ import (
109
"k8s.io/client-go/kubernetes/fake"
1110
)
1211

13-
var (
14-
controllerServiceNotSupportErr = errors.New("CSI driver does not support controller service")
15-
)
16-
1712
func TestNewModifier(t *testing.T) {
1813
for i, c := range []struct {
1914
SupportsControllerModify bool

‎pkg/modifycontroller/controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ func (ctrl *modifyController) initUncertainPVCs() error {
140140
return nil
141141
}
142142

143-
func (ctrl *modifyController) addPVC(obj interface{}) {
143+
func (ctrl *modifyController) addPVC(obj any) {
144144
objKey, err := util.GetObjectKey(obj)
145145
if err != nil {
146146
return
147147
}
148148
ctrl.claimQueue.Add(objKey)
149149
}
150150

151-
func (ctrl *modifyController) updatePVC(oldObj, newObj interface{}) {
151+
func (ctrl *modifyController) updatePVC(oldObj, newObj any) {
152152
oldPVC, ok := oldObj.(*v1.PersistentVolumeClaim)
153153
if !ok || oldPVC == nil {
154154
return
@@ -178,7 +178,7 @@ func (ctrl *modifyController) updatePVC(oldObj, newObj interface{}) {
178178
}
179179
}
180180

181-
func (ctrl *modifyController) deletePVC(obj interface{}) {
181+
func (ctrl *modifyController) deletePVC(obj any) {
182182
objKey, err := util.GetObjectKey(obj)
183183
if err != nil {
184184
return
@@ -220,7 +220,7 @@ func (ctrl *modifyController) Run(
220220
// Starts go-routine that deletes expired slowSet entries.
221221
go ctrl.slowSet.Run(stopCh)
222222

223-
for i := 0; i < workers; i++ {
223+
for range workers {
224224
go wait.Until(ctrl.sync, 0, stopCh)
225225
}
226226

@@ -265,7 +265,7 @@ func (ctrl *modifyController) syncPVC(key string) error {
265265

266266
pv, err := ctrl.pvLister.Get(pvc.Spec.VolumeName)
267267
if err != nil {
268-
return fmt.Errorf("Get PV %q of pvc %q in PVInformer cache failed: %v", pvc.Spec.VolumeName, klog.KObj(pvc), err)
268+
return fmt.Errorf("get pv %q of pvc %q in PVInformer cache failed: %v", pvc.Spec.VolumeName, klog.KObj(pvc), err)
269269
}
270270

271271
// Only trigger modify volume if the following conditions are met

‎pkg/modifycontroller/modify_status_test.go‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package modifycontroller
22

33
import (
44
"context"
5-
"reflect"
5+
"errors"
66
"testing"
77
"time"
88

@@ -37,7 +37,6 @@ var (
3737
targetVac = "target-vac"
3838
testDriverName = "mock"
3939
infeasibleErr = status.Errorf(codes.InvalidArgument, "Parameters in VolumeAttributesClass is invalid")
40-
finalErr = status.Errorf(codes.Internal, "Final error")
4140
pvcConditionInProgress = v1.PersistentVolumeClaimCondition{
4241
Type: v1.PersistentVolumeClaimVolumeModifyingVolume,
4342
Status: v1.ConditionTrue,
@@ -83,7 +82,7 @@ func TestMarkControllerModifyVolumeStatus(t *testing.T) {
8382
pvc: basePVC.Get(),
8483
expectedPVC: basePVC.WithModifyVolumeStatus(v1.PersistentVolumeClaimModifyVolumeInfeasible).Get(),
8584
expectedConditions: []v1.PersistentVolumeClaimCondition{pvcConditionInfeasible},
86-
expectedErr: infeasibleErr,
85+
expectedErr: nil,
8786
testFunc: func(pvc *v1.PersistentVolumeClaim, ctrl *modifyController) (*v1.PersistentVolumeClaim, error) {
8887
return ctrl.markControllerModifyVolumeStatus(pvc, v1.PersistentVolumeClaimModifyVolumeInfeasible, infeasibleErr)
8988
},
@@ -126,14 +125,14 @@ func TestMarkControllerModifyVolumeStatus(t *testing.T) {
126125
ctrlInstance, _ := controller.(*modifyController)
127126

128127
pvc, err = tc.testFunc(pvc, ctrlInstance)
129-
if err != nil && !reflect.DeepEqual(tc.expectedErr, err) {
130-
t.Errorf("Expected error to be %v but got %v", tc.expectedErr, err)
128+
if !errors.Is(err, tc.expectedErr) {
129+
t.Errorf("expected error: %v, got: %v", tc.expectedErr, err)
131130
}
132131

133132
realStatus := pvc.Status.ModifyVolumeStatus.Status
134133
expectedStatus := tc.expectedPVC.Status.ModifyVolumeStatus.Status
135-
if !reflect.DeepEqual(realStatus, expectedStatus) {
136-
t.Errorf("expected modify volume status %+v got %+v", expectedStatus, realStatus)
134+
if diff := cmp.Diff(expectedStatus, realStatus); diff != "" {
135+
t.Errorf("unexpected modify volume status (-want +got):\n%s", diff)
137136
}
138137

139138
realConditions := pvc.Status.Conditions
@@ -167,8 +166,6 @@ func TestUpdateConditionBasedOnError(t *testing.T) {
167166
client := csi.NewMockClient("foo", true, true, true, true, true, false)
168167
driverName, _ := client.GetDriverName(context.TODO())
169168

170-
pvc := test.pvc
171-
172169
var initialObjects []runtime.Object
173170
initialObjects = append(initialObjects, test.pvc)
174171

@@ -185,9 +182,9 @@ func TestUpdateConditionBasedOnError(t *testing.T) {
185182

186183
ctrlInstance, _ := controller.(*modifyController)
187184

188-
pvc, err = ctrlInstance.updateConditionBasedOnError(tc.pvc, err)
189-
if err != nil && !reflect.DeepEqual(tc.expectedErr, err) {
190-
t.Errorf("Expected error to be %v but got %v", tc.expectedErr, err)
185+
pvc, err := ctrlInstance.updateConditionBasedOnError(tc.pvc, err)
186+
if !errors.Is(err, tc.expectedErr) {
187+
t.Errorf("expected error: %v, got: %v", tc.expectedErr, err)
191188
}
192189

193190
if !testutil.CompareConditions(pvc.Status.Conditions, tc.expectedConditions) {
@@ -254,20 +251,20 @@ func TestMarkControllerModifyVolumeCompleted(t *testing.T) {
254251
ctrlInstance, _ := controller.(*modifyController)
255252

256253
actualPVC, pv, err := ctrlInstance.markControllerModifyVolumeCompleted(tc.pvc, tc.pv)
257-
if err != nil && !reflect.DeepEqual(tc.expectedErr, err) {
258-
t.Errorf("Expected error to be %v but got %v", tc.expectedErr, err)
254+
if !errors.Is(err, tc.expectedErr) {
255+
t.Errorf("expected error: %v, got: %v", tc.expectedErr, err)
259256
}
260257

261258
if len(actualPVC.Status.Conditions) == 0 {
262259
actualPVC.Status.Conditions = []v1.PersistentVolumeClaimCondition{}
263260
}
264261

265262
if diff := cmp.Diff(tc.expectedPVC, actualPVC); diff != "" {
266-
t.Errorf("expected pvc %+v got %+v, diff is: %v", tc.expectedPVC, actualPVC, diff)
263+
t.Errorf("unexpected pvc (-want +got):\n%s", diff)
267264
}
268265

269266
if diff := cmp.Diff(tc.expectedPV, pv); diff != "" {
270-
t.Errorf("expected pvc %+v got %+v, diff is: %v", tc.expectedPV, pv, diff)
267+
t.Errorf("unexpected pv (-want +got):\n%s", diff)
271268
}
272269
})
273270
}

‎pkg/resizer/csi_resizer.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
)
3838

3939
var (
40-
controllerServiceNotSupportErr = errors.New("CSI driver does not support controller service")
41-
resizeNotSupportErr = errors.New("CSI driver neither supports controller resize nor node resize")
40+
errControllerServiceNotSupport = errors.New("CSI driver does not support controller service")
41+
errResizeNotSupport = errors.New("CSI driver neither supports controller resize nor node resize")
4242
)
4343

4444
func NewResizerFromClient(
@@ -53,7 +53,7 @@ func NewResizerFromClient(
5353
}
5454

5555
if !supportControllerService {
56-
return nil, controllerServiceNotSupportErr
56+
return nil, errControllerServiceNotSupport
5757
}
5858

5959
supportControllerResize, err := supportsControllerResize(csiClient, timeout)
@@ -70,7 +70,7 @@ func NewResizerFromClient(
7070
klog.InfoS("The CSI driver supports node resize only, using trivial resizer to handle resize requests")
7171
return newTrivialResizer(driverName), nil
7272
}
73-
return nil, resizeNotSupportErr
73+
return nil, errResizeNotSupport
7474
}
7575

7676
_, err = supportsControllerSingleNodeMultiWriter(csiClient, timeout)

‎pkg/resizer/csi_resizer_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestNewResizer(t *testing.T) {
4242
SupportsPluginControllerService: false,
4343
SupportsControllerSingleNodeMultiWriter: true,
4444

45-
Error: controllerServiceNotSupportErr,
45+
Error: errControllerServiceNotSupport,
4646
},
4747
// Controller modify not supported.
4848
{
@@ -69,7 +69,7 @@ func TestNewResizer(t *testing.T) {
6969
SupportsPluginControllerService: true,
7070
SupportsControllerSingleNodeMultiWriter: true,
7171

72-
Error: resizeNotSupportErr,
72+
Error: errResizeNotSupport,
7373
},
7474
} {
7575
client := csi.NewMockClient("mock", c.SupportsNodeResize, c.SupportsControllerResize, false, c.SupportsPluginControllerService, c.SupportsControllerSingleNodeMultiWriter, false)

‎pkg/util/util.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func GetPVCPatchData(oldPVC, newPVC *v1.PersistentVolumeClaim, addResourceVersio
139139
}
140140

141141
func addResourceVersion(patchBytes []byte, resourceVersion string) ([]byte, error) {
142-
var patchMap map[string]interface{}
142+
var patchMap map[string]any
143143
err := json.Unmarshal(patchBytes, &patchMap)
144144
if err != nil {
145145
return nil, fmt.Errorf("error unmarshalling patch with %v", err)
@@ -157,7 +157,7 @@ func addResourceVersion(patchBytes []byte, resourceVersion string) ([]byte, erro
157157
return versionBytes, nil
158158
}
159159

160-
func GetPatchData(oldObj, newObj interface{}) ([]byte, error) {
160+
func GetPatchData(oldObj, newObj any) ([]byte, error) {
161161
oldData, err := json.Marshal(oldObj)
162162
if err != nil {
163163
return nil, fmt.Errorf("marshal old object failed: %v", err)
@@ -195,7 +195,7 @@ func SanitizeName(name string) string {
195195
return name
196196
}
197197

198-
func GetObjectKey(obj interface{}) (string, error) {
198+
func GetObjectKey(obj any) (string, error) {
199199
if unknown, ok := obj.(cache.DeletedFinalStateUnknown); ok && unknown.Obj != nil {
200200
obj = unknown.Obj
201201
}

‎pkg/util/util_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ func TestGetPVCPatchData(t *testing.T) {
6060
t.Errorf("Case %d: Get patch data failed: %v", i, err)
6161
}
6262

63-
var patchMap map[string]interface{}
63+
var patchMap map[string]any
6464
err = json.Unmarshal(patchBytes, &patchMap)
6565
if err != nil {
6666
t.Errorf("Case %d: unmarshalling json patch failed: %v", i, err)
6767
}
6868

69-
metadata, exist := patchMap["metadata"].(map[string]interface{})
69+
metadata, exist := patchMap["metadata"].(map[string]any)
7070
if !exist {
7171
t.Errorf("Case %d: ResourceVersion should exist in patch data", i)
7272
}

0 commit comments

Comments
 (0)