From 5cf2b736e10a86b8347fc1a146062c7fa3a66a45 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Fri, 30 Sep 2022 00:16:47 -0700
Subject: [PATCH] ignore configs with no KVs and simplify config builder
 (#2342)

convert all \n to ','
---
 restapi/admin_config.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/restapi/admin_config.go b/restapi/admin_config.go
index fa1b1443b..1c118bef8 100644
--- a/restapi/admin_config.go
+++ b/restapi/admin_config.go
@@ -18,7 +18,6 @@ package restapi
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 
@@ -132,7 +131,7 @@ func getConfig(ctx context.Context, client MinioAdmin, name string) ([]*models.C
 			confkv = append(confkv, &models.ConfigurationKV{Key: kv.Key, Value: kv.Value})
 		}
 		if len(confkv) == 0 {
-			return nil, errors.New("Invalid SubSystem - check config format")
+			continue
 		}
 		var fullConfigName string
 		if scfg.Target == "" {
@@ -192,15 +191,20 @@ func setConfigWithARNAccountID(ctx context.Context, client MinioAdmin, configNam
 // buildConfig builds a concatenated string including name and keyvalues
 // e.g. `region name=us-west-1`
 func buildConfig(configName *string, kvs []*models.ConfigurationKV) *string {
-	configElements := []string{*configName}
+	var builder strings.Builder
+	builder.WriteString(*configName)
 	for _, kv := range kvs {
-		key := kv.Key
-		val := fmt.Sprintf("\"%s\"", kv.Value)
-		if key != "" {
-			configElements = append(configElements, fmt.Sprintf("%s=%s", key, val))
+		key := strings.TrimSpace(kv.Key)
+		if key == "" {
+			continue
 		}
+		builder.WriteString(" ")
+		builder.WriteString(key)
+		builder.WriteString("=")
+		// All newlines must be converted to ','
+		builder.WriteString(strings.ReplaceAll(strings.TrimSpace(fmt.Sprintf("\"%s\"", kv.Value)), "\n", ","))
 	}
-	config := strings.Join(configElements, " ")
+	config := builder.String()
 	return &config
 }