fix: generated testsuite from openapispec

kubeshop · Feb 10, 2022 · 9902bda · 9902bda
1 parent 3b4c31c
commit 9902bda
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -49,6 +49,7 @@ openapi-generate-model-testkube:
 	mv tmp/api/testkube/model_test.go tmp/api/testkube/model_test_base.go || true
 	mv tmp/api/testkube/model_*.go pkg/api/v1/testkube/
 	rm -rf tmp
+	find ./pkg/api/v1/testkube -type f -exec sed -i '' -e "s/package swagger/package testkube/g" {} \;
 	go fmt pkg/api/v1/testkube/*.go
 
 

diff --git a/api/v1/testkube.yaml b/api/v1/testkube.yaml
@@ -134,7 +134,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/TestExecutionsResult"
+                $ref: "#/components/schemas/TestSuiteExecutionsResult"
         500:
           description: "problem with getting script executions from storage"
           content:
@@ -1008,7 +1008,7 @@ components:
           $ref: "#/components/schemas/Execution"
           description: test step execution
 
-    TestExecutionsResult:
+    TestSuiteExecutionsResult:
       description: the result for a page of executions
       type: object
       required:
@@ -1449,7 +1449,7 @@ components:
           items:
             type: string
 
-    TestExecutionRequest:
+    TestSuiteExecutionRequest:
       description: test execution request body
       type: object
       properties:

diff --git a/pkg/api/v1/testkube/model_test_suite_base.go → pkg/api/v1/testkube/model_test_suite.go b/pkg/api/v1/testkube/model_test_suite_base.go → pkg/api/v1/testkube/model_test_suite.go
diff --git a/...pi/v1/testkube/model_test_suite_status.go → ...kube/model_test_suite_execution_status.go b/...pi/v1/testkube/model_test_suite_status.go → ...kube/model_test_suite_execution_status.go
@@ -11,7 +11,7 @@ package testkube
 
 type TestSuiteExecutionStatus string
 
-// List of TestStatus
+// List of TestSuiteExecutionStatus
 const (
 	QUEUED_TestSuiteExecutionStatus  TestSuiteExecutionStatus = "queued"
 	PENDING_TestSuiteExecutionStatus TestSuiteExecutionStatus = "pending"

diff --git a/pkg/api/v1/testkube/model_test_suite_step_type.go b/pkg/api/v1/testkube/model_test_suite_step_type.go
@@ -11,7 +11,7 @@ package testkube
 
 type TestSuiteStepType string
 
-// List of TestStepType
+// List of TestSuiteStepType
 const (
 	EXECUTE_SCRIPT_TestSuiteStepType TestSuiteStepType = "executeScript"
 	DELAY_TestSuiteStepType          TestSuiteStepType = "delay"