Refactor LogAndFormatError to LoggedErrorf

Signed-off-by: perdasilva <[email protected]>

Author: perdasilva

Diff for: test/e2e/util/e2e_catalog_helper.go

@@ -16,10 +16,10 @@ type CatalogSourceHelper struct {
 func (c *CatalogSourceHelper) EventuallyHasGrpcConnectionWithLastConnectionState(expectedState connectivity.State) {
 	c.waitForCatalogToBeLike(func(catalogSource *v1alpha1.CatalogSource) error {
 		if catalogSource.Status.GRPCConnectionState == nil {
-			return LogAndFormatError("expected catalog source grpc connection state to be '%s' but there is no connection state", expectedState)
+			return LoggedErrorf("expected catalog source grpc connection state to be '%s' but there is no connection state", expectedState)
 		}
 		if catalogSource.Status.GRPCConnectionState.LastObservedState != expectedState.String() {
-			return LogAndFormatError("expected catalog source gprc connection state '%s' to be '%s'", catalogSource.Status.GRPCConnectionState.LastObservedState, expectedState)
+			return LoggedErrorf("expected catalog source gprc connection state '%s' to be '%s'", catalogSource.Status.GRPCConnectionState.LastObservedState, expectedState)
 		}
 		return nil
 	})

Diff for: test/e2e/util/e2e_client.go

@@ -66,7 +66,7 @@ func (m *E2EKubeClient) Reset() error {
 
 		Logf("deleting %s/%s", namespace, obj.GetName())
 		if err := k8scontrollerclient.IgnoreNotFound(m.Delete(context.Background(), obj)); err != nil {
-			Logf("error deleting object %s/%s: %s", namespace, obj.GetName(), obj)
+			Logf("error deleting object %s/%s: %s", namespace, obj.GetName(), err)
 			return err
 		}
 	}

Diff for: test/e2e/util/e2e_determined_client.go

@@ -3,6 +3,7 @@ package util
 import (
 	"context"
 
+	"k8s.io/client-go/util/retry"
 	k8scontrollerclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	. "github.com/onsi/gomega"
@@ -30,7 +31,9 @@ func (m *DeterminedE2EClient) Create(context context.Context, obj k8scontrollerc
 
 func (m *DeterminedE2EClient) Update(context context.Context, obj k8scontrollerclient.Object, options ...k8scontrollerclient.UpdateOption) error {
 	m.keepTrying(func() error {
-		return m.E2EKubeClient.Update(context, obj, options...)
+		return retry.RetryOnConflict(retry.DefaultRetry, func() error {
+			return m.E2EKubeClient.Update(context, obj, options...)
+		})
 	})
 	return nil
 }

Diff for: test/e2e/util/e2e_subscription_helper.go

@@ -15,7 +15,7 @@ type SubscriptionHelper struct {
 func (s *SubscriptionHelper) EventuallyHasState(expectedState v1alpha1.SubscriptionState) {
 	s.waitForSubscriptionToBeLike(func(subscription *v1alpha1.Subscription) error {
 		if subscription.Status.State != expectedState {
-			return LogAndFormatError("expected subscription state '%s' to be '%s'", subscription.Status.State, expectedState)
+			return LoggedErrorf("expected subscription state '%s' to be '%s'", subscription.Status.State, expectedState)
 		}
 		return nil
 	})
@@ -28,7 +28,7 @@ func (s *SubscriptionHelper) EventuallyContainsCondition(expectedCondition v1alp
 				return nil
 			}
 		}
-		return LogAndFormatError("expected subscription condition %s to be in %s", expectedCondition, ObjectToJsonString(subscription.Status.Conditions))
+		return LoggedErrorf("expected subscription condition %s to be in %s", expectedCondition, ObjectToJsonString(subscription.Status.Conditions))
 	})
 }
 
@@ -41,7 +41,7 @@ func (s *SubscriptionHelper) EventuallyContainsConditionWithConditionType(expect
 			}
 			foundConditionTypes = append(foundConditionTypes, condition.Type)
 		}
-		return LogAndFormatError("expected subscription condition type '%s' to be in %s", expectedConditionType, foundConditionTypes)
+		return LoggedErrorf("expected subscription condition type '%s' to be in %s", expectedConditionType, foundConditionTypes)
 	})
 }
 

Diff for: test/e2e/util/test_logging.go

@@ -15,7 +15,7 @@ func Logf(f string, v ...interface{}) {
 	_, _ = fmt.Fprintf(g.GinkgoWriter, f, v...)
 }
 
-func LogAndFormatError(format string, args ...interface{}) error {
+func LoggedErrorf(format string, args ...interface{}) error {
 	Logf(format, args...)
 	return fmt.Errorf(format, args...)
 }