Merge pull request #452 from Liujingfang1/config

move transformerconfig package to transformers/config

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)
 }

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.

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"))

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)
 	}

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": ""

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.

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"

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"

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"

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"

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"

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"

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"

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"

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
 	}

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{

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")
 	}

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()
 	}

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
 	}

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,