Validate config before saving changes after config reset (minio#14203)

poornas · web-flow · commit a4be47d7ad92 · 2022-01-27T18:28:16.000-08:00
diff --git a/cmd/admin-handlers-config-kv.go b/cmd/admin-handlers-config-kv.go
@@ -74,6 +74,10 @@ func (a adminAPIHandlers) DelConfigKVHandler(w http.ResponseWriter, r *http.Requ
 		writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
 		return
 	}
+	if err = validateConfig(cfg); err != nil {
+		writeCustomErrorResponseJSON(ctx, w, errorCodes.ToAPIErr(ErrAdminConfigBadJSON), err.Error(), r.URL)
+		return
+	}
 
 	if err = saveServerConfig(ctx, objectAPI, cfg); err != nil {
 		writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
diff --git a/internal/config/notify/parse.go b/internal/config/notify/parse.go
@@ -82,7 +82,7 @@ func RegisterNotificationTargets(ctx context.Context, cfg config.Config, transpo
 		for _, targetID := range targetIDs {
 			if !targetList.Exists(targetID) {
 				return nil, config.Errorf(
-					"Unable to disable configured targets '%v'",
+					"Unable to disable currently configured targets '%v'",
 					targetID)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func RegisterNotificationTargets(ctx context.Context, cfg config.Config, transpo`
`82`	`82`	`for _, targetID := range targetIDs {`
`83`	`83`	`if !targetList.Exists(targetID) {`
`84`	`84`	`return nil, config.Errorf(`
`85`		`- "Unable to disable configured targets '%v'",`
	`85`	`+ "Unable to disable currently configured targets '%v'",`
`86`	`86`	`targetID)`
`87`	`87`	`}`
`88`	`88`	`}`