fix(scorecard): error when constructing request should be checked (#843)

* fix(scorecard): error when constructing request should be checked Signed-off-by: Thuan Vo <[email protected]> * chore(scorecard): better error message and avoid nil pointer --------- Signed-off-by: Thuan Vo <[email protected]>
cryostatio · Jun 5, 2024 · e7b7afc · e7b7afc
1 parent 7025c66
commit e7b7afc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/internal/test/scorecard/clients.go b/internal/test/scorecard/clients.go
@@ -149,6 +149,9 @@ func get[r runtime.Object](ctx context.Context, c rest.Interface, res string, ns
 	if len(ns) > 0 {
 		rq = rq.Namespace(ns)
 	}
+	if err := rq.Error(); err != nil {
+		return result, err
+	}
 	err := rq.Do(ctx).Into(result)
 	return result, err
 }
@@ -158,14 +161,22 @@ func create[r runtime.Object](ctx context.Context, c rest.Interface, res string,
 	if len(ns) > 0 {
 		rq = rq.Namespace(ns)
 	}
+	if err := rq.Error(); err != nil {
+		return result, err
+	}
 	err := rq.Do(ctx).Into(result)
 	return result, err
 }
 
 func update[r runtime.Object](ctx context.Context, c rest.Interface, res string, ns string, obj r, result r, name string) (r, error) {
-	err := c.Put().
-		Namespace(ns).Resource(res).Name(name).
-		Body(obj).Do(ctx).Into(result)
+	rq := c.Put().Resource(res).Name(name).Body(obj)
+	if len(ns) > 0 {
+		rq = rq.Namespace(ns)
+	}
+	if err := rq.Error(); err != nil {
+		return result, err
+	}
+	err := rq.Do(ctx).Into(result)
 	return result, err
 }
 
@@ -174,6 +185,9 @@ func delete(ctx context.Context, c rest.Interface, res string, ns string, name s
 	if len(ns) > 0 {
 		rq = rq.Namespace(ns)
 	}
+	if err := rq.Error(); err != nil {
+		return err
+	}
 	return rq.Do(ctx).Error()
 }
 

diff --git a/internal/test/scorecard/common_utils.go b/internal/test/scorecard/common_utils.go
@@ -331,7 +331,7 @@ func configureIngress(name string, cryostatSpec *operatorv1beta2.CryostatSpec) {
 func (r *TestResources) createAndWaitTillCryostatAvailable(cr *operatorv1beta2.Cryostat) (*operatorv1beta2.Cryostat, error) {
 	cr, err := r.Client.OperatorCRDs().Cryostats(cr.Namespace).Create(context.Background(), cr)
 	if err != nil {
-		r.logError(fmt.Sprintf("failed to create Cryostat CR: %s", err.Error()))
+		r.logError(fmt.Sprintf("failed to create Cryostat CR \"%s\": %s", cr.Name, err.Error()))
 		return nil, err
 	}
 
@@ -347,7 +347,7 @@ func (r *TestResources) createAndWaitTillCryostatAvailable(cr *operatorv1beta2.C
 	err = wait.PollUntilContextCancel(ctx, time.Second, true, func(ctx context.Context) (done bool, err error) {
 		cr, err = r.Client.OperatorCRDs().Cryostats(cr.Namespace).Get(ctx, cr.Name)
 		if err != nil {
-			return false, fmt.Errorf("failed to get Cryostat CR: %s", err.Error())
+			return false, fmt.Errorf("failed to get Cryostat CR \"%s\": %s", cr.Name, err.Error())
 		}
 		if len(cr.Spec.TargetNamespaces) > 0 {
 			if len(cr.Status.TargetNamespaces) == 0 {
@@ -457,7 +457,7 @@ func (r *TestResources) updateAndWaitTillCryostatAvailable(cr *operatorv1beta2.C
 		var err error
 		cr, err = r.Client.OperatorCRDs().Cryostats(cr.Namespace).Get(ctx, cr.Name)
 		if err != nil {
-			return fmt.Errorf("failed to get Cryostat CR: %s", err.Error())
+			return fmt.Errorf("failed to get Cryostat CR \"%s\": %s", cr.Name, err.Error())
 		}
 
 		cr.Spec.StorageOptions = &operatorv1beta2.StorageConfiguration{
@@ -477,7 +477,7 @@ func (r *TestResources) updateAndWaitTillCryostatAvailable(cr *operatorv1beta2.C
 		return err
 	})
 	if err != nil {
-		return nil, fmt.Errorf("failed to update Cryostat CR: %s", err.Error())
+		return nil, fmt.Errorf("failed to update Cryostat CR \"%s\": %s", cr.Name, err.Error())
 	}
 
 	// Poll the deployment until it becomes available or we timeout

diff --git a/internal/test/scorecard/tests.go b/internal/test/scorecard/tests.go
@@ -116,7 +116,7 @@ func CryostatConfigChangeTest(bundle *apimanifests.Bundle, namespace string, ope
 		},
 	}
 
-	_, err = r.createAndWaitTillCryostatAvailable(cr)
+	cr, err = r.createAndWaitTillCryostatAvailable(cr)
 	if err != nil {
 		return r.fail(fmt.Sprintf("failed to determine application URL: %s", err.Error()))
 	}
@@ -243,7 +243,7 @@ func CryostatRecordingTest(bundle *apimanifests.Bundle, namespace string, openSh
 		return r.fail(fmt.Sprintf("failed to get the recordings: %s", err.Error()))
 	}
 	if rec.State != "STOPPED" {
-		return r.fail(fmt.Sprintf("recording %s failed to stop: %s", rec.Name, err.Error()))
+		return r.fail(fmt.Sprintf("expect recording %s to have state STOPPED but found %s", rec.Name, rec.State))
 	}
 	r.Log += fmt.Sprintf("stopped the recording: %s\n", rec.Name)