Delete some factories

kubernetes-sigs · Feb 11, 2019 · bce894a · bce894a
1 parent 74d3e92
commit bce894a
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 252 deletions.
diff --git a/k8sdeps/factory.go b/k8sdeps/factory.go
diff --git a/k8sdeps/transformer/factory.go b/k8sdeps/transformer/factory.go
diff --git a/kustomize.go b/kustomize.go
@@ -19,12 +19,11 @@ package main
 import (
 	"os"
 
-	"sigs.k8s.io/kustomize/k8sdeps"
 	"sigs.k8s.io/kustomize/pkg/commands"
 )
 
 func main() {
-	if err := commands.NewDefaultCommand(k8sdeps.NewFactory()).Execute(); err != nil {
+	if err := commands.NewDefaultCommand().Execute(); err != nil {
 		os.Exit(1)
 	}
 	os.Exit(0)

diff --git a/pkg/commands/build/build.go b/pkg/commands/build/build.go
@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/pkg/constants"
 	"sigs.k8s.io/kustomize/pkg/fs"
-	"sigs.k8s.io/kustomize/pkg/ifc/transformer"
 	"sigs.k8s.io/kustomize/pkg/loader"
 	"sigs.k8s.io/kustomize/pkg/resmap"
 	"sigs.k8s.io/kustomize/pkg/target"
@@ -60,9 +59,7 @@ url examples:
 
 // NewCmdBuild creates a new build command.
 func NewCmdBuild(
-	out io.Writer, fs fs.FileSystem,
-	rf *resmap.Factory,
-	ptf transformer.Factory) *cobra.Command {
+	out io.Writer, fs fs.FileSystem, rf *resmap.Factory) *cobra.Command {
 	var o Options
 
 	cmd := &cobra.Command{
@@ -75,7 +72,7 @@ func NewCmdBuild(
 			if err != nil {
 				return err
 			}
-			return o.RunBuild(out, fs, rf, ptf)
+			return o.RunBuild(out, fs, rf)
 		},
 	}
 	cmd.Flags().StringVarP(
@@ -95,28 +92,25 @@ func (o *Options) Validate(args []string) error {
 	} else {
 		o.kustomizationPath = args[0]
 	}
-
 	return nil
 }
 
 // RunBuild runs build command.
 func (o *Options) RunBuild(
-	out io.Writer, fSys fs.FileSystem,
-	rf *resmap.Factory, ptf transformer.Factory) error {
+	out io.Writer, fSys fs.FileSystem, rf *resmap.Factory) error {
 	ldr, err := loader.NewLoader(o.kustomizationPath, fSys)
 	if err != nil {
 		return err
 	}
 	defer ldr.Cleanup()
-	kt, err := target.NewKustTarget(ldr, fSys, rf, ptf)
+	kt, err := target.NewKustTarget(ldr, fSys, rf)
 	if err != nil {
 		return err
 	}
 	allResources, err := kt.MakeCustomizedResMap()
 	if err != nil {
 		return err
 	}
-	// Output the objects.
 	res, err := allResources.EncodeAsYaml()
 	if err != nil {
 		return err

diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go
@@ -22,18 +22,18 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/k8sdeps/kunstruct"
+	"sigs.k8s.io/kustomize/k8sdeps/validator"
 	"sigs.k8s.io/kustomize/pkg/commands/build"
 	"sigs.k8s.io/kustomize/pkg/commands/edit"
 	"sigs.k8s.io/kustomize/pkg/commands/misc"
-	"sigs.k8s.io/kustomize/pkg/factory"
 	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/resmap"
+	"sigs.k8s.io/kustomize/pkg/resource"
 )
 
 // NewDefaultCommand returns the default (aka root) command for kustomize command.
-func NewDefaultCommand(f *factory.KustFactory) *cobra.Command {
-	fsys := fs.MakeRealFS()
-	stdOut := os.Stdout
-
+func NewDefaultCommand() *cobra.Command {
 	c := &cobra.Command{
 		Use:   "kustomize",
 		Short: "kustomize manages declarative configuration of Kubernetes",
@@ -43,13 +43,14 @@ kustomize manages declarative configuration of Kubernetes.
 See https://sigs.k8s.io/kustomize
 `,
 	}
-
+	fSys := fs.MakeRealFS()
+	uf := kunstruct.NewKunstructuredFactoryImpl()
+	rf := resmap.NewFactory(resource.NewFactory(uf))
 	c.AddCommand(
-		// TODO: Make consistent API for newCmd* functions.
-		build.NewCmdBuild(stdOut, fsys, f.ResmapF, f.TransformerF),
-		edit.NewCmdEdit(fsys, f.ValidatorF, f.UnstructF),
-		misc.NewCmdConfig(fsys),
-		misc.NewCmdVersion(stdOut),
+		build.NewCmdBuild(os.Stdout, fSys, rf),
+		edit.NewCmdEdit(fSys, validator.NewKustValidator(), uf),
+		misc.NewCmdConfig(fSys),
+		misc.NewCmdVersion(os.Stdout),
 	)
 	c.PersistentFlags().AddGoFlagSet(flag.CommandLine)
 

diff --git a/pkg/factory/factory.go b/pkg/factory/factory.go
diff --git a/pkg/ifc/transformer/factory.go b/pkg/ifc/transformer/factory.go
diff --git a/pkg/patch/transformer/util.go b/pkg/patch/transformer/util.go
diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go
@@ -25,12 +25,12 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/k8sdeps/transformer/hash"
+	"sigs.k8s.io/kustomize/k8sdeps/transformer/patch"
 	"sigs.k8s.io/kustomize/pkg/constants"
 	"sigs.k8s.io/kustomize/pkg/fs"
 	"sigs.k8s.io/kustomize/pkg/ifc"
-	"sigs.k8s.io/kustomize/pkg/ifc/transformer"
 	interror "sigs.k8s.io/kustomize/pkg/internal/error"
-	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/transformers"
@@ -44,15 +44,13 @@ type KustTarget struct {
 	ldr           ifc.Loader
 	fSys          fs.FileSystem
 	rFactory      *resmap.Factory
-	tFactory      transformer.Factory
 }
 
 // NewKustTarget returns a new instance of KustTarget primed with a Loader.
 func NewKustTarget(
 	ldr ifc.Loader,
 	fSys fs.FileSystem,
-	rFactory *resmap.Factory,
-	tFactory transformer.Factory) (*KustTarget, error) {
+	rFactory *resmap.Factory) (*KustTarget, error) {
 	content, err := loadKustFile(ldr)
 	if err != nil {
 		return nil, err
@@ -72,7 +70,6 @@ func NewKustTarget(
 		ldr:           ldr,
 		fSys:          fSys,
 		rFactory:      rFactory,
-		tFactory:      tFactory,
 	}, nil
 }
 
@@ -127,7 +124,7 @@ func (kt *KustTarget) MakeCustomizedResMap() (resmap.ResMap, error) {
 	if err != nil {
 		return nil, err
 	}
-	err = ra.Transform(kt.tFactory.MakeHashTransformer())
+	err = ra.Transform(hash.NewNameHashTransformer())
 	if err != nil {
 		return nil, err
 	}
@@ -248,8 +245,7 @@ func (kt *KustTarget) accumulateBases() (
 			errs.Append(errors.Wrap(err, "couldn't make loader for "+path))
 			continue
 		}
-		subKt, err := NewKustTarget(
-			ldr, kt.fSys, kt.rFactory, kt.tFactory)
+		subKt, err := NewKustTarget(ldr, kt.fSys, kt.rFactory)
 		if err != nil {
 			errs.Append(errors.Wrap(err, "couldn't make target for "+path))
 			ldr.Cleanup()
@@ -276,7 +272,7 @@ func (kt *KustTarget) newTransformer(
 	patches []*resource.Resource, tConfig *config.TransformerConfig) (
 	transformers.Transformer, error) {
 	var r []transformers.Transformer
-	t, err := kt.tFactory.MakePatchTransformer(patches, kt.rFactory.RF())
+	t, err := patch.NewPatchTransformer(patches, kt.rFactory.RF())
 	if err != nil {
 		return nil, err
 	}
@@ -304,7 +300,7 @@ func (kt *KustTarget) newTransformer(
 		return nil, err
 	}
 	r = append(r, t)
-	t, err = patchtransformer.NewPatchJson6902Factory(kt.ldr).
+	t, err = transformers.NewPatchJson6902Factory(kt.ldr).
 		MakePatchJson6902Transformer(kt.kustomization.PatchesJson6902)
 	if err != nil {
 		return nil, err

diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go
@@ -199,7 +199,7 @@ func TestResources1(t *testing.T) {
 
 func TestKustomizationNotFound(t *testing.T) {
 	_, err := NewKustTarget(
-		loadertest.NewFakeLoader("/foo"), fs.MakeFakeFS(), nil, nil)
+		loadertest.NewFakeLoader("/foo"), fs.MakeFakeFS(), nil)
 	if err == nil {
 		t.Fatalf("expected an error")
 	}