Merge pull request #383 from Liujingfang1/buildflag

Add flag to load transfomer configurations from files

pkg/commands/build.go

@@ -17,12 +17,13 @@ limitations under the License.
 package commands
 
 import (
+	"errors"
 	"io"
+	"strings"
 
 	"github.com/spf13/cobra"
 
-	"errors"
-
+	"log"
 	"sigs.k8s.io/kustomize/pkg/app"
 	"sigs.k8s.io/kustomize/pkg/constants"
 	"sigs.k8s.io/kustomize/pkg/fs"
@@ -31,8 +32,9 @@ import (
 )
 
 type buildOptions struct {
-	kustomizationPath string
-	outputPath        string
+	kustomizationPath      string
+	outputPath             string
+	transformerconfigPaths []string
 }
 
 var examples = `
@@ -48,11 +50,17 @@ url examples:
   sigs.k8s.io/kustomize//examples/multibases?ref=v1.0.6
   github.com/Liujingfang1/mysql
   github.com/Liujingfang1/kustomize//examples/helloWorld?ref=repoUrl2
+
+Advanced usage:
+Use different transformer configurations by passing files to kustomize
+    build somedir -t someconfigdir
+    build somedir -t some-transformer-configfile,another-transformer-configfile
 `
 
 // newCmdBuild creates a new build command.
 func newCmdBuild(out io.Writer, fs fs.FileSystem) *cobra.Command {
 	var o buildOptions
+	var p string
 
 	cmd := &cobra.Command{
 		Use:          "build [path]",
@@ -60,7 +68,7 @@ func newCmdBuild(out io.Writer, fs fs.FileSystem) *cobra.Command {
 		Example:      examples,
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			err := o.Validate(args)
+			err := o.Validate(args, p, fs)
 			if err != nil {
 				return err
 			}
@@ -71,11 +79,15 @@ func newCmdBuild(out io.Writer, fs fs.FileSystem) *cobra.Command {
 		&o.outputPath,
 		"output", "o", "",
 		"If specified, write the build output to this path.")
+	cmd.Flags().StringVarP(
+		&p,
+		"transformer-config", "t", "",
+		"If specified, use the transformer configs load from these files.")
 	return cmd
 }
 
 // Validate validates build command.
-func (o *buildOptions) Validate(args []string) error {
+func (o *buildOptions) Validate(args []string, p string, fs fs.FileSystem) error {
 	if len(args) > 1 {
 		return errors.New("specify one path to " + constants.KustomizationFileName)
 	}
@@ -84,6 +96,21 @@ func (o *buildOptions) Validate(args []string) error {
 		return nil
 	}
 	o.kustomizationPath = args[0]
+
+	if p == "" {
+		return nil
+	}
+
+	if fs.IsDir(p) {
+		paths, err := fs.Glob(p + "/*")
+		if err != nil {
+			return err
+		}
+		o.transformerconfigPaths = paths
+	} else {
+		o.transformerconfigPaths = strings.Split(p, ",")
+	}
+
 	return nil
 }
 
@@ -94,8 +121,9 @@ func (o *buildOptions) RunBuild(out io.Writer, fSys fs.FileSystem) error {
 		return err
 	}
 	defer rootLoader.Cleanup()
+
 	application, err := app.NewApplication(
-		rootLoader, fSys, transformerconfig.MakeDefaultTransformerConfig())
+		rootLoader, fSys, makeTransformerconfig(fSys, o.transformerconfigPaths))
 	if err != nil {
 		return err
 	}
@@ -114,3 +142,20 @@ func (o *buildOptions) RunBuild(out io.Writer, fSys fs.FileSystem) error {
 	_, err = out.Write(res)
 	return err
 }
+
+// makeTransformerConfig returns a complete TransformerConfig object from either files
+// or the default configs
+func makeTransformerconfig(fSys fs.FileSystem, paths []string) *transformerconfig.TransformerConfig {
+	ldr, err := loader.NewLoader(".", "", fSys)
+	if err != nil {
+		log.Fatalf("error creating loader to load transformer configurations %v\n", err)
+	}
+	if paths == nil || len(paths) == 0 {
+		return transformerconfig.MakeDefaultTransformerConfig()
+	}
+	t, err := transformerconfig.MakeTransformerConfigFromFiles(ldr, paths)
+	if err != nil {
+		log.Fatalf("failed to load transformer configrations %v\n", err)
+	}
+	return t
+}

pkg/commands/build_test.go

@@ -56,7 +56,7 @@ func TestBuildValidate(t *testing.T) {
 	}
 	for _, mycase := range cases {
 		opts := buildOptions{}
-		e := opts.Validate(mycase.args)
+		e := opts.Validate(mycase.args, "", nil)
 		if len(mycase.erMsg) > 0 {
 			if e == nil {
 				t.Errorf("%s: Expected an error %v", mycase.name, mycase.erMsg)

pkg/transformerconfig/transformerconfig_test.go

@@ -20,7 +20,9 @@ import (
 	"testing"
 
 	"reflect"
+	"sigs.k8s.io/kustomize/pkg/fs"
 	"sigs.k8s.io/kustomize/pkg/gvk"
+	"sigs.k8s.io/kustomize/pkg/loader"
 )
 
 func TestAddNameReferencePathConfigs(t *testing.T) {
@@ -146,3 +148,34 @@ func TestMakeDefaultTransformerConfig(t *testing.T) {
 	// Confirm default can be made without fatal error inside call.
 	_ = MakeDefaultTransformerConfig()
 }
+
+func makeFakeLoaderAndOutput() (loader.Loader, *TransformerConfig, *TransformerConfig) {
+	transformerConfig := `
+namePrefix:
+- path: nameprefix/path
+  kind: SomeKind
+`
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile("transformerconfig/test/config.yaml", []byte(transformerConfig))
+	ldr := loader.NewFileLoader(fakeFS)
+	expected := &TransformerConfig{
+		NamePrefix: []PathConfig{
+			{
+				Gvk:  gvk.Gvk{Kind: "SomeKind"},
+				Path: "nameprefix/path",
+			},
+		},
+	}
+	return ldr, expected, MakeDefaultTransformerConfig()
+}
+func TestMakeTransformerConfigFromFiles(t *testing.T) {
+	ldr, expected, _ := makeFakeLoaderAndOutput()
+	tcfg, err := MakeTransformerConfigFromFiles(ldr, []string{"transformerconfig/test/config.yaml"})
+	if err != nil {
+		t.Fatalf("unexpected error %v", err)
+	}
+
+	if !reflect.DeepEqual(tcfg, expected) {
+		t.Fatalf("expected %v\n but go6t %v\n", expected, tcfg)
+	}
+}