return k8sClient change and remove print directive.Args[0] from crossplane

Author: tataruty

tests/framework/crossplane.go

@@ -102,8 +102,7 @@ func fieldExistsInUpstream(
 	directive Directive,
 ) bool {
 	GinkgoWriter.Printf(
-		"Checking upstream %q for directive %q with value %q\n",
-		directive.Args[0],
+		"Checking upstream for directive %q with value %q\n",
 		expFieldCfg.Directive,
 		expFieldCfg.Value,
 	)

tests/framework/prometheus.go

@@ -541,11 +541,13 @@ func CreateEndTimeFinder(
 
 // CreateResponseChecker returns a function that checks if there is a successful response from a url.
 func CreateResponseChecker(url, address string, requestTimeout time.Duration, opts ...Option) func() error {
-	GinkgoWriter.Printf("Starting checking response for url %q and address %q\n", url, address)
 	options := &Options{logEnabled: true}
 	for _, opt := range opts {
 		opt(options)
 	}
+	if options.logEnabled {
+		GinkgoWriter.Printf("Starting checking response for url %q and address %q\n", url, address)
+	}
 
 	return func() error {
 		status, _, err := Get(url, address, requestTimeout, nil, nil, opts...)

tests/framework/resourcemanager.go

@@ -139,10 +139,12 @@ func (rm *ResourceManager) Apply(resources []client.Object, opts ...Option) erro
 			resource.SetResourceVersion(obj.GetResourceVersion())
 			updateErr := rm.K8sClient.Update(ctx, resource)
 			if updateErr != nil {
-				GinkgoWriter.Printf(
-					"ERROR occurred during updating Kubernetes resources on retries: %s\n",
-					updateErr,
-				)
+				if options.logEnabled {
+					GinkgoWriter.Printf(
+						"ERROR occurred during updating Kubernetes resources on retries: %s\n",
+						updateErr,
+					)
+				}
 			}
 
 			return updateErr
@@ -154,8 +156,9 @@ func (rm *ResourceManager) Apply(resources []client.Object, opts ...Option) erro
 			return retryErr
 		}
 	}
-	GinkgoWriter.Printf("Resources defined as Go objects applied successfully\n")
-
+	if options.logEnabled {
+		GinkgoWriter.Printf("Resources defined as Go objects applied successfully\n")
+	}
 	return nil
 }
 

tests/suite/graceful_recovery_test.go

@@ -313,6 +313,7 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
 					ngfNamespace,
 					releaseName,
 					timeoutConfig.GetStatusTimeout,
+					framework.WithLoggingDisabled(),
 				)
 				return len(podNames) == 1 && err == nil
 			}).
@@ -411,7 +412,13 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
 	}
 
 	BeforeAll(func() {
-		podNames, err := framework.GetReadyNGFPodNames(k8sClient, ngfNamespace, releaseName, timeoutConfig.GetStatusTimeout)
+		podNames, err := framework.GetReadyNGFPodNames(
+			k8sClient,
+			ngfNamespace,
+			releaseName,
+			timeoutConfig.GetStatusTimeout,
+			framework.WithLoggingDisabled(),
+		)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(podNames).To(HaveLen(1))
 
@@ -500,6 +507,7 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
 					ngfNamespace,
 					releaseName,
 					timeoutConfig.GetStatusTimeout,
+					framework.WithLoggingDisabled(),
 				)
 				return len(newNGFPodNames) == 1 && err == nil
 			}).