Fix review comments and new changes in config (#8515)

- Migrate and save only settings which are enabled
- Rename logger_http to logger_webhook and
  logger_http_audit to audit_webhook
- No more pretty printing comments, comment
  is a key=value pair now.
- Avoid quotes on values which do not have space in them
- `state="on"` is implicit for all SetConfigKV unless
  specified explicitly as `state="off"`
- Disabled IAM users should be disabled always

pkg/env/env.go

@@ -27,6 +27,12 @@ func SetEnvOn() {
 	envOff = false
 }
 
+// IsSet returns if the given env key is set.
+func IsSet(key string) bool {
+	_, ok := os.LookupEnv(key)
+	return ok
+}
+
 // Get retrieves the value of the environment variable named
 // by the key. If the variable is present in the environment the
 // value (which may be empty) is returned. Otherwise it returns

pkg/event/target/kafka.go

@@ -39,10 +39,10 @@ const (
 	KafkaTopic         = "topic"
 	KafkaQueueDir      = "queue_dir"
 	KafkaQueueLimit    = "queue_limit"
-	KafkaTLSEnable     = "tls_enable"
+	KafkaTLS           = "tls"
 	KafkaTLSSkipVerify = "tls_skip_verify"
 	KafkaTLSClientAuth = "tls_client_auth"
-	KafkaSASLEnable    = "sasl_enable"
+	KafkaSASL          = "sasl"
 	KafkaSASLUsername  = "sasl_username"
 	KafkaSASLPassword  = "sasl_password"
 
@@ -51,10 +51,10 @@ const (
 	EnvKafkaTopic         = "MINIO_NOTIFY_KAFKA_TOPIC"
 	EnvKafkaQueueDir      = "MINIO_NOTIFY_KAFKA_QUEUE_DIR"
 	EnvKafkaQueueLimit    = "MINIO_NOTIFY_KAFKA_QUEUE_LIMIT"
-	EnvKafkaTLSEnable     = "MINIO_NOTIFY_KAFKA_TLS_ENABLE"
+	EnvKafkaTLS           = "MINIO_NOTIFY_KAFKA_TLS"
 	EnvKafkaTLSSkipVerify = "MINIO_NOTIFY_KAFKA_TLS_SKIP_VERIFY"
 	EnvKafkaTLSClientAuth = "MINIO_NOTIFY_KAFKA_TLS_CLIENT_AUTH"
-	EnvKafkaSASLEnable    = "MINIO_NOTIFY_KAFKA_SASL_ENABLE"
+	EnvKafkaSASLEnable    = "MINIO_NOTIFY_KAFKA_SASL"
 	EnvKafkaSASLUsername  = "MINIO_NOTIFY_KAFKA_SASL_USERNAME"
 	EnvKafkaSASLPassword  = "MINIO_NOTIFY_KAFKA_SASL_PASSWORD"
 )

pkg/event/target/nats.go

@@ -43,7 +43,7 @@ const (
 	NATSQueueLimit   = "queue_limit"
 
 	// Streaming constants
-	NATSStreamingEnable             = "streaming_enable"
+	NATSStreaming                   = "streaming"
 	NATSStreamingClusterID          = "streaming_cluster_id"
 	NATSStreamingAsync              = "streaming_async"
 	NATSStreamingMaxPubAcksInFlight = "streaming_max_pub_acks_in_flight"
@@ -60,7 +60,7 @@ const (
 	EnvNATSQueueLimit   = "MINIO_NOTIFY_NATS_QUEUE_LIMIT"
 
 	// Streaming constants
-	EnvNATSStreamingEnable             = "MINIO_NOTIFY_NATS_STREAMING_ENABLE"
+	EnvNATSStreaming                   = "MINIO_NOTIFY_NATS_STREAMING"
 	EnvNATSStreamingClusterID          = "MINIO_NOTIFY_NATS_STREAMING_CLUSTER_ID"
 	EnvNATSStreamingAsync              = "MINIO_NOTIFY_NATS_STREAMING_ASYNC"
 	EnvNATSStreamingMaxPubAcksInFlight = "MINIO_NOTIFY_NATS_STREAMING_MAX_PUB_ACKS_IN_FLIGHT"

pkg/event/target/nsq.go

@@ -35,7 +35,7 @@ import (
 const (
 	NSQAddress       = "nsqd_address"
 	NSQTopic         = "topic"
-	NSQTLSEnable     = "tls_enable"
+	NSQTLS           = "tls"
 	NSQTLSSkipVerify = "tls_skip_verify"
 	NSQQueueDir      = "queue_dir"
 	NSQQueueLimit    = "queue_limit"
@@ -43,7 +43,7 @@ const (
 	EnvNSQState         = "MINIO_NOTIFY_NSQ"
 	EnvNSQAddress       = "MINIO_NOTIFY_NSQ_NSQD_ADDRESS"
 	EnvNSQTopic         = "MINIO_NOTIFY_NSQ_TOPIC"
-	EnvNSQTLSEnable     = "MINIO_NOTIFY_NSQ_TLS_ENABLE"
+	EnvNSQTLS           = "MINIO_NOTIFY_NSQ_TLS"
 	EnvNSQTLSSkipVerify = "MINIO_NOTIFY_NSQ_TLS_SKIP_VERIFY"
 	EnvNSQQueueDir      = "MINIO_NOTIFY_NSQ_QUEUE_DIR"
 	EnvNSQQueueLimit    = "MINIO_NOTIFY_NSQ_QUEUE_LIMIT"

pkg/madmin/config-kv-commands.go

@@ -18,11 +18,8 @@
 package madmin
 
 import (
-	"bufio"
-	"encoding/base64"
 	"net/http"
 	"net/url"
-	"strings"
 )
 
 // DelConfigKV - delete key from server config.
@@ -54,33 +51,21 @@ func (adm *AdminClient) DelConfigKV(k string) (err error) {
 
 // SetConfigKV - set key value config to server.
 func (adm *AdminClient) SetConfigKV(kv string) (err error) {
-	bio := bufio.NewScanner(strings.NewReader(kv))
-	var s strings.Builder
-	var comment string
-	for bio.Scan() {
-		if bio.Text() == "" {
-			continue
-		}
-		if strings.HasPrefix(bio.Text(), KvComment) {
-			// Join multiple comments for each newline, separated by "\n"
-			comments := []string{comment, strings.TrimPrefix(bio.Text(), KvComment)}
-			comment = strings.Join(comments, KvNewline)
-			continue
-		}
-		s.WriteString(bio.Text())
-		if comment != "" {
-			s.WriteString(KvSpaceSeparator)
-			s.WriteString(commentKey)
-			s.WriteString(KvSeparator)
-			s.WriteString(KvDoubleQuote)
-			s.WriteString(base64.RawStdEncoding.EncodeToString([]byte(comment)))
-			s.WriteString(KvDoubleQuote)
-		}
-		s.WriteString(KvNewline)
-		comment = ""
+	targets, err := ParseSubSysTarget([]byte(kv))
+	if err != nil {
+		return err
 	}
-
-	econfigBytes, err := EncryptData(adm.secretAccessKey, []byte(s.String()))
+	for subSys, targetKV := range targets {
+		for target := range targetKV {
+			_, ok := targets[subSys][target][stateKey]
+			if !ok {
+				// If client asked for state preserve.
+				// otherwise implicitly add state to "on"
+				targets[subSys][target][stateKey] = stateOn
+			}
+		}
+	}
+	econfigBytes, err := EncryptData(adm.secretAccessKey, []byte(targets.String()))
 	if err != nil {
 		return err
 	}

pkg/madmin/parse-kv.go

@@ -20,11 +20,9 @@ package madmin
 import (
 	"bufio"
 	"bytes"
-	"encoding/base64"
 	"fmt"
 	"strings"
-
-	"github.com/minio/minio/pkg/color"
+	"unicode"
 )
 
 // KVS each sub-system key, value
@@ -34,9 +32,35 @@ type KVS map[string]string
 type Targets map[string]map[string]KVS
 
 const (
+	stateKey   = "state"
 	commentKey = "comment"
+
+	stateOn  = "on"
+	stateOff = "off"
 )
 
+func (kvs KVS) String() string {
+	var s strings.Builder
+	for k, v := range kvs {
+		// Do not need to print if state is on
+		if k == stateKey && v == stateOn {
+			continue
+		}
+		s.WriteString(k)
+		s.WriteString(KvSeparator)
+		spc := hasSpace(v)
+		if spc {
+			s.WriteString(KvDoubleQuote)
+		}
+		s.WriteString(v)
+		if spc {
+			s.WriteString(KvDoubleQuote)
+		}
+		s.WriteString(KvSpaceSeparator)
+	}
+	return s.String()
+}
+
 // Count - returns total numbers of target
 func (t Targets) Count() int {
 	var count int
@@ -48,44 +72,28 @@ func (t Targets) Count() int {
 	return count
 }
 
+func hasSpace(s string) bool {
+	for _, r := range s {
+		if unicode.IsSpace(r) {
+			return true
+		}
+	}
+	return false
+}
+
 func (t Targets) String() string {
 	var s strings.Builder
 	count := t.Count()
 	for subSys, targetKV := range t {
 		for target, kv := range targetKV {
 			count--
-			c := kv[commentKey]
-			data, err := base64.RawStdEncoding.DecodeString(c)
-			if err == nil {
-				c = string(data)
-			}
-			for _, c1 := range strings.Split(c, KvNewline) {
-				if c1 == "" {
-					continue
-				}
-				s.WriteString(color.YellowBold(KvComment))
-				s.WriteString(KvSpaceSeparator)
-				s.WriteString(color.BlueBold(strings.TrimSpace(c1)))
-				s.WriteString(KvNewline)
-			}
 			s.WriteString(subSys)
 			if target != Default {
 				s.WriteString(SubSystemSeparator)
 				s.WriteString(target)
 			}
 			s.WriteString(KvSpaceSeparator)
-			for k, v := range kv {
-				// Comment is already printed, do not print it here.
-				if k == commentKey {
-					continue
-				}
-				s.WriteString(k)
-				s.WriteString(KvSeparator)
-				s.WriteString(KvDoubleQuote)
-				s.WriteString(v)
-				s.WriteString(KvDoubleQuote)
-				s.WriteString(KvSpaceSeparator)
-			}
+			s.WriteString(kv.String())
 			if (len(t) > 1 || len(targetKV) > 1) && count > 0 {
 				s.WriteString(KvNewline)
 				s.WriteString(KvNewline)
@@ -100,7 +108,6 @@ const (
 	SubSystemSeparator = `:`
 	KvSeparator        = `=`
 	KvSpaceSeparator   = ` `
-	KvComment          = `#`
 	KvNewline          = "\n"
 	KvDoubleQuote      = `"`
 	KvSingleQuote      = `'`