Added CustomMatcher for asserting on k8 errors

Author: harishsurf

test/e2e/bundle_e2e_test.go

@@ -64,15 +64,13 @@ var _ = Describe("Installing bundles with new object types", func() {
 			err = json.Unmarshal(data, &vpaCRD)
 			Expect(err).ToNot(HaveOccurred(), "could not convert vpa crd to unstructured")
 
-			Eventually(func() error {
+			Eventually(func() bool {
 				err := ctx.Ctx().Client().Create(context.TODO(), &vpaCRD)
 				if err != nil {
-					if !k8serrors.IsAlreadyExists(err) {
-						return err
-					}
+					return k8serrors.IsAlreadyExists(err)
 				}
-				return nil
-			}).Should(Succeed())
+				return true
+			}).Should(BeTrue())
 
 			// ensure vpa crd is established and accepted on the cluster before continuing
 			Eventually(func() (bool, error) {

test/e2e/gc_e2e_test.go

@@ -3,11 +3,14 @@ package e2e
 import (
 	"context"
 	"fmt"
+	"reflect"
+	"runtime"
+	"strings"
 
 	"github.com/blang/semver"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/operator-framework/operator-lifecycle-manager/test/e2e/dsl"
+	"github.com/onsi/gomega/types"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -21,8 +24,11 @@ import (
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
 	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
+	. "github.com/operator-framework/operator-lifecycle-manager/test/e2e/dsl"
 )
 
+const k8ErrorImportPath = "k8s.io/apimachinery/pkg/api/errors."
+
 var _ = Describe("Garbage collection for dependent resources", func() {
 	var (
 		kubeClient     operatorclient.ClientInterface
@@ -276,7 +282,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
 			It("should have deleted the dependent since both the owners were deleted", func() {
 				_, err := kubeClient.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Get(context.TODO(), dependent.GetName(), metav1.GetOptions{})
 				Expect(err).To(HaveOccurred())
-				Expect(k8serrors.IsNotFound(err)).To(BeTrue())
+				Expect(k8serrors.IsNotFound).Should(assertOnk8Error("IsNotFound", err))
 				ctx.Ctx().Logf("dependent successfully garbage collected after both owners were deleted")
 			})
 
@@ -602,3 +608,16 @@ var _ = Describe("Garbage collection for dependent resources", func() {
 		})
 	})
 })
+
+// assertOnk8Error validates that the actual error passed in matches the expected k8 error
+// using gomega's matcher
+func assertOnk8Error(expectedk8Error string, actualError error) types.GomegaMatcher {
+	return WithTransform(func(f func(e error) bool) string {
+		var errFuncName string
+		if f(actualError) {
+			errFuncName = runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
+			errFuncName = strings.Split(errFuncName, k8ErrorImportPath)[1]
+		}
+		return errFuncName
+	}, Equal(expectedk8Error))
+}

test/e2e/scoped_client_test.go

@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	"github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/gomega"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
@@ -61,7 +62,7 @@ var _ = Describe("Scoped Client", func() {
 			// lack of permission.
 			name: "ServiceAccountDoesNotHaveAnyPermission",
 			assertFunc: func(errGot error) {
-				require.True(GinkgoT(), k8serrors.IsForbidden(errGot))
+				Expect(k8serrors.IsForbidden).Should(assertOnk8Error("IsForbidden", errGot))
 			},
 		}),
 		table.Entry("ServiceAccountHasPermission", testParameter{
@@ -73,7 +74,7 @@ var _ = Describe("Scoped Client", func() {
 				return
 			},
 			assertFunc: func(errGot error) {
-				require.True(GinkgoT(), k8serrors.IsNotFound(errGot))
+				Expect(k8serrors.IsNotFound).Should(assertOnk8Error("IsNotFound", errGot))
 			},
 		}),
 	}