Reduce size of missing field markers.

This commit is contained in:
Jeffrey Regan
2018-12-13 11:12:51 -08:00
parent f0f8aad2bb
commit d40f52e953
6 changed files with 43 additions and 43 deletions

View File

@@ -1,12 +1,4 @@
apiVersion: v1 apiVersion: v1
data:
altGreeting: Good Morning from default namespace!
enableRisky: "false"
kind: ConfigMap
metadata:
name: the-map-4959m5tm6c
---
apiVersion: v1
data: data:
altGreeting: Good Morning from non-default namespace! altGreeting: Good Morning from non-default namespace!
enableRisky: "false" enableRisky: "false"
@@ -17,11 +9,11 @@ metadata:
--- ---
apiVersion: v1 apiVersion: v1
data: data:
password.txt: dmVyeSRlY3JldA== altGreeting: Good Morning from default namespace!
kind: Secret enableRisky: "false"
kind: ConfigMap
metadata: metadata:
name: the-secret-cfbmct72tb name: the-map-4959m5tm6c
type: Opaque
--- ---
apiVersion: v1 apiVersion: v1
data: data:
@@ -31,3 +23,11 @@ metadata:
name: the-non-default-namespace-secret-255294gd9d name: the-non-default-namespace-secret-255294gd9d
namespace: non-default namespace: non-default
type: Opaque type: Opaque
---
apiVersion: v1
data:
password.txt: dmVyeSRlY3JldA==
kind: Secret
metadata:
name: the-secret-cfbmct72tb
type: Opaque

View File

@@ -1,4 +1,4 @@
description: multibases with name reference description: multibases with name reference
args: [] args: []
filename: testdata/testcase-multibases-conflict/combined filename: testdata/testcase-multibases-conflict/combined
expectedError: Multiple matches for name noGroup_v1_ServiceAccount expectedError: Multiple matches for name ~G_v1_ServiceAccount

View File

@@ -36,9 +36,9 @@ func FromKind(k string) Gvk {
} }
const ( const (
noGroup = "noGroup" noGroup = "~G"
noVersion = "noVersion" noVersion = "~V"
noKind = "noKind" noKind = "~K"
separator = "_" separator = "_"
) )

View File

@@ -75,13 +75,13 @@ var stringTests = []struct {
x Gvk x Gvk
s string s string
}{ }{
{Gvk{}, "noGroup_noVersion_noKind"}, {Gvk{}, "~G_~V_~K"},
{Gvk{Kind: "k"}, "noGroup_noVersion_k"}, {Gvk{Kind: "k"}, "~G_~V_k"},
{Gvk{Version: "v"}, "noGroup_v_noKind"}, {Gvk{Version: "v"}, "~G_v_~K"},
{Gvk{Version: "v", Kind: "k"}, "noGroup_v_k"}, {Gvk{Version: "v", Kind: "k"}, "~G_v_k"},
{Gvk{Group: "g"}, "g_noVersion_noKind"}, {Gvk{Group: "g"}, "g_~V_~K"},
{Gvk{Group: "g", Kind: "k"}, "g_noVersion_k"}, {Gvk{Group: "g", Kind: "k"}, "g_~V_k"},
{Gvk{Group: "g", Version: "v"}, "g_v_noKind"}, {Gvk{Group: "g", Version: "v"}, "g_v_~K"},
{Gvk{Group: "g", Version: "v", Kind: "k"}, "g_v_k"}, {Gvk{Group: "g", Version: "v", Kind: "k"}, "g_v_k"},
} }

View File

@@ -74,10 +74,10 @@ func NewResIdKindOnly(k string, n string) ResId {
} }
const ( const (
noNamespace = "noNamespace" noNamespace = "~X"
noPrefix = "noPrefix" noPrefix = "~P"
noName = "noName" noName = "~N"
noSuffix = "noSuffix" noSuffix = "~S"
separator = "|" separator = "|"
) )

View File

@@ -15,26 +15,26 @@ var stringTests = []struct {
"g_v_k|ns|p|nm|s"}, "g_v_k|ns|p|nm|s"},
{ResId{gvKind: gvk.Gvk{Version: "v", Kind: "k"}, {ResId{gvKind: gvk.Gvk{Version: "v", Kind: "k"},
name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, 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"}, {ResId{gvKind: gvk.Gvk{Kind: "k"},
name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, 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{}, {ResId{gvKind: gvk.Gvk{},
name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, 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{}, {ResId{gvKind: gvk.Gvk{},
name: "nm", prefix: "p", suffix: "s"}, name: "nm", prefix: "p", suffix: "s"},
"noGroup_noVersion_noKind|noNamespace|p|nm|s"}, "~G_~V_~K|~X|p|nm|s"},
{ResId{gvKind: gvk.Gvk{}, {ResId{gvKind: gvk.Gvk{},
name: "nm", suffix: "s"}, name: "nm", suffix: "s"},
"noGroup_noVersion_noKind|noNamespace|noPrefix|nm|s"}, "~G_~V_~K|~X|~P|nm|s"},
{ResId{gvKind: gvk.Gvk{}, {ResId{gvKind: gvk.Gvk{},
suffix: "s"}, suffix: "s"},
"noGroup_noVersion_noKind|noNamespace|noPrefix|noName|s"}, "~G_~V_~K|~X|~P|~N|s"},
{ResId{gvKind: gvk.Gvk{}}, {ResId{gvKind: gvk.Gvk{}},
"noGroup_noVersion_noKind|noNamespace|noPrefix|noName|noSuffix"}, "~G_~V_~K|~X|~P|~N|~S"},
{ResId{}, {ResId{},
"noGroup_noVersion_noKind|noNamespace|noPrefix|noName|noSuffix"}, "~G_~V_~K|~X|~P|~N|~S"},
} }
func TestString(t *testing.T) { func TestString(t *testing.T) {
@@ -54,26 +54,26 @@ var gvknStringTests = []struct {
"g_v_k|nm"}, "g_v_k|nm"},
{ResId{gvKind: gvk.Gvk{Version: "v", Kind: "k"}, {ResId{gvKind: gvk.Gvk{Version: "v", Kind: "k"},
name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"},
"noGroup_v_k|nm"}, "~G_v_k|nm"},
{ResId{gvKind: gvk.Gvk{Kind: "k"}, {ResId{gvKind: gvk.Gvk{Kind: "k"},
name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"},
"noGroup_noVersion_k|nm"}, "~G_~V_k|nm"},
{ResId{gvKind: gvk.Gvk{}, {ResId{gvKind: gvk.Gvk{},
name: "nm", prefix: "p", suffix: "s", namespace: "ns"}, name: "nm", prefix: "p", suffix: "s", namespace: "ns"},
"noGroup_noVersion_noKind|nm"}, "~G_~V_~K|nm"},
{ResId{gvKind: gvk.Gvk{}, {ResId{gvKind: gvk.Gvk{},
name: "nm", prefix: "p", suffix: "s"}, name: "nm", prefix: "p", suffix: "s"},
"noGroup_noVersion_noKind|nm"}, "~G_~V_~K|nm"},
{ResId{gvKind: gvk.Gvk{}, {ResId{gvKind: gvk.Gvk{},
name: "nm", suffix: "s"}, name: "nm", suffix: "s"},
"noGroup_noVersion_noKind|nm"}, "~G_~V_~K|nm"},
{ResId{gvKind: gvk.Gvk{}, {ResId{gvKind: gvk.Gvk{},
suffix: "s"}, suffix: "s"},
"noGroup_noVersion_noKind|"}, "~G_~V_~K|"},
{ResId{gvKind: gvk.Gvk{}}, {ResId{gvKind: gvk.Gvk{}},
"noGroup_noVersion_noKind|"}, "~G_~V_~K|"},
{ResId{}, {ResId{},
"noGroup_noVersion_noKind|"}, "~G_~V_~K|"},
} }
func TestGvknString(t *testing.T) { func TestGvknString(t *testing.T) {