Improve addition of debug options in createVolumeResource by using mountpoint.Args

Signed-off-by: Renan Magagnin <renanmag@amazon.co.uk>

Author: renanmagagnin

pkg/mountpoint/args.go

@@ -20,6 +20,8 @@ const (
 	ArgGid             = "--gid"
 	ArgDirMode         = "--dir-mode"
 	ArgFileMode        = "--file-mode"
+	ArgDebug           = "--debug"
+	ArgDebugCRT        = "--debug-crt"
 )
 
 // An ArgKey represents the key of an argument.

tests/e2e-kubernetes/testsuites/mountoptions.go

@@ -88,30 +88,31 @@ func (t *s3CSIMountOptionsTestSuite) DefineTests(driver storageframework.TestDri
 			"allow-other",
 		})
 		expectedMountOptions := []string{
-			"allow-other",
-			"debug",
-			"debug-crt",
+			"--allow-other",
+			"--debug",
+			"--debug-crt",
 		}
 		gomega.Expect(resource.Pv.Spec.MountOptions).To(gomega.Equal(expectedMountOptions))
 
 		resource = createVolumeResource(ctx, l.config, pattern, v1.ReadWriteMany, []string{
 			"allow-other",
 			"--debug",
+			"--debug-crt",
 		})
 		expectedMountOptions = []string{
-			"allow-other",
+			"--allow-other",
 			"--debug",
-			"debug-crt",
+			"--debug-crt",
 		}
 		gomega.Expect(resource.Pv.Spec.MountOptions).To(gomega.Equal(expectedMountOptions))
 
 		resource = createVolumeResource(ctx, l.config, pattern, v1.ReadWriteMany, []string{
 			"allow-other",
-			"--debug",
-			"--debug-crt",
+			"debug",
+			"debug-crt",
 		})
 		expectedMountOptions = []string{
-			"allow-other",
+			"--allow-other",
 			"--debug",
 			"--debug-crt",
 		}

tests/e2e-kubernetes/testsuites/util.go

@@ -108,12 +108,8 @@ func createVolumeResource(ctx context.Context, config *storageframework.PerTestC
 
 	// Add debug options if they're not already present
 	normalizedOptions := mountpoint.ParseArgs(mountOptions)
-	debugOptions := []string{"debug", "debug-crt"}
-	for _, option := range debugOptions {
-		if !normalizedOptions.Has(option) {
-			mountOptions = append(mountOptions, option)
-		}
-	}
+	normalizedOptions.Set(mountpoint.ArgDebug, mountpoint.ArgNoValue)
+	normalizedOptions.Set(mountpoint.ArgDebugCRT, mountpoint.ArgNoValue)
 
 	pv := &v1.PersistentVolume{
 		ObjectMeta: metav1.ObjectMeta{
@@ -123,7 +119,7 @@ func createVolumeResource(ctx context.Context, config *storageframework.PerTestC
 			PersistentVolumeSource: *pvSource,
 			StorageClassName:       "", // for static provisioning
 			NodeAffinity:           volumeNodeAffinity,
-			MountOptions:           mountOptions, // this is not set by storageframework.CreateVolumeResource, which is why we need to implement our own function
+			MountOptions:           normalizedOptions.SortedList(), // this is not set by storageframework.CreateVolumeResource, which is why we need to implement our own function
 			AccessModes:            []v1.PersistentVolumeAccessMode{accessMode},
 			Capacity: v1.ResourceList{
 				v1.ResourceStorage: resource.MustParse("1200Gi"),