kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

improve gvk and resid strings for error messages

Browse Source
This commit is contained in:
natasha41575
2021-12-21 18:58:01 -08:00
parent ec38bbeb99
commit 6dfc238aa2
14 changed files with 85 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
kyaml/resid/resid_test.go
View File

@@ -17,7 +17,7 @@ var resIdStringTests = []struct {
Gvk: Gvk{Group: "g", Version: "v", Kind: "k"},
Name: "nm",
},
"g_v_k|ns|nm",
"k.v.g/nm.ns",
},
{
ResId{
@@ -25,7 +25,7 @@ var resIdStringTests = []struct {
Gvk: Gvk{Version: "v", Kind: "k"},
Name: "nm",
},
"~G_v_k|ns|nm",
"k.v.[noGrp]/nm.ns",
},
{
ResId{
@@ -33,7 +33,7 @@ var resIdStringTests = []struct {
Gvk: Gvk{Kind: "k"},
Name: "nm",
},
"~G_~V_k|ns|nm",
"k.[noVer].[noGrp]/nm.ns",
},
{
ResId{
@@ -41,38 +41,26 @@ var resIdStringTests = []struct {
Gvk: Gvk{},
Name: "nm",
},
"~G_~V_~K|ns|nm",
"[noKind].[noVer].[noGrp]/nm.ns",
},
{
ResId{
Gvk: Gvk{},
Name: "nm",
},
"~G_~V_~K|~X|nm",
},
{
ResId{
Gvk: Gvk{},
Name: "nm",
},
"~G_~V_~K|~X|nm",
"[noKind].[noVer].[noGrp]/nm.[noNs]",
},
{
ResId{
Gvk: Gvk{},
},
"~G_~V_~K|~X|~N",
},
{
ResId{
Gvk: Gvk{},
},
"~G_~V_~K|~X|~N",
"[noKind].[noVer].[noGrp]/[noName].[noNs]",
},
{
ResId{},
"~G_~V_~K|~X|~N",
"[noKind].[noVer].[noGrp]/[noName].[noNs]",
},
}
func TestResIdString(t *testing.T) {
@@ -83,84 +71,7 @@ func TestResIdString(t *testing.T) {
}
}
var gvknStringTests = []struct {
x ResId
s string
}{
{
ResId{
Namespace: "ns",
Gvk: Gvk{Group: "g", Version: "v", Kind: "k"},
Name: "nm",
},
"g_v_k|nm",
},
{
ResId{
Namespace: "ns",
Gvk: Gvk{Version: "v", Kind: "k"},
Name: "nm",
},
"~G_v_k|nm",
},
{
ResId{
Namespace: "ns",
Gvk: Gvk{Kind: "k"},
Name: "nm",
},
"~G_~V_k|nm",
},
{
ResId{
Namespace: "ns",
Gvk: Gvk{},
Name: "nm",
},
"~G_~V_~K|nm",
},
{
ResId{
Gvk: Gvk{},
Name: "nm",
},
"~G_~V_~K|nm",
},
{
ResId{
Gvk: Gvk{},
Name: "nm",
},
"~G_~V_~K|nm",
},
{
ResId{
Gvk: Gvk{},
},
"~G_~V_~K|",
},
{
ResId{
Gvk: Gvk{},
},
"~G_~V_~K|",
},
{
ResId{},
"~G_~V_~K|",
},
}
func TestGvknString(t *testing.T) {
for _, hey := range gvknStringTests {
if hey.x.GvknString() != hey.s {
t.Fatalf("Actual: %s, Expected: '%s'", hey.x.GvknString(), hey.s)
}
}
}
func TestResIdEquals(t *testing.T) {
var GvknEqualsTest = []struct {
id1 ResId
id2 ResId
@@ -358,6 +269,24 @@ var ids = []ResId{
{
Gvk: Gvk{},
},
{
Gvk: Gvk{
Group: "rbac.authorization.k8s.io",
Version: "v1",
Kind: "ClusterRole",
isClusterScoped: true,
},
Name: "nm",
},
{
Gvk: Gvk{
Group: "rbac.authorization.k8s.io",
Version: "v1",
Kind: "ClusterRole",
isClusterScoped: true,
},
Name: "my.name",
},
}
func TestResIdIsSelected(t *testing.T) {