diff --git a/pkg/commands/build/build.go b/pkg/commands/build/build.go index c6f5fb6f7..bf74a05ff 100644 --- a/pkg/commands/build/build.go +++ b/pkg/commands/build/build.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/target" - "sigs.k8s.io/kustomize/pkg/transformerconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config" ) type buildOptions struct { @@ -159,14 +159,14 @@ func (o *buildOptions) RunBuild( // makeTransformerConfig returns a complete TransformerConfig object from either files // or the default configs func makeTransformerconfig( - fSys fs.FileSystem, paths []string) (*transformerconfig.TransformerConfig, error) { + fSys fs.FileSystem, paths []string) (*config.TransformerConfig, error) { if paths == nil || len(paths) == 0 { - return transformerconfig.NewFactory(nil).DefaultConfig(), nil + return config.NewFactory(nil).DefaultConfig(), nil } ldr, err := loader.NewLoader(".", "", fSys) if err != nil { return nil, errors.Wrap( err, "cannot create transformer configuration loader") } - return transformerconfig.NewFactory(ldr).FromFiles(paths) + return config.NewFactory(ldr).FromFiles(paths) } diff --git a/pkg/commands/misc/config.go b/pkg/commands/misc/config.go index 4b480556f..46cde4de8 100644 --- a/pkg/commands/misc/config.go +++ b/pkg/commands/misc/config.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/transformerconfig/defaultconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config/defaultconfig" ) // NewCmdConfig returns an instance of 'config' subcommand. diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index 20f9fa90a..6c1ffae2e 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -34,8 +34,8 @@ import ( patchtransformer "sigs.k8s.io/kustomize/pkg/patch/transformer" "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformerconfig" "sigs.k8s.io/kustomize/pkg/transformers" + "sigs.k8s.io/kustomize/pkg/transformers/config" "sigs.k8s.io/kustomize/pkg/types" ) @@ -45,7 +45,7 @@ type KustTarget struct { ldr ifc.Loader fSys fs.FileSystem rf *resmap.Factory - tcfg *transformerconfig.TransformerConfig + tcfg *config.TransformerConfig ptf transformer.Factory } @@ -54,7 +54,7 @@ func NewKustTarget( ldr ifc.Loader, fSys fs.FileSystem, rf *resmap.Factory, ptf transformer.Factory, - tcfg *transformerconfig.TransformerConfig) (*KustTarget, error) { + tcfg *config.TransformerConfig) (*KustTarget, error) { content, err := ldr.Load(constants.KustomizationFileName) if err != nil { return nil, err @@ -132,8 +132,7 @@ func (kt *KustTarget) loadCustomizedResMap() (resmap.ResMap, error) { if err != nil { errs.Append(errors.Wrap(err, "loadResMapFromBasesAndResources")) } - crdPathConfigs, err := transformerconfig. - NewFactory(kt.ldr).LoadCRDs(kt.kustomization.Crds) + crdPathConfigs, err := config.NewFactory(kt.ldr).LoadCRDs(kt.kustomization.Crds) kt.tcfg = kt.tcfg.Merge(crdPathConfigs) if err != nil { errs.Append(errors.Wrap(err, "LoadCRDs")) diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index d8a9c958c..b226926d7 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -32,7 +32,7 @@ import ( "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformerconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config" ) const ( @@ -96,7 +96,7 @@ func makeKustTarget(t *testing.T, l ifc.Loader) *KustTarget { fakeFs.Mkdir("/") kt, err := NewKustTarget( l, fakeFs, rf, transformer.NewFactoryImpl(), - transformerconfig.NewFactory(l).DefaultConfig()) + config.NewFactory(l).DefaultConfig()) if err != nil { t.Fatalf("Unexpected construction error %v", err) } diff --git a/pkg/transformerconfig/constants.go b/pkg/transformers/config/constants.go similarity index 98% rename from pkg/transformerconfig/constants.go rename to pkg/transformers/config/constants.go index 58b4bc8dd..357b8950f 100644 --- a/pkg/transformerconfig/constants.go +++ b/pkg/transformers/config/constants.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config // Annotation is to mark a field as annotations. // "x-kubernetes-annotation": "" diff --git a/pkg/transformerconfig/defaultconfig/commonannotations.go b/pkg/transformers/config/defaultconfig/commonannotations.go similarity index 100% rename from pkg/transformerconfig/defaultconfig/commonannotations.go rename to pkg/transformers/config/defaultconfig/commonannotations.go diff --git a/pkg/transformerconfig/defaultconfig/commonlabels.go b/pkg/transformers/config/defaultconfig/commonlabels.go similarity index 100% rename from pkg/transformerconfig/defaultconfig/commonlabels.go rename to pkg/transformers/config/defaultconfig/commonlabels.go diff --git a/pkg/transformerconfig/defaultconfig/defaultconfig.go b/pkg/transformers/config/defaultconfig/defaultconfig.go similarity index 100% rename from pkg/transformerconfig/defaultconfig/defaultconfig.go rename to pkg/transformers/config/defaultconfig/defaultconfig.go diff --git a/pkg/transformerconfig/defaultconfig/nameprefix.go b/pkg/transformers/config/defaultconfig/nameprefix.go similarity index 100% rename from pkg/transformerconfig/defaultconfig/nameprefix.go rename to pkg/transformers/config/defaultconfig/nameprefix.go diff --git a/pkg/transformerconfig/defaultconfig/namereference.go b/pkg/transformers/config/defaultconfig/namereference.go similarity index 100% rename from pkg/transformerconfig/defaultconfig/namereference.go rename to pkg/transformers/config/defaultconfig/namereference.go diff --git a/pkg/transformerconfig/defaultconfig/namespace.go b/pkg/transformers/config/defaultconfig/namespace.go similarity index 100% rename from pkg/transformerconfig/defaultconfig/namespace.go rename to pkg/transformers/config/defaultconfig/namespace.go diff --git a/pkg/transformerconfig/defaultconfig/varreference.go b/pkg/transformers/config/defaultconfig/varreference.go similarity index 100% rename from pkg/transformerconfig/defaultconfig/varreference.go rename to pkg/transformers/config/defaultconfig/varreference.go diff --git a/pkg/transformerconfig/factory.go b/pkg/transformers/config/factory.go similarity index 96% rename from pkg/transformerconfig/factory.go rename to pkg/transformers/config/factory.go index 28686eaf7..698ef1ac1 100644 --- a/pkg/transformerconfig/factory.go +++ b/pkg/transformers/config/factory.go @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config import ( "log" "github.com/ghodss/yaml" "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/transformerconfig/defaultconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config/defaultconfig" ) // Factory makes instances of TransformerConfig. diff --git a/pkg/transformerconfig/factory_test.go b/pkg/transformers/config/factory_test.go similarity index 98% rename from pkg/transformerconfig/factory_test.go rename to pkg/transformers/config/factory_test.go index 6988f2022..5b0fcabd0 100644 --- a/pkg/transformerconfig/factory_test.go +++ b/pkg/transformers/config/factory_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config import ( "reflect" diff --git a/pkg/transformerconfig/factorycrd.go b/pkg/transformers/config/factorycrd.go similarity index 99% rename from pkg/transformerconfig/factorycrd.go rename to pkg/transformers/config/factorycrd.go index c9a23f81a..475f7445b 100644 --- a/pkg/transformerconfig/factorycrd.go +++ b/pkg/transformers/config/factorycrd.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config import ( "encoding/json" diff --git a/pkg/transformerconfig/factorycrd_test.go b/pkg/transformers/config/factorycrd_test.go similarity index 99% rename from pkg/transformerconfig/factorycrd_test.go rename to pkg/transformers/config/factorycrd_test.go index a0fe42c10..495000240 100644 --- a/pkg/transformerconfig/factorycrd_test.go +++ b/pkg/transformers/config/factorycrd_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config import ( "reflect" diff --git a/pkg/transformerconfig/pathconfig.go b/pkg/transformers/config/pathconfig.go similarity index 98% rename from pkg/transformerconfig/pathconfig.go rename to pkg/transformers/config/pathconfig.go index 906eacb24..201d71fb6 100644 --- a/pkg/transformerconfig/pathconfig.go +++ b/pkg/transformers/config/pathconfig.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config import ( "strings" diff --git a/pkg/transformerconfig/pathconfig_test.go b/pkg/transformers/config/pathconfig_test.go similarity index 97% rename from pkg/transformerconfig/pathconfig_test.go rename to pkg/transformers/config/pathconfig_test.go index 08c374ff2..d91662418 100644 --- a/pkg/transformerconfig/pathconfig_test.go +++ b/pkg/transformers/config/pathconfig_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config import ( "reflect" diff --git a/pkg/transformerconfig/referencepathconfig.go b/pkg/transformers/config/referencepathconfig.go similarity index 98% rename from pkg/transformerconfig/referencepathconfig.go rename to pkg/transformers/config/referencepathconfig.go index 1e915febc..5dacaeb4f 100644 --- a/pkg/transformerconfig/referencepathconfig.go +++ b/pkg/transformers/config/referencepathconfig.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config import ( "sigs.k8s.io/kustomize/pkg/gvk" diff --git a/pkg/transformerconfig/transformerconfig.go b/pkg/transformers/config/transformerconfig.go similarity index 96% rename from pkg/transformerconfig/transformerconfig.go rename to pkg/transformers/config/transformerconfig.go index 3fe92a4fe..22dc6ddbb 100644 --- a/pkg/transformerconfig/transformerconfig.go +++ b/pkg/transformers/config/transformerconfig.go @@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package transformerconfig provides the functions to load default or user provided configurations +// Package config provides the functions to load default or user provided configurations // for different transformers -package transformerconfig +package config import ( "sort" diff --git a/pkg/transformerconfig/transformerconfig_test.go b/pkg/transformers/config/transformerconfig_test.go similarity index 99% rename from pkg/transformerconfig/transformerconfig_test.go rename to pkg/transformers/config/transformerconfig_test.go index 7616407c6..f2d769761 100644 --- a/pkg/transformerconfig/transformerconfig_test.go +++ b/pkg/transformers/config/transformerconfig_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package transformerconfig +package config import ( "testing" diff --git a/pkg/transformers/labelsandannotations.go b/pkg/transformers/labelsandannotations.go index ea8070279..0d694531e 100644 --- a/pkg/transformers/labelsandannotations.go +++ b/pkg/transformers/labelsandannotations.go @@ -21,30 +21,30 @@ import ( "fmt" "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformerconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config" ) // mapTransformer contains a map string->string and path configs // The map will be applied to the fields specified in path configs. type mapTransformer struct { m map[string]string - pathConfigs []transformerconfig.PathConfig + pathConfigs []config.PathConfig } var _ Transformer = &mapTransformer{} // NewLabelsMapTransformer construct a mapTransformer with a given pathConfig slice -func NewLabelsMapTransformer(m map[string]string, p []transformerconfig.PathConfig) (Transformer, error) { +func NewLabelsMapTransformer(m map[string]string, p []config.PathConfig) (Transformer, error) { return NewMapTransformer(p, m) } // NewAnnotationsMapTransformer construct a mapTransformer with a given pathConfig slice -func NewAnnotationsMapTransformer(m map[string]string, p []transformerconfig.PathConfig) (Transformer, error) { +func NewAnnotationsMapTransformer(m map[string]string, p []config.PathConfig) (Transformer, error) { return NewMapTransformer(p, m) } // NewMapTransformer construct a mapTransformer. -func NewMapTransformer(pc []transformerconfig.PathConfig, m map[string]string) (Transformer, error) { +func NewMapTransformer(pc []config.PathConfig, m map[string]string) (Transformer, error) { if m == nil { return NewNoOpTransformer(), nil } diff --git a/pkg/transformers/labelsandannotations_test.go b/pkg/transformers/labelsandannotations_test.go index b6e6ac24c..45cdffb23 100644 --- a/pkg/transformers/labelsandannotations_test.go +++ b/pkg/transformers/labelsandannotations_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformerconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config" ) var service = gvk.Gvk{Version: "v1", Kind: "Service"} @@ -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.NewKunstructuredFactoryImpl()) -var defaultTransformerConfig = transformerconfig.NewFactory(nil).DefaultConfig() +var defaultTransformerConfig = config.NewFactory(nil).DefaultConfig() func TestLabelsRun(t *testing.T) { m := resmap.ResMap{ diff --git a/pkg/transformers/namereference.go b/pkg/transformers/namereference.go index 0ce85ec12..53f10328c 100644 --- a/pkg/transformers/namereference.go +++ b/pkg/transformers/namereference.go @@ -23,19 +23,19 @@ import ( "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformerconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config" ) // nameReferenceTransformer contains the referencing info between 2 GroupVersionKinds type nameReferenceTransformer struct { - pathConfigs []transformerconfig.ReferencePathConfig + pathConfigs []config.ReferencePathConfig } var _ Transformer = &nameReferenceTransformer{} // NewNameReferenceTransformer constructs a nameReferenceTransformer // with a given Reference PathConfig slice -func NewNameReferenceTransformer(pc []transformerconfig.ReferencePathConfig) (Transformer, error) { +func NewNameReferenceTransformer(pc []config.ReferencePathConfig) (Transformer, error) { if pc == nil { return nil, errors.New("pathConfigs is not expected to be nil") } diff --git a/pkg/transformers/namespace.go b/pkg/transformers/namespace.go index 84528966c..009d77186 100644 --- a/pkg/transformers/namespace.go +++ b/pkg/transformers/namespace.go @@ -19,16 +19,16 @@ package transformers import ( "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformerconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config" ) type namespaceTransformer struct { namespace string - pathConfigs []transformerconfig.PathConfig - skipPathConfigs []transformerconfig.PathConfig + pathConfigs []config.PathConfig + skipPathConfigs []config.PathConfig } -var skipNamespacePathConfigs = []transformerconfig.PathConfig{ +var skipNamespacePathConfigs = []config.PathConfig{ { Gvk: gvk.Gvk{ Kind: "Namespace", @@ -54,7 +54,7 @@ var skipNamespacePathConfigs = []transformerconfig.PathConfig{ var _ Transformer = &namespaceTransformer{} // NewNamespaceTransformer construct a namespaceTransformer. -func NewNamespaceTransformer(ns string, cf []transformerconfig.PathConfig) Transformer { +func NewNamespaceTransformer(ns string, cf []config.PathConfig) Transformer { if len(ns) == 0 { return NewNoOpTransformer() } diff --git a/pkg/transformers/prefixname.go b/pkg/transformers/prefixname.go index 15e5e6a67..2c152cd96 100644 --- a/pkg/transformers/prefixname.go +++ b/pkg/transformers/prefixname.go @@ -23,32 +23,32 @@ import ( "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformerconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config" ) // namePrefixTransformer contains the prefix and the path config for each field that // the name prefix will be applied. type namePrefixTransformer struct { prefix string - pathConfigs []transformerconfig.PathConfig - skipPathConfigs []transformerconfig.PathConfig + pathConfigs []config.PathConfig + skipPathConfigs []config.PathConfig } var _ Transformer = &namePrefixTransformer{} -var skipNamePrefixPathConfigs = []transformerconfig.PathConfig{ +var skipNamePrefixPathConfigs = []config.PathConfig{ { Gvk: gvk.Gvk{Kind: "CustomResourceDefinition"}, }, } // deprecateNamePrefixPathConfig will be moved into skipNamePrefixPathConfigs in next release -var deprecateNamePrefixPathConfig = transformerconfig.PathConfig{ +var deprecateNamePrefixPathConfig = config.PathConfig{ Gvk: gvk.Gvk{Kind: "Namespace"}, } // NewNamePrefixTransformer construct a namePrefixTransformer. -func NewNamePrefixTransformer(np string, pc []transformerconfig.PathConfig) (Transformer, error) { +func NewNamePrefixTransformer(np string, pc []config.PathConfig) (Transformer, error) { if len(np) == 0 { return NewNoOpTransformer(), nil } diff --git a/pkg/transformers/refvars.go b/pkg/transformers/refvars.go index 596198a61..505bdffb6 100644 --- a/pkg/transformers/refvars.go +++ b/pkg/transformers/refvars.go @@ -5,16 +5,16 @@ import ( "sigs.k8s.io/kustomize/pkg/expansion" "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformerconfig" + "sigs.k8s.io/kustomize/pkg/transformers/config" ) type refvarTransformer struct { - pathConfigs []transformerconfig.PathConfig + pathConfigs []config.PathConfig vars map[string]string } // NewRefVarTransformer returns a Trasformer that replaces $(VAR) style variables with values. -func NewRefVarTransformer(vars map[string]string, p []transformerconfig.PathConfig) Transformer { +func NewRefVarTransformer(vars map[string]string, p []config.PathConfig) Transformer { return &refvarTransformer{ vars: vars, pathConfigs: p,