fixup! cloud, plz: add public detail and abort to events

grafana · Nov 6, 2023 · d48f8cf · d48f8cf
1 parent 030ddf2
commit d48f8cf
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/api/v1alpha1/testruni.go b/api/v1alpha1/testruni.go
@@ -20,3 +20,14 @@ type TestRunI interface {
 	GetSpec() *TestRunSpec
 	NamespacedName() types.NamespacedName
 }
+
+// TestRunID is a tiny helper to get k6 Cloud test run ID.
+// PLZ test run will have test run ID as part of spec
+// while cloud output test run as part of status.
+func TestRunID(k6 TestRunI) string {
+	specId := k6.GetSpec().TestRunID
+	if len(specId) > 0 {
+		return specId
+	}
+	return k6.GetStatus().TestRunID
+}
diff --git a/controllers/k6_create.go b/controllers/k6_create.go
@@ -56,7 +56,7 @@ func CreateJobs(ctx context.Context, log logr.Logger, k6 v1alpha1.TestRunI, r *T
 			events := cloud.ErrorEvent(cloud.K6OperatorStartError).
 				WithDetail(fmt.Sprintf("Failed to create runner jobs: %v", err)).
 				WithAbort()
-			cloud.SendTestRunEvents(r.k6CloudClient, k6.GetSpec().TestRunID, log, events)
+			cloud.SendTestRunEvents(r.k6CloudClient, v1alpha1.TestRunID(k6), log, events)
 		}
 
 		return res, err

diff --git a/controllers/k6_finish.go b/controllers/k6_finish.go
@@ -57,7 +57,7 @@ func FinishJobs(ctx context.Context, log logr.Logger, k6 v1alpha1.TestRunI, r *T
 		events := cloud.ErrorEvent(cloud.K6OperatorRunnerError).
 			WithDetail(msg).
 			WithAbort()
-		cloud.SendTestRunEvents(r.k6CloudClient, k6.GetSpec().TestRunID, log, events)
+		cloud.SendTestRunEvents(r.k6CloudClient, v1alpha1.TestRunID(k6), log, events)
 	}
 
 	if finished < k6.GetSpec().Parallelism {

diff --git a/controllers/k6_initialize.go b/controllers/k6_initialize.go
@@ -59,7 +59,7 @@ func RunValidations(ctx context.Context, log logr.Logger, k6 v1alpha1.TestRunI,
 			events := cloud.ErrorEvent(cloud.K6OperatorStartError).
 				WithDetail(fmt.Sprintf("Failed to inspect the test script: %v", err)).
 				WithAbort()
-			cloud.SendTestRunEvents(r.k6CloudClient, k6.GetSpec().TestRunID, log, events)
+			cloud.SendTestRunEvents(r.k6CloudClient, v1alpha1.TestRunID(k6), log, events)
 		}
 
 		// inspectTestRun made a log message already so just return without requeue

diff --git a/controllers/k6_start.go b/controllers/k6_start.go
@@ -74,7 +74,7 @@ func StartJobs(ctx context.Context, log logr.Logger, k6 v1alpha1.TestRunI, r *Te
 					events := cloud.ErrorEvent(cloud.K6OperatorStartError).
 						WithDetail("Creation of runner pods takes too long: your configuration might be off. Check if runner jobs and pods were created successfully.").
 						WithAbort()
-					cloud.SendTestRunEvents(r.k6CloudClient, k6.GetSpec().TestRunID, log, events)
+					cloud.SendTestRunEvents(r.k6CloudClient, v1alpha1.TestRunID(k6), log, events)
 				}
 			}
 		}

diff --git a/pkg/cloud/test_runs.go b/pkg/cloud/test_runs.go
@@ -110,7 +110,7 @@ func GetTestRunData(client *cloudapi.Client, refID string) (*TestRunData, error)
 	return getTestRun(client, url)
 }
 
-// called by K6 controller
+// called by TestRun controller
 func GetTestRunState(client *cloudapi.Client, refID string, log logr.Logger) (TestRunStatus, error) {
 	url := fmt.Sprintf("%s/loadtests/v4/test_runs(%s)?$select=id,run_status", ApiURL(client.BaseURL()), refID)
 	trData, err := getTestRun(client, url)
@@ -121,7 +121,7 @@ func GetTestRunState(client *cloudapi.Client, refID string, log logr.Logger) (Te
 	return TestRunStatus(trData.RunStatus), nil
 }
 
-// called by K6 controller
+// called by TestRun controller
 // If there's an error, it'll be logged.
 func SendTestRunEvents(client *cloudapi.Client, refID string, log logr.Logger, events *Events) {
 	if len(*events) == 0 {