move server definitions into the server folder

kurtosis-tech · Dec 8, 2023 · cf78ef9 · cf78ef9
1 parent 4014d70
commit cf78ef9
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/...core_rest_api/api_container_server.gen.go → ...core_rest_api/api_container_server.gen.go b/...core_rest_api/api_container_server.gen.go → ...core_rest_api/api_container_server.gen.go
diff --git a/...rest/engine_rest_api/engine_server.gen.go → ...rver/engine_rest_api/engine_server.gen.go b/...rest/engine_rest_api/engine_server.gen.go → ...rver/engine_rest_api/engine_server.gen.go
diff --git a/...est/websocket_api/websocket_server.gen.go → ...ver/websocket_api/websocket_server.gen.go b/...est/websocket_api/websocket_server.gen.go → ...ver/websocket_api/websocket_server.gen.go
diff --git 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/core_rest_api/api_container_server.gen.go
+output: api/golang/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
@@ -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/engine_rest_api/engine_server.gen.go
+output: api/golang/http_rest/server/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
@@ -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/websocket_api/websocket_server.gen.go
+output: api/golang/http_rest/server/websocket_api/websocket_server.gen.go
 output-options:
   include-tags:
     - streaming
diff --git a/engine/server/engine/main.go b/engine/server/engine/main.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
 	"github.com/kurtosis-tech/kurtosis/api/golang/engine/kurtosis_engine_rpc_api_bindings/kurtosis_engine_rpc_api_bindingsconnect"
-	enclaveApi "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/core_rest_api"
-	engineApi "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/engine_rest_api"
-	loggingApi "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/websocket_api"
+	enclaveApi "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/server/core_rest_api"
+	engineApi "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/server/engine_rest_api"
+	loggingApi "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/server/websocket_api"
 	connect_server "github.com/kurtosis-tech/kurtosis/connect-server"
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/backend_creator"
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/consts"

diff --git a/engine/server/engine/server/enclave_rest_api_handler.go b/engine/server/engine/server/enclave_rest_api_handler.go
@@ -23,7 +23,7 @@ import (
 
 	rpc_api "github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
 	api_type "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types"
-	api "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/core_rest_api"
+	api "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/server/core_rest_api"
 )
 
 const (

diff --git a/engine/server/engine/server/engine_rest_api_handler.go b/engine/server/engine/server/engine_rest_api_handler.go
@@ -14,7 +14,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	api_type "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/api_types"
-	api "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/engine_rest_api"
+	api "github.com/kurtosis-tech/kurtosis/api/golang/http_rest/server/engine_rest_api"
 )
 
 type EngineRuntime struct {