X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4e65a41bea4b892ef7232bfe6b9b20ca35380368..df90bb0a37a7e6fc3c18afd3e000a71fb7cc11e2:/lib/config/load.go?ds=sidebyside

diff --git a/lib/config/load.go b/lib/config/load.go
index 73f0a24457..15174ae9cf 100644
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -361,6 +361,9 @@ func (ldr *Loader) logExtraKeys(expected, supplied map[string]interface{}, prefi
 		}
 		vexp, ok := expected[k]
 		if expected["SAMPLE"] != nil {
+			// use the SAMPLE entry's keys as the
+			// "expected" map when checking vsupp
+			// recursively.
 			vexp = expected["SAMPLE"]
 		} else if !ok {
 			// check for a case-insensitive match
@@ -368,6 +371,12 @@ func (ldr *Loader) logExtraKeys(expected, supplied map[string]interface{}, prefi
 			for ek := range expected {
 				if strings.EqualFold(k, ek) {
 					hint = " (perhaps you meant " + ek + "?)"
+					// If we don't delete this, it
+					// will end up getting merged,
+					// unpredictably
+					// merging/overriding the
+					// default.
+					delete(supplied, k)
 					break
 				}
 			}