fix: added running context to execution details

kubeshop · Aug 8, 2024 · e2e0849 · e2e0849
1 parent b77d161
commit e2e0849
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/api/v1/testkube.yaml b/api/v1/testkube.yaml
@@ -7899,6 +7899,8 @@ components:
           type: boolean
           description: whether webhooks on the execution of this test workflow are disabled
           default: false
+        runningContext:
+          $ref: "#/components/schemas/RunningContext"
 
     TestWorkflowWithExecution:
       type: object
@@ -7990,9 +7992,11 @@ components:
           example:
             - true
             - false
-        runnerID:
+        runnerId:
           type: string
           description: Runner id that executed the test workflow
+        runningContext:
+          $ref: "#/components/schemas/RunningContext"
       required:
         - id
         - name

diff --git a/cmd/api-server/main.go b/cmd/api-server/main.go
@@ -154,7 +154,9 @@ func main() {
 	features, err := featureflags.Get()
 	exitOnError("error getting application feature flags", err)
 
-	log.DefaultLogger.Infow("Feature flags configured", "ff", features)
+	logger := log.DefaultLogger.With("apiVersion", version.Version)
+
+	logger.Infow("Feature flags configured", "ff", features)
 
 	// Run services within an errgroup to propagate errors between services.
 	g, ctx := errgroup.WithContext(ctx)
@@ -453,7 +455,6 @@ func main() {
 		proContext.OrgID = environment.OrganizationId
 		proContext.OrgName = environment.OrganizationName
 		proContext.OrgSlug = environment.OrganizationSlug
-
 	}
 
 	serviceAccountNames := map[string]string{

diff --git a/pkg/api/v1/testkube/model_test_workflow_execution.go b/pkg/api/v1/testkube/model_test_workflow_execution.go
@@ -40,5 +40,6 @@ type TestWorkflowExecution struct {
 	// whether webhooks on the execution of this test workflow are disabled
 	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
 	// Runner id that executed the test workflow
-	RunnerID string `json:"runnerID,omitempty"`
+	RunnerId       string          `json:"runnerId,omitempty"`
+	RunningContext *RunningContext `json:"runningContext,omitempty"`
 }
diff --git a/pkg/api/v1/testkube/model_test_workflow_execution_request.go b/pkg/api/v1/testkube/model_test_workflow_execution_request.go
@@ -16,5 +16,6 @@ type TestWorkflowExecutionRequest struct {
 	// test workflow execution name started the test workflow execution
 	TestWorkflowExecutionName string `json:"testWorkflowExecutionName,omitempty"`
 	// whether webhooks on the execution of this test workflow are disabled
-	DisableWebhooks bool `json:"disableWebhooks,omitempty"`
+	DisableWebhooks bool            `json:"disableWebhooks,omitempty"`
+	RunningContext  *RunningContext `json:"runningContext,omitempty"`
 }
diff --git a/pkg/testworkflows/testworkflowexecutor/executor.go b/pkg/testworkflows/testworkflowexecutor/executor.go
@@ -543,7 +543,8 @@ func (e *executor) Execute(ctx context.Context, workflow testworkflowsv1.TestWor
 		ResolvedWorkflow:          testworkflowmappers.MapKubeToAPI(resolvedWorkflow),
 		TestWorkflowExecutionName: testWorkflowExecutionName,
 		DisableWebhooks:           request.DisableWebhooks,
-		RunnerID:                  e.runnerID,
+		RunnerId:                  e.runnerID,
+		RunningContext:            request.RunningContext,
 	}
 	err = e.repository.Insert(ctx, execution)
 	if err != nil {