Addressing Gonzalo's comments, use offical Package manifest object

Author: edcdavid

go.mod

@@ -95,6 +95,8 @@ require (
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect
+	github.com/h2non/filetype v1.1.3 // indirect
+	github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -128,9 +130,11 @@ require (
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+	github.com/onsi/gomega v1.34.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/operator-framework/operator-manifest-tools v0.7.0 // indirect
+	github.com/operator-framework/operator-registry v1.47.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

go.sum

@@ -27,6 +27,7 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	clientconfigv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
 	olmv1Alpha "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	olmPkgv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v1"
 	"github.com/redhat-best-practices-for-k8s/certsuite/internal/clientsholder"
 	"github.com/redhat-best-practices-for-k8s/certsuite/internal/log"
 	"github.com/redhat-best-practices-for-k8s/certsuite/pkg/compatibility"
@@ -73,7 +74,7 @@ type DiscoveredTestData struct {
 	AllCsvs                []*olmv1Alpha.ClusterServiceVersion
 	AllInstallPlans        []*olmv1Alpha.InstallPlan
 	AllCatalogSources      []*olmv1Alpha.CatalogSource
-	AllPackageManifests    []*PackageManifest
+	AllPackageManifests    []*olmPkgv1.PackageManifest
 	Deployments            []appsv1.Deployment
 	StatefulSet            []appsv1.StatefulSet
 	PersistentVolumes      []corev1.PersistentVolume

pkg/autodiscover/autodiscover.go

@@ -19,14 +19,14 @@ package autodiscover
 import (
 	"context"
 	"fmt"
-	"time"
 
 	helmclient "github.com/mittwald/go-helm-client"
 	olmv1Alpha "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	clientOlm "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
 	"github.com/redhat-best-practices-for-k8s/certsuite/internal/log"
 	"github.com/redhat-best-practices-for-k8s/certsuite/pkg/configuration"
 
+	olmpkgv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v1"
 	"github.com/redhat-best-practices-for-k8s/certsuite/pkg/stringhelper"
 	"helm.sh/helm/v3/pkg/release"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -44,34 +44,6 @@ const (
 	istioDeploymentName = "istiod"
 )
 
-type PackageManifest struct {
-	APIVersion string `json:"apiVersion"`
-	Kind       string `json:"kind"`
-	Metadata   struct {
-		CreationTimestamp time.Time         `json:"creationTimestamp"`
-		Labels            map[string]string `json:"labels"`
-		Name              string            `json:"name"`
-		Namespace         string            `json:"namespace"`
-	} `json:"metadata"`
-	Spec struct {
-	} `json:"spec"`
-	Status struct {
-		CatalogSource            string `json:"catalogSource"`
-		CatalogSourceDisplayName string `json:"catalogSourceDisplayName"`
-		CatalogSourceNamespace   string `json:"catalogSourceNamespace"`
-		CatalogSourcePublisher   string `json:"catalogSourcePublisher"`
-		Channels                 []struct {
-			CurrentCSV string `json:"currentCSV"`
-			Name       string `json:"name"`
-		} `json:"channels"`
-		DefaultChannel string `json:"defaultChannel"`
-		PackageName    string `json:"packageName"`
-		Provider       struct {
-			Name string `json:"name"`
-		} `json:"provider"`
-	} `json:"status"`
-}
-
 func isIstioServiceMeshInstalled(appClient appv1client.AppsV1Interface, allNs []string) bool {
 	// The Istio namespace must be present
 	if !stringhelper.StringInSlice(allNs, istioNamespace, false) {
@@ -237,7 +209,7 @@ func getAllCatalogSources(olmClient clientOlm.Interface) (out []*olmv1Alpha.Cata
 }
 
 // getAllPackageManifests is a helper function to get the all the PackageManifests in a cluster.
-func getAllPackageManifests(dynamicClient dynamic.Interface) (out []*PackageManifest) {
+func getAllPackageManifests(dynamicClient dynamic.Interface) (out []*olmpkgv1.PackageManifest) {
 	gvr := schema.GroupVersionResource{
 		Group:    "packages.operators.coreos.com",
 		Version:  "v1",
@@ -250,7 +222,7 @@ func getAllPackageManifests(dynamicClient dynamic.Interface) (out []*PackageMani
 		return out
 	}
 	for _, item := range pkgManifest.Items {
-		var manifest PackageManifest
+		var manifest olmpkgv1.PackageManifest
 		if err := runtime.DefaultUnstructuredConverter.FromUnstructured(item.Object, &manifest); err != nil {
 			log.Error("Failed to convert to PackageManifestWithNs: %v", err)
 		}

pkg/autodiscover/autodiscover_operators.go

@@ -30,9 +30,9 @@ import (
 	"github.com/go-logr/stdr"
 	olmv1 "github.com/operator-framework/api/pkg/operators/v1"
 	olmv1Alpha "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	olmpkgv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v1"
 	"github.com/redhat-best-practices-for-k8s/certsuite/internal/clientsholder"
 	"github.com/redhat-best-practices-for-k8s/certsuite/internal/log"
-	"github.com/redhat-best-practices-for-k8s/certsuite/pkg/autodiscover"
 	"github.com/redhat-openshift-ecosystem/openshift-preflight/artifacts"
 	plibRuntime "github.com/redhat-openshift-ecosystem/openshift-preflight/certification"
 	plibOperator "github.com/redhat-openshift-ecosystem/openshift-preflight/operator"
@@ -151,7 +151,7 @@ func getUniqueCsvListByName(csvs []*olmv1Alpha.ClusterServiceVersion) []*olmv1Al
 
 func createOperators(csvs []*olmv1Alpha.ClusterServiceVersion,
 	allSubscriptions []olmv1Alpha.Subscription,
-	allPackageManifests []*autodiscover.PackageManifest,
+	allPackageManifests []*olmpkgv1.PackageManifest,
 	allInstallPlans []*olmv1Alpha.InstallPlan,
 	allCatalogSources []*olmv1Alpha.CatalogSource,
 	succeededRequired,
@@ -202,7 +202,7 @@ func createOperators(csvs []*olmv1Alpha.ClusterServiceVersion,
 	return operators
 }
 
-func getAtLeastOneSubscription(op *Operator, csv *olmv1Alpha.ClusterServiceVersion, subscriptions []olmv1Alpha.Subscription, packageManifests []*autodiscover.PackageManifest) (atLeastOneSubscription bool) {
+func getAtLeastOneSubscription(op *Operator, csv *olmv1Alpha.ClusterServiceVersion, subscriptions []olmv1Alpha.Subscription, packageManifests []*olmpkgv1.PackageManifest) (atLeastOneSubscription bool) {
 	atLeastOneSubscription = false
 	for s := range subscriptions {
 		subscription := &subscriptions[s]
@@ -231,10 +231,10 @@ func getAtLeastOneSubscription(op *Operator, csv *olmv1Alpha.ClusterServiceVersi
 	return atLeastOneSubscription
 }
 
-func getPackageManifestWithSubscription(subscription *olmv1Alpha.Subscription, packageManifests []*autodiscover.PackageManifest) *autodiscover.PackageManifest {
+func getPackageManifestWithSubscription(subscription *olmv1Alpha.Subscription, packageManifests []*olmpkgv1.PackageManifest) *olmpkgv1.PackageManifest {
 	for index := range packageManifests {
 		if packageManifests[index].Status.PackageName == subscription.Spec.Package &&
-			packageManifests[index].Metadata.Namespace == subscription.Spec.CatalogSourceNamespace &&
+			packageManifests[index].Namespace == subscription.Spec.CatalogSourceNamespace &&
 			packageManifests[index].Status.CatalogSource == subscription.Spec.CatalogSource {
 			return packageManifests[index]
 		}

pkg/provider/operators.go

@@ -23,8 +23,8 @@ import (
 	"github.com/operator-framework/api/pkg/lib/version"
 	olmv1 "github.com/operator-framework/api/pkg/operators/v1"
 	olmv1Alpha "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	olmpkgv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v1"
 	"github.com/redhat-best-practices-for-k8s/certsuite/internal/clientsholder"
-	"github.com/redhat-best-practices-for-k8s/certsuite/pkg/autodiscover"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -297,7 +297,7 @@ func TestCreateOperators(t *testing.T) {
 		_ = clientsholder.GetTestClientsHolder(nil)
 		clientsholder.SetupFakeOlmClient(runtimeObjects)
 
-		emptyManifests := []*autodiscover.PackageManifest{}
+		emptyManifests := []*olmpkgv1.PackageManifest{}
 		ops := createOperators(tc.csvs, tc.subscriptions, emptyManifests, tc.installPlan, tc.catalogSource, false, true)
 		assert.Equal(t, tc.expectedOperators, ops)
 	}

pkg/provider/operators_test.go

@@ -29,6 +29,7 @@ import (
 	mcv1 "github.com/openshift/api/machineconfiguration/v1"
 	olmv1 "github.com/operator-framework/api/pkg/operators/v1"
 	olmv1Alpha "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	olmpkgv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v1"
 	"github.com/redhat-best-practices-for-k8s/certsuite/internal/clientsholder"
 	"github.com/redhat-best-practices-for-k8s/certsuite/internal/log"
 	"github.com/redhat-best-practices-for-k8s/certsuite/pkg/autodiscover"
@@ -112,11 +113,11 @@ type TestEnvironment struct { // rename this with testTarget
 	ResourceQuotas         []corev1.ResourceQuota
 	PodDisruptionBudgets   []policyv1.PodDisruptionBudget
 	NetworkPolicies        []networkingv1.NetworkPolicy
-	AllInstallPlans        []*olmv1Alpha.InstallPlan       `json:"AllInstallPlans"`
-	AllSubscriptions       []olmv1Alpha.Subscription       `json:"AllSubscriptions"`
-	AllCatalogSources      []*olmv1Alpha.CatalogSource     `json:"AllCatalogSources"`
-	AllPackageManifests    []*autodiscover.PackageManifest `json:"AllPackageManifests"`
-	OperatorGroups         []*olmv1.OperatorGroup          `json:"OperatorGroups"`
+	AllInstallPlans        []*olmv1Alpha.InstallPlan   `json:"AllInstallPlans"`
+	AllSubscriptions       []olmv1Alpha.Subscription   `json:"AllSubscriptions"`
+	AllCatalogSources      []*olmv1Alpha.CatalogSource `json:"AllCatalogSources"`
+	AllPackageManifests    []*olmpkgv1.PackageManifest `json:"AllPackageManifests"`
+	OperatorGroups         []*olmv1.OperatorGroup      `json:"OperatorGroups"`
 	IstioServiceMeshFound  bool
 	ValidProtocolNames     []string
 	DaemonsetFailedToSpawn bool