From e0ec8028eb0f4c0964507e0df3cfa49e232733a3 Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Wed, 7 Nov 2018 14:05:40 -0800 Subject: [PATCH] Update TransformerConfig.Merge function to handle nil --- pkg/transformers/config/transformerconfig.go | 3 +++ pkg/transformers/config/transformerconfig_test.go | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/pkg/transformers/config/transformerconfig.go b/pkg/transformers/config/transformerconfig.go index c2bda9938..71e8707de 100644 --- a/pkg/transformers/config/transformerconfig.go +++ b/pkg/transformers/config/transformerconfig.go @@ -64,6 +64,9 @@ func (t *TransformerConfig) AddNamereferenceFieldSpec(nbrs NameBackReferences) { // Merge merges two TransformerConfigs objects into a new TransformerConfig object func (t *TransformerConfig) Merge(input *TransformerConfig) *TransformerConfig { + if input == nil { + return t + } merged := &TransformerConfig{} merged.NamePrefix = append(t.NamePrefix, input.NamePrefix...) merged.NameSpace = append(t.NameSpace, input.NameSpace...) diff --git a/pkg/transformers/config/transformerconfig_test.go b/pkg/transformers/config/transformerconfig_test.go index 86e81f09f..b73b01c2e 100644 --- a/pkg/transformers/config/transformerconfig_test.go +++ b/pkg/transformers/config/transformerconfig_test.go @@ -141,4 +141,9 @@ func TestMerge(t *testing.T) { if !reflect.DeepEqual(actual, expected) { 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) + } }