djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle the new output of kubectl explain which shows GROUP separately

Browse Source
This commit is contained in:
Ryan Richard 2023-05-10 18:03:40 -07:00
parent 1e6e9e0c0e
commit 484f134a98
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/integration/kube_api_discovery_test.go
View File

@ -604,8 +604,17 @@ func requireKubectlExplainShowsDescriptionForResource(t *testing.T, resourceName
output := runKubectlExplain(t, resourceName, resourceGroupVersion) output := runKubectlExplain(t, resourceName, resourceGroupVersion)
// Check that the output is as expected. // Check that the output is as expected.
require.Regexp(t, `(?m)^KIND:\s+`+regexp.QuoteMeta(resourceKind)+`$`, output) if strings.Contains(output, "GROUP: ") {
// At some point kubectl split the group and version into two separate fields in the output.
splitGroupAndVersion := strings.Split(resourceGroupVersion, "/")
require.Len(t, splitGroupAndVersion, 2)
require.Regexp(t, `(?m)^GROUP:\s+`+regexp.QuoteMeta(splitGroupAndVersion[0])+`$`, output)
require.Regexp(t, `(?m)^VERSION:\s+`+regexp.QuoteMeta(splitGroupAndVersion[1])+`$`, output)
} else {
// kubectl used to show "VERSION: clientsecret.supervisor.pinniped.dev/v1alpha1" and not have any "GROUP:"
require.Regexp(t, `(?m)^VERSION:\s+`+regexp.QuoteMeta(resourceGroupVersion)+`$`, output) require.Regexp(t, `(?m)^VERSION:\s+`+regexp.QuoteMeta(resourceGroupVersion)+`$`, output)
}
require.Regexp(t, `(?m)^KIND:\s+`+regexp.QuoteMeta(resourceKind)+`$`, output)
require.Regexp(t, `(?m)^DESCRIPTION:$`, output) require.Regexp(t, `(?m)^DESCRIPTION:$`, output)
// Use assert here so that the test keeps running when a description is empty, so we can find all the empty descriptions. // Use assert here so that the test keeps running when a description is empty, so we can find all the empty descriptions.