From 835b7334cfe2e5e27870ab3ed4135f136eecc704 Mon Sep 17 00:00:00 2001
From: Martin Hickey <martin.hickey@ie.ibm.com>
Date: Thu, 8 Dec 2022 16:00:45 +0000
Subject: [PATCH] Fix backwards compatibility

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
(cherry picked from commit b6fef6c4665130644acf7742040ebd46f9cc957c)
---
 pkg/strvals/parser.go      | 12 ++++++------
 pkg/strvals/parser_test.go | 14 +++++++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkg/strvals/parser.go b/pkg/strvals/parser.go
index 2b815e1b9..c59925522 100644
--- a/pkg/strvals/parser.go
+++ b/pkg/strvals/parser.go
@@ -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
 		}
 	}
 }
diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index 122f0ac85..925aa97c6 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -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",
@@ -770,15 +769,19 @@ 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),
 		},
 	}
 
@@ -786,6 +789,11 @@ func TestParseSetNestedLevels(t *testing.T) {
 		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)