diff --git a/pkg/commands/build/testdata/testcase-generators-namespace/expected.yaml b/pkg/commands/build/testdata/testcase-generators-namespace/expected.yaml index 803b2a325..1d265fe43 100644 --- a/pkg/commands/build/testdata/testcase-generators-namespace/expected.yaml +++ b/pkg/commands/build/testdata/testcase-generators-namespace/expected.yaml @@ -1,12 +1,4 @@ apiVersion: v1 -data: - altGreeting: Good Morning from default namespace! - enableRisky: "false" -kind: ConfigMap -metadata: - name: the-map-4959m5tm6c ---- -apiVersion: v1 data: altGreeting: Good Morning from non-default namespace! enableRisky: "false" @@ -17,11 +9,11 @@ metadata: --- apiVersion: v1 data: - password.txt: dmVyeSRlY3JldA== -kind: Secret + altGreeting: Good Morning from default namespace! + enableRisky: "false" +kind: ConfigMap metadata: - name: the-secret-cfbmct72tb -type: Opaque + name: the-map-4959m5tm6c --- apiVersion: v1 data: @@ -31,3 +23,11 @@ metadata: name: the-non-default-namespace-secret-255294gd9d namespace: non-default type: Opaque +--- +apiVersion: v1 +data: + password.txt: dmVyeSRlY3JldA== +kind: Secret +metadata: + name: the-secret-cfbmct72tb +type: Opaque diff --git a/pkg/commands/build/testdata/testcase-multibases-conflict/test.yaml b/pkg/commands/build/testdata/testcase-multibases-conflict/test.yaml index bda51d606..334c5f957 100644 --- a/pkg/commands/build/testdata/testcase-multibases-conflict/test.yaml +++ b/pkg/commands/build/testdata/testcase-multibases-conflict/test.yaml @@ -1,4 +1,4 @@ description: multibases with name reference args: [] filename: testdata/testcase-multibases-conflict/combined -expectedError: Multiple matches for name noGroup_v1_ServiceAccount +expectedError: Multiple matches for name ~G_v1_ServiceAccount diff --git a/pkg/gvk/gvk.go b/pkg/gvk/gvk.go index 6ab227995..382f284d1 100644 --- a/pkg/gvk/gvk.go +++ b/pkg/gvk/gvk.go @@ -36,9 +36,9 @@ func FromKind(k string) Gvk { } const ( - noGroup = "noGroup" - noVersion = "noVersion" - noKind = "noKind" + noGroup = "~G" + noVersion = "~V" + noKind = "~K" separator = "_" ) diff --git a/pkg/gvk/gvk_test.go b/pkg/gvk/gvk_test.go index 6e235ed3e..3d2b50c35 100644 --- a/pkg/gvk/gvk_test.go +++ b/pkg/gvk/gvk_test.go @@ -75,13 +75,13 @@ var stringTests = []struct { x Gvk s string }{ - {Gvk{}, "noGroup_noVersion_noKind"}, - {Gvk{Kind: "k"}, "noGroup_noVersion_k"}, - {Gvk{Version: "v"}, "noGroup_v_noKind"}, - {Gvk{Version: "v", Kind: "k"}, "noGroup_v_k"}, - {Gvk{Group: "g"}, "g_noVersion_noKind"}, - {Gvk{Group: "g", Kind: "k"}, "g_noVersion_k"}, - {Gvk{Group: "g", Version: "v"}, "g_v_noKind"}, + {Gvk{}, "~G_~V_~K"}, + {Gvk{Kind: "k"}, "~G_~V_k"}, + {Gvk{Version: "v"}, "~G_v_~K"}, + {Gvk{Version: "v", Kind: "k"}, "~G_v_k"}, + {Gvk{Group: "g"}, "g_~V_~K"}, + {Gvk{Group: "g", Kind: "k"}, "g_~V_k"}, + {Gvk{Group: "g", Version: "v"}, "g_v_~K"}, {Gvk{Group: "g", Version: "v", Kind: "k"}, "g_v_k"}, } diff --git a/pkg/resid/resid.go b/pkg/resid/resid.go index e76f9b887..390fc2514 100644 --- a/pkg/resid/resid.go +++ b/pkg/resid/resid.go @@ -74,10 +74,10 @@ func NewResIdKindOnly(k string, n string) ResId { } const ( - noNamespace = "noNamespace" - noPrefix = "noPrefix" - noName = "noName" - noSuffix = "noSuffix" + noNamespace = "~X" + noPrefix = "~P" + noName = "~N" + noSuffix = "~S" separator = "|" ) diff --git a/pkg/resid/resid_test.go b/pkg/resid/resid_test.go index 53fb431d4..165860b6c 100644 --- a/pkg/resid/resid_test.go +++ b/pkg/resid/resid_test.go @@ -15,26 +15,26 @@ var stringTests = []struct { "g_v_k|ns|p|nm|s"}, {ResId{gvKind: gvk.Gvk{Version: "v", Kind: "k"}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, - "noGroup_v_k|ns|p|nm|s"}, + "~G_v_k|ns|p|nm|s"}, {ResId{gvKind: gvk.Gvk{Kind: "k"}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, - "noGroup_noVersion_k|ns|p|nm|s"}, + "~G_~V_k|ns|p|nm|s"}, {ResId{gvKind: gvk.Gvk{}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, - "noGroup_noVersion_noKind|ns|p|nm|s"}, + "~G_~V_~K|ns|p|nm|s"}, {ResId{gvKind: gvk.Gvk{}, name: "nm", prefix: "p", suffix: "s"}, - "noGroup_noVersion_noKind|noNamespace|p|nm|s"}, + "~G_~V_~K|~X|p|nm|s"}, {ResId{gvKind: gvk.Gvk{}, name: "nm", suffix: "s"}, - "noGroup_noVersion_noKind|noNamespace|noPrefix|nm|s"}, + "~G_~V_~K|~X|~P|nm|s"}, {ResId{gvKind: gvk.Gvk{}, suffix: "s"}, - "noGroup_noVersion_noKind|noNamespace|noPrefix|noName|s"}, + "~G_~V_~K|~X|~P|~N|s"}, {ResId{gvKind: gvk.Gvk{}}, - "noGroup_noVersion_noKind|noNamespace|noPrefix|noName|noSuffix"}, + "~G_~V_~K|~X|~P|~N|~S"}, {ResId{}, - "noGroup_noVersion_noKind|noNamespace|noPrefix|noName|noSuffix"}, + "~G_~V_~K|~X|~P|~N|~S"}, } func TestString(t *testing.T) { @@ -54,26 +54,26 @@ var gvknStringTests = []struct { "g_v_k|nm"}, {ResId{gvKind: gvk.Gvk{Version: "v", Kind: "k"}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, - "noGroup_v_k|nm"}, + "~G_v_k|nm"}, {ResId{gvKind: gvk.Gvk{Kind: "k"}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, - "noGroup_noVersion_k|nm"}, + "~G_~V_k|nm"}, {ResId{gvKind: gvk.Gvk{}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, - "noGroup_noVersion_noKind|nm"}, + "~G_~V_~K|nm"}, {ResId{gvKind: gvk.Gvk{}, name: "nm", prefix: "p", suffix: "s"}, - "noGroup_noVersion_noKind|nm"}, + "~G_~V_~K|nm"}, {ResId{gvKind: gvk.Gvk{}, name: "nm", suffix: "s"}, - "noGroup_noVersion_noKind|nm"}, + "~G_~V_~K|nm"}, {ResId{gvKind: gvk.Gvk{}, suffix: "s"}, - "noGroup_noVersion_noKind|"}, + "~G_~V_~K|"}, {ResId{gvKind: gvk.Gvk{}}, - "noGroup_noVersion_noKind|"}, + "~G_~V_~K|"}, {ResId{}, - "noGroup_noVersion_noKind|"}, + "~G_~V_~K|"}, } func TestGvknString(t *testing.T) {