From 2b683968f6e2392ed4cbdfd96f2ec254edd2f162 Mon Sep 17 00:00:00 2001
From: kevinrizza <krizza@redhat.com>
Date: Wed, 13 Dec 2023 10:08:22 -0500
Subject: [PATCH] Consume new optional validators

Signed-off-by: kevinrizza <krizza@redhat.com>
---
 .../operator-sdk/bundle/validate/optional.go  | 34 ++++++++++++++++---
 .../bundle/validate/optional_test.go          |  8 ++---
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/internal/cmd/operator-sdk/bundle/validate/optional.go b/internal/cmd/operator-sdk/bundle/validate/optional.go
index 7c11bce226..1e30edead5 100644
--- a/internal/cmd/operator-sdk/bundle/validate/optional.go
+++ b/internal/cmd/operator-sdk/bundle/validate/optional.go
@@ -33,17 +33,43 @@ const (
 	suiteKey = "suite"
 )
 
-// optionalValidators is a list of validators with 0their name, labels for CLI usage, and a light description.
+// optionalValidators is a list of validators with their name, labels for CLI usage, and a light description.
 var optionalValidators = validators{
 	{
-		Validator: apivalidation.OperatorHubValidator,
-		name:      "operatorhub",
+		Validator: apivalidation.OperatorHubV2Validator,
+		name:      "operatorhubv2",
 		labels: map[string]string{
-			nameKey:  "operatorhub",
+			nameKey:  "operatorhubv2",
 			suiteKey: "operatorframework",
 		},
 		desc: "OperatorHub.io metadata validation. ",
 	},
+	{
+		Validator: apivalidation.StandardCapabilitiesValidator,
+		name:      "capabilities",
+		labels: map[string]string{
+			nameKey:  "capabilities",
+			suiteKey: "operatorframework",
+		},
+		desc: "OperatorHub.io capabilities metadata validation. ",
+	},
+	{
+		Validator: apivalidation.StandardCategoriesValidator,
+		name:      "categories",
+		labels: map[string]string{
+			nameKey:  "categories",
+			suiteKey: "operatorframework",
+		},
+		desc: "OperatorHub.io categories metadata validation. ",
+	},
+	{
+		Validator: apivalidation.OperatorHubValidator,
+		name:      "operatorhub",
+		labels: map[string]string{
+			nameKey: "operatorhub",
+		},
+		desc: "Deprecated OperatorHub.io metadata validation. ",
+	},
 	{
 		Validator: apivalidation.CommunityOperatorValidator,
 		name:      "community",
diff --git a/internal/cmd/operator-sdk/bundle/validate/optional_test.go b/internal/cmd/operator-sdk/bundle/validate/optional_test.go
index 288d2f9aa9..5c8ba1d192 100644
--- a/internal/cmd/operator-sdk/bundle/validate/optional_test.go
+++ b/internal/cmd/operator-sdk/bundle/validate/optional_test.go
@@ -51,7 +51,7 @@ var _ = Describe("Running optional validators", func() {
 		It("runs a validator for one selector on an empty bundle", func() {
 			bundle = &apimanifests.Bundle{}
 			sel = labels.SelectorFromSet(map[string]string{
-				nameKey: "operatorhub",
+				suiteKey: "operatorframework",
 			})
 			results = vals.run(bundle, sel, map[string]string{"k8s-version": "1.22"})
 			Expect(results).To(HaveLen(1))
@@ -61,7 +61,7 @@ var _ = Describe("Running optional validators", func() {
 			bundle = &apimanifests.Bundle{}
 			bundle.CSV = &v1alpha1.ClusterServiceVersion{}
 			sel = labels.SelectorFromSet(map[string]string{
-				nameKey: "operatorhub",
+				suiteKey: "operatorframework",
 			})
 			results = vals.run(bundle, sel, nil)
 			Expect(results).To(HaveLen(1))
@@ -84,14 +84,14 @@ var _ = Describe("Running optional validators", func() {
 		})
 		It("returns an error for an unmatched selector with no validators", func() {
 			sel = labels.SelectorFromSet(map[string]string{
-				nameKey: "operatorhub",
+				suiteKey: "operatorframework",
 			})
 			err = vals.checkMatches(sel)
 			Expect(err).To(HaveOccurred())
 		})
 		It("returns no error for an unmatched selector with all optional validators", func() {
 			sel = labels.SelectorFromSet(map[string]string{
-				nameKey: "operatorhub",
+				suiteKey: "operatorframework",
 			})
 			vals = optionalValidators
 			err = vals.checkMatches(sel)