From dfa7a9522fb77925e66809e06e19616ee5511dab Mon Sep 17 00:00:00 2001 From: Tedi Mitiku Date: Sat, 18 Jan 2025 10:23:16 -0500 Subject: [PATCH] migrate rest api generators to v2 path --- .../lib/binding_constructors/binding_constructors.go | 2 +- api/golang/core/lib/enclaves/enclave_context.go | 8 ++++---- api/golang/core/lib/enclaves/starlark_run_blocking.go | 2 +- api/golang/core/lib/services/port_spec.go | 2 +- api/golang/core/lib/services/service_config_builder.go | 2 +- api/golang/core/lib/services/service_context.go | 4 ++-- api/golang/core/lib/services/service_identifiers.go | 2 +- .../lib/starlark_run_config/starlark_run_config.go | 2 +- .../engine/lib/kurtosis_context/enclave_identifiers.go | 4 ++-- .../lib/kurtosis_context/enclave_identifiers_test.go | 2 +- api/golang/engine/lib/kurtosis_context/enclaves.go | 2 +- .../engine/lib/kurtosis_context/kurtosis_context.go | 10 +++++----- .../kurtosis_context/service_logs_stream_content.go | 2 +- api/golang/util/create_enclave.go | 6 +++--- api/openapi/generators/api_types.cfg.yaml | 2 +- api/openapi/generators/core_server.cfg.yaml | 2 +- api/openapi/generators/engine_server.cfg.yaml | 2 +- api/openapi/generators/go_client.cfg.yaml | 2 +- api/openapi/generators/websocket_server.cfg.yaml | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/api/golang/core/lib/binding_constructors/binding_constructors.go b/api/golang/core/lib/binding_constructors/binding_constructors.go index ef41643e54..071c899e9f 100644 --- a/api/golang/core/lib/binding_constructors/binding_constructors.go +++ b/api/golang/core/lib/binding_constructors/binding_constructors.go @@ -1,7 +1,7 @@ package binding_constructors import ( - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" ) // The generated bindings don't come with constructors (leaving it up to the user to initialize all the fields), so we diff --git a/api/golang/core/lib/enclaves/enclave_context.go b/api/golang/core/lib/enclaves/enclave_context.go index 12b480aed2..6bff2dc3c3 100755 --- a/api/golang/core/lib/enclaves/enclave_context.go +++ b/api/golang/core/lib/enclaves/enclave_context.go @@ -27,10 +27,10 @@ import ( "strings" yaml_convert "github.com/ghodss/yaml" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/binding_constructors" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/binding_constructors" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/services" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/starlark_run_config" "github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang/grpc_file_streaming" "github.com/kurtosis-tech/stacktrace" "github.com/sirupsen/logrus" diff --git a/api/golang/core/lib/enclaves/starlark_run_blocking.go b/api/golang/core/lib/enclaves/starlark_run_blocking.go index e9c4699347..24398b3aea 100644 --- a/api/golang/core/lib/enclaves/starlark_run_blocking.go +++ b/api/golang/core/lib/enclaves/starlark_run_blocking.go @@ -1,7 +1,7 @@ package enclaves import ( - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" "strings" ) diff --git a/api/golang/core/lib/services/port_spec.go b/api/golang/core/lib/services/port_spec.go index 446cd733ea..0e893f0092 100644 --- a/api/golang/core/lib/services/port_spec.go +++ b/api/golang/core/lib/services/port_spec.go @@ -7,7 +7,7 @@ package services import ( "fmt" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" "math" ) diff --git a/api/golang/core/lib/services/service_config_builder.go b/api/golang/core/lib/services/service_config_builder.go index 12691ede8a..6c7a096a6d 100644 --- a/api/golang/core/lib/services/service_config_builder.go +++ b/api/golang/core/lib/services/service_config_builder.go @@ -2,7 +2,7 @@ package services import ( "fmt" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" "strings" ) diff --git a/api/golang/core/lib/services/service_context.go b/api/golang/core/lib/services/service_context.go index 7e5df0e7b9..02fc9138b6 100644 --- a/api/golang/core/lib/services/service_context.go +++ b/api/golang/core/lib/services/service_context.go @@ -19,8 +19,8 @@ package services import ( "context" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/binding_constructors" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/binding_constructors" "github.com/kurtosis-tech/stacktrace" ) diff --git a/api/golang/core/lib/services/service_identifiers.go b/api/golang/core/lib/services/service_identifiers.go index 5b59a921e4..5302db7490 100644 --- a/api/golang/core/lib/services/service_identifiers.go +++ b/api/golang/core/lib/services/service_identifiers.go @@ -1,7 +1,7 @@ package services import ( - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" "github.com/kurtosis-tech/stacktrace" "sort" ) diff --git a/api/golang/core/lib/starlark_run_config/starlark_run_config.go b/api/golang/core/lib/starlark_run_config/starlark_run_config.go index f84ef58c8e..73e48c3cc4 100644 --- a/api/golang/core/lib/starlark_run_config/starlark_run_config.go +++ b/api/golang/core/lib/starlark_run_config/starlark_run_config.go @@ -1,7 +1,7 @@ package starlark_run_config import ( - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" ) const ( diff --git a/api/golang/engine/lib/kurtosis_context/enclave_identifiers.go b/api/golang/engine/lib/kurtosis_context/enclave_identifiers.go index cc5a5c7eea..c86fe4a4b3 100644 --- a/api/golang/engine/lib/kurtosis_context/enclave_identifiers.go +++ b/api/golang/engine/lib/kurtosis_context/enclave_identifiers.go @@ -1,8 +1,8 @@ package kurtosis_context import ( - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/kurtosis_engine_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/enclaves" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/engine/kurtosis_engine_rpc_api_bindings" "github.com/kurtosis-tech/stacktrace" "sort" ) diff --git a/api/golang/engine/lib/kurtosis_context/enclave_identifiers_test.go b/api/golang/engine/lib/kurtosis_context/enclave_identifiers_test.go index bd26cc7891..d314baa418 100644 --- a/api/golang/engine/lib/kurtosis_context/enclave_identifiers_test.go +++ b/api/golang/engine/lib/kurtosis_context/enclave_identifiers_test.go @@ -1,7 +1,7 @@ package kurtosis_context import ( - "github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/kurtosis_engine_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/engine/kurtosis_engine_rpc_api_bindings" "github.com/stretchr/testify/require" "testing" ) diff --git a/api/golang/engine/lib/kurtosis_context/enclaves.go b/api/golang/engine/lib/kurtosis_context/enclaves.go index c37bbcb99d..95adb3e41b 100644 --- a/api/golang/engine/lib/kurtosis_context/enclaves.go +++ b/api/golang/engine/lib/kurtosis_context/enclaves.go @@ -1,6 +1,6 @@ package kurtosis_context -import "github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/kurtosis_engine_rpc_api_bindings" +import "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/engine/kurtosis_engine_rpc_api_bindings" // Enclaves A collection of enclaves by uuid, name and shortened uuid type Enclaves struct { diff --git a/api/golang/engine/lib/kurtosis_context/kurtosis_context.go b/api/golang/engine/lib/kurtosis_context/kurtosis_context.go index 9ae5e33bb4..c6d51b6f5d 100644 --- a/api/golang/engine/lib/kurtosis_context/kurtosis_context.go +++ b/api/golang/engine/lib/kurtosis_context/kurtosis_context.go @@ -8,11 +8,11 @@ import ( "github.com/Masterminds/semver/v3" portal_constructors "github.com/kurtosis-tech/kurtosis-portal/api/golang/constructors" portal_api "github.com/kurtosis-tech/kurtosis-portal/api/golang/generated" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/kurtosis_engine_rpc_api_bindings" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/kurtosis_version" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/kurtosis_core_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/enclaves" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/services" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/engine/kurtosis_engine_rpc_api_bindings" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/kurtosis_version" "github.com/kurtosis-tech/kurtosis/contexts-config-store/store" "github.com/kurtosis-tech/stacktrace" "github.com/sirupsen/logrus" diff --git a/api/golang/engine/lib/kurtosis_context/service_logs_stream_content.go b/api/golang/engine/lib/kurtosis_context/service_logs_stream_content.go index d637418b2a..59445033ef 100644 --- a/api/golang/engine/lib/kurtosis_context/service_logs_stream_content.go +++ b/api/golang/engine/lib/kurtosis_context/service_logs_stream_content.go @@ -1,6 +1,6 @@ package kurtosis_context -import "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services" +import "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/services" // This struct wrap the information returned by the user service logs GRPC stream type serviceLogsStreamContent struct { diff --git a/api/golang/util/create_enclave.go b/api/golang/util/create_enclave.go index 621dae1b70..44e94908d2 100644 --- a/api/golang/util/create_enclave.go +++ b/api/golang/util/create_enclave.go @@ -2,9 +2,9 @@ package util import ( "context" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config" - "github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/lib/kurtosis_context" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/enclaves" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/core/lib/starlark_run_config" + "github.com/kurtosis-tech/kurtosis/api/golang/v2/v2/engine/lib/kurtosis_context" "github.com/kurtosis-tech/stacktrace" ) diff --git a/api/openapi/generators/api_types.cfg.yaml b/api/openapi/generators/api_types.cfg.yaml index e063278144..76333abd28 100644 --- a/api/openapi/generators/api_types.cfg.yaml +++ b/api/openapi/generators/api_types.cfg.yaml @@ -1,4 +1,4 @@ package: api_types generate: models: true -output: api/golang/http_rest/api_types/api_types.gen.go +output: api/golang/v2/http_rest/api_types/api_types.gen.go diff --git a/api/openapi/generators/core_server.cfg.yaml b/api/openapi/generators/core_server.cfg.yaml index 08dcb92b88..5a14566289 100644 --- a/api/openapi/generators/core_server.cfg.yaml +++ b/api/openapi/generators/core_server.cfg.yaml @@ -6,7 +6,7 @@ generate: additional-imports: - package: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types alias: . -output: api/golang/http_rest/server/core_rest_api/api_container_server.gen.go +output: api/golang/v2/http_rest/server/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 index c997912fca..2ce62d98cc 100644 --- a/api/openapi/generators/engine_server.cfg.yaml +++ b/api/openapi/generators/engine_server.cfg.yaml @@ -6,7 +6,7 @@ generate: additional-imports: - package: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types alias: . -output: api/golang/http_rest/server/engine_rest_api/engine_server.gen.go +output: api/golang/v2/http_rest/server/engine_rest_api/engine_server.gen.go output-options: include-tags: - engine diff --git a/api/openapi/generators/go_client.cfg.yaml b/api/openapi/generators/go_client.cfg.yaml index bbf13270bc..2cbf1088ad 100644 --- a/api/openapi/generators/go_client.cfg.yaml +++ b/api/openapi/generators/go_client.cfg.yaml @@ -4,4 +4,4 @@ generate: additional-imports: - package: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types alias: . -output: api/golang/http_rest/client/rest_api_client.gen.go +output: api/golang/v2/http_rest/client/rest_api_client.gen.go diff --git a/api/openapi/generators/websocket_server.cfg.yaml b/api/openapi/generators/websocket_server.cfg.yaml index a7b855b2a9..51343f2774 100644 --- a/api/openapi/generators/websocket_server.cfg.yaml +++ b/api/openapi/generators/websocket_server.cfg.yaml @@ -6,7 +6,7 @@ generate: additional-imports: - package: github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types alias: . -output: api/golang/http_rest/server/websocket_api/websocket_server.gen.go +output: api/golang/v2/http_rest/server/websocket_api/websocket_server.gen.go output-options: include-tags: - streaming