Skip to content

Commit

Permalink
Fix backwards compatibility
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
  • Loading branch information
hickeyma committed Dec 8, 2022
1 parent a59e584 commit b6fef6c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
12 changes: 6 additions & 6 deletions pkg/strvals/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,14 @@ func (t *parser) key(data map[string]interface{}, nestedNameLevel int) (reterr e
}

// Recurse
if e := t.key(inner, nestedNameLevel); e != nil {
return e
}
if len(inner) == 0 {
e := t.key(inner, nestedNameLevel)
if e == nil && len(inner) == 0 {
return errors.Errorf("key map %q has no value", string(k))
}
set(data, string(k), inner)
return nil
if len(inner) != 0 {
set(data, string(k), inner)
}
return e
}
}
}
Expand Down
14 changes: 11 additions & 3 deletions pkg/strvals/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,8 @@ func TestParseSet(t *testing.T) {
err: true,
},
{
"name1.name2=",
map[string]interface{}{},
false,
str: "name1.name2=",
expect: map[string]interface{}{"name1": map[string]interface{}{"name2": ""}},
},
{
str: "name1.=name2",
Expand Down Expand Up @@ -770,22 +769,31 @@ func TestParseSetNestedLevels(t *testing.T) {
str string
expect map[string]interface{}
err bool
errStr string
}{
{
"outer.middle.inner=value",
map[string]interface{}{"outer": map[string]interface{}{"middle": map[string]interface{}{"inner": "value"}}},
false,
"",
},
{
str: keyMultipleNestedLevels + "=value",
err: true,
errStr: fmt.Sprintf("value name nested level is greater than maximum supported nested level of %d",
MaxNestedNameLevel),
},
}

for _, tt := range tests {
got, err := Parse(tt.str)
if err != nil {
if tt.err {
if tt.errStr != "" {
if err.Error() != tt.errStr {
t.Errorf("Expected error: %s. Got error: %s", tt.errStr, err.Error())
}
}
continue
}
t.Fatalf("%s: %s", tt.str, err)
Expand Down

0 comments on commit b6fef6c

Please sign in to comment.