diff --git a/Makefile b/Makefile index 0511c3074..4f4a61cab 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,8 @@ _builtinplugins = \ PatchJson6902Transformer.go \ PatchStrategicMergeTransformer.go \ PatchTransformer.go \ - PrefixSuffixTransformer.go \ + PrefixTransformer.go \ + SuffixTransformer.go \ ReplacementTransformer.go \ ReplicaCountTransformer.go \ SecretGenerator.go \ @@ -164,7 +165,8 @@ $(pGen)/NamespaceTransformer.go: $(pSrc)/namespacetransformer/NamespaceTransform $(pGen)/PatchJson6902Transformer.go: $(pSrc)/patchjson6902transformer/PatchJson6902Transformer.go $(pGen)/PatchStrategicMergeTransformer.go: $(pSrc)/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go $(pGen)/PatchTransformer.go: $(pSrc)/patchtransformer/PatchTransformer.go -$(pGen)/PrefixSuffixTransformer.go: $(pSrc)/prefixsuffixtransformer/PrefixSuffixTransformer.go +$(pGen)/PrefixTransformer.go: $(pSrc)/prefixtransformer/PrefixTransformer.go +$(pGen)/SuffixTransformer.go: $(pSrc)/suffixtransformer/SuffixTransformer.go $(pGen)/ReplacementTransformer.go: $(pSrc)/replacementtransformer/ReplacementTransformer.go $(pGen)/ReplicaCountTransformer.go: $(pSrc)/replicacounttransformer/ReplicaCountTransformer.go $(pGen)/SecretGenerator.go: $(pSrc)/secretgenerator/SecretGenerator.go diff --git a/api/builtins/builtins.go b/api/builtins/builtins.go index ae59f3779..5f671260b 100644 --- a/api/builtins/builtins.go +++ b/api/builtins/builtins.go @@ -21,7 +21,8 @@ type ( PatchJson6902TransformerPlugin = internal.PatchJson6902TransformerPlugin PatchStrategicMergeTransformerPlugin = internal.PatchStrategicMergeTransformerPlugin PatchTransformerPlugin = internal.PatchTransformerPlugin - PrefixSuffixTransformerPlugin = internal.PrefixSuffixTransformerPlugin + PrefixTransformerPlugin = internal.PrefixTransformerPlugin + SuffixTransformerPlugin = internal.SuffixTransformerPlugin ReplacementTransformerPlugin = internal.ReplacementTransformerPlugin ReplicaCountTransformerPlugin = internal.ReplicaCountTransformerPlugin SecretGeneratorPlugin = internal.SecretGeneratorPlugin @@ -41,7 +42,8 @@ var ( NewPatchJson6902TransformerPlugin = internal.NewPatchJson6902TransformerPlugin NewPatchStrategicMergeTransformerPlugin = internal.NewPatchStrategicMergeTransformerPlugin NewPatchTransformerPlugin = internal.NewPatchTransformerPlugin - NewPrefixSuffixTransformerPlugin = internal.NewPrefixSuffixTransformerPlugin + NewPrefixTransformerPlugin = internal.NewPrefixTransformerPlugin + NewSuffixTransformerPlugin = internal.NewSuffixTransformerPlugin NewReplacementTransformerPlugin = internal.NewReplacementTransformerPlugin NewReplicaCountTransformerPlugin = internal.NewReplicaCountTransformerPlugin NewSecretGeneratorPlugin = internal.NewSecretGeneratorPlugin diff --git a/api/filters/prefix/doc.go b/api/filters/prefix/doc.go new file mode 100644 index 000000000..95236859f --- /dev/null +++ b/api/filters/prefix/doc.go @@ -0,0 +1,6 @@ +// Copyright 2020 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +// Package prefix contains a kio.Filter implementation of the kustomize +// PrefixTransformer. +package prefix diff --git a/api/filters/prefixsuffix/example_test.go b/api/filters/prefix/example_test.go similarity index 87% rename from api/filters/prefixsuffix/example_test.go rename to api/filters/prefix/example_test.go index 1bc698bf5..eccd58837 100644 --- a/api/filters/prefixsuffix/example_test.go +++ b/api/filters/prefix/example_test.go @@ -1,14 +1,14 @@ // Copyright 2020 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package prefixsuffix_test +package prefix_test import ( "bytes" "log" "os" - "sigs.k8s.io/kustomize/api/filters/prefixsuffix" + "sigs.k8s.io/kustomize/api/filters/prefix" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/kio" ) @@ -26,7 +26,7 @@ kind: Bar metadata: name: instance `)}}, - Filters: []kio.Filter{prefixsuffix.Filter{ + Filters: []kio.Filter{prefix.Filter{ Prefix: "baz-", FieldSpec: types.FieldSpec{Path: "metadata/name"}}}, Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}}, }.Execute() diff --git a/api/filters/prefixsuffix/prefixsuffix.go b/api/filters/prefix/prefix.go similarity index 82% rename from api/filters/prefixsuffix/prefixsuffix.go rename to api/filters/prefix/prefix.go index 4b4247d41..dc7fb134f 100644 --- a/api/filters/prefixsuffix/prefixsuffix.go +++ b/api/filters/prefix/prefix.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package prefixsuffix +package prefix import ( "fmt" @@ -13,10 +13,9 @@ import ( "sigs.k8s.io/kustomize/kyaml/yaml" ) -// Filter applies resource name prefix's and suffix's using the fieldSpecs +// Filter applies resource name prefix's using the fieldSpecs type Filter struct { Prefix string `json:"prefix,omitempty" yaml:"prefix,omitempty"` - Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"` FieldSpec types.FieldSpec `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"` } @@ -39,5 +38,5 @@ func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) { func (f Filter) evaluateField(node *yaml.RNode) error { return filtersutil.SetScalar(fmt.Sprintf( - "%s%s%s", f.Prefix, node.YNode().Value, f.Suffix))(node) + "%s%s", f.Prefix, node.YNode().Value))(node) } diff --git a/api/filters/prefixsuffix/prefixsuffix_test.go b/api/filters/prefix/prefix_test.go similarity index 52% rename from api/filters/prefixsuffix/prefixsuffix_test.go rename to api/filters/prefix/prefix_test.go index 092a9c388..2bcdbdeab 100644 --- a/api/filters/prefixsuffix/prefixsuffix_test.go +++ b/api/filters/prefix/prefix_test.go @@ -1,14 +1,14 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package prefixsuffix_test +package prefix_test import ( "strings" "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/filters/prefixsuffix" + "sigs.k8s.io/kustomize/api/filters/prefix" filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest" "sigs.k8s.io/kustomize/api/types" ) @@ -37,62 +37,10 @@ kind: Bar metadata: name: foo-instance `, - filter: prefixsuffix.Filter{Prefix: "foo-"}, - fs: types.FieldSpec{Path: "metadata/name"}, - }, - - "suffix": { - input: ` -apiVersion: example.com/v1 -kind: Foo -metadata: - name: instance ---- -apiVersion: example.com/v1 -kind: Bar -metadata: - name: instance -`, - expected: ` -apiVersion: example.com/v1 -kind: Foo -metadata: - name: instance-foo ---- -apiVersion: example.com/v1 -kind: Bar -metadata: - name: instance-foo -`, - filter: prefixsuffix.Filter{Suffix: "-foo"}, - fs: types.FieldSpec{Path: "metadata/name"}, - }, - - "prefix-suffix": { - input: ` -apiVersion: example.com/v1 -kind: Foo -metadata: - name: instance ---- -apiVersion: example.com/v1 -kind: Bar -metadata: - name: instance -`, - expected: ` -apiVersion: example.com/v1 -kind: Foo -metadata: - name: bar-instance-foo ---- -apiVersion: example.com/v1 -kind: Bar -metadata: - name: bar-instance-foo -`, - filter: prefixsuffix.Filter{Prefix: "bar-", Suffix: "-foo"}, - fs: types.FieldSpec{Path: "metadata/name"}, + filter: prefix.Filter{ + Prefix: "foo-", + FieldSpec: types.FieldSpec{Path: "metadata/name"}, + }, }, "data-fieldspecs": { @@ -130,23 +78,23 @@ a: b: c: foo-d `, - filter: prefixsuffix.Filter{Prefix: "foo-"}, - fs: types.FieldSpec{Path: "a/b/c"}, + filter: prefix.Filter{ + Prefix: "foo-", + FieldSpec: types.FieldSpec{Path: "a/b/c"}, + }, }, } type TestCase struct { input string expected string - filter prefixsuffix.Filter - fs types.FieldSpec + filter prefix.Filter } func TestFilter(t *testing.T) { for name := range tests { test := tests[name] t.Run(name, func(t *testing.T) { - test.filter.FieldSpec = test.fs if !assert.Equal(t, strings.TrimSpace(test.expected), strings.TrimSpace( diff --git a/api/filters/prefixsuffix/doc.go b/api/filters/prefixsuffix/doc.go deleted file mode 100644 index 319374436..000000000 --- a/api/filters/prefixsuffix/doc.go +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2020 The Kubernetes Authors. -// SPDX-License-Identifier: Apache-2.0 - -// Package prefixsuffix contains a kio.Filter implementation of the kustomize -// PrefixSuffixTransformer. -package prefixsuffix diff --git a/api/filters/suffix/doc.go b/api/filters/suffix/doc.go new file mode 100644 index 000000000..18be62dfd --- /dev/null +++ b/api/filters/suffix/doc.go @@ -0,0 +1,6 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +// Package suffix contains a kio.Filter implementation of the kustomize +// SuffixTransformer. +package suffix diff --git a/api/filters/suffix/example_test.go b/api/filters/suffix/example_test.go new file mode 100644 index 000000000..bc95b8397 --- /dev/null +++ b/api/filters/suffix/example_test.go @@ -0,0 +1,47 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package suffix_test + +import ( + "bytes" + "log" + "os" + + "sigs.k8s.io/kustomize/api/filters/suffix" + "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/kio" +) + +func ExampleFilter() { + err := kio.Pipeline{ + Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(` +apiVersion: example.com/v1 +kind: Foo +metadata: + name: instance +--- +apiVersion: example.com/v1 +kind: Bar +metadata: + name: instance +`)}}, + Filters: []kio.Filter{suffix.Filter{ + Suffix: "-baz", FieldSpec: types.FieldSpec{Path: "metadata/name"}}}, + Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}}, + }.Execute() + if err != nil { + log.Fatal(err) + } + + // Output: + // apiVersion: example.com/v1 + // kind: Foo + // metadata: + // name: instance-baz + // --- + // apiVersion: example.com/v1 + // kind: Bar + // metadata: + // name: instance-baz +} diff --git a/api/filters/suffix/suffix.go b/api/filters/suffix/suffix.go new file mode 100644 index 000000000..a3df62557 --- /dev/null +++ b/api/filters/suffix/suffix.go @@ -0,0 +1,42 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package suffix + +import ( + "fmt" + + "sigs.k8s.io/kustomize/api/filters/fieldspec" + "sigs.k8s.io/kustomize/api/filters/filtersutil" + "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/kio" + "sigs.k8s.io/kustomize/kyaml/yaml" +) + +// Filter applies resource name suffix's using the fieldSpecs +type Filter struct { + Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"` + + FieldSpec types.FieldSpec `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"` +} + +var _ kio.Filter = Filter{} + +func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) { + return kio.FilterAll(yaml.FilterFunc(f.run)).Filter(nodes) +} + +func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) { + err := node.PipeE(fieldspec.Filter{ + FieldSpec: f.FieldSpec, + SetValue: f.evaluateField, + CreateKind: yaml.ScalarNode, // Name is a ScalarNode + CreateTag: yaml.NodeTagString, + }) + return node, err +} + +func (f Filter) evaluateField(node *yaml.RNode) error { + return filtersutil.SetScalar(fmt.Sprintf( + "%s%s", node.YNode().Value, f.Suffix))(node) +} diff --git a/api/filters/suffix/suffix_test.go b/api/filters/suffix/suffix_test.go new file mode 100644 index 000000000..94020ed94 --- /dev/null +++ b/api/filters/suffix/suffix_test.go @@ -0,0 +1,106 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package suffix_test + +import ( + "strings" + "testing" + + "github.com/stretchr/testify/assert" + "sigs.k8s.io/kustomize/api/filters/suffix" + filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest" + "sigs.k8s.io/kustomize/api/types" +) + +var tests = map[string]TestCase{ + "suffix": { + input: ` +apiVersion: example.com/v1 +kind: Foo +metadata: + name: instance +--- +apiVersion: example.com/v1 +kind: Bar +metadata: + name: instance +`, + expected: ` +apiVersion: example.com/v1 +kind: Foo +metadata: + name: instance-foo +--- +apiVersion: example.com/v1 +kind: Bar +metadata: + name: instance-foo +`, + filter: suffix.Filter{ + Suffix: "-foo", + FieldSpec: types.FieldSpec{Path: "metadata/name"}, + }, + }, + + "data-fieldspecs": { + input: ` +apiVersion: example.com/v1 +kind: Foo +metadata: + name: instance +a: + b: + c: d +--- +apiVersion: example.com/v1 +kind: Bar +metadata: + name: instance +a: + b: + c: d +`, + expected: ` +apiVersion: example.com/v1 +kind: Foo +metadata: + name: instance +a: + b: + c: d-foo +--- +apiVersion: example.com/v1 +kind: Bar +metadata: + name: instance +a: + b: + c: d-foo +`, + filter: suffix.Filter{ + Suffix: "-foo", + FieldSpec: types.FieldSpec{Path: "a/b/c"}, + }, + }, +} + +type TestCase struct { + input string + expected string + filter suffix.Filter +} + +func TestFilter(t *testing.T) { + for name := range tests { + test := tests[name] + t.Run(name, func(t *testing.T) { + if !assert.Equal(t, + strings.TrimSpace(test.expected), + strings.TrimSpace( + filtertest_test.RunFilter(t, test.input, test.filter))) { + t.FailNow() + } + }) + } +} diff --git a/api/internal/builtins/PrefixSuffixTransformer.go b/api/internal/builtins/PrefixTransformer.go similarity index 51% rename from api/internal/builtins/PrefixSuffixTransformer.go rename to api/internal/builtins/PrefixTransformer.go index 57a81a0fc..ef60d3e79 100644 --- a/api/internal/builtins/PrefixSuffixTransformer.go +++ b/api/internal/builtins/PrefixTransformer.go @@ -1,4 +1,4 @@ -// Code generated by pluginator on PrefixSuffixTransformer; DO NOT EDIT. +// Code generated by pluginator on PrefixTransformer; DO NOT EDIT. // pluginator {unknown 1970-01-01T00:00:00Z } package builtins @@ -6,32 +6,28 @@ package builtins import ( "errors" - "sigs.k8s.io/kustomize/api/filters/prefixsuffix" + "sigs.k8s.io/kustomize/api/filters/prefix" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/resid" - "sigs.k8s.io/yaml" + "sigs.k8s.io/kustomize/kyaml/yaml" ) -// Add the given prefix and suffix to the field. -type PrefixSuffixTransformerPlugin struct { +// Add the given prefix to the field +type PrefixTransformerPlugin struct { Prefix string `json:"prefix,omitempty" yaml:"prefix,omitempty"` - Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"` FieldSpecs types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` } -// A Gvk skip list for prefix/suffix modification. -// hard coded for now - eventually should be part of config. -var prefixSuffixFieldSpecsToSkip = types.FsSlice{ +var prefixFieldSpecsToSkip = types.FsSlice{ {Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}}, {Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}}, {Gvk: resid.Gvk{Kind: "Namespace"}}, } -func (p *PrefixSuffixTransformerPlugin) Config( +func (p *PrefixTransformerPlugin) Config( _ *resmap.PluginHelpers, c []byte) (err error) { p.Prefix = "" - p.Suffix = "" p.FieldSpecs = nil err = yaml.Unmarshal(c, p) if err != nil { @@ -43,10 +39,10 @@ func (p *PrefixSuffixTransformerPlugin) Config( return } -func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error { - // Even if both the Prefix and Suffix are empty we want - // to proceed with the transformation. This allows to add contextual - // information to the resources (AddNamePrefix and AddNameSuffix). +func (p *PrefixTransformerPlugin) Transform(m resmap.ResMap) error { + // Even if the Prefix is empty we want to proceed with the + // transformation. This allows to add contextual information + // to the resources (AddNamePrefix). for _, r := range m.Resources() { // TODO: move this test into the filter (i.e. make a better filter) if p.shouldSkip(r.OrgId()) { @@ -61,21 +57,21 @@ func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error { continue } // TODO: move this test into the filter. - if smellsLikeANameChange(&fs) { + if fs.Path == "metadata/name" { // "metadata/name" is the only field. - // this will add a prefix and a suffix - // to the resource even if those are - // empty + // this will add a prefix to the resource + // even if it is empty r.AddNamePrefix(p.Prefix) - r.AddNameSuffix(p.Suffix) - if p.Prefix != "" || p.Suffix != "" { + if p.Prefix != "" { + // TODO: There are multiple transformers that can change a resource's name, and each makes a call to + // StorePreviousID(). We should make it so that we only call StorePreviousID once per kustomization layer + // to avoid storing intermediate names between transformations, to prevent intermediate name conflicts. r.StorePreviousId() } } - if err := r.ApplyFilter(prefixsuffix.Filter{ + if err := r.ApplyFilter(prefix.Filter{ Prefix: p.Prefix, - Suffix: p.Suffix, FieldSpec: fs, }); err != nil { return err @@ -85,12 +81,8 @@ func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error { return nil } -func smellsLikeANameChange(fs *types.FieldSpec) bool { - return fs.Path == "metadata/name" -} - -func (p *PrefixSuffixTransformerPlugin) shouldSkip(id resid.ResId) bool { - for _, path := range prefixSuffixFieldSpecsToSkip { +func (p *PrefixTransformerPlugin) shouldSkip(id resid.ResId) bool { + for _, path := range prefixFieldSpecsToSkip { if id.IsSelected(&path.Gvk) { return true } @@ -98,6 +90,6 @@ func (p *PrefixSuffixTransformerPlugin) shouldSkip(id resid.ResId) bool { return false } -func NewPrefixSuffixTransformerPlugin() resmap.TransformerPlugin { - return &PrefixSuffixTransformerPlugin{} +func NewPrefixTransformerPlugin() resmap.TransformerPlugin { + return &PrefixTransformerPlugin{} } diff --git a/api/internal/builtins/SuffixTransformer.go b/api/internal/builtins/SuffixTransformer.go new file mode 100644 index 000000000..09a2d6977 --- /dev/null +++ b/api/internal/builtins/SuffixTransformer.go @@ -0,0 +1,95 @@ +// Code generated by pluginator on SuffixTransformer; DO NOT EDIT. +// pluginator {unknown 1970-01-01T00:00:00Z } + +package builtins + +import ( + "errors" + + "sigs.k8s.io/kustomize/api/filters/suffix" + "sigs.k8s.io/kustomize/api/resmap" + "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" + "sigs.k8s.io/kustomize/kyaml/yaml" +) + +// Add the given suffix to the field +type SuffixTransformerPlugin struct { + Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"` + FieldSpecs types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` +} + +var suffixFieldSpecsToSkip = types.FsSlice{ + {Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}}, + {Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}}, + {Gvk: resid.Gvk{Kind: "Namespace"}}, +} + +func (p *SuffixTransformerPlugin) Config( + _ *resmap.PluginHelpers, c []byte) (err error) { + p.Suffix = "" + p.FieldSpecs = nil + err = yaml.Unmarshal(c, p) + if err != nil { + return + } + if p.FieldSpecs == nil { + return errors.New("fieldSpecs is not expected to be nil") + } + return +} + +func (p *SuffixTransformerPlugin) Transform(m resmap.ResMap) error { + // Even if the Suffix is empty we want to proceed with the + // transformation. This allows to add contextual information + // to the resources (AddNameSuffix). + for _, r := range m.Resources() { + // TODO: move this test into the filter (i.e. make a better filter) + if p.shouldSkip(r.OrgId()) { + continue + } + id := r.OrgId() + // current default configuration contains + // only one entry: "metadata/name" with no GVK + for _, fs := range p.FieldSpecs { + // TODO: this is redundant to filter (but needed for now) + if !id.IsSelected(&fs.Gvk) { + continue + } + // TODO: move this test into the filter. + if fs.Path == "metadata/name" { + // "metadata/name" is the only field. + // this will add a suffix to the resource + // even if it is empty + + r.AddNameSuffix(p.Suffix) + if p.Suffix != "" { + // TODO: There are multiple transformers that can change a resource's name, and each makes a call to + // StorePreviousID(). We should make it so that we only call StorePreviousID once per kustomization layer + // to avoid storing intermediate names between transformations, to prevent intermediate name conflicts. + r.StorePreviousId() + } + } + if err := r.ApplyFilter(suffix.Filter{ + Suffix: p.Suffix, + FieldSpec: fs, + }); err != nil { + return err + } + } + } + return nil +} + +func (p *SuffixTransformerPlugin) shouldSkip(id resid.ResId) bool { + for _, path := range suffixFieldSpecsToSkip { + if id.IsSelected(&path.Gvk) { + return true + } + } + return false +} + +func NewSuffixTransformerPlugin() resmap.TransformerPlugin { + return &SuffixTransformerPlugin{} +} diff --git a/api/internal/plugins/builtinhelpers/builtinplugintype_string.go b/api/internal/plugins/builtinhelpers/builtinplugintype_string.go index e87fe90e4..1b347cbc8 100644 --- a/api/internal/plugins/builtinhelpers/builtinplugintype_string.go +++ b/api/internal/plugins/builtinhelpers/builtinplugintype_string.go @@ -21,16 +21,18 @@ func _() { _ = x[PatchStrategicMergeTransformer-10] _ = x[PatchTransformer-11] _ = x[PrefixSuffixTransformer-12] - _ = x[ReplicaCountTransformer-13] - _ = x[SecretGenerator-14] - _ = x[ValueAddTransformer-15] - _ = x[HelmChartInflationGenerator-16] - _ = x[ReplacementTransformer-17] + _ = x[PrefixTransformer-13] + _ = x[SuffixTransformer-14] + _ = x[ReplicaCountTransformer-15] + _ = x[SecretGenerator-16] + _ = x[ValueAddTransformer-17] + _ = x[HelmChartInflationGenerator-18] + _ = x[ReplacementTransformer-19] } -const _BuiltinPluginType_name = "UnknownAnnotationsTransformerConfigMapGeneratorIAMPolicyGeneratorHashTransformerImageTagTransformerLabelTransformerLegacyOrderTransformerNamespaceTransformerPatchJson6902TransformerPatchStrategicMergeTransformerPatchTransformerPrefixSuffixTransformerReplicaCountTransformerSecretGeneratorValueAddTransformerHelmChartInflationGeneratorReplacementTransformer" +const _BuiltinPluginType_name = "UnknownAnnotationsTransformerConfigMapGeneratorIAMPolicyGeneratorHashTransformerImageTagTransformerLabelTransformerLegacyOrderTransformerNamespaceTransformerPatchJson6902TransformerPatchStrategicMergeTransformerPatchTransformerPrefixSuffixTransformerPrefixTransformerSuffixTransformerReplicaCountTransformerSecretGeneratorValueAddTransformerHelmChartInflationGeneratorReplacementTransformer" -var _BuiltinPluginType_index = [...]uint16{0, 7, 29, 47, 65, 80, 99, 115, 137, 157, 181, 211, 227, 250, 273, 288, 307, 334, 356} +var _BuiltinPluginType_index = [...]uint16{0, 7, 29, 47, 65, 80, 99, 115, 137, 157, 181, 211, 227, 250, 267, 284, 307, 322, 341, 368, 390} func (i BuiltinPluginType) String() string { if i < 0 || i >= BuiltinPluginType(len(_BuiltinPluginType_index)-1) { diff --git a/api/internal/plugins/builtinhelpers/builtins.go b/api/internal/plugins/builtinhelpers/builtins.go index 416ce5ec0..260ed1bf5 100644 --- a/api/internal/plugins/builtinhelpers/builtins.go +++ b/api/internal/plugins/builtinhelpers/builtins.go @@ -25,6 +25,8 @@ const ( PatchStrategicMergeTransformer PatchTransformer PrefixSuffixTransformer + PrefixTransformer + SuffixTransformer ReplicaCountTransformer SecretGenerator ValueAddTransformer @@ -64,6 +66,35 @@ var GeneratorFactories = map[BuiltinPluginType]func() resmap.GeneratorPlugin{ HelmChartInflationGenerator: builtins.NewHelmChartInflationGeneratorPlugin, } +type MultiTransformer struct { + transformers []resmap.TransformerPlugin +} + +func (t *MultiTransformer) Transform(m resmap.ResMap) error { + for _, transformer := range t.transformers { + if err := transformer.Transform(m); err != nil { + return err + } + } + return nil +} + +func (t *MultiTransformer) Config(h *resmap.PluginHelpers, b []byte) error { + for _, transformer := range t.transformers { + if err := transformer.Config(h, b); err != nil { + return err + } + } + return nil +} + +func NewMultiTransformer() resmap.TransformerPlugin { + return &MultiTransformer{[]resmap.TransformerPlugin{ + builtins.NewPrefixTransformerPlugin(), + builtins.NewSuffixTransformerPlugin(), + }} +} + var TransformerFactories = map[BuiltinPluginType]func() resmap.TransformerPlugin{ AnnotationsTransformer: builtins.NewAnnotationsTransformerPlugin, HashTransformer: builtins.NewHashTransformerPlugin, @@ -74,7 +105,9 @@ var TransformerFactories = map[BuiltinPluginType]func() resmap.TransformerPlugin PatchJson6902Transformer: builtins.NewPatchJson6902TransformerPlugin, PatchStrategicMergeTransformer: builtins.NewPatchStrategicMergeTransformerPlugin, PatchTransformer: builtins.NewPatchTransformerPlugin, - PrefixSuffixTransformer: builtins.NewPrefixSuffixTransformerPlugin, + PrefixSuffixTransformer: NewMultiTransformer, + PrefixTransformer: builtins.NewPrefixTransformerPlugin, + SuffixTransformer: builtins.NewSuffixTransformerPlugin, ReplacementTransformer: builtins.NewReplacementTransformerPlugin, ReplicaCountTransformer: builtins.NewReplicaCountTransformerPlugin, ValueAddTransformer: builtins.NewValueAddTransformerPlugin, diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go index 7bb15516e..ba9b705c0 100644 --- a/api/internal/target/kusttarget_configplugin.go +++ b/api/internal/target/kusttarget_configplugin.go @@ -51,7 +51,8 @@ func (kt *KustTarget) configureBuiltinTransformers( builtinhelpers.PatchStrategicMergeTransformer, builtinhelpers.PatchTransformer, builtinhelpers.NamespaceTransformer, - builtinhelpers.PrefixSuffixTransformer, + builtinhelpers.PrefixTransformer, + builtinhelpers.SuffixTransformer, builtinhelpers.LabelTransformer, builtinhelpers.AnnotationsTransformer, builtinhelpers.PatchJson6902Transformer, @@ -286,16 +287,14 @@ var transformerConfigurators = map[builtinhelpers.BuiltinPluginType]func( result = append(result, p) return }, - builtinhelpers.PrefixSuffixTransformer: func( + builtinhelpers.PrefixTransformer: func( kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) ( result []resmap.Transformer, err error) { var c struct { - Prefix string - Suffix string - FieldSpecs []types.FieldSpec + Prefix string `json:"prefix,omitempty" yaml:"prefix,omitempty"` + FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` } c.Prefix = kt.kustomization.NamePrefix - c.Suffix = kt.kustomization.NameSuffix c.FieldSpecs = tc.NamePrefix p := f() err = kt.configureBuiltinPlugin(p, c, bpt) @@ -305,6 +304,23 @@ var transformerConfigurators = map[builtinhelpers.BuiltinPluginType]func( result = append(result, p) return }, + builtinhelpers.SuffixTransformer: func( + kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) ( + result []resmap.Transformer, err error) { + var c struct { + Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"` + FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` + } + c.Suffix = kt.kustomization.NameSuffix + c.FieldSpecs = tc.NameSuffix + p := f() + err = kt.configureBuiltinPlugin(p, c, bpt) + if err != nil { + return nil, err + } + result = append(result, p) + return + }, builtinhelpers.ImageTagTransformer: func( kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) ( result []resmap.Transformer, err error) { diff --git a/api/konfig/builtinpluginconsts/defaultconfig.go b/api/konfig/builtinpluginconsts/defaultconfig.go index 435491ccd..29673d76a 100644 --- a/api/konfig/builtinpluginconsts/defaultconfig.go +++ b/api/konfig/builtinpluginconsts/defaultconfig.go @@ -11,6 +11,7 @@ import ( func GetDefaultFieldSpecs() []byte { configData := [][]byte{ []byte(namePrefixFieldSpecs), + []byte(nameSuffixFieldSpecs), []byte(commonLabelFieldSpecs), []byte(commonAnnotationFieldSpecs), []byte(namespaceFieldSpecs), @@ -27,6 +28,7 @@ func GetDefaultFieldSpecs() []byte { func GetDefaultFieldSpecsAsMap() map[string]string { result := make(map[string]string) result["nameprefix"] = namePrefixFieldSpecs + result["namesuffix"] = nameSuffixFieldSpecs result["commonlabels"] = commonLabelFieldSpecs result["commonannotations"] = commonAnnotationFieldSpecs result["namespace"] = namespaceFieldSpecs diff --git a/api/konfig/builtinpluginconsts/namesuffix.go b/api/konfig/builtinpluginconsts/namesuffix.go new file mode 100644 index 000000000..11592bd2b --- /dev/null +++ b/api/konfig/builtinpluginconsts/namesuffix.go @@ -0,0 +1,11 @@ +// Copyright 2019 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package builtinpluginconsts + +const ( + nameSuffixFieldSpecs = ` +nameSuffix: +- path: metadata/name +` +) diff --git a/api/krusty/customconfigofbuiltinplugin_test.go b/api/krusty/customconfigofbuiltinplugin_test.go index dd4d0d8d8..7b33e4038 100644 --- a/api/krusty/customconfigofbuiltinplugin_test.go +++ b/api/krusty/customconfigofbuiltinplugin_test.go @@ -6,6 +6,8 @@ package krusty_test import ( "testing" + "sigs.k8s.io/kustomize/api/types" + kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" ) @@ -13,8 +15,8 @@ import ( // This is a NamePrefixer that touches Deployments // and Services exclusively. func TestCustomNamePrefixer(t *testing.T) { - th := kusttest_test.MakeEnhancedHarness(t). - PrepBuiltin("PrefixSuffixTransformer") + th := kusttest_test.MakeEnhancedHarness(t) + th.GetPluginConfig().BpLoadingOptions = types.BploUseStaticallyLinked defer th.Reset() th.WriteK(".", ` diff --git a/api/krusty/customconfigreusable_test.go b/api/krusty/customconfigreusable_test.go index 148abe4b7..04e56512c 100644 --- a/api/krusty/customconfigreusable_test.go +++ b/api/krusty/customconfigreusable_test.go @@ -7,6 +7,7 @@ import ( "testing" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" + "sigs.k8s.io/kustomize/api/types" ) // Demo custom configuration as a base. @@ -15,9 +16,9 @@ import ( // kustomizations. func TestReusableCustomTransformers(t *testing.T) { th := kusttest_test.MakeEnhancedHarness(t). - PrepBuiltin("PrefixSuffixTransformer"). PrepBuiltin("AnnotationsTransformer"). PrepBuiltin("LabelTransformer") + th.GetPluginConfig().BpLoadingOptions = types.BploUseStaticallyLinked defer th.Reset() // First write three custom configurations for builtin plugins. diff --git a/api/krusty/legacyprefixsuffixtransformer_test.go b/api/krusty/legacyprefixsuffixtransformer_test.go new file mode 100644 index 000000000..d3e0daad3 --- /dev/null +++ b/api/krusty/legacyprefixsuffixtransformer_test.go @@ -0,0 +1,41 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package krusty_test + +import ( + "testing" + + kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" +) + +func TestLegacyPrefixSuffixTransformer(t *testing.T) { + th := kusttest_test.MakeHarness(t) + th.WriteK(".", ` +resources: +- service.yaml +transformers: +- |- + apiVersion: builtin + kind: PrefixSuffixTransformer + metadata: + name: notImportantHere + prefix: baked- + suffix: -pie + fieldSpecs: + - path: metadata/name +`) + th.WriteF("service.yaml", ` +apiVersion: v1 +kind: Service +metadata: + name: apple +`) + m := th.Run(".", th.MakeDefaultOptions()) + th.AssertActualEqualsExpected(m, ` +apiVersion: v1 +kind: Service +metadata: + name: baked-apple-pie +`) +} diff --git a/hack/generateBuiltinKrmFunctions.sh b/hack/generateBuiltinKrmFunctions.sh index baad8585b..106108504 100755 --- a/hack/generateBuiltinKrmFunctions.sh +++ b/hack/generateBuiltinKrmFunctions.sh @@ -11,6 +11,8 @@ builtinPlugins=(AnnotationsTransformer \ PatchStrategicMergeTransformer \ PatchTransformer \ PrefixSuffixTransformer \ + PrefixTransformer \ + SuffixTransformer \ ReplicaCountTransformer \ SecretGenerator \ ValueAddTransformer \ diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go b/plugin/builtin/prefixtransformer/PrefixTransformer.go similarity index 62% rename from plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go rename to plugin/builtin/prefixtransformer/PrefixTransformer.go index 40ed1b840..3051d0636 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go +++ b/plugin/builtin/prefixtransformer/PrefixTransformer.go @@ -1,4 +1,4 @@ -// Copyright 2019 The Kubernetes Authors. +// Copyright 2021 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 //go:generate pluginator @@ -7,26 +7,24 @@ package main import ( "errors" - "sigs.k8s.io/kustomize/api/filters/prefixsuffix" + "sigs.k8s.io/kustomize/api/filters/prefix" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/resid" - "sigs.k8s.io/yaml" + "sigs.k8s.io/kustomize/kyaml/yaml" ) -// Add the given prefix and suffix to the field. +// Add the given prefix to the field type plugin struct { Prefix string `json:"prefix,omitempty" yaml:"prefix,omitempty"` - Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"` FieldSpecs types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` } //noinspection GoUnusedGlobalVariable var KustomizePlugin plugin -// A Gvk skip list for prefix/suffix modification. -// hard coded for now - eventually should be part of config. -var prefixSuffixFieldSpecsToSkip = types.FsSlice{ +// TODO: Make this gvk skip list part of the config. +var prefixFieldSpecsToSkip = types.FsSlice{ {Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}}, {Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}}, {Gvk: resid.Gvk{Kind: "Namespace"}}, @@ -35,7 +33,6 @@ var prefixSuffixFieldSpecsToSkip = types.FsSlice{ func (p *plugin) Config( _ *resmap.PluginHelpers, c []byte) (err error) { p.Prefix = "" - p.Suffix = "" p.FieldSpecs = nil err = yaml.Unmarshal(c, p) if err != nil { @@ -48,9 +45,9 @@ func (p *plugin) Config( } func (p *plugin) Transform(m resmap.ResMap) error { - // Even if both the Prefix and Suffix are empty we want - // to proceed with the transformation. This allows to add contextual - // information to the resources (AddNamePrefix and AddNameSuffix). + // Even if the Prefix is empty we want to proceed with the + // transformation. This allows to add contextual information + // to the resources (AddNamePrefix). for _, r := range m.Resources() { // TODO: move this test into the filter (i.e. make a better filter) if p.shouldSkip(r.OrgId()) { @@ -65,21 +62,21 @@ func (p *plugin) Transform(m resmap.ResMap) error { continue } // TODO: move this test into the filter. - if smellsLikeANameChange(&fs) { + if fs.Path == "metadata/name" { // "metadata/name" is the only field. - // this will add a prefix and a suffix - // to the resource even if those are - // empty + // this will add a prefix to the resource + // even if it is empty r.AddNamePrefix(p.Prefix) - r.AddNameSuffix(p.Suffix) - if p.Prefix != "" || p.Suffix != "" { + if p.Prefix != "" { + // TODO: There are multiple transformers that can change a resource's name, and each makes a call to + // StorePreviousID(). We should make it so that we only call StorePreviousID once per kustomization layer + // to avoid storing intermediate names between transformations, to prevent intermediate name conflicts. r.StorePreviousId() } } - if err := r.ApplyFilter(prefixsuffix.Filter{ + if err := r.ApplyFilter(prefix.Filter{ Prefix: p.Prefix, - Suffix: p.Suffix, FieldSpec: fs, }); err != nil { return err @@ -89,12 +86,8 @@ func (p *plugin) Transform(m resmap.ResMap) error { return nil } -func smellsLikeANameChange(fs *types.FieldSpec) bool { - return fs.Path == "metadata/name" -} - func (p *plugin) shouldSkip(id resid.ResId) bool { - for _, path := range prefixSuffixFieldSpecsToSkip { + for _, path := range prefixFieldSpecsToSkip { if id.IsSelected(&path.Gvk) { return true } diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go b/plugin/builtin/prefixtransformer/PrefixTransformer_test.go similarity index 89% rename from plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go rename to plugin/builtin/prefixtransformer/PrefixTransformer_test.go index 3d81cdebc..00247c1e6 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go +++ b/plugin/builtin/prefixtransformer/PrefixTransformer_test.go @@ -1,4 +1,4 @@ -// Copyright 2019 The Kubernetes Authors. +// Copyright 2021 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 package main_test @@ -9,18 +9,17 @@ import ( kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" ) -func TestPrefixSuffixTransformer(t *testing.T) { +func TestPrefixTransformer(t *testing.T) { th := kusttest_test.MakeEnhancedHarness(t). - PrepBuiltin("PrefixSuffixTransformer") + PrepBuiltin("PrefixTransformer") defer th.Reset() rm := th.LoadAndRunTransformer(` apiVersion: builtin -kind: PrefixSuffixTransformer +kind: PrefixTransformer metadata: name: notImportantHere prefix: baked- -suffix: -pie fieldSpecs: - path: metadata/name `, ` @@ -67,8 +66,7 @@ metadata: internal.config.kubernetes.io/previousKinds: Service internal.config.kubernetes.io/previousNames: apple internal.config.kubernetes.io/previousNamespaces: default - internal.config.kubernetes.io/suffixes: -pie - name: baked-apple-pie + name: baked-apple spec: ports: - port: 7002 @@ -91,13 +89,12 @@ metadata: internal.config.kubernetes.io/previousKinds: ConfigMap internal.config.kubernetes.io/previousNames: cm internal.config.kubernetes.io/previousNamespaces: default - internal.config.kubernetes.io/suffixes: -pie - name: baked-cm-pie + name: baked-cm `) rm = th.LoadAndRunTransformer(` apiVersion: builtin -kind: PrefixSuffixTransformer +kind: PrefixTransformer metadata: name: notImportantHere prefix: test- diff --git a/plugin/builtin/prefixsuffixtransformer/go.mod b/plugin/builtin/prefixtransformer/go.mod similarity index 68% rename from plugin/builtin/prefixsuffixtransformer/go.mod rename to plugin/builtin/prefixtransformer/go.mod index 8b9398e70..91bd0b98c 100644 --- a/plugin/builtin/prefixsuffixtransformer/go.mod +++ b/plugin/builtin/prefixtransformer/go.mod @@ -1,11 +1,10 @@ -module sigs.k8s.io/kustomize/plugin/builtin/prefixsuffixtransformer +module sigs.k8s.io/kustomize/plugin/builtin/prefixtransformer go 1.16 require ( sigs.k8s.io/kustomize/api v0.8.9 sigs.k8s.io/kustomize/kyaml v0.13.0 - sigs.k8s.io/yaml v1.2.0 ) replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/prefixsuffixtransformer/go.sum b/plugin/builtin/prefixtransformer/go.sum similarity index 100% rename from plugin/builtin/prefixsuffixtransformer/go.sum rename to plugin/builtin/prefixtransformer/go.sum diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go index 0a7e0a291..ab1141315 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go +++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go @@ -7,6 +7,7 @@ import ( "testing" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" + "sigs.k8s.io/kustomize/api/types" ) func TestReplicaCountTransformer(t *testing.T) { @@ -148,9 +149,8 @@ spec: } func TestMatchesCurrentID(t *testing.T) { - th := kusttest_test.MakeEnhancedHarness(t). - PrepBuiltin("PrefixSuffixTransformer"). - PrepBuiltin("ReplicaCountTransformer") + th := kusttest_test.MakeEnhancedHarness(t) + th.GetPluginConfig().BpLoadingOptions = types.BploUseStaticallyLinked defer th.Reset() rm := th.LoadAndRunTransformer(` diff --git a/plugin/builtin/suffixtransformer/SuffixTransformer.go b/plugin/builtin/suffixtransformer/SuffixTransformer.go new file mode 100644 index 000000000..da01098c8 --- /dev/null +++ b/plugin/builtin/suffixtransformer/SuffixTransformer.go @@ -0,0 +1,96 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +//go:generate pluginator +package main + +import ( + "errors" + + "sigs.k8s.io/kustomize/api/filters/suffix" + "sigs.k8s.io/kustomize/api/resmap" + "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" + "sigs.k8s.io/kustomize/kyaml/yaml" +) + +// Add the given suffix to the field +type plugin struct { + Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"` + FieldSpecs types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` +} + +//noinspection GoUnusedGlobalVariable +var KustomizePlugin plugin + +// TODO: Make this gvk skip list part of the config. +var suffixFieldSpecsToSkip = types.FsSlice{ + {Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}}, + {Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}}, + {Gvk: resid.Gvk{Kind: "Namespace"}}, +} + +func (p *plugin) Config( + _ *resmap.PluginHelpers, c []byte) (err error) { + p.Suffix = "" + p.FieldSpecs = nil + err = yaml.Unmarshal(c, p) + if err != nil { + return + } + if p.FieldSpecs == nil { + return errors.New("fieldSpecs is not expected to be nil") + } + return +} + +func (p *plugin) Transform(m resmap.ResMap) error { + // Even if the Suffix is empty we want to proceed with the + // transformation. This allows to add contextual information + // to the resources (AddNameSuffix). + for _, r := range m.Resources() { + // TODO: move this test into the filter (i.e. make a better filter) + if p.shouldSkip(r.OrgId()) { + continue + } + id := r.OrgId() + // current default configuration contains + // only one entry: "metadata/name" with no GVK + for _, fs := range p.FieldSpecs { + // TODO: this is redundant to filter (but needed for now) + if !id.IsSelected(&fs.Gvk) { + continue + } + // TODO: move this test into the filter. + if fs.Path == "metadata/name" { + // "metadata/name" is the only field. + // this will add a suffix to the resource + // even if it is empty + + r.AddNameSuffix(p.Suffix) + if p.Suffix != "" { + // TODO: There are multiple transformers that can change a resource's name, and each makes a call to + // StorePreviousID(). We should make it so that we only call StorePreviousID once per kustomization layer + // to avoid storing intermediate names between transformations, to prevent intermediate name conflicts. + r.StorePreviousId() + } + } + if err := r.ApplyFilter(suffix.Filter{ + Suffix: p.Suffix, + FieldSpec: fs, + }); err != nil { + return err + } + } + } + return nil +} + +func (p *plugin) shouldSkip(id resid.ResId) bool { + for _, path := range suffixFieldSpecsToSkip { + if id.IsSelected(&path.Gvk) { + return true + } + } + return false +} diff --git a/plugin/builtin/suffixtransformer/SuffixTransformer_test.go b/plugin/builtin/suffixtransformer/SuffixTransformer_test.go new file mode 100644 index 000000000..47700efbc --- /dev/null +++ b/plugin/builtin/suffixtransformer/SuffixTransformer_test.go @@ -0,0 +1,166 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package main_test + +import ( + "testing" + + kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" +) + +func TestSuffixTransformer(t *testing.T) { + th := kusttest_test.MakeEnhancedHarness(t). + PrepBuiltin("SuffixTransformer") + defer th.Reset() + + rm := th.LoadAndRunTransformer(` +apiVersion: builtin +kind: SuffixTransformer +metadata: + name: notImportantHere +suffix: -pie +fieldSpecs: + - path: metadata/name +`, ` +apiVersion: v1 +kind: Namespace +metadata: + name: apple +--- +apiVersion: v1 +kind: Service +metadata: + name: apple +spec: + ports: + - port: 7002 +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: crd +--- +apiVersion: apiregistration.k8s.io/v1 +kind: APIService +metadata: + name: apiservice +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: cm +`) + + th.AssertActualEqualsExpected(rm, ` +apiVersion: v1 +kind: Namespace +metadata: + name: apple +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + internal.config.kubernetes.io/previousKinds: Service + internal.config.kubernetes.io/previousNames: apple + internal.config.kubernetes.io/previousNamespaces: default + internal.config.kubernetes.io/suffixes: -pie + name: apple-pie +spec: + ports: + - port: 7002 +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: crd +--- +apiVersion: apiregistration.k8s.io/v1 +kind: APIService +metadata: + name: apiservice +--- +apiVersion: v1 +kind: ConfigMap +metadata: + annotations: + internal.config.kubernetes.io/previousKinds: ConfigMap + internal.config.kubernetes.io/previousNames: cm + internal.config.kubernetes.io/previousNamespaces: default + internal.config.kubernetes.io/suffixes: -pie + name: cm-pie +`) + + rm = th.LoadAndRunTransformer(` +apiVersion: builtin +kind: SuffixTransformer +metadata: + name: notImportantHere +suffix: -test +fieldSpecs: + - kind: Deployment + path: metadata/name + - kind: Deployment + path: spec/template/spec/containers/name +`, ` +apiVersion: apps/v1 +kind: Deployment +metadata: + name: deployment +spec: + template: + spec: + containers: + - image: myapp + name: main +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: crd +--- +apiVersion: apiregistration.k8s.io/v1 +kind: APIService +metadata: + name: apiservice +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: cm +`) + + th.AssertActualEqualsExpected(rm, ` +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + internal.config.kubernetes.io/previousKinds: Deployment + internal.config.kubernetes.io/previousNames: deployment + internal.config.kubernetes.io/previousNamespaces: default + internal.config.kubernetes.io/suffixes: -test + name: deployment-test +spec: + template: + spec: + containers: + - image: myapp + name: main-test +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: crd +--- +apiVersion: apiregistration.k8s.io/v1 +kind: APIService +metadata: + name: apiservice +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: cm +`) +} diff --git a/plugin/builtin/suffixtransformer/go.mod b/plugin/builtin/suffixtransformer/go.mod new file mode 100644 index 000000000..685e8d767 --- /dev/null +++ b/plugin/builtin/suffixtransformer/go.mod @@ -0,0 +1,12 @@ +module sigs.k8s.io/kustomize/plugin/builtin/suffixtransformer + +go 1.16 + +require ( + sigs.k8s.io/kustomize/api v0.8.9 + sigs.k8s.io/kustomize/kyaml v0.13.0 +) + +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml + +replace sigs.k8s.io/kustomize/api => ../../../api diff --git a/plugin/builtin/suffixtransformer/go.sum b/plugin/builtin/suffixtransformer/go.sum new file mode 100644 index 000000000..5055de671 --- /dev/null +++ b/plugin/builtin/suffixtransformer/go.sum @@ -0,0 +1,228 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs= +github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI= +github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= +go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= +k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go index 63aca0afb..a416dbae5 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go +++ b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go @@ -25,11 +25,10 @@ type plugin struct { //noinspection GoUnusedGlobalVariable var KustomizePlugin plugin -func (p *plugin) makePrefixSuffixPluginConfig() ([]byte, error) { +func (p *plugin) makePrefixPluginConfig() ([]byte, error) { var s struct { - Prefix string - Suffix string - FieldSpecs []types.FieldSpec + Prefix string `json:"prefix,omitempty" yaml:"prefix,omitempty"` + FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` } s.Prefix = getDate() + "-" s.FieldSpecs = []types.FieldSpec{ @@ -40,16 +39,16 @@ func (p *plugin) makePrefixSuffixPluginConfig() ([]byte, error) { func (p *plugin) Config(h *resmap.PluginHelpers, _ []byte) error { // Ignore the incoming c, compute new config. - c, err := p.makePrefixSuffixPluginConfig() + c, err := p.makePrefixPluginConfig() if err != nil { return errors.Wrapf( err, "dateprefixer makeconfig") } - prefixer := builtins.NewPrefixSuffixTransformerPlugin() + prefixer := builtins.NewPrefixTransformerPlugin() err = prefixer.Config(h, c) if err != nil { return errors.Wrapf( - err, "prefixsuffix configure") + err, "prefix configure") } p.t = prefixer return nil diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go index 2a42a0009..073e7e99f 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go +++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go @@ -26,11 +26,10 @@ type plugin struct { //noinspection GoUnusedGlobalVariable var KustomizePlugin plugin -func (p *plugin) makePrefixSuffixPluginConfig(n string) ([]byte, error) { +func (p *plugin) makePrefixPluginConfig(n string) ([]byte, error) { var s struct { - Prefix string - Suffix string - FieldSpecs []types.FieldSpec + Prefix string `json:"prefix,omitempty" yaml:"prefix,omitempty"` + FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` } s.Prefix = n + "-" s.FieldSpecs = []types.FieldSpec{ @@ -44,11 +43,11 @@ func (p *plugin) Config(h *resmap.PluginHelpers, c []byte) error { if err != nil { return err } - c, err = p.makePrefixSuffixPluginConfig(p.Name) + c, err = p.makePrefixPluginConfig(p.Name) if err != nil { return err } - prefixer := builtins.NewPrefixSuffixTransformerPlugin() + prefixer := builtins.NewPrefixTransformerPlugin() err = prefixer.Config(h, c) if err != nil { return errors.Wrapf(