kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Improve error message for merge error

Browse Source
This commit is contained in:
Donny Xia
2020-05-26 10:12:33 -07:00
parent 9e40cc177a
commit e05404f89c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/krusty/generatormergeandreplace_test.go
View File

@@ -541,7 +541,7 @@ configMapGenerator:
if err == nil {
t.Fatalf("expected error")
}
if !strings.Contains(err.Error(), "must merge or replace") {
if !strings.Contains(err.Error(), "behavior must be merge or replace") {
t.Fatalf("unexpected error %v", err)
}
}
@@ -566,7 +566,7 @@ secretGenerator:
if err == nil {
t.Fatalf("expected error")
}
if !strings.Contains(err.Error(), "must merge or replace") {
if !strings.Contains(err.Error(), "behavior must be merge or replace") {
t.Fatalf("unexpected error %v", err)
}
}

2
api/resmap/resmap.go
View File

@@ -691,7 +691,7 @@ func (m *resWrangler) appendReplaceOrMerge(
res.Merge(old)
default:
return fmt.Errorf(
"id %#v exists; must merge or replace", id)
"id %#v exists; behavior must be merge or replace", id)
}
i, err := m.Replace(res)
if err != nil {