mirror of
https://github.com/vmware-tanzu/pinniped.git
synced 2026-01-06 05:27:23 +00:00
Make kubectl explain work for Pinniped aggregated APIs
- Change update-codegen.sh script to also generated openapi code for the aggregated API types - Update both aggregated API servers' configuration to make them serve the openapi docs for the aggregated APIs - Add new integration test which runs `kubectl explain` for all Pinniped API resources, and all fields and subfields of those resources - Update some the comments on the API structs - Change some names of the tmpl files to make the filename better match the struct names
This commit is contained in:
@@ -4,9 +4,12 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"regexp"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
@@ -22,7 +25,7 @@ import (
|
||||
"go.pinniped.dev/test/testlib"
|
||||
)
|
||||
|
||||
func TestGetAPIResourceList(t *testing.T) {
|
||||
func TestGetAPIResourceList(t *testing.T) { //nolint:gocyclo // each t.Run is pretty simple, but there are many
|
||||
env := testlib.IntegrationEnv(t)
|
||||
|
||||
client := testlib.NewKubernetesClientset(t)
|
||||
@@ -405,6 +408,28 @@ func TestGetAPIResourceList(t *testing.T) {
|
||||
assert.Equal(t, regular, status)
|
||||
})
|
||||
|
||||
t.Run("every API can show its docs to the user via kubectl explain, including aggregated APIs, and everything has a description", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
for _, r := range resources {
|
||||
if !strings.Contains(r.GroupVersion, env.APIGroupSuffix) {
|
||||
continue
|
||||
}
|
||||
|
||||
for _, a := range r.APIResources {
|
||||
if strings.HasSuffix(a.Name, "/status") {
|
||||
// skip status subresources for this test, as they don't work with `kubectl explain`
|
||||
continue
|
||||
}
|
||||
|
||||
// Note that this test might indirectly depend on the kubectl discovery cache, found in $HOME/.kube/cache/discovery.
|
||||
// If you are working on changing API type struct comments, then you may need to clear your discovery cache
|
||||
// (or wait ~10 minutes for the cache to expire) for the new comments to appear in the `kubectl explain` results.
|
||||
requireKubectlExplainShowsDescriptionForResource(t, a.Name, a.Kind, r.GroupVersion)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("Pinniped resources do not have short names", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
for _, r := range resources {
|
||||
@@ -561,3 +586,82 @@ func TestCRDAdditionalPrinterColumns_Parallel(t *testing.T) {
|
||||
require.Equal(t, expectedPinnipedCRDCount, actualPinnipedCRDCount,
|
||||
"did not find expected number of Pinniped CRDs to check for additionalPrinterColumns")
|
||||
}
|
||||
|
||||
func requireKubectlExplainShowsDescriptionForResource(t *testing.T, resourceName string, resourceKind string, resourceGroupVersion string) {
|
||||
// Run kubectl explain on the resource.
|
||||
output := runKubectlExplain(t, resourceName, resourceGroupVersion)
|
||||
|
||||
// Check that the output is as expected.
|
||||
require.Regexp(t, `(?m)^KIND:\s+`+regexp.QuoteMeta(resourceKind)+`$`, output)
|
||||
require.Regexp(t, `(?m)^VERSION:\s+`+regexp.QuoteMeta(resourceGroupVersion)+`$`, 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.
|
||||
assert.NotRegexp(t, `(?m)^\s*<empty>\s*$`, output, "resource or field should not have an empty description in kubectl explain")
|
||||
|
||||
if strings.Contains(output, "\nFIELD: ") {
|
||||
// We must have explained a leaf field, which has no children fields.
|
||||
return
|
||||
}
|
||||
|
||||
if resourceName == "whoamirequests.spec" {
|
||||
// This is an exception because this field is declared to be an empty struct in its type definition. It is
|
||||
// not a leaf field because it is a struct, but it also has no children because the struct contains no fields.
|
||||
// So it has neither the `FIELD:` section nor the `FIELDS:` section in the output.
|
||||
return
|
||||
}
|
||||
|
||||
// Otherwise, we must have explained a resource or field which has children fields, so it should have a fields list.
|
||||
require.Contains(t, output, "\nFIELDS:\n")
|
||||
|
||||
// Grab everything after the line that says `FIELDS:`.
|
||||
fieldsSectionMatches := regexp.MustCompile(`(?s).+\nFIELDS:\n(.+)`).FindStringSubmatch(output)
|
||||
require.Len(t, fieldsSectionMatches, 2)
|
||||
allFieldsDescribedText := fieldsSectionMatches[1]
|
||||
|
||||
// Grab the names of all the fields from the fields description.
|
||||
fieldNames := []string{}
|
||||
for _, line := range strings.Split(allFieldsDescribedText, "\n") {
|
||||
if strings.HasPrefix(line, " ") {
|
||||
// Field names are indented by exactly three spaces.
|
||||
// Skip lines that are indented deeper, which are field descriptions.
|
||||
continue
|
||||
}
|
||||
if len(strings.TrimSpace(line)) == 0 {
|
||||
// Ignore empty lines.
|
||||
continue
|
||||
}
|
||||
// Field name lines start with 3 spaces, then the field name, then some tabs/spaces, then the field type.
|
||||
// Grab just the field name.
|
||||
fieldsNameMatches := regexp.MustCompile(`^ {3}(\S+)\s+`).FindStringSubmatch(line)
|
||||
require.Len(t, fieldsNameMatches, 2, fmt.Sprintf("field name line which did not match: %s", line))
|
||||
fieldNames = append(fieldNames, fieldsNameMatches[1])
|
||||
}
|
||||
require.Greater(t, len(fieldNames), 0, "should have found some field names in the kubectl explain output, but didn't find any")
|
||||
|
||||
// For each field, check to see that docs were provided for that field by making a recursive call to this function.
|
||||
for _, fieldName := range fieldNames {
|
||||
if fieldName == "kind" || fieldName == "metadata" || fieldName == "apiVersion" {
|
||||
// Skip these since the docs are implemented by k8s packages, so we can assume that they are correct.
|
||||
continue
|
||||
}
|
||||
requireKubectlExplainShowsDescriptionForResource(t, fmt.Sprintf("%s.%s", resourceName, fieldName), resourceKind, resourceGroupVersion)
|
||||
}
|
||||
}
|
||||
|
||||
func runKubectlExplain(t *testing.T, resourceName string, apiVersion string) string {
|
||||
t.Helper()
|
||||
var stdOut, stdErr bytes.Buffer
|
||||
cmd := exec.Command("kubectl", "explain", resourceName, "--api-version", apiVersion)
|
||||
t.Log("Running:", cmd.String())
|
||||
cmd.Stdout = &stdOut
|
||||
cmd.Stderr = &stdErr
|
||||
err := cmd.Run()
|
||||
var exitErr *exec.ExitError
|
||||
if errors.As(err, &exitErr) {
|
||||
t.Logf("Running kubectl explain had non-zero exit code."+
|
||||
"\nkubectl explain stdout: %s\nkubectl explain stderr: %s", stdOut.String(), stdErr.String())
|
||||
}
|
||||
require.NoError(t, err)
|
||||
return stdOut.String()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user