222

Author: lianghuan

flatten/store.go

@@ -433,6 +433,9 @@ func (s *LayeredStorage) MapKeys(key string, result map[string]struct{}) bool {
 func (s *LayeredStorage) SliceEntries(key string, result map[string]string) bool {
 	for _, arr := range s.layers {
 		for _, source := range arr {
+			if _, ok := source.Value(key); ok {
+				return false
+			}
 			if source.SliceEntries(key, result) {
 				return true
 			}

flatten/store_test.go

@@ -537,6 +537,30 @@ func TestLayeredStorage(t *testing.T) {
 		assert.That(t, result["users[0].name"]).Equal("Override")
 	})
 
+	t.Run("SliceEntries stops at higher priority scalar value", func(t *testing.T) {
+		s := &LayeredStorage{}
+
+		defaultLayer := NewProperties(map[string]string{
+			"users[0]": "Default",
+			"users[1]": "User1",
+		})
+		s.AddStorage(StorageDefault, NewPropertiesStorage(defaultLayer), "default")
+
+		cmdlineLayer := NewProperties(map[string]string{
+			"users": "Override1,Override2",
+		})
+		s.AddStorage(StorageCommandLine, NewPropertiesStorage(cmdlineLayer), "cmdline")
+
+		result := make(map[string]string)
+		found := s.SliceEntries("users", result)
+
+		assert.That(t, found).False()
+		assert.That(t, len(result)).Equal(0)
+		val, ok := s.Value("users")
+		assert.That(t, ok).True()
+		assert.That(t, val).Equal("Override1,Override2")
+	})
+
 	t.Run("multiple sources in same layer", func(t *testing.T) {
 		s := &LayeredStorage{}