From 30814302aff787b413b31aaafe9fbbe1fb9a9482 Mon Sep 17 00:00:00 2001 From: Jeff Regan Date: Mon, 8 Oct 2018 15:58:44 -0700 Subject: [PATCH] Fix some minor naming mistakes. (#434) * Fix some minor naming mistakes. * Fix some minor naming mistakes. --- internal/k8sdeps/kunstructuredfactory.go | 4 ++-- internal/k8sdeps/kunstructuredfactory_test.go | 2 +- internal/k8sdeps/patch/patch_test.go | 2 +- internal/k8sdeps/unstructadapter_test.go | 2 +- kustomize.go | 2 +- pkg/commands/build/build.go | 4 ++-- pkg/commands/build/build_test.go | 2 +- pkg/commands/commands.go | 2 +- pkg/crds/crds_test.go | 20 +++++++++---------- pkg/ifc/patch/patch.go | 4 ++-- pkg/patch/transformer/factory_test.go | 2 +- .../transformer/patchjson6902json_test.go | 2 +- pkg/resmap/resmap_test.go | 2 +- pkg/resource/resource_test.go | 2 +- pkg/target/kusttarget.go | 4 ++-- pkg/target/kusttarget_test.go | 2 +- pkg/transformers/imagetag_test.go | 2 +- pkg/transformers/labelsandannotations_test.go | 2 +- pkg/transformers/namehash_test.go | 2 +- pkg/transformers/namereference_test.go | 2 +- pkg/transformers/namespace_test.go | 2 +- pkg/transformers/prefixname_test.go | 2 +- 22 files changed, 35 insertions(+), 35 deletions(-) diff --git a/internal/k8sdeps/kunstructuredfactory.go b/internal/k8sdeps/kunstructuredfactory.go index 39dd2acb4..cf05da1d6 100644 --- a/internal/k8sdeps/kunstructuredfactory.go +++ b/internal/k8sdeps/kunstructuredfactory.go @@ -29,8 +29,8 @@ type KunstructurerFactoryImpl struct { var _ ifc.KunstructuredFactory = &KunstructurerFactoryImpl{} -// NewKustKunstructuredFactory returns a factory. -func NewKustKunstructuredFactory(d ifc.Decoder) ifc.KunstructuredFactory { +// NewKunstructuredFactoryImpl returns a factory. +func NewKunstructuredFactoryImpl(d ifc.Decoder) ifc.KunstructuredFactory { return &KunstructurerFactoryImpl{decoder: d} } diff --git a/internal/k8sdeps/kunstructuredfactory_test.go b/internal/k8sdeps/kunstructuredfactory_test.go index 5e77a1e7e..1ac71fdf8 100644 --- a/internal/k8sdeps/kunstructuredfactory_test.go +++ b/internal/k8sdeps/kunstructuredfactory_test.go @@ -24,7 +24,7 @@ import ( ) func TestSliceFromBytes(t *testing.T) { - factory := NewKustKunstructuredFactory(NewKustDecoder()) + factory := NewKunstructuredFactoryImpl(NewKustDecoder()) testConfigMap := factory.FromMap( map[string]interface{}{ "apiVersion": "v1", diff --git a/internal/k8sdeps/patch/patch_test.go b/internal/k8sdeps/patch/patch_test.go index 9ff854b39..c8d0449d9 100644 --- a/internal/k8sdeps/patch/patch_test.go +++ b/internal/k8sdeps/patch/patch_test.go @@ -29,7 +29,7 @@ import ( ) var rf = resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) var deploy = gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"} var foo = gvk.Gvk{Group: "example.com", Version: "v1", Kind: "Foo"} diff --git a/internal/k8sdeps/unstructadapter_test.go b/internal/k8sdeps/unstructadapter_test.go index e9cf685c0..c7d7fa672 100644 --- a/internal/k8sdeps/unstructadapter_test.go +++ b/internal/k8sdeps/unstructadapter_test.go @@ -21,7 +21,7 @@ import ( ) func TestGetFieldValue(t *testing.T) { - factory := NewKustKunstructuredFactory(NewKustDecoder()) + factory := NewKunstructuredFactoryImpl(NewKustDecoder()) kunstructured := factory.FromMap(map[string]interface{}{ "Kind": "Service", "metadata": map[string]interface{}{ diff --git a/kustomize.go b/kustomize.go index 621b499a1..eb8bab2ee 100644 --- a/kustomize.go +++ b/kustomize.go @@ -29,7 +29,7 @@ func main() { defer glog.Flush() if err := commands.NewDefaultCommand( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder()), + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder()), patch.NewPatchTransformerFactory(), k8sdeps.NewKustDecoder(), k8sdeps.NewKustValidator(), diff --git a/pkg/commands/build/build.go b/pkg/commands/build/build.go index 04fa2bccf..67421efe9 100644 --- a/pkg/commands/build/build.go +++ b/pkg/commands/build/build.go @@ -64,7 +64,7 @@ Use different transformer configurations by passing files to kustomize func NewCmdBuild( out io.Writer, fs fs.FileSystem, kf ifc.KunstructuredFactory, - ptf patch.PatchTransformerFactory, + ptf patch.TransformerFactory, decoder ifc.Decoder, hash ifc.Hash) *cobra.Command { var o buildOptions var p string @@ -125,7 +125,7 @@ func (o *buildOptions) Validate(args []string, p string, fs fs.FileSystem) error func (o *buildOptions) RunBuild( out io.Writer, fSys fs.FileSystem, kf ifc.KunstructuredFactory, - ptf patch.PatchTransformerFactory, + ptf patch.TransformerFactory, decoder ifc.Decoder, hash ifc.Hash) error { rootLoader, err := loader.NewLoader(o.kustomizationPath, "", fSys) if err != nil { diff --git a/pkg/commands/build/build_test.go b/pkg/commands/build/build_test.go index 958469f1f..7bfded34b 100644 --- a/pkg/commands/build/build_test.go +++ b/pkg/commands/build/build_test.go @@ -131,7 +131,7 @@ func runBuildTestCase(t *testing.T, testcaseName string, updateKustomizeExpected buf := bytes.NewBuffer([]byte{}) err = ops.RunBuild( buf, fSys, - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder()), + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder()), patch.NewPatchTransformerFactory(), k8sdeps.NewKustDecoder(), k8sdeps.NewKustHash()) switch { diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go index 68252ca17..f9ad8aca1 100644 --- a/pkg/commands/commands.go +++ b/pkg/commands/commands.go @@ -32,7 +32,7 @@ import ( // NewDefaultCommand returns the default (aka root) command for kustomize command. func NewDefaultCommand( - kf ifc.KunstructuredFactory, ptf patch.PatchTransformerFactory, + kf ifc.KunstructuredFactory, ptf patch.TransformerFactory, decoder ifc.Decoder, validator ifc.Validator, hash ifc.Hash) *cobra.Command { fsys := fs.MakeRealFS() diff --git a/pkg/crds/crds_test.go b/pkg/crds/crds_test.go index 224291f25..13ba9cb73 100644 --- a/pkg/crds/crds_test.go +++ b/pkg/crds/crds_test.go @@ -151,16 +151,6 @@ func makeLoader(t *testing.T) ifc.Loader { func TestRegisterCRD(t *testing.T) { refpathconfigs := []transformerconfig.ReferencePathConfig{ - { - Gvk: gvk.Gvk{Kind: "Bee", Version: "v1beta1"}, - PathConfigs: []transformerconfig.PathConfig{ - { - CreateIfNotPresent: false, - Gvk: gvk.Gvk{Kind: "MyKind"}, - Path: "spec/beeRef/name", - }, - }, - }, { Gvk: gvk.Gvk{Kind: "Secret", Version: "v1"}, PathConfigs: []transformerconfig.PathConfig{ @@ -171,6 +161,16 @@ func TestRegisterCRD(t *testing.T) { }, }, }, + { + Gvk: gvk.Gvk{Kind: "Bee", Version: "v1beta1"}, + PathConfigs: []transformerconfig.PathConfig{ + { + CreateIfNotPresent: false, + Gvk: gvk.Gvk{Kind: "MyKind"}, + Path: "spec/beeRef/name", + }, + }, + }, } expected := &transformerconfig.TransformerConfig{ diff --git a/pkg/ifc/patch/patch.go b/pkg/ifc/patch/patch.go index 6d188cabf..c808bfc1f 100644 --- a/pkg/ifc/patch/patch.go +++ b/pkg/ifc/patch/patch.go @@ -22,7 +22,7 @@ import ( "sigs.k8s.io/kustomize/pkg/transformers" ) -// PatchTransformerFactory makes patch transformer. -type PatchTransformerFactory interface { +// TransformerFactory makes patch transformer. +type TransformerFactory interface { MakePatchTransformer(slice []*resource.Resource, rf *resource.Factory) (transformers.Transformer, error) } diff --git a/pkg/patch/transformer/factory_test.go b/pkg/patch/transformer/factory_test.go index 268c45686..5f241bff1 100644 --- a/pkg/patch/transformer/factory_test.go +++ b/pkg/patch/transformer/factory_test.go @@ -32,7 +32,7 @@ import ( ) var rf = resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) func TestNewPatchJson6902FactoryNoTarget(t *testing.T) { p := patch.Json6902{} diff --git a/pkg/patch/transformer/patchjson6902json_test.go b/pkg/patch/transformer/patchjson6902json_test.go index 564933c54..78fecb8bc 100644 --- a/pkg/patch/transformer/patchjson6902json_test.go +++ b/pkg/patch/transformer/patchjson6902json_test.go @@ -32,7 +32,7 @@ var deploy = gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"} func TestJsonPatchJSONTransformer_Transform(t *testing.T) { rf := resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) id := resid.NewResId(deploy, "deploy1") base := resmap.ResMap{ id: rf.FromMap( diff --git a/pkg/resmap/resmap_test.go b/pkg/resmap/resmap_test.go index a48d8a106..c09f86c4e 100644 --- a/pkg/resmap/resmap_test.go +++ b/pkg/resmap/resmap_test.go @@ -30,7 +30,7 @@ import ( var deploy = gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"} var statefulset = gvk.Gvk{Group: "apps", Version: "v1", Kind: "StatefulSet"} var rf = resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) var rmF = NewFactory(rf) func TestEncodeAsYaml(t *testing.T) { diff --git a/pkg/resource/resource_test.go b/pkg/resource/resource_test.go index 4a4677e19..17ef7fd87 100644 --- a/pkg/resource/resource_test.go +++ b/pkg/resource/resource_test.go @@ -23,7 +23,7 @@ import ( ) var factory = NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) var testConfigMap = factory.FromMap( map[string]interface{}{ diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index 16e0a3a39..e7ed0fa1e 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -50,14 +50,14 @@ type KustTarget struct { fSys fs.FileSystem rf *resmap.Factory tcfg *transformerconfig.TransformerConfig - ptf patch.PatchTransformerFactory + ptf patch.TransformerFactory } // NewKustTarget returns a new instance of KustTarget primed with a Loader. func NewKustTarget( ldr ifc.Loader, fSys fs.FileSystem, rf *resmap.Factory, - ptf patch.PatchTransformerFactory, + ptf patch.TransformerFactory, tcfg *transformerconfig.TransformerConfig, d ifc.Decoder, h ifc.Hash) (*KustTarget, error) { content, err := ldr.Load(constants.KustomizationFileName) diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 3825e54ee..c181ae6ca 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -90,7 +90,7 @@ metadata: ) var rf = resmap.NewFactory(resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder()))) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder()))) func makeLoader1(t *testing.T) ifc.Loader { ldr := loadertest.NewFakeLoader("/testpath") diff --git a/pkg/transformers/imagetag_test.go b/pkg/transformers/imagetag_test.go index 99c56d5d8..8de2fb403 100644 --- a/pkg/transformers/imagetag_test.go +++ b/pkg/transformers/imagetag_test.go @@ -30,7 +30,7 @@ import ( func TestImageTagTransformer(t *testing.T) { var rf = resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) m := resmap.ResMap{ resid.NewResId(deploy, "deploy1"): rf.FromMap( diff --git a/pkg/transformers/labelsandannotations_test.go b/pkg/transformers/labelsandannotations_test.go index c65a14df6..862558bad 100644 --- a/pkg/transformers/labelsandannotations_test.go +++ b/pkg/transformers/labelsandannotations_test.go @@ -42,7 +42,7 @@ var crb = gvk.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "Clus var sa = gvk.Gvk{Version: "v1", Kind: "ServiceAccount"} var ingress = gvk.Gvk{Kind: "Ingress"} var rf = resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) func TestLabelsRun(t *testing.T) { m := resmap.ResMap{ diff --git a/pkg/transformers/namehash_test.go b/pkg/transformers/namehash_test.go index e8aa0c7d1..6d02bb178 100644 --- a/pkg/transformers/namehash_test.go +++ b/pkg/transformers/namehash_test.go @@ -29,7 +29,7 @@ import ( func TestNameHashTransformer(t *testing.T) { rf := resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) objs := resmap.ResMap{ resid.NewResId(cmap, "cm1"): rf.FromMap( map[string]interface{}{ diff --git a/pkg/transformers/namereference_test.go b/pkg/transformers/namereference_test.go index ce3951918..085063abb 100644 --- a/pkg/transformers/namereference_test.go +++ b/pkg/transformers/namereference_test.go @@ -29,7 +29,7 @@ import ( func TestNameReferenceRun(t *testing.T) { rf := resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) m := resmap.ResMap{ resid.NewResId(cmap, "cm1"): rf.FromMap( map[string]interface{}{ diff --git a/pkg/transformers/namespace_test.go b/pkg/transformers/namespace_test.go index a30c52049..b566af0aa 100644 --- a/pkg/transformers/namespace_test.go +++ b/pkg/transformers/namespace_test.go @@ -29,7 +29,7 @@ import ( func TestNamespaceRun(t *testing.T) { rf := resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) m := resmap.ResMap{ resid.NewResId(cmap, "cm1"): rf.FromMap( map[string]interface{}{ diff --git a/pkg/transformers/prefixname_test.go b/pkg/transformers/prefixname_test.go index d6befeb3a..f5ae3a957 100644 --- a/pkg/transformers/prefixname_test.go +++ b/pkg/transformers/prefixname_test.go @@ -29,7 +29,7 @@ import ( func TestPrefixNameRun(t *testing.T) { rf := resource.NewFactory( - k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder())) + k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())) m := resmap.ResMap{ resid.NewResId(cmap, "cm1"): rf.FromMap( map[string]interface{}{