diff --git a/Dockerfile b/Dockerfile index 2f110f1349..5dfbaf00cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,8 @@ COPY go.sum go.sum RUN go mod download COPY scripts/ scripts/ -COPY cmd/ cmd/ -COPY internal/ internal/ +COPY v2/cmd/ cmd/ +COPY v2/internal/ internal/ COPY .git/ .git/ RUN ./scripts/build.sh diff --git a/docs/CONTINUOUS_CODE_DEPLOYMENT.md b/docs/CONTINUOUS_CODE_DEPLOYMENT.md index 16accbd4a8..9a5ffba17f 100644 --- a/docs/CONTINUOUS_CODE_DEPLOYMENT.md +++ b/docs/CONTINUOUS_CODE_DEPLOYMENT.md @@ -5,7 +5,7 @@ This enables us to keep Scaleway toolings up to date with the latest version of ## Generated files -Generated files and folders are located in [scaleway-cli/internal/namespaces](../internal/namespaces). +Generated files and folders are located in [scaleway-cli/internal/namespaces](../v2/internal/namespaces). They always start with the following line: ```c diff --git a/internal/namespaces/get_commands.go b/internal/namespaces/get_commands.go deleted file mode 100644 index 93bc9cdd48..0000000000 --- a/internal/namespaces/get_commands.go +++ /dev/null @@ -1,55 +0,0 @@ -package namespaces - -import ( - "github.com/scaleway/scaleway-cli/internal/core" - account "github.com/scaleway/scaleway-cli/internal/namespaces/account/v2alpha1" - applesilicon "github.com/scaleway/scaleway-cli/internal/namespaces/applesilicon/v1alpha1" - autocompleteNamespace "github.com/scaleway/scaleway-cli/internal/namespaces/autocomplete" - "github.com/scaleway/scaleway-cli/internal/namespaces/baremetal/v1" - configNamespace "github.com/scaleway/scaleway-cli/internal/namespaces/config" - domain "github.com/scaleway/scaleway-cli/internal/namespaces/domain/v2beta1" - "github.com/scaleway/scaleway-cli/internal/namespaces/feedback" - "github.com/scaleway/scaleway-cli/internal/namespaces/help" - "github.com/scaleway/scaleway-cli/internal/namespaces/info" - initNamespace "github.com/scaleway/scaleway-cli/internal/namespaces/init" - "github.com/scaleway/scaleway-cli/internal/namespaces/instance/v1" - "github.com/scaleway/scaleway-cli/internal/namespaces/iot/v1" - "github.com/scaleway/scaleway-cli/internal/namespaces/k8s/v1" - "github.com/scaleway/scaleway-cli/internal/namespaces/lb/v1" - "github.com/scaleway/scaleway-cli/internal/namespaces/marketplace/v1" - "github.com/scaleway/scaleway-cli/internal/namespaces/object/v1" - "github.com/scaleway/scaleway-cli/internal/namespaces/rdb/v1" - "github.com/scaleway/scaleway-cli/internal/namespaces/registry/v1" - versionNamespace "github.com/scaleway/scaleway-cli/internal/namespaces/version" - "github.com/scaleway/scaleway-cli/internal/namespaces/vpc/v1" -) - -// GetCommands returns a list of all commands in the CLI. -// It is used by both scw and scw-qa. -// We can not put it in `core` package as it would result in a import cycle `core` -> `namespaces/autocomplete` -> `core`. -func GetCommands() *core.Commands { - // Import all commands available in CLI from various packages. - // NB: Merge order impacts scw usage sort. - commands := core.NewCommands() - commands.Merge(instance.GetCommands()) - commands.Merge(baremetal.GetCommands()) - commands.Merge(k8s.GetCommands()) - commands.Merge(marketplace.GetCommands()) - commands.Merge(initNamespace.GetCommands()) - commands.Merge(configNamespace.GetCommands()) - commands.Merge(account.GetCommands()) - commands.Merge(autocompleteNamespace.GetCommands()) - commands.Merge(object.GetCommands()) - commands.Merge(versionNamespace.GetCommands()) - commands.Merge(registry.GetCommands()) - commands.Merge(feedback.GetCommands()) - commands.Merge(info.GetCommands()) - commands.Merge(rdb.GetCommands()) - commands.Merge(lb.GetCommands()) - commands.Merge(iot.GetCommands()) - commands.Merge(help.GetCommands()) - commands.Merge(vpc.GetCommands()) - commands.Merge(domain.GetCommands()) - commands.Merge(applesilicon.GetCommands()) - return commands -} diff --git a/cmd/scw-doc-gen/main.go b/v2/cmd/scw-doc-gen/main.go similarity index 83% rename from cmd/scw-doc-gen/main.go rename to v2/cmd/scw-doc-gen/main.go index 051a7a3086..c2893d55d7 100644 --- a/cmd/scw-doc-gen/main.go +++ b/v2/cmd/scw-doc-gen/main.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/scaleway/scaleway-cli/internal/docgen" - "github.com/scaleway/scaleway-cli/internal/namespaces" + "github.com/scaleway/scaleway-cli/v2/internal/docgen" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces" ) // This command is used to generate markdown documentation for each commands (custom or generated) of the CLI diff --git a/cmd/scw-qa/main.go b/v2/cmd/scw-qa/main.go similarity index 73% rename from cmd/scw-qa/main.go rename to v2/cmd/scw-qa/main.go index fbb7e70827..27347f1de8 100644 --- a/cmd/scw-qa/main.go +++ b/v2/cmd/scw-qa/main.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/namespaces" - "github.com/scaleway/scaleway-cli/internal/qa" - "github.com/scaleway/scaleway-cli/internal/tabwriter" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces" + "github.com/scaleway/scaleway-cli/v2/internal/qa" + "github.com/scaleway/scaleway-cli/v2/internal/tabwriter" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" ) func main() { diff --git a/cmd/scw/main.go b/v2/cmd/scw/main.go similarity index 90% rename from cmd/scw/main.go rename to v2/cmd/scw/main.go index 8ff594ec46..1fd0a18d3d 100644 --- a/cmd/scw/main.go +++ b/v2/cmd/scw/main.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/go-version" "github.com/mattn/go-colorable" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces" - "github.com/scaleway/scaleway-cli/internal/sentry" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces" + "github.com/scaleway/scaleway-cli/v2/internal/sentry" ) var ( diff --git a/cmd/scw/main_test.go b/v2/cmd/scw/main_test.go similarity index 90% rename from cmd/scw/main_test.go rename to v2/cmd/scw/main_test.go index 4f831f1248..2b27ac0484 100644 --- a/cmd/scw/main_test.go +++ b/v2/cmd/scw/main_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces" ) func Test_MainUsage(t *testing.T) { diff --git a/cmd/scw/testdata/test-all-usage-account-ssh-key-add-usage.golden b/v2/cmd/scw/testdata/test-all-usage-account-ssh-key-add-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-account-ssh-key-add-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-account-ssh-key-add-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-account-ssh-key-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-account-ssh-key-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-account-ssh-key-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-account-ssh-key-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-account-ssh-key-init-usage.golden b/v2/cmd/scw/testdata/test-all-usage-account-ssh-key-init-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-account-ssh-key-init-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-account-ssh-key-init-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-account-ssh-key-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-account-ssh-key-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-account-ssh-key-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-account-ssh-key-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-account-ssh-key-remove-usage.golden b/v2/cmd/scw/testdata/test-all-usage-account-ssh-key-remove-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-account-ssh-key-remove-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-account-ssh-key-remove-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-account-ssh-key-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-account-ssh-key-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-account-ssh-key-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-account-ssh-key-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-account-ssh-key-usage.golden b/v2/cmd/scw/testdata/test-all-usage-account-ssh-key-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-account-ssh-key-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-account-ssh-key-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-account-usage.golden b/v2/cmd/scw/testdata/test-all-usage-account-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-account-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-account-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-os-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-os-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-os-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-os-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-os-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-os-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-os-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-os-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-os-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-os-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-os-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-os-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-reboot-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-reboot-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-reboot-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-reboot-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-ssh-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-ssh-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-ssh-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-ssh-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-type-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-type-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-type-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-type-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-server-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-server-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-server-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-apple-silicon-usage.golden b/v2/cmd/scw/testdata/test-all-usage-apple-silicon-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-apple-silicon-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-apple-silicon-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-autocomplete-install-usage.golden b/v2/cmd/scw/testdata/test-all-usage-autocomplete-install-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-autocomplete-install-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-autocomplete-install-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-autocomplete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-autocomplete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-autocomplete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-autocomplete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-bmc-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-bmc-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-bmc-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-bmc-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-os-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-os-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-os-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-os-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-server-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-server-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-server-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-baremetal-usage.golden b/v2/cmd/scw/testdata/test-all-usage-baremetal-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-baremetal-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-baremetal-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-config-dump-usage.golden b/v2/cmd/scw/testdata/test-all-usage-config-dump-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-config-dump-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-config-dump-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-config-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-config-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-config-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-config-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-config-profile-activate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-config-profile-activate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-config-profile-activate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-config-profile-activate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-config-profile-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-config-profile-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-config-profile-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-config-profile-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-config-profile-usage.golden b/v2/cmd/scw/testdata/test-all-usage-config-profile-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-config-profile-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-config-profile-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-config-reset-usage.golden b/v2/cmd/scw/testdata/test-all-usage-config-reset-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-config-reset-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-config-reset-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-config-set-usage.golden b/v2/cmd/scw/testdata/test-all-usage-config-set-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-config-set-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-config-set-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-config-unset-usage.golden b/v2/cmd/scw/testdata/test-all-usage-config-unset-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-config-unset-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-config-unset-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-certificate-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-certificate-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-certificate-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-certificate-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-certificate-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-certificate-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-certificate-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-certificate-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-certificate-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-certificate-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-certificate-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-certificate-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-certificate-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-certificate-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-certificate-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-certificate-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-certificate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-certificate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-certificate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-certificate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-add-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-add-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-add-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-add-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-bulk-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-bulk-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-bulk-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-bulk-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-clear-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-clear-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-clear-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-clear-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-list-nameservers-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-list-nameservers-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-list-nameservers-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-list-nameservers-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-set-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-set-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-set-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-set-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-update-nameservers-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-update-nameservers-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-update-nameservers-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-update-nameservers-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-record-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-record-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-record-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-record-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-tsig-key-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-tsig-key-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-tsig-key-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-tsig-key-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-tsig-key-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-tsig-key-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-tsig-key-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-tsig-key-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-tsig-key-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-tsig-key-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-tsig-key-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-tsig-key-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-version-diff-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-version-diff-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-version-diff-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-version-diff-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-version-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-version-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-version-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-version-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-version-restore-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-version-restore-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-version-restore-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-version-restore-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-version-show-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-version-show-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-version-show-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-version-show-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-version-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-version-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-version-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-version-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-clone-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-clone-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-clone-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-clone-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-export-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-export-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-export-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-export-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-import-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-import-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-import-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-import-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-refresh-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-refresh-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-refresh-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-refresh-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-dns-zone-usage.golden b/v2/cmd/scw/testdata/test-all-usage-dns-zone-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-dns-zone-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-dns-zone-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-feedback-bug-usage.golden b/v2/cmd/scw/testdata/test-all-usage-feedback-bug-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-feedback-bug-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-feedback-bug-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-feedback-feature-usage.golden b/v2/cmd/scw/testdata/test-all-usage-feedback-feature-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-feedback-feature-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-feedback-feature-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-feedback-usage.golden b/v2/cmd/scw/testdata/test-all-usage-feedback-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-feedback-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-feedback-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-help-date-usage.golden b/v2/cmd/scw/testdata/test-all-usage-help-date-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-help-date-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-help-date-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-help-output-usage.golden b/v2/cmd/scw/testdata/test-all-usage-help-output-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-help-output-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-help-output-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-help-usage.golden b/v2/cmd/scw/testdata/test-all-usage-help-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-help-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-help-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-info-usage.golden b/v2/cmd/scw/testdata/test-all-usage-info-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-info-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-info-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-image-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-image-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-image-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-image-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-image-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-image-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-image-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-image-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-image-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-image-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-image-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-image-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-image-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-image-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-image-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-image-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-image-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-image-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-image-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-image-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-image-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-ip-attach-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-ip-attach-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-ip-attach-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-ip-attach-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-ip-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-ip-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-ip-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-ip-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-ip-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-ip-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-ip-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-ip-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-ip-detach-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-ip-detach-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-ip-detach-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-ip-detach-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-ip-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-ip-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-ip-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-ip-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-ip-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-ip-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-ip-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-ip-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-ip-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-ip-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-ip-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-ip-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-ip-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-ip-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-ip-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-ip-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-placement-group-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-placement-group-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-placement-group-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-placement-group-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-placement-group-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-placement-group-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-placement-group-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-placement-group-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-placement-group-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-placement-group-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-placement-group-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-placement-group-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-placement-group-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-placement-group-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-placement-group-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-placement-group-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-placement-group-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-placement-group-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-placement-group-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-placement-group-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-placement-group-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-placement-group-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-placement-group-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-placement-group-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-private-nic-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-private-nic-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-private-nic-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-private-nic-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-private-nic-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-private-nic-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-private-nic-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-private-nic-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-private-nic-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-private-nic-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-private-nic-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-private-nic-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-private-nic-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-private-nic-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-private-nic-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-private-nic-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-private-nic-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-private-nic-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-private-nic-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-private-nic-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-security-group-clear-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-security-group-clear-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-security-group-clear-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-security-group-clear-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-security-group-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-security-group-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-security-group-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-security-group-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-security-group-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-security-group-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-security-group-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-security-group-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-security-group-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-security-group-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-security-group-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-security-group-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-security-group-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-security-group-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-security-group-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-security-group-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-security-group-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-security-group-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-security-group-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-security-group-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-security-group-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-security-group-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-security-group-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-security-group-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-attach-ip-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-attach-ip-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-attach-ip-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-attach-ip-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-attach-volume-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-attach-volume-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-attach-volume-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-attach-volume-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-backup-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-backup-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-backup-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-backup-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-console-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-console-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-console-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-console-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-detach-ip-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-detach-ip-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-detach-ip-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-detach-ip-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-detach-volume-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-detach-volume-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-detach-volume-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-detach-volume-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-reboot-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-reboot-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-reboot-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-reboot-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-ssh-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-ssh-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-ssh-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-ssh-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-standby-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-standby-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-standby-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-standby-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-start-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-start-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-start-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-start-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-stop-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-stop-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-stop-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-stop-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-terminate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-terminate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-terminate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-terminate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-type-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-type-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-type-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-type-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-type-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-type-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-type-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-type-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-server-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-server-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-server-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-server-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-snapshot-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-snapshot-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-snapshot-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-snapshot-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-snapshot-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-snapshot-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-snapshot-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-snapshot-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-snapshot-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-snapshot-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-snapshot-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-snapshot-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-snapshot-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-snapshot-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-snapshot-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-snapshot-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-snapshot-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-snapshot-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-snapshot-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-snapshot-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-snapshot-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-snapshot-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-snapshot-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-snapshot-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-user-data-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-user-data-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-user-data-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-user-data-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-user-data-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-user-data-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-user-data-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-user-data-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-user-data-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-user-data-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-user-data-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-user-data-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-user-data-set-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-user-data-set-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-user-data-set-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-user-data-set-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-user-data-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-user-data-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-user-data-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-user-data-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-volume-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-volume-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-volume-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-volume-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-volume-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-volume-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-volume-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-volume-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-volume-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-volume-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-volume-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-volume-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-type-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-volume-type-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-volume-type-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-volume-type-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-type-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-volume-type-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-volume-type-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-volume-type-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-volume-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-volume-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-volume-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-instance-volume-usage.golden b/v2/cmd/scw/testdata/test-all-usage-instance-volume-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-instance-volume-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-instance-volume-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-disable-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-disable-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-disable-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-disable-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-enable-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-enable-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-enable-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-enable-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-get-certificate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-get-certificate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-get-certificate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-get-certificate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-get-metrics-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-get-metrics-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-get-metrics-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-get-metrics-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-renew-certificate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-renew-certificate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-renew-certificate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-renew-certificate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-set-certificate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-set-certificate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-set-certificate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-set-certificate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-device-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-device-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-device-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-device-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-disable-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-disable-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-disable-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-disable-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-enable-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-enable-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-enable-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-enable-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-get-ca-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-get-ca-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-get-ca-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-get-ca-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-set-ca-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-set-ca-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-set-ca-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-set-ca-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-hub-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-hub-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-hub-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-hub-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-network-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-network-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-network-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-network-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-network-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-network-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-network-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-network-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-network-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-network-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-network-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-network-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-network-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-network-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-network-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-network-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-network-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-network-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-network-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-network-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-route-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-route-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-route-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-route-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-route-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-route-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-route-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-route-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-route-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-route-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-route-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-route-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-route-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-route-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-route-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-route-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-route-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-route-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-route-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-route-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-route-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-route-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-route-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-route-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iot-usage.golden b/v2/cmd/scw/testdata/test-all-usage-iot-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-iot-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-iot-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-list-available-versions-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-list-available-versions-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-list-available-versions-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-list-available-versions-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-reset-admin-token-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-reset-admin-token-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-reset-admin-token-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-reset-admin-token-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-upgrade-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-upgrade-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-upgrade-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-upgrade-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-cluster-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-cluster-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-cluster-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-kubeconfig-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-install-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-install-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-kubeconfig-install-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-install-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-uninstall-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-uninstall-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-kubeconfig-uninstall-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-uninstall-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-kubeconfig-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-kubeconfig-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-node-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-node-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-node-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-node-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-node-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-node-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-node-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-node-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-node-reboot-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-node-reboot-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-node-reboot-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-node-reboot-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-node-replace-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-node-replace-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-node-replace-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-node-replace-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-node-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-node-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-node-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-node-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-node-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-node-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-node-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-node-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-pool-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-pool-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-pool-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-pool-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-pool-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-pool-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-pool-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-pool-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-pool-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-pool-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-pool-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-pool-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-pool-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-pool-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-pool-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-upgrade-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-pool-upgrade-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-pool-upgrade-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-pool-upgrade-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-pool-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-pool-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-pool-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-pool-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-pool-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-pool-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-pool-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-version-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-version-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-version-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-version-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-version-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-version-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-version-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-version-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-k8s-version-usage.golden b/v2/cmd/scw/testdata/test-all-usage-k8s-version-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-k8s-version-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-k8s-version-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-add-servers-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-add-servers-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-add-servers-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-add-servers-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-remove-servers-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-remove-servers-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-remove-servers-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-remove-servers-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-set-servers-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-set-servers-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-set-servers-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-set-servers-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-backend-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-backend-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-backend-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-certificate-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-certificate-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-certificate-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-certificate-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-certificate-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-certificate-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-certificate-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-certificate-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-certificate-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-certificate-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-certificate-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-certificate-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-certificate-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-certificate-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-certificate-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-certificate-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-certificate-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-certificate-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-certificate-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-certificate-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-certificate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-certificate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-certificate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-certificate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-frontend-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-frontend-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-frontend-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-frontend-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-frontend-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-frontend-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-frontend-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-frontend-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-frontend-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-frontend-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-frontend-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-frontend-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-frontend-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-frontend-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-frontend-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-frontend-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-frontend-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-frontend-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-frontend-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-frontend-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-frontend-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-frontend-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-frontend-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-frontend-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lb-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lb-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lb-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lb-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbacl-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbacl-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbacl-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbacl-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbacl-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbacl-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbacl-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbacl-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbacl-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbacl-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbacl-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbacl-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbacl-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbacl-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbacl-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbacl-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbacl-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbacl-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbacl-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbacl-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbacl-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbacl-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbacl-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbacl-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbip-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbip-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbip-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbip-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbip-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbip-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbip-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbip-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbip-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbip-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbip-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbip-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbip-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbip-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbip-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbip-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbip-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbip-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbip-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbip-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lbip-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lbip-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lbip-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lbip-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-get-stats-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-get-stats-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-get-stats-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-get-stats-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-migrate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-migrate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-migrate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-migrate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-types-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-types-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-types-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-types-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-types-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-types-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-types-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-types-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-lblb-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-lblb-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-lblb-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-lblb-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-marketplace-image-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-marketplace-image-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-marketplace-image-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-marketplace-image-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-marketplace-image-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-marketplace-image-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-marketplace-image-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-marketplace-image-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-marketplace-image-usage.golden b/v2/cmd/scw/testdata/test-all-usage-marketplace-image-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-marketplace-image-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-marketplace-image-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-marketplace-usage.golden b/v2/cmd/scw/testdata/test-all-usage-marketplace-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-marketplace-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-marketplace-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-object-config-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-object-config-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-object-config-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-object-config-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-object-config-install-usage.golden b/v2/cmd/scw/testdata/test-all-usage-object-config-install-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-object-config-install-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-object-config-install-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-object-config-usage.golden b/v2/cmd/scw/testdata/test-all-usage-object-config-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-object-config-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-object-config-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-object-usage.golden b/v2/cmd/scw/testdata/test-all-usage-object-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-object-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-object-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-acl-add-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-acl-add-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-acl-add-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-acl-add-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-acl-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-acl-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-acl-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-acl-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-acl-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-acl-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-acl-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-acl-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-acl-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-acl-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-acl-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-acl-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-download-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-download-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-download-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-download-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-export-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-export-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-export-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-export-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-restore-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-restore-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-restore-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-restore-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-backup-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-backup-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-backup-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-backup-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-database-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-database-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-database-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-database-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-database-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-database-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-database-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-database-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-database-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-database-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-database-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-database-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-database-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-database-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-database-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-database-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-engine-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-engine-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-engine-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-engine-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-engine-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-engine-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-engine-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-engine-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-clone-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-clone-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-clone-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-clone-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-connect-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-connect-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-connect-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-connect-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-get-certificate-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-get-certificate-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-get-certificate-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-get-certificate-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-upgrade-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-upgrade-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-upgrade-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-upgrade-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-wait-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-instance-wait-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-instance-wait-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-instance-wait-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-log-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-log-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-log-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-log-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-log-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-log-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-log-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-log-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-log-prepare-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-log-prepare-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-log-prepare-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-log-prepare-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-log-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-log-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-log-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-log-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-node-type-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-node-type-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-node-type-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-node-type-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-node-type-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-node-type-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-node-type-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-node-type-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-privilege-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-privilege-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-privilege-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-privilege-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-privilege-set-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-privilege-set-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-privilege-set-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-privilege-set-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-privilege-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-privilege-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-privilege-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-privilege-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-snapshot-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-snapshot-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-snapshot-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-snapshot-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-restore-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-restore-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-snapshot-restore-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-restore-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-snapshot-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-snapshot-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-snapshot-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-user-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-user-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-user-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-user-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-user-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-user-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-user-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-user-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-user-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-user-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-user-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-user-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-user-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-user-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-user-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-user-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-rdb-user-usage.golden b/v2/cmd/scw/testdata/test-all-usage-rdb-user-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-rdb-user-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-rdb-user-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-image-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-image-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-image-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-image-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-image-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-image-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-image-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-image-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-image-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-image-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-image-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-image-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-image-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-image-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-image-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-image-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-image-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-image-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-image-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-image-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-install-docker-helper-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-install-docker-helper-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-install-docker-helper-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-install-docker-helper-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-login-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-login-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-login-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-login-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-logout-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-logout-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-logout-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-logout-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-namespace-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-namespace-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-namespace-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-namespace-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-namespace-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-namespace-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-namespace-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-namespace-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-namespace-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-namespace-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-namespace-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-namespace-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-namespace-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-namespace-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-namespace-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-namespace-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-namespace-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-namespace-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-namespace-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-namespace-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-namespace-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-namespace-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-namespace-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-namespace-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-tag-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-tag-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-tag-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-tag-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-tag-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-tag-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-tag-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-tag-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-tag-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-tag-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-tag-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-tag-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-tag-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-tag-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-tag-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-tag-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-registry-usage.golden b/v2/cmd/scw/testdata/test-all-usage-registry-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-registry-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-registry-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-version-usage.golden b/v2/cmd/scw/testdata/test-all-usage-version-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-version-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-version-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-vpc-private-network-create-usage.golden b/v2/cmd/scw/testdata/test-all-usage-vpc-private-network-create-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-vpc-private-network-create-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-vpc-private-network-create-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-vpc-private-network-delete-usage.golden b/v2/cmd/scw/testdata/test-all-usage-vpc-private-network-delete-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-vpc-private-network-delete-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-vpc-private-network-delete-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-vpc-private-network-get-usage.golden b/v2/cmd/scw/testdata/test-all-usage-vpc-private-network-get-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-vpc-private-network-get-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-vpc-private-network-get-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-vpc-private-network-list-usage.golden b/v2/cmd/scw/testdata/test-all-usage-vpc-private-network-list-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-vpc-private-network-list-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-vpc-private-network-list-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-vpc-private-network-update-usage.golden b/v2/cmd/scw/testdata/test-all-usage-vpc-private-network-update-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-vpc-private-network-update-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-vpc-private-network-update-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-vpc-private-network-usage.golden b/v2/cmd/scw/testdata/test-all-usage-vpc-private-network-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-vpc-private-network-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-vpc-private-network-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-vpc-usage.golden b/v2/cmd/scw/testdata/test-all-usage-vpc-usage.golden similarity index 100% rename from cmd/scw/testdata/test-all-usage-vpc-usage.golden rename to v2/cmd/scw/testdata/test-all-usage-vpc-usage.golden diff --git a/cmd/scw/testdata/test-main-usage-usage.golden b/v2/cmd/scw/testdata/test-main-usage-usage.golden similarity index 100% rename from cmd/scw/testdata/test-main-usage-usage.golden rename to v2/cmd/scw/testdata/test-main-usage-usage.golden diff --git a/go.mod b/v2/go.mod similarity index 96% rename from go.mod rename to v2/go.mod index 71a5ecf656..fe28f46acc 100644 --- a/go.mod +++ b/v2/go.mod @@ -1,4 +1,4 @@ -module github.com/scaleway/scaleway-cli +module github.com/scaleway/scaleway-cli/v2 go 1.16 diff --git a/go.sum b/v2/go.sum similarity index 100% rename from go.sum rename to v2/go.sum diff --git a/internal/account/account.go b/v2/internal/account/account.go similarity index 100% rename from internal/account/account.go rename to v2/internal/account/account.go diff --git a/internal/account/test.go b/v2/internal/account/test.go similarity index 100% rename from internal/account/test.go rename to v2/internal/account/test.go diff --git a/internal/args/args.go b/v2/internal/args/args.go similarity index 100% rename from internal/args/args.go rename to v2/internal/args/args.go diff --git a/internal/args/args_test.go b/v2/internal/args/args_test.go similarity index 100% rename from internal/args/args_test.go rename to v2/internal/args/args_test.go diff --git a/internal/args/errors.go b/v2/internal/args/errors.go similarity index 100% rename from internal/args/errors.go rename to v2/internal/args/errors.go diff --git a/internal/args/marshal.go b/v2/internal/args/marshal.go similarity index 100% rename from internal/args/marshal.go rename to v2/internal/args/marshal.go diff --git a/internal/args/marshal_test.go b/v2/internal/args/marshal_test.go similarity index 100% rename from internal/args/marshal_test.go rename to v2/internal/args/marshal_test.go diff --git a/internal/args/unmarshal.go b/v2/internal/args/unmarshal.go similarity index 100% rename from internal/args/unmarshal.go rename to v2/internal/args/unmarshal.go diff --git a/internal/args/unmarshal_test.go b/v2/internal/args/unmarshal_test.go similarity index 100% rename from internal/args/unmarshal_test.go rename to v2/internal/args/unmarshal_test.go diff --git a/internal/core/arg_specs.go b/v2/internal/core/arg_specs.go similarity index 100% rename from internal/core/arg_specs.go rename to v2/internal/core/arg_specs.go diff --git a/internal/core/arg_specs_test.go b/v2/internal/core/arg_specs_test.go similarity index 100% rename from internal/core/arg_specs_test.go rename to v2/internal/core/arg_specs_test.go diff --git a/internal/core/autocomplete.go b/v2/internal/core/autocomplete.go similarity index 99% rename from internal/core/autocomplete.go rename to v2/internal/core/autocomplete.go index 1ee887fa00..8eb5615c06 100644 --- a/internal/core/autocomplete.go +++ b/v2/internal/core/autocomplete.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" ) // AutocompleteSuggestions is a list of words to be set to the shell as autocomplete suggestions. diff --git a/internal/core/autocomplete_test.go b/v2/internal/core/autocomplete_test.go similarity index 100% rename from internal/core/autocomplete_test.go rename to v2/internal/core/autocomplete_test.go diff --git a/internal/core/autocomplete_utils.go b/v2/internal/core/autocomplete_utils.go similarity index 100% rename from internal/core/autocomplete_utils.go rename to v2/internal/core/autocomplete_utils.go diff --git a/internal/core/bootstrap.go b/v2/internal/core/bootstrap.go similarity index 98% rename from internal/core/bootstrap.go rename to v2/internal/core/bootstrap.go index 00b4692039..4ba4b7d0a1 100644 --- a/internal/core/bootstrap.go +++ b/v2/internal/core/bootstrap.go @@ -8,9 +8,9 @@ import ( "os" "time" - "github.com/scaleway/scaleway-cli/internal/account" - "github.com/scaleway/scaleway-cli/internal/interactive" - "github.com/scaleway/scaleway-cli/internal/matomo" + "github.com/scaleway/scaleway-cli/v2/internal/account" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/matomo" "github.com/scaleway/scaleway-sdk-go/logger" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/spf13/pflag" diff --git a/internal/core/bootstrap_test.go b/v2/internal/core/bootstrap_test.go similarity index 97% rename from internal/core/bootstrap_test.go rename to v2/internal/core/bootstrap_test.go index bfe4b30680..3c72516e0d 100644 --- a/internal/core/bootstrap_test.go +++ b/v2/internal/core/bootstrap_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/args" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" ) func TestInterruptError(t *testing.T) { diff --git a/internal/core/build_info.go b/v2/internal/core/build_info.go similarity index 100% rename from internal/core/build_info.go rename to v2/internal/core/build_info.go diff --git a/internal/core/build_info_test.go b/v2/internal/core/build_info_test.go similarity index 98% rename from internal/core/build_info_test.go rename to v2/internal/core/build_info_test.go index 0de1b5699b..0cbdb0aaa0 100644 --- a/internal/core/build_info_test.go +++ b/v2/internal/core/build_info_test.go @@ -9,7 +9,7 @@ import ( "github.com/alecthomas/assert" "github.com/hashicorp/go-version" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/stretchr/testify/require" ) diff --git a/internal/core/client.go b/v2/internal/core/client.go similarity index 100% rename from internal/core/client.go rename to v2/internal/core/client.go diff --git a/internal/core/cobra_builder.go b/v2/internal/core/cobra_builder.go similarity index 100% rename from internal/core/cobra_builder.go rename to v2/internal/core/cobra_builder.go diff --git a/internal/core/cobra_builder_test.go b/v2/internal/core/cobra_builder_test.go similarity index 100% rename from internal/core/cobra_builder_test.go rename to v2/internal/core/cobra_builder_test.go diff --git a/internal/core/cobra_usage_builder.go b/v2/internal/core/cobra_usage_builder.go similarity index 97% rename from internal/core/cobra_usage_builder.go rename to v2/internal/core/cobra_usage_builder.go index 302f4ea098..7155839dc4 100644 --- a/internal/core/cobra_usage_builder.go +++ b/v2/internal/core/cobra_usage_builder.go @@ -8,7 +8,7 @@ import ( "strings" "text/tabwriter" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/scaleway/scaleway-sdk-go/logger" ) diff --git a/internal/core/cobra_usage_builder_test.go b/v2/internal/core/cobra_usage_builder_test.go similarity index 100% rename from internal/core/cobra_usage_builder_test.go rename to v2/internal/core/cobra_usage_builder_test.go diff --git a/internal/core/cobra_utils.go b/v2/internal/core/cobra_utils.go similarity index 99% rename from internal/core/cobra_utils.go rename to v2/internal/core/cobra_utils.go index ea9dd9399f..27666e140c 100644 --- a/internal/core/cobra_utils.go +++ b/v2/internal/core/cobra_utils.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" "github.com/spf13/cobra" ) diff --git a/internal/core/cobra_utils_test.go b/v2/internal/core/cobra_utils_test.go similarity index 99% rename from internal/core/cobra_utils_test.go rename to v2/internal/core/cobra_utils_test.go index 9d68a8b11a..2f583e4fb1 100644 --- a/internal/core/cobra_utils_test.go +++ b/v2/internal/core/cobra_utils_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" ) type testType struct { diff --git a/internal/core/command.go b/v2/internal/core/command.go similarity index 99% rename from internal/core/command.go rename to v2/internal/core/command.go index b524ecf588..30385516a1 100644 --- a/internal/core/command.go +++ b/v2/internal/core/command.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" ) // Command represent a CLI command. From this higher level type we create Cobra command objects. diff --git a/internal/core/command_interceptor.go b/v2/internal/core/command_interceptor.go similarity index 100% rename from internal/core/command_interceptor.go rename to v2/internal/core/command_interceptor.go diff --git a/internal/core/command_interceptor_test.go b/v2/internal/core/command_interceptor_test.go similarity index 100% rename from internal/core/command_interceptor_test.go rename to v2/internal/core/command_interceptor_test.go diff --git a/internal/core/context.go b/v2/internal/core/context.go similarity index 100% rename from internal/core/context.go rename to v2/internal/core/context.go diff --git a/internal/core/default.go b/v2/internal/core/default.go similarity index 97% rename from internal/core/default.go rename to v2/internal/core/default.go index eaf3b31920..0df2dc29f4 100644 --- a/internal/core/default.go +++ b/v2/internal/core/default.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" "github.com/scaleway/scaleway-sdk-go/namegenerator" ) diff --git a/internal/core/default_test.go b/v2/internal/core/default_test.go similarity index 97% rename from internal/core/default_test.go rename to v2/internal/core/default_test.go index 9105e89106..ff21fecd7a 100644 --- a/internal/core/default_test.go +++ b/v2/internal/core/default_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" ) func Test_ApplyDefaultValues(t *testing.T) { diff --git a/internal/core/error.go b/v2/internal/core/error.go similarity index 97% rename from internal/core/error.go rename to v2/internal/core/error.go index 12c95f76bb..41f80a90ad 100644 --- a/internal/core/error.go +++ b/v2/internal/core/error.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" ) // CliError is an all-in-one error structure that can be used in commands to return useful errors to the user. diff --git a/internal/core/errors.go b/v2/internal/core/errors.go similarity index 100% rename from internal/core/errors.go rename to v2/internal/core/errors.go diff --git a/internal/core/example.go b/v2/internal/core/example.go similarity index 94% rename from internal/core/example.go rename to v2/internal/core/example.go index 8c00bb1cf6..1173f7ed4d 100644 --- a/internal/core/example.go +++ b/v2/internal/core/example.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/scaleway/scaleway-cli/internal/args" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" ) // Example represents an example for the usage of a CLI command. diff --git a/internal/core/exec.go b/v2/internal/core/exec.go similarity index 100% rename from internal/core/exec.go rename to v2/internal/core/exec.go diff --git a/internal/core/http_retry.go b/v2/internal/core/http_retry.go similarity index 100% rename from internal/core/http_retry.go rename to v2/internal/core/http_retry.go diff --git a/internal/core/logger.go b/v2/internal/core/logger.go similarity index 100% rename from internal/core/logger.go rename to v2/internal/core/logger.go diff --git a/internal/core/printer.go b/v2/internal/core/printer.go similarity index 98% rename from internal/core/printer.go rename to v2/internal/core/printer.go index 6aa6151ec0..7ef356213e 100644 --- a/internal/core/printer.go +++ b/v2/internal/core/printer.go @@ -8,8 +8,8 @@ import ( "strings" "text/template" - "github.com/scaleway/scaleway-cli/internal/gofields" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/gofields" + "github.com/scaleway/scaleway-cli/v2/internal/human" "gopkg.in/yaml.v2" ) diff --git a/internal/core/printer_test.go b/v2/internal/core/printer_test.go similarity index 100% rename from internal/core/printer_test.go rename to v2/internal/core/printer_test.go diff --git a/internal/core/reflect.go b/v2/internal/core/reflect.go similarity index 100% rename from internal/core/reflect.go rename to v2/internal/core/reflect.go diff --git a/internal/core/result.go b/v2/internal/core/result.go similarity index 91% rename from internal/core/result.go rename to v2/internal/core/result.go index ff94377852..2c6a7e8e40 100644 --- a/internal/core/result.go +++ b/v2/internal/core/result.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/scaleway/scaleway-cli/internal/human" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/strcase" ) diff --git a/internal/core/result_test.go b/v2/internal/core/result_test.go similarity index 100% rename from internal/core/result_test.go rename to v2/internal/core/result_test.go diff --git a/internal/core/see_also.go b/v2/internal/core/see_also.go similarity index 100% rename from internal/core/see_also.go rename to v2/internal/core/see_also.go diff --git a/internal/core/testdata/test-check-version-check-more-than24h-ago.cassette.yaml b/v2/internal/core/testdata/test-check-version-check-more-than24h-ago.cassette.yaml similarity index 100% rename from internal/core/testdata/test-check-version-check-more-than24h-ago.cassette.yaml rename to v2/internal/core/testdata/test-check-version-check-more-than24h-ago.cassette.yaml diff --git a/internal/core/testdata/test-check-version-outdated-version.cassette.yaml b/v2/internal/core/testdata/test-check-version-outdated-version.cassette.yaml similarity index 100% rename from internal/core/testdata/test-check-version-outdated-version.cassette.yaml rename to v2/internal/core/testdata/test-check-version-outdated-version.cassette.yaml diff --git a/internal/core/testdata/test-check-version-up-to-date-version.cassette.yaml b/v2/internal/core/testdata/test-check-version-up-to-date-version.cassette.yaml similarity index 100% rename from internal/core/testdata/test-check-version-up-to-date-version.cassette.yaml rename to v2/internal/core/testdata/test-check-version-up-to-date-version.cassette.yaml diff --git a/internal/core/testdata/test-core-printer-human-list-with-options-unknown-column.golden b/v2/internal/core/testdata/test-core-printer-human-list-with-options-unknown-column.golden similarity index 100% rename from internal/core/testdata/test-core-printer-human-list-with-options-unknown-column.golden rename to v2/internal/core/testdata/test-core-printer-human-list-with-options-unknown-column.golden diff --git a/internal/core/testdata/test-core-printer-human-list-with-options.golden b/v2/internal/core/testdata/test-core-printer-human-list-with-options.golden similarity index 100% rename from internal/core/testdata/test-core-printer-human-list-with-options.golden rename to v2/internal/core/testdata/test-core-printer-human-list-with-options.golden diff --git a/internal/core/testdata/test-core-printer-human-list-without-option.golden b/v2/internal/core/testdata/test-core-printer-human-list-without-option.golden similarity index 100% rename from internal/core/testdata/test-core-printer-human-list-without-option.golden rename to v2/internal/core/testdata/test-core-printer-human-list-without-option.golden diff --git a/internal/core/testdata/test-core-printer-human-simple-with-options.golden b/v2/internal/core/testdata/test-core-printer-human-simple-with-options.golden similarity index 100% rename from internal/core/testdata/test-core-printer-human-simple-with-options.golden rename to v2/internal/core/testdata/test-core-printer-human-simple-with-options.golden diff --git a/internal/core/testdata/test-core-printer-human-simple-without-option.golden b/v2/internal/core/testdata/test-core-printer-human-simple-without-option.golden similarity index 100% rename from internal/core/testdata/test-core-printer-human-simple-without-option.golden rename to v2/internal/core/testdata/test-core-printer-human-simple-without-option.golden diff --git a/internal/core/testdata/test-interrupt-error-empty-error-json.golden b/v2/internal/core/testdata/test-interrupt-error-empty-error-json.golden similarity index 100% rename from internal/core/testdata/test-interrupt-error-empty-error-json.golden rename to v2/internal/core/testdata/test-interrupt-error-empty-error-json.golden diff --git a/internal/core/testdata/test-interrupt-error-empty-error.golden b/v2/internal/core/testdata/test-interrupt-error-empty-error.golden similarity index 100% rename from internal/core/testdata/test-interrupt-error-empty-error.golden rename to v2/internal/core/testdata/test-interrupt-error-empty-error.golden diff --git a/internal/core/testdata/test-interrupt-error-empty-success-json.golden b/v2/internal/core/testdata/test-interrupt-error-empty-success-json.golden similarity index 100% rename from internal/core/testdata/test-interrupt-error-empty-success-json.golden rename to v2/internal/core/testdata/test-interrupt-error-empty-success-json.golden diff --git a/internal/core/testdata/test-interrupt-error-empty-success.golden b/v2/internal/core/testdata/test-interrupt-error-empty-success.golden similarity index 100% rename from internal/core/testdata/test-interrupt-error-empty-success.golden rename to v2/internal/core/testdata/test-interrupt-error-empty-success.golden diff --git a/internal/core/testdata/test-positional-arg-full-command#01.golden b/v2/internal/core/testdata/test-positional-arg-full-command#01.golden similarity index 100% rename from internal/core/testdata/test-positional-arg-full-command#01.golden rename to v2/internal/core/testdata/test-positional-arg-full-command#01.golden diff --git a/internal/core/testdata/test-positional-arg-multi-positional-json.golden b/v2/internal/core/testdata/test-positional-arg-multi-positional-json.golden similarity index 100% rename from internal/core/testdata/test-positional-arg-multi-positional-json.golden rename to v2/internal/core/testdata/test-positional-arg-multi-positional-json.golden diff --git a/internal/core/testdata/test-positional-arg-multi-positional.golden b/v2/internal/core/testdata/test-positional-arg-multi-positional.golden similarity index 100% rename from internal/core/testdata/test-positional-arg-multi-positional.golden rename to v2/internal/core/testdata/test-positional-arg-multi-positional.golden diff --git a/internal/core/testdata/test-template-printer-nil-slice.golden b/v2/internal/core/testdata/test-template-printer-nil-slice.golden similarity index 100% rename from internal/core/testdata/test-template-printer-nil-slice.golden rename to v2/internal/core/testdata/test-template-printer-nil-slice.golden diff --git a/internal/core/testdata/test-template-printer-template-list-with-options-unknown-column.golden b/v2/internal/core/testdata/test-template-printer-template-list-with-options-unknown-column.golden similarity index 100% rename from internal/core/testdata/test-template-printer-template-list-with-options-unknown-column.golden rename to v2/internal/core/testdata/test-template-printer-template-list-with-options-unknown-column.golden diff --git a/internal/core/testdata/test-template-printer-template-list-with-options.golden b/v2/internal/core/testdata/test-template-printer-template-list-with-options.golden similarity index 100% rename from internal/core/testdata/test-template-printer-template-list-with-options.golden rename to v2/internal/core/testdata/test-template-printer-template-list-with-options.golden diff --git a/internal/core/testdata/test-template-printer-template-list-without-option.golden b/v2/internal/core/testdata/test-template-printer-template-list-without-option.golden similarity index 100% rename from internal/core/testdata/test-template-printer-template-list-without-option.golden rename to v2/internal/core/testdata/test-template-printer-template-list-without-option.golden diff --git a/internal/core/testdata/test-template-printer-template-simple-with-options.golden b/v2/internal/core/testdata/test-template-printer-template-simple-with-options.golden similarity index 100% rename from internal/core/testdata/test-template-printer-template-simple-with-options.golden rename to v2/internal/core/testdata/test-template-printer-template-simple-with-options.golden diff --git a/internal/core/testdata/test-template-printer-template-simple-without-option.golden b/v2/internal/core/testdata/test-template-printer-template-simple-without-option.golden similarity index 100% rename from internal/core/testdata/test-template-printer-template-simple-without-option.golden rename to v2/internal/core/testdata/test-template-printer-template-simple-without-option.golden diff --git a/internal/core/testdata/test-unknown-command-unknown-resource.golden b/v2/internal/core/testdata/test-unknown-command-unknown-resource.golden similarity index 100% rename from internal/core/testdata/test-unknown-command-unknown-resource.golden rename to v2/internal/core/testdata/test-unknown-command-unknown-resource.golden diff --git a/internal/core/testdata/test-unknown-command-unknown-verb.golden b/v2/internal/core/testdata/test-unknown-command-unknown-verb.golden similarity index 100% rename from internal/core/testdata/test-unknown-command-unknown-verb.golden rename to v2/internal/core/testdata/test-unknown-command-unknown-verb.golden diff --git a/internal/core/testdata/test-yaml-printer-human-list-with-options-unknown-column.golden b/v2/internal/core/testdata/test-yaml-printer-human-list-with-options-unknown-column.golden similarity index 100% rename from internal/core/testdata/test-yaml-printer-human-list-with-options-unknown-column.golden rename to v2/internal/core/testdata/test-yaml-printer-human-list-with-options-unknown-column.golden diff --git a/internal/core/testdata/test-yaml-printer-human-list-with-options.golden b/v2/internal/core/testdata/test-yaml-printer-human-list-with-options.golden similarity index 100% rename from internal/core/testdata/test-yaml-printer-human-list-with-options.golden rename to v2/internal/core/testdata/test-yaml-printer-human-list-with-options.golden diff --git a/internal/core/testdata/test-yaml-printer-human-list-without-option.golden b/v2/internal/core/testdata/test-yaml-printer-human-list-without-option.golden similarity index 100% rename from internal/core/testdata/test-yaml-printer-human-list-without-option.golden rename to v2/internal/core/testdata/test-yaml-printer-human-list-without-option.golden diff --git a/internal/core/testdata/test-yaml-printer-human-simple-with-options.golden b/v2/internal/core/testdata/test-yaml-printer-human-simple-with-options.golden similarity index 100% rename from internal/core/testdata/test-yaml-printer-human-simple-with-options.golden rename to v2/internal/core/testdata/test-yaml-printer-human-simple-with-options.golden diff --git a/internal/core/testdata/test-yaml-printer-human-simple-without-option.golden b/v2/internal/core/testdata/test-yaml-printer-human-simple-without-option.golden similarity index 100% rename from internal/core/testdata/test-yaml-printer-human-simple-without-option.golden rename to v2/internal/core/testdata/test-yaml-printer-human-simple-without-option.golden diff --git a/internal/core/testdata/test-yaml-printer-nil-slice.golden b/v2/internal/core/testdata/test-yaml-printer-nil-slice.golden similarity index 100% rename from internal/core/testdata/test-yaml-printer-nil-slice.golden rename to v2/internal/core/testdata/test-yaml-printer-nil-slice.golden diff --git a/internal/core/testing.go b/v2/internal/core/testing.go similarity index 99% rename from internal/core/testing.go rename to v2/internal/core/testing.go index 0901d0a1ec..61147b898a 100644 --- a/internal/core/testing.go +++ b/v2/internal/core/testing.go @@ -21,9 +21,9 @@ import ( "github.com/dnaeon/go-vcr/cassette" "github.com/dnaeon/go-vcr/recorder" "github.com/hashicorp/go-version" - args "github.com/scaleway/scaleway-cli/internal/args" - "github.com/scaleway/scaleway-cli/internal/human" - "github.com/scaleway/scaleway-cli/internal/interactive" + args "github.com/scaleway/scaleway-cli/v2/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/scaleway/scaleway-sdk-go/api/test/v1" "github.com/scaleway/scaleway-sdk-go/logger" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/core/validate.go b/v2/internal/core/validate.go similarity index 99% rename from internal/core/validate.go rename to v2/internal/core/validate.go index 74c2e7a29c..8c40cee7c2 100644 --- a/internal/core/validate.go +++ b/v2/internal/core/validate.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" "github.com/scaleway/scaleway-sdk-go/logger" "github.com/scaleway/scaleway-sdk-go/strcase" "github.com/scaleway/scaleway-sdk-go/validation" diff --git a/internal/core/validate_test.go b/v2/internal/core/validate_test.go similarity index 99% rename from internal/core/validate_test.go rename to v2/internal/core/validate_test.go index 31e342d87a..19e8e2bc6b 100644 --- a/internal/core/validate_test.go +++ b/v2/internal/core/validate_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" ) type Element struct { diff --git a/internal/core/view.go b/v2/internal/core/view.go similarity index 94% rename from internal/core/view.go rename to v2/internal/core/view.go index 809fded495..3187d82a3e 100644 --- a/internal/core/view.go +++ b/v2/internal/core/view.go @@ -1,7 +1,7 @@ package core import ( - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" ) // View hydrates human.MarshalOpt diff --git a/internal/docgen/docgen.go b/v2/internal/docgen/docgen.go similarity index 98% rename from internal/docgen/docgen.go rename to v2/internal/docgen/docgen.go index fa7a87748d..60abc03c73 100644 --- a/internal/docgen/docgen.go +++ b/v2/internal/docgen/docgen.go @@ -9,7 +9,7 @@ import ( "strings" "text/template" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) type tplData struct { diff --git a/internal/docgen/tpl.go b/v2/internal/docgen/tpl.go similarity index 100% rename from internal/docgen/tpl.go rename to v2/internal/docgen/tpl.go diff --git a/internal/e2e/errors_test.go b/v2/internal/e2e/errors_test.go similarity index 76% rename from internal/e2e/errors_test.go rename to v2/internal/e2e/errors_test.go index ce7db82462..4027b047e5 100644 --- a/internal/e2e/errors_test.go +++ b/v2/internal/e2e/errors_test.go @@ -3,8 +3,8 @@ package e2e import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces/test/v1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1" ) func TestStandardErrors(t *testing.T) { diff --git a/internal/e2e/human_test.go b/v2/internal/e2e/human_test.go similarity index 98% rename from internal/e2e/human_test.go rename to v2/internal/e2e/human_test.go index 97d1e45908..64cf6511c4 100644 --- a/internal/e2e/human_test.go +++ b/v2/internal/e2e/human_test.go @@ -3,8 +3,8 @@ package e2e import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces/test/v1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1" ) func TestTestCommand(t *testing.T) { diff --git a/internal/e2e/sdk_errors_test.go b/v2/internal/e2e/sdk_errors_test.go similarity index 95% rename from internal/e2e/sdk_errors_test.go rename to v2/internal/e2e/sdk_errors_test.go index c4a898eef1..a35222092e 100644 --- a/internal/e2e/sdk_errors_test.go +++ b/v2/internal/e2e/sdk_errors_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces/test/v1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1" sdktest "github.com/scaleway/scaleway-sdk-go/api/test/v1" ) diff --git a/internal/e2e/testdata/test-human-create-invalid-boolean.golden b/v2/internal/e2e/testdata/test-human-create-invalid-boolean.golden similarity index 100% rename from internal/e2e/testdata/test-human-create-invalid-boolean.golden rename to v2/internal/e2e/testdata/test-human-create-invalid-boolean.golden diff --git a/internal/e2e/testdata/test-human-create-simple.golden b/v2/internal/e2e/testdata/test-human-create-simple.golden similarity index 100% rename from internal/e2e/testdata/test-human-create-simple.golden rename to v2/internal/e2e/testdata/test-human-create-simple.golden diff --git a/internal/e2e/testdata/test-human-create-usage.golden b/v2/internal/e2e/testdata/test-human-create-usage.golden similarity index 100% rename from internal/e2e/testdata/test-human-create-usage.golden rename to v2/internal/e2e/testdata/test-human-create-usage.golden diff --git a/internal/e2e/testdata/test-human-create-with-args.golden b/v2/internal/e2e/testdata/test-human-create-with-args.golden similarity index 100% rename from internal/e2e/testdata/test-human-create-with-args.golden rename to v2/internal/e2e/testdata/test-human-create-with-args.golden diff --git a/internal/e2e/testdata/test-human-delete-simple.golden b/v2/internal/e2e/testdata/test-human-delete-simple.golden similarity index 100% rename from internal/e2e/testdata/test-human-delete-simple.golden rename to v2/internal/e2e/testdata/test-human-delete-simple.golden diff --git a/internal/e2e/testdata/test-human-delete-usage.golden b/v2/internal/e2e/testdata/test-human-delete-usage.golden similarity index 100% rename from internal/e2e/testdata/test-human-delete-usage.golden rename to v2/internal/e2e/testdata/test-human-delete-usage.golden diff --git a/internal/e2e/testdata/test-human-get-invalid-arg-name.golden b/v2/internal/e2e/testdata/test-human-get-invalid-arg-name.golden similarity index 100% rename from internal/e2e/testdata/test-human-get-invalid-arg-name.golden rename to v2/internal/e2e/testdata/test-human-get-invalid-arg-name.golden diff --git a/internal/e2e/testdata/test-human-get-pass-human-uuid-without-arg.golden b/v2/internal/e2e/testdata/test-human-get-pass-human-uuid-without-arg.golden similarity index 100% rename from internal/e2e/testdata/test-human-get-pass-human-uuid-without-arg.golden rename to v2/internal/e2e/testdata/test-human-get-pass-human-uuid-without-arg.golden diff --git a/internal/e2e/testdata/test-human-get-simple.golden b/v2/internal/e2e/testdata/test-human-get-simple.golden similarity index 100% rename from internal/e2e/testdata/test-human-get-simple.golden rename to v2/internal/e2e/testdata/test-human-get-simple.golden diff --git a/internal/e2e/testdata/test-human-get-usage.golden b/v2/internal/e2e/testdata/test-human-get-usage.golden similarity index 100% rename from internal/e2e/testdata/test-human-get-usage.golden rename to v2/internal/e2e/testdata/test-human-get-usage.golden diff --git a/internal/e2e/testdata/test-human-list-simple.golden b/v2/internal/e2e/testdata/test-human-list-simple.golden similarity index 100% rename from internal/e2e/testdata/test-human-list-simple.golden rename to v2/internal/e2e/testdata/test-human-list-simple.golden diff --git a/internal/e2e/testdata/test-human-list-usage.golden b/v2/internal/e2e/testdata/test-human-list-usage.golden similarity index 100% rename from internal/e2e/testdata/test-human-list-usage.golden rename to v2/internal/e2e/testdata/test-human-list-usage.golden diff --git a/internal/e2e/testdata/test-human-run-usage.golden b/v2/internal/e2e/testdata/test-human-run-usage.golden similarity index 100% rename from internal/e2e/testdata/test-human-run-usage.golden rename to v2/internal/e2e/testdata/test-human-run-usage.golden diff --git a/internal/e2e/testdata/test-human-update-multiple-args.golden b/v2/internal/e2e/testdata/test-human-update-multiple-args.golden similarity index 100% rename from internal/e2e/testdata/test-human-update-multiple-args.golden rename to v2/internal/e2e/testdata/test-human-update-multiple-args.golden diff --git a/internal/e2e/testdata/test-human-update-single-arg.golden b/v2/internal/e2e/testdata/test-human-update-single-arg.golden similarity index 100% rename from internal/e2e/testdata/test-human-update-single-arg.golden rename to v2/internal/e2e/testdata/test-human-update-single-arg.golden diff --git a/internal/e2e/testdata/test-human-update-usage.golden b/v2/internal/e2e/testdata/test-human-update-usage.golden similarity index 100% rename from internal/e2e/testdata/test-human-update-usage.golden rename to v2/internal/e2e/testdata/test-human-update-usage.golden diff --git a/internal/e2e/testdata/test-sdk-standard-errors-invalid-arguments.golden b/v2/internal/e2e/testdata/test-sdk-standard-errors-invalid-arguments.golden similarity index 100% rename from internal/e2e/testdata/test-sdk-standard-errors-invalid-arguments.golden rename to v2/internal/e2e/testdata/test-sdk-standard-errors-invalid-arguments.golden diff --git a/internal/e2e/testdata/test-sdk-standard-errors-out-of-stock.golden b/v2/internal/e2e/testdata/test-sdk-standard-errors-out-of-stock.golden similarity index 100% rename from internal/e2e/testdata/test-sdk-standard-errors-out-of-stock.golden rename to v2/internal/e2e/testdata/test-sdk-standard-errors-out-of-stock.golden diff --git a/internal/e2e/testdata/test-sdk-standard-errors-quotas-exceeded.golden b/v2/internal/e2e/testdata/test-sdk-standard-errors-quotas-exceeded.golden similarity index 100% rename from internal/e2e/testdata/test-sdk-standard-errors-quotas-exceeded.golden rename to v2/internal/e2e/testdata/test-sdk-standard-errors-quotas-exceeded.golden diff --git a/internal/e2e/testdata/test-sdk-standard-errors-resource-not-found.golden b/v2/internal/e2e/testdata/test-sdk-standard-errors-resource-not-found.golden similarity index 100% rename from internal/e2e/testdata/test-sdk-standard-errors-resource-not-found.golden rename to v2/internal/e2e/testdata/test-sdk-standard-errors-resource-not-found.golden diff --git a/internal/e2e/testdata/test-sdk-standard-errors-transient-state.golden b/v2/internal/e2e/testdata/test-sdk-standard-errors-transient-state.golden similarity index 100% rename from internal/e2e/testdata/test-sdk-standard-errors-transient-state.golden rename to v2/internal/e2e/testdata/test-sdk-standard-errors-transient-state.golden diff --git a/internal/e2e/testdata/test-standard-errors-unknown-command.golden b/v2/internal/e2e/testdata/test-standard-errors-unknown-command.golden similarity index 100% rename from internal/e2e/testdata/test-standard-errors-unknown-command.golden rename to v2/internal/e2e/testdata/test-standard-errors-unknown-command.golden diff --git a/internal/e2e/testdata/test-test-command-usage.golden b/v2/internal/e2e/testdata/test-test-command-usage.golden similarity index 100% rename from internal/e2e/testdata/test-test-command-usage.golden rename to v2/internal/e2e/testdata/test-test-command-usage.golden diff --git a/internal/gofields/gofields.go b/v2/internal/gofields/gofields.go similarity index 100% rename from internal/gofields/gofields.go rename to v2/internal/gofields/gofields.go diff --git a/internal/gofields/gofields_test.go b/v2/internal/gofields/gofields_test.go similarity index 100% rename from internal/gofields/gofields_test.go rename to v2/internal/gofields/gofields_test.go diff --git a/internal/gotty/client.go b/v2/internal/gotty/client.go similarity index 100% rename from internal/gotty/client.go rename to v2/internal/gotty/client.go diff --git a/internal/gotty/resize.go b/v2/internal/gotty/resize.go similarity index 100% rename from internal/gotty/resize.go rename to v2/internal/gotty/resize.go diff --git a/internal/gotty/resize_windows.go b/v2/internal/gotty/resize_windows.go similarity index 100% rename from internal/gotty/resize_windows.go rename to v2/internal/gotty/resize_windows.go diff --git a/internal/human/error.go b/v2/internal/human/error.go similarity index 100% rename from internal/human/error.go rename to v2/internal/human/error.go diff --git a/internal/human/marshal.go b/v2/internal/human/marshal.go similarity index 98% rename from internal/human/marshal.go rename to v2/internal/human/marshal.go index 44d87bd177..c9c08f8117 100644 --- a/internal/human/marshal.go +++ b/v2/internal/human/marshal.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/gofields" - "github.com/scaleway/scaleway-cli/internal/tabwriter" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/gofields" + "github.com/scaleway/scaleway-cli/v2/internal/tabwriter" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/logger" "github.com/scaleway/scaleway-sdk-go/strcase" ) diff --git a/internal/human/marshal_func.go b/v2/internal/human/marshal_func.go similarity index 99% rename from internal/human/marshal_func.go rename to v2/internal/human/marshal_func.go index 2208a75f5e..67d252e0e6 100644 --- a/internal/human/marshal_func.go +++ b/v2/internal/human/marshal_func.go @@ -11,7 +11,7 @@ import ( "github.com/dustin/go-humanize" "github.com/fatih/color" "github.com/hashicorp/go-version" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/human/marshal_test.go b/v2/internal/human/marshal_test.go similarity index 100% rename from internal/human/marshal_test.go rename to v2/internal/human/marshal_test.go diff --git a/internal/human/specs.go b/v2/internal/human/specs.go similarity index 100% rename from internal/human/specs.go rename to v2/internal/human/specs.go diff --git a/internal/human/utils.go b/v2/internal/human/utils.go similarity index 100% rename from internal/human/utils.go rename to v2/internal/human/utils.go diff --git a/internal/interactive/error.go b/v2/internal/interactive/error.go similarity index 100% rename from internal/interactive/error.go rename to v2/internal/interactive/error.go diff --git a/internal/interactive/print.go b/v2/internal/interactive/print.go similarity index 96% rename from internal/interactive/print.go rename to v2/internal/interactive/print.go index b9bf0effa0..092943593f 100644 --- a/internal/interactive/print.go +++ b/v2/internal/interactive/print.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" ) func Print(a ...interface{}) (int, error) { diff --git a/internal/interactive/print_test.go b/v2/internal/interactive/print_test.go similarity index 100% rename from internal/interactive/print_test.go rename to v2/internal/interactive/print_test.go diff --git a/internal/interactive/prompt.go b/v2/internal/interactive/prompt.go similarity index 97% rename from internal/interactive/prompt.go rename to v2/internal/interactive/prompt.go index 22e3614beb..b696760c7e 100644 --- a/internal/interactive/prompt.go +++ b/v2/internal/interactive/prompt.go @@ -7,8 +7,8 @@ import ( "github.com/chzyer/readline" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" ) type PromptPasswordConfig struct { diff --git a/internal/interactive/prompt_test.go b/v2/internal/interactive/prompt_test.go similarity index 100% rename from internal/interactive/prompt_test.go rename to v2/internal/interactive/prompt_test.go diff --git a/internal/interactive/test.go b/v2/internal/interactive/test.go similarity index 100% rename from internal/interactive/test.go rename to v2/internal/interactive/test.go diff --git a/internal/interactive/utils.go b/v2/internal/interactive/utils.go similarity index 100% rename from internal/interactive/utils.go rename to v2/internal/interactive/utils.go diff --git a/internal/matomo/matomo.go b/v2/internal/matomo/matomo.go similarity index 98% rename from internal/matomo/matomo.go rename to v2/internal/matomo/matomo.go index 923e7e130b..1a32515f55 100644 --- a/internal/matomo/matomo.go +++ b/v2/internal/matomo/matomo.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/account/v2alpha1/account_cli.go b/v2/internal/namespaces/account/v2alpha1/account_cli.go similarity index 98% rename from internal/namespaces/account/v2alpha1/account_cli.go rename to v2/internal/namespaces/account/v2alpha1/account_cli.go index f52054ba03..f4223987ea 100644 --- a/internal/namespaces/account/v2alpha1/account_cli.go +++ b/v2/internal/namespaces/account/v2alpha1/account_cli.go @@ -7,8 +7,8 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/account/v2alpha1/custom.go b/v2/internal/namespaces/account/v2alpha1/custom.go similarity index 94% rename from internal/namespaces/account/v2alpha1/custom.go rename to v2/internal/namespaces/account/v2alpha1/custom.go index cf27aeaf8d..d8c9d536a9 100644 --- a/internal/namespaces/account/v2alpha1/custom.go +++ b/v2/internal/namespaces/account/v2alpha1/custom.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" - "github.com/scaleway/scaleway-cli/internal/args" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/account/v2alpha1/custom_test.go b/v2/internal/namespaces/account/v2alpha1/custom_test.go similarity index 97% rename from internal/namespaces/account/v2alpha1/custom_test.go rename to v2/internal/namespaces/account/v2alpha1/custom_test.go index 8b5aa85dee..14ab648258 100644 --- a/internal/namespaces/account/v2alpha1/custom_test.go +++ b/v2/internal/namespaces/account/v2alpha1/custom_test.go @@ -6,7 +6,7 @@ import ( "path" "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1" ) diff --git a/internal/namespaces/account/v2alpha1/error.go b/v2/internal/namespaces/account/v2alpha1/error.go similarity index 90% rename from internal/namespaces/account/v2alpha1/error.go rename to v2/internal/namespaces/account/v2alpha1/error.go index b3a9e624c8..cc3571b2c2 100644 --- a/internal/namespaces/account/v2alpha1/error.go +++ b/v2/internal/namespaces/account/v2alpha1/error.go @@ -3,7 +3,7 @@ package account import ( "fmt" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func installationCanceled(addKeyInstructions string) *core.CliError { diff --git a/internal/namespaces/account/v2alpha1/helpers_test.go b/v2/internal/namespaces/account/v2alpha1/helpers_test.go similarity index 83% rename from internal/namespaces/account/v2alpha1/helpers_test.go rename to v2/internal/namespaces/account/v2alpha1/helpers_test.go index 77bfa4fa5f..9032798147 100644 --- a/internal/namespaces/account/v2alpha1/helpers_test.go +++ b/v2/internal/namespaces/account/v2alpha1/helpers_test.go @@ -1,7 +1,7 @@ package account import ( - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func addSSHKey(metaKey string, key string) core.BeforeFunc { diff --git a/internal/namespaces/account/v2alpha1/testdata/test-init-command-simple.cassette.yaml b/v2/internal/namespaces/account/v2alpha1/testdata/test-init-command-simple.cassette.yaml similarity index 100% rename from internal/namespaces/account/v2alpha1/testdata/test-init-command-simple.cassette.yaml rename to v2/internal/namespaces/account/v2alpha1/testdata/test-init-command-simple.cassette.yaml diff --git a/internal/namespaces/account/v2alpha1/testdata/test-init-command-simple.golden b/v2/internal/namespaces/account/v2alpha1/testdata/test-init-command-simple.golden similarity index 100% rename from internal/namespaces/account/v2alpha1/testdata/test-init-command-simple.golden rename to v2/internal/namespaces/account/v2alpha1/testdata/test-init-command-simple.golden diff --git a/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-add-command-simple.cassette.yaml b/v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-add-command-simple.cassette.yaml similarity index 100% rename from internal/namespaces/account/v2alpha1/testdata/test-ssh-key-add-command-simple.cassette.yaml rename to v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-add-command-simple.cassette.yaml diff --git a/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-add-command-simple.golden b/v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-add-command-simple.golden similarity index 100% rename from internal/namespaces/account/v2alpha1/testdata/test-ssh-key-add-command-simple.golden rename to v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-add-command-simple.golden diff --git a/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-init-command-simple.cassette.yaml b/v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-init-command-simple.cassette.yaml similarity index 100% rename from internal/namespaces/account/v2alpha1/testdata/test-ssh-key-init-command-simple.cassette.yaml rename to v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-init-command-simple.cassette.yaml diff --git a/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-remove-command-simple.cassette.yaml b/v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-remove-command-simple.cassette.yaml similarity index 100% rename from internal/namespaces/account/v2alpha1/testdata/test-ssh-key-remove-command-simple.cassette.yaml rename to v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-remove-command-simple.cassette.yaml diff --git a/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-remove-command-simple.golden b/v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-remove-command-simple.golden similarity index 100% rename from internal/namespaces/account/v2alpha1/testdata/test-ssh-key-remove-command-simple.golden rename to v2/internal/namespaces/account/v2alpha1/testdata/test-ssh-key-remove-command-simple.golden diff --git a/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go b/v2/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go similarity index 98% rename from internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go rename to v2/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go index 875733a6a8..3507564ab6 100644 --- a/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go +++ b/v2/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go @@ -7,8 +7,8 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/applesilicon/v1alpha1/custom.go b/v2/internal/namespaces/applesilicon/v1alpha1/custom.go similarity index 90% rename from internal/namespaces/applesilicon/v1alpha1/custom.go rename to v2/internal/namespaces/applesilicon/v1alpha1/custom.go index 3fb8cabcbe..b9cd68bb09 100644 --- a/internal/namespaces/applesilicon/v1alpha1/custom.go +++ b/v2/internal/namespaces/applesilicon/v1alpha1/custom.go @@ -1,8 +1,8 @@ package applesilicon import ( - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" ) diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server.go b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server.go similarity index 97% rename from internal/namespaces/applesilicon/v1alpha1/custom_server.go rename to v2/internal/namespaces/applesilicon/v1alpha1/custom_server.go index 7b88e73852..ee1d723682 100644 --- a/internal/namespaces/applesilicon/v1alpha1/custom_server.go +++ b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server.go @@ -9,8 +9,8 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go similarity index 97% rename from internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go rename to v2/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go index db0264fca2..1dec847461 100644 --- a/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go +++ b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go @@ -6,7 +6,7 @@ import ( "os/exec" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go similarity index 95% rename from internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go rename to v2/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go index 64234cadd5..4880782c49 100644 --- a/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go +++ b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go @@ -3,7 +3,7 @@ package applesilicon import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_ServerSSH(t *testing.T) { diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go similarity index 95% rename from internal/namespaces/applesilicon/v1alpha1/custom_server_types.go rename to v2/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go index 4c4e70b0e3..75a38ec22b 100644 --- a/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go +++ b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" ) diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go similarity index 85% rename from internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go rename to v2/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go index 31a3cf1f32..89fd25439f 100644 --- a/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go +++ b/v2/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go @@ -3,7 +3,7 @@ package applesilicon import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_ServerTypeList(t *testing.T) { diff --git a/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-simple.cassette.yaml b/v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-simple.cassette.yaml similarity index 100% rename from internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-simple.cassette.yaml rename to v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-simple.cassette.yaml diff --git a/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-simple.golden b/v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-simple.golden similarity index 100% rename from internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-simple.golden rename to v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-simple.golden diff --git a/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-with-exit-code.cassette.yaml b/v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-with-exit-code.cassette.yaml similarity index 100% rename from internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-with-exit-code.cassette.yaml rename to v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-with-exit-code.cassette.yaml diff --git a/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-with-exit-code.golden b/v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-with-exit-code.golden similarity index 100% rename from internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-with-exit-code.golden rename to v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-ssh-with-exit-code.golden diff --git a/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-type-list-base.cassette.yaml b/v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-type-list-base.cassette.yaml similarity index 100% rename from internal/namespaces/applesilicon/v1alpha1/testdata/test-server-type-list-base.cassette.yaml rename to v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-type-list-base.cassette.yaml diff --git a/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-type-list-base.golden b/v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-type-list-base.golden similarity index 100% rename from internal/namespaces/applesilicon/v1alpha1/testdata/test-server-type-list-base.golden rename to v2/internal/namespaces/applesilicon/v1alpha1/testdata/test-server-type-list-base.golden diff --git a/internal/namespaces/autocomplete/autocomplete.go b/v2/internal/namespaces/autocomplete/autocomplete.go similarity index 98% rename from internal/namespaces/autocomplete/autocomplete.go rename to v2/internal/namespaces/autocomplete/autocomplete.go index 1164f6dfc2..ebfc33c0c3 100644 --- a/internal/namespaces/autocomplete/autocomplete.go +++ b/v2/internal/namespaces/autocomplete/autocomplete.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" - "github.com/scaleway/scaleway-cli/internal/args" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/scaleway/scaleway-sdk-go/logger" ) diff --git a/internal/namespaces/autocomplete/autocomplete_test.go b/v2/internal/namespaces/autocomplete/autocomplete_test.go similarity index 100% rename from internal/namespaces/autocomplete/autocomplete_test.go rename to v2/internal/namespaces/autocomplete/autocomplete_test.go diff --git a/internal/namespaces/autocomplete/errors.go b/v2/internal/namespaces/autocomplete/errors.go similarity index 94% rename from internal/namespaces/autocomplete/errors.go rename to v2/internal/namespaces/autocomplete/errors.go index 7d34777675..e23c83b143 100644 --- a/internal/namespaces/autocomplete/errors.go +++ b/v2/internal/namespaces/autocomplete/errors.go @@ -3,7 +3,7 @@ package autocomplete import ( "fmt" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func unsupportedShellError(shell string) *core.CliError { diff --git a/internal/namespaces/baremetal/v1/baremetal_cli.go b/v2/internal/namespaces/baremetal/v1/baremetal_cli.go similarity index 99% rename from internal/namespaces/baremetal/v1/baremetal_cli.go rename to v2/internal/namespaces/baremetal/v1/baremetal_cli.go index bb9451b4b5..098fbd1bad 100644 --- a/internal/namespaces/baremetal/v1/baremetal_cli.go +++ b/v2/internal/namespaces/baremetal/v1/baremetal_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/baremetal/v1/baremetal_cli_test.go b/v2/internal/namespaces/baremetal/v1/baremetal_cli_test.go similarity index 92% rename from internal/namespaces/baremetal/v1/baremetal_cli_test.go rename to v2/internal/namespaces/baremetal/v1/baremetal_cli_test.go index d2ea3cafff..d4a5850a68 100644 --- a/internal/namespaces/baremetal/v1/baremetal_cli_test.go +++ b/v2/internal/namespaces/baremetal/v1/baremetal_cli_test.go @@ -3,7 +3,7 @@ package baremetal import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/baremetal/v1/custom.go b/v2/internal/namespaces/baremetal/v1/custom.go similarity index 88% rename from internal/namespaces/baremetal/v1/custom.go rename to v2/internal/namespaces/baremetal/v1/custom.go index 2327ffc0e0..ca2a955b24 100644 --- a/internal/namespaces/baremetal/v1/custom.go +++ b/v2/internal/namespaces/baremetal/v1/custom.go @@ -1,8 +1,8 @@ package baremetal import ( - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" ) diff --git a/internal/namespaces/baremetal/v1/custom_server.go b/v2/internal/namespaces/baremetal/v1/custom_server.go similarity index 98% rename from internal/namespaces/baremetal/v1/custom_server.go rename to v2/internal/namespaces/baremetal/v1/custom_server.go index c3d197ae62..807f146edb 100644 --- a/internal/namespaces/baremetal/v1/custom_server.go +++ b/v2/internal/namespaces/baremetal/v1/custom_server.go @@ -7,8 +7,8 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/scaleway-sdk-go/logger" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/namespaces/baremetal/v1/custom_server_create.go b/v2/internal/namespaces/baremetal/v1/custom_server_create.go similarity index 98% rename from internal/namespaces/baremetal/v1/custom_server_create.go rename to v2/internal/namespaces/baremetal/v1/custom_server_create.go index f6a02edf44..8ed52a3171 100644 --- a/internal/namespaces/baremetal/v1/custom_server_create.go +++ b/v2/internal/namespaces/baremetal/v1/custom_server_create.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/baremetal/v1/custom_server_create_test.go b/v2/internal/namespaces/baremetal/v1/custom_server_create_test.go similarity index 98% rename from internal/namespaces/baremetal/v1/custom_server_create_test.go rename to v2/internal/namespaces/baremetal/v1/custom_server_create_test.go index 2c4568b463..3c8ca96134 100644 --- a/internal/namespaces/baremetal/v1/custom_server_create_test.go +++ b/v2/internal/namespaces/baremetal/v1/custom_server_create_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/baremetal/v1/custom_server_install.go b/v2/internal/namespaces/baremetal/v1/custom_server_install.go similarity index 97% rename from internal/namespaces/baremetal/v1/custom_server_install.go rename to v2/internal/namespaces/baremetal/v1/custom_server_install.go index 71d106429c..409e5ec57b 100644 --- a/internal/namespaces/baremetal/v1/custom_server_install.go +++ b/v2/internal/namespaces/baremetal/v1/custom_server_install.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1" baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/namespaces/baremetal/v1/custom_server_install_test.go b/v2/internal/namespaces/baremetal/v1/custom_server_install_test.go similarity index 92% rename from internal/namespaces/baremetal/v1/custom_server_install_test.go rename to v2/internal/namespaces/baremetal/v1/custom_server_install_test.go index a4f8201773..0fcdf0580c 100644 --- a/internal/namespaces/baremetal/v1/custom_server_install_test.go +++ b/v2/internal/namespaces/baremetal/v1/custom_server_install_test.go @@ -3,8 +3,8 @@ package baremetal import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" - account "github.com/scaleway/scaleway-cli/internal/namespaces/account/v2alpha1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + account "github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v2alpha1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/baremetal/v1/custom_server_test.go b/v2/internal/namespaces/baremetal/v1/custom_server_test.go similarity index 98% rename from internal/namespaces/baremetal/v1/custom_server_test.go rename to v2/internal/namespaces/baremetal/v1/custom_server_test.go index 7171ec2cc0..77780052f3 100644 --- a/internal/namespaces/baremetal/v1/custom_server_test.go +++ b/v2/internal/namespaces/baremetal/v1/custom_server_test.go @@ -3,7 +3,7 @@ package baremetal import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/baremetal/v1/helpers_test.go b/v2/internal/namespaces/baremetal/v1/helpers_test.go similarity index 95% rename from internal/namespaces/baremetal/v1/helpers_test.go rename to v2/internal/namespaces/baremetal/v1/helpers_test.go index 64bab5c19e..24ef51df50 100644 --- a/internal/namespaces/baremetal/v1/helpers_test.go +++ b/v2/internal/namespaces/baremetal/v1/helpers_test.go @@ -1,7 +1,7 @@ package baremetal import ( - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) // createServerAndWait creates a baremetal instance diff --git a/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.golden b/v2/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.golden similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.golden rename to v2/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-default.golden diff --git a/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-tags.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-tags.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-create-server-simple-tags.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-tags.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-with-name.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-with-name.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-create-server-simple-with-name.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-create-server-simple-with-name.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.golden b/v2/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.golden similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.golden rename to v2/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.golden diff --git a/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.golden b/v2/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.golden similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.golden rename to v2/internal/namespaces/baremetal/v1/testdata/test-install-server-simple-with-id.golden diff --git a/internal/namespaces/baremetal/v1/testdata/test-list-server-list-with-tags.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-list-server-list-with-tags.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-list-server-list-with-tags.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-list-server-list-with-tags.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-list-server-list-with-tags.golden b/v2/internal/namespaces/baremetal/v1/testdata/test-list-server-list-with-tags.golden similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-list-server-list-with-tags.golden rename to v2/internal/namespaces/baremetal/v1/testdata/test-list-server-list-with-tags.golden diff --git a/internal/namespaces/baremetal/v1/testdata/test-list-server-simple.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-list-server-simple.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-list-server-simple.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-list-server-simple.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-list-server-simple.golden b/v2/internal/namespaces/baremetal/v1/testdata/test-list-server-simple.golden similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-list-server-simple.golden rename to v2/internal/namespaces/baremetal/v1/testdata/test-list-server-simple.golden diff --git a/internal/namespaces/baremetal/v1/testdata/test-reboot-server-errors-error-cannot-be-rebooted-while-not-delivered.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-reboot-server-errors-error-cannot-be-rebooted-while-not-delivered.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-reboot-server-errors-error-cannot-be-rebooted-while-not-delivered.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-reboot-server-errors-error-cannot-be-rebooted-while-not-delivered.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-reboot-server-errors-error-cannot-be-rebooted-while-not-delivered.golden b/v2/internal/namespaces/baremetal/v1/testdata/test-reboot-server-errors-error-cannot-be-rebooted-while-not-delivered.golden similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-reboot-server-errors-error-cannot-be-rebooted-while-not-delivered.golden rename to v2/internal/namespaces/baremetal/v1/testdata/test-reboot-server-errors-error-cannot-be-rebooted-while-not-delivered.golden diff --git a/internal/namespaces/baremetal/v1/testdata/test-start-server-errors-error-cannot-be-started-while-not-delivered.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-start-server-errors-error-cannot-be-started-while-not-delivered.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-start-server-errors-error-cannot-be-started-while-not-delivered.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-start-server-errors-error-cannot-be-started-while-not-delivered.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-start-server-errors-error-cannot-be-started-while-not-delivered.golden b/v2/internal/namespaces/baremetal/v1/testdata/test-start-server-errors-error-cannot-be-started-while-not-delivered.golden similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-start-server-errors-error-cannot-be-started-while-not-delivered.golden rename to v2/internal/namespaces/baremetal/v1/testdata/test-start-server-errors-error-cannot-be-started-while-not-delivered.golden diff --git a/internal/namespaces/baremetal/v1/testdata/test-stop-server-errors-error-cannot-be-stopped-while-not-delivered.cassette.yaml b/v2/internal/namespaces/baremetal/v1/testdata/test-stop-server-errors-error-cannot-be-stopped-while-not-delivered.cassette.yaml similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-stop-server-errors-error-cannot-be-stopped-while-not-delivered.cassette.yaml rename to v2/internal/namespaces/baremetal/v1/testdata/test-stop-server-errors-error-cannot-be-stopped-while-not-delivered.cassette.yaml diff --git a/internal/namespaces/baremetal/v1/testdata/test-stop-server-errors-error-cannot-be-stopped-while-not-delivered.golden b/v2/internal/namespaces/baremetal/v1/testdata/test-stop-server-errors-error-cannot-be-stopped-while-not-delivered.golden similarity index 100% rename from internal/namespaces/baremetal/v1/testdata/test-stop-server-errors-error-cannot-be-stopped-while-not-delivered.golden rename to v2/internal/namespaces/baremetal/v1/testdata/test-stop-server-errors-error-cannot-be-stopped-while-not-delivered.golden diff --git a/internal/namespaces/config/commands.go b/v2/internal/namespaces/config/commands.go similarity index 98% rename from internal/namespaces/config/commands.go rename to v2/internal/namespaces/config/commands.go index 6fdd9bbeaa..f24cfb3767 100644 --- a/internal/namespaces/config/commands.go +++ b/v2/internal/namespaces/config/commands.go @@ -9,10 +9,10 @@ import ( "github.com/scaleway/scaleway-sdk-go/validation" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/interactive" - "github.com/scaleway/scaleway-cli/internal/tabwriter" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/tabwriter" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/scaleway-sdk-go/strcase" ) diff --git a/internal/namespaces/config/commands_test.go b/v2/internal/namespaces/config/commands_test.go similarity index 99% rename from internal/namespaces/config/commands_test.go rename to v2/internal/namespaces/config/commands_test.go index e352d4dfcf..75e4a7cdc2 100644 --- a/internal/namespaces/config/commands_test.go +++ b/v2/internal/namespaces/config/commands_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/stretchr/testify/require" ) diff --git a/internal/namespaces/config/errors.go b/v2/internal/namespaces/config/errors.go similarity index 88% rename from internal/namespaces/config/errors.go rename to v2/internal/namespaces/config/errors.go index 59dcef3568..1d9551d63e 100644 --- a/internal/namespaces/config/errors.go +++ b/v2/internal/namespaces/config/errors.go @@ -7,7 +7,7 @@ package config import ( "fmt" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func invalidProfileKeyError(fieldName string) *core.CliError { diff --git a/internal/namespaces/config/testdata/test-config-delete-profile-command-simple.golden b/v2/internal/namespaces/config/testdata/test-config-delete-profile-command-simple.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-delete-profile-command-simple.golden rename to v2/internal/namespaces/config/testdata/test-config-delete-profile-command-simple.golden diff --git a/internal/namespaces/config/testdata/test-config-delete-profile-command-unknown-profile.golden b/v2/internal/namespaces/config/testdata/test-config-delete-profile-command-unknown-profile.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-delete-profile-command-unknown-profile.golden rename to v2/internal/namespaces/config/testdata/test-config-delete-profile-command-unknown-profile.golden diff --git a/internal/namespaces/config/testdata/test-config-dump-command-simple.golden b/v2/internal/namespaces/config/testdata/test-config-dump-command-simple.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-dump-command-simple.golden rename to v2/internal/namespaces/config/testdata/test-config-dump-command-simple.golden diff --git a/internal/namespaces/config/testdata/test-config-get-command-profile.golden b/v2/internal/namespaces/config/testdata/test-config-get-command-profile.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-get-command-profile.golden rename to v2/internal/namespaces/config/testdata/test-config-get-command-profile.golden diff --git a/internal/namespaces/config/testdata/test-config-get-command-simple.golden b/v2/internal/namespaces/config/testdata/test-config-get-command-simple.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-get-command-simple.golden rename to v2/internal/namespaces/config/testdata/test-config-get-command-simple.golden diff --git a/internal/namespaces/config/testdata/test-config-get-command-telemetry.golden b/v2/internal/namespaces/config/testdata/test-config-get-command-telemetry.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-get-command-telemetry.golden rename to v2/internal/namespaces/config/testdata/test-config-get-command-telemetry.golden diff --git a/internal/namespaces/config/testdata/test-config-get-command-unknown-profile.golden b/v2/internal/namespaces/config/testdata/test-config-get-command-unknown-profile.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-get-command-unknown-profile.golden rename to v2/internal/namespaces/config/testdata/test-config-get-command-unknown-profile.golden diff --git a/internal/namespaces/config/testdata/test-config-set-command-profile.golden b/v2/internal/namespaces/config/testdata/test-config-set-command-profile.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-set-command-profile.golden rename to v2/internal/namespaces/config/testdata/test-config-set-command-profile.golden diff --git a/internal/namespaces/config/testdata/test-config-set-command-simple.golden b/v2/internal/namespaces/config/testdata/test-config-set-command-simple.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-set-command-simple.golden rename to v2/internal/namespaces/config/testdata/test-config-set-command-simple.golden diff --git a/internal/namespaces/config/testdata/test-config-set-command-telemetry.golden b/v2/internal/namespaces/config/testdata/test-config-set-command-telemetry.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-set-command-telemetry.golden rename to v2/internal/namespaces/config/testdata/test-config-set-command-telemetry.golden diff --git a/internal/namespaces/config/testdata/test-config-set-command-unknown-profile.golden b/v2/internal/namespaces/config/testdata/test-config-set-command-unknown-profile.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-set-command-unknown-profile.golden rename to v2/internal/namespaces/config/testdata/test-config-set-command-unknown-profile.golden diff --git a/internal/namespaces/config/testdata/test-config-unset-command-profile.golden b/v2/internal/namespaces/config/testdata/test-config-unset-command-profile.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-unset-command-profile.golden rename to v2/internal/namespaces/config/testdata/test-config-unset-command-profile.golden diff --git a/internal/namespaces/config/testdata/test-config-unset-command-simple.golden b/v2/internal/namespaces/config/testdata/test-config-unset-command-simple.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-unset-command-simple.golden rename to v2/internal/namespaces/config/testdata/test-config-unset-command-simple.golden diff --git a/internal/namespaces/config/testdata/test-config-unset-command-telemetry.golden b/v2/internal/namespaces/config/testdata/test-config-unset-command-telemetry.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-unset-command-telemetry.golden rename to v2/internal/namespaces/config/testdata/test-config-unset-command-telemetry.golden diff --git a/internal/namespaces/config/testdata/test-config-unset-command-unknown-profile.golden b/v2/internal/namespaces/config/testdata/test-config-unset-command-unknown-profile.golden similarity index 100% rename from internal/namespaces/config/testdata/test-config-unset-command-unknown-profile.golden rename to v2/internal/namespaces/config/testdata/test-config-unset-command-unknown-profile.golden diff --git a/internal/namespaces/domain/v2beta1/custom.go b/v2/internal/namespaces/domain/v2beta1/custom.go similarity index 86% rename from internal/namespaces/domain/v2beta1/custom.go rename to v2/internal/namespaces/domain/v2beta1/custom.go index 7a114834a2..0aa02f31a5 100644 --- a/internal/namespaces/domain/v2beta1/custom.go +++ b/v2/internal/namespaces/domain/v2beta1/custom.go @@ -1,8 +1,8 @@ package domain import ( - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" ) diff --git a/internal/namespaces/domain/v2beta1/custom_certificate.go b/v2/internal/namespaces/domain/v2beta1/custom_certificate.go similarity index 92% rename from internal/namespaces/domain/v2beta1/custom_certificate.go rename to v2/internal/namespaces/domain/v2beta1/custom_certificate.go index 24676cba2d..afeec9c188 100644 --- a/internal/namespaces/domain/v2beta1/custom_certificate.go +++ b/v2/internal/namespaces/domain/v2beta1/custom_certificate.go @@ -2,7 +2,7 @@ package domain import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" ) diff --git a/internal/namespaces/domain/v2beta1/custom_record_add.go b/v2/internal/namespaces/domain/v2beta1/custom_record_add.go similarity index 98% rename from internal/namespaces/domain/v2beta1/custom_record_add.go rename to v2/internal/namespaces/domain/v2beta1/custom_record_add.go index ef7df47012..1513dbe467 100644 --- a/internal/namespaces/domain/v2beta1/custom_record_add.go +++ b/v2/internal/namespaces/domain/v2beta1/custom_record_add.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" ) diff --git a/internal/namespaces/domain/v2beta1/custom_record_delete.go b/v2/internal/namespaces/domain/v2beta1/custom_record_delete.go similarity index 97% rename from internal/namespaces/domain/v2beta1/custom_record_delete.go rename to v2/internal/namespaces/domain/v2beta1/custom_record_delete.go index 6d7afbc331..38457334e2 100644 --- a/internal/namespaces/domain/v2beta1/custom_record_delete.go +++ b/v2/internal/namespaces/domain/v2beta1/custom_record_delete.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" ) diff --git a/internal/namespaces/domain/v2beta1/custom_record_set.go b/v2/internal/namespaces/domain/v2beta1/custom_record_set.go similarity index 98% rename from internal/namespaces/domain/v2beta1/custom_record_set.go rename to v2/internal/namespaces/domain/v2beta1/custom_record_set.go index 9959195290..e7e55a29cb 100644 --- a/internal/namespaces/domain/v2beta1/custom_record_set.go +++ b/v2/internal/namespaces/domain/v2beta1/custom_record_set.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" ) diff --git a/internal/namespaces/domain/v2beta1/custom_zone.go b/v2/internal/namespaces/domain/v2beta1/custom_zone.go similarity index 91% rename from internal/namespaces/domain/v2beta1/custom_zone.go rename to v2/internal/namespaces/domain/v2beta1/custom_zone.go index af0a6aad1c..5159076f0f 100644 --- a/internal/namespaces/domain/v2beta1/custom_zone.go +++ b/v2/internal/namespaces/domain/v2beta1/custom_zone.go @@ -2,7 +2,7 @@ package domain import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" ) diff --git a/internal/namespaces/domain/v2beta1/domain_cli.go b/v2/internal/namespaces/domain/v2beta1/domain_cli.go similarity index 99% rename from internal/namespaces/domain/v2beta1/domain_cli.go rename to v2/internal/namespaces/domain/v2beta1/domain_cli.go index 5efca50310..b04f86c8c7 100644 --- a/internal/namespaces/domain/v2beta1/domain_cli.go +++ b/v2/internal/namespaces/domain/v2beta1/domain_cli.go @@ -7,8 +7,8 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/feedback/custom.go b/v2/internal/namespaces/feedback/custom.go similarity index 97% rename from internal/namespaces/feedback/custom.go rename to v2/internal/namespaces/feedback/custom.go index 82804a378d..9e4184b516 100644 --- a/internal/namespaces/feedback/custom.go +++ b/v2/internal/namespaces/feedback/custom.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func GetCommands() *core.Commands { diff --git a/internal/namespaces/feedback/custom_test.go b/v2/internal/namespaces/feedback/custom_test.go similarity index 97% rename from internal/namespaces/feedback/custom_test.go rename to v2/internal/namespaces/feedback/custom_test.go index 0c4cee76ab..594926570f 100644 --- a/internal/namespaces/feedback/custom_test.go +++ b/v2/internal/namespaces/feedback/custom_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_FeedbackBug(t *testing.T) { diff --git a/internal/namespaces/feedback/issue.go b/v2/internal/namespaces/feedback/issue.go similarity index 95% rename from internal/namespaces/feedback/issue.go rename to v2/internal/namespaces/feedback/issue.go index 81ef053cbd..9af9c06f27 100644 --- a/internal/namespaces/feedback/issue.go +++ b/v2/internal/namespaces/feedback/issue.go @@ -10,8 +10,8 @@ import ( "os/exec" "runtime" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" ) const githubURL = "https://github.com/scaleway/scaleway-cli/issues/new" diff --git a/internal/namespaces/feedback/testdata/test-feedback-bug-simple.golden b/v2/internal/namespaces/feedback/testdata/test-feedback-bug-simple.golden similarity index 100% rename from internal/namespaces/feedback/testdata/test-feedback-bug-simple.golden rename to v2/internal/namespaces/feedback/testdata/test-feedback-bug-simple.golden diff --git a/internal/namespaces/feedback/testdata/test-feedback-feature-simple.golden b/v2/internal/namespaces/feedback/testdata/test-feedback-feature-simple.golden similarity index 100% rename from internal/namespaces/feedback/testdata/test-feedback-feature-simple.golden rename to v2/internal/namespaces/feedback/testdata/test-feedback-feature-simple.golden diff --git a/v2/internal/namespaces/get_commands.go b/v2/internal/namespaces/get_commands.go new file mode 100644 index 0000000000..baa68035b5 --- /dev/null +++ b/v2/internal/namespaces/get_commands.go @@ -0,0 +1,55 @@ +package namespaces + +import ( + "github.com/scaleway/scaleway-cli/v2/internal/core" + account "github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v2alpha1" + applesilicon "github.com/scaleway/scaleway-cli/v2/internal/namespaces/applesilicon/v1alpha1" + autocompleteNamespace "github.com/scaleway/scaleway-cli/v2/internal/namespaces/autocomplete" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1" + configNamespace "github.com/scaleway/scaleway-cli/v2/internal/namespaces/config" + domain "github.com/scaleway/scaleway-cli/v2/internal/namespaces/domain/v2beta1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/feedback" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/help" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/info" + initNamespace "github.com/scaleway/scaleway-cli/v2/internal/namespaces/init" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iot/v1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/lb/v1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/marketplace/v1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/object/v1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/registry/v1" + versionNamespace "github.com/scaleway/scaleway-cli/v2/internal/namespaces/version" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v1" +) + +// GetCommands returns a list of all commands in the CLI. +// It is used by both scw and scw-qa. +// We can not put it in `core` package as it would result in a import cycle `core` -> `namespaces/autocomplete` -> `core`. +func GetCommands() *core.Commands { + // Import all commands available in CLI from various packages. + // NB: Merge order impacts scw usage sort. + commands := core.NewCommands() + commands.Merge(instance.GetCommands()) + commands.Merge(baremetal.GetCommands()) + commands.Merge(k8s.GetCommands()) + commands.Merge(marketplace.GetCommands()) + commands.Merge(initNamespace.GetCommands()) + commands.Merge(configNamespace.GetCommands()) + commands.Merge(account.GetCommands()) + commands.Merge(autocompleteNamespace.GetCommands()) + commands.Merge(object.GetCommands()) + commands.Merge(versionNamespace.GetCommands()) + commands.Merge(registry.GetCommands()) + commands.Merge(feedback.GetCommands()) + commands.Merge(info.GetCommands()) + commands.Merge(rdb.GetCommands()) + commands.Merge(lb.GetCommands()) + commands.Merge(iot.GetCommands()) + commands.Merge(help.GetCommands()) + commands.Merge(vpc.GetCommands()) + commands.Merge(domain.GetCommands()) + commands.Merge(applesilicon.GetCommands()) + return commands +} diff --git a/internal/namespaces/help/custom.go b/v2/internal/namespaces/help/custom.go similarity index 94% rename from internal/namespaces/help/custom.go rename to v2/internal/namespaces/help/custom.go index 90aa5919ea..186b26a072 100644 --- a/internal/namespaces/help/custom.go +++ b/v2/internal/namespaces/help/custom.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func GetCommands() *core.Commands { diff --git a/internal/namespaces/help/date.go b/v2/internal/namespaces/help/date.go similarity index 100% rename from internal/namespaces/help/date.go rename to v2/internal/namespaces/help/date.go diff --git a/internal/namespaces/help/output.go b/v2/internal/namespaces/help/output.go similarity index 100% rename from internal/namespaces/help/output.go rename to v2/internal/namespaces/help/output.go diff --git a/internal/namespaces/info/custom.go b/v2/internal/namespaces/info/custom.go similarity index 98% rename from internal/namespaces/info/custom.go rename to v2/internal/namespaces/info/custom.go index 25abf1ecac..b825c2af82 100644 --- a/internal/namespaces/info/custom.go +++ b/v2/internal/namespaces/info/custom.go @@ -5,8 +5,8 @@ import ( "fmt" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/info/custom_test.go b/v2/internal/namespaces/info/custom_test.go similarity index 96% rename from internal/namespaces/info/custom_test.go rename to v2/internal/namespaces/info/custom_test.go index 693eda967d..a7bbe31070 100644 --- a/internal/namespaces/info/custom_test.go +++ b/v2/internal/namespaces/info/custom_test.go @@ -3,7 +3,7 @@ package info import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_Info(t *testing.T) { diff --git a/internal/namespaces/info/testdata/test-info-show-secret.golden b/v2/internal/namespaces/info/testdata/test-info-show-secret.golden similarity index 100% rename from internal/namespaces/info/testdata/test-info-show-secret.golden rename to v2/internal/namespaces/info/testdata/test-info-show-secret.golden diff --git a/internal/namespaces/info/testdata/test-info-simple.golden b/v2/internal/namespaces/info/testdata/test-info-simple.golden similarity index 100% rename from internal/namespaces/info/testdata/test-info-simple.golden rename to v2/internal/namespaces/info/testdata/test-info-simple.golden diff --git a/internal/namespaces/init/custom_init_autocomplete_test.go b/v2/internal/namespaces/init/custom_init_autocomplete_test.go similarity index 98% rename from internal/namespaces/init/custom_init_autocomplete_test.go rename to v2/internal/namespaces/init/custom_init_autocomplete_test.go index f99d30c361..c29af2684c 100644 --- a/internal/namespaces/init/custom_init_autocomplete_test.go +++ b/v2/internal/namespaces/init/custom_init_autocomplete_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/stretchr/testify/require" ) diff --git a/internal/namespaces/init/custom_init_ssh_test.go b/v2/internal/namespaces/init/custom_init_ssh_test.go similarity index 96% rename from internal/namespaces/init/custom_init_ssh_test.go rename to v2/internal/namespaces/init/custom_init_ssh_test.go index 8707662100..6fedf205c0 100644 --- a/internal/namespaces/init/custom_init_ssh_test.go +++ b/v2/internal/namespaces/init/custom_init_ssh_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/scaleway/scaleway-cli/internal/core" - account "github.com/scaleway/scaleway-cli/internal/namespaces/account/v2alpha1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + account "github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v2alpha1" accountsdk "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/init/init.go b/v2/internal/namespaces/init/init.go similarity index 97% rename from internal/namespaces/init/init.go rename to v2/internal/namespaces/init/init.go index 52bf2ac018..2ab33ce20f 100644 --- a/internal/namespaces/init/init.go +++ b/v2/internal/namespaces/init/init.go @@ -9,12 +9,12 @@ import ( "strings" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/account" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/interactive" - accountcommands "github.com/scaleway/scaleway-cli/internal/namespaces/account/v2alpha1" - "github.com/scaleway/scaleway-cli/internal/namespaces/autocomplete" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/account" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" + accountcommands "github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v2alpha1" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/autocomplete" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/logger" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/scaleway-sdk-go/validation" diff --git a/internal/namespaces/init/init_test.go b/v2/internal/namespaces/init/init_test.go similarity index 98% rename from internal/namespaces/init/init_test.go rename to v2/internal/namespaces/init/init_test.go index f02888b77d..f2f52be2c3 100644 --- a/internal/namespaces/init/init_test.go +++ b/v2/internal/namespaces/init/init_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/stretchr/testify/require" ) diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-linux-without.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-without.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-linux-without.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-without.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-linux-without.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-without.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-linux-without.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-without.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-windows-without.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-without.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-windows-without.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-without.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-windows-without.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-without.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-windows-without.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-without.golden diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.golden b/v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.golden rename to v2/internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.golden diff --git a/internal/namespaces/init/testdata/test-init-cl-iv2-config-no-overwrite.golden b/v2/internal/namespaces/init/testdata/test-init-cl-iv2-config-no-overwrite.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-cl-iv2-config-no-overwrite.golden rename to v2/internal/namespaces/init/testdata/test-init-cl-iv2-config-no-overwrite.golden diff --git a/internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.golden b/v2/internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.golden rename to v2/internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.golden diff --git a/internal/namespaces/init/testdata/test-init-configuration-path.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-configuration-path.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-configuration-path.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-configuration-path.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-configuration-path.golden b/v2/internal/namespaces/init/testdata/test-init-configuration-path.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-configuration-path.golden rename to v2/internal/namespaces/init/testdata/test-init-configuration-path.golden diff --git a/internal/namespaces/init/testdata/test-init-profile.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-profile.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-profile.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-profile.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-profile.golden b/v2/internal/namespaces/init/testdata/test-init-profile.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-profile.golden rename to v2/internal/namespaces/init/testdata/test-init-profile.golden diff --git a/internal/namespaces/init/testdata/test-init-simple.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-simple.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-simple.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-simple.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-simple.golden b/v2/internal/namespaces/init/testdata/test-init-simple.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-simple.golden rename to v2/internal/namespaces/init/testdata/test-init-simple.golden diff --git a/internal/namespaces/init/testdata/test-init-ssh-key-registered.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-ssh-key-registered.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-ssh-key-registered.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-ssh-key-registered.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-ssh-key-registered.golden b/v2/internal/namespaces/init/testdata/test-init-ssh-key-registered.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-ssh-key-registered.golden rename to v2/internal/namespaces/init/testdata/test-init-ssh-key-registered.golden diff --git a/internal/namespaces/init/testdata/test-init-ssh-key-unregistered.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-ssh-key-unregistered.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-ssh-key-unregistered.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-ssh-key-unregistered.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-ssh-key-unregistered.golden b/v2/internal/namespaces/init/testdata/test-init-ssh-key-unregistered.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-ssh-key-unregistered.golden rename to v2/internal/namespaces/init/testdata/test-init-ssh-key-unregistered.golden diff --git a/internal/namespaces/init/testdata/test-init-ssh-no-local-key.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-ssh-no-local-key.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-ssh-no-local-key.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-ssh-no-local-key.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-ssh-no-local-key.golden b/v2/internal/namespaces/init/testdata/test-init-ssh-no-local-key.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-ssh-no-local-key.golden rename to v2/internal/namespaces/init/testdata/test-init-ssh-no-local-key.golden diff --git a/internal/namespaces/init/testdata/test-init-ssh-with-local-ed25519-key.cassette.yaml b/v2/internal/namespaces/init/testdata/test-init-ssh-with-local-ed25519-key.cassette.yaml similarity index 100% rename from internal/namespaces/init/testdata/test-init-ssh-with-local-ed25519-key.cassette.yaml rename to v2/internal/namespaces/init/testdata/test-init-ssh-with-local-ed25519-key.cassette.yaml diff --git a/internal/namespaces/init/testdata/test-init-ssh-with-local-ed25519-key.golden b/v2/internal/namespaces/init/testdata/test-init-ssh-with-local-ed25519-key.golden similarity index 100% rename from internal/namespaces/init/testdata/test-init-ssh-with-local-ed25519-key.golden rename to v2/internal/namespaces/init/testdata/test-init-ssh-with-local-ed25519-key.golden diff --git a/internal/namespaces/instance/v1/args.go b/v2/internal/namespaces/instance/v1/args.go similarity index 95% rename from internal/namespaces/instance/v1/args.go rename to v2/internal/namespaces/instance/v1/args.go index e305be4117..32aa13c4c9 100644 --- a/internal/namespaces/instance/v1/args.go +++ b/v2/internal/namespaces/instance/v1/args.go @@ -1,7 +1,7 @@ package instance import ( - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" ) diff --git a/internal/namespaces/instance/v1/args_test.go b/v2/internal/namespaces/instance/v1/args_test.go similarity index 97% rename from internal/namespaces/instance/v1/args_test.go rename to v2/internal/namespaces/instance/v1/args_test.go index cacd6aad1b..c559312c2d 100644 --- a/internal/namespaces/instance/v1/args_test.go +++ b/v2/internal/namespaces/instance/v1/args_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/args" + "github.com/scaleway/scaleway-cli/v2/internal/args" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/stretchr/testify/assert" ) diff --git a/internal/namespaces/instance/v1/custom.go b/v2/internal/namespaces/instance/v1/custom.go similarity index 98% rename from internal/namespaces/instance/v1/custom.go rename to v2/internal/namespaces/instance/v1/custom.go index 15f775e182..1577601f03 100644 --- a/internal/namespaces/instance/v1/custom.go +++ b/v2/internal/namespaces/instance/v1/custom.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" ) diff --git a/internal/namespaces/instance/v1/custom_image.go b/v2/internal/namespaces/instance/v1/custom_image.go similarity index 99% rename from internal/namespaces/instance/v1/custom_image.go rename to v2/internal/namespaces/instance/v1/custom_image.go index 6e9326be8b..77737637d9 100644 --- a/internal/namespaces/instance/v1/custom_image.go +++ b/v2/internal/namespaces/instance/v1/custom_image.go @@ -8,8 +8,8 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/custom_image_test.go b/v2/internal/namespaces/instance/v1/custom_image_test.go similarity index 98% rename from internal/namespaces/instance/v1/custom_image_test.go rename to v2/internal/namespaces/instance/v1/custom_image_test.go index 609fb04c3c..811c4f2e29 100644 --- a/internal/namespaces/instance/v1/custom_image_test.go +++ b/v2/internal/namespaces/instance/v1/custom_image_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/custom_ip.go b/v2/internal/namespaces/instance/v1/custom_ip.go similarity index 98% rename from internal/namespaces/instance/v1/custom_ip.go rename to v2/internal/namespaces/instance/v1/custom_ip.go index 5860a19639..560934e29d 100644 --- a/internal/namespaces/instance/v1/custom_ip.go +++ b/v2/internal/namespaces/instance/v1/custom_ip.go @@ -6,7 +6,7 @@ import ( "net" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/logger" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/namespaces/instance/v1/custom_ip_test.go b/v2/internal/namespaces/instance/v1/custom_ip_test.go similarity index 97% rename from internal/namespaces/instance/v1/custom_ip_test.go rename to v2/internal/namespaces/instance/v1/custom_ip_test.go index 7254bf75b4..50d9fc5997 100644 --- a/internal/namespaces/instance/v1/custom_ip_test.go +++ b/v2/internal/namespaces/instance/v1/custom_ip_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_IPAttach(t *testing.T) { diff --git a/internal/namespaces/instance/v1/custom_placement_group.go b/v2/internal/namespaces/instance/v1/custom_placement_group.go similarity index 98% rename from internal/namespaces/instance/v1/custom_placement_group.go rename to v2/internal/namespaces/instance/v1/custom_placement_group.go index 81705d6f8a..53dca8cf5f 100644 --- a/internal/namespaces/instance/v1/custom_placement_group.go +++ b/v2/internal/namespaces/instance/v1/custom_placement_group.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" ) diff --git a/internal/namespaces/instance/v1/custom_placement_group_test.go b/v2/internal/namespaces/instance/v1/custom_placement_group_test.go similarity index 93% rename from internal/namespaces/instance/v1/custom_placement_group_test.go rename to v2/internal/namespaces/instance/v1/custom_placement_group_test.go index 9141e6b62f..1f4912c241 100644 --- a/internal/namespaces/instance/v1/custom_placement_group_test.go +++ b/v2/internal/namespaces/instance/v1/custom_placement_group_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_GetPlacementGroup(t *testing.T) { diff --git a/internal/namespaces/instance/v1/custom_privatenics.go b/v2/internal/namespaces/instance/v1/custom_privatenics.go similarity index 89% rename from internal/namespaces/instance/v1/custom_privatenics.go rename to v2/internal/namespaces/instance/v1/custom_privatenics.go index 65c55cf6e0..921741f3ab 100644 --- a/internal/namespaces/instance/v1/custom_privatenics.go +++ b/v2/internal/namespaces/instance/v1/custom_privatenics.go @@ -4,8 +4,8 @@ import ( "context" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" ) diff --git a/internal/namespaces/instance/v1/custom_privatenics_test.go b/v2/internal/namespaces/instance/v1/custom_privatenics_test.go similarity index 87% rename from internal/namespaces/instance/v1/custom_privatenics_test.go rename to v2/internal/namespaces/instance/v1/custom_privatenics_test.go index 68bb7815f8..c0b16b06dc 100644 --- a/internal/namespaces/instance/v1/custom_privatenics_test.go +++ b/v2/internal/namespaces/instance/v1/custom_privatenics_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_ListNICs(t *testing.T) { diff --git a/internal/namespaces/instance/v1/custom_security_group.go b/v2/internal/namespaces/instance/v1/custom_security_group.go similarity index 98% rename from internal/namespaces/instance/v1/custom_security_group.go rename to v2/internal/namespaces/instance/v1/custom_security_group.go index 1de43ee338..4c0285bdea 100644 --- a/internal/namespaces/instance/v1/custom_security_group.go +++ b/v2/internal/namespaces/instance/v1/custom_security_group.go @@ -9,10 +9,10 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" - "github.com/scaleway/scaleway-cli/internal/interactive" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/logger" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/namespaces/instance/v1/custom_server.go b/v2/internal/namespaces/instance/v1/custom_server.go similarity index 99% rename from internal/namespaces/instance/v1/custom_server.go rename to v2/internal/namespaces/instance/v1/custom_server.go index 1b93a6ac06..01414518c8 100644 --- a/internal/namespaces/instance/v1/custom_server.go +++ b/v2/internal/namespaces/instance/v1/custom_server.go @@ -12,9 +12,9 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/api/vpc/v1" "github.com/scaleway/scaleway-sdk-go/logger" diff --git a/internal/namespaces/instance/v1/custom_server_console.go b/v2/internal/namespaces/instance/v1/custom_server_console.go similarity index 88% rename from internal/namespaces/instance/v1/custom_server_console.go rename to v2/internal/namespaces/instance/v1/custom_server_console.go index 79e422f24f..b243c96cdc 100644 --- a/internal/namespaces/instance/v1/custom_server_console.go +++ b/v2/internal/namespaces/instance/v1/custom_server_console.go @@ -6,10 +6,10 @@ import ( "reflect" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/gotty" - "github.com/scaleway/scaleway-cli/internal/interactive" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/gotty" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/custom_server_create.go b/v2/internal/namespaces/instance/v1/custom_server_create.go similarity index 99% rename from internal/namespaces/instance/v1/custom_server_create.go rename to v2/internal/namespaces/instance/v1/custom_server_create.go index dd2fcbe3f1..8b1e221267 100644 --- a/internal/namespaces/instance/v1/custom_server_create.go +++ b/v2/internal/namespaces/instance/v1/custom_server_create.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/dustin/go-humanize" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/api/marketplace/v1" "github.com/scaleway/scaleway-sdk-go/logger" diff --git a/internal/namespaces/instance/v1/custom_server_create_test.go b/v2/internal/namespaces/instance/v1/custom_server_create_test.go similarity index 99% rename from internal/namespaces/instance/v1/custom_server_create_test.go rename to v2/internal/namespaces/instance/v1/custom_server_create_test.go index 287fff03e0..2ca2f0c051 100644 --- a/internal/namespaces/instance/v1/custom_server_create_test.go +++ b/v2/internal/namespaces/instance/v1/custom_server_create_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/custom_server_ssh.go b/v2/internal/namespaces/instance/v1/custom_server_ssh.go similarity index 97% rename from internal/namespaces/instance/v1/custom_server_ssh.go rename to v2/internal/namespaces/instance/v1/custom_server_ssh.go index 928816e2cc..58188826cf 100644 --- a/internal/namespaces/instance/v1/custom_server_ssh.go +++ b/v2/internal/namespaces/instance/v1/custom_server_ssh.go @@ -6,7 +6,7 @@ import ( "os/exec" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/custom_server_ssh_test.go b/v2/internal/namespaces/instance/v1/custom_server_ssh_test.go similarity index 96% rename from internal/namespaces/instance/v1/custom_server_ssh_test.go rename to v2/internal/namespaces/instance/v1/custom_server_ssh_test.go index 6daec19925..8e6199f3e9 100644 --- a/internal/namespaces/instance/v1/custom_server_ssh_test.go +++ b/v2/internal/namespaces/instance/v1/custom_server_ssh_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_ServerSSH(t *testing.T) { diff --git a/internal/namespaces/instance/v1/custom_server_test.go b/v2/internal/namespaces/instance/v1/custom_server_test.go similarity index 99% rename from internal/namespaces/instance/v1/custom_server_test.go rename to v2/internal/namespaces/instance/v1/custom_server_test.go index ccbc7d3ee7..b081d6983e 100644 --- a/internal/namespaces/instance/v1/custom_server_test.go +++ b/v2/internal/namespaces/instance/v1/custom_server_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/stretchr/testify/require" diff --git a/internal/namespaces/instance/v1/custom_server_type.go b/v2/internal/namespaces/instance/v1/custom_server_type.go similarity index 97% rename from internal/namespaces/instance/v1/custom_server_type.go rename to v2/internal/namespaces/instance/v1/custom_server_type.go index 977db5ed16..c26bc422ce 100644 --- a/internal/namespaces/instance/v1/custom_server_type.go +++ b/v2/internal/namespaces/instance/v1/custom_server_type.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/custom_server_type_test.go b/v2/internal/namespaces/instance/v1/custom_server_type_test.go similarity index 85% rename from internal/namespaces/instance/v1/custom_server_type_test.go rename to v2/internal/namespaces/instance/v1/custom_server_type_test.go index 5a036c61d5..cb2b7dc5c4 100644 --- a/internal/namespaces/instance/v1/custom_server_type_test.go +++ b/v2/internal/namespaces/instance/v1/custom_server_type_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_ServerTypeList(t *testing.T) { diff --git a/internal/namespaces/instance/v1/custom_snapshot.go b/v2/internal/namespaces/instance/v1/custom_snapshot.go similarity index 98% rename from internal/namespaces/instance/v1/custom_snapshot.go rename to v2/internal/namespaces/instance/v1/custom_snapshot.go index d04bcb828d..78861f61a5 100644 --- a/internal/namespaces/instance/v1/custom_snapshot.go +++ b/v2/internal/namespaces/instance/v1/custom_snapshot.go @@ -5,7 +5,7 @@ import ( "reflect" "time" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/custom_user_data.go b/v2/internal/namespaces/instance/v1/custom_user_data.go similarity index 97% rename from internal/namespaces/instance/v1/custom_user_data.go rename to v2/internal/namespaces/instance/v1/custom_user_data.go index 1546a5f422..3d8868fc3f 100644 --- a/internal/namespaces/instance/v1/custom_user_data.go +++ b/v2/internal/namespaces/instance/v1/custom_user_data.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/custom_user_data_test.go b/v2/internal/namespaces/instance/v1/custom_user_data_test.go similarity index 96% rename from internal/namespaces/instance/v1/custom_user_data_test.go rename to v2/internal/namespaces/instance/v1/custom_user_data_test.go index 2d9f3e2002..475feeaeb2 100644 --- a/internal/namespaces/instance/v1/custom_user_data_test.go +++ b/v2/internal/namespaces/instance/v1/custom_user_data_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_UserDataGet(t *testing.T) { diff --git a/internal/namespaces/instance/v1/custom_volume.go b/v2/internal/namespaces/instance/v1/custom_volume.go similarity index 96% rename from internal/namespaces/instance/v1/custom_volume.go rename to v2/internal/namespaces/instance/v1/custom_volume.go index 1528a32d89..650fa884f0 100644 --- a/internal/namespaces/instance/v1/custom_volume.go +++ b/v2/internal/namespaces/instance/v1/custom_volume.go @@ -6,8 +6,8 @@ import ( "reflect" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" ) diff --git a/internal/namespaces/instance/v1/custom_volume_type.go b/v2/internal/namespaces/instance/v1/custom_volume_type.go similarity index 95% rename from internal/namespaces/instance/v1/custom_volume_type.go rename to v2/internal/namespaces/instance/v1/custom_volume_type.go index 1c9c52a248..4e4444e891 100644 --- a/internal/namespaces/instance/v1/custom_volume_type.go +++ b/v2/internal/namespaces/instance/v1/custom_volume_type.go @@ -4,7 +4,7 @@ import ( "context" "sort" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" ) diff --git a/internal/namespaces/instance/v1/custom_volume_type_test.go b/v2/internal/namespaces/instance/v1/custom_volume_type_test.go similarity index 82% rename from internal/namespaces/instance/v1/custom_volume_type_test.go rename to v2/internal/namespaces/instance/v1/custom_volume_type_test.go index b4b2dd05b9..1c9dde234c 100644 --- a/internal/namespaces/instance/v1/custom_volume_type_test.go +++ b/v2/internal/namespaces/instance/v1/custom_volume_type_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_VolumeTypeList(t *testing.T) { diff --git a/internal/namespaces/instance/v1/helpers_test.go b/v2/internal/namespaces/instance/v1/helpers_test.go similarity index 98% rename from internal/namespaces/instance/v1/helpers_test.go rename to v2/internal/namespaces/instance/v1/helpers_test.go index b8b0a63e4e..55a48db7e7 100644 --- a/internal/namespaces/instance/v1/helpers_test.go +++ b/v2/internal/namespaces/instance/v1/helpers_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" ) diff --git a/internal/namespaces/instance/v1/instance_cli.go b/v2/internal/namespaces/instance/v1/instance_cli.go similarity index 99% rename from internal/namespaces/instance/v1/instance_cli.go rename to v2/internal/namespaces/instance/v1/instance_cli.go index 4022f1e7c0..35b12e2dae 100644 --- a/internal/namespaces/instance/v1/instance_cli.go +++ b/v2/internal/namespaces/instance/v1/instance_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/instance/v1/instance_cli_test.go b/v2/internal/namespaces/instance/v1/instance_cli_test.go similarity index 99% rename from internal/namespaces/instance/v1/instance_cli_test.go rename to v2/internal/namespaces/instance/v1/instance_cli_test.go index ee73f08165..fdf97f810d 100644 --- a/internal/namespaces/instance/v1/instance_cli_test.go +++ b/v2/internal/namespaces/instance/v1/instance_cli_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/namespaces/instance/v1/ip_test.go b/v2/internal/namespaces/instance/v1/ip_test.go similarity index 96% rename from internal/namespaces/instance/v1/ip_test.go rename to v2/internal/namespaces/instance/v1/ip_test.go index d2316424d9..f75f5459b3 100644 --- a/internal/namespaces/instance/v1/ip_test.go +++ b/v2/internal/namespaces/instance/v1/ip_test.go @@ -3,7 +3,7 @@ package instance import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_IpCreate(t *testing.T) { diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-already-attached-additional-volume-id.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-disallow-existing-root-volume-id.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-forbidden-ip.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-image-size-is-incompatible-with-instance-type.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-image-size-is-incompatible-with-instance-type.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-image-size-is-incompatible-with-instance-type.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-image-size-is-incompatible-with-instance-type.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-image-size-is-incompatible-with-instance-type.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-image-size-is-incompatible-with-instance-type.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-image-size-is-incompatible-with-instance-type.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-image-size-is-incompatible-with-instance-type.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-uuid.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-ip.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-format.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-id.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-size.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-type.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-type.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-type.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-type.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-type.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-type.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-type.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-root-volume-type.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high1.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high2.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-high3.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low1.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-invalid-total-local-volumes-size-too-low2.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-errors-error-not-found-ipid.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ipid.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ipid.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ipid.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-existing-ipid.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-ips-explicit-new-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-explicit-new-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-ips-explicit-new-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-explicit-new-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-ips-run-with-dynamic-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-run-with-dynamic-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-ips-run-with-dynamic-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-run-with-dynamic-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-ips-with-ipv6.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-with-ipv6.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-ips-with-ipv6.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-ips-with-ipv6.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-simple-default.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-gp1xs.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-gp1xs.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-simple-gp1xs.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-gp1xs.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-image-uuid.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-image-uuid.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-simple-image-uuid.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-image-uuid.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-tags.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-tags.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-simple-tags.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-tags.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-bootscript.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-bootscript.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-simple-with-bootscript.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-bootscript.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-name.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-name.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-simple-with-name.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-name.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-start.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-start.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-simple-with-start.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-simple-with-start.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-additional-block-volumes.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-additional-block-volumes.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-additional-block-volumes.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-additional-block-volumes.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-double-local-volumes.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-double-local-volumes.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-double-local-volumes.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-double-local-volumes.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-single-local-volume.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-single-local-volume.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-single-local-volume.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-server-volumes-valid-single-local-volume.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-create-volume-bad-size-unit.golden b/v2/internal/namespaces/instance/v1/testdata/test-create-volume-bad-size-unit.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-volume-bad-size-unit.golden rename to v2/internal/namespaces/instance/v1/testdata/test-create-volume-bad-size-unit.golden diff --git a/internal/namespaces/instance/v1/testdata/test-create-volume-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-create-volume-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-create-volume-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-create-volume-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-get-placement-group-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-get-placement-group-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-get-placement-group-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-get-placement-group-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-get-placement-group-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-get-placement-group-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-get-placement-group-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-get-placement-group-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-get-server-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-get-server-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-get-server-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-get-server-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-get-server-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-image-create-create-simple-image.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-image-create-create-simple-image.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-create-create-simple-image.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-image-create-create-simple-image.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-image-create-create-simple-image.golden b/v2/internal/namespaces/instance/v1/testdata/test-image-create-create-simple-image.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-create-create-simple-image.golden rename to v2/internal/namespaces/instance/v1/testdata/test-image-create-create-simple-image.golden diff --git a/internal/namespaces/instance/v1/testdata/test-image-create-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-image-create-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-create-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-image-create-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-image-create-use-additional-snapshots.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-image-create-use-additional-snapshots.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-create-use-additional-snapshots.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-image-create-use-additional-snapshots.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-image-create-use-additional-snapshots.golden b/v2/internal/namespaces/instance/v1/testdata/test-image-create-use-additional-snapshots.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-create-use-additional-snapshots.golden rename to v2/internal/namespaces/instance/v1/testdata/test-image-create-use-additional-snapshots.golden diff --git a/internal/namespaces/instance/v1/testdata/test-image-delete-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-image-delete-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-delete-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-image-delete-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-image-delete-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-image-delete-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-delete-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-image-delete-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-image-list-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-image-list-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-list-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-image-list-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-image-list-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-image-list-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-image-list-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-image-list-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-attach-with-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-attach-with-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-attach-with-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-attach-with-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-attach-with-ip.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-attach-with-ip.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-attach-with-ip.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-attach-with-ip.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-attach-with-uuid.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-attach-with-uuid.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-attach-with-uuid.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-attach-with-uuid.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-attach-with-uuid.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-attach-with-uuid.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-attach-with-uuid.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-attach-with-uuid.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-create-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-create-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-create-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-create-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-create-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-create-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-create-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-create-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-delete-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-delete-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-delete-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-delete-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-delete-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-delete-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-delete-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-delete-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-detach-with-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-detach-with-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-detach-with-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-detach-with-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-detach-with-ip.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-detach-with-ip.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-detach-with-ip.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-detach-with-ip.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-detach-with-uuid.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-detach-with-uuid.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-detach-with-uuid.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-detach-with-uuid.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-detach-with-uuid.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-detach-with-uuid.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-detach-with-uuid.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-detach-with-uuid.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-get-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-get-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-get-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-get-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-get-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-get-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-get-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-get-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-list-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-list-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-list-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-list-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-list-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-list-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-list-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-list-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-ip-update-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-ip-update-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-update-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-ip-update-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-ip-update-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-ip-update-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-ip-update-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-ip-update-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-list-ni-cs-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-list-ni-cs-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-list-ni-cs-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-list-ni-cs-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-list-ni-cs-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-list-ni-cs-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-list-ni-cs-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-list-ni-cs-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-list-server-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-list-server-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-list-server-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-list-server-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-list-server-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-list-server-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-list-server-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-list-server-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-backup-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-backup-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-backup-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-backup-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-backup-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-backup-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-backup-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-backup-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-delete-only-block-volumes.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-delete-only-block-volumes.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-delete-only-block-volumes.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-delete-only-block-volumes.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-delete-only-block-volumes.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-delete-only-block-volumes.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-delete-only-block-volumes.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-delete-only-block-volumes.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-delete-only-local-volumes.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-delete-only-local-volumes.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-delete-only-local-volumes.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-delete-only-local-volumes.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-delete-only-local-volumes.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-delete-only-local-volumes.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-delete-only-local-volumes.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-delete-only-local-volumes.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-delete-with-all-volumes.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-delete-with-all-volumes.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-delete-with-all-volumes.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-delete-with-all-volumes.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-delete-with-all-volumes.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-delete-with-all-volumes.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-delete-with-all-volumes.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-delete-with-all-volumes.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-ssh-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-ssh-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-ssh-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-ssh-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-ssh-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-ssh-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-ssh-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-ssh-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-ssh-stopped-server.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-ssh-stopped-server.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-ssh-stopped-server.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-ssh-stopped-server.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-ssh-stopped-server.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-ssh-stopped-server.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-ssh-stopped-server.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-ssh-stopped-server.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-ssh-with-exit-code.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-ssh-with-exit-code.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-ssh-with-exit-code.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-ssh-with-exit-code.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-ssh-with-exit-code.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-ssh-with-exit-code.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-ssh-with-exit-code.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-ssh-with-exit-code.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-terminate-with-block.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-terminate-with-block.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-terminate-with-block.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-terminate-with-block.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-terminate-with-block.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-terminate-with-block.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-terminate-with-block.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-terminate-with-block.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-terminate-with-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-terminate-with-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-terminate-with-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-terminate-with-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-terminate-with-ip.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-terminate-with-ip.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-terminate-with-ip.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-terminate-with-ip.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-terminate-without-block.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-terminate-without-block.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-terminate-without-block.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-terminate-without-block.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-terminate-without-block.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-terminate-without-block.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-terminate-without-block.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-terminate-without-block.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-terminate-without-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-terminate-without-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-terminate-without-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-terminate-without-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-terminate-without-ip.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-terminate-without-ip.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-terminate-without-ip.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-terminate-without-ip.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-custom-try-to-remove-ip-from-server-without-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-try-to-remove-ip-from-server-without-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-custom-try-to-remove-ip-from-server-without-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-try-to-remove-ip-from-server-without-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-ip-from-server-with-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-ip-from-server-with-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-ip-from-server-with-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-ip-from-server-with-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-ip-from-server-without-ip.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-ip-from-server-without-ip.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-ip-from-server-without-ip.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-ip-from-server-without-ip.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-placement-group-id-from-server-with-placement-group-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-placement-group-id-from-server-with-placement-group-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-placement-group-id-from-server-with-placement-group-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-placement-group-id-from-server-with-placement-group-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-security-group-id-from-server-with-security-group-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-security-group-id-from-server-with-security-group-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-security-group-id-from-server-with-security-group-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-update-server-security-group-id-from-server-with-security-group-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-custom-volumes-detach-all-volumes.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-volumes-detach-all-volumes.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-custom-volumes-detach-all-volumes.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-volumes-detach-all-volumes.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-custom-volumes-valid-simple-block-volume.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-volumes-valid-simple-block-volume.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-custom-volumes-valid-simple-block-volume.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-custom-volumes-valid-simple-block-volume.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=current-pg-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=current-pg-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=current-pg-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=current-pg-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=new-pg-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=new-pg-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=new-pg-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=new-pg-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=none.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=none.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=none.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-initial-placement-group&-placement-group-id=none.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=existing-pg-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=existing-pg-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=existing-pg-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=existing-pg-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=invalid-pg-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=invalid-pg-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=invalid-pg-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=invalid-pg-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=invalid-pg-id.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=invalid-pg-id.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=invalid-pg-id.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=invalid-pg-id.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=none.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=none.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=none.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=none.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=valid,-but-non-existing-pg-id.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=valid,-but-non-existing-pg-id.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=valid,-but-non-existing-pg-id.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=valid,-but-non-existing-pg-id.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=valid,-but-non-existing-pg-id.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=valid,-but-non-existing-pg-id.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=valid,-but-non-existing-pg-id.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-no-initial-placement-group&-placement-group-id=valid,-but-non-existing-pg-id.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-update-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-update-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-update-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-invalid-volume-uuid.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-invalid-volume-uuid.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-invalid-volume-uuid.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-invalid-volume-uuid.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-invalid-volume-uuid.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-invalid-volume-uuid.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-invalid-volume-uuid.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-invalid-volume-uuid.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-simple-block-volume.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-simple-block-volume.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-simple-block-volume.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-simple-block-volume.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-simple-local-volume.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-simple-local-volume.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-simple-local-volume.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-attach-simple-local-volume.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.golden b/v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.golden rename to v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-invalid-volume-uuid.golden diff --git a/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-simple-block-volume.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-simple-block-volume.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-simple-block-volume.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-server-volume-update-detach-simple-block-volume.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-snapshot-create-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-snapshot-create-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-snapshot-create-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-snapshot-create-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-snapshot-create-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-snapshot-create-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-snapshot-create-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-snapshot-create-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-existing-key.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-existing-key.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-existing-key.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-existing-key.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-existing-key.golden b/v2/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-existing-key.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-existing-key.golden rename to v2/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-existing-key.golden diff --git a/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-nonexistent-key.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-nonexistent-key.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-nonexistent-key.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-nonexistent-key.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-nonexistent-key.golden b/v2/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-nonexistent-key.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-nonexistent-key.golden rename to v2/internal/namespaces/instance/v1/testdata/test-user-data-get-get-an-nonexistent-key.golden diff --git a/internal/namespaces/instance/v1/testdata/test-user-data-list-simple.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-user-data-list-simple.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-user-data-list-simple.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-user-data-list-simple.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-user-data-list-simple.golden b/v2/internal/namespaces/instance/v1/testdata/test-user-data-list-simple.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-user-data-list-simple.golden rename to v2/internal/namespaces/instance/v1/testdata/test-user-data-list-simple.golden diff --git a/internal/namespaces/instance/v1/testdata/test-volume-type-list-volume-type-list.cassette.yaml b/v2/internal/namespaces/instance/v1/testdata/test-volume-type-list-volume-type-list.cassette.yaml similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-volume-type-list-volume-type-list.cassette.yaml rename to v2/internal/namespaces/instance/v1/testdata/test-volume-type-list-volume-type-list.cassette.yaml diff --git a/internal/namespaces/instance/v1/testdata/test-volume-type-list-volume-type-list.golden b/v2/internal/namespaces/instance/v1/testdata/test-volume-type-list-volume-type-list.golden similarity index 100% rename from internal/namespaces/instance/v1/testdata/test-volume-type-list-volume-type-list.golden rename to v2/internal/namespaces/instance/v1/testdata/test-volume-type-list-volume-type-list.golden diff --git a/internal/namespaces/iot/v1/custom.go b/v2/internal/namespaces/iot/v1/custom.go similarity index 82% rename from internal/namespaces/iot/v1/custom.go rename to v2/internal/namespaces/iot/v1/custom.go index 4b640ce7ff..ffb10f962b 100644 --- a/internal/namespaces/iot/v1/custom.go +++ b/v2/internal/namespaces/iot/v1/custom.go @@ -1,8 +1,8 @@ package iot import ( - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/iot/v1" ) diff --git a/internal/namespaces/iot/v1/custom_device.go b/v2/internal/namespaces/iot/v1/custom_device.go similarity index 93% rename from internal/namespaces/iot/v1/custom_device.go rename to v2/internal/namespaces/iot/v1/custom_device.go index d31c42160b..7e53c2777a 100644 --- a/internal/namespaces/iot/v1/custom_device.go +++ b/v2/internal/namespaces/iot/v1/custom_device.go @@ -2,7 +2,7 @@ package iot import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/iot/v1" ) diff --git a/internal/namespaces/iot/v1/custom_hub.go b/v2/internal/namespaces/iot/v1/custom_hub.go similarity index 92% rename from internal/namespaces/iot/v1/custom_hub.go rename to v2/internal/namespaces/iot/v1/custom_hub.go index b6e44af962..19972a15d1 100644 --- a/internal/namespaces/iot/v1/custom_hub.go +++ b/v2/internal/namespaces/iot/v1/custom_hub.go @@ -2,7 +2,7 @@ package iot import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/iot/v1" ) diff --git a/internal/namespaces/iot/v1/iot_cli.go b/v2/internal/namespaces/iot/v1/iot_cli.go similarity index 99% rename from internal/namespaces/iot/v1/iot_cli.go rename to v2/internal/namespaces/iot/v1/iot_cli.go index 9488d61dc2..b1288873cc 100644 --- a/internal/namespaces/iot/v1/iot_cli.go +++ b/v2/internal/namespaces/iot/v1/iot_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/iot/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/k8s/v1/custom.go b/v2/internal/namespaces/k8s/v1/custom.go similarity index 94% rename from internal/namespaces/k8s/v1/custom.go rename to v2/internal/namespaces/k8s/v1/custom.go index 8b68f4d8f5..1d6c64cc09 100644 --- a/internal/namespaces/k8s/v1/custom.go +++ b/v2/internal/namespaces/k8s/v1/custom.go @@ -1,8 +1,8 @@ package k8s import ( - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" ) diff --git a/internal/namespaces/k8s/v1/custom_cluster.go b/v2/internal/namespaces/k8s/v1/custom_cluster.go similarity index 98% rename from internal/namespaces/k8s/v1/custom_cluster.go rename to v2/internal/namespaces/k8s/v1/custom_cluster.go index 42af847f6a..9ed19a44e4 100644 --- a/internal/namespaces/k8s/v1/custom_cluster.go +++ b/v2/internal/namespaces/k8s/v1/custom_cluster.go @@ -9,8 +9,8 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/k8s/v1/custom_cluster_test.go b/v2/internal/namespaces/k8s/v1/custom_cluster_test.go similarity index 93% rename from internal/namespaces/k8s/v1/custom_cluster_test.go rename to v2/internal/namespaces/k8s/v1/custom_cluster_test.go index 92a6f6d08f..0e10d855b6 100644 --- a/internal/namespaces/k8s/v1/custom_cluster_test.go +++ b/v2/internal/namespaces/k8s/v1/custom_cluster_test.go @@ -3,7 +3,7 @@ package k8s import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_GetCluster(t *testing.T) { diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig.go b/v2/internal/namespaces/k8s/v1/custom_kubeconfig.go similarity index 80% rename from internal/namespaces/k8s/v1/custom_kubeconfig.go rename to v2/internal/namespaces/k8s/v1/custom_kubeconfig.go index b02e641cc6..7cdf1aaa26 100644 --- a/internal/namespaces/k8s/v1/custom_kubeconfig.go +++ b/v2/internal/namespaces/k8s/v1/custom_kubeconfig.go @@ -1,7 +1,7 @@ package k8s import ( - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func k8sKubeconfigCommand() *core.Command { diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_get.go b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_get.go similarity index 96% rename from internal/namespaces/k8s/v1/custom_kubeconfig_get.go rename to v2/internal/namespaces/k8s/v1/custom_kubeconfig_get.go index e9e14f7aec..eab79834e4 100644 --- a/internal/namespaces/k8s/v1/custom_kubeconfig_get.go +++ b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_get.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go similarity index 93% rename from internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go rename to v2/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go index 5edfa27ade..bf6454968f 100644 --- a/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go +++ b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" ) diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go similarity index 96% rename from internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go rename to v2/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go index 6fbd8b9e33..322d5adfbe 100644 --- a/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go +++ b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "gopkg.in/yaml.v2" ) diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_install.go b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_install.go similarity index 99% rename from internal/namespaces/k8s/v1/custom_kubeconfig_install.go rename to v2/internal/namespaces/k8s/v1/custom_kubeconfig_install.go index dca84c1e28..7abea62a6e 100644 --- a/internal/namespaces/k8s/v1/custom_kubeconfig_install.go +++ b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_install.go @@ -7,7 +7,7 @@ import ( "path" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go similarity index 99% rename from internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go rename to v2/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go index 7e423e06e6..1ccf646952 100644 --- a/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go +++ b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "gopkg.in/yaml.v2" ) diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go similarity index 98% rename from internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go rename to v2/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go index cefcad2bdb..9790b58609 100644 --- a/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go +++ b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" ) diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go similarity index 98% rename from internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go rename to v2/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go index a88023132c..5ba1f7417a 100644 --- a/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go +++ b/v2/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "gopkg.in/yaml.v2" ) diff --git a/internal/namespaces/k8s/v1/custom_node.go b/v2/internal/namespaces/k8s/v1/custom_node.go similarity index 96% rename from internal/namespaces/k8s/v1/custom_node.go rename to v2/internal/namespaces/k8s/v1/custom_node.go index 27c12f3e43..9828c62466 100644 --- a/internal/namespaces/k8s/v1/custom_node.go +++ b/v2/internal/namespaces/k8s/v1/custom_node.go @@ -6,8 +6,8 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/k8s/v1/custom_pool.go b/v2/internal/namespaces/k8s/v1/custom_pool.go similarity index 97% rename from internal/namespaces/k8s/v1/custom_pool.go rename to v2/internal/namespaces/k8s/v1/custom_pool.go index d9bbb4896e..9910b50b10 100644 --- a/internal/namespaces/k8s/v1/custom_pool.go +++ b/v2/internal/namespaces/k8s/v1/custom_pool.go @@ -9,8 +9,8 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/k8s/v1/custom_version.go b/v2/internal/namespaces/k8s/v1/custom_version.go similarity index 94% rename from internal/namespaces/k8s/v1/custom_version.go rename to v2/internal/namespaces/k8s/v1/custom_version.go index b8f91a97fd..b301240b8d 100644 --- a/internal/namespaces/k8s/v1/custom_version.go +++ b/v2/internal/namespaces/k8s/v1/custom_version.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-version" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/k8s/v1/custom_version_test.go b/v2/internal/namespaces/k8s/v1/custom_version_test.go similarity index 91% rename from internal/namespaces/k8s/v1/custom_version_test.go rename to v2/internal/namespaces/k8s/v1/custom_version_test.go index 8bf3cd0d36..8e36231324 100644 --- a/internal/namespaces/k8s/v1/custom_version_test.go +++ b/v2/internal/namespaces/k8s/v1/custom_version_test.go @@ -3,7 +3,7 @@ package k8s import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_GetVersion(t *testing.T) { diff --git a/internal/namespaces/k8s/v1/helpers_test.go b/v2/internal/namespaces/k8s/v1/helpers_test.go similarity index 98% rename from internal/namespaces/k8s/v1/helpers_test.go rename to v2/internal/namespaces/k8s/v1/helpers_test.go index 9aa9a5769e..994a4047e9 100644 --- a/internal/namespaces/k8s/v1/helpers_test.go +++ b/v2/internal/namespaces/k8s/v1/helpers_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "strings" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" ) diff --git a/internal/namespaces/k8s/v1/k8s_cli.go b/v2/internal/namespaces/k8s/v1/k8s_cli.go similarity index 99% rename from internal/namespaces/k8s/v1/k8s_cli.go rename to v2/internal/namespaces/k8s/v1/k8s_cli.go index dc74ac9089..98c99c7d51 100644 --- a/internal/namespaces/k8s/v1/k8s_cli.go +++ b/v2/internal/namespaces/k8s/v1/k8s_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.golden b/v2/internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.golden similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.golden rename to v2/internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.golden diff --git a/internal/namespaces/k8s/v1/testdata/test-get-kubeconfig-simple.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-get-kubeconfig-simple.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-get-kubeconfig-simple.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-get-kubeconfig-simple.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-get-kubeconfig-simple.golden b/v2/internal/namespaces/k8s/v1/testdata/test-get-kubeconfig-simple.golden similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-get-kubeconfig-simple.golden rename to v2/internal/namespaces/k8s/v1/testdata/test-get-kubeconfig-simple.golden diff --git a/internal/namespaces/k8s/v1/testdata/test-get-version-simple.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-get-version-simple.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-get-version-simple.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-get-version-simple.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-get-version-simple.golden b/v2/internal/namespaces/k8s/v1/testdata/test-get-version-simple.golden similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-get-version-simple.golden rename to v2/internal/namespaces/k8s/v1/testdata/test-get-version-simple.golden diff --git a/internal/namespaces/k8s/v1/testdata/test-install-kubeconfig-merge.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-install-kubeconfig-merge.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-install-kubeconfig-merge.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-install-kubeconfig-merge.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-install-kubeconfig-simple.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-install-kubeconfig-simple.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-install-kubeconfig-simple.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-install-kubeconfig-simple.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.golden b/v2/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.golden similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.golden rename to v2/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.golden diff --git a/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-empty-file.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-empty-file.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-empty-file.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-empty-file.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-uninstall-merge.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-uninstall-merge.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-uninstall-merge.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-uninstall-merge.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-uninstall.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-uninstall.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-uninstall.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-uninstall-kubeconfig-uninstall.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.cassette.yaml b/v2/internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.cassette.yaml similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.cassette.yaml rename to v2/internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.cassette.yaml diff --git a/internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.golden b/v2/internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.golden similarity index 100% rename from internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.golden rename to v2/internal/namespaces/k8s/v1/testdata/test-wait-cluster-wait-for-pools.golden diff --git a/internal/namespaces/lb/v1/custom.go b/v2/internal/namespaces/lb/v1/custom.go similarity index 92% rename from internal/namespaces/lb/v1/custom.go rename to v2/internal/namespaces/lb/v1/custom.go index 089ade712b..c24a4f3bfd 100644 --- a/internal/namespaces/lb/v1/custom.go +++ b/v2/internal/namespaces/lb/v1/custom.go @@ -1,8 +1,8 @@ package lb import ( - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/lb/v1" ) diff --git a/internal/namespaces/lb/v1/custom_acl.go b/v2/internal/namespaces/lb/v1/custom_acl.go similarity index 86% rename from internal/namespaces/lb/v1/custom_acl.go rename to v2/internal/namespaces/lb/v1/custom_acl.go index 59cbbd2ad5..44a4209c4d 100644 --- a/internal/namespaces/lb/v1/custom_acl.go +++ b/v2/internal/namespaces/lb/v1/custom_acl.go @@ -2,7 +2,7 @@ package lb import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/lb/v1" ) diff --git a/internal/namespaces/lb/v1/custom_backend.go b/v2/internal/namespaces/lb/v1/custom_backend.go similarity index 95% rename from internal/namespaces/lb/v1/custom_backend.go rename to v2/internal/namespaces/lb/v1/custom_backend.go index a6cbf78a2a..e137df5f6d 100644 --- a/internal/namespaces/lb/v1/custom_backend.go +++ b/v2/internal/namespaces/lb/v1/custom_backend.go @@ -2,7 +2,7 @@ package lb import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/lb/v1" ) diff --git a/internal/namespaces/lb/v1/custom_certificate.go b/v2/internal/namespaces/lb/v1/custom_certificate.go similarity index 96% rename from internal/namespaces/lb/v1/custom_certificate.go rename to v2/internal/namespaces/lb/v1/custom_certificate.go index 6fe6542c07..7c7e9cc222 100644 --- a/internal/namespaces/lb/v1/custom_certificate.go +++ b/v2/internal/namespaces/lb/v1/custom_certificate.go @@ -6,8 +6,8 @@ import ( "reflect" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/lb/v1/custom_certificate_test.go b/v2/internal/namespaces/lb/v1/custom_certificate_test.go similarity index 99% rename from internal/namespaces/lb/v1/custom_certificate_test.go rename to v2/internal/namespaces/lb/v1/custom_certificate_test.go index f436d7631b..a11fdb2dff 100644 --- a/internal/namespaces/lb/v1/custom_certificate_test.go +++ b/v2/internal/namespaces/lb/v1/custom_certificate_test.go @@ -3,7 +3,7 @@ package lb import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_CreateCertificate(t *testing.T) { diff --git a/internal/namespaces/lb/v1/custom_frontend.go b/v2/internal/namespaces/lb/v1/custom_frontend.go similarity index 78% rename from internal/namespaces/lb/v1/custom_frontend.go rename to v2/internal/namespaces/lb/v1/custom_frontend.go index eeff62fb2c..d0154e596d 100644 --- a/internal/namespaces/lb/v1/custom_frontend.go +++ b/v2/internal/namespaces/lb/v1/custom_frontend.go @@ -1,6 +1,6 @@ package lb -import "github.com/scaleway/scaleway-cli/internal/core" +import "github.com/scaleway/scaleway-cli/v2/internal/core" func frontendGetBuilder(c *core.Command) *core.Command { c.View = &core.View{ diff --git a/internal/namespaces/lb/v1/custom_frontend_test.go b/v2/internal/namespaces/lb/v1/custom_frontend_test.go similarity index 79% rename from internal/namespaces/lb/v1/custom_frontend_test.go rename to v2/internal/namespaces/lb/v1/custom_frontend_test.go index 6858f1a7a8..edf981c5ae 100644 --- a/internal/namespaces/lb/v1/custom_frontend_test.go +++ b/v2/internal/namespaces/lb/v1/custom_frontend_test.go @@ -3,8 +3,8 @@ package lb import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces/instance/v1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1" ) func Test_GetFrontend(t *testing.T) { diff --git a/internal/namespaces/lb/v1/custom_lb.go b/v2/internal/namespaces/lb/v1/custom_lb.go similarity index 96% rename from internal/namespaces/lb/v1/custom_lb.go rename to v2/internal/namespaces/lb/v1/custom_lb.go index 7606eebe52..3ff4db896a 100644 --- a/internal/namespaces/lb/v1/custom_lb.go +++ b/v2/internal/namespaces/lb/v1/custom_lb.go @@ -5,8 +5,8 @@ import ( "reflect" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/lb/v1/custom_lb_test.go b/v2/internal/namespaces/lb/v1/custom_lb_test.go similarity index 93% rename from internal/namespaces/lb/v1/custom_lb_test.go rename to v2/internal/namespaces/lb/v1/custom_lb_test.go index 54a567b8e4..483d4ee1ac 100644 --- a/internal/namespaces/lb/v1/custom_lb_test.go +++ b/v2/internal/namespaces/lb/v1/custom_lb_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces/instance/v1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1" ) func Test_ListLB(t *testing.T) { diff --git a/internal/namespaces/lb/v1/custom_lbtypes.go b/v2/internal/namespaces/lb/v1/custom_lbtypes.go similarity index 89% rename from internal/namespaces/lb/v1/custom_lbtypes.go rename to v2/internal/namespaces/lb/v1/custom_lbtypes.go index 25a696f5ce..1225f71faf 100644 --- a/internal/namespaces/lb/v1/custom_lbtypes.go +++ b/v2/internal/namespaces/lb/v1/custom_lbtypes.go @@ -2,7 +2,7 @@ package lb import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/lb/v1" ) diff --git a/internal/namespaces/lb/v1/helper_test.go b/v2/internal/namespaces/lb/v1/helper_test.go similarity index 96% rename from internal/namespaces/lb/v1/helper_test.go rename to v2/internal/namespaces/lb/v1/helper_test.go index 697f58eb28..1959e12f1d 100644 --- a/internal/namespaces/lb/v1/helper_test.go +++ b/v2/internal/namespaces/lb/v1/helper_test.go @@ -3,7 +3,7 @@ package lb import ( "fmt" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func createLB() core.BeforeFunc { diff --git a/internal/namespaces/lb/v1/lb_cli.go b/v2/internal/namespaces/lb/v1/lb_cli.go similarity index 99% rename from internal/namespaces/lb/v1/lb_cli.go rename to v2/internal/namespaces/lb/v1/lb_cli.go index 80bd16a84a..6ea0c9570b 100644 --- a/internal/namespaces/lb/v1/lb_cli.go +++ b/v2/internal/namespaces/lb/v1/lb_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/lb/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/lb/v1/testdata/test-create-certificate-import.cassette.yaml b/v2/internal/namespaces/lb/v1/testdata/test-create-certificate-import.cassette.yaml similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-create-certificate-import.cassette.yaml rename to v2/internal/namespaces/lb/v1/testdata/test-create-certificate-import.cassette.yaml diff --git a/internal/namespaces/lb/v1/testdata/test-create-certificate-import.golden b/v2/internal/namespaces/lb/v1/testdata/test-create-certificate-import.golden similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-create-certificate-import.golden rename to v2/internal/namespaces/lb/v1/testdata/test-create-certificate-import.golden diff --git a/internal/namespaces/lb/v1/testdata/test-create-lb-simple.cassette.yaml b/v2/internal/namespaces/lb/v1/testdata/test-create-lb-simple.cassette.yaml similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-create-lb-simple.cassette.yaml rename to v2/internal/namespaces/lb/v1/testdata/test-create-lb-simple.cassette.yaml diff --git a/internal/namespaces/lb/v1/testdata/test-create-lb-simple.golden b/v2/internal/namespaces/lb/v1/testdata/test-create-lb-simple.golden similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-create-lb-simple.golden rename to v2/internal/namespaces/lb/v1/testdata/test-create-lb-simple.golden diff --git a/internal/namespaces/lb/v1/testdata/test-get-frontend-simple.cassette.yaml b/v2/internal/namespaces/lb/v1/testdata/test-get-frontend-simple.cassette.yaml similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-get-frontend-simple.cassette.yaml rename to v2/internal/namespaces/lb/v1/testdata/test-get-frontend-simple.cassette.yaml diff --git a/internal/namespaces/lb/v1/testdata/test-get-frontend-simple.golden b/v2/internal/namespaces/lb/v1/testdata/test-get-frontend-simple.golden similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-get-frontend-simple.golden rename to v2/internal/namespaces/lb/v1/testdata/test-get-frontend-simple.golden diff --git a/internal/namespaces/lb/v1/testdata/test-get-lb-simple.cassette.yaml b/v2/internal/namespaces/lb/v1/testdata/test-get-lb-simple.cassette.yaml similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-get-lb-simple.cassette.yaml rename to v2/internal/namespaces/lb/v1/testdata/test-get-lb-simple.cassette.yaml diff --git a/internal/namespaces/lb/v1/testdata/test-get-lb-simple.golden b/v2/internal/namespaces/lb/v1/testdata/test-get-lb-simple.golden similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-get-lb-simple.golden rename to v2/internal/namespaces/lb/v1/testdata/test-get-lb-simple.golden diff --git a/internal/namespaces/lb/v1/testdata/test-get-stats-simple.cassette.yaml b/v2/internal/namespaces/lb/v1/testdata/test-get-stats-simple.cassette.yaml similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-get-stats-simple.cassette.yaml rename to v2/internal/namespaces/lb/v1/testdata/test-get-stats-simple.cassette.yaml diff --git a/internal/namespaces/lb/v1/testdata/test-get-stats-simple.golden b/v2/internal/namespaces/lb/v1/testdata/test-get-stats-simple.golden similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-get-stats-simple.golden rename to v2/internal/namespaces/lb/v1/testdata/test-get-stats-simple.golden diff --git a/internal/namespaces/lb/v1/testdata/test-list-lb-simple.cassette.yaml b/v2/internal/namespaces/lb/v1/testdata/test-list-lb-simple.cassette.yaml similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-list-lb-simple.cassette.yaml rename to v2/internal/namespaces/lb/v1/testdata/test-list-lb-simple.cassette.yaml diff --git a/internal/namespaces/lb/v1/testdata/test-list-lb-simple.golden b/v2/internal/namespaces/lb/v1/testdata/test-list-lb-simple.golden similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-list-lb-simple.golden rename to v2/internal/namespaces/lb/v1/testdata/test-list-lb-simple.golden diff --git a/internal/namespaces/lb/v1/testdata/test-wait-lb-simple.cassette.yaml b/v2/internal/namespaces/lb/v1/testdata/test-wait-lb-simple.cassette.yaml similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-wait-lb-simple.cassette.yaml rename to v2/internal/namespaces/lb/v1/testdata/test-wait-lb-simple.cassette.yaml diff --git a/internal/namespaces/lb/v1/testdata/test-wait-lb-simple.golden b/v2/internal/namespaces/lb/v1/testdata/test-wait-lb-simple.golden similarity index 100% rename from internal/namespaces/lb/v1/testdata/test-wait-lb-simple.golden rename to v2/internal/namespaces/lb/v1/testdata/test-wait-lb-simple.golden diff --git a/internal/namespaces/marketplace/v1/custom.go b/v2/internal/namespaces/marketplace/v1/custom.go similarity index 91% rename from internal/namespaces/marketplace/v1/custom.go rename to v2/internal/namespaces/marketplace/v1/custom.go index 52c0695ba5..621559c746 100644 --- a/internal/namespaces/marketplace/v1/custom.go +++ b/v2/internal/namespaces/marketplace/v1/custom.go @@ -1,7 +1,7 @@ package marketplace import ( - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) // custom_marshal: contains all the registered MarshalFunc and the human.Marshaler implementations diff --git a/internal/namespaces/marketplace/v1/custom_marshal.go b/v2/internal/namespaces/marketplace/v1/custom_marshal.go similarity index 97% rename from internal/namespaces/marketplace/v1/custom_marshal.go rename to v2/internal/namespaces/marketplace/v1/custom_marshal.go index 1f558d3fe0..f5bed8f256 100644 --- a/internal/namespaces/marketplace/v1/custom_marshal.go +++ b/v2/internal/namespaces/marketplace/v1/custom_marshal.go @@ -5,8 +5,8 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" - "github.com/scaleway/scaleway-cli/internal/terminal" + "github.com/scaleway/scaleway-cli/v2/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/terminal" "github.com/scaleway/scaleway-sdk-go/api/marketplace/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/marketplace/v1/marketplace_cli.go b/v2/internal/namespaces/marketplace/v1/marketplace_cli.go similarity index 97% rename from internal/namespaces/marketplace/v1/marketplace_cli.go rename to v2/internal/namespaces/marketplace/v1/marketplace_cli.go index 7e34c5e820..dab59b7536 100644 --- a/internal/namespaces/marketplace/v1/marketplace_cli.go +++ b/v2/internal/namespaces/marketplace/v1/marketplace_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/marketplace/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/marketplace/v1/marketplace_cli_test.go b/v2/internal/namespaces/marketplace/v1/marketplace_cli_test.go similarity index 85% rename from internal/namespaces/marketplace/v1/marketplace_cli_test.go rename to v2/internal/namespaces/marketplace/v1/marketplace_cli_test.go index 80d8b246b9..1c77f869da 100644 --- a/internal/namespaces/marketplace/v1/marketplace_cli_test.go +++ b/v2/internal/namespaces/marketplace/v1/marketplace_cli_test.go @@ -3,7 +3,7 @@ package marketplace import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_marketplaceImageList(t *testing.T) { diff --git a/internal/namespaces/marketplace/v1/testdata/test-marketplace-image-list-simple.cassette.yaml b/v2/internal/namespaces/marketplace/v1/testdata/test-marketplace-image-list-simple.cassette.yaml similarity index 100% rename from internal/namespaces/marketplace/v1/testdata/test-marketplace-image-list-simple.cassette.yaml rename to v2/internal/namespaces/marketplace/v1/testdata/test-marketplace-image-list-simple.cassette.yaml diff --git a/internal/namespaces/marketplace/v1/testdata/test-marketplace-image-list-simple.golden b/v2/internal/namespaces/marketplace/v1/testdata/test-marketplace-image-list-simple.golden similarity index 100% rename from internal/namespaces/marketplace/v1/testdata/test-marketplace-image-list-simple.golden rename to v2/internal/namespaces/marketplace/v1/testdata/test-marketplace-image-list-simple.golden diff --git a/internal/namespaces/marketplace/v1/updated_commands.go b/v2/internal/namespaces/marketplace/v1/updated_commands.go similarity index 97% rename from internal/namespaces/marketplace/v1/updated_commands.go rename to v2/internal/namespaces/marketplace/v1/updated_commands.go index f8553adc9c..0f178dae67 100644 --- a/internal/namespaces/marketplace/v1/updated_commands.go +++ b/v2/internal/namespaces/marketplace/v1/updated_commands.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/marketplace/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/scaleway-sdk-go/strcase" diff --git a/internal/namespaces/object/v1/custom.go b/v2/internal/namespaces/object/v1/custom.go similarity index 90% rename from internal/namespaces/object/v1/custom.go rename to v2/internal/namespaces/object/v1/custom.go index 76d1fb30b4..b67a834e58 100644 --- a/internal/namespaces/object/v1/custom.go +++ b/v2/internal/namespaces/object/v1/custom.go @@ -1,7 +1,7 @@ package object import ( - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func GetCommands() *core.Commands { diff --git a/internal/namespaces/object/v1/custom_config_get.go b/v2/internal/namespaces/object/v1/custom_config_get.go similarity index 96% rename from internal/namespaces/object/v1/custom_config_get.go rename to v2/internal/namespaces/object/v1/custom_config_get.go index bf9dac0d6c..d2f579ceec 100644 --- a/internal/namespaces/object/v1/custom_config_get.go +++ b/v2/internal/namespaces/object/v1/custom_config_get.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/object/v1/custom_config_get_test.go b/v2/internal/namespaces/object/v1/custom_config_get_test.go similarity index 97% rename from internal/namespaces/object/v1/custom_config_get_test.go rename to v2/internal/namespaces/object/v1/custom_config_get_test.go index 9f14501a51..e0185347ad 100644 --- a/internal/namespaces/object/v1/custom_config_get_test.go +++ b/v2/internal/namespaces/object/v1/custom_config_get_test.go @@ -3,7 +3,7 @@ package object import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/stretchr/testify/require" ) diff --git a/internal/namespaces/object/v1/custom_config_install.go b/v2/internal/namespaces/object/v1/custom_config_install.go similarity index 96% rename from internal/namespaces/object/v1/custom_config_install.go rename to v2/internal/namespaces/object/v1/custom_config_install.go index bf428eaf49..7c4b5f6051 100644 --- a/internal/namespaces/object/v1/custom_config_install.go +++ b/v2/internal/namespaces/object/v1/custom_config_install.go @@ -8,8 +8,8 @@ import ( "path/filepath" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/object/v1/custom_config_install_test.go b/v2/internal/namespaces/object/v1/custom_config_install_test.go similarity index 97% rename from internal/namespaces/object/v1/custom_config_install_test.go rename to v2/internal/namespaces/object/v1/custom_config_install_test.go index 5974f5a0d0..43080fa57e 100644 --- a/internal/namespaces/object/v1/custom_config_install_test.go +++ b/v2/internal/namespaces/object/v1/custom_config_install_test.go @@ -4,7 +4,7 @@ import ( "path" "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/namespaces/object/v1/s3configfile.go b/v2/internal/namespaces/object/v1/s3configfile.go similarity index 98% rename from internal/namespaces/object/v1/s3configfile.go rename to v2/internal/namespaces/object/v1/s3configfile.go index c3d265f624..032472ec97 100644 --- a/internal/namespaces/object/v1/s3configfile.go +++ b/v2/internal/namespaces/object/v1/s3configfile.go @@ -8,7 +8,7 @@ import ( "path" "text/template" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/object/v1/testdata/test-config-get-default-mc.golden b/v2/internal/namespaces/object/v1/testdata/test-config-get-default-mc.golden similarity index 100% rename from internal/namespaces/object/v1/testdata/test-config-get-default-mc.golden rename to v2/internal/namespaces/object/v1/testdata/test-config-get-default-mc.golden diff --git a/internal/namespaces/object/v1/testdata/test-config-get-default-rclone.golden b/v2/internal/namespaces/object/v1/testdata/test-config-get-default-rclone.golden similarity index 100% rename from internal/namespaces/object/v1/testdata/test-config-get-default-rclone.golden rename to v2/internal/namespaces/object/v1/testdata/test-config-get-default-rclone.golden diff --git a/internal/namespaces/object/v1/testdata/test-config-get-default-s3cmd.golden b/v2/internal/namespaces/object/v1/testdata/test-config-get-default-s3cmd.golden similarity index 100% rename from internal/namespaces/object/v1/testdata/test-config-get-default-s3cmd.golden rename to v2/internal/namespaces/object/v1/testdata/test-config-get-default-s3cmd.golden diff --git a/internal/namespaces/object/v1/testdata/test-config-get-with-region-mc.golden b/v2/internal/namespaces/object/v1/testdata/test-config-get-with-region-mc.golden similarity index 100% rename from internal/namespaces/object/v1/testdata/test-config-get-with-region-mc.golden rename to v2/internal/namespaces/object/v1/testdata/test-config-get-with-region-mc.golden diff --git a/internal/namespaces/object/v1/testdata/test-config-get-with-region-rclone.golden b/v2/internal/namespaces/object/v1/testdata/test-config-get-with-region-rclone.golden similarity index 100% rename from internal/namespaces/object/v1/testdata/test-config-get-with-region-rclone.golden rename to v2/internal/namespaces/object/v1/testdata/test-config-get-with-region-rclone.golden diff --git a/internal/namespaces/object/v1/testdata/test-config-get-with-region-s3cmd.golden b/v2/internal/namespaces/object/v1/testdata/test-config-get-with-region-s3cmd.golden similarity index 100% rename from internal/namespaces/object/v1/testdata/test-config-get-with-region-s3cmd.golden rename to v2/internal/namespaces/object/v1/testdata/test-config-get-with-region-s3cmd.golden diff --git a/internal/namespaces/rdb/v1/custom.go b/v2/internal/namespaces/rdb/v1/custom.go similarity index 94% rename from internal/namespaces/rdb/v1/custom.go rename to v2/internal/namespaces/rdb/v1/custom.go index ee64a6be4d..a133202732 100644 --- a/internal/namespaces/rdb/v1/custom.go +++ b/v2/internal/namespaces/rdb/v1/custom.go @@ -1,8 +1,8 @@ package rdb import ( - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" ) diff --git a/internal/namespaces/rdb/v1/custom_acl.go b/v2/internal/namespaces/rdb/v1/custom_acl.go similarity index 91% rename from internal/namespaces/rdb/v1/custom_acl.go rename to v2/internal/namespaces/rdb/v1/custom_acl.go index 7798c1db22..89beeb80f6 100644 --- a/internal/namespaces/rdb/v1/custom_acl.go +++ b/v2/internal/namespaces/rdb/v1/custom_acl.go @@ -4,8 +4,8 @@ import ( "context" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" ) diff --git a/internal/namespaces/rdb/v1/custom_acl_test.go b/v2/internal/namespaces/rdb/v1/custom_acl_test.go similarity index 93% rename from internal/namespaces/rdb/v1/custom_acl_test.go rename to v2/internal/namespaces/rdb/v1/custom_acl_test.go index 2f38ab8641..e13163b448 100644 --- a/internal/namespaces/rdb/v1/custom_acl_test.go +++ b/v2/internal/namespaces/rdb/v1/custom_acl_test.go @@ -3,7 +3,7 @@ package rdb import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_AddACL(t *testing.T) { diff --git a/internal/namespaces/rdb/v1/custom_backup.go b/v2/internal/namespaces/rdb/v1/custom_backup.go similarity index 98% rename from internal/namespaces/rdb/v1/custom_backup.go rename to v2/internal/namespaces/rdb/v1/custom_backup.go index 617a7e7578..c25cf3e059 100644 --- a/internal/namespaces/rdb/v1/custom_backup.go +++ b/v2/internal/namespaces/rdb/v1/custom_backup.go @@ -12,8 +12,8 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/rdb/v1/custom_backup_test.go b/v2/internal/namespaces/rdb/v1/custom_backup_test.go similarity index 98% rename from internal/namespaces/rdb/v1/custom_backup_test.go rename to v2/internal/namespaces/rdb/v1/custom_backup_test.go index 3b6fec52c3..e51b0bb5fc 100644 --- a/internal/namespaces/rdb/v1/custom_backup_test.go +++ b/v2/internal/namespaces/rdb/v1/custom_backup_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/rdb/v1/custom_engine.go b/v2/internal/namespaces/rdb/v1/custom_engine.go similarity index 95% rename from internal/namespaces/rdb/v1/custom_engine.go rename to v2/internal/namespaces/rdb/v1/custom_engine.go index 25802980d3..442fd3452e 100644 --- a/internal/namespaces/rdb/v1/custom_engine.go +++ b/v2/internal/namespaces/rdb/v1/custom_engine.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" ) diff --git a/internal/namespaces/rdb/v1/custom_engine_test.go b/v2/internal/namespaces/rdb/v1/custom_engine_test.go similarity index 80% rename from internal/namespaces/rdb/v1/custom_engine_test.go rename to v2/internal/namespaces/rdb/v1/custom_engine_test.go index 4b0c7e7b56..b18a01e96d 100644 --- a/internal/namespaces/rdb/v1/custom_engine_test.go +++ b/v2/internal/namespaces/rdb/v1/custom_engine_test.go @@ -3,7 +3,7 @@ package rdb import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_EngineList(t *testing.T) { diff --git a/internal/namespaces/rdb/v1/custom_instance.go b/v2/internal/namespaces/rdb/v1/custom_instance.go similarity index 98% rename from internal/namespaces/rdb/v1/custom_instance.go rename to v2/internal/namespaces/rdb/v1/custom_instance.go index f3bd134f2e..5c534c76a4 100644 --- a/internal/namespaces/rdb/v1/custom_instance.go +++ b/v2/internal/namespaces/rdb/v1/custom_instance.go @@ -12,9 +12,9 @@ import ( "time" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/rdb/v1/custom_instance_test.go b/v2/internal/namespaces/rdb/v1/custom_instance_test.go similarity index 98% rename from internal/namespaces/rdb/v1/custom_instance_test.go rename to v2/internal/namespaces/rdb/v1/custom_instance_test.go index 4deba35e4f..581f3eca78 100644 --- a/internal/namespaces/rdb/v1/custom_instance_test.go +++ b/v2/internal/namespaces/rdb/v1/custom_instance_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_ListInstance(t *testing.T) { diff --git a/internal/namespaces/rdb/v1/custom_log.go b/v2/internal/namespaces/rdb/v1/custom_log.go similarity index 91% rename from internal/namespaces/rdb/v1/custom_log.go rename to v2/internal/namespaces/rdb/v1/custom_log.go index 097183558e..fbf25ce297 100644 --- a/internal/namespaces/rdb/v1/custom_log.go +++ b/v2/internal/namespaces/rdb/v1/custom_log.go @@ -2,7 +2,7 @@ package rdb import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" ) diff --git a/internal/namespaces/rdb/v1/custom_node_type.go b/v2/internal/namespaces/rdb/v1/custom_node_type.go similarity index 91% rename from internal/namespaces/rdb/v1/custom_node_type.go rename to v2/internal/namespaces/rdb/v1/custom_node_type.go index e7bb379179..cb585713e0 100644 --- a/internal/namespaces/rdb/v1/custom_node_type.go +++ b/v2/internal/namespaces/rdb/v1/custom_node_type.go @@ -2,7 +2,7 @@ package rdb import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" ) diff --git a/internal/namespaces/rdb/v1/custom_user.go b/v2/internal/namespaces/rdb/v1/custom_user.go similarity index 97% rename from internal/namespaces/rdb/v1/custom_user.go rename to v2/internal/namespaces/rdb/v1/custom_user.go index 19175d4bc9..d2208f036d 100644 --- a/internal/namespaces/rdb/v1/custom_user.go +++ b/v2/internal/namespaces/rdb/v1/custom_user.go @@ -3,7 +3,7 @@ package rdb import ( "context" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/rdb/v1/custom_user_test.go b/v2/internal/namespaces/rdb/v1/custom_user_test.go similarity index 86% rename from internal/namespaces/rdb/v1/custom_user_test.go rename to v2/internal/namespaces/rdb/v1/custom_user_test.go index 3e30bb8ce0..9c7ffb22b1 100644 --- a/internal/namespaces/rdb/v1/custom_user_test.go +++ b/v2/internal/namespaces/rdb/v1/custom_user_test.go @@ -3,7 +3,7 @@ package rdb import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_ListUser(t *testing.T) { diff --git a/internal/namespaces/rdb/v1/helper_test.go b/v2/internal/namespaces/rdb/v1/helper_test.go similarity index 90% rename from internal/namespaces/rdb/v1/helper_test.go rename to v2/internal/namespaces/rdb/v1/helper_test.go index 995dfcad5d..d448bdd58c 100644 --- a/internal/namespaces/rdb/v1/helper_test.go +++ b/v2/internal/namespaces/rdb/v1/helper_test.go @@ -3,7 +3,7 @@ package rdb import ( "fmt" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) const ( diff --git a/internal/namespaces/rdb/v1/rdb_cli.go b/v2/internal/namespaces/rdb/v1/rdb_cli.go similarity index 99% rename from internal/namespaces/rdb/v1/rdb_cli.go rename to v2/internal/namespaces/rdb/v1/rdb_cli.go index 230225418e..26b9c0175c 100644 --- a/internal/namespaces/rdb/v1/rdb_cli.go +++ b/v2/internal/namespaces/rdb/v1/rdb_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/rdb/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/rdb/v1/testdata/test-add-acl-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-add-acl-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-add-acl-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-add-acl-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-add-acl-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-add-acl-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-add-acl-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-add-acl-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-clone-instance-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-clone-instance-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-clone-instance-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-clone-instance-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-clone-instance-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-clone-instance-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-clone-instance-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-clone-instance-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-connect-mysql.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-connect-mysql.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-connect-mysql.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-connect-mysql.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-connect-mysql.golden b/v2/internal/namespaces/rdb/v1/testdata/test-connect-mysql.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-connect-mysql.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-connect-mysql.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-connect-psql.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-connect-psql.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-connect-psql.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-connect-psql.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-connect-psql.golden b/v2/internal/namespaces/rdb/v1/testdata/test-connect-psql.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-connect-psql.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-connect-psql.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-create-backup-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-create-backup-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-create-backup-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-create-backup-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-create-backup-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-create-backup-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-create-backup-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-create-backup-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-create-instance-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-create-instance-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-create-instance-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-create-instance-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-create-instance-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-create-instance-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-create-instance-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-create-instance-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-delete-acl-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-download-backup-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-download-backup-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-download-backup-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-download-backup-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-download-backup-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-download-backup-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-download-backup-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-download-backup-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-engine-list-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-engine-list-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-engine-list-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-engine-list-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-engine-list-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-engine-list-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-engine-list-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-engine-list-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-export-backup-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-export-backup-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-export-backup-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-export-backup-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-export-backup-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-export-backup-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-export-backup-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-export-backup-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-get-instance-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-get-instance-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-get-instance-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-get-instance-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-get-instance-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-get-instance-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-get-instance-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-get-instance-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-list-instance-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-list-instance-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-list-instance-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-list-instance-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-list-instance-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-list-instance-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-list-instance-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-list-instance-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-list-user-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-list-user-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-list-user-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-list-user-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-list-user-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-list-user-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-list-user-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-list-user-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-restore-backup-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-restore-backup-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-restore-backup-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-restore-backup-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-restore-backup-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-restore-backup-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-restore-backup-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-restore-backup-simple.golden diff --git a/internal/namespaces/rdb/v1/testdata/test-upgrade-instance-simple.cassette.yaml b/v2/internal/namespaces/rdb/v1/testdata/test-upgrade-instance-simple.cassette.yaml similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-upgrade-instance-simple.cassette.yaml rename to v2/internal/namespaces/rdb/v1/testdata/test-upgrade-instance-simple.cassette.yaml diff --git a/internal/namespaces/rdb/v1/testdata/test-upgrade-instance-simple.golden b/v2/internal/namespaces/rdb/v1/testdata/test-upgrade-instance-simple.golden similarity index 100% rename from internal/namespaces/rdb/v1/testdata/test-upgrade-instance-simple.golden rename to v2/internal/namespaces/rdb/v1/testdata/test-upgrade-instance-simple.golden diff --git a/internal/namespaces/registry/v1/custom.go b/v2/internal/namespaces/registry/v1/custom.go similarity index 91% rename from internal/namespaces/registry/v1/custom.go rename to v2/internal/namespaces/registry/v1/custom.go index 4d7b466237..acd657e4c7 100644 --- a/internal/namespaces/registry/v1/custom.go +++ b/v2/internal/namespaces/registry/v1/custom.go @@ -1,8 +1,8 @@ package registry import ( - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/registry/v1" ) diff --git a/internal/namespaces/registry/v1/custom_docker_helper.go b/v2/internal/namespaces/registry/v1/custom_docker_helper.go similarity index 98% rename from internal/namespaces/registry/v1/custom_docker_helper.go rename to v2/internal/namespaces/registry/v1/custom_docker_helper.go index 270eb4c42c..bf0205ff23 100644 --- a/internal/namespaces/registry/v1/custom_docker_helper.go +++ b/v2/internal/namespaces/registry/v1/custom_docker_helper.go @@ -16,8 +16,8 @@ import ( "strings" "text/template" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/interactive" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/interactive" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/registry/v1/custom_docker_helper_test.go b/v2/internal/namespaces/registry/v1/custom_docker_helper_test.go similarity index 98% rename from internal/namespaces/registry/v1/custom_docker_helper_test.go rename to v2/internal/namespaces/registry/v1/custom_docker_helper_test.go index a7e601dc5c..dcd3a702bc 100644 --- a/internal/namespaces/registry/v1/custom_docker_helper_test.go +++ b/v2/internal/namespaces/registry/v1/custom_docker_helper_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/stretchr/testify/require" ) diff --git a/internal/namespaces/registry/v1/custom_image.go b/v2/internal/namespaces/registry/v1/custom_image.go similarity index 96% rename from internal/namespaces/registry/v1/custom_image.go rename to v2/internal/namespaces/registry/v1/custom_image.go index ead96fd3d6..ed385e8d08 100644 --- a/internal/namespaces/registry/v1/custom_image.go +++ b/v2/internal/namespaces/registry/v1/custom_image.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/registry/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/registry/v1/custom_image_test.go b/v2/internal/namespaces/registry/v1/custom_image_test.go similarity index 98% rename from internal/namespaces/registry/v1/custom_image_test.go rename to v2/internal/namespaces/registry/v1/custom_image_test.go index bc2a091f04..d2e48db409 100644 --- a/internal/namespaces/registry/v1/custom_image_test.go +++ b/v2/internal/namespaces/registry/v1/custom_image_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/registry/v1" ) diff --git a/internal/namespaces/registry/v1/custom_login.go b/v2/internal/namespaces/registry/v1/custom_login.go similarity index 96% rename from internal/namespaces/registry/v1/custom_login.go rename to v2/internal/namespaces/registry/v1/custom_login.go index 717b8bdc74..744c7b3367 100644 --- a/internal/namespaces/registry/v1/custom_login.go +++ b/v2/internal/namespaces/registry/v1/custom_login.go @@ -7,7 +7,7 @@ import ( "os/exec" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/registry/v1/custom_login_test.go b/v2/internal/namespaces/registry/v1/custom_login_test.go similarity index 96% rename from internal/namespaces/registry/v1/custom_login_test.go rename to v2/internal/namespaces/registry/v1/custom_login_test.go index b8122372d7..e6e18eef81 100644 --- a/internal/namespaces/registry/v1/custom_login_test.go +++ b/v2/internal/namespaces/registry/v1/custom_login_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/alecthomas/assert" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/stretchr/testify/require" ) diff --git a/internal/namespaces/registry/v1/custom_logout.go b/v2/internal/namespaces/registry/v1/custom_logout.go similarity index 96% rename from internal/namespaces/registry/v1/custom_logout.go rename to v2/internal/namespaces/registry/v1/custom_logout.go index f112bf64a7..8fec963f24 100644 --- a/internal/namespaces/registry/v1/custom_logout.go +++ b/v2/internal/namespaces/registry/v1/custom_logout.go @@ -5,7 +5,7 @@ import ( "os/exec" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/registry/v1/custom_logout_test.go b/v2/internal/namespaces/registry/v1/custom_logout_test.go similarity index 92% rename from internal/namespaces/registry/v1/custom_logout_test.go rename to v2/internal/namespaces/registry/v1/custom_logout_test.go index 54c2a3a1b4..bcf369a547 100644 --- a/internal/namespaces/registry/v1/custom_logout_test.go +++ b/v2/internal/namespaces/registry/v1/custom_logout_test.go @@ -3,7 +3,7 @@ package registry import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_Logout(t *testing.T) { diff --git a/internal/namespaces/registry/v1/custom_namespace.go b/v2/internal/namespaces/registry/v1/custom_namespace.go similarity index 91% rename from internal/namespaces/registry/v1/custom_namespace.go rename to v2/internal/namespaces/registry/v1/custom_namespace.go index 319c49bfe3..e35457c0ea 100644 --- a/internal/namespaces/registry/v1/custom_namespace.go +++ b/v2/internal/namespaces/registry/v1/custom_namespace.go @@ -2,7 +2,7 @@ package registry import ( "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/registry/v1" ) diff --git a/internal/namespaces/registry/v1/custom_tag.go b/v2/internal/namespaces/registry/v1/custom_tag.go similarity index 96% rename from internal/namespaces/registry/v1/custom_tag.go rename to v2/internal/namespaces/registry/v1/custom_tag.go index 15efd114f9..acd4d0eb8c 100644 --- a/internal/namespaces/registry/v1/custom_tag.go +++ b/v2/internal/namespaces/registry/v1/custom_tag.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/fatih/color" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/human" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/human" "github.com/scaleway/scaleway-sdk-go/api/registry/v1" ) diff --git a/internal/namespaces/registry/v1/helpers_docker.go b/v2/internal/namespaces/registry/v1/helpers_docker.go similarity index 97% rename from internal/namespaces/registry/v1/helpers_docker.go rename to v2/internal/namespaces/registry/v1/helpers_docker.go index c0dd5ef996..1fced431b8 100644 --- a/internal/namespaces/registry/v1/helpers_docker.go +++ b/v2/internal/namespaces/registry/v1/helpers_docker.go @@ -11,7 +11,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) const ( diff --git a/internal/namespaces/registry/v1/helpers_login_logout.go b/v2/internal/namespaces/registry/v1/helpers_login_logout.go similarity index 100% rename from internal/namespaces/registry/v1/helpers_login_logout.go rename to v2/internal/namespaces/registry/v1/helpers_login_logout.go diff --git a/internal/namespaces/registry/v1/registry_cli.go b/v2/internal/namespaces/registry/v1/registry_cli.go similarity index 99% rename from internal/namespaces/registry/v1/registry_cli.go rename to v2/internal/namespaces/registry/v1/registry_cli.go index 111af4b67e..91b4abdc2d 100644 --- a/internal/namespaces/registry/v1/registry_cli.go +++ b/v2/internal/namespaces/registry/v1/registry_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/registry/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/registry/v1/testdata/test-image-list-simple.cassette.yaml b/v2/internal/namespaces/registry/v1/testdata/test-image-list-simple.cassette.yaml similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-image-list-simple.cassette.yaml rename to v2/internal/namespaces/registry/v1/testdata/test-image-list-simple.cassette.yaml diff --git a/internal/namespaces/registry/v1/testdata/test-image-list-simple.golden b/v2/internal/namespaces/registry/v1/testdata/test-image-list-simple.golden similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-image-list-simple.golden rename to v2/internal/namespaces/registry/v1/testdata/test-image-list-simple.golden diff --git a/internal/namespaces/registry/v1/testdata/test-login-docker.golden b/v2/internal/namespaces/registry/v1/testdata/test-login-docker.golden similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-login-docker.golden rename to v2/internal/namespaces/registry/v1/testdata/test-login-docker.golden diff --git a/internal/namespaces/registry/v1/testdata/test-login-podman.golden b/v2/internal/namespaces/registry/v1/testdata/test-login-podman.golden similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-login-podman.golden rename to v2/internal/namespaces/registry/v1/testdata/test-login-podman.golden diff --git a/internal/namespaces/registry/v1/testdata/test-logout-docker.golden b/v2/internal/namespaces/registry/v1/testdata/test-logout-docker.golden similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-logout-docker.golden rename to v2/internal/namespaces/registry/v1/testdata/test-logout-docker.golden diff --git a/internal/namespaces/registry/v1/testdata/test-logout-podman.golden b/v2/internal/namespaces/registry/v1/testdata/test-logout-podman.golden similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-logout-podman.golden rename to v2/internal/namespaces/registry/v1/testdata/test-logout-podman.golden diff --git a/internal/namespaces/registry/v1/testdata/test-namespace-login-docker.cassette.yaml b/v2/internal/namespaces/registry/v1/testdata/test-namespace-login-docker.cassette.yaml similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-namespace-login-docker.cassette.yaml rename to v2/internal/namespaces/registry/v1/testdata/test-namespace-login-docker.cassette.yaml diff --git a/internal/namespaces/registry/v1/testdata/test-namespace-login-podman.cassette.yaml b/v2/internal/namespaces/registry/v1/testdata/test-namespace-login-podman.cassette.yaml similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-namespace-login-podman.cassette.yaml rename to v2/internal/namespaces/registry/v1/testdata/test-namespace-login-podman.cassette.yaml diff --git a/internal/namespaces/registry/v1/testdata/test-namespace-logout-docker.cassette.yaml b/v2/internal/namespaces/registry/v1/testdata/test-namespace-logout-docker.cassette.yaml similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-namespace-logout-docker.cassette.yaml rename to v2/internal/namespaces/registry/v1/testdata/test-namespace-logout-docker.cassette.yaml diff --git a/internal/namespaces/registry/v1/testdata/test-namespace-logout-podman.cassette.yaml b/v2/internal/namespaces/registry/v1/testdata/test-namespace-logout-podman.cassette.yaml similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-namespace-logout-podman.cassette.yaml rename to v2/internal/namespaces/registry/v1/testdata/test-namespace-logout-podman.cassette.yaml diff --git a/internal/namespaces/registry/v1/testdata/test-registry-docker-helper-get-command-simple.golden b/v2/internal/namespaces/registry/v1/testdata/test-registry-docker-helper-get-command-simple.golden similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-registry-docker-helper-get-command-simple.golden rename to v2/internal/namespaces/registry/v1/testdata/test-registry-docker-helper-get-command-simple.golden diff --git a/internal/namespaces/registry/v1/testdata/test-registry-docker-helper-list-command-simple.golden b/v2/internal/namespaces/registry/v1/testdata/test-registry-docker-helper-list-command-simple.golden similarity index 100% rename from internal/namespaces/registry/v1/testdata/test-registry-docker-helper-list-command-simple.golden rename to v2/internal/namespaces/registry/v1/testdata/test-registry-docker-helper-list-command-simple.golden diff --git a/internal/namespaces/test/custom/custom_cli.go b/v2/internal/namespaces/test/custom/custom_cli.go similarity index 95% rename from internal/namespaces/test/custom/custom_cli.go rename to v2/internal/namespaces/test/custom/custom_cli.go index ad972770b6..ed820d0d3b 100644 --- a/internal/namespaces/test/custom/custom_cli.go +++ b/v2/internal/namespaces/test/custom/custom_cli.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func GetCustomCommands() *core.Commands { diff --git a/internal/namespaces/test/custom/custom_cli_test.go b/v2/internal/namespaces/test/custom/custom_cli_test.go similarity index 82% rename from internal/namespaces/test/custom/custom_cli_test.go rename to v2/internal/namespaces/test/custom/custom_cli_test.go index 8ae8acd46f..32b00774d9 100644 --- a/internal/namespaces/test/custom/custom_cli_test.go +++ b/v2/internal/namespaces/test/custom/custom_cli_test.go @@ -3,7 +3,7 @@ package test import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func Test_AnonymousFields(t *testing.T) { diff --git a/internal/namespaces/test/custom/testdata/test-anonymous-fields-usage.golden b/v2/internal/namespaces/test/custom/testdata/test-anonymous-fields-usage.golden similarity index 100% rename from internal/namespaces/test/custom/testdata/test-anonymous-fields-usage.golden rename to v2/internal/namespaces/test/custom/testdata/test-anonymous-fields-usage.golden diff --git a/internal/namespaces/test/v1/custom.go b/v2/internal/namespaces/test/v1/custom.go similarity index 64% rename from internal/namespaces/test/v1/custom.go rename to v2/internal/namespaces/test/v1/custom.go index b408d8344e..ccc59a7567 100644 --- a/internal/namespaces/test/v1/custom.go +++ b/v2/internal/namespaces/test/v1/custom.go @@ -1,7 +1,7 @@ package test import ( - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func GetCommands() *core.Commands { diff --git a/internal/namespaces/test/v1/test_cli.go b/v2/internal/namespaces/test/v1/test_cli.go similarity index 99% rename from internal/namespaces/test/v1/test_cli.go rename to v2/internal/namespaces/test/v1/test_cli.go index a45ba637bc..f5d0d58ef9 100644 --- a/internal/namespaces/test/v1/test_cli.go +++ b/v2/internal/namespaces/test/v1/test_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/test/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/namespaces/version/version.go b/v2/internal/namespaces/version/version.go similarity index 90% rename from internal/namespaces/version/version.go rename to v2/internal/namespaces/version/version.go index f24fb74f22..dabdf51144 100644 --- a/internal/namespaces/version/version.go +++ b/v2/internal/namespaces/version/version.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func GetCommands() *core.Commands { diff --git a/internal/namespaces/vpc/v1/custom.go b/v2/internal/namespaces/vpc/v1/custom.go similarity index 78% rename from internal/namespaces/vpc/v1/custom.go rename to v2/internal/namespaces/vpc/v1/custom.go index d1a1c491c5..5cd5f8f092 100644 --- a/internal/namespaces/vpc/v1/custom.go +++ b/v2/internal/namespaces/vpc/v1/custom.go @@ -1,7 +1,7 @@ package vpc import ( - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func GetCommands() *core.Commands { diff --git a/internal/namespaces/vpc/v1/custom_private_network.go b/v2/internal/namespaces/vpc/v1/custom_private_network.go similarity index 96% rename from internal/namespaces/vpc/v1/custom_private_network.go rename to v2/internal/namespaces/vpc/v1/custom_private_network.go index 6878b145ba..baab925a0d 100644 --- a/internal/namespaces/vpc/v1/custom_private_network.go +++ b/v2/internal/namespaces/vpc/v1/custom_private_network.go @@ -3,7 +3,7 @@ package vpc import ( "context" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/api/vpc/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/internal/namespaces/vpc/v1/custom_private_network_test.go b/v2/internal/namespaces/vpc/v1/custom_private_network_test.go similarity index 79% rename from internal/namespaces/vpc/v1/custom_private_network_test.go rename to v2/internal/namespaces/vpc/v1/custom_private_network_test.go index e5fa4f5361..a959b1c1d5 100644 --- a/internal/namespaces/vpc/v1/custom_private_network_test.go +++ b/v2/internal/namespaces/vpc/v1/custom_private_network_test.go @@ -3,8 +3,8 @@ package vpc import ( "testing" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces/instance/v1" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1" ) func Test_GetPrivateNetwork(t *testing.T) { diff --git a/internal/namespaces/vpc/v1/helper_test.go b/v2/internal/namespaces/vpc/v1/helper_test.go similarity index 93% rename from internal/namespaces/vpc/v1/helper_test.go rename to v2/internal/namespaces/vpc/v1/helper_test.go index dbbfc4ed64..063425ef2c 100644 --- a/internal/namespaces/vpc/v1/helper_test.go +++ b/v2/internal/namespaces/vpc/v1/helper_test.go @@ -1,7 +1,7 @@ package vpc import ( - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func createInstance() core.BeforeFunc { diff --git a/internal/namespaces/vpc/v1/testdata/test-get-private-network-simple.cassette.yaml b/v2/internal/namespaces/vpc/v1/testdata/test-get-private-network-simple.cassette.yaml similarity index 100% rename from internal/namespaces/vpc/v1/testdata/test-get-private-network-simple.cassette.yaml rename to v2/internal/namespaces/vpc/v1/testdata/test-get-private-network-simple.cassette.yaml diff --git a/internal/namespaces/vpc/v1/testdata/test-get-private-network-simple.golden b/v2/internal/namespaces/vpc/v1/testdata/test-get-private-network-simple.golden similarity index 100% rename from internal/namespaces/vpc/v1/testdata/test-get-private-network-simple.golden rename to v2/internal/namespaces/vpc/v1/testdata/test-get-private-network-simple.golden diff --git a/internal/namespaces/vpc/v1/vpc_cli.go b/v2/internal/namespaces/vpc/v1/vpc_cli.go similarity index 99% rename from internal/namespaces/vpc/v1/vpc_cli.go rename to v2/internal/namespaces/vpc/v1/vpc_cli.go index 48d2e399e0..a85a8925b9 100644 --- a/internal/namespaces/vpc/v1/vpc_cli.go +++ b/v2/internal/namespaces/vpc/v1/vpc_cli.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/api/vpc/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/internal/qa/ignore.go b/v2/internal/qa/ignore.go similarity index 93% rename from internal/qa/ignore.go rename to v2/internal/qa/ignore.go index a1eb2835cd..de3fe5649b 100644 --- a/internal/qa/ignore.go +++ b/v2/internal/qa/ignore.go @@ -3,8 +3,8 @@ package qa import ( "reflect" - "github.com/scaleway/scaleway-cli/internal/core" - "github.com/scaleway/scaleway-cli/internal/namespaces" + "github.com/scaleway/scaleway-cli/v2/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/namespaces" ) func filterIgnore(unfilteredErrors []error) []error { diff --git a/internal/qa/qa.go b/v2/internal/qa/qa.go similarity index 99% rename from internal/qa/qa.go rename to v2/internal/qa/qa.go index f10a80ea0e..9cbb8a0a85 100644 --- a/internal/qa/qa.go +++ b/v2/internal/qa/qa.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) func LintCommands(commands *core.Commands) []error { diff --git a/internal/sentry/sentry.go b/v2/internal/sentry/sentry.go similarity index 97% rename from internal/sentry/sentry.go rename to v2/internal/sentry/sentry.go index 688127be0c..76a3b94402 100644 --- a/internal/sentry/sentry.go +++ b/v2/internal/sentry/sentry.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/getsentry/raven-go" - "github.com/scaleway/scaleway-cli/internal/core" + "github.com/scaleway/scaleway-cli/v2/internal/core" "github.com/scaleway/scaleway-sdk-go/logger" ) diff --git a/internal/tabwriter/tabwriter.go b/v2/internal/tabwriter/tabwriter.go similarity index 100% rename from internal/tabwriter/tabwriter.go rename to v2/internal/tabwriter/tabwriter.go diff --git a/internal/tabwriter/tabwriter_test.go b/v2/internal/tabwriter/tabwriter_test.go similarity index 100% rename from internal/tabwriter/tabwriter_test.go rename to v2/internal/tabwriter/tabwriter_test.go diff --git a/internal/terminal/terminal.go b/v2/internal/terminal/terminal.go similarity index 100% rename from internal/terminal/terminal.go rename to v2/internal/terminal/terminal.go