Fix RunTest return object (#273)

kubeshop · Apr 20, 2022 · 7eab56f · 7eab56f
1 parent 5fb2371
commit 7eab56f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 62 deletions.
diff --git a/api/openapi.yaml b/api/openapi.yaml
@@ -122,7 +122,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/TestRun"
+                $ref: "#/components/schemas/TestRunResult"
 
   /tests/{testId}/results/{resultId}:
     get:
@@ -365,14 +365,6 @@ components:
           type: string
         value:
           type: string
-    TestRun:
-      type: object
-      properties:
-        testRunId:
-          type: string
-          description: ID
-          format: uuid
-          readOnly: true
     SelectorItem:
       type: object
       properties:

diff --git a/server/.openapi-generator/FILES b/server/.openapi-generator/FILES
@@ -26,7 +26,6 @@ go/model_span_span_kind.go
 go/model_status_status_code.go
 go/model_test_.go
 go/model_test_assertion_result.go
-go/model_test_run.go
 go/model_test_run_result.go
 go/model_test_service_under_test_.go
 go/model_v1_any_value.go

diff --git a/server/README.md b/server/README.md
@@ -13,7 +13,7 @@ To see how to make this your own, look here:
 [README](https://openapi-generator.tech)
 
 - API version: 0.0.1
-- Build date: 2022-04-18T17:23:11.595350489-03:00[America/Sao_Paulo]
+- Build date: 2022-04-20T12:46:25.872-03:00[America/Argentina/Buenos_Aires]
 
 
 ### Running the server

diff --git a/server/api/openapi.yaml b/server/api/openapi.yaml
@@ -112,7 +112,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/TestRun'
+                $ref: '#/components/schemas/TestRunResult'
           description: successful operation
       summary: run test
       tags:
@@ -3683,16 +3683,6 @@ components:
         value:
           type: string
       type: object
-    TestRun:
-      example:
-        testRunId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
-      properties:
-        testRunId:
-          description: ID
-          format: uuid
-          readOnly: true
-          type: string
-      type: object
     SelectorItem:
       example:
         locationName: RESOURCE_ATTRIBUTES

diff --git a/server/go/api_api_service.go b/server/go/api_api_service.go
@@ -139,11 +139,9 @@ func (s *ApiApiService) RunTest(ctx context.Context, testid string) (ImplRespons
 		}
 	}
 
-	id := s.runner.Run(*test)
+	result := s.runner.Run(*test)
 
-	return Response(200, TestRun{
-		TestRunId: id,
-	}), nil
+	return Response(200, result), nil
 }
 
 // GetTestResults -

diff --git a/server/go/model_test_run.go b/server/go/model_test_run.go
diff --git a/server/go/runner.go b/server/go/runner.go
@@ -9,7 +9,7 @@ import (
 )
 
 type Runner interface {
-	Run(Test) (runID string)
+	Run(Test) TestRunResult
 }
 
 type PersistentRunner interface {
@@ -88,7 +88,7 @@ func (r persistentRunner) Stop() {
 	r.exit <- true
 }
 
-func (r persistentRunner) Run(t Test) string {
+func (r persistentRunner) Run(t Test) TestRunResult {
 	// Start a new background context for the async process
 	ctx := context.Background()
 
@@ -101,7 +101,7 @@ func (r persistentRunner) Run(t Test) string {
 		result: result,
 	}
 
-	return result.ResultId
+	return result
 }
 
 func (r persistentRunner) processExecQueue(job execReq) {