convert resources to ResourceGenerator

Makefile-plugins.mk

@@ -41,6 +41,7 @@ _builtinplugins = \
 	PatchTransformer.go \
 	PrefixTransformer.go \
 	SuffixTransformer.go \
+	ResourceGenerator.go \
 	ReplacementTransformer.go \
 	ReplicaCountTransformer.go \
 	SecretGenerator.go \
@@ -70,6 +71,7 @@ $(pGen)/PatchStrategicMergeTransformer.go: $(pSrc)/patchstrategicmergetransforme
 $(pGen)/PatchTransformer.go: $(pSrc)/patchtransformer/PatchTransformer.go
 $(pGen)/PrefixTransformer.go: $(pSrc)/prefixtransformer/PrefixTransformer.go
 $(pGen)/SuffixTransformer.go: $(pSrc)/suffixtransformer/SuffixTransformer.go
+$(pGen)/ResourceGenerator.go: $(pSrc)/resourcegenerator/ResourceGenerator.go
 $(pGen)/ReplacementTransformer.go: $(pSrc)/replacementtransformer/ReplacementTransformer.go
 $(pGen)/ReplicaCountTransformer.go: $(pSrc)/replicacounttransformer/ReplicaCountTransformer.go
 $(pGen)/SecretGenerator.go: $(pSrc)/secretgenerator/SecretGenerator.go

api/builtins/builtins.go

@@ -10,6 +10,7 @@ import (
 
 type (
 	AnnotationsTransformerPlugin         = internal.AnnotationsTransformerPlugin
+	ResourceGeneratorPlugin              = internal.ResourceGeneratorPlugin
 	ConfigMapGeneratorPlugin             = internal.ConfigMapGeneratorPlugin
 	HashTransformerPlugin                = internal.HashTransformerPlugin
 	HelmChartInflationGeneratorPlugin    = internal.HelmChartInflationGeneratorPlugin
@@ -30,6 +31,7 @@ type (
 
 var (
 	NewAnnotationsTransformerPlugin         = internal.NewAnnotationsTransformerPlugin
+	NewResourceGeneratorPlugin              = internal.NewResourceGeneratorPlugin
 	NewConfigMapGeneratorPlugin             = internal.NewConfigMapGeneratorPlugin
 	NewHashTransformerPlugin                = internal.NewHashTransformerPlugin
 	NewHelmChartInflationGeneratorPlugin    = internal.NewHelmChartInflationGeneratorPlugin

api/internal/plugins/builtinhelpers/builtins.go

@@ -14,6 +14,7 @@ type BuiltinPluginType int
 const (
 	Unknown BuiltinPluginType = iota
 	AnnotationsTransformer
+	ResourceGenerator
 	ConfigMapGenerator
 	IAMPolicyGenerator
 	HashTransformer
@@ -59,6 +60,7 @@ func GetBuiltinPluginType(n string) BuiltinPluginType {
 }
 
 var GeneratorFactories = map[BuiltinPluginType]func() resmap.GeneratorPlugin{
+	ResourceGenerator:           builtins.NewResourceGeneratorPlugin,
 	ConfigMapGenerator:          builtins.NewConfigMapGeneratorPlugin,
 	IAMPolicyGenerator:          builtins.NewIAMPolicyGeneratorPlugin,
 	SecretGenerator:             builtins.NewSecretGeneratorPlugin,

api/internal/target/kusttarget.go

@@ -196,34 +196,33 @@ func (kt *KustTarget) AccumulateTarget() (
 
 // ra should be empty when this KustTarget is a Kustomization, or the ra of the parent if this KustTarget is a Component
 // (or empty if the Component does not have a parent).
-func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) (
-	resRa *accumulator.ResAccumulator, err error) {
-	ra, err = kt.accumulateResources(ra, kt.kustomization.Resources)
+func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) (resRa *accumulator.ResAccumulator, err error) {
+	// read `resources`
+	ra, err = kt.accumulateResources(ra, kt.kustomization.Resources) // it needs to remove
 	if err != nil {
 		return nil, errors.WrapPrefixf(err, "accumulating resources")
 	}
+
 	tConfig, err := builtinconfig.MakeTransformerConfig(
 		kt.ldr, kt.kustomization.Configurations)
 	if err != nil {
 		return nil, err
 	}
-	err = ra.MergeConfig(tConfig)
-	if err != nil {
-		return nil, errors.WrapPrefixf(
-			err, "merging config %v", tConfig)
+	if err := ra.MergeConfig(tConfig); err != nil {
+		return nil, errors.WrapPrefixf(err, "merging config %v", tConfig)
 	}
+
+	// load CRDs schemas
 	crdTc, err := accumulator.LoadConfigFromCRDs(kt.ldr, kt.kustomization.Crds)
 	if err != nil {
-		return nil, errors.WrapPrefixf(
-			err, "loading CRDs %v", kt.kustomization.Crds)
+		return nil, errors.WrapPrefixf(err, "loading CRDs %v", kt.kustomization.Crds)
 	}
-	err = ra.MergeConfig(crdTc)
-	if err != nil {
-		return nil, errors.WrapPrefixf(
-			err, "merging CRDs %v", crdTc)
+	if err := ra.MergeConfig(crdTc); err != nil {
+		return nil, errors.WrapPrefixf(err, "merging CRDs %v", crdTc)
 	}
-	err = kt.runGenerators(ra)
-	if err != nil {
+
+	// exec Generators
+	if err := kt.runGenerators(ra); err != nil {
 		return nil, err
 	}
 
@@ -234,16 +233,19 @@ func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) (
 		return nil, errors.WrapPrefixf(err, "accumulating components")
 	}
 
-	err = kt.runTransformers(ra)
-	if err != nil {
+	// exec Transformers
+	if err := kt.runTransformers(ra); err != nil {
 		return nil, err
 	}
-	err = kt.runValidators(ra)
-	if err != nil {
+
+	// exec Validators
+	if err := kt.runValidators(ra); err != nil {
 		return nil, err
 	}
-	err = ra.MergeVars(kt.kustomization.Vars)
-	if err != nil {
+
+	// merging `vars`
+	//nolint:staticcheck
+	if err := ra.MergeVars(kt.kustomization.Vars); err != nil {
 		return nil, errors.WrapPrefixf(
 			err, "merging vars %v", kt.kustomization.Vars)
 	}

api/internal/target/kusttarget_configplugin.go

@@ -34,6 +34,7 @@ import (
 func (kt *KustTarget) configureBuiltinGenerators() (
 	result []*resmap.GeneratorWithProperties, err error) {
 	for _, bpt := range []builtinhelpers.BuiltinPluginType{
+		builtinhelpers.ResourceGenerator,
 		builtinhelpers.ConfigMapGenerator,
 		builtinhelpers.SecretGenerator,
 		builtinhelpers.HelmChartInflationGenerator,
@@ -66,9 +67,7 @@ func (kt *KustTarget) configureBuiltinGenerators() (
 	return result, nil
 }
 
-func (kt *KustTarget) configureBuiltinTransformers(
-	tc *builtinconfig.TransformerConfig) (
-	result []*resmap.TransformerWithProperties, err error) {
+func (kt *KustTarget) configureBuiltinTransformers(tc *builtinconfig.TransformerConfig) (result []*resmap.TransformerWithProperties, err error) {
 	for _, bpt := range []builtinhelpers.BuiltinPluginType{
 		builtinhelpers.PatchStrategicMergeTransformer,
 		builtinhelpers.PatchTransformer,
@@ -114,6 +113,22 @@ var generatorConfigurators = map[builtinhelpers.BuiltinPluginType]func(
 	kt *KustTarget,
 	bpt builtinhelpers.BuiltinPluginType,
 	factory gFactory) (result []resmap.Generator, err error){
+	builtinhelpers.ResourceGenerator: func(kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f gFactory) (
+		result []resmap.Generator, err error) {
+		var c struct {
+			resource string
+		}
+		for _, args := range kt.kustomization.Resources {
+			c.resource = args
+			p := f()
+			if err := kt.configureBuiltinPlugin(p, c, bpt); err != nil {
+				return nil, err
+			}
+			result = append(result, p)
+		}
+		return
+	},
+
 	builtinhelpers.SecretGenerator: func(kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f gFactory) (
 		result []resmap.Generator, err error) {
 		var c struct {

go.work

@@ -31,6 +31,7 @@ use (
 	./plugin/builtin/prefixtransformer
 	./plugin/builtin/replacementtransformer
 	./plugin/builtin/replicacounttransformer
+	./plugin/builtin/resourcegenerator
 	./plugin/builtin/secretgenerator
 	./plugin/builtin/sortordertransformer
 	./plugin/builtin/suffixtransformer

plugin/builtin/annotationstransformer/go.mod

@@ -24,6 +24,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/configmapgenerator/go.mod

@@ -24,6 +24,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/hashtransformer/go.mod

@@ -21,6 +21,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/helmchartinflationgenerator/go.mod

@@ -25,6 +25,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/imagetagtransformer/go.mod

@@ -24,6 +24,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/labeltransformer/go.mod

@@ -24,6 +24,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/patchjson6902transformer/go.mod

@@ -25,6 +25,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/patchtransformer/go.mod

@@ -25,6 +25,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/prefixtransformer/go.mod

@@ -24,6 +24,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/replacementtransformer/go.mod

@@ -24,6 +24,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/replicacounttransformer/go.mod

@@ -25,6 +25,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/sys v0.8.0 // indirect

plugin/builtin/resourcegenerator/Makefile

@@ -0,0 +1 @@
+../../../Makefile-modules.mk

plugin/builtin/resourcegenerator/ResourceGenerator.go

@@ -0,0 +1,27 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+//go:generate pluginator
+package main
+
+import (
+	"sigs.k8s.io/kustomize/api/resmap"
+)
+
+type plugin struct {
+	h        *resmap.PluginHelpers
+	resource string
+}
+
+var KustomizePlugin plugin //nolint:gochecknoglobals
+
+func (p *plugin) Config(h *resmap.PluginHelpers, config []byte) (err error) {
+	p.h = h
+	return
+}
+
+func (p *plugin) Generate() (resmap.ResMap, error) {
+
+	resourceBytes := []byte(p.resource) //idiot
+	return p.h.ResmapFactory().NewResMapFromBytes(resourceBytes)
+}

plugin/builtin/resourcegenerator/ResourceGenerator_test.go

@@ -0,0 +1,11 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package main_test
+
+import (
+	"testing"
+)
+
+func TestResourceGenerator(t *testing.T) {
+}