Fix some minor naming mistakes. (#434)

monopole · Liujingfang1 · commit 30814302aff7 · 2018-10-08T15:58:44.000-07:00
* Fix some minor naming mistakes.

* Fix some minor naming mistakes.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -152,22 +152,22 @@ func makeLoader(t *testing.T) ifc.Loader {
 func TestRegisterCRD(t *testing.T) {
 	refpathconfigs := []transformerconfig.ReferencePathConfig{
 		{
-			Gvk: gvk.Gvk{Kind: "Bee", Version: "v1beta1"},
+			Gvk: gvk.Gvk{Kind: "Secret", Version: "v1"},
 			PathConfigs: []transformerconfig.PathConfig{
 				{
 					CreateIfNotPresent: false,
 					Gvk:                gvk.Gvk{Kind: "MyKind"},
-					Path:               "spec/beeRef/name",
+					Path:               "spec/secretRef/name",
 				},
 			},
 		},
 		{
-			Gvk: gvk.Gvk{Kind: "Secret", Version: "v1"},
+			Gvk: gvk.Gvk{Kind: "Bee", Version: "v1beta1"},
 			PathConfigs: []transformerconfig.PathConfig{
 				{
 					CreateIfNotPresent: false,
 					Gvk:                gvk.Gvk{Kind: "MyKind"},
-					Path:               "spec/secretRef/name",
+					Path:               "spec/beeRef/name",
 				},
 			},
 		},
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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{}{

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ type KunstructurerFactoryImpl struct {`
`29`	`29`
`30`	`30`	`var _ ifc.KunstructuredFactory = &KunstructurerFactoryImpl{}`
`31`	`31`
`32`		`-// NewKustKunstructuredFactory returns a factory.`
`33`		`-func NewKustKunstructuredFactory(d ifc.Decoder) ifc.KunstructuredFactory {`
	`32`	`+// NewKunstructuredFactoryImpl returns a factory.`
	`33`	`+func NewKunstructuredFactoryImpl(d ifc.Decoder) ifc.KunstructuredFactory {`
`34`	`34`	`return &KunstructurerFactoryImpl{decoder: d}`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func TestSliceFromBytes(t *testing.T) {`
`27`		`- factory := NewKustKunstructuredFactory(NewKustDecoder())`
	`27`	`+ factory := NewKunstructuredFactoryImpl(NewKustDecoder())`
`28`	`28`	`testConfigMap := factory.FromMap(`
`29`	`29`	`map[string]interface{}{`
`30`	`30`	`"apiVersion": "v1",`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`var rf = resource.NewFactory(`
`32`		`- k8sdeps.NewKustKunstructuredFactory(k8sdeps.NewKustDecoder()))`
	`32`	`+ k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder()))`
`33`	`33`	`var deploy = gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"}`
`34`	`34`	`var foo = gvk.Gvk{Group: "example.com", Version: "v1", Kind: "Foo"}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`func TestGetFieldValue(t *testing.T) {`
`24`		`- factory := NewKustKunstructuredFactory(NewKustDecoder())`
	`24`	`+ factory := NewKunstructuredFactoryImpl(NewKustDecoder())`
`25`	`25`	`kunstructured := factory.FromMap(map[string]interface{}{`
`26`	`26`	`"Kind": "Service",`
`27`	`27`	`"metadata": map[string]interface{}{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"sigs.k8s.io/kustomize/pkg/transformers"`
`23`	`23`	`)`
`24`	`24`
`25`		`-// PatchTransformerFactory makes patch transformer.`
`26`		`-type PatchTransformerFactory interface {`
	`25`	`+// TransformerFactory makes patch transformer.`
	`26`	`+type TransformerFactory interface {`
`27`	`27`	`MakePatchTransformer(slice []resource.Resource, rf resource.Factory) (transformers.Transformer, error)`
`28`	`28`	`}`