Merge pull request #1268 from uriel-guzman/automated-cherry-pick-of-#1231-upstream-release-1.22

Automated cherry pick of #1231: Fix boolean flags formatting bug

Author: uriel-guzman

pkg/csi_driver/utils.go

@@ -95,6 +95,9 @@ var (
 	managedSidecarRegexGCR   = regexp.MustCompile(managedSidecarPatternGCR)
 	// Regex to detect deprecated flag error messages from gcsfuse. Should match the flags using .MarkDeprecated() in https://github.com/GoogleCloudPlatform/gcsfuse/blob/master/cfg/config.go
 	deprecatedFlagPatterns = regexp.MustCompile(`Flag .*? has been deprecated`)
+	// Regex to detect invalid argument error messages from gcsfuse. Should match the flags using InvalidValueError in https://github.com/spf13/pflag/blob/b85eb9e15911a41cd7c05d955503542e9befadf4/errors.go#L116,
+	// imported by GCSFuse: https://github.com/GoogleCloudPlatform/gcsfuse/blob/fc54ba2287dba1ae4be0888686902f72e2f16f8b/go.mod#L34
+	invalidArgumentPatterns = regexp.MustCompile(`invalid argument .* for .* flag`)
 )
 
 func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {
@@ -471,7 +474,7 @@ func extractErrorFromGcsFuseErrorFile(errMsg []byte, err error) (codes.Code, err
 		errMsgStr := string(errMsg)
 		code := codes.Internal
 		if strings.Contains(errMsgStr, "Incorrect Usage") ||
-			strings.Contains(errMsgStr, "unknown flag") {
+			strings.Contains(errMsgStr, "unknown flag") || invalidArgumentPatterns.MatchString(errMsgStr) {
 			code = codes.InvalidArgument
 		}
 

pkg/csi_driver/utils_test.go

@@ -60,6 +60,11 @@ func TestExtractErrorFromGcsFuseErrorFile(t *testing.T) {
 				errorMessage: []byte("Flag --max-retry-duration has been deprecated, This is currently unused."),
 				expectedCode: codes.Unavailable,
 			},
+			{
+				name:         "invalid argument flag error",
+				errorMessage: []byte(`Error: invalid argument "trve" for "--file-cache-cache-file-for-range-read" flag: strconv.ParseBool: parsing "trve": invalid syntax`),
+				expectedCode: codes.InvalidArgument,
+			},
 			{
 				name:         "bucket doesn't exist error",
 				errorMessage: []byte("something went wrong: bucket doesn't exist"),

pkg/sidecar_mounter/sidecar_mounter.go

@@ -111,10 +111,11 @@ func (m *Mounter) Mount(ctx context.Context, mc *MountConfig) error {
 
 	args := []string{}
 	for k, v := range mc.FlagMap {
-		args = append(args, "--"+k)
+		arg := k
 		if v != "" {
-			args = append(args, v)
+			arg = fmt.Sprintf("%s=%s", k, v)
 		}
+		args = append(args, fmt.Sprintf("--%s", arg))
 	}
 
 	args = append(args, mc.BucketName)

pkg/sidecar_mounter/sidecar_mounter_config.go

@@ -96,19 +96,6 @@ var disallowedFlags = map[string]bool{
 	KernelParamsFileConfigFlag: true,
 }
 
-var boolFlags = map[string]bool{
-	"implicit-dirs":                 true,
-	"enable-nonexistent-type-cache": true,
-	"debug_fuse_errors":             true,
-	"debug_fuse":                    true,
-	"debug_fs":                      true,
-	"debug_gcs":                     true,
-	"debug_http":                    true,
-	"debug_invariants":              true,
-	"debug_mutex":                   true,
-	"disable-autoconfig":            true,
-}
-
 // Fetch the following information from a given socket path:
 // 1. Pod volume name
 // 2. The file descriptor
@@ -307,17 +294,7 @@ func (mc *MountConfig) prepareMountArgs() {
 			continue
 		}
 
-		switch {
-		case boolFlags[flag] && value != "":
-			flag = flag + "=" + value
-			if value == util.TrueStr || value == util.FalseStr {
-				value = ""
-			} else {
-				invalidArgs = append(invalidArgs, flag)
-
-				continue
-			}
-		case flag == "app-name":
+		if flag == util.GCSFuseAppNameArg {
 			value = GCSFuseAppName + "-" + value
 		}
 

pkg/sidecar_mounter/sidecar_mounter_config_test.go

@@ -120,7 +120,7 @@ func TestPrepareMountArgs(t *testing.T) {
 				Options:    []string{"uid=100", "gid=200", "debug_gcs", "max-conns-per-host=10", "implicit-dirs=true"},
 			},
 			expectedArgs: map[string]string{
-				"implicit-dirs=true": "",
+				"implicit-dirs":      "true",
 				"app-name":           GCSFuseAppName,
 				"temp-dir":           "test-buffer-dir/temp-dir",
 				"config-file":        "test-config-file",

pkg/util/util.go

@@ -60,6 +60,7 @@ const (
 	StorageServiceErrorStr              = "failed to setup storage service"
 	GCSFuseCsiDriverName                = "gcsfuse.csi.storage.gke.io"
 	GCSFuseNumaNodeArg                  = "gcs-fuse-numa-node"
+	GCSFuseAppNameArg                   = "app-name"
 )
 
 var (