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/identity/ldap/config.go

@@ -78,15 +78,38 @@ const (
 // DefaultKVS - default config for LDAP config
 var (
 	DefaultKVS = config.KVS{
-		config.State:       config.StateOff,
-		config.Comment:     "This is a default LDAP configuration",
-		ServerAddr:         "",
-		STSExpiry:          "1h",
-		UsernameFormat:     "",
-		GroupSearchFilter:  "",
-		GroupNameAttribute: "",
-		GroupSearchBaseDN:  "",
-		TLSSkipVerify:      config.StateOff,
+		config.KV{
+			Key:   config.State,
+			Value: config.StateOff,
+		},
+		config.KV{
+			Key:   ServerAddr,
+			Value: "",
+		},
+		config.KV{
+			Key:   STSExpiry,
+			Value: "1h",
+		},
+		config.KV{
+			Key:   UsernameFormat,
+			Value: "",
+		},
+		config.KV{
+			Key:   GroupSearchFilter,
+			Value: "",
+		},
+		config.KV{
+			Key:   GroupNameAttribute,
+			Value: "",
+		},
+		config.KV{
+			Key:   GroupSearchBaseDN,
+			Value: "",
+		},
+		config.KV{
+			Key:   TLSSkipVerify,
+			Value: config.StateOff,
+		},
 	}
 )
 

cmd/config/identity/ldap/help.go

@@ -21,11 +21,6 @@ import "github.com/minio/minio/cmd/config"
 // Help template for LDAP identity feature.
 var (
 	Help = config.HelpKVS{
-		config.HelpKV{
-			Key:         config.State,
-			Description: "Enable or disable LDAP/AD identity",
-			Type:        "on|off",
-		},
 		config.HelpKV{
 			Key:         ServerAddr,
 			Description: `AD/LDAP server address eg: "myldapserver.com:636"`,

cmd/config/identity/ldap/legacy.go

@@ -25,12 +25,33 @@ func SetIdentityLDAP(s config.Config, ldapArgs Config) {
 		return
 	}
 	s[config.IdentityLDAPSubSys][config.Default] = config.KVS{
-		config.State:       config.StateOn,
-		ServerAddr:         ldapArgs.ServerAddr,
-		STSExpiry:          ldapArgs.STSExpiryDuration,
-		UsernameFormat:     ldapArgs.UsernameFormat,
-		GroupSearchFilter:  ldapArgs.GroupSearchFilter,
-		GroupNameAttribute: ldapArgs.GroupNameAttribute,
-		GroupSearchBaseDN:  ldapArgs.GroupSearchBaseDN,
+		config.KV{
+			Key:   config.State,
+			Value: config.StateOn,
+		},
+		config.KV{
+			Key:   ServerAddr,
+			Value: ldapArgs.ServerAddr,
+		},
+		config.KV{
+			Key:   STSExpiry,
+			Value: ldapArgs.STSExpiryDuration,
+		},
+		config.KV{
+			Key:   UsernameFormat,
+			Value: ldapArgs.UsernameFormat,
+		},
+		config.KV{
+			Key:   GroupSearchFilter,
+			Value: ldapArgs.GroupSearchFilter,
+		},
+		config.KV{
+			Key:   GroupNameAttribute,
+			Value: ldapArgs.GroupNameAttribute,
+		},
+		config.KV{
+			Key:   GroupSearchBaseDN,
+			Value: ldapArgs.GroupSearchBaseDN,
+		},
 	}
 }