always error on iface tests, avoid separate testdata dir

Author: brekelj1

pkg/crd/gen_integration_test.go

@@ -34,8 +34,8 @@ import (
 
 var _ = Describe("CRD Generation proper defaulting", func() {
 	var (
-		ctx, ctx2 *genall.GenerationContext
-		out       *outputRule
+		ctx, ctx2, ctx3 *genall.GenerationContext
+		out             *outputRule
 
 		genDir = filepath.Join("testdata", "gen")
 	)
@@ -53,7 +53,10 @@ var _ = Describe("CRD Generation proper defaulting", func() {
 		Expect(pkgs).To(HaveLen(1))
 		pkgs2, err := loader.LoadRoots("./...")
 		Expect(err).NotTo(HaveOccurred())
-		Expect(pkgs2).To(HaveLen(2))
+		Expect(pkgs2).To(HaveLen(3))
+		pkgs3, err := loader.LoadRoots("./iface")
+		Expect(err).NotTo(HaveOccurred())
+		Expect(pkgs3).To(HaveLen(1))
 
 		By("setup up the context")
 		reg := &markers.Registry{}
@@ -73,6 +76,12 @@ var _ = Describe("CRD Generation proper defaulting", func() {
 			Checker:    &loader.TypeChecker{},
 			OutputRule: out,
 		}
+		ctx3 = &genall.GenerationContext{
+			Collector:  &markers.Collector{Registry: reg},
+			Roots:      pkgs3,
+			Checker:    &loader.TypeChecker{},
+			OutputRule: out,
+		}
 	})
 
 	It("should fail to generate v1beta1 CRDs", func() {
@@ -106,13 +115,15 @@ var _ = Describe("CRD Generation proper defaulting", func() {
 		Expect(gen.Generate(ctx2)).NotTo(HaveOccurred())
 
 		By("loading the desired YAMLs")
+		expectedFileIfaces, err := os.ReadFile(filepath.Join(genDir, "iface", "iface.example.com_kindwithifaces.yaml"))
+		Expect(err).NotTo(HaveOccurred())
 		expectedFileFoos, err := os.ReadFile(filepath.Join(genDir, "bar.example.com_foos.yaml"))
 		Expect(err).NotTo(HaveOccurred())
 		expectedFileZoos, err := os.ReadFile(filepath.Join(genDir, "zoo", "bar.example.com_zoos.yaml"))
 		Expect(err).NotTo(HaveOccurred())
 
-		By("comparing the two, output must be deterministic because groupKinds are sorted")
-		expectedOut := string(expectedFileFoos) + string(expectedFileZoos)
+		By("comparing the three, output must be deterministic because groupKinds are sorted")
+		expectedOut := string(expectedFileFoos) + string(expectedFileIfaces) + string(expectedFileZoos)
 		Expect(out.buf.String()).To(Equal(expectedOut), cmp.Diff(out.buf.String(), expectedOut))
 	})
 
@@ -169,43 +180,25 @@ var _ = Describe("CRD Generation proper defaulting", func() {
 		By("comparing the two")
 		Expect(out.buf.String()).To(Equal(string(expectedFile)), cmp.Diff(out.buf.String(), string(expectedFile)))
 	})
-})
 
-var _ = Describe("CRD Generation with any", func() {
-	It("Works", func() {
-		oldWorkingDir, err := os.Getwd()
+	It("should gracefully error on interface types", func() {
+		gen := &crd.Generator{}
+		err := gen.Generate(ctx3)
 		Expect(err).NotTo(HaveOccurred())
-		const testModuleDir = "testdata2"
-		Expect(os.Chdir(testModuleDir)).To(Succeed()) // go modules are directory-sensitive
-		defer func() {
-			Expect(os.Chdir(oldWorkingDir)).To(Succeed())
-		}()
 
-		pkgs, err := loader.LoadRoots("./v1/...")
+		wd, err := os.Getwd()
 		Expect(err).NotTo(HaveOccurred())
-
-		reg := &markers.Registry{}
-		Expect(crdmarkers.Register(reg)).To(Succeed())
-		gen := &crd.Generator{}
-		out := &outputRule{
-			buf: &bytes.Buffer{},
+		matches := 0
+		for _, pkg := range ctx3.Roots {
+			for _, pkgError := range pkg.Errors {
+				posRel, err := filepath.Rel(filepath.Join(wd, genDir), pkgError.Pos)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(posRel).To(Equal("iface/iface_types.go:32:6"))
+				Expect(pkgError.Msg).To(Equal("cannot generate schema for interface type any"))
+				matches++
+			}
 		}
-		ctx := &genall.GenerationContext{
-			Collector: &markers.Collector{
-				Registry: reg,
-			},
-			Roots: pkgs,
-			Checker: &loader.TypeChecker{
-				NodeFilters: []loader.NodeFilter{gen.CheckFilter()},
-			},
-			OutputRule: out,
-		}
-		err = gen.Generate(ctx)
-		Expect(err).NotTo(HaveOccurred())
-		wantCRDYAML, err := os.ReadFile("v1/example.com_foos.yaml")
-		Expect(err).NotTo(HaveOccurred())
-		gotCRDYAML := out.buf.String()
-		Expect(gotCRDYAML).To(Equal(string(wantCRDYAML)), cmp.Diff(gotCRDYAML, string(wantCRDYAML)))
+		Expect(matches).To(Equal(1))
 	})
 })
 

pkg/crd/schema.go

@@ -294,11 +294,8 @@ func localNamedToSchema(ctx *schemaContext, ident *ast.Ident) *apiext.JSONSchema
 			Format: fmt,
 		}
 	}
-	if ifaceInfo, isInterface := typeInfo.(*types.Interface); isInterface {
-		// The "any" type introduced in Go1.18 shows up as an identifier / empty interface.
-		if !ifaceInfo.Empty() {
-			ctx.pkg.AddError(loader.ErrFromNode(fmt.Errorf("cannot generate schema for non-empty interface type %s", ident.Name), ident))
-		}
+	if _, isInterface := typeInfo.(*types.Interface); isInterface {
+		ctx.pkg.AddError(loader.ErrFromNode(fmt.Errorf("cannot generate schema for interface type %s", ident.Name), ident))
 		return &apiext.JSONSchemaProps{}
 	}
 	// NB(directxman12): if there are dot imports, this might be an external reference,

pkg/crd/testdata/gen/iface/iface.example.com_kindwithifaces.yaml

@@ -0,0 +1,46 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (devel)
+  name: kindwithifaces.iface.example.com
+spec:
+  group: iface.example.com
+  names:
+    kind: KindWithIFace
+    listKind: KindWithIFaceList
+    plural: kindwithifaces
+    singular: kindwithiface
+  scope: Namespaced
+  versions:
+  - name: iface
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              bar: {}
+            type: object
+        required:
+        - metadata
+        type: object
+    served: true
+    storage: true

pkg/crd/testdata/gen/iface/iface_types.go

@@ -0,0 +1,33 @@
+/*
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+//go:generate ../../../../../.run-controller-gen.sh crd:crdVersions=v1 paths=. output:dir=.
+
+// +groupName=iface.example.com
+package iface
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type KindWithIFace struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata"`
+	Spec              KindWithIFaceSpec `json:"spec,omitempty"`
+}
+
+type KindWithIFaceSpec struct {
+	Bar any `json:"bar,omitempty"`
+}