projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17803: Fix unnecessarily convoluted test case.
[arvados.git]
/
lib
/
config
/
load.go
diff --git
a/lib/config/load.go
b/lib/config/load.go
index 73f0a244572279a75eabd76f1b151d954b05bfe8..15174ae9cf97b5561071783da842cabe2be78fd7 100644
(file)
--- 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 {
}
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
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 + "?)"
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
}
}
break
}
}