Skip to content

Commit 570865b

Browse files
Address peer review
1 parent 0c4f863 commit 570865b

File tree

1 file changed

+11
-29
lines changed

1 file changed

+11
-29
lines changed

api/internal/target/kusttarget_test.go

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -258,19 +258,17 @@ metadata:
258258
assert.Equal(t, string(expYaml), string(actYaml))
259259
}
260260

261-
func TestMergeTransformersConfig(t *testing.T) {
261+
func TestConfigurationsOverrideDefault(t *testing.T) {
262262
th := kusttest_test.MakeHarness(t)
263263
th.WriteK("/merge-config", `
264264
apiVersion: kustomize.config.k8s.io/v1beta1
265265
kind: Kustomization
266266
namePrefix: foo-
267267
nameSuffix: -bar
268-
namespace: ns1
269268
resources:
270269
- deployment.yaml
271270
- config.yaml
272271
- secret.yaml
273-
- namespace.yaml
274272
configurations:
275273
- name-prefix-rules.yaml
276274
`)
@@ -301,12 +299,6 @@ kind: Secret
301299
metadata:
302300
name: secret
303301
`)
304-
th.WriteF("/merge-config/namespace.yaml", `
305-
apiVersion: v1
306-
kind: Namespace
307-
metadata:
308-
name: ns1
309-
`)
310302

311303
pvd := provider.NewDefaultDepProvider()
312304
resFactory := pvd.GetResourceFactory()
@@ -316,50 +308,40 @@ metadata:
316308
"apiVersion": "apps/v1",
317309
"kind": "Deployment",
318310
"metadata": map[string]interface{}{
319-
"name": "foo-deployment1-bar",
320-
"namespace": "ns1",
311+
"name": "foo-deployment1-bar",
321312
},
322313
}), resFactory.FromMapWithName("config", map[string]interface{}{
323314
"apiVersion": "v1",
324315
"kind": "ConfigMap",
325316
"metadata": map[string]interface{}{
326-
"name": "config-bar",
327-
"namespace": "ns1",
317+
"name": "config-bar",
328318
},
329319
}), resFactory.FromMapWithName("secret", map[string]interface{}{
330320
"apiVersion": "v1",
331321
"kind": "Secret",
332322
"metadata": map[string]interface{}{
333-
"name": "foo-secret-bar",
334-
"namespace": "ns1",
335-
},
336-
}), resFactory.FromMapWithName("ns1", map[string]interface{}{
337-
"apiVersion": "v1",
338-
"kind": "Namespace",
339-
"metadata": map[string]interface{}{
340-
"name": "ns1",
323+
"name": "foo-secret-bar",
341324
},
342325
}),
343326
}
344327

345328
expected := resmap.New()
346329
for _, r := range resources {
347-
if err := expected.Append(r); err != nil {
348-
t.Fatalf("unexpected error %v", err)
349-
}
330+
err := expected.Append(r)
331+
require.NoError(t, err)
350332
}
351333
expected.RemoveBuildAnnotations()
352334
expYaml, err := expected.AsYaml()
353-
assert.NoError(t, err)
335+
require.NoError(t, err)
354336

355337
kt := makeKustTargetWithRf(t, th.GetFSys(), "/merge-config", pvd)
356-
assert.NoError(t, kt.Load())
338+
require.NoError(t, kt.Load())
357339
actual, err := kt.MakeCustomizedResMap()
358-
assert.NoError(t, err)
340+
require.NoError(t, err)
359341
actual.RemoveBuildAnnotations()
360342
actYaml, err := actual.AsYaml()
361-
assert.NoError(t, err)
362-
assert.Equal(t, string(expYaml), string(actYaml))
343+
require.NoError(t, err)
344+
require.Equal(t, string(expYaml), string(actYaml))
363345
}
364346

365347
func TestDuplicateExternalGeneratorsForbidden(t *testing.T) {

0 commit comments

Comments
 (0)