kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #536 from Liujingfang1/mergenil

Browse Source 
Update TransformerConfig.Merge function to handle nil
This commit is contained in:
k8s-ci-robot
2018-11-07 19:19:33 -08:00
committed by GitHub
parent 5c4a778e6a e0ec8028eb
commit e089a56e05
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/transformers/config/transformerconfig.go
View File

@@ -64,6 +64,9 @@ func (t *TransformerConfig) AddNamereferenceFieldSpec(nbrs NameBackReferences) {
// Merge merges two TransformerConfigs objects into a new TransformerConfig object // Merge merges two TransformerConfigs objects into a new TransformerConfig object
func (t *TransformerConfig) Merge(input *TransformerConfig) *TransformerConfig { func (t *TransformerConfig) Merge(input *TransformerConfig) *TransformerConfig {
if input == nil {
return t
}
merged := &TransformerConfig{} merged := &TransformerConfig{}
merged.NamePrefix = append(t.NamePrefix, input.NamePrefix...) merged.NamePrefix = append(t.NamePrefix, input.NamePrefix...)
merged.NameSpace = append(t.NameSpace, input.NameSpace...) merged.NameSpace = append(t.NameSpace, input.NameSpace...)

5
pkg/transformers/config/transformerconfig_test.go
View File

@@ -141,4 +141,9 @@ func TestMerge(t *testing.T) {
if !reflect.DeepEqual(actual, expected) { if !reflect.DeepEqual(actual, expected) {
t.Fatalf("expected: %v\n but got: %v\n", expected, actual) t.Fatalf("expected: %v\n but got: %v\n", expected, actual)
} }
actual = cfga.Merge(nil)
if !reflect.DeepEqual(actual, cfga) {
t.Fatalf("expected: %v\n but got: %v\n", cfga, actual)
}
} }