test

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

Author: Per Goncalves da Silva

test/e2e/steps/hooks.go

@@ -37,10 +37,10 @@ type scenarioContext struct {
 	extensionObjects []client.Object
 }
 
-// SaveClusterExtensionObjects collects all resources related to the ClusterExtension container in
+// GatherClusterExtensionObjects collects all resources related to the ClusterExtension container in
 // either their Helm release Secret or ClusterExtensionRevision depending on the applier being used
 // and saves them into the context.
-func (s *scenarioContext) SaveClusterExtensionObjects() error {
+func (s *scenarioContext) GatherClusterExtensionObjects() error {
 	objs, err := listExtensionResources(s.clusterExtensionName)
 	if err != nil {
 		return fmt.Errorf("failed to load extension resources into context: %w", err)
@@ -49,8 +49,8 @@ func (s *scenarioContext) SaveClusterExtensionObjects() error {
 	return nil
 }
 
-// GetClusterExtensionObjects returns the ClusterExtension objects currently save into the context.
-// Will always return nil until SaveClusterExtensionObjects is called
+// GetClusterExtensionObjects returns the ClusterExtension objects currently saved into the context.
+// Will always return nil until GatherClusterExtensionObjects is called
 func (s *scenarioContext) GetClusterExtensionObjects() []client.Object {
 	return s.extensionObjects
 }

test/e2e/steps/steps.go

@@ -293,7 +293,7 @@ func ClusterExtensionIsRolledOut(ctx context.Context) error {
 	}, timeout, tick)
 
 	// Save ClusterExtension resources to test context for posterior checks
-	if err := sc.SaveClusterExtensionObjects(); err != nil {
+	if err := sc.GatherClusterExtensionObjects(); err != nil {
 		return err
 	}
 	return nil
@@ -310,13 +310,13 @@ func ClusterExtensionResourcesCreatedAndAreLabeled(ctx context.Context) error {
 			kind := obj.GetObjectKind().GroupVersionKind().Kind
 			clusterObj, err := getResource(kind, obj.GetName(), obj.GetNamespace())
 			if err != nil {
-				logger.V(1).Info("error getting resource name=%q namespace=%q kind=%q: %v", obj.GetName(), obj.GetNamespace(), kind, err)
+				logger.V(1).Error(err, "error getting resource", "name", obj.GetName(), "namespace", obj.GetNamespace(), "kind", kind)
 				return false
 			}
 
 			labels := clusterObj.GetLabels()
 			if labels == nil {
-				logger.V(1).Info("resource name=%q namespace=%q kind=%q has no labels", obj.GetName(), obj.GetNamespace(), kind)
+				logger.V(1).Info("no labels found for resource", "name", obj.GetName(), "namespace", obj.GetNamespace(), "kind", kind)
 				return false
 			}
 
@@ -325,7 +325,7 @@ func ClusterExtensionResourcesCreatedAndAreLabeled(ctx context.Context) error {
 				"olm.operatorframework.io/owner-name": sc.clusterExtensionName,
 			} {
 				if labels[key] != expectedValue {
-					logger.V(1).Info("resource name=%q namespace=%q kind=%q expected label %q to equal %q but got %q", obj.GetName(), obj.GetNamespace(), kind, key, expectedValue, labels["olm.operatorframework.io/owner-kind"])
+					logger.V(1).Info("invalid resource label value", "name", obj.GetName(), "namespace", obj.GetNamespace(), "kind", kind, "label", key, "expected", expectedValue, "actual", labels["olm.operatorframework.io/owner-kind"])
 					return false
 				}
 			}