msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge 3416dd5f21 into f05c21b6b6

Browse Source
Evans Mungai 7 days ago committed by GitHub
parent f05c21b6b6 3416dd5f21
commit c922149f17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 157 additions and 120 deletions
Show Stats Download Patch File Download Diff File

15
pkg/chart/common/util/coalesce.go
Unescape View File

@ -302,6 +302,15 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, pref
if dst == nil {
return src
}
// Track original non-nil src keys before modifying src
// This lets us distinguish between user nullifying a chart default vs
// user setting nil for a key not in chart defaults.
srcOriginalNonNil := make(map[string]bool)
for key, val := range src {
if val != nil {
srcOriginalNonNil[key] = true
}
}
for key, val := range dst {
if val == nil {
src[key] = nil
@ -311,9 +320,13 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, pref
// values.
for key, val := range src {
fullkey := concatPrefix(prefix, key)
if dv, ok := dst[key]; ok && !merge && dv == nil {
if dv, ok := dst[key]; ok && !merge && dv == nil && srcOriginalNonNil[key] {
// When coalescing (not merging), if dst has nil and src has a non-nil
// value, the user is nullifying a chart default - remove the key.
// But if src also has nil (or key not in src), preserve the nil
delete(dst, key)
} else if !ok {
// key not in user values, preserve src value (including nil)
dst[key] = val
} else if istable(val) {
if istable(dv) {

262
pkg/chart/common/util/coalesce_test.go
Unescape View File

@ -25,6 +25,7 @@ import (
"text/template"
"github.com/stretchr/testify/assert"
req "github.com/stretchr/testify/require"
"helm.sh/helm/v4/pkg/chart/common"
chart "helm.sh/helm/v4/pkg/chart/v2"
@ -401,131 +402,120 @@ func TestMergeValues(t *testing.T) {
}
func TestCoalesceTables(t *testing.T) {
dst := map[string]interface{}{
"name": "Ishmael",
"address": map[string]interface{}{
"street": "123 Spouter Inn Ct.",
"city": "Nantucket",
"country": nil,
},
"details": map[string]interface{}{
"friends": []string{"Tashtego"},
},
"boat": "pequod",
"hole": nil,
}
src := map[string]interface{}{
"occupation": "whaler",
"address": map[string]interface{}{
"state": "MA",
"street": "234 Spouter Inn Ct.",
"country": "US",
},
"details": "empty",
"boat": map[string]interface{}{
"mast": true,
},
"hole": "black",
}
// What we expect is that anything in dst overrides anything in src, but that
// otherwise the values are coalesced.
CoalesceTables(dst, src)
if dst["name"] != "Ishmael" {
t.Errorf("Unexpected name: %s", dst["name"])
}
if dst["occupation"] != "whaler" {
t.Errorf("Unexpected occupation: %s", dst["occupation"])
}
addr, ok := dst["address"].(map[string]interface{})
if !ok {
t.Fatal("Address went away.")
}
if addr["street"].(string) != "123 Spouter Inn Ct." {
t.Errorf("Unexpected address: %v", addr["street"])
}
if addr["city"].(string) != "Nantucket" {
t.Errorf("Unexpected city: %v", addr["city"])
}
if addr["state"].(string) != "MA" {
t.Errorf("Unexpected state: %v", addr["state"])
}
if _, ok = addr["country"]; ok {
t.Error("The country is not left out.")
}
if det, ok := dst["details"].(map[string]interface{}); !ok {
t.Fatalf("Details is the wrong type: %v", dst["details"])
} else if _, ok := det["friends"]; !ok {
t.Error("Could not find your friends. Maybe you don't have any. :-(")
}
if dst["boat"].(string) != "pequod" {
t.Errorf("Expected boat string, got %v", dst["boat"])
}
if _, ok = dst["hole"]; ok {
t.Error("The hole still exists.")
}
dst2 := map[string]interface{}{
"name": "Ishmael",
"address": map[string]interface{}{
"street": "123 Spouter Inn Ct.",
"city": "Nantucket",
"country": "US",
},
"details": map[string]interface{}{
"friends": []string{"Tashtego"},
},
"boat": "pequod",
"hole": "black",
}
// What we expect is that anything in dst should have all values set,
// this happens when the --reuse-values flag is set but the chart has no modifications yet
CoalesceTables(dst2, nil)
if dst2["name"] != "Ishmael" {
t.Errorf("Unexpected name: %s", dst2["name"])
}
addr2, ok := dst2["address"].(map[string]interface{})
if !ok {
t.Fatal("Address went away.")
}
t.Run("case 1", func(t *testing.T) {
is := assert.New(t)
dst := map[string]interface{}{
"name": "Ishmael",
"address": map[string]interface{}{
"street": "123 Spouter Inn Ct.",
"city": "Nantucket",
"country": nil,
},
"details": map[string]interface{}{
"friends": []string{"Tashtego"},
},
"boat": "pequod",
"hole": nil,
}
src := map[string]interface{}{
"occupation": "whaler",
"address": map[string]interface{}{
"state": "MA",
"street": "234 Spouter Inn Ct.",
"country": "US",
},
"details": "empty",
"boat": map[string]interface{}{
"mast": true,
},
"hole": "black",
}
if addr2["street"].(string) != "123 Spouter Inn Ct." {
t.Errorf("Unexpected address: %v", addr2["street"])
}
// What we expect is that anything in dst overrides anything in src, but that
// otherwise the values are coalesced.
CoalesceTables(dst, src)
is.Equal("Ishmael", dst["name"], "Unexpected name: %s", dst["name"])
is.Equal("whaler", dst["occupation"], "Unexpected occupation: %s", dst["occupation"])
addr, ok := dst["address"].(map[string]interface{})
req.True(t, ok, "Address went away.")
is.Equal("123 Spouter Inn Ct.", addr["street"], "Unexpected address: %v", addr["street"])
is.Equal("Nantucket", addr["city"], "Unexpected city: %v", addr["city"])
is.Equal("MA", addr["state"], "Unexpected state: %v", addr["state"])
_, ok = addr["country"]
is.False(ok, "The country should be removed")
det, ok := dst["details"].(map[string]interface{})
req.True(t, ok, "Details is the wrong type: %v", dst["details"])
_, ok = det["friends"]
is.True(ok, "Could not find your friends. Maybe you don't have any. :-(")
is.Equal("pequod", dst["boat"], "Expected boat string, got %v", dst["boat"])
_, ok = dst["hole"]
is.False(ok, "The hole should be removed")
})
t.Run("case 2", func(_ *testing.T) {
is := assert.New(t)
dst2 := map[string]interface{}{
"name": "Ishmael",
"address": map[string]interface{}{
"street": "123 Spouter Inn Ct.",
"city": "Nantucket",
"country": "US",
},
"details": map[string]interface{}{
"friends": []string{"Tashtego"},
},
"boat": "pequod",
"hole": "black",
}
if addr2["city"].(string) != "Nantucket" {
t.Errorf("Unexpected city: %v", addr2["city"])
}
// What we expect is that anything in dst should have all values set,
// this happens when the --reuse-values flag is set but the chart has no modifications yet
CoalesceTables(dst2, nil)
is.Equal("Ishmael", dst2["name"], "Unexpected name: %s", dst2["name"])
addr2, ok := dst2["address"].(map[string]interface{})
req.True(t, ok, "Address went away.")
is.Equal("123 Spouter Inn Ct.", addr2["street"], "Unexpected address: %v", addr2["street"])
is.Equal("Nantucket", addr2["city"], "Unexpected city: %v", addr2["city"])
is.Equal("US", addr2["country"], "Unexpected country: %v", addr2["country"])
is.Equal("US", addr2["country"], "Unexpected country: %v", addr2["country"])
det2, ok := dst2["details"].(map[string]interface{})
req.True(t, ok, "Details is the wrong type: %v", dst2["details"])
_, ok = det2["friends"]
is.True(ok, "Could not find your friends. Maybe you don't have any. :-(")
is.Equal("pequod", dst2["boat"], "Expected boat string, got %v", dst2["boat"])
is.Equal("black", dst2["hole"], "Expected hole string, got %v", dst2["hole"])
})
t.Run("chart values with nil user value", func(t *testing.T) {
is := assert.New(t)
dst := map[string]any{
"foo": "bar",
"baz": nil, // explicit nil from user
}
if addr2["country"].(string) != "US" {
t.Errorf("Unexpected Country: %v", addr2["country"])
}
// Chart's default values (src - lower priority) - empty map
src := map[string]any{
"ben": nil,
}
if det2, ok := dst2["details"].(map[string]interface{}); !ok {
t.Fatalf("Details is the wrong type: %v", dst2["details"])
} else if _, ok := det2["friends"]; !ok {
t.Error("Could not find your friends. Maybe you don't have any. :-(")
}
CoalesceTables(dst, src)
if dst2["boat"].(string) != "pequod" {
t.Errorf("Expected boat string, got %v", dst2["boat"])
}
// "foo" should be preserved
is.Equal("bar", dst["foo"])
_, ok := dst["ben"]
is.True(ok, "Expected ben key to be present")
is.Nil(dst["ben"], "Expected ben key to be nil but it is not")
if dst2["hole"].(string) != "black" {
t.Errorf("Expected hole string, got %v", dst2["boat"])
}
_, ok = dst["baz"]
is.True(ok, "Expected baz key to be present but it was removed")
is.Nil(dst["baz"], "Expected baz key to be nil but it is not")
})
}
func TestMergeTables(t *testing.T) {
@ -731,3 +721,37 @@ func TestConcatPrefix(t *testing.T) {
assert.Equal(t, "b", concatPrefix("", "b"))
assert.Equal(t, "a.b", concatPrefix("a", "b"))
}
// TestCoalesceValuesEmptyMapWithNils tests the full CoalesceValues scenario
// from issue #31643 where chart has data: {} and user provides data: {foo: bar, baz: ~}
func TestCoalesceValuesEmptyMapWithNils(t *testing.T) {
is := assert.New(t)
c := &chart.Chart{
Metadata: &chart.Metadata{Name: "test"},
Values: map[string]any{
"data": map[string]any{}, // empty map in chart defaults
},
}
vals := map[string]any{
"data": map[string]any{
"foo": "bar",
"baz": nil, // explicit nil from user
},
}
v, err := CoalesceValues(c, vals)
is.NoError(err)
data, ok := v["data"].(map[string]any)
is.True(ok, "data is not a map")
// "foo" should be preserved
is.Equal("bar", data["foo"])
// "baz" should be preserved with nil value since it wasn't in chart defaults
_, ok = data["baz"]
is.True(ok, "Expected data.baz key to be present but it was removed")
is.Nil(data["baz"], "Expected data.baz key to be nil but it is not")
}

Write Preview
Loading…
Cancel
Save