diff --git a/api/internal/plugins/loader/loader.go b/api/internal/plugins/loader/loader.go index 26441ed51..43b11d6ff 100644 --- a/api/internal/plugins/loader/loader.go +++ b/api/internal/plugins/loader/loader.go @@ -42,16 +42,24 @@ func NewLoader( return &Loader{pc: pc, rf: rf, fs: fs} } +// LoaderWithWorkingDir returns loader after setting its working directory. +// NOTE: This is not really a new loader since some of the Loader struct fields are pointers. +func (l *Loader) LoaderWithWorkingDir(wd string) *Loader { + lpc := &types.PluginConfig{ + PluginRestrictions: l.pc.PluginRestrictions, + BpLoadingOptions: l.pc.BpLoadingOptions, + FnpLoadingOptions: l.pc.FnpLoadingOptions, + HelmConfig: l.pc.HelmConfig, + } + lpc.FnpLoadingOptions.WorkingDir = wd + return &Loader{pc: lpc, rf: l.rf, fs: l.fs} +} + // Config provides the global (not plugin specific) PluginConfig data. func (l *Loader) Config() *types.PluginConfig { return l.pc } -// SetWorkDir sets the working directory for this loader's plugins -func (l *Loader) SetWorkDir(wd string) { - l.pc.FnpLoadingOptions.WorkingDir = wd -} - func (l *Loader) LoadGenerators( ldr ifc.Loader, v ifc.Validator, rm resmap.ResMap) ( result []*resmap.GeneratorWithProperties, err error) { diff --git a/api/internal/plugins/loader/loader_test.go b/api/internal/plugins/loader/loader_test.go index c5e30b808..23cf55cb9 100644 --- a/api/internal/plugins/loader/loader_test.go +++ b/api/internal/plugins/loader/loader_test.go @@ -6,6 +6,7 @@ package loader_test import ( "testing" + "github.com/stretchr/testify/require" . "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/loader" "sigs.k8s.io/kustomize/api/provider" @@ -78,3 +79,20 @@ func TestLoader(t *testing.T) { } } } + +func TestLoaderWithWorkingDir(t *testing.T) { + p := provider.NewDefaultDepProvider() + rmF := resmap.NewFactory(p.GetResourceFactory()) + fsys := filesys.MakeFsInMemory() + c := types.EnabledPluginConfig(types.BploLoadFromFileSys) + pLdr := NewLoader(c, rmF, fsys) + npLdr := pLdr.LoaderWithWorkingDir("/tmp/dummy") + require.Equal(t, + "", + pLdr.Config().FnpLoadingOptions.WorkingDir, + "the plugin working dir should not change") + require.Equal(t, + "/tmp/dummy", + npLdr.Config().FnpLoadingOptions.WorkingDir, + "the plugin working dir is not updated") +} diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go index 4bbf7e98a..d5d7c1474 100644 --- a/api/internal/target/kusttarget.go +++ b/api/internal/target/kusttarget.go @@ -44,13 +44,11 @@ func NewKustTarget( validator ifc.Validator, rFactory *resmap.Factory, pLdr *loader.Loader) *KustTarget { - pLdrCopy := *pLdr - pLdrCopy.SetWorkDir(ldr.Root()) return &KustTarget{ ldr: ldr, validator: validator, rFactory: rFactory, - pLdr: &pLdrCopy, + pLdr: pLdr.LoaderWithWorkingDir(ldr.Root()), } } diff --git a/api/krusty/fnplugin_test.go b/api/krusty/fnplugin_test.go index a4be95d55..40f63b642 100644 --- a/api/krusty/fnplugin_test.go +++ b/api/krusty/fnplugin_test.go @@ -41,7 +41,19 @@ spec: EOF ` -func TestFnExecGenerator(t *testing.T) { +const krmTransformerDotSh = `#!/bin/bash +cat << EOF +apiVersion: v1 +kind: Secret +metadata: + name: dummyTransformed +stringData: + foo: bar +type: Opaque +EOF +` + +func TestFnExecGeneratorInBase(t *testing.T) { fSys := filesys.MakeFsOnDisk() th := kusttest_test.MakeHarnessWithFs(t, fSys) @@ -87,7 +99,6 @@ spec: `) m := th.Run(tmpDir.String(), o) - assert.NoError(t, err) yml, err := m.AsYaml() assert.NoError(t, err) assert.Equal(t, `apiVersion: v1 @@ -126,7 +137,7 @@ spec: assert.NoError(t, fSys.RemoveAll(tmpDir.String())) } -func TestFnExecGeneratorWithOverlay(t *testing.T) { +func TestFnExecGeneratorInBaseWithOverlay(t *testing.T) { fSys := filesys.MakeFsOnDisk() th := kusttest_test.MakeHarnessWithFs(t, fSys) @@ -217,6 +228,274 @@ spec: assert.NoError(t, fSys.RemoveAll(tmpDir.String())) } +func TestFnExecGeneratorInOverlay(t *testing.T) { + fSys := filesys.MakeFsOnDisk() + + th := kusttest_test.MakeHarnessWithFs(t, fSys) + o := th.MakeOptionsPluginsEnabled() + o.PluginConfig.FnpLoadingOptions.EnableExec = true + + tmpDir, err := filesys.NewTmpConfirmedDir() + assert.NoError(t, err) + base := filepath.Join(tmpDir.String(), "base") + prod := filepath.Join(tmpDir.String(), "prod") + assert.NoError(t, fSys.Mkdir(base)) + assert.NoError(t, fSys.Mkdir(prod)) + th.WriteK(base, ` +resources: +- short_secret.yaml +`) + th.WriteK(prod, ` +resources: +- ../base +generators: +- gener.yaml +`) + th.WriteF(filepath.Join(base, "short_secret.yaml"), + ` +apiVersion: v1 +kind: Secret +metadata: + labels: + airshipit.org/ephemeral-user-data: "true" + name: node1-bmc-secret +type: Opaque +stringData: + userData: | + bootcmd: + - mkdir /mnt/vda +`) + th.WriteF(filepath.Join(prod, "generateDeployment.sh"), generateDeploymentDotSh) + + assert.NoError(t, os.Chmod(filepath.Join(prod, "generateDeployment.sh"), 0777)) + th.WriteF(filepath.Join(prod, "gener.yaml"), ` +kind: executable +metadata: + name: demo + annotations: + config.kubernetes.io/function: | + exec: + path: ./generateDeployment.sh +spec: +`) + + m := th.Run(prod, o) + assert.NoError(t, err) + yml, err := m.AsYaml() + assert.NoError(t, err) + assert.Equal(t, `apiVersion: v1 +kind: Secret +metadata: + labels: + airshipit.org/ephemeral-user-data: "true" + name: node1-bmc-secret +stringData: + userData: | + bootcmd: + - mkdir /mnt/vda +type: Opaque +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + tshirt-size: small + labels: + app: nginx + name: nginx +spec: + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - image: nginx + name: nginx +`, string(yml)) + assert.NoError(t, fSys.RemoveAll(tmpDir.String())) +} + +func TestFnExecTransformerInBase(t *testing.T) { + fSys := filesys.MakeFsOnDisk() + + th := kusttest_test.MakeHarnessWithFs(t, fSys) + o := th.MakeOptionsPluginsEnabled() + o.PluginConfig.FnpLoadingOptions.EnableExec = true + + tmpDir, err := filesys.NewTmpConfirmedDir() + assert.NoError(t, err) + base := filepath.Join(tmpDir.String(), "base") + assert.NoError(t, fSys.Mkdir(base)) + th.WriteK(base, ` +resources: +- secret.yaml +transformers: +- krm-transformer.yaml +`) + th.WriteF(filepath.Join(base, "secret.yaml"), + ` +apiVersion: v1 +kind: Secret +metadata: + name: dummy +type: Opaque +stringData: + foo: bar +`) + th.WriteF(filepath.Join(base, "krmTransformer.sh"), krmTransformerDotSh) + + assert.NoError(t, os.Chmod(filepath.Join(base, "krmTransformer.sh"), 0777)) + th.WriteF(filepath.Join(base, "krm-transformer.yaml"), ` +apiVersion: examples.config.kubernetes.io/v1beta1 +kind: MyPlugin +metadata: + name: notImportantHere + annotations: + config.kubernetes.io/function: | + exec: + path: ./krmTransformer.sh +`) + + m := th.Run(base, o) + yml, err := m.AsYaml() + assert.NoError(t, err) + assert.Equal(t, `apiVersion: v1 +kind: Secret +metadata: + name: dummyTransformed +stringData: + foo: bar +type: Opaque +`, string(yml)) + assert.NoError(t, fSys.RemoveAll(tmpDir.String())) +} + +func TestFnExecTransformerInBaseWithOverlay(t *testing.T) { + fSys := filesys.MakeFsOnDisk() + + th := kusttest_test.MakeHarnessWithFs(t, fSys) + o := th.MakeOptionsPluginsEnabled() + o.PluginConfig.FnpLoadingOptions.EnableExec = true + + tmpDir, err := filesys.NewTmpConfirmedDir() + assert.NoError(t, err) + base := filepath.Join(tmpDir.String(), "base") + prod := filepath.Join(tmpDir.String(), "prod") + assert.NoError(t, fSys.Mkdir(base)) + assert.NoError(t, fSys.Mkdir(prod)) + th.WriteK(base, ` +resources: +- secret.yaml +transformers: +- krm-transformer.yaml +`) + th.WriteK(prod, ` +resources: +- ../base +`) + th.WriteF(filepath.Join(base, "secret.yaml"), + ` +apiVersion: v1 +kind: Secret +metadata: + name: dummy +type: Opaque +stringData: + foo: bar +`) + th.WriteF(filepath.Join(base, "krmTransformer.sh"), krmTransformerDotSh) + + assert.NoError(t, os.Chmod(filepath.Join(base, "krmTransformer.sh"), 0777)) + th.WriteF(filepath.Join(base, "krm-transformer.yaml"), ` +apiVersion: examples.config.kubernetes.io/v1beta1 +kind: MyPlugin +metadata: + name: notImportantHere + annotations: + config.kubernetes.io/function: | + exec: + path: ./krmTransformer.sh +`) + + m := th.Run(prod, o) + yml, err := m.AsYaml() + assert.NoError(t, err) + assert.Equal(t, `apiVersion: v1 +kind: Secret +metadata: + name: dummyTransformed +stringData: + foo: bar +type: Opaque +`, string(yml)) + assert.NoError(t, fSys.RemoveAll(tmpDir.String())) +} + +func TestFnExecTransformerInOverlay(t *testing.T) { + fSys := filesys.MakeFsOnDisk() + + th := kusttest_test.MakeHarnessWithFs(t, fSys) + o := th.MakeOptionsPluginsEnabled() + o.PluginConfig.FnpLoadingOptions.EnableExec = true + + tmpDir, err := filesys.NewTmpConfirmedDir() + assert.NoError(t, err) + base := filepath.Join(tmpDir.String(), "base") + prod := filepath.Join(tmpDir.String(), "prod") + assert.NoError(t, fSys.Mkdir(base)) + assert.NoError(t, fSys.Mkdir(prod)) + th.WriteK(base, ` +resources: +- secret.yaml +`) + th.WriteK(prod, ` +resources: +- ../base +transformers: +- krm-transformer.yaml +`) + th.WriteF(filepath.Join(base, "secret.yaml"), + ` +apiVersion: v1 +kind: Secret +metadata: + name: dummy +type: Opaque +stringData: + foo: bar +`) + th.WriteF(filepath.Join(prod, "krmTransformer.sh"), krmTransformerDotSh) + + assert.NoError(t, os.Chmod(filepath.Join(prod, "krmTransformer.sh"), 0777)) + th.WriteF(filepath.Join(prod, "krm-transformer.yaml"), ` +apiVersion: examples.config.kubernetes.io/v1beta1 +kind: MyPlugin +metadata: + name: notImportantHere + annotations: + config.kubernetes.io/function: | + exec: + path: ./krmTransformer.sh +`) + + m := th.Run(prod, o) + yml, err := m.AsYaml() + assert.NoError(t, err) + assert.Equal(t, `apiVersion: v1 +kind: Secret +metadata: + name: dummyTransformed +stringData: + foo: bar +type: Opaque +`, string(yml)) + assert.NoError(t, fSys.RemoveAll(tmpDir.String())) +} + func skipIfNoDocker(t *testing.T) { t.Helper() if _, err := exec.LookPath("docker"); err != nil { diff --git a/api/krusty/remoteloader_test.go b/api/krusty/remoteloader_test.go index e5ee3ded6..5a7950dab 100644 --- a/api/krusty/remoteloader_test.go +++ b/api/krusty/remoteloader_test.go @@ -62,6 +62,7 @@ export GIT_COMMITTER_NAME=Nobody cp -r testdata/remoteload/simple $ROOT/simple.git ( cd $ROOT/simple.git + git config --global protocol.file.allow always git init --initial-branch=main git add . git commit -m "import" diff --git a/api/types/kustomization.go b/api/types/kustomization.go index c194dcc3c..4e7ac9e87 100644 --- a/api/types/kustomization.go +++ b/api/types/kustomization.go @@ -8,6 +8,7 @@ import ( "encoding/json" "fmt" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/yaml" ) @@ -217,11 +218,25 @@ func (k *Kustomization) FixKustomizationPostUnmarshalling() { // FixKustomizationPreMarshalling fixes things // that should occur after the kustomization file // has been processed. -func (k *Kustomization) FixKustomizationPreMarshalling() error { +func (k *Kustomization) FixKustomizationPreMarshalling(fSys filesys.FileSystem) error { // PatchesJson6902 should be under the Patches field. k.Patches = append(k.Patches, k.PatchesJson6902...) k.PatchesJson6902 = nil + if k.PatchesStrategicMerge != nil { + for _, patchStrategicMerge := range k.PatchesStrategicMerge { + // check this patch is file path select. + if _, err := fSys.ReadFile(string(patchStrategicMerge)); err == nil { + // path patch + k.Patches = append(k.Patches, Patch{Path: string(patchStrategicMerge)}) + } else { + // inline string patch + k.Patches = append(k.Patches, Patch{Patch: string(patchStrategicMerge)}) + } + } + k.PatchesStrategicMerge = nil + } + // this fix is not in FixKustomizationPostUnmarshalling because // it will break some commands like `create` and `add`. those // commands depend on 'commonLabels' field diff --git a/kustomize/commands/edit/fix/fix.go b/kustomize/commands/edit/fix/fix.go index eb1e260fb..bae67811d 100644 --- a/kustomize/commands/edit/fix/fix.go +++ b/kustomize/commands/edit/fix/fix.go @@ -55,8 +55,7 @@ func RunFix(fSys filesys.FileSystem, w io.Writer) error { return err } - err = m.FixKustomizationPreMarshalling() - if err != nil { + if err := m.FixKustomizationPreMarshalling(fSys); err != nil { return err } @@ -68,12 +67,14 @@ func RunFix(fSys filesys.FileSystem, w io.Writer) error { fmt.Fprintln(w, ` Fixed fields: patchesJson6902 -> patches + patchesStrategicMerge -> patches commonLabels -> labels vars -> replacements`) } else { fmt.Fprintln(w, ` Fixed fields: patchesJson6902 -> patches + patchesStrategicMerge -> patches commonLabels -> labels To convert vars -> replacements, run the command `+"`kustomize edit fix --vars`"+` @@ -89,7 +90,7 @@ We recommend doing this in a clean git repository where the change is easy to un fixedBuildCmd := build.NewCmdBuild(fSys, build.MakeHelp(konfig.ProgramName, "build"), &fixedOutput) err = fixedBuildCmd.RunE(fixedBuildCmd, nil) if err != nil { - fmt.Fprintf(w, "Warning: 'Fixed' kustomization now produces the error when running `kustomize build`: %s", err.Error()) + fmt.Fprintf(w, "Warning: 'Fixed' kustomization now produces the error when running `kustomize build`: %s\n", err.Error()) } else if fixedOutput.String() != oldOutput.String() { fmt.Fprintf(w, "Warning: 'Fixed' kustomization now produces different output when running `kustomize build`:\n...%s...\n", fixedOutput.String()) } diff --git a/kustomize/commands/edit/fix/fix_test.go b/kustomize/commands/edit/fix/fix_test.go index 163d03baa..fc6cced28 100644 --- a/kustomize/commands/edit/fix/fix_test.go +++ b/kustomize/commands/edit/fix/fix_test.go @@ -9,6 +9,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) @@ -27,8 +28,16 @@ func TestFix(t *testing.T) { assert.Contains(t, string(content), "kind: Kustomization") } -func TestFixOutdatedPatchesFieldTitle(t *testing.T) { - kustomizationContentWithOutdatedPatchesFieldTitle := []byte(` +func TestFixCommand(t *testing.T) { + tests := []struct { + name string + input string + files map[string]string + expected string + }{ + { + name: "FixOutdatedPatchesFieldTitle", + input: ` patchesJson6902: - path: patch1.yaml target: @@ -38,9 +47,8 @@ patchesJson6902: group: apps kind: Deployment version: v1 -`) - - expected := []byte(` +`, + expected: ` apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization patches: @@ -52,24 +60,11 @@ patches: group: apps kind: Deployment version: v1 -`) - fSys := filesys.MakeFsInMemory() - testutils_test.WriteTestKustomizationWith(fSys, kustomizationContentWithOutdatedPatchesFieldTitle) - cmd := NewCmdFix(fSys, os.Stdout) - assert.NoError(t, cmd.RunE(cmd, nil)) - - content, err := testutils_test.ReadTestKustomization(fSys) - assert.NoError(t, err) - assert.Contains(t, string(content), "apiVersion: ") - assert.Contains(t, string(content), "kind: Kustomization") - - if diff := cmp.Diff(expected, content); diff != "" { - t.Errorf("Mismatch (-expected, +actual):\n%s", diff) - } -} - -func TestRenameAndKeepOutdatedPatchesField(t *testing.T) { - kustomizationContentWithOutdatedPatchesFieldTitle := []byte(` +`, + }, + { + name: "TestRenameAndKeepOutdatedPatchesField", + input: ` patchesJson6902: - path: patch1.yaml target: @@ -81,9 +76,8 @@ patches: - path: patch3.yaml target: kind: Service -`) - - expected := []byte(` +`, + expected: ` patches: - path: patch2.yaml target: @@ -96,32 +90,273 @@ patches: kind: Deployment apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -`) - fSys := filesys.MakeFsInMemory() - testutils_test.WriteTestKustomizationWith(fSys, kustomizationContentWithOutdatedPatchesFieldTitle) - cmd := NewCmdFix(fSys, os.Stdout) - assert.NoError(t, cmd.RunE(cmd, nil)) - - content, err := testutils_test.ReadTestKustomization(fSys) - assert.NoError(t, err) - assert.Contains(t, string(content), "apiVersion: ") - assert.Contains(t, string(content), "kind: Kustomization") - - if diff := cmp.Diff(expected, content); diff != "" { - t.Errorf("Mismatch (-expected, +actual):\n%s", diff) - } -} - -func TestFixOutdatedCommonLabels(t *testing.T) { - kustomizationContentWithOutdatedCommonLabels := []byte(` +`, + }, + { + name: "TestFixOutdatedPatchesStrategicMergeFieldTitle", + input: ` +patchesStrategicMerge: +- |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: nginx + spec: + template: + spec: + containers: + - name: nginx + image: nignx:latest +`, + expected: ` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- patch: |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: nginx + spec: + template: + spec: + containers: + - name: nginx + image: nignx:latest +`, + }, + { + name: "TestFixAndMergeOutdatedPatchesStrategicMergeFieldTitle", + input: ` +patchesStrategicMerge: +- |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: nginx + spec: + template: + spec: + containers: + - name: nginx + image: nignx:latest +patches: +- path: patch2.yaml + target: + kind: Deployment +`, + expected: ` +patches: +- path: patch2.yaml + target: + kind: Deployment +- patch: |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: nginx + spec: + template: + spec: + containers: + - name: nginx + image: nignx:latest +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +`, + }, + { + name: "TestFixOutdatedPatchesStrategicMergeToPathFieldTitle", + input: ` +patchesStrategicMerge: +- deploy.yaml +`, + files: map[string]string{ + "deploy.yaml": ` +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx +spec: + template: + spec: + containers: + - name: nginx + env: + - name: CONFIG_FILE_PATH + value: home.yaml`, + }, + expected: ` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: deploy.yaml +`, + }, + { + name: "TestFixOutdatedPatchesStrategicMergeToPathFieldYMLTitle", + input: ` +patchesStrategicMerge: +- deploy.yml +`, + files: map[string]string{ + "deploy.yml": ` +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx +spec: + template: + spec: + containers: + - name: nginx + env: + - name: CONFIG_FILE_PATH + value: home.yaml`, + }, + expected: ` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: deploy.yml +`, + }, + { + name: "Test fix outdated patchesStrategicMerge from a file and one string literal", + input: ` +patchesStrategicMerge: +- deploy.yaml +- |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: nginx + spec: + template: + spec: + containers: + - name: nginx + env: + - name: CONFIG_FILE_PATH + value: home.yaml +`, + files: map[string]string{ + "deploy.yaml": ` +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx +spec: + template: + spec: + containers: + - name: nginx + env: + - name: CONFIG_FILE_PATH + value: home.yaml`, + }, + expected: ` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: deploy.yaml +- patch: |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: nginx + spec: + template: + spec: + containers: + - name: nginx + env: + - name: CONFIG_FILE_PATH + value: home.yaml +`, + }, + { + name: "Test fix outdated patchesStrategicMerge and patchesJson6902", + input: ` +patchesStrategicMerge: +- deploy.yaml +patchesJson6902: +- path: patch1.yaml + target: + kind: Deployment +`, + files: map[string]string{ + "deploy.yaml": ` +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx +spec: + template: + spec: + containers: + - name: nginx + env: + - name: CONFIG_FILE_PATH + value: home.yaml`, + }, + expected: ` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: patch1.yaml + target: + kind: Deployment +- path: deploy.yaml +`, + }, + { + name: "TestFixOutdatedPatchesStrategicMergeFieldPatchEndOfYamlTitle", + input: ` +patchesStrategicMerge: +- |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: nginx + spec: + template: + spec: + containers: + - name: nginx + env: + - name: CONFIG_FILE_PATH + value: home.yaml +`, + expected: ` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- patch: |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: nginx + spec: + template: + spec: + containers: + - name: nginx + env: + - name: CONFIG_FILE_PATH + value: home.yaml +`, + }, + { + name: "TestFixOutdatedCommonLabels", + input: ` commonLabels: foo: bar labels: - pairs: a: b -`) - - expected := []byte(` +`, + expected: ` labels: - pairs: a: b @@ -130,19 +365,26 @@ labels: foo: bar apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -`) - fSys := filesys.MakeFsInMemory() - testutils_test.WriteTestKustomizationWith(fSys, kustomizationContentWithOutdatedCommonLabels) - cmd := NewCmdFix(fSys, os.Stdout) - assert.NoError(t, cmd.RunE(cmd, nil)) +`, + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + fSys := filesys.MakeFsInMemory() + testutils_test.WriteTestKustomizationWith(fSys, []byte(test.input)) + for filename, content := range test.files { + require.NoError(t, fSys.WriteFile(filename, []byte(content))) + } + cmd := NewCmdFix(fSys, os.Stdout) + require.NoError(t, cmd.RunE(cmd, nil)) - content, err := testutils_test.ReadTestKustomization(fSys) - assert.NoError(t, err) - assert.Contains(t, string(content), "apiVersion: ") - assert.Contains(t, string(content), "kind: Kustomization") + content, err := testutils_test.ReadTestKustomization(fSys) + require.NoError(t, err) + require.Contains(t, string(content), "apiVersion: ") + require.Contains(t, string(content), "kind: Kustomization") - if diff := cmp.Diff(expected, content); diff != "" { - t.Errorf("Mismatch (-expected, +actual):\n%s", diff) + require.Empty(t, cmp.Diff([]byte(test.expected), content)) + }) } } diff --git a/kyaml/sets/string.go b/kyaml/sets/string.go index 07f02afb0..d590e5328 100644 --- a/kyaml/sets/string.go +++ b/kyaml/sets/string.go @@ -10,7 +10,7 @@ func (s String) Len() int { } func (s String) List() []string { - var val []string + val := make([]string, 0, len(s)) for k := range s { val = append(val, k) } diff --git a/kyaml/yaml/filters.go b/kyaml/yaml/filters.go index e364035e6..e7d4b5f7b 100644 --- a/kyaml/yaml/filters.go +++ b/kyaml/yaml/filters.go @@ -68,7 +68,7 @@ func (y *YFilter) UnmarshalYAML(unmarshal func(interface{}) error) error { type YFilters []YFilter func (y YFilters) Filters() []Filter { - var f []Filter + f := make([]Filter, 0, len(y)) for i := range y { f = append(f, y[i].Filter) }