Address peer review

This commit is contained in:
Christopher Fry
2022-12-05 23:06:05 +00:00
parent 0c4f863bc5
commit 570865baae

View File

@@ -258,19 +258,17 @@ metadata:
assert.Equal(t, string(expYaml), string(actYaml)) assert.Equal(t, string(expYaml), string(actYaml))
} }
func TestMergeTransformersConfig(t *testing.T) { func TestConfigurationsOverrideDefault(t *testing.T) {
th := kusttest_test.MakeHarness(t) th := kusttest_test.MakeHarness(t)
th.WriteK("/merge-config", ` th.WriteK("/merge-config", `
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
namePrefix: foo- namePrefix: foo-
nameSuffix: -bar nameSuffix: -bar
namespace: ns1
resources: resources:
- deployment.yaml - deployment.yaml
- config.yaml - config.yaml
- secret.yaml - secret.yaml
- namespace.yaml
configurations: configurations:
- name-prefix-rules.yaml - name-prefix-rules.yaml
`) `)
@@ -301,12 +299,6 @@ kind: Secret
metadata: metadata:
name: secret name: secret
`) `)
th.WriteF("/merge-config/namespace.yaml", `
apiVersion: v1
kind: Namespace
metadata:
name: ns1
`)
pvd := provider.NewDefaultDepProvider() pvd := provider.NewDefaultDepProvider()
resFactory := pvd.GetResourceFactory() resFactory := pvd.GetResourceFactory()
@@ -316,50 +308,40 @@ metadata:
"apiVersion": "apps/v1", "apiVersion": "apps/v1",
"kind": "Deployment", "kind": "Deployment",
"metadata": map[string]interface{}{ "metadata": map[string]interface{}{
"name": "foo-deployment1-bar", "name": "foo-deployment1-bar",
"namespace": "ns1",
}, },
}), resFactory.FromMapWithName("config", map[string]interface{}{ }), resFactory.FromMapWithName("config", map[string]interface{}{
"apiVersion": "v1", "apiVersion": "v1",
"kind": "ConfigMap", "kind": "ConfigMap",
"metadata": map[string]interface{}{ "metadata": map[string]interface{}{
"name": "config-bar", "name": "config-bar",
"namespace": "ns1",
}, },
}), resFactory.FromMapWithName("secret", map[string]interface{}{ }), resFactory.FromMapWithName("secret", map[string]interface{}{
"apiVersion": "v1", "apiVersion": "v1",
"kind": "Secret", "kind": "Secret",
"metadata": map[string]interface{}{ "metadata": map[string]interface{}{
"name": "foo-secret-bar", "name": "foo-secret-bar",
"namespace": "ns1",
},
}), resFactory.FromMapWithName("ns1", map[string]interface{}{
"apiVersion": "v1",
"kind": "Namespace",
"metadata": map[string]interface{}{
"name": "ns1",
}, },
}), }),
} }
expected := resmap.New() expected := resmap.New()
for _, r := range resources { for _, r := range resources {
if err := expected.Append(r); err != nil { err := expected.Append(r)
t.Fatalf("unexpected error %v", err) require.NoError(t, err)
}
} }
expected.RemoveBuildAnnotations() expected.RemoveBuildAnnotations()
expYaml, err := expected.AsYaml() expYaml, err := expected.AsYaml()
assert.NoError(t, err) require.NoError(t, err)
kt := makeKustTargetWithRf(t, th.GetFSys(), "/merge-config", pvd) kt := makeKustTargetWithRf(t, th.GetFSys(), "/merge-config", pvd)
assert.NoError(t, kt.Load()) require.NoError(t, kt.Load())
actual, err := kt.MakeCustomizedResMap() actual, err := kt.MakeCustomizedResMap()
assert.NoError(t, err) require.NoError(t, err)
actual.RemoveBuildAnnotations() actual.RemoveBuildAnnotations()
actYaml, err := actual.AsYaml() actYaml, err := actual.AsYaml()
assert.NoError(t, err) require.NoError(t, err)
assert.Equal(t, string(expYaml), string(actYaml)) require.Equal(t, string(expYaml), string(actYaml))
} }
func TestDuplicateExternalGeneratorsForbidden(t *testing.T) { func TestDuplicateExternalGeneratorsForbidden(t *testing.T) {