Cut more ties to k8sdeps

Add tests for all the plugins.

pkg/resmap/factory.go

@@ -41,6 +41,13 @@ func (rmF *Factory) RF() *resource.Factory {
 	return rmF.resF
 }
 
+// FromResource returns a ResMap with one entry.
+func (rmF *Factory) FromResource(res *resource.Resource) ResMap {
+	result := ResMap{}
+	result[res.Id()] = res
+	return result
+}
+
 // FromFile returns a ResMap given a resource path.
 func (rmF *Factory) FromFile(
 	loader ifc.Loader, path string) (ResMap, error) {
@@ -89,6 +96,17 @@ func (rmF *Factory) NewResMapFromConfigMapArgs(
 	return newResMapFromResourceSlice(resources)
 }
 
+func (rmF *Factory) FromConfigMapArgs(
+	ldr ifc.Loader,
+	options *types.GeneratorOptions,
+	args types.ConfigMapArgs) (ResMap, error) {
+	res, err := rmF.resF.MakeConfigMap(ldr, options, &args)
+	if err != nil {
+		return nil, err
+	}
+	return rmF.FromResource(res), nil
+}
+
 // NewResMapFromSecretArgs takes a SecretArgs slice, generates
 // secrets from each entry, and accumulates them in a ResMap.
 func (rmF *Factory) NewResMapFromSecretArgs(
@@ -106,6 +124,17 @@ func (rmF *Factory) NewResMapFromSecretArgs(
 	return newResMapFromResourceSlice(resources)
 }
 
+func (rmF *Factory) FromSecretArgs(
+	ldr ifc.Loader,
+	options *types.GeneratorOptions,
+	args types.SecretArgs) (ResMap, error) {
+	res, err := rmF.resF.MakeSecret(ldr, options, &args)
+	if err != nil {
+		return nil, err
+	}
+	return rmF.FromResource(res), nil
+}
+
 func newResMapFromResourceSlice(resources []*resource.Resource) (ResMap, error) {
 	result := ResMap{}
 	for _, res := range resources {

plugin/builtin/ConfigMapGenerator.go

@@ -30,8 +30,5 @@ func (p *ConfigMapGeneratorPlugin) Config(
 }
 
 func (p *ConfigMapGeneratorPlugin) Generate() (resmap.ResMap, error) {
-	argsList := make([]types.ConfigMapArgs, 1)
-	argsList[0] = p.ConfigMapArgs
-	return p.rf.NewResMapFromConfigMapArgs(
-		p.ldr, &p.GeneratorOptions, argsList)
+	return p.rf.FromConfigMapArgs(p.ldr, &p.GeneratorOptions, p.ConfigMapArgs)
 }

plugin/builtin/ImageTagTransformer.go

@@ -29,9 +29,8 @@ func (p *ImageTagTransformerPlugin) Config(
 }
 
 func (p *ImageTagTransformerPlugin) Transform(m resmap.ResMap) error {
-	argsList := make([]image.Image, 1)
-	argsList[0] = p.ImageTag
-	t, err := transformers.NewImageTransformer(argsList, p.FieldSpecs)
+	t, err := transformers.NewImageTransformer(
+		[]image.Image{p.ImageTag}, p.FieldSpecs)
 	if err != nil {
 		return err
 	}

plugin/builtin/SecretGenerator.go

@@ -30,8 +30,5 @@ func (p *SecretGeneratorPlugin) Config(
 }
 
 func (p *SecretGeneratorPlugin) Generate() (resmap.ResMap, error) {
-	argsList := make([]types.SecretArgs, 1)
-	argsList[0] = p.SecretArgs
-	return p.rf.NewResMapFromSecretArgs(
-		p.ldr, &p.GeneratorOptions, argsList)
+	return p.rf.FromSecretArgs(p.ldr, &p.GeneratorOptions, p.SecretArgs)
 }

plugin/builtin/configmapgenerator/ConfigMapGenerator.go

@@ -31,8 +31,5 @@ func (p *plugin) Config(
 }
 
 func (p *plugin) Generate() (resmap.ResMap, error) {
-	argsList := make([]types.ConfigMapArgs, 1)
-	argsList[0] = p.ConfigMapArgs
-	return p.rf.NewResMapFromConfigMapArgs(
-		p.ldr, &p.GeneratorOptions, argsList)
+	return p.rf.FromConfigMapArgs(p.ldr, &p.GeneratorOptions, p.ConfigMapArgs)
 }

plugin/builtin/imagetagtransformer/ImageTagTransformer.go

@@ -30,9 +30,8 @@ func (p *plugin) Config(
 }
 
 func (p *plugin) Transform(m resmap.ResMap) error {
-	argsList := make([]image.Image, 1)
-	argsList[0] = p.ImageTag
-	t, err := transformers.NewImageTransformer(argsList, p.FieldSpecs)
+	t, err := transformers.NewImageTransformer(
+		[]image.Image{p.ImageTag}, p.FieldSpecs)
 	if err != nil {
 		return err
 	}

plugin/builtin/secretgenerator/SecretGenerator.go

@@ -31,8 +31,5 @@ func (p *plugin) Config(
 }
 
 func (p *plugin) Generate() (resmap.ResMap, error) {
-	argsList := make([]types.SecretArgs, 1)
-	argsList[0] = p.SecretArgs
-	return p.rf.NewResMapFromSecretArgs(
-		p.ldr, &p.GeneratorOptions, argsList)
+	return p.rf.FromSecretArgs(p.ldr, &p.GeneratorOptions, p.SecretArgs)
 }

plugin/someteam.example.com/v1/configmapgenerator/ConfigMapGenerator_test.go

@@ -0,0 +1,38 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package main_test
+
+import (
+	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/kusttest"
+	"sigs.k8s.io/kustomize/plugin"
+)
+
+func TestConfigMapGeneratorPlugin(t *testing.T) {
+	tc := plugin.NewEnvForTest(t).Set()
+	defer tc.Reset()
+
+	tc.BuildExecPlugin(
+		"someteam.example.com", "v1", "ConfigMapGenerator")
+
+	th := kusttest_test.NewKustTestPluginHarness(t, "/app")
+
+	m := th.LoadAndRunGenerator(`
+apiVersion: someteam.example.com/v1
+kind: ConfigMapGenerator
+metadata:
+  name: whatever
+argsOneLiner: alice myMomsMaidenName
+`)
+	th.AssertActualEqualsExpected(m, `
+apiVersion: v1
+data:
+  password: myMomsMaidenName
+  username: alice
+kind: ConfigMap
+metadata:
+  name: example-configmap-test
+`)
+}

plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go

@@ -0,0 +1,39 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package main_test
+
+import (
+	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/kusttest"
+	"sigs.k8s.io/kustomize/plugin"
+)
+
+func TestDatePrefixerPlugin(t *testing.T) {
+	tc := plugin.NewEnvForTest(t).Set()
+	defer tc.Reset()
+
+	tc.BuildGoPlugin(
+		"someteam.example.com", "v1", "DatePrefixer")
+	th := kusttest_test.NewKustTestPluginHarness(t, "/app")
+
+	m := th.LoadAndRunTransformer(`
+apiVersion: someteam.example.com/v1
+kind: DatePrefixer
+metadata:
+  name: whatever
+`,
+		`apiVersion: apps/v1
+kind: MeatBall
+metadata:
+  name: meatball
+`)
+
+	th.AssertActualEqualsExpected(m, `
+apiVersion: apps/v1
+kind: MeatBall
+metadata:
+  name: 2018-05-11-meatball
+`)
+}

plugin/someteam.example.com/v1/kvmaker/kvMaker.go

@@ -1,25 +0,0 @@
-package kvmaker
-
-var database = map[string]string{
-	"TREE":      "oak",
-	"ROCKET":    "Saturn V",
-	"FRUIT":     "apple",
-	"VEGETABLE": "carrot",
-	"SIMPSON":   "homer",
-}
-
-type plugin struct{}
-
-var KVSource plugin
-
-func (p plugin) Get(
-	root string, args []string) (map[string]string, error) {
-	r := make(map[string]string)
-	for _, k := range args {
-		v, ok := database[k]
-		if ok {
-			r[k] = v
-		}
-	}
-	return r, nil
-}

plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go

@@ -0,0 +1,41 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package main_test
+
+import (
+	"strings"
+	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/kusttest"
+	"sigs.k8s.io/kustomize/plugin"
+)
+
+func shouldContain(t *testing.T, s []byte, x string) {
+	if !strings.Contains(string(s), x) {
+		t.Fatalf("unable to find %s", x)
+	}
+}
+
+func TestPrintWorkDirPlugin(t *testing.T) {
+	tc := plugin.NewEnvForTest(t).Set()
+	defer tc.Reset()
+
+	tc.BuildExecPlugin(
+		"someteam.example.com", "v1", "PrintWorkDir")
+
+	th := kusttest_test.NewKustTestPluginHarness(t, "/theAppRoot")
+
+	m := th.LoadAndRunGenerator(`
+apiVersion: someteam.example.com/v1
+kind: PrintWorkDir
+metadata:
+  name: whatever
+`)
+	a, err := m.EncodeAsYaml()
+	if err != nil {
+		t.Error(err)
+	}
+	shouldContain(t, a, "path: /theAppRoot")
+	shouldContain(t, a, "sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/printworkdir")
+}

plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go

@@ -0,0 +1,54 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"sigs.k8s.io/kustomize/pkg/ifc"
+	"sigs.k8s.io/kustomize/pkg/resmap"
+	"sigs.k8s.io/kustomize/pkg/types"
+	"sigs.k8s.io/yaml"
+)
+
+// A secret generator example that gets data
+// from a database (simulated by a hardcoded map).
+type plugin struct {
+	rf        *resmap.Factory
+	ldr       ifc.Loader
+	Name      string `json:"name,omitempty" yaml:"name,omitempty"`
+	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
+	// List of keys to use in database lookups
+	Keys []string `json:"keys,omitempty" yaml:"keys,omitempty"`
+}
+
+var KustomizePlugin plugin
+
+var database = map[string]string{
+	"TREE":      "oak",
+	"ROCKET":    "SaturnV",
+	"FRUIT":     "apple",
+	"VEGETABLE": "carrot",
+	"SIMPSON":   "homer",
+}
+
+func (p *plugin) Config(
+	ldr ifc.Loader, rf *resmap.Factory, c []byte) error {
+	p.rf = rf
+	return yaml.Unmarshal(c, p)
+}
+
+// The plan here is to convert the plugin's input
+// into the format used by the builtin secret generator plugin.
+func (p *plugin) Generate() (resmap.ResMap, error) {
+	args := types.SecretArgs{}
+	args.Name = p.Name
+	args.Namespace = p.Namespace
+	for _, k := range p.Keys {
+		if v, ok := database[k]; ok {
+			args.LiteralSources = append(
+				args.LiteralSources, k+"="+v)
+		}
+	}
+	return p.rf.FromSecretArgs(p.ldr, nil, args)
+
+}

plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go

@@ -0,0 +1,44 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package main_test
+
+import (
+	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/kusttest"
+	"sigs.k8s.io/kustomize/plugin"
+)
+
+func TestSecretsFromDatabasePlugin(t *testing.T) {
+	tc := plugin.NewEnvForTest(t).Set()
+	defer tc.Reset()
+
+	tc.BuildGoPlugin(
+		"someteam.example.com", "v1", "SecretsFromDatabase")
+
+	th := kusttest_test.NewKustTestPluginHarness(t, "/app")
+
+	m := th.LoadAndRunGenerator(`
+apiVersion: someteam.example.com/v1
+kind: SecretsFromDatabase
+metadata:
+  name: mySecretGenerator
+name: forbiddenValues
+namespace: production
+keys:
+- ROCKET
+- VEGETABLE
+`)
+	th.AssertActualEqualsExpected(m, `
+apiVersion: v1
+data:
+  ROCKET: U2F0dXJuVg==
+  VEGETABLE: Y2Fycm90
+kind: Secret
+metadata:
+  name: forbiddenValues
+  namespace: production
+type: Opaque
+`)
+}

plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go

@@ -7,15 +7,14 @@ import (
 	"bytes"
 	"text/template"
 
-	"sigs.k8s.io/kustomize/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/pkg/ifc"
 	"sigs.k8s.io/kustomize/pkg/resmap"
-	"sigs.k8s.io/kustomize/pkg/resource"
 	"sigs.k8s.io/yaml"
 )
 
 // A simple generator example.  Makes one service.
 type plugin struct {
+	rf   *resmap.Factory
 	Name string `json:"name,omitempty" yaml:"name,omitempty"`
 	Port string `json:"port,omitempty" yaml:"port,omitempty"`
 }
@@ -38,6 +37,7 @@ spec:
 
 func (p *plugin) Config(
 	ldr ifc.Loader, rf *resmap.Factory, config []byte) error {
+	p.rf = rf
 	return yaml.Unmarshal(config, p)
 }
 
@@ -48,6 +48,5 @@ func (p *plugin) Generate() (resmap.ResMap, error) {
 	if err != nil {
 		return nil, err
 	}
-	rf := resmap.NewFactory(resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()))
-	return rf.NewResMapFromBytes(buf.Bytes())
+	return p.rf.NewResMapFromBytes(buf.Bytes())
 }

plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go

@@ -0,0 +1,39 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package main_test
+
+import (
+	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/kusttest"
+	"sigs.k8s.io/kustomize/plugin"
+)
+
+func TestStringPrefixerPlugin(t *testing.T) {
+	tc := plugin.NewEnvForTest(t).Set()
+	defer tc.Reset()
+
+	tc.BuildGoPlugin(
+		"someteam.example.com", "v1", "StringPrefixer")
+	th := kusttest_test.NewKustTestPluginHarness(t, "/app")
+
+	m := th.LoadAndRunTransformer(`
+apiVersion: someteam.example.com/v1
+kind: StringPrefixer
+metadata:
+  name: wowsa
+`,
+		`apiVersion: apps/v1
+kind: MeatBall
+metadata:
+  name: meatball
+`)
+
+	th.AssertActualEqualsExpected(m, `
+apiVersion: apps/v1
+kind: MeatBall
+metadata:
+  name: wowsa-meatball
+`)
+}