@@ -2,7 +2,6 @@ package controllers
2
2
3
3
import (
4
4
"errors"
5
- "fmt"
6
5
"testing"
7
6
8
7
"github.com/IBM/ibm-object-csi-driver-operator/api/v1alpha1"
@@ -344,7 +343,7 @@ var (
344
343
345
344
rCloneSC = & storagev1.StorageClass {
346
345
ObjectMeta : metav1.ObjectMeta {
347
- Name : fmt . Sprintf ( "%s" , config .RcloneStorageClass ),
346
+ Name : config .RcloneStorageClass . String ( ),
348
347
},
349
348
Provisioner : config .DriverName ,
350
349
ReclaimPolicy : & reclaimPolicyDelete ,
@@ -371,7 +370,7 @@ var (
371
370
372
371
rCloneRetainSC = & storagev1.StorageClass {
373
372
ObjectMeta : metav1.ObjectMeta {
374
- Name : fmt . Sprintf ( "%s" , config .RcloneRetainStorageClass ),
373
+ Name : config .RcloneRetainStorageClass . String ( ),
375
374
},
376
375
Provisioner : config .DriverName ,
377
376
ReclaimPolicy : & reclaimPolicyRetain ,
@@ -398,7 +397,7 @@ var (
398
397
399
398
s3fsSC = & storagev1.StorageClass {
400
399
ObjectMeta : metav1.ObjectMeta {
401
- Name : fmt . Sprintf ( "%s" , config .S3fsStorageClass ),
400
+ Name : config .S3fsStorageClass . String ( ),
402
401
},
403
402
Provisioner : config .DriverName ,
404
403
ReclaimPolicy : & reclaimPolicyDelete ,
@@ -422,7 +421,7 @@ var (
422
421
423
422
s3fsRetainSC = & storagev1.StorageClass {
424
423
ObjectMeta : metav1.ObjectMeta {
425
- Name : fmt . Sprintf ( "%s" , config .S3fsRetainStorageClass ),
424
+ Name : config .S3fsRetainStorageClass . String ( ),
426
425
},
427
426
Provisioner : config .DriverName ,
428
427
ReclaimPolicy : & reclaimPolicyRetain ,
@@ -864,6 +863,7 @@ func TestIBMObjectCSIReconcile(t *testing.T) {
864
863
assert .Equal (t , testcase .expectedResp , res )
865
864
866
865
if testcase .expectedErr != nil {
866
+ assert .Error (t , err )
867
867
assert .Contains (t , err .Error (), testcase .expectedErr .Error ())
868
868
} else {
869
869
assert .NoError (t , err )
0 commit comments