diff --git a/api/internal/builtins/PrefixTransformer.go b/api/internal/builtins/PrefixTransformer.go index ef60d3e7903..03040ce0f9f 100644 --- a/api/internal/builtins/PrefixTransformer.go +++ b/api/internal/builtins/PrefixTransformer.go @@ -19,6 +19,7 @@ type PrefixTransformerPlugin struct { FieldSpecs types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` } +// 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"}}, diff --git a/api/internal/builtins/SuffixTransformer.go b/api/internal/builtins/SuffixTransformer.go index 09a2d697700..2b389d8e55e 100644 --- a/api/internal/builtins/SuffixTransformer.go +++ b/api/internal/builtins/SuffixTransformer.go @@ -19,6 +19,7 @@ type SuffixTransformerPlugin struct { FieldSpecs types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` } +// 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"}}, diff --git a/api/krusty/namespaces_test.go b/api/krusty/namespaces_test.go index 5aa7047cf66..45d18078db8 100644 --- a/api/krusty/namespaces_test.go +++ b/api/krusty/namespaces_test.go @@ -800,32 +800,3 @@ metadata: namespace: iter8-monitoring `) } - -func TestNamespacedNumeric(t *testing.T) { - th := kusttest_test.MakeHarness(t) - th.WriteF("secrets.yaml", ` -apiVersion: v1 -kind: Secret -metadata: - name: dummy -type: Opaque -data: - dummy: "" -`) - th.WriteK(".", ` -resources: -- secrets.yaml -namespace: "01234" -`) - m := th.Run(".", th.MakeDefaultOptions()) - th.AssertActualEqualsExpected(m, ` -apiVersion: v1 -data: - dummy: "" -kind: Secret -metadata: - name: dummy - namespace: "01234" -type: Opaque -`) -} diff --git a/api/resmap/reswrangler_test.go b/api/resmap/reswrangler_test.go index 8d81e34ddac..acf0cf73af9 100644 --- a/api/resmap/reswrangler_test.go +++ b/api/resmap/reswrangler_test.go @@ -363,82 +363,6 @@ func TestGetMatchingResourcesByCurrentId(t *testing.T) { } } -func TestGetMatchingResourcesByCurrentIdNumeric(t *testing.T) { - cmap := resid.NewGvk("", "v1", "ConfigMap") - - r1 := rf.FromMap( - map[string]interface{}{ - "apiVersion": "v1", - "kind": "ConfigMap", - "metadata": map[string]interface{}{ - "name": "alice", - "namespace": "01234", - }, - }) - - m := resmaptest_test.NewRmBuilder(t, rf). - AddR(r1).ResMap() - - result := m.GetMatchingResourcesByCurrentId( - resid.NewResIdWithNamespace(cmap, "alice", "01234").GvknEquals) - if len(result) != 1 { - t.Fatalf("Expected single map entry but got %v", result) - } - - // nolint:goconst - tests := []struct { - name string - matcher IdMatcher - count int - }{ - { - "match everything", - func(resid.ResId) bool { return true }, - 1, - }, - { - "match nothing", - func(resid.ResId) bool { return false }, - 0, - }, - { - "name is alice", - func(x resid.ResId) bool { return x.Name == "alice" }, - 1, - }, - { - "01234 namespace", - func(x resid.ResId) bool { - return x.Namespace == "01234" - }, - 1, - }, - { - "01234 deployment", - func(x resid.ResId) bool { - return x.Namespace == "01234" && - x.Gvk.Kind == "Deployment" - }, - 0, - }, - { - "01234 ConfigMap", - func(x resid.ResId) bool { - return x.Namespace == "01234" && - x.Gvk.Kind == "ConfigMap" - }, - 1, - }, - } - for _, tst := range tests { - result := m.GetMatchingResourcesByCurrentId(tst.matcher) - if len(result) != tst.count { - t.Fatalf("test '%s'; actual: %d, expected: %d", - tst.name, len(result), tst.count) - } - } -} - func TestGetMatchingResourcesByAnyId(t *testing.T) { r1 := rf.FromMap( map[string]interface{}{ diff --git a/api/resource/origin_test.go b/api/resource/origin_test.go index 9112be6e200..46ae2b8d0d4 100644 --- a/api/resource/origin_test.go +++ b/api/resource/origin_test.go @@ -112,22 +112,6 @@ func TestTransformationsString(t *testing.T) { }, }, } - origin3 := &Origin{ - Repo: "github.com/myrepo", - Ref: "master", - ConfiguredIn: "config.yaml", - ConfiguredBy: kyaml.ResourceIdentifier{ - TypeMeta: kyaml.TypeMeta{ - APIVersion: "builtin", - Kind: "Generator", - }, - NameMeta: kyaml.NameMeta{ - Name: "my-name", - Namespace: "01234", - }, - }, - } - tests := []struct { in Transformations expected string @@ -160,18 +144,6 @@ func TestTransformationsString(t *testing.T) { kind: Generator name: my-name namespace: my-namespace -`, - }, - { - in: Transformations{origin3}, - expected: `- repo: github.com/myrepo - ref: master - configuredIn: config.yaml - configuredBy: - apiVersion: builtin - kind: Generator - name: my-name - namespace: "01234" `, }, { diff --git a/kyaml/yaml/rnode.go b/kyaml/yaml/rnode.go index b04cae8c3f4..156e7eead7e 100644 --- a/kyaml/yaml/rnode.go +++ b/kyaml/yaml/rnode.go @@ -486,8 +486,7 @@ func (rn *RNode) SetNamespace(ns string) error { return meta.PipeE(Clear(NamespaceField)) } return rn.SetMapField( - // NewScalarRNode(ns), MetadataField, NamespaceField) - NewStringRNode(ns), MetadataField, NamespaceField) + NewScalarRNode(ns), MetadataField, NamespaceField) } // GetAnnotations gets the metadata annotations field. diff --git a/kyaml/yaml/rnode_test.go b/kyaml/yaml/rnode_test.go index 17746f5097c..4ba1e87a4e9 100644 --- a/kyaml/yaml/rnode_test.go +++ b/kyaml/yaml/rnode_test.go @@ -1081,29 +1081,15 @@ const deploymentJSON = ` ` func TestRNodeSetNamespace(t *testing.T) { - testCases := map[string]struct { - ns string - }{ - "simple": { - ns: "flanders", - }, - "numeric": { - ns: "01234", - }, - } - for n, tc := range testCases { - t.Run(n, func(t *testing.T) { - n := NewRNode(nil) - assert.Equal(t, "", n.GetNamespace()) - assert.NoError(t, n.SetNamespace("")) - assert.Equal(t, "", n.GetNamespace()) - if err := n.UnmarshalJSON([]byte(deploymentJSON)); err != nil { - t.Fatalf("unexpected unmarshaljson err: %v", err) - } - assert.NoError(t, n.SetNamespace(tc.ns)) - assert.Equal(t, tc.ns, n.GetNamespace()) - }) + n := NewRNode(nil) + assert.Equal(t, "", n.GetNamespace()) + assert.NoError(t, n.SetNamespace("")) + assert.Equal(t, "", n.GetNamespace()) + if err := n.UnmarshalJSON([]byte(deploymentJSON)); err != nil { + t.Fatalf("unexpected unmarshaljson err: %v", err) } + assert.NoError(t, n.SetNamespace("flanders")) + assert.Equal(t, "flanders", n.GetNamespace()) } func TestRNodeSetLabels(t *testing.T) { @@ -1819,30 +1805,16 @@ func TestSetName(t *testing.T) { } func TestSetNamespace(t *testing.T) { - testCases := map[string]struct { - ns string - }{ - "simple": { - ns: "flanders", - }, - "numeric": { - ns: "01234", - }, + rn := NewRNode(nil) + if err := rn.UnmarshalJSON([]byte(deploymentBiggerJson)); err != nil { + t.Fatalf("unexpected unmarshaljson err: %v", err) } - for n, tc := range testCases { - t.Run(n, func(t *testing.T) { - rn := NewRNode(nil) - if err := rn.UnmarshalJSON([]byte(deploymentBiggerJson)); err != nil { - t.Fatalf("unexpected unmarshaljson err: %v", err) - } - err := rn.SetNamespace(tc.ns) - require.NoError(t, err) - meta, err := rn.GetMeta() - require.NoError(t, err) - if expected, actual := tc.ns, meta.Namespace; expected != actual { - t.Fatalf("expected '%s', got '%s'", expected, actual) - } - }) + err := rn.SetNamespace("flanders") + require.NoError(t, err) + meta, err := rn.GetMeta() + require.NoError(t, err) + if expected, actual := "flanders", meta.Namespace; expected != actual { + t.Fatalf("expected '%s', got '%s'", expected, actual) } }