From f35e16bd8d59566ab789b5a26622a10f2054169b Mon Sep 17 00:00:00 2001 From: jregan Date: Fri, 28 Sep 2018 10:17:14 -0700 Subject: [PATCH] Simplify default config code. --- pkg/app/application_test.go | 9 +++------ pkg/commands/build.go | 12 ++---------- pkg/transformerconfig/transformerconfig.go | 12 +++++++++--- pkg/transformerconfig/transformerconfig_test.go | 6 ++---- pkg/transformers/labelsandannotations_test.go | 17 ++++++----------- pkg/transformers/namereference_test.go | 7 +------ pkg/transformers/namespace_test.go | 8 ++------ pkg/transformers/prefixname_test.go | 7 ++----- 8 files changed, 27 insertions(+), 51 deletions(-) diff --git a/pkg/app/application_test.go b/pkg/app/application_test.go index 91e72add9..7a127d19c 100644 --- a/pkg/app/application_test.go +++ b/pkg/app/application_test.go @@ -204,8 +204,7 @@ func TestResources1(t *testing.T) { l := makeLoader1(t) fakeFs := fs.MakeFakeFS() fakeFs.Mkdir("/") - cfg, _ := transformerconfig.MakeDefaultTransformerConfig() - app, err := NewApplication(l, fakeFs, cfg) + app, err := NewApplication(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig()) if err != nil { t.Fatalf("Unexpected construction error %v", err) } @@ -228,8 +227,7 @@ func TestResourceNotFound(t *testing.T) { } fakeFs := fs.MakeFakeFS() fakeFs.Mkdir("/") - cfg, _ := transformerconfig.MakeDefaultTransformerConfig() - app, err := NewApplication(l, fakeFs, cfg) + app, err := NewApplication(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig()) if err != nil { t.Fatalf("Unexpected construction error %v", err) } @@ -250,8 +248,7 @@ func TestSecretTimeout(t *testing.T) { } fakeFs := fs.MakeFakeFS() fakeFs.Mkdir("/") - cfg, _ := transformerconfig.MakeDefaultTransformerConfig() - app, err := NewApplication(l, fakeFs, cfg) + app, err := NewApplication(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig()) if err != nil { t.Fatalf("Unexpected construction error %v", err) } diff --git a/pkg/commands/build.go b/pkg/commands/build.go index 310db2288..93adfa1fa 100644 --- a/pkg/commands/build.go +++ b/pkg/commands/build.go @@ -94,28 +94,20 @@ func (o *buildOptions) RunBuild(out io.Writer, fSys fs.FileSystem) error { return err } defer rootLoader.Cleanup() - - cfg, err := transformerconfig.MakeDefaultTransformerConfig() + application, err := app.NewApplication( + rootLoader, fSys, transformerconfig.MakeDefaultTransformerConfig()) if err != nil { return err } - application, err := app.NewApplication(rootLoader, fSys, cfg) - if err != nil { - return err - } - allResources, err := application.MakeCustomizedResMap() - if err != nil { return err } - // Output the objects. res, err := allResources.EncodeAsYaml() if err != nil { return err } - if o.outputPath != "" { return fSys.WriteFile(o.outputPath, res) } diff --git a/pkg/transformerconfig/transformerconfig.go b/pkg/transformerconfig/transformerconfig.go index b20a0f634..7af519e1d 100644 --- a/pkg/transformerconfig/transformerconfig.go +++ b/pkg/transformerconfig/transformerconfig.go @@ -20,6 +20,7 @@ package transformerconfig import ( "github.com/ghodss/yaml" + "log" "sigs.k8s.io/kustomize/pkg/loader" "sigs.k8s.io/kustomize/pkg/transformerconfig/defaultconfig" ) @@ -98,7 +99,12 @@ func MakeEmptyTransformerConfig() *TransformerConfig { return &TransformerConfig{} } -// MakeDefaultTransformerConfig returns a TransformerConfig object from the default configurations -func MakeDefaultTransformerConfig() (*TransformerConfig, error) { - return MakeTransformerConfigFromBytes(defaultconfig.GetDefaultPathConfigs()) +// MakeDefaultTransformerConfig returns a default TransformerConfig. +// This should never fail, hence the Fatal panic. +func MakeDefaultTransformerConfig() *TransformerConfig { + c, err := MakeTransformerConfigFromBytes(defaultconfig.GetDefaultPathConfigs()) + if err != nil { + log.Fatalf("Unable to make default transformconfig: %v", err) + } + return c } diff --git a/pkg/transformerconfig/transformerconfig_test.go b/pkg/transformerconfig/transformerconfig_test.go index a1bdde578..6562de100 100644 --- a/pkg/transformerconfig/transformerconfig_test.go +++ b/pkg/transformerconfig/transformerconfig_test.go @@ -143,8 +143,6 @@ func TestMerge(t *testing.T) { } func TestMakeDefaultTransformerConfig(t *testing.T) { - _, err := MakeDefaultTransformerConfig() - if err != nil { - t.Fatalf("unexpected error %v\n", err) - } + // Confirm default can be made without fatal error inside call. + _ = MakeDefaultTransformerConfig() } diff --git a/pkg/transformers/labelsandannotations_test.go b/pkg/transformers/labelsandannotations_test.go index 3d75bee6e..f909af77a 100644 --- a/pkg/transformers/labelsandannotations_test.go +++ b/pkg/transformers/labelsandannotations_test.go @@ -414,12 +414,9 @@ func TestLabelsRun(t *testing.T) { }, }), } - - tcfg, err := transformerconfig.MakeDefaultTransformerConfig() - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - lt, err := NewLabelsMapTransformer(map[string]string{"label-key1": "label-value1", "label-key2": "label-value2"}, tcfg.CommonLabels) + lt, err := NewLabelsMapTransformer( + map[string]string{"label-key1": "label-value1", "label-key2": "label-value2"}, + transformerconfig.MakeDefaultTransformerConfig().CommonLabels) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -554,11 +551,9 @@ func TestAnnotationsRun(t *testing.T) { }, }), } - tcfg, err := transformerconfig.MakeDefaultTransformerConfig() - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - at, err := NewAnnotationsMapTransformer(map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"}, tcfg.CommonAnnotations) + at, err := NewAnnotationsMapTransformer( + map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"}, + transformerconfig.MakeDefaultTransformerConfig().CommonAnnotations) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/transformers/namereference_test.go b/pkg/transformers/namereference_test.go index f33baa2f4..e3a48e03a 100644 --- a/pkg/transformers/namereference_test.go +++ b/pkg/transformers/namereference_test.go @@ -322,12 +322,7 @@ func TestNameReferenceRun(t *testing.T) { }, }, ) - - tcfg, err := transformerconfig.MakeDefaultTransformerConfig() - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - nrt, err := NewNameReferenceTransformer(tcfg.NameReference) + nrt, err := NewNameReferenceTransformer(transformerconfig.MakeDefaultTransformerConfig().NameReference) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/transformers/namespace_test.go b/pkg/transformers/namespace_test.go index 56d995f77..b02995b69 100644 --- a/pkg/transformers/namespace_test.go +++ b/pkg/transformers/namespace_test.go @@ -184,12 +184,8 @@ func TestNamespaceRun(t *testing.T) { }), } - tcfg, err := transformerconfig.MakeDefaultTransformerConfig() - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - nst := NewNamespaceTransformer("test", tcfg.NameSpace) - err = nst.Transform(m) + nst := NewNamespaceTransformer("test", transformerconfig.MakeDefaultTransformerConfig().NameSpace) + err := nst.Transform(m) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/transformers/prefixname_test.go b/pkg/transformers/prefixname_test.go index d77841a96..54599782c 100644 --- a/pkg/transformers/prefixname_test.go +++ b/pkg/transformers/prefixname_test.go @@ -79,11 +79,8 @@ func TestPrefixNameRun(t *testing.T) { }), } - tcfg, err := transformerconfig.MakeDefaultTransformerConfig() - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - npt, err := NewNamePrefixTransformer("someprefix-", tcfg.NamePrefix) + npt, err := NewNamePrefixTransformer( + "someprefix-", transformerconfig.MakeDefaultTransformerConfig().NamePrefix) if err != nil { t.Fatalf("unexpected error: %v", err) }