commands/.../scorecard: move getCRDs to k8sutil (#1071)

* commands/.../scorecard/olm_tests.go: move getCRDs to k8sutil

* internal/util/k8sutil/crd.go: move getCRDs here from scorecard

* commands/.../generate/openapi.go: use k8sutil.GetCRDs instead of splitting file names

Author: estroz

commands/operator-sdk/cmd/generate/openapi.go

@@ -23,15 +23,13 @@ import (
 	"strings"
 
 	genutil "github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd/generate/internal"
+	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
-	"github.com/ghodss/yaml"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var headerFile string
@@ -111,26 +109,29 @@ func OpenAPIGen() error {
 		AbsProjectPath: absProjectPath,
 		ProjectName:    filepath.Base(absProjectPath),
 	}
-	crdMap, err := getCRDGVKMap()
+	crds, err := k8sutil.GetCRDs(scaffold.CRDsDir)
 	if err != nil {
 		return err
 	}
-	for g, vs := range gvMap {
-		for _, v := range vs {
-			gvks := crdMap[filepath.Join(g, v)]
-			for _, gvk := range gvks {
-				r, err := scaffold.NewResource(filepath.Join(gvk.Group, gvk.Version), gvk.Kind)
-				if err != nil {
-					return err
-				}
-				err = s.Execute(cfg,
-					&scaffold.CRD{Resource: r, IsOperatorGo: projutil.IsOperatorGo()},
-				)
-				if err != nil {
-					return err
-				}
+	for _, crd := range crds {
+		g, v, k := crd.Spec.Group, crd.Spec.Version, crd.Spec.Names.Kind
+		if v == "" {
+			if len(crd.Spec.Versions) != 0 {
+				v = crd.Spec.Versions[0].Name
+			} else {
+				return fmt.Errorf("crd of group %s kind %s has no version", g, k)
 			}
 		}
+		r, err := scaffold.NewResource(g+"/"+v, k)
+		if err != nil {
+			return err
+		}
+		err = s.Execute(cfg,
+			&scaffold.CRD{Resource: r, IsOperatorGo: projutil.IsOperatorGo()},
+		)
+		if err != nil {
+			return err
+		}
 	}
 
 	log.Info("Code-generation complete.")
@@ -179,34 +180,3 @@ func openAPIGen(binDir string, fqApis []string) (err error) {
 	}
 	return nil
 }
-
-func getCRDGVKMap() (map[string][]metav1.GroupVersionKind, error) {
-	crdInfos, err := ioutil.ReadDir(scaffold.CRDsDir)
-	if err != nil {
-		return nil, err
-	}
-	crdMap := make(map[string][]metav1.GroupVersionKind)
-	for _, info := range crdInfos {
-		if filepath.Ext(info.Name()) == ".yaml" {
-			path := filepath.Join(scaffold.CRDsDir, info.Name())
-			b, err := ioutil.ReadFile(path)
-			if err != nil {
-				return nil, err
-			}
-			crd := &apiextv1beta1.CustomResourceDefinition{}
-			if err := yaml.Unmarshal(b, crd); err != nil {
-				return nil, err
-			}
-			if crd.Kind != "CustomResourceDefinition" {
-				continue
-			}
-			gv := filepath.Join(strings.Split(info.Name(), "_")[:2]...)
-			crdMap[gv] = append(crdMap[gv], metav1.GroupVersionKind{
-				Group:   crd.Spec.Group,
-				Version: crd.Spec.Version,
-				Kind:    crd.Spec.Names.Kind,
-			})
-		}
-	}
-	return crdMap, nil
-}

commands/operator-sdk/cmd/olm-catalog/gen-csv.go

@@ -67,7 +67,7 @@ func genCSVFunc(cmd *cobra.Command, args []string) error {
 		AbsProjectPath: absProjectPath,
 		ProjectName:    filepath.Base(absProjectPath),
 	}
-	if projutil.GetOperatorType() == projutil.OperatorTypeGo {
+	if projutil.IsOperatorGo() {
 		cfg.Repo = projutil.CheckAndGetProjectGoPkg()
 	}
 

commands/operator-sdk/cmd/scorecard/olm_tests.go

@@ -17,11 +17,9 @@ package scorecard
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
-	"path/filepath"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 
 	olmapiv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
 	log "github.com/sirupsen/logrus"
@@ -31,28 +29,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func getCRDs(crdsDir string) ([]apiextv1beta1.CustomResourceDefinition, error) {
-	files, err := ioutil.ReadDir(crdsDir)
-	if err != nil {
-		return nil, fmt.Errorf("could not read deploy directory: (%v)", err)
-	}
-	crds := []apiextv1beta1.CustomResourceDefinition{}
-	for _, file := range files {
-		if strings.HasSuffix(file.Name(), "crd.yaml") {
-			obj, err := yamlToUnstructured(filepath.Join(scaffold.CRDsDir, file.Name()))
-			if err != nil {
-				return nil, err
-			}
-			crd, err := unstructuredToCRD(obj)
-			if err != nil {
-				return nil, err
-			}
-			crds = append(crds, *crd)
-		}
-	}
-	return crds, nil
-}
-
 func matchKind(kind1, kind2 string) bool {
 	singularKind1, err := restMapper.ResourceSingularizer(kind1)
 	if err != nil {
@@ -68,7 +44,7 @@ func matchKind(kind1, kind2 string) bool {
 }
 
 // matchVersion checks if a CRD contains a specified version in a case insensitive manner
-func matchVersion(version string, crd apiextv1beta1.CustomResourceDefinition) bool {
+func matchVersion(version string, crd *apiextv1beta1.CustomResourceDefinition) bool {
 	if strings.EqualFold(version, crd.Spec.Version) {
 		return true
 	}
@@ -84,7 +60,7 @@ func matchVersion(version string, crd apiextv1beta1.CustomResourceDefinition) bo
 // crdsHaveValidation makes sure that all CRDs have a validation block
 func crdsHaveValidation(crdsDir string, runtimeClient client.Client, obj *unstructured.Unstructured) error {
 	test := scorecardTest{testType: olmIntegration, name: "Provided APIs have validation"}
-	crds, err := getCRDs(crdsDir)
+	crds, err := k8sutil.GetCRDs(crdsDir)
 	if err != nil {
 		return fmt.Errorf("failed to get CRDs in %s directory: %v", crdsDir, err)
 	}

commands/operator-sdk/cmd/scorecard/resource_handler.go

@@ -31,7 +31,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
-	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -226,24 +225,6 @@ func addProxyContainer(dep *appsv1.Deployment) {
 	})
 }
 
-// unstructuredToCRD converts an unstructured object to a CRD
-func unstructuredToCRD(obj *unstructured.Unstructured) (*apiextv1beta1.CustomResourceDefinition, error) {
-	jsonByte, err := obj.MarshalJSON()
-	if err != nil {
-		return nil, fmt.Errorf("failed to convert CRD to json: %v", err)
-	}
-	crdObj, _, err := dynamicDecoder.Decode(jsonByte, nil, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode CRD object: %v", err)
-	}
-	switch o := crdObj.(type) {
-	case *apiextv1beta1.CustomResourceDefinition:
-		return o, nil
-	default:
-		return nil, fmt.Errorf("conversion of runtime object to CRD failed (resulting runtime object not CRD type)")
-	}
-}
-
 // unstructuredToDeployment converts an unstructured object to a deployment
 func unstructuredToDeployment(obj *unstructured.Unstructured) (*appsv1.Deployment, error) {
 	jsonByte, err := obj.MarshalJSON()

internal/util/k8sutil/crd.go

@@ -0,0 +1,48 @@
+package k8sutil
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	yaml "github.com/ghodss/yaml"
+	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+)
+
+func GetCRDs(crdsDir string) ([]*apiextv1beta1.CustomResourceDefinition, error) {
+	manifests, err := GetCRDManifestPaths(crdsDir)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get CRD's from %s: (%v)", crdsDir, err)
+	}
+	var crds []*apiextv1beta1.CustomResourceDefinition
+	for _, m := range manifests {
+		b, err := ioutil.ReadFile(m)
+		if err != nil {
+			return nil, err
+		}
+		crd := &apiextv1beta1.CustomResourceDefinition{}
+		if err = yaml.Unmarshal(b, crd); err != nil {
+			return nil, err
+		}
+		crds = append(crds, crd)
+	}
+	return crds, nil
+}
+
+func GetCRDManifestPaths(crdsDir string) (crdPaths []string, err error) {
+	err = filepath.Walk(crdsDir, func(path string, info os.FileInfo, werr error) error {
+		if werr != nil {
+			return werr
+		}
+		if info == nil {
+			return nil
+		}
+		if !info.IsDir() && strings.HasSuffix(path, "_crd.yaml") {
+			crdPaths = append(crdPaths, path)
+		}
+		return nil
+	})
+	return crdPaths, err
+}