feat: update api version to be 0.12.0 in order to use new Not constraint (#2603)

Signed-off-by: Tyler Slaton <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7a6de4804c92a309fa085a189a9fdf37ece2a731

Author: tylerslaton

Diff for: staging/operator-lifecycle-manager/go.mod

@@ -25,7 +25,7 @@ require (
 	github.com/onsi/gomega v1.15.0
 	github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
 	github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
-	github.com/operator-framework/api v0.11.1
+	github.com/operator-framework/api v0.12.0
 	github.com/operator-framework/operator-registry v1.17.5
 	github.com/otiai10/copy v1.2.0
 	github.com/pkg/errors v0.9.1

Diff for: staging/operator-lifecycle-manager/go.sum

@@ -927,8 +927,8 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/operator-framework/api v0.7.1/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
-github.com/operator-framework/api v0.11.1 h1:5eNUMplyL/GZrnBgG4SS2csO3+Fl4F79OqXN6POHQyA=
-github.com/operator-framework/api v0.11.1/go.mod h1:FTiYGm11fZQ3cSX+EQHc/UWoGZAwkGfyeHU+wMJ8jmA=
+github.com/operator-framework/api v0.12.0 h1:aHxHk50/Y1J4Ogdk2J6tYofgX+GEqyBPCMyun+JFqV4=
+github.com/operator-framework/api v0.12.0/go.mod h1:FTiYGm11fZQ3cSX+EQHc/UWoGZAwkGfyeHU+wMJ8jmA=
 github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0=
 github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8=
 github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

Diff for: staging/operator-lifecycle-manager/pkg/controller/registry/resolver/resolver.go

@@ -815,8 +815,8 @@ func (pc *predicateConverter) convertConstraints(constraints ...constraints.Cons
 		case constraint.Any != nil:
 			subs, perr := pc.convertConstraints(constraint.Any.Constraints...)
 			preds[i], err = cache.Or(subs...), perr
-		case constraint.None != nil:
-			subs, perr := pc.convertConstraints(constraint.None.Constraints...)
+		case constraint.Not != nil:
+			subs, perr := pc.convertConstraints(constraint.Not.Constraints...)
 			preds[i], err = cache.Not(subs...), perr
 		case constraint.Cel != nil:
 			preds[i], err = cache.CreateCelPredicate(pc.celEnv, constraint.Cel.Rule, constraint.FailureMessage)

Diff for: staging/operator-lifecycle-manager/pkg/controller/registry/resolver/resolver_test.go

@@ -953,7 +953,7 @@ func TestSolveOperators_OLMConstraint_CompoundAny(t *testing.T) {
 	}
 }
 
-func TestSolveOperators_OLMConstraint_CompoundNone(t *testing.T) {
+func TestSolveOperators_OLMConstraint_CompoundNot(t *testing.T) {
 	namespace := "olm"
 	csName := "community"
 	catalog := cache.SourceKey{Name: csName, Namespace: namespace}
@@ -965,10 +965,10 @@ func TestSolveOperators_OLMConstraint_CompoundNone(t *testing.T) {
 		properties: []*api.Property{
 			{
 				Type: constraints.OLMConstraintType,
-				Value: `{"failureMessage": "compound none constraint",
+				Value: `{"failureMessage": "compound not constraint",
 					"all": {"constraints": [
 						{"gvk": {"group": "g0", "version": "v0", "kind": "k0"}},
-						{"none": {"constraints": [
+						{"not": {"constraints": [
 							{"gvk": {"group": "g1", "version": "v1", "kind": "k1"}},
 							{"gvk": {"group": "g2", "version": "v2", "kind": "k2"}}
 						]}}