Skip to content

Commit b8f50fc

Browse files
committed
fix internal linter
1 parent 8a4093b commit b8f50fc

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

controllers/ibmobjectcsi_controller_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package controllers
22

33
import (
44
"errors"
5-
"fmt"
65
"testing"
76

87
"github.com/IBM/ibm-object-csi-driver-operator/api/v1alpha1"
@@ -344,7 +343,7 @@ var (
344343

345344
rCloneSC = &storagev1.StorageClass{
346345
ObjectMeta: metav1.ObjectMeta{
347-
Name: fmt.Sprintf("%s", config.RcloneStorageClass),
346+
Name: config.RcloneStorageClass.String(),
348347
},
349348
Provisioner: config.DriverName,
350349
ReclaimPolicy: &reclaimPolicyDelete,
@@ -371,7 +370,7 @@ var (
371370

372371
rCloneRetainSC = &storagev1.StorageClass{
373372
ObjectMeta: metav1.ObjectMeta{
374-
Name: fmt.Sprintf("%s", config.RcloneRetainStorageClass),
373+
Name: config.RcloneRetainStorageClass.String(),
375374
},
376375
Provisioner: config.DriverName,
377376
ReclaimPolicy: &reclaimPolicyRetain,
@@ -398,7 +397,7 @@ var (
398397

399398
s3fsSC = &storagev1.StorageClass{
400399
ObjectMeta: metav1.ObjectMeta{
401-
Name: fmt.Sprintf("%s", config.S3fsStorageClass),
400+
Name: config.S3fsStorageClass.String(),
402401
},
403402
Provisioner: config.DriverName,
404403
ReclaimPolicy: &reclaimPolicyDelete,
@@ -422,7 +421,7 @@ var (
422421

423422
s3fsRetainSC = &storagev1.StorageClass{
424423
ObjectMeta: metav1.ObjectMeta{
425-
Name: fmt.Sprintf("%s", config.S3fsRetainStorageClass),
424+
Name: config.S3fsRetainStorageClass.String(),
426425
},
427426
Provisioner: config.DriverName,
428427
ReclaimPolicy: &reclaimPolicyRetain,
@@ -864,6 +863,7 @@ func TestIBMObjectCSIReconcile(t *testing.T) {
864863
assert.Equal(t, testcase.expectedResp, res)
865864

866865
if testcase.expectedErr != nil {
866+
assert.Error(t, err)
867867
assert.Contains(t, err.Error(), testcase.expectedErr.Error())
868868
} else {
869869
assert.NoError(t, err)

controllers/internal/crutils/static_resource_generator.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
package crutils
33

44
import (
5-
"fmt"
6-
"github.com/IBM/ibm-object-csi-driver-operator/pkg/config"
7-
"github.com/IBM/ibm-object-csi-driver-operator/pkg/util/boolptr"
85
corev1 "k8s.io/api/core/v1"
96
rbacv1 "k8s.io/api/rbac/v1"
107
storagev1 "k8s.io/api/storage/v1"
118
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9+
10+
"github.com/IBM/ibm-object-csi-driver-operator/pkg/config"
11+
"github.com/IBM/ibm-object-csi-driver-operator/pkg/util/boolptr"
1212
)
1313

1414
// GenerateCSIDriver ...
@@ -208,7 +208,7 @@ func (c *IBMObjectCSI) GenerateSCCForNodeClusterRoleBinding() *rbacv1.ClusterRol
208208
func (c *IBMObjectCSI) GenerateS3fsSC(storageClassName config.ResourceName, reclaimPolicy corev1.PersistentVolumeReclaimPolicy) *storagev1.StorageClass {
209209
return &storagev1.StorageClass{
210210
ObjectMeta: metav1.ObjectMeta{
211-
Name: fmt.Sprintf("%s", storageClassName),
211+
Name: storageClassName.String(),
212212
},
213213
Provisioner: config.DriverName,
214214
ReclaimPolicy: &reclaimPolicy,
@@ -235,7 +235,7 @@ func (c *IBMObjectCSI) GenerateS3fsSC(storageClassName config.ResourceName, recl
235235
func (c *IBMObjectCSI) GenerateRcloneSC(storageClassName config.ResourceName, reclaimPolicy corev1.PersistentVolumeReclaimPolicy) *storagev1.StorageClass {
236236
return &storagev1.StorageClass{
237237
ObjectMeta: metav1.ObjectMeta{
238-
Name: fmt.Sprintf("%s", storageClassName),
238+
Name: storageClassName.String(),
239239
},
240240
Provisioner: config.DriverName,
241241
ReclaimPolicy: &reclaimPolicy,

0 commit comments

Comments
 (0)