Order all keys in config (#8541)

New changes

- return default values when sub-sys is
  not configured.
- state is hidden parameter now
- remove worm mode to be saved in config

cmd/config/cache/config_test.go

@@ -73,7 +73,7 @@ func TestParseCacheDrives(t *testing.T) {
 		}{"/home/drive{1..3}", []string{}, false})
 	}
 	for i, testCase := range testCases {
-		drives, err := parseCacheDrives(strings.Split(testCase.driveStr, cacheDelimiter))
+		drives, err := parseCacheDrives(strings.Split(testCase.driveStr, cacheDelimiterLegacy))
 		if err != nil && testCase.success {
 			t.Errorf("Test %d: Expected success but failed instead %s", i+1, err)
 		}
@@ -106,7 +106,7 @@ func TestParseCacheExclude(t *testing.T) {
 	}
 
 	for i, testCase := range testCases {
-		excludes, err := parseCacheExcludes(strings.Split(testCase.excludeStr, cacheDelimiter))
+		excludes, err := parseCacheExcludes(strings.Split(testCase.excludeStr, cacheDelimiterLegacy))
 		if err != nil && testCase.success {
 			t.Errorf("Test %d: Expected success but failed instead %s", i+1, err)
 		}

cmd/config/cache/help.go

@@ -21,21 +21,16 @@ import "github.com/minio/minio/cmd/config"
 // Help template for caching feature.
 var (
 	Help = config.HelpKVS{
-		config.HelpKV{
-			Key:         config.State,
-			Description: "Indicates if caching is enabled or not",
-			Type:        "on|off",
-		},
 		config.HelpKV{
 			Key:         Drives,
-			Description: `List of mounted drives or directories delimited by ";"`,
-			Type:        "delimited-string",
+			Description: `List of mounted drives or directories delimited by ","`,
+			Type:        "csv",
 		},
 		config.HelpKV{
 			Key:         Exclude,
-			Description: `List of wildcard based cache exclusion patterns delimited by ";"`,
+			Description: `List of wildcard based cache exclusion patterns delimited by ","`,
 			Optional:    true,
-			Type:        "delimited-string",
+			Type:        "csv",
 		},
 		config.HelpKV{
 			Key:         Expiry,

cmd/config/cache/legacy.go

@@ -23,16 +23,36 @@ import (
 	"github.com/minio/minio/cmd/config"
 )
 
+const (
+	cacheDelimiterLegacy = ";"
+)
+
 // SetCacheConfig - One time migration code needed, for migrating from older config to new for Cache.
 func SetCacheConfig(s config.Config, cfg Config) {
 	if len(cfg.Drives) == 0 {
 		// Do not save cache if no settings available.
 		return
 	}
-	s[config.CacheSubSys][config.Default] = DefaultKVS
-	s[config.CacheSubSys][config.Default][Drives] = strings.Join(cfg.Drives, cacheDelimiter)
-	s[config.CacheSubSys][config.Default][Exclude] = strings.Join(cfg.Exclude, cacheDelimiter)
-	s[config.CacheSubSys][config.Default][Expiry] = fmt.Sprintf("%d", cfg.Expiry)
-	s[config.CacheSubSys][config.Default][Quota] = fmt.Sprintf("%d", cfg.MaxUse)
-	s[config.CacheSubSys][config.Default][config.State] = config.StateOn
+	s[config.CacheSubSys][config.Default] = config.KVS{
+		config.KV{
+			Key:   config.State,
+			Value: config.StateOn,
+		},
+		config.KV{
+			Key:   Drives,
+			Value: strings.Join(cfg.Drives, cacheDelimiter),
+		},
+		config.KV{
+			Key:   Exclude,
+			Value: strings.Join(cfg.Exclude, cacheDelimiter),
+		},
+		config.KV{
+			Key:   Expiry,
+			Value: fmt.Sprintf("%d", cfg.Expiry),
+		},
+		config.KV{
+			Key:   Quota,
+			Value: fmt.Sprintf("%d", cfg.MaxUse),
+		},
+	}
 }

cmd/config/cache/lookup.go

@@ -48,17 +48,31 @@ const (
 // DefaultKVS - default KV settings for caching.
 var (
 	DefaultKVS = config.KVS{
-		config.State:   config.StateOff,
-		config.Comment: "This is a default cache configuration, only applicable in gateway setups",
-		Drives:         "",
-		Exclude:        "",
-		Expiry:         DefaultExpiry,
-		Quota:          DefaultQuota,
+		config.KV{
+			Key:   config.State,
+			Value: config.StateOff,
+		},
+		config.KV{
+			Key:   Drives,
+			Value: "",
+		},
+		config.KV{
+			Key:   Exclude,
+			Value: "",
+		},
+		config.KV{
+			Key:   Expiry,
+			Value: DefaultExpiry,
+		},
+		config.KV{
+			Key:   Quota,
+			Value: DefaultQuota,
+		},
 	}
 )
 
 const (
-	cacheDelimiter = ";"
+	cacheDelimiter = ","
 )
 
 // LookupConfig - extracts cache configuration provided by environment
@@ -92,14 +106,20 @@ func LookupConfig(kvs config.KVS) (Config, error) {
 
 	cfg.Drives, err = parseCacheDrives(strings.Split(drives, cacheDelimiter))
 	if err != nil {
-		return cfg, err
+		cfg.Drives, err = parseCacheDrives(strings.Split(drives, cacheDelimiterLegacy))
+		if err != nil {
+			return cfg, err
+		}
 	}
 
 	cfg.Enabled = true
 	if excludes := env.Get(EnvCacheExclude, kvs.Get(Exclude)); excludes != "" {
 		cfg.Exclude, err = parseCacheExcludes(strings.Split(excludes, cacheDelimiter))
 		if err != nil {
-			return cfg, err
+			cfg.Exclude, err = parseCacheExcludes(strings.Split(excludes, cacheDelimiterLegacy))
+			if err != nil {
+				return cfg, err
+			}
 		}
 	}