Skip to content

Commit

Permalink
migrate rest api generators to v2 path
Browse files Browse the repository at this point in the history
  • Loading branch information
@tedim52
tedim52 committed Jan 18, 2025
1 parent 1e7d4fa commit dfa7a95
Show file tree
Hide file tree
Showing 19 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion api/golang/core/lib/binding_constructors/binding_constructors.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions api/golang/core/lib/enclaves/enclave_context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion api/golang/core/lib/enclaves/starlark_run_blocking.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/golang/core/lib/services/port_spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/golang/core/lib/services/service_config_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions api/golang/core/lib/services/service_context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/golang/core/lib/services/service_identifiers.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion api/golang/core/lib/starlark_run_config/starlark_run_config.go
View file
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions api/golang/engine/lib/kurtosis_context/enclave_identifiers.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion api/golang/engine/lib/kurtosis_context/enclave_identifiers_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion api/golang/engine/lib/kurtosis_context/enclaves.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions api/golang/engine/lib/kurtosis_context/kurtosis_context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion api/golang/engine/lib/kurtosis_context/service_logs_stream_content.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions api/golang/util/create_enclave.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/openapi/generators/api_types.cfg.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion api/openapi/generators/core_server.cfg.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion api/openapi/generators/engine_server.cfg.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion api/openapi/generators/go_client.cfg.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion api/openapi/generators/websocket_server.cfg.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit dfa7a95

Please sign in to comment.