Merge OpenAPI specs

kurtosis-tech · Nov 29, 2023 · 0a7a796 · 0a7a796
1 parent ade15b7
commit 0a7a796
Show file tree

Hide file tree

Showing 14 changed files with 981 additions and 1,093 deletions.
diff --git a/api/golang/http_rest/api_types/api_types.gen.go b/api/golang/http_rest/api_types/api_types.gen.go
diff --git a/api/golang/http_rest/core_rest_api/api_container_server.gen.go b/api/golang/http_rest/core_rest_api/api_container_server.gen.go
diff --git a/api/golang/http_rest/engine_rest_api/engine_server.gen.go b/api/golang/http_rest/engine_rest_api/engine_server.gen.go
diff --git a/api/golang/http_rest/websocket_api/websocket_server.gen.go b/api/golang/http_rest/websocket_api/websocket_server.gen.go
diff --git a/api/openapi/generators/api_types.cfg.yaml b/api/openapi/generators/api_types.cfg.yaml
@@ -1,7 +1,4 @@
 package: api_types
 generate:
   models: true
-  embedded-spec: true
 output: api/golang/http_rest/api_types/api_types.gen.go
-output-options:
-  skip-prune: true
diff --git a/api/openapi/generators/core_server.cfg.yaml b/api/openapi/generators/core_server.cfg.yaml
@@ -3,7 +3,10 @@ generate:
   embedded-spec: true
   echo-server: true
   strict-server: true
-  models: true
-import-mapping:
-  ./api_types.yaml: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types
-output: api/golang/http_rest/core_rest_api/api_container_server.gen.go
+additional-imports:
+  - package: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types
+    alias: .
+output: api/golang/http_rest/core_rest_api/api_container_server.gen.go
+output-options:
+  include-tags:
+    - enclave
diff --git a/api/openapi/generators/engine_server.cfg.yaml b/api/openapi/generators/engine_server.cfg.yaml
@@ -3,7 +3,10 @@ generate:
   embedded-spec: true
   echo-server: true
   strict-server: true
-  models: true
-import-mapping:
-  ./api_types.yaml: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types
-output: api/golang/http_rest/engine_rest_api/engine_server.gen.go
+additional-imports:
+  - package: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types
+    alias: .
+output: api/golang/http_rest/engine_rest_api/engine_server.gen.go
+output-options:
+  include-tags:
+    - engine
diff --git a/api/openapi/generators/websocket_server.cfg.yaml b/api/openapi/generators/websocket_server.cfg.yaml
@@ -3,7 +3,10 @@ generate:
   embedded-spec: true
   echo-server: true
   strict-server: false
-  models: true
-import-mapping:
-  ./api_types.yaml: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types
-output: api/golang/http_rest/websocket_api/websocket_server.gen.go
+additional-imports:
+  - package: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types
+    alias: .
+output: api/golang/http_rest/websocket_api/websocket_server.gen.go
+output-options:
+  include-tags:
+    - streaming
diff --git a/api/openapi/scripts/build.sh b/api/openapi/scripts/build.sh
@@ -6,9 +6,9 @@ script_dirpath="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 api_root_dirpath="$(dirname "${script_dirpath}")"
 
 echo "Generating data models for REST API "
-oapi-codegen --config="$api_root_dirpath/generators/api_types.cfg.yaml" "$api_root_dirpath/specs/api_types.yaml"
+oapi-codegen --config="$api_root_dirpath/generators/api_types.cfg.yaml" "$api_root_dirpath/specs/kurtosis_api.yaml"
 
 echo "Generating server code for REST API "
-oapi-codegen --config="$api_root_dirpath/generators/engine_server.cfg.yaml" "$api_root_dirpath/specs/engine_service.yaml"
-oapi-codegen --config="$api_root_dirpath/generators/core_server.cfg.yaml" "$api_root_dirpath/specs/core_service.yaml"
-oapi-codegen --config="$api_root_dirpath/generators/websocket_server.cfg.yaml" "$api_root_dirpath/specs/websocket_service.yaml"
+oapi-codegen --config="$api_root_dirpath/generators/engine_server.cfg.yaml" "$api_root_dirpath/specs/kurtosis_api.yaml"
+oapi-codegen --config="$api_root_dirpath/generators/core_server.cfg.yaml" "$api_root_dirpath/specs/kurtosis_api.yaml"
+oapi-codegen --config="$api_root_dirpath/generators/websocket_server.cfg.yaml" "$api_root_dirpath/specs/kurtosis_api.yaml"