Convert plugins to accept bytes instead of unstruct.

plugin/builtin/ConfigMapGenerator.go

@@ -22,27 +22,31 @@ import (
 	"sigs.k8s.io/kustomize/pkg/ifc"
 	"sigs.k8s.io/kustomize/pkg/resmap"
 	"sigs.k8s.io/kustomize/pkg/types"
+	"sigs.k8s.io/yaml"
 )
 
 type plugin struct {
 	ldr     ifc.Loader
 	rf      *resmap.Factory
-	options types.GeneratorOptions
-	args    types.ConfigMapArgs
+	types.GeneratorOptions
+	types.ConfigMapArgs
 }
 
 var KustomizePlugin plugin
 
 func (p *plugin) Config(
-	ldr ifc.Loader, rf *resmap.Factory, k ifc.Kunstructured) (err error) {
+	ldr ifc.Loader, rf *resmap.Factory, config []byte) (err error) {
+	p.GeneratorOptions = types.GeneratorOptions{}
+	p.ConfigMapArgs = types.ConfigMapArgs{}
+	err = yaml.Unmarshal(config, p)
 	p.ldr = ldr
 	p.rf = rf
-	p.args.GeneratorArgs, err = resmap.GeneratorArgsFromKunstruct(k)
 	return
 }
 
 func (p *plugin) Generate() (resmap.ResMap, error) {
 	argsList := make([]types.ConfigMapArgs, 1)
-	argsList[0] = p.args
-	return p.rf.NewResMapFromConfigMapArgs(p.ldr, &p.options, argsList)
+	argsList[0] = p.ConfigMapArgs
+	return p.rf.NewResMapFromConfigMapArgs(
+		p.ldr, &p.GeneratorOptions, argsList)
 }

plugin/builtin/ConfigMapGenerator_test.go

@@ -46,8 +46,9 @@ COLOR=red
 apiVersion: builtin
 kind: ConfigMapGenerator
 metadata:
-  name: myMap
-envFiles:
+  name: myMapGen
+name: myMap
+envs:
 - devops.env
 - uxteam.env
 literals:

plugin/builtin/SecretGenerator.go

@@ -22,34 +22,31 @@ import (
 	"sigs.k8s.io/kustomize/pkg/ifc"
 	"sigs.k8s.io/kustomize/pkg/resmap"
 	"sigs.k8s.io/kustomize/pkg/types"
+	"sigs.k8s.io/yaml"
 )
 
 type plugin struct {
-	ldr     ifc.Loader
-	rf      *resmap.Factory
-	options types.GeneratorOptions
-	args    types.SecretArgs
+	ldr ifc.Loader
+	rf  *resmap.Factory
+	types.GeneratorOptions
+	types.SecretArgs
 }
 
 var KustomizePlugin plugin
 
 func (p *plugin) Config(
-	ldr ifc.Loader, rf *resmap.Factory, k ifc.Kunstructured) (err error) {
+	ldr ifc.Loader, rf *resmap.Factory, config []byte) (err error) {
+	p.GeneratorOptions = types.GeneratorOptions{}
+	p.SecretArgs = types.SecretArgs{}
+	err = yaml.Unmarshal(config, p)
 	p.ldr = ldr
 	p.rf = rf
-	p.args.GeneratorArgs, err = resmap.GeneratorArgsFromKunstruct(k)
-	if err != nil {
-		return
-	}
-	p.args.Type, err = k.GetFieldValue("type")
-	if !resmap.IsAcceptableError(err) {
-		return
-	}
-	return nil
+	return
 }
 
 func (p *plugin) Generate() (resmap.ResMap, error) {
 	argsList := make([]types.SecretArgs, 1)
-	argsList[0] = p.args
-	return p.rf.NewResMapFromSecretArgs(p.ldr, &p.options, argsList)
+	argsList[0] = p.SecretArgs
+	return p.rf.NewResMapFromSecretArgs(
+		p.ldr, &p.GeneratorOptions, argsList)
 }

plugin/builtin/SecretGenerator_test.go

@@ -50,12 +50,14 @@ consectetur adipiscing elit.
 apiVersion: builtin
 kind: SecretGenerator
 metadata:
-  name: mySecret
+  name: exampleSecGen
+name: mySecret
+namespace: whatever
 behavior: merge
-envFiles:
+envs:
 - a.env
 - b.env
-valueFiles:
+files:
 - obscure=longsecret.txt
 literals:
 - FRUIT=apple
@@ -73,6 +75,7 @@ data:
 kind: Secret
 metadata:
   name: mySecret
+  namespace: whatever
 type: Opaque
 `)
 }