Final changes to config sub-system (#8600)

- Introduces changes such as certain types of
  errors that can be ignored or which need to 
  go into safe mode.
- Update help text as per the review

pkg/event/target/amqp.go

@@ -68,7 +68,7 @@ const (
 	AmqpArguments         = "arguments"
 	AmqpPublishingHeaders = "publishing_headers"
 
-	EnvAMQPState             = "MINIO_NOTIFY_AMQP_STATE"
+	EnvAMQPEnable            = "MINIO_NOTIFY_AMQP_ENABLE"
 	EnvAMQPURL               = "MINIO_NOTIFY_AMQP_URL"
 	EnvAMQPExchange          = "MINIO_NOTIFY_AMQP_EXCHANGE"
 	EnvAMQPRoutingKey        = "MINIO_NOTIFY_AMQP_ROUTING_KEY"

pkg/event/target/elasticsearch.go

@@ -39,7 +39,7 @@ const (
 	ElasticQueueDir   = "queue_dir"
 	ElasticQueueLimit = "queue_limit"
 
-	EnvElasticState      = "MINIO_NOTIFY_ELASTICSEARCH_STATE"
+	EnvElasticEnable     = "MINIO_NOTIFY_ELASTICSEARCH_ENABLE"
 	EnvElasticFormat     = "MINIO_NOTIFY_ELASTICSEARCH_FORMAT"
 	EnvElasticURL        = "MINIO_NOTIFY_ELASTICSEARCH_URL"
 	EnvElasticIndex      = "MINIO_NOTIFY_ELASTICSEARCH_INDEX"

pkg/event/target/kafka.go

@@ -46,7 +46,7 @@ const (
 	KafkaSASLUsername  = "sasl_username"
 	KafkaSASLPassword  = "sasl_password"
 
-	EnvKafkaState         = "MINIO_NOTIFY_KAFKA_STATE"
+	EnvKafkaEnable        = "MINIO_NOTIFY_KAFKA_ENABLE"
 	EnvKafkaBrokers       = "MINIO_NOTIFY_KAFKA_BROKERS"
 	EnvKafkaTopic         = "MINIO_NOTIFY_KAFKA_TOPIC"
 	EnvKafkaQueueDir      = "MINIO_NOTIFY_KAFKA_QUEUE_DIR"

pkg/event/target/mqtt.go

@@ -50,7 +50,7 @@ const (
 	MqttQueueDir          = "queue_dir"
 	MqttQueueLimit        = "queue_limit"
 
-	EnvMQTTState             = "MINIO_NOTIFY_MQTT_STATE"
+	EnvMQTTEnable            = "MINIO_NOTIFY_MQTT_ENABLE"
 	EnvMQTTBroker            = "MINIO_NOTIFY_MQTT_BROKER"
 	EnvMQTTTopic             = "MINIO_NOTIFY_MQTT_TOPIC"
 	EnvMQTTQoS               = "MINIO_NOTIFY_MQTT_QOS"

pkg/event/target/mysql.go

@@ -94,7 +94,7 @@ const (
 	MySQLQueueLimit = "queue_limit"
 	MySQLQueueDir   = "queue_dir"
 
-	EnvMySQLState      = "MINIO_NOTIFY_MYSQL_STATE"
+	EnvMySQLEnable     = "MINIO_NOTIFY_MYSQL_ENABLE"
 	EnvMySQLFormat     = "MINIO_NOTIFY_MYSQL_FORMAT"
 	EnvMySQLDSNString  = "MINIO_NOTIFY_MYSQL_DSN_STRING"
 	EnvMySQLTable      = "MINIO_NOTIFY_MYSQL_TABLE"

pkg/event/target/nats.go

@@ -51,7 +51,7 @@ const (
 	NATSStreamingAsync              = "streaming_async"
 	NATSStreamingMaxPubAcksInFlight = "streaming_max_pub_acks_in_flight"
 
-	EnvNATSState         = "MINIO_NOTIFY_NATS_STATE"
+	EnvNATSEnable        = "MINIO_NOTIFY_NATS_ENABLE"
 	EnvNATSAddress       = "MINIO_NOTIFY_NATS_ADDRESS"
 	EnvNATSSubject       = "MINIO_NOTIFY_NATS_SUBJECT"
 	EnvNATSUsername      = "MINIO_NOTIFY_NATS_USERNAME"

pkg/event/target/nsq.go

@@ -40,7 +40,7 @@ const (
 	NSQQueueDir      = "queue_dir"
 	NSQQueueLimit    = "queue_limit"
 
-	EnvNSQState         = "MINIO_NOTIFY_NSQ"
+	EnvNSQEnable        = "MINIO_NOTIFY_NSQ"
 	EnvNSQAddress       = "MINIO_NOTIFY_NSQ_NSQD_ADDRESS"
 	EnvNSQTopic         = "MINIO_NOTIFY_NSQ_TOPIC"
 	EnvNSQTLS           = "MINIO_NOTIFY_NSQ_TLS"

pkg/event/target/postgresql.go

@@ -95,7 +95,7 @@ const (
 	PostgresQueueDir         = "queue_dir"
 	PostgresQueueLimit       = "queue_limit"
 
-	EnvPostgresState            = "MINIO_NOTIFY_POSTGRES_STATE"
+	EnvPostgresEnable           = "MINIO_NOTIFY_POSTGRES_ENABLE"
 	EnvPostgresFormat           = "MINIO_NOTIFY_POSTGRES_FORMAT"
 	EnvPostgresConnectionString = "MINIO_NOTIFY_POSTGRES_CONNECTION_STRING"
 	EnvPostgresTable            = "MINIO_NOTIFY_POSTGRES_TABLE"

pkg/event/target/redis.go

@@ -41,7 +41,7 @@ const (
 	RedisQueueDir   = "queue_dir"
 	RedisQueueLimit = "queue_limit"
 
-	EnvRedisState      = "MINIO_NOTIFY_REDIS_STATE"
+	EnvRedisEnable     = "MINIO_NOTIFY_REDIS_ENABLE"
 	EnvRedisFormat     = "MINIO_NOTIFY_REDIS_FORMAT"
 	EnvRedisAddress    = "MINIO_NOTIFY_REDIS_ADDRESS"
 	EnvRedisPassword   = "MINIO_NOTIFY_REDIS_PASSWORD"

pkg/event/target/webhook.go

@@ -44,7 +44,7 @@ const (
 	WebhookQueueDir   = "queue_dir"
 	WebhookQueueLimit = "queue_limit"
 
-	EnvWebhookState      = "MINIO_NOTIFY_WEBHOOK_STATE"
+	EnvWebhookEnable     = "MINIO_NOTIFY_WEBHOOK_ENABLE"
 	EnvWebhookEndpoint   = "MINIO_NOTIFY_WEBHOOK_ENDPOINT"
 	EnvWebhookAuthToken  = "MINIO_NOTIFY_WEBHOOK_AUTH_TOKEN"
 	EnvWebhookQueueDir   = "MINIO_NOTIFY_WEBHOOK_QUEUE_DIR"

pkg/madmin/parse-kv.go

@@ -70,19 +70,19 @@ type Targets []Target
 
 // Standard config keys and values.
 const (
-	StateKey   = "state"
+	EnableKey  = "enable"
 	CommentKey = "comment"
 
-	// State values
-	StateOn  = "on"
-	StateOff = "off"
+	// Enable values
+	EnableOn  = "on"
+	EnableOff = "off"
 )
 
 func (kvs KVS) String() string {
 	var s strings.Builder
 	for _, kv := range kvs {
 		// Do not need to print state which is on.
-		if kv.Key == StateKey && kv.Value == StateOn {
+		if kv.Key == EnableKey && kv.Value == EnableOn {
 			continue
 		}
 		if kv.Key == CommentKey && kv.Value == "" {
@@ -90,7 +90,7 @@ func (kvs KVS) String() string {
 		}
 		s.WriteString(kv.Key)
 		s.WriteString(KvSeparator)
-		spc := hasSpace(kv.Value)
+		spc := HasSpace(kv.Value)
 		if spc {
 			s.WriteString(KvDoubleQuote)
 		}
@@ -108,7 +108,8 @@ func (t Targets) Count() int {
 	return len(t)
 }
 
-func hasSpace(s string) bool {
+// HasSpace - returns if given string has space.
+func HasSpace(s string) bool {
 	for _, r := range s {
 		if unicode.IsSpace(r) {
 			return true
@@ -159,10 +160,12 @@ func (t *Targets) AddTarget(s string) error {
 	if len(inputs) <= 1 {
 		return fmt.Errorf("invalid number of arguments '%s'", s)
 	}
+
 	subSystemValue := strings.SplitN(inputs[0], SubSystemSeparator, 2)
 	if len(subSystemValue) == 0 {
 		return fmt.Errorf("invalid number of arguments %s", s)
 	}
+
 	var kvs = KVS{}
 	var prevK string
 	for _, v := range strings.Fields(inputs[1]) {
@@ -187,11 +190,19 @@ func (t *Targets) AddTarget(s string) error {
 		})
 	}
 
+	for i := range *t {
+		if (*t)[i].SubSystem == inputs[0] {
+			(*t)[i] = Target{
+				SubSystem: inputs[0],
+				KVS:       kvs,
+			}
+			return nil
+		}
+	}
 	*t = append(*t, Target{
 		SubSystem: inputs[0],
 		KVS:       kvs,
 	})
-
 	return nil
 }