fixup! Update CRD generator to support experimental CRDs

Author: tmshort

hack/tools/crd-generator/main.go

@@ -70,8 +70,6 @@ func runGenerator(args ...string) {
 		crdRoot = args[2]
 	}
 
-	log.Printf("crdRoot: %s", crdRoot)
-
 	roots, err := loader.LoadRoots(
 		"k8s.io/apimachinery/pkg/runtime/schema", // Needed to parse generated register functions.
 		crdRoot,
@@ -96,7 +94,6 @@ func runGenerator(args ...string) {
 
 	crd.AddKnownTypes(parser)
 	for _, r := range roots {
-		log.Printf("Looking at package %v", r)
 		parser.NeedPackage(r)
 	}
 
@@ -144,7 +141,6 @@ func runGenerator(args ...string) {
 
 			conv, err := crd.AsVersion(*channelCrd, apiextensionsv1.SchemeGroupVersion)
 			if err != nil {
-				log.Printf("CRD: %v", *channelCrd)
 				log.Fatalf("failed to convert CRD: %s", err)
 			}
 
@@ -174,8 +170,6 @@ func runGenerator(args ...string) {
 				out = append(breakLine, out...)
 			}
 
-			log.Printf("writing %v bytes", len(out))
-
 			fileName := fmt.Sprintf("%s/%s/%s_%s.yaml", outputDir, channel, crdRaw.Spec.Group, crdRaw.Spec.Names.Plural)
 			err = os.WriteFile(fileName, out, 0o600)
 			if err != nil {
@@ -216,8 +210,6 @@ func opconTweaks(channel string, name string, jsonProps apiextensionsv1.JSONSche
 	numExpressions := strings.Count(jsonProps.Description, validationPrefix)
 	numValid := 0
 	if numExpressions > 0 {
-		log.Printf("found validations")
-
 		enumRe := regexp.MustCompile(validationPrefix + "Enum=([A-Za-z;]*)>")
 		enumMatches := enumRe.FindAllStringSubmatch(jsonProps.Description, 64)
 		for _, enumMatch := range enumMatches {
@@ -248,7 +240,6 @@ func opconTweaks(channel string, name string, jsonProps apiextensionsv1.JSONSche
 	}
 
 	if numValid < numExpressions {
-		fmt.Printf("Description: %s\n", jsonProps.Description)
 		log.Fatalf("Found %d Opcon validation expressions, but only %d were valid", numExpressions, numValid)
 	}
 
@@ -274,7 +265,6 @@ func formatDescription(description string, channel string, name string) string {
 			log.Fatalf("Invalid <opcon:experimental:description> tag for %s", name)
 		}
 		description = re.ReplaceAllString(description, "\n\n")
-		log.Printf("found experimental:description")
 	} else {
 		description = strings.ReplaceAll(description, startTag, "")
 		description = strings.ReplaceAll(description, endTag, "")
@@ -292,7 +282,6 @@ func formatDescription(description string, channel string, name string) string {
 			log.Fatalf("Invalid <opcon:util:excludeFromCRD> tag for %s", name)
 		}
 		description = re.ReplaceAllString(description, "\n\n\n")
-		log.Printf("found excludeFromCRD")
 	}
 
 	opconRe := regexp.MustCompile(`<opcon:.*>`)

hack/tools/crd-generator/main_test.go

@@ -16,7 +16,9 @@ func TestRunGenerator(t *testing.T) {
 	// Get to repo root
 	err = os.Chdir("../../..")
 	require.NoError(t, err)
-	defer os.Chdir(here)
+	defer func() {
+		_ = os.Chdir(here)
+	}()
 	dir, err := os.MkdirTemp("", "crd-generate-*")
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
@@ -49,7 +51,9 @@ func TestTags(t *testing.T) {
 	here, err := os.Getwd()
 	require.NoError(t, err)
 	err = os.Chdir("testdata")
-	defer os.Chdir(here)
+	defer func() {
+		_ = os.Chdir(here)
+	}()
 	require.NoError(t, err)
 	dir, err := os.MkdirTemp("", "crd-generate-*")
 	require.NoError(t, err)
@@ -72,11 +76,15 @@ func TestTags(t *testing.T) {
 func compareFiles(t *testing.T, file1, file2 string) {
 	f1, err := os.Open(file1)
 	require.NoError(t, err)
-	defer f1.Close()
+	defer func() {
+		_ = f1.Close()
+	}()
 
 	f2, err := os.Open(file2)
 	require.NoError(t, err)
-	defer f2.Close()
+	defer func() {
+		_ = f2.Close()
+	}()
 
 	for {
 		b1 := make([]byte, 64000)