From 9902bdaa54f77424325e5d17b39ab2efaad30a84 Mon Sep 17 00:00:00 2001 From: Jacek Wysocki Date: Thu, 10 Feb 2022 12:38:31 +0100 Subject: [PATCH] fix: generated testsuite from openapispec --- Makefile | 1 + api/v1/testkube.yaml | 6 +++--- .../{model_test_suite_base.go => model_test_suite.go} | 0 ...suite_status.go => model_test_suite_execution_status.go} | 2 +- pkg/api/v1/testkube/model_test_suite_step_type.go | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) rename pkg/api/v1/testkube/{model_test_suite_base.go => model_test_suite.go} (100%) rename pkg/api/v1/testkube/{model_test_suite_status.go => model_test_suite_execution_status.go} (94%) diff --git a/Makefile b/Makefile index 815079cc74c..817f1b162ae 100644 --- 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 index 2688c8e10a1..66cbef2b28c 100644 --- 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 b/pkg/api/v1/testkube/model_test_suite.go similarity index 100% rename from pkg/api/v1/testkube/model_test_suite_base.go rename to pkg/api/v1/testkube/model_test_suite.go diff --git a/pkg/api/v1/testkube/model_test_suite_status.go b/pkg/api/v1/testkube/model_test_suite_execution_status.go similarity index 94% rename from pkg/api/v1/testkube/model_test_suite_status.go rename to pkg/api/v1/testkube/model_test_suite_execution_status.go index edfccc9dbf1..38251b3d2d0 100644 --- a/pkg/api/v1/testkube/model_test_suite_status.go +++ b/pkg/api/v1/testkube/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 index f39e1aaecd0..4c15df91b01 100644 --- 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"