From 5a841eedc90fa23b67556aff484ee439340e3d06 Mon Sep 17 00:00:00 2001 From: Toni Kangas Date: Wed, 18 Oct 2023 13:05:12 +0300 Subject: [PATCH 1/3] chore: update `v2` to `v3` in package name --- .ci/docs/main.go | 2 +- .goreleaser.yaml | 2 +- README.md | 2 +- cmd/upctl/main.go | 2 +- go.mod | 2 +- internal/commands/account/account.go | 2 +- internal/commands/account/show.go | 4 +- internal/commands/account/show_test.go | 8 ++-- internal/commands/all/all.go | 44 +++++++++---------- internal/commands/command.go | 8 ++-- internal/commands/database/database.go | 2 +- internal/commands/database/delete.go | 8 ++-- internal/commands/database/delete_test.go | 6 +-- internal/commands/database/index/delete.go | 8 ++-- .../commands/database/index/delete_test.go | 8 ++-- internal/commands/database/index/index.go | 2 +- internal/commands/database/index/list.go | 12 ++--- internal/commands/database/list.go | 8 ++-- internal/commands/database/list_test.go | 8 ++-- internal/commands/database/plans.go | 6 +-- internal/commands/database/plans_test.go | 8 ++-- .../database/properties/properties.go | 2 +- internal/commands/database/properties/show.go | 8 ++-- internal/commands/database/properties/type.go | 6 +-- internal/commands/database/session/cancel.go | 10 ++--- .../commands/database/session/cancel_test.go | 8 ++-- internal/commands/database/session/list.go | 12 ++--- internal/commands/database/session/session.go | 2 +- internal/commands/database/show.go | 12 ++--- internal/commands/database/start.go | 8 ++-- internal/commands/database/start_test.go | 8 ++-- internal/commands/database/stop.go | 8 ++-- internal/commands/database/stop_test.go | 8 ++-- internal/commands/database/types.go | 4 +- internal/commands/error.go | 2 +- internal/commands/executor.go | 8 ++-- internal/commands/executor_test.go | 4 +- internal/commands/ipaddress/assign.go | 12 ++--- internal/commands/ipaddress/assign_test.go | 6 +-- internal/commands/ipaddress/ip_address.go | 2 +- internal/commands/ipaddress/list.go | 8 ++-- internal/commands/ipaddress/list_test.go | 10 ++--- internal/commands/ipaddress/modify.go | 8 ++-- internal/commands/ipaddress/modify_test.go | 6 +-- internal/commands/ipaddress/remove.go | 8 ++-- internal/commands/ipaddress/remove_test.go | 6 +-- internal/commands/ipaddress/show.go | 12 ++--- internal/commands/ipaddress/show_test.go | 8 ++-- internal/commands/kubernetes/config.go | 8 ++-- internal/commands/kubernetes/config_test.go | 8 ++-- internal/commands/kubernetes/create.go | 14 +++--- internal/commands/kubernetes/create_test.go | 8 ++-- internal/commands/kubernetes/delete.go | 8 ++-- internal/commands/kubernetes/delete_test.go | 6 +-- internal/commands/kubernetes/kubernetes.go | 2 +- internal/commands/kubernetes/list.go | 8 ++-- internal/commands/kubernetes/list_test.go | 10 ++--- internal/commands/kubernetes/modify.go | 8 ++-- internal/commands/kubernetes/modify_test.go | 8 ++-- .../commands/kubernetes/nodegroup/create.go | 12 ++--- .../kubernetes/nodegroup/create_test.go | 8 ++-- .../commands/kubernetes/nodegroup/delete.go | 8 ++-- .../kubernetes/nodegroup/delete_test.go | 8 ++-- .../kubernetes/nodegroup/nodegroup.go | 2 +- .../commands/kubernetes/nodegroup/scale.go | 8 ++-- .../kubernetes/nodegroup/scale_test.go | 8 ++-- .../commands/kubernetes/nodegroup/show.go | 14 +++--- .../kubernetes/nodegroup/show_test.go | 8 ++-- internal/commands/kubernetes/plans.go | 4 +- internal/commands/kubernetes/show.go | 12 ++--- internal/commands/kubernetes/show_test.go | 8 ++-- internal/commands/kubernetes/versions.go | 4 +- internal/commands/kubernetes/wait.go | 2 +- internal/commands/loadbalancer/delete.go | 8 ++-- internal/commands/loadbalancer/delete_test.go | 6 +-- internal/commands/loadbalancer/list.go | 8 ++-- .../commands/loadbalancer/loadbalancer.go | 2 +- internal/commands/loadbalancer/plans.go | 4 +- internal/commands/loadbalancer/show.go | 14 +++--- internal/commands/network/create.go | 14 +++--- internal/commands/network/create_test.go | 8 ++-- internal/commands/network/delete.go | 8 ++-- internal/commands/network/delete_test.go | 6 +-- internal/commands/network/list.go | 8 ++-- internal/commands/network/list_test.go | 10 ++--- internal/commands/network/modify.go | 10 ++--- internal/commands/network/modify_test.go | 8 ++-- internal/commands/network/network.go | 4 +- internal/commands/network/show.go | 14 +++--- internal/commands/network/show_test.go | 8 ++-- internal/commands/root/version.go | 6 +-- internal/commands/router/create.go | 6 +-- internal/commands/router/create_test.go | 8 ++-- internal/commands/router/delete.go | 8 ++-- internal/commands/router/delete_test.go | 6 +-- internal/commands/router/list.go | 8 ++-- internal/commands/router/modify.go | 8 ++-- internal/commands/router/modify_test.go | 8 ++-- internal/commands/router/router.go | 2 +- internal/commands/router/show.go | 12 ++--- internal/commands/router/show_test.go | 10 ++--- internal/commands/runcommand.go | 10 ++--- internal/commands/runcommand_test.go | 10 ++--- internal/commands/server/create.go | 18 ++++---- internal/commands/server/create_test.go | 10 ++--- internal/commands/server/delete.go | 10 ++--- internal/commands/server/delete_test.go | 6 +-- internal/commands/server/eject.go | 8 ++-- internal/commands/server/eject_test.go | 6 +-- internal/commands/server/firewall/create.go | 8 ++-- .../commands/server/firewall/create_test.go | 8 ++-- internal/commands/server/firewall/delete.go | 8 ++-- .../commands/server/firewall/delete_test.go | 8 ++-- .../server/firewall/server_firewall.go | 2 +- internal/commands/server/firewall/show.go | 12 ++--- .../commands/server/firewall/show_test.go | 8 ++-- internal/commands/server/list.go | 8 ++-- internal/commands/server/list_test.go | 8 ++-- internal/commands/server/load.go | 10 ++--- internal/commands/server/load_test.go | 8 ++-- internal/commands/server/modify.go | 12 ++--- internal/commands/server/modify_test.go | 6 +-- .../server/networkinterface/create.go | 14 +++--- .../server/networkinterface/create_test.go | 6 +-- .../server/networkinterface/delete.go | 8 ++-- .../server/networkinterface/delete_test.go | 8 ++-- .../server/networkinterface/modify.go | 8 ++-- .../server/networkinterface/modify_test.go | 8 ++-- .../networkinterface/network_interface.go | 4 +- internal/commands/server/plan_list.go | 4 +- internal/commands/server/restart.go | 8 ++-- internal/commands/server/restart_test.go | 6 +-- internal/commands/server/server.go | 2 +- internal/commands/server/show.go | 14 +++--- internal/commands/server/show_test.go | 8 ++-- internal/commands/server/start.go | 8 ++-- internal/commands/server/start_test.go | 6 +-- internal/commands/server/stop.go | 10 ++--- internal/commands/server/stop_test.go | 6 +-- internal/commands/server/storage/attach.go | 12 ++--- .../commands/server/storage/attach_test.go | 8 ++-- internal/commands/server/storage/detach.go | 8 ++-- .../commands/server/storage/detach_test.go | 8 ++-- .../commands/server/storage/server_storage.go | 2 +- internal/commands/servergroup/create.go | 14 +++--- internal/commands/servergroup/create_test.go | 8 ++-- internal/commands/servergroup/delete.go | 8 ++-- internal/commands/servergroup/delete_test.go | 6 +-- internal/commands/servergroup/list.go | 8 ++-- internal/commands/servergroup/modify.go | 14 +++--- internal/commands/servergroup/modify_test.go | 8 ++-- internal/commands/servergroup/servergroup.go | 4 +- internal/commands/servergroup/show.go | 14 +++--- internal/commands/servergroup/show_test.go | 8 ++-- internal/commands/storage/backup/backup.go | 2 +- internal/commands/storage/backup/create.go | 10 ++--- .../commands/storage/backup/create_test.go | 8 ++-- internal/commands/storage/backup/restore.go | 8 ++-- .../commands/storage/backup/restore_test.go | 6 +-- internal/commands/storage/clone.go | 12 ++--- internal/commands/storage/clone_test.go | 8 ++-- internal/commands/storage/create.go | 12 ++--- internal/commands/storage/create_test.go | 8 ++-- internal/commands/storage/delete.go | 8 ++-- internal/commands/storage/delete_test.go | 6 +-- internal/commands/storage/import.go | 10 ++--- internal/commands/storage/import_test.go | 8 ++-- internal/commands/storage/list.go | 10 ++--- internal/commands/storage/list_test.go | 8 ++-- internal/commands/storage/modify.go | 10 ++--- internal/commands/storage/modify_test.go | 6 +-- internal/commands/storage/show.go | 14 +++--- internal/commands/storage/show_test.go | 8 ++-- internal/commands/storage/storage.go | 2 +- internal/commands/storage/templatize.go | 12 ++--- internal/commands/storage/templatize_test.go | 8 ++-- internal/commands/util.go | 2 +- internal/commands/util_test.go | 2 +- internal/commands/zone/list.go | 6 +-- internal/commands/zone/list_test.go | 8 ++-- internal/commands/zone/zone.go | 2 +- internal/completion/completionprovider.go | 2 +- internal/completion/database.go | 2 +- internal/completion/database_test.go | 4 +- internal/completion/helpers_test.go | 2 +- internal/completion/ipaddress.go | 2 +- internal/completion/ipaddress_test.go | 4 +- internal/completion/kubernetes.go | 2 +- internal/completion/kubernetes_test.go | 4 +- internal/completion/loadbalancer.go | 2 +- internal/completion/loadbalancer_test.go | 4 +- internal/completion/network.go | 2 +- internal/completion/network_test.go | 4 +- internal/completion/router.go | 2 +- internal/completion/router_test.go | 4 +- internal/completion/server.go | 2 +- internal/completion/server_test.go | 4 +- internal/completion/servergroup.go | 2 +- internal/completion/servergroup_test.go | 4 +- internal/completion/storage.go | 2 +- internal/completion/storage_test.go | 4 +- internal/completion/zone.go | 2 +- internal/config/config.go | 4 +- internal/core/core.go | 12 ++--- internal/format/common.go | 2 +- internal/format/database.go | 2 +- internal/labels/output.go | 2 +- internal/mockexecute/mockexecute.go | 8 ++-- internal/namedargs/complete.go | 4 +- internal/namedargs/network.go | 4 +- internal/namedargs/resolve.go | 4 +- internal/namedargs/server.go | 4 +- internal/output/combined.go | 2 +- internal/output/combined_test.go | 2 +- internal/output/details.go | 2 +- internal/output/details_test.go | 2 +- internal/output/error_test.go | 2 +- .../output/marshaledwithhumandetails_test.go | 2 +- .../output/marshaledwithhumanoutput_test.go | 2 +- internal/output/onlymarshaled_test.go | 2 +- internal/output/output_test.go | 2 +- internal/output/render.go | 2 +- internal/output/render_test.go | 4 +- internal/output/table.go | 4 +- internal/output/table_test.go | 2 +- internal/resolver/database.go | 2 +- internal/resolver/database_test.go | 4 +- internal/resolver/ipaddress.go | 2 +- internal/resolver/ipaddress_test.go | 4 +- internal/resolver/kubernetes.go | 2 +- internal/resolver/kubernetes_test.go | 4 +- internal/resolver/loadbalancer.go | 2 +- internal/resolver/loadbalancer_test.go | 4 +- internal/resolver/matchers.go | 2 +- internal/resolver/network.go | 2 +- internal/resolver/network_test.go | 4 +- internal/resolver/resolver.go | 2 +- internal/resolver/router.go | 2 +- internal/resolver/router_test.go | 4 +- internal/resolver/server.go | 2 +- internal/resolver/server_test.go | 4 +- internal/resolver/servergroup.go | 2 +- internal/resolver/servergroup_test.go | 4 +- internal/resolver/storage.go | 2 +- internal/resolver/storage_test.go | 4 +- internal/ui/datatable.go | 2 +- internal/ui/details.go | 2 +- 247 files changed, 804 insertions(+), 804 deletions(-) diff --git a/.ci/docs/main.go b/.ci/docs/main.go index 84c932134..4f4007940 100644 --- a/.ci/docs/main.go +++ b/.ci/docs/main.go @@ -3,7 +3,7 @@ package main import ( "log" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/core" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/core" "github.com/spf13/cobra" ) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 7d9653fee..c1fce5bbe 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -6,7 +6,7 @@ before: builds: - env: - CGO_ENABLED=0 - - GO_MODULE_NAME=github.com/UpCloudLtd/upcloud-cli/v2 + - GO_MODULE_NAME=github.com/UpCloudLtd/upcloud-cli/v3 goos: - linux - windows diff --git a/README.md b/README.md index d78eb46de..fdd54df32 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Use "upctl [command] --help" for more information about a command. Install the latest with Go by running: ```bash -go install github.com/UpCloudLtd/upcloud-cli/v2/...@latest +go install github.com/UpCloudLtd/upcloud-cli/v3/...@latest ``` To use upctl as a binary, download it from the diff --git a/cmd/upctl/main.go b/cmd/upctl/main.go index 0250586c0..d784eb71a 100644 --- a/cmd/upctl/main.go +++ b/cmd/upctl/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/core" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/core" ) func main() { diff --git a/go.mod b/go.mod index ba4752fdb..78b6581ff 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/UpCloudLtd/upcloud-cli/v2 +module github.com/UpCloudLtd/upcloud-cli/v3 go 1.20 diff --git a/internal/commands/account/account.go b/internal/commands/account/account.go index 5cfd2b91b..2cab39d7c 100644 --- a/internal/commands/account/account.go +++ b/internal/commands/account/account.go @@ -1,7 +1,7 @@ package account import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseAccountCommand creates the base 'account' command diff --git a/internal/commands/account/show.go b/internal/commands/account/show.go index cb9aef67a..73fd09b78 100644 --- a/internal/commands/account/show.go +++ b/internal/commands/account/show.go @@ -4,8 +4,8 @@ import ( "fmt" "math" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) // ShowCommand creates the 'account show' command diff --git a/internal/commands/account/show_test.go b/internal/commands/account/show_test.go index dafa240cd..b8845602d 100644 --- a/internal/commands/account/show_test.go +++ b/internal/commands/account/show_test.go @@ -5,10 +5,10 @@ import ( "github.com/jedib0t/go-pretty/v6/text" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/commands/all/all.go b/internal/commands/all/all.go index 4febf93b7..741dc4a1c 100644 --- a/internal/commands/all/all.go +++ b/internal/commands/all/all.go @@ -1,28 +1,28 @@ package all import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/account" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/database" - databaseindex "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/database/index" - databaseproperties "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/database/properties" - databasesession "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/database/session" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/ipaddress" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/kubernetes" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/kubernetes/nodegroup" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/loadbalancer" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/network" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/root" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/router" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/server" - serverfirewall "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/server/firewall" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/server/networkinterface" - serverstorage "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/server/storage" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/servergroup" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/storage" - storagebackup "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/storage/backup" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/zone" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/account" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/database" + databaseindex "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/database/index" + databaseproperties "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/database/properties" + databasesession "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/database/session" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/ipaddress" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/kubernetes" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/kubernetes/nodegroup" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/loadbalancer" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/network" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/root" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/router" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/server" + serverfirewall "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/server/firewall" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/server/networkinterface" + serverstorage "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/server/storage" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/servergroup" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/storage" + storagebackup "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/storage/backup" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/zone" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" "github.com/spf13/cobra" ) diff --git a/internal/commands/command.go b/internal/commands/command.go index 529a9e5d4..e43ce8469 100644 --- a/internal/commands/command.go +++ b/internal/commands/command.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/internal/commands/database/database.go b/internal/commands/database/database.go index 9dff49fe2..c212ce3e7 100644 --- a/internal/commands/database/database.go +++ b/internal/commands/database/database.go @@ -1,7 +1,7 @@ package database import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseDatabaseCommand creates the base "database" command diff --git a/internal/commands/database/delete.go b/internal/commands/database/delete.go index f30ef5650..a4fab0e89 100644 --- a/internal/commands/database/delete.go +++ b/internal/commands/database/delete.go @@ -3,10 +3,10 @@ package database import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/delete_test.go b/internal/commands/database/delete_test.go index 657c21eb1..96c0eae0d 100644 --- a/internal/commands/database/delete_test.go +++ b/internal/commands/database/delete_test.go @@ -3,9 +3,9 @@ package database import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/database/index/delete.go b/internal/commands/database/index/delete.go index c3b529328..623a6f4ef 100644 --- a/internal/commands/database/index/delete.go +++ b/internal/commands/database/index/delete.go @@ -3,10 +3,10 @@ package databaseindex import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/database/index/delete_test.go b/internal/commands/database/index/delete_test.go index 88b3dc5b6..5357cedbd 100644 --- a/internal/commands/database/index/delete_test.go +++ b/internal/commands/database/index/delete_test.go @@ -3,10 +3,10 @@ package databaseindex import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/stretchr/testify/assert" diff --git a/internal/commands/database/index/index.go b/internal/commands/database/index/index.go index d86aba801..c4e56fdb1 100644 --- a/internal/commands/database/index/index.go +++ b/internal/commands/database/index/index.go @@ -1,7 +1,7 @@ package databaseindex import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseIndexCommand creates the base "database index" command diff --git a/internal/commands/database/index/list.go b/internal/commands/database/index/list.go index 013e20761..07611a2a9 100644 --- a/internal/commands/database/index/list.go +++ b/internal/commands/database/index/list.go @@ -3,12 +3,12 @@ package databaseindex import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/list.go b/internal/commands/database/list.go index 2ccfef7be..87e1dc3cc 100644 --- a/internal/commands/database/list.go +++ b/internal/commands/database/list.go @@ -1,10 +1,10 @@ package database import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/list_test.go b/internal/commands/database/list_test.go index 61e9d6cdc..a77250a42 100644 --- a/internal/commands/database/list_test.go +++ b/internal/commands/database/list_test.go @@ -3,10 +3,10 @@ package database import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/commands/database/plans.go b/internal/commands/database/plans.go index c2af6d726..6216d1cd3 100644 --- a/internal/commands/database/plans.go +++ b/internal/commands/database/plans.go @@ -3,9 +3,9 @@ package database import ( "sort" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/plans_test.go b/internal/commands/database/plans_test.go index b2617ee17..741ac1eb2 100644 --- a/internal/commands/database/plans_test.go +++ b/internal/commands/database/plans_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/commands/database/properties/properties.go b/internal/commands/database/properties/properties.go index bc4139290..8d33bc34b 100644 --- a/internal/commands/database/properties/properties.go +++ b/internal/commands/database/properties/properties.go @@ -1,7 +1,7 @@ package databaseproperties import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // PropertiesCommand creates the "database properties" command diff --git a/internal/commands/database/properties/show.go b/internal/commands/database/properties/show.go index 38fb0813a..022065531 100644 --- a/internal/commands/database/properties/show.go +++ b/internal/commands/database/properties/show.go @@ -3,10 +3,10 @@ package databaseproperties import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/properties/type.go b/internal/commands/database/properties/type.go index 85061575f..52473c4e2 100644 --- a/internal/commands/database/properties/type.go +++ b/internal/commands/database/properties/type.go @@ -4,9 +4,9 @@ import ( "fmt" "sort" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/session/cancel.go b/internal/commands/database/session/cancel.go index 4c8bbdf19..c836d19af 100644 --- a/internal/commands/database/session/cancel.go +++ b/internal/commands/database/session/cancel.go @@ -3,11 +3,11 @@ package databasesession import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/database/session/cancel_test.go b/internal/commands/database/session/cancel_test.go index 599e0d5d6..afa775494 100644 --- a/internal/commands/database/session/cancel_test.go +++ b/internal/commands/database/session/cancel_test.go @@ -3,10 +3,10 @@ package databasesession import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/database/session/list.go b/internal/commands/database/session/list.go index c9e8181f5..a07c0fa00 100644 --- a/internal/commands/database/session/list.go +++ b/internal/commands/database/session/list.go @@ -3,12 +3,12 @@ package databasesession import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/database/session/session.go b/internal/commands/database/session/session.go index f48795d56..a6f6cbb36 100644 --- a/internal/commands/database/session/session.go +++ b/internal/commands/database/session/session.go @@ -1,7 +1,7 @@ package databasesession import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseSessionCommand creates the base "session" command diff --git a/internal/commands/database/show.go b/internal/commands/database/show.go index 3b7279bd2..c1aa5959b 100644 --- a/internal/commands/database/show.go +++ b/internal/commands/database/show.go @@ -1,12 +1,12 @@ package database import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/start.go b/internal/commands/database/start.go index 1290bf024..5f64afd54 100644 --- a/internal/commands/database/start.go +++ b/internal/commands/database/start.go @@ -3,10 +3,10 @@ package database import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/start_test.go b/internal/commands/database/start_test.go index b37aab1ae..e1054e4ce 100644 --- a/internal/commands/database/start_test.go +++ b/internal/commands/database/start_test.go @@ -3,10 +3,10 @@ package database import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/database/stop.go b/internal/commands/database/stop.go index 9898eee4a..226eb53d4 100644 --- a/internal/commands/database/stop.go +++ b/internal/commands/database/stop.go @@ -3,10 +3,10 @@ package database import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/database/stop_test.go b/internal/commands/database/stop_test.go index 761121372..6b0dfc1d1 100644 --- a/internal/commands/database/stop_test.go +++ b/internal/commands/database/stop_test.go @@ -3,10 +3,10 @@ package database import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/database/types.go b/internal/commands/database/types.go index 8e1fd3336..90a3ee700 100644 --- a/internal/commands/database/types.go +++ b/internal/commands/database/types.go @@ -1,8 +1,8 @@ package database import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/error.go b/internal/commands/error.go index 79af9cdc2..c38903149 100644 --- a/internal/commands/error.go +++ b/internal/commands/error.go @@ -2,7 +2,7 @@ package commands import ( "github.com/UpCloudLtd/progress/messages" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) // HandleError updates error details to progress log message identified by given key. Returns (nil, err), where err is the err passed in as input. diff --git a/internal/commands/executor.go b/internal/commands/executor.go index 60b6e24d0..6f2d79c5b 100644 --- a/internal/commands/executor.go +++ b/internal/commands/executor.go @@ -9,10 +9,10 @@ import ( "github.com/UpCloudLtd/progress" "github.com/UpCloudLtd/progress/messages" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/clierrors" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/clierrors" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/service" "github.com/gemalto/flume" diff --git a/internal/commands/executor_test.go b/internal/commands/executor_test.go index 57d1f8241..dae784c81 100644 --- a/internal/commands/executor_test.go +++ b/internal/commands/executor_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/gemalto/flume" "github.com/stretchr/testify/assert" diff --git a/internal/commands/ipaddress/assign.go b/internal/commands/ipaddress/assign.go index 4a099a977..84e82791a 100644 --- a/internal/commands/ipaddress/assign.go +++ b/internal/commands/ipaddress/assign.go @@ -3,12 +3,12 @@ package ipaddress import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/ipaddress/assign_test.go b/internal/commands/ipaddress/assign_test.go index f98df29d5..7f2cf509e 100644 --- a/internal/commands/ipaddress/assign_test.go +++ b/internal/commands/ipaddress/assign_test.go @@ -3,9 +3,9 @@ package ipaddress import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/ipaddress/ip_address.go b/internal/commands/ipaddress/ip_address.go index 0d4303898..50e6ebef5 100644 --- a/internal/commands/ipaddress/ip_address.go +++ b/internal/commands/ipaddress/ip_address.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" ) diff --git a/internal/commands/ipaddress/list.go b/internal/commands/ipaddress/list.go index 406ecf1b1..f5a1dfdfd 100644 --- a/internal/commands/ipaddress/list.go +++ b/internal/commands/ipaddress/list.go @@ -1,10 +1,10 @@ package ipaddress import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" ) // ListCommand creates the "ip-address list" command diff --git a/internal/commands/ipaddress/list_test.go b/internal/commands/ipaddress/list_test.go index a3c62433f..ea3c14feb 100644 --- a/internal/commands/ipaddress/list_test.go +++ b/internal/commands/ipaddress/list_test.go @@ -3,11 +3,11 @@ package ipaddress import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/testutils" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/testutils" "github.com/stretchr/testify/assert" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" diff --git a/internal/commands/ipaddress/modify.go b/internal/commands/ipaddress/modify.go index d8cc3cb0c..6385bd41b 100644 --- a/internal/commands/ipaddress/modify.go +++ b/internal/commands/ipaddress/modify.go @@ -3,10 +3,10 @@ package ipaddress import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" ) diff --git a/internal/commands/ipaddress/modify_test.go b/internal/commands/ipaddress/modify_test.go index d78bb8b49..f89180279 100644 --- a/internal/commands/ipaddress/modify_test.go +++ b/internal/commands/ipaddress/modify_test.go @@ -3,9 +3,9 @@ package ipaddress import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/ipaddress/remove.go b/internal/commands/ipaddress/remove.go index eeec65924..cdb0a3827 100644 --- a/internal/commands/ipaddress/remove.go +++ b/internal/commands/ipaddress/remove.go @@ -3,10 +3,10 @@ package ipaddress import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/ipaddress/remove_test.go b/internal/commands/ipaddress/remove_test.go index a67fd428a..bd8a88a0d 100644 --- a/internal/commands/ipaddress/remove_test.go +++ b/internal/commands/ipaddress/remove_test.go @@ -3,9 +3,9 @@ package ipaddress import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/ipaddress/show.go b/internal/commands/ipaddress/show.go index 20ea7dfa4..1783e67a9 100644 --- a/internal/commands/ipaddress/show.go +++ b/internal/commands/ipaddress/show.go @@ -1,12 +1,12 @@ package ipaddress import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/ipaddress/show_test.go b/internal/commands/ipaddress/show_test.go index 6f8de48fb..b95a94bad 100644 --- a/internal/commands/ipaddress/show_test.go +++ b/internal/commands/ipaddress/show_test.go @@ -4,10 +4,10 @@ import ( "bytes" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/config.go b/internal/commands/kubernetes/config.go index 0035e9a25..b2f740b67 100644 --- a/internal/commands/kubernetes/config.go +++ b/internal/commands/kubernetes/config.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/kubernetes/config_test.go b/internal/commands/kubernetes/config_test.go index d0b1253b7..dd77fe130 100644 --- a/internal/commands/kubernetes/config_test.go +++ b/internal/commands/kubernetes/config_test.go @@ -7,10 +7,10 @@ import ( "os" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/create.go b/internal/commands/kubernetes/create.go index 059d7f9d1..6abc63aef 100644 --- a/internal/commands/kubernetes/create.go +++ b/internal/commands/kubernetes/create.go @@ -3,13 +3,13 @@ package kubernetes import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/kubernetes/nodegroup" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/kubernetes/nodegroup" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/create_test.go b/internal/commands/kubernetes/create_test.go index efd70680c..b940f92cc 100644 --- a/internal/commands/kubernetes/create_test.go +++ b/internal/commands/kubernetes/create_test.go @@ -3,10 +3,10 @@ package kubernetes import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/delete.go b/internal/commands/kubernetes/delete.go index 50e3628ea..a42e3e697 100644 --- a/internal/commands/kubernetes/delete.go +++ b/internal/commands/kubernetes/delete.go @@ -3,10 +3,10 @@ package kubernetes import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/kubernetes/delete_test.go b/internal/commands/kubernetes/delete_test.go index 1cc019456..a2856fb15 100644 --- a/internal/commands/kubernetes/delete_test.go +++ b/internal/commands/kubernetes/delete_test.go @@ -3,9 +3,9 @@ package kubernetes import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/kubernetes.go b/internal/commands/kubernetes/kubernetes.go index e41d392d7..75d40148a 100644 --- a/internal/commands/kubernetes/kubernetes.go +++ b/internal/commands/kubernetes/kubernetes.go @@ -1,7 +1,7 @@ package kubernetes import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseKubernetesCommand creates the base "kubernetes" command diff --git a/internal/commands/kubernetes/list.go b/internal/commands/kubernetes/list.go index f88715564..32fcdecf9 100644 --- a/internal/commands/kubernetes/list.go +++ b/internal/commands/kubernetes/list.go @@ -1,10 +1,10 @@ package kubernetes import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/kubernetes/list_test.go b/internal/commands/kubernetes/list_test.go index ac3d1c0df..93a796753 100644 --- a/internal/commands/kubernetes/list_test.go +++ b/internal/commands/kubernetes/list_test.go @@ -3,11 +3,11 @@ package kubernetes import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/testutils" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/testutils" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/commands/kubernetes/modify.go b/internal/commands/kubernetes/modify.go index 83b6e0118..96c1547fa 100644 --- a/internal/commands/kubernetes/modify.go +++ b/internal/commands/kubernetes/modify.go @@ -3,10 +3,10 @@ package kubernetes import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/kubernetes/modify_test.go b/internal/commands/kubernetes/modify_test.go index 9d7b17c06..b3486ffc7 100644 --- a/internal/commands/kubernetes/modify_test.go +++ b/internal/commands/kubernetes/modify_test.go @@ -3,10 +3,10 @@ package kubernetes import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/nodegroup/create.go b/internal/commands/kubernetes/nodegroup/create.go index 8becfab78..0d513d793 100644 --- a/internal/commands/kubernetes/nodegroup/create.go +++ b/internal/commands/kubernetes/nodegroup/create.go @@ -5,12 +5,12 @@ import ( "regexp" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/nodegroup/create_test.go b/internal/commands/kubernetes/nodegroup/create_test.go index fe874ce32..c7a1490b6 100644 --- a/internal/commands/kubernetes/nodegroup/create_test.go +++ b/internal/commands/kubernetes/nodegroup/create_test.go @@ -3,10 +3,10 @@ package nodegroup import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/nodegroup/delete.go b/internal/commands/kubernetes/nodegroup/delete.go index a994ea56c..6a3e1c9db 100644 --- a/internal/commands/kubernetes/nodegroup/delete.go +++ b/internal/commands/kubernetes/nodegroup/delete.go @@ -3,10 +3,10 @@ package nodegroup import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" ) diff --git a/internal/commands/kubernetes/nodegroup/delete_test.go b/internal/commands/kubernetes/nodegroup/delete_test.go index 350dda546..4b3ff9c04 100644 --- a/internal/commands/kubernetes/nodegroup/delete_test.go +++ b/internal/commands/kubernetes/nodegroup/delete_test.go @@ -3,10 +3,10 @@ package nodegroup import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/stretchr/testify/assert" diff --git a/internal/commands/kubernetes/nodegroup/nodegroup.go b/internal/commands/kubernetes/nodegroup/nodegroup.go index 71ab4e90a..944bf2684 100644 --- a/internal/commands/kubernetes/nodegroup/nodegroup.go +++ b/internal/commands/kubernetes/nodegroup/nodegroup.go @@ -1,7 +1,7 @@ package nodegroup import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseNodeGroupCommand creates the base "kubernetes nodegroups" command diff --git a/internal/commands/kubernetes/nodegroup/scale.go b/internal/commands/kubernetes/nodegroup/scale.go index 2f14734d8..cac1c6934 100644 --- a/internal/commands/kubernetes/nodegroup/scale.go +++ b/internal/commands/kubernetes/nodegroup/scale.go @@ -3,10 +3,10 @@ package nodegroup import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" ) diff --git a/internal/commands/kubernetes/nodegroup/scale_test.go b/internal/commands/kubernetes/nodegroup/scale_test.go index 20dbc94f7..8d1c8e397 100644 --- a/internal/commands/kubernetes/nodegroup/scale_test.go +++ b/internal/commands/kubernetes/nodegroup/scale_test.go @@ -3,10 +3,10 @@ package nodegroup import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/nodegroup/show.go b/internal/commands/kubernetes/nodegroup/show.go index 13f958637..d49340362 100644 --- a/internal/commands/kubernetes/nodegroup/show.go +++ b/internal/commands/kubernetes/nodegroup/show.go @@ -1,13 +1,13 @@ package nodegroup import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/spf13/pflag" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/nodegroup/show_test.go b/internal/commands/kubernetes/nodegroup/show_test.go index cc4929314..0bb9d55af 100644 --- a/internal/commands/kubernetes/nodegroup/show_test.go +++ b/internal/commands/kubernetes/nodegroup/show_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/commands/kubernetes/plans.go b/internal/commands/kubernetes/plans.go index d5daf8805..e6d84be6c 100644 --- a/internal/commands/kubernetes/plans.go +++ b/internal/commands/kubernetes/plans.go @@ -1,8 +1,8 @@ package kubernetes import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/kubernetes/show.go b/internal/commands/kubernetes/show.go index fdf0b986f..6f3636cf0 100644 --- a/internal/commands/kubernetes/show.go +++ b/internal/commands/kubernetes/show.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/jedib0t/go-pretty/v6/text" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/kubernetes/show_test.go b/internal/commands/kubernetes/show_test.go index 4759a794f..ee58d4640 100644 --- a/internal/commands/kubernetes/show_test.go +++ b/internal/commands/kubernetes/show_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/commands/kubernetes/versions.go b/internal/commands/kubernetes/versions.go index 711f53fe5..20d847961 100644 --- a/internal/commands/kubernetes/versions.go +++ b/internal/commands/kubernetes/versions.go @@ -1,8 +1,8 @@ package kubernetes import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/kubernetes/wait.go b/internal/commands/kubernetes/wait.go index 22a5017d2..5215e3ed7 100644 --- a/internal/commands/kubernetes/wait.go +++ b/internal/commands/kubernetes/wait.go @@ -5,7 +5,7 @@ import ( "time" "github.com/UpCloudLtd/progress/messages" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/loadbalancer/delete.go b/internal/commands/loadbalancer/delete.go index 283da45f0..051a0c070 100644 --- a/internal/commands/loadbalancer/delete.go +++ b/internal/commands/loadbalancer/delete.go @@ -3,10 +3,10 @@ package loadbalancer import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/loadbalancer/delete_test.go b/internal/commands/loadbalancer/delete_test.go index 1bc93bdbc..fd73c96ca 100644 --- a/internal/commands/loadbalancer/delete_test.go +++ b/internal/commands/loadbalancer/delete_test.go @@ -3,9 +3,9 @@ package loadbalancer import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/loadbalancer/list.go b/internal/commands/loadbalancer/list.go index a482980a7..87e5c7786 100644 --- a/internal/commands/loadbalancer/list.go +++ b/internal/commands/loadbalancer/list.go @@ -1,10 +1,10 @@ package loadbalancer import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/loadbalancer/loadbalancer.go b/internal/commands/loadbalancer/loadbalancer.go index 6ce2e7271..72d858b77 100644 --- a/internal/commands/loadbalancer/loadbalancer.go +++ b/internal/commands/loadbalancer/loadbalancer.go @@ -1,7 +1,7 @@ package loadbalancer import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseLoadBalancerCommand creates the base "loadbalancer" command diff --git a/internal/commands/loadbalancer/plans.go b/internal/commands/loadbalancer/plans.go index 1d36c8ec3..10236f962 100644 --- a/internal/commands/loadbalancer/plans.go +++ b/internal/commands/loadbalancer/plans.go @@ -1,8 +1,8 @@ package loadbalancer import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/loadbalancer/show.go b/internal/commands/loadbalancer/show.go index b3cc20538..f392e3fce 100644 --- a/internal/commands/loadbalancer/show.go +++ b/internal/commands/loadbalancer/show.go @@ -3,13 +3,13 @@ package loadbalancer import ( "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/internal/commands/network/create.go b/internal/commands/network/create.go index 4b57fd676..e4da65746 100644 --- a/internal/commands/network/create.go +++ b/internal/commands/network/create.go @@ -3,13 +3,13 @@ package network import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/ipaddress" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/ipaddress" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/network/create_test.go b/internal/commands/network/create_test.go index 4eb217ab9..472148a83 100644 --- a/internal/commands/network/create_test.go +++ b/internal/commands/network/create_test.go @@ -3,10 +3,10 @@ package network import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/network/delete.go b/internal/commands/network/delete.go index a0dbc1ac3..f7c327afb 100644 --- a/internal/commands/network/delete.go +++ b/internal/commands/network/delete.go @@ -3,10 +3,10 @@ package network import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/network/delete_test.go b/internal/commands/network/delete_test.go index 2c5f2cad0..c6ceef92c 100644 --- a/internal/commands/network/delete_test.go +++ b/internal/commands/network/delete_test.go @@ -3,9 +3,9 @@ package network import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/network/list.go b/internal/commands/network/list.go index befe2da6f..625703c28 100644 --- a/internal/commands/network/list.go +++ b/internal/commands/network/list.go @@ -1,10 +1,10 @@ package network import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/network/list_test.go b/internal/commands/network/list_test.go index 449e6b31c..75d1910a5 100644 --- a/internal/commands/network/list_test.go +++ b/internal/commands/network/list_test.go @@ -3,11 +3,11 @@ package network import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/network/modify.go b/internal/commands/network/modify.go index 9d4d0364a..d27251aff 100644 --- a/internal/commands/network/modify.go +++ b/internal/commands/network/modify.go @@ -7,11 +7,11 @@ import ( "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" ) type modifyCommand struct { diff --git a/internal/commands/network/modify_test.go b/internal/commands/network/modify_test.go index d13bedd65..e5052b0f9 100644 --- a/internal/commands/network/modify_test.go +++ b/internal/commands/network/modify_test.go @@ -3,10 +3,10 @@ package network import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/network/network.go b/internal/commands/network/network.go index 7fca22ab2..eb92882f5 100644 --- a/internal/commands/network/network.go +++ b/internal/commands/network/network.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/pflag" ) diff --git a/internal/commands/network/show.go b/internal/commands/network/show.go index 2ace9fc79..6b0b284d5 100644 --- a/internal/commands/network/show.go +++ b/internal/commands/network/show.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/internal/commands/network/show_test.go b/internal/commands/network/show_test.go index a8dbb8600..6d0e1c54c 100644 --- a/internal/commands/network/show_test.go +++ b/internal/commands/network/show_test.go @@ -6,10 +6,10 @@ import ( "github.com/jedib0t/go-pretty/v6/text" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/root/version.go b/internal/commands/root/version.go index c15414b14..71f2679f8 100644 --- a/internal/commands/root/version.go +++ b/internal/commands/root/version.go @@ -3,9 +3,9 @@ package root import ( "runtime" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) // VersionCommand reports the current version of upctl diff --git a/internal/commands/router/create.go b/internal/commands/router/create.go index 59186dac0..69de4ef3e 100644 --- a/internal/commands/router/create.go +++ b/internal/commands/router/create.go @@ -3,9 +3,9 @@ package router import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" ) diff --git a/internal/commands/router/create_test.go b/internal/commands/router/create_test.go index a09962872..06ebdfeb7 100644 --- a/internal/commands/router/create_test.go +++ b/internal/commands/router/create_test.go @@ -3,10 +3,10 @@ package router import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/router/delete.go b/internal/commands/router/delete.go index 94ecfb6f4..2e120837a 100644 --- a/internal/commands/router/delete.go +++ b/internal/commands/router/delete.go @@ -3,10 +3,10 @@ package router import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/router/delete_test.go b/internal/commands/router/delete_test.go index 7ebcd5ba6..0fd5a1f8f 100644 --- a/internal/commands/router/delete_test.go +++ b/internal/commands/router/delete_test.go @@ -3,9 +3,9 @@ package router import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/router/list.go b/internal/commands/router/list.go index 85505c6a1..bd05182db 100644 --- a/internal/commands/router/list.go +++ b/internal/commands/router/list.go @@ -1,10 +1,10 @@ package router import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/pflag" ) diff --git a/internal/commands/router/modify.go b/internal/commands/router/modify.go index f72b3ea69..4b92a6bc8 100644 --- a/internal/commands/router/modify.go +++ b/internal/commands/router/modify.go @@ -3,10 +3,10 @@ package router import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" ) diff --git a/internal/commands/router/modify_test.go b/internal/commands/router/modify_test.go index e59dc9f54..17e01e91b 100644 --- a/internal/commands/router/modify_test.go +++ b/internal/commands/router/modify_test.go @@ -3,10 +3,10 @@ package router import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/router/router.go b/internal/commands/router/router.go index bccff15fc..ee2cfc350 100644 --- a/internal/commands/router/router.go +++ b/internal/commands/router/router.go @@ -1,7 +1,7 @@ package router import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) const maxRouterActions = 10 diff --git a/internal/commands/router/show.go b/internal/commands/router/show.go index 4e896c952..c2afdd65b 100644 --- a/internal/commands/router/show.go +++ b/internal/commands/router/show.go @@ -4,12 +4,12 @@ import ( "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" ) // ShowCommand creates the "router show" command diff --git a/internal/commands/router/show_test.go b/internal/commands/router/show_test.go index c1700e8f4..9e8bf930e 100644 --- a/internal/commands/router/show_test.go +++ b/internal/commands/router/show_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" ) func TestShowCommand(t *testing.T) { diff --git a/internal/commands/runcommand.go b/internal/commands/runcommand.go index a12fe7994..6456497a2 100644 --- a/internal/commands/runcommand.go +++ b/internal/commands/runcommand.go @@ -3,11 +3,11 @@ package commands import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/clierrors" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/clierrors" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/gemalto/flume" ) diff --git a/internal/commands/runcommand_test.go b/internal/commands/runcommand_test.go index a153812ae..bf9904cfe 100644 --- a/internal/commands/runcommand_test.go +++ b/internal/commands/runcommand_test.go @@ -8,11 +8,11 @@ import ( "os" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/gemalto/flume" "github.com/spf13/cobra" diff --git a/internal/commands/server/create.go b/internal/commands/server/create.go index a7cd0c55a..a13a8e83e 100644 --- a/internal/commands/server/create.go +++ b/internal/commands/server/create.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/ipaddress" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/storage" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/ipaddress" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/storage" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/create_test.go b/internal/commands/server/create_test.go index feeddb6ce..b21bbe566 100644 --- a/internal/commands/server/create_test.go +++ b/internal/commands/server/create_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/storage" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/storage" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/delete.go b/internal/commands/server/delete.go index 2df8174fb..8cebac317 100644 --- a/internal/commands/server/delete.go +++ b/internal/commands/server/delete.go @@ -3,11 +3,11 @@ package server import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/server/delete_test.go b/internal/commands/server/delete_test.go index 03af20b76..13fb425d2 100644 --- a/internal/commands/server/delete_test.go +++ b/internal/commands/server/delete_test.go @@ -3,9 +3,9 @@ package server import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/gemalto/flume" diff --git a/internal/commands/server/eject.go b/internal/commands/server/eject.go index c0979d3b8..f725bb35d 100644 --- a/internal/commands/server/eject.go +++ b/internal/commands/server/eject.go @@ -3,10 +3,10 @@ package server import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/server/eject_test.go b/internal/commands/server/eject_test.go index 5d7aa77d5..3113de3c6 100644 --- a/internal/commands/server/eject_test.go +++ b/internal/commands/server/eject_test.go @@ -3,9 +3,9 @@ package server import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/firewall/create.go b/internal/commands/server/firewall/create.go index 65eff3374..a7966190a 100644 --- a/internal/commands/server/firewall/create.go +++ b/internal/commands/server/firewall/create.go @@ -3,10 +3,10 @@ package serverfirewall import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/m7shapan/cidr" diff --git a/internal/commands/server/firewall/create_test.go b/internal/commands/server/firewall/create_test.go index b88d968ba..4e067dc1c 100644 --- a/internal/commands/server/firewall/create_test.go +++ b/internal/commands/server/firewall/create_test.go @@ -3,10 +3,10 @@ package serverfirewall import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/firewall/delete.go b/internal/commands/server/firewall/delete.go index 69f628ffa..4252ffe09 100644 --- a/internal/commands/server/firewall/delete.go +++ b/internal/commands/server/firewall/delete.go @@ -3,10 +3,10 @@ package serverfirewall import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" ) diff --git a/internal/commands/server/firewall/delete_test.go b/internal/commands/server/firewall/delete_test.go index 08cf00aef..66f9112dc 100644 --- a/internal/commands/server/firewall/delete_test.go +++ b/internal/commands/server/firewall/delete_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/commands/server/firewall/server_firewall.go b/internal/commands/server/firewall/server_firewall.go index b35254a42..d0d631daf 100644 --- a/internal/commands/server/firewall/server_firewall.go +++ b/internal/commands/server/firewall/server_firewall.go @@ -1,7 +1,7 @@ package serverfirewall import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseServerFirewallCommand is the root command for all 'server firewall' commands diff --git a/internal/commands/server/firewall/show.go b/internal/commands/server/firewall/show.go index 924a74102..5203ec431 100644 --- a/internal/commands/server/firewall/show.go +++ b/internal/commands/server/firewall/show.go @@ -6,16 +6,16 @@ import ( "strings" "sync" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/jedib0t/go-pretty/v6/text" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // ShowCommand is the 'server firewall show' command, displaying firewall details diff --git a/internal/commands/server/firewall/show_test.go b/internal/commands/server/firewall/show_test.go index 43f5157c1..73d87cb54 100644 --- a/internal/commands/server/firewall/show_test.go +++ b/internal/commands/server/firewall/show_test.go @@ -4,10 +4,10 @@ import ( "bytes" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/list.go b/internal/commands/server/list.go index ca10abbb6..9be82a3c8 100644 --- a/internal/commands/server/list.go +++ b/internal/commands/server/list.go @@ -6,10 +6,10 @@ import ( "strings" "sync" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/commands/server/list_test.go b/internal/commands/server/list_test.go index a62d99de2..89c490b50 100644 --- a/internal/commands/server/list_test.go +++ b/internal/commands/server/list_test.go @@ -3,10 +3,10 @@ package server import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/load.go b/internal/commands/server/load.go index 09cd20064..ba02ba5ea 100644 --- a/internal/commands/server/load.go +++ b/internal/commands/server/load.go @@ -3,11 +3,11 @@ package server import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/storage" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/storage" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/server/load_test.go b/internal/commands/server/load_test.go index e556fb002..c72cc65f9 100644 --- a/internal/commands/server/load_test.go +++ b/internal/commands/server/load_test.go @@ -3,10 +3,10 @@ package server import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/modify.go b/internal/commands/server/modify.go index d52859342..11ac86528 100644 --- a/internal/commands/server/modify.go +++ b/internal/commands/server/modify.go @@ -3,12 +3,12 @@ package server import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/server/modify_test.go b/internal/commands/server/modify_test.go index d947686c2..4b30915c5 100644 --- a/internal/commands/server/modify_test.go +++ b/internal/commands/server/modify_test.go @@ -3,9 +3,9 @@ package server import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/networkinterface/create.go b/internal/commands/server/networkinterface/create.go index 1786b0797..75f004982 100644 --- a/internal/commands/server/networkinterface/create.go +++ b/internal/commands/server/networkinterface/create.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/jedib0t/go-pretty/v6/text" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" diff --git a/internal/commands/server/networkinterface/create_test.go b/internal/commands/server/networkinterface/create_test.go index 7113af315..bda18f7af 100644 --- a/internal/commands/server/networkinterface/create_test.go +++ b/internal/commands/server/networkinterface/create_test.go @@ -3,9 +3,9 @@ package networkinterface import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/networkinterface/delete.go b/internal/commands/server/networkinterface/delete.go index fff8a3dbb..babceff23 100644 --- a/internal/commands/server/networkinterface/delete.go +++ b/internal/commands/server/networkinterface/delete.go @@ -3,10 +3,10 @@ package networkinterface import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" ) diff --git a/internal/commands/server/networkinterface/delete_test.go b/internal/commands/server/networkinterface/delete_test.go index 4bb895895..955c03fc5 100644 --- a/internal/commands/server/networkinterface/delete_test.go +++ b/internal/commands/server/networkinterface/delete_test.go @@ -3,10 +3,10 @@ package networkinterface import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/networkinterface/modify.go b/internal/commands/server/networkinterface/modify.go index 2ca37d579..5d5d9fc74 100644 --- a/internal/commands/server/networkinterface/modify.go +++ b/internal/commands/server/networkinterface/modify.go @@ -3,12 +3,12 @@ package networkinterface import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" ) diff --git a/internal/commands/server/networkinterface/modify_test.go b/internal/commands/server/networkinterface/modify_test.go index fd93708a5..999ab97f9 100644 --- a/internal/commands/server/networkinterface/modify_test.go +++ b/internal/commands/server/networkinterface/modify_test.go @@ -3,10 +3,10 @@ package networkinterface import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/networkinterface/network_interface.go b/internal/commands/server/networkinterface/network_interface.go index ee38fcb8f..f2bace0c0 100644 --- a/internal/commands/server/networkinterface/network_interface.go +++ b/internal/commands/server/networkinterface/network_interface.go @@ -1,8 +1,8 @@ package networkinterface import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/ipaddress" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/ipaddress" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/server/plan_list.go b/internal/commands/server/plan_list.go index fe42372e0..815658b5c 100644 --- a/internal/commands/server/plan_list.go +++ b/internal/commands/server/plan_list.go @@ -1,8 +1,8 @@ package server import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) // PlanListCommand creates the "server plans" command diff --git a/internal/commands/server/restart.go b/internal/commands/server/restart.go index 40d656039..1e5d764ee 100644 --- a/internal/commands/server/restart.go +++ b/internal/commands/server/restart.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/server/restart_test.go b/internal/commands/server/restart_test.go index 97bf69eef..4fe85ce85 100644 --- a/internal/commands/server/restart_test.go +++ b/internal/commands/server/restart_test.go @@ -3,9 +3,9 @@ package server import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/server.go b/internal/commands/server/server.go index c40381f9b..964a86592 100644 --- a/internal/commands/server/server.go +++ b/internal/commands/server/server.go @@ -5,7 +5,7 @@ import ( "time" "github.com/UpCloudLtd/progress/messages" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/server/show.go b/internal/commands/server/show.go index 30e0a06b7..76f553104 100644 --- a/internal/commands/server/show.go +++ b/internal/commands/server/show.go @@ -5,13 +5,13 @@ import ( "strings" "sync" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/jedib0t/go-pretty/v6/text" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" diff --git a/internal/commands/server/show_test.go b/internal/commands/server/show_test.go index 5f45a8608..e92c50518 100644 --- a/internal/commands/server/show_test.go +++ b/internal/commands/server/show_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/start.go b/internal/commands/server/start.go index d21d9a78a..283ef8846 100644 --- a/internal/commands/server/start.go +++ b/internal/commands/server/start.go @@ -3,10 +3,10 @@ package server import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/server/start_test.go b/internal/commands/server/start_test.go index 428815ca9..c07bf645e 100644 --- a/internal/commands/server/start_test.go +++ b/internal/commands/server/start_test.go @@ -3,9 +3,9 @@ package server import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/stop.go b/internal/commands/server/stop.go index 194a5943b..8ef93d48e 100644 --- a/internal/commands/server/stop.go +++ b/internal/commands/server/stop.go @@ -3,11 +3,11 @@ package server import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/stop_test.go b/internal/commands/server/stop_test.go index 853e6f93d..0c7912e2c 100644 --- a/internal/commands/server/stop_test.go +++ b/internal/commands/server/stop_test.go @@ -3,9 +3,9 @@ package server import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/storage/attach.go b/internal/commands/server/storage/attach.go index 4e166cfcd..641c1f907 100644 --- a/internal/commands/server/storage/attach.go +++ b/internal/commands/server/storage/attach.go @@ -3,12 +3,12 @@ package serverstorage import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/storage" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/storage" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/server/storage/attach_test.go b/internal/commands/server/storage/attach_test.go index 7d4386a41..74c9bb303 100644 --- a/internal/commands/server/storage/attach_test.go +++ b/internal/commands/server/storage/attach_test.go @@ -3,10 +3,10 @@ package serverstorage import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/storage/detach.go b/internal/commands/server/storage/detach.go index 656a675f5..a960d8de2 100644 --- a/internal/commands/server/storage/detach.go +++ b/internal/commands/server/storage/detach.go @@ -3,10 +3,10 @@ package serverstorage import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/server/storage/detach_test.go b/internal/commands/server/storage/detach_test.go index 9bbc5d29f..893e22c11 100644 --- a/internal/commands/server/storage/detach_test.go +++ b/internal/commands/server/storage/detach_test.go @@ -3,10 +3,10 @@ package serverstorage import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/server/storage/server_storage.go b/internal/commands/server/storage/server_storage.go index f36d0969b..548c467a7 100644 --- a/internal/commands/server/storage/server_storage.go +++ b/internal/commands/server/storage/server_storage.go @@ -1,7 +1,7 @@ package serverstorage import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) const ( diff --git a/internal/commands/servergroup/create.go b/internal/commands/servergroup/create.go index ba53fcd13..314de84f9 100644 --- a/internal/commands/servergroup/create.go +++ b/internal/commands/servergroup/create.go @@ -3,13 +3,13 @@ package servergroup import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/servergroup/create_test.go b/internal/commands/servergroup/create_test.go index 3673d32f4..f58493fe5 100644 --- a/internal/commands/servergroup/create_test.go +++ b/internal/commands/servergroup/create_test.go @@ -3,10 +3,10 @@ package servergroup import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/servergroup/delete.go b/internal/commands/servergroup/delete.go index c64b45246..a8dbd76f4 100644 --- a/internal/commands/servergroup/delete.go +++ b/internal/commands/servergroup/delete.go @@ -3,10 +3,10 @@ package servergroup import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/servergroup/delete_test.go b/internal/commands/servergroup/delete_test.go index 5bc4a8b60..463810ae2 100644 --- a/internal/commands/servergroup/delete_test.go +++ b/internal/commands/servergroup/delete_test.go @@ -3,9 +3,9 @@ package servergroup import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/servergroup/list.go b/internal/commands/servergroup/list.go index e80ee4d95..d528d2d94 100644 --- a/internal/commands/servergroup/list.go +++ b/internal/commands/servergroup/list.go @@ -1,10 +1,10 @@ package servergroup import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/servergroup/modify.go b/internal/commands/servergroup/modify.go index 74f92cb1d..422ed930f 100644 --- a/internal/commands/servergroup/modify.go +++ b/internal/commands/servergroup/modify.go @@ -3,13 +3,13 @@ package servergroup import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" diff --git a/internal/commands/servergroup/modify_test.go b/internal/commands/servergroup/modify_test.go index d7e50f724..67d2d9b78 100644 --- a/internal/commands/servergroup/modify_test.go +++ b/internal/commands/servergroup/modify_test.go @@ -3,10 +3,10 @@ package servergroup import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/servergroup/servergroup.go b/internal/commands/servergroup/servergroup.go index 24d20fea7..5bc5b508d 100644 --- a/internal/commands/servergroup/servergroup.go +++ b/internal/commands/servergroup/servergroup.go @@ -1,8 +1,8 @@ package servergroup import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" ) diff --git a/internal/commands/servergroup/show.go b/internal/commands/servergroup/show.go index e81307047..16b8ad69a 100644 --- a/internal/commands/servergroup/show.go +++ b/internal/commands/servergroup/show.go @@ -3,13 +3,13 @@ package servergroup import ( "strconv" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/servergroup/show_test.go b/internal/commands/servergroup/show_test.go index 228cb68df..ad19d4d3e 100644 --- a/internal/commands/servergroup/show_test.go +++ b/internal/commands/servergroup/show_test.go @@ -6,10 +6,10 @@ import ( "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/commands/storage/backup/backup.go b/internal/commands/storage/backup/backup.go index eeb5e2f4a..480d4cdd4 100644 --- a/internal/commands/storage/backup/backup.go +++ b/internal/commands/storage/backup/backup.go @@ -1,6 +1,6 @@ package storagebackup -import "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" +import "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" // BackupCommand creates the "storage backup" command func BackupCommand() commands.Command { diff --git a/internal/commands/storage/backup/create.go b/internal/commands/storage/backup/create.go index 1dddfd53e..293ab7c5b 100644 --- a/internal/commands/storage/backup/create.go +++ b/internal/commands/storage/backup/create.go @@ -3,11 +3,11 @@ package storagebackup import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/pflag" diff --git a/internal/commands/storage/backup/create_test.go b/internal/commands/storage/backup/create_test.go index 1a6d559b7..0b69ca7b7 100644 --- a/internal/commands/storage/backup/create_test.go +++ b/internal/commands/storage/backup/create_test.go @@ -3,10 +3,10 @@ package storagebackup import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/backup/restore.go b/internal/commands/storage/backup/restore.go index 528859e54..172c36934 100644 --- a/internal/commands/storage/backup/restore.go +++ b/internal/commands/storage/backup/restore.go @@ -3,10 +3,10 @@ package storagebackup import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/storage/backup/restore_test.go b/internal/commands/storage/backup/restore_test.go index 24f9dcf42..9be7a0ab0 100644 --- a/internal/commands/storage/backup/restore_test.go +++ b/internal/commands/storage/backup/restore_test.go @@ -5,9 +5,9 @@ import ( "github.com/gemalto/flume" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/clone.go b/internal/commands/storage/clone.go index e412f94c7..19b1a96da 100644 --- a/internal/commands/storage/clone.go +++ b/internal/commands/storage/clone.go @@ -3,12 +3,12 @@ package storage import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/clone_test.go b/internal/commands/storage/clone_test.go index 3b6efd4d4..783eb75c5 100644 --- a/internal/commands/storage/clone_test.go +++ b/internal/commands/storage/clone_test.go @@ -3,10 +3,10 @@ package storage import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/create.go b/internal/commands/storage/create.go index c10af35be..6f92adeda 100644 --- a/internal/commands/storage/create.go +++ b/internal/commands/storage/create.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/namedargs" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/namedargs" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/create_test.go b/internal/commands/storage/create_test.go index 1aca10f8c..825e3e115 100644 --- a/internal/commands/storage/create_test.go +++ b/internal/commands/storage/create_test.go @@ -3,10 +3,10 @@ package storage import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/delete.go b/internal/commands/storage/delete.go index 1b0a92a1b..7c7501b24 100644 --- a/internal/commands/storage/delete.go +++ b/internal/commands/storage/delete.go @@ -3,10 +3,10 @@ package storage import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/commands/storage/delete_test.go b/internal/commands/storage/delete_test.go index bacfaa298..777c86ae5 100644 --- a/internal/commands/storage/delete_test.go +++ b/internal/commands/storage/delete_test.go @@ -3,9 +3,9 @@ package storage import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/import.go b/internal/commands/storage/import.go index 19655dbfb..f0511fcff 100644 --- a/internal/commands/storage/import.go +++ b/internal/commands/storage/import.go @@ -10,11 +10,11 @@ import ( "time" "github.com/UpCloudLtd/progress/messages" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/import_test.go b/internal/commands/storage/import_test.go index f06ce8548..b87424f25 100644 --- a/internal/commands/storage/import_test.go +++ b/internal/commands/storage/import_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/list.go b/internal/commands/storage/list.go index eb6035d3d..fb890c3ec 100644 --- a/internal/commands/storage/list.go +++ b/internal/commands/storage/list.go @@ -1,11 +1,11 @@ package storage import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/list_test.go b/internal/commands/storage/list_test.go index e388737bd..9e260a6fa 100644 --- a/internal/commands/storage/list_test.go +++ b/internal/commands/storage/list_test.go @@ -3,10 +3,10 @@ package storage import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/commands/storage/modify.go b/internal/commands/storage/modify.go index 7dd5c433b..ce43948c0 100644 --- a/internal/commands/storage/modify.go +++ b/internal/commands/storage/modify.go @@ -5,11 +5,11 @@ import ( "time" "github.com/UpCloudLtd/progress/messages" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/modify_test.go b/internal/commands/storage/modify_test.go index ecdace75b..9d1440e7f 100644 --- a/internal/commands/storage/modify_test.go +++ b/internal/commands/storage/modify_test.go @@ -3,9 +3,9 @@ package storage import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/show.go b/internal/commands/storage/show.go index 29e056d2b..38061fca1 100644 --- a/internal/commands/storage/show.go +++ b/internal/commands/storage/show.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/labels" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/labels" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/jedib0t/go-pretty/v6/text" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" diff --git a/internal/commands/storage/show_test.go b/internal/commands/storage/show_test.go index 06cb681c4..f7614149a 100644 --- a/internal/commands/storage/show_test.go +++ b/internal/commands/storage/show_test.go @@ -7,10 +7,10 @@ import ( "github.com/jedib0t/go-pretty/v6/text" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/storage.go b/internal/commands/storage/storage.go index a473446a7..0dc2bfdc1 100644 --- a/internal/commands/storage/storage.go +++ b/internal/commands/storage/storage.go @@ -8,7 +8,7 @@ import ( "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) var ( diff --git a/internal/commands/storage/templatize.go b/internal/commands/storage/templatize.go index 82558983b..2d7d757ba 100644 --- a/internal/commands/storage/templatize.go +++ b/internal/commands/storage/templatize.go @@ -3,12 +3,12 @@ package storage import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/storage/templatize_test.go b/internal/commands/storage/templatize_test.go index 25e6332b1..79e1337ef 100644 --- a/internal/commands/storage/templatize_test.go +++ b/internal/commands/storage/templatize_test.go @@ -3,10 +3,10 @@ package storage import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/commands/util.go b/internal/commands/util.go index bdb68900f..15c008729 100644 --- a/internal/commands/util.go +++ b/internal/commands/util.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/validation" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/validation" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/commands/util_test.go b/internal/commands/util_test.go index 2e6d7ba2a..e9bbf9f54 100644 --- a/internal/commands/util_test.go +++ b/internal/commands/util_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" "github.com/stretchr/testify/assert" ) diff --git a/internal/commands/zone/list.go b/internal/commands/zone/list.go index bb6d96be9..17e6cdd72 100644 --- a/internal/commands/zone/list.go +++ b/internal/commands/zone/list.go @@ -1,9 +1,9 @@ package zone import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/format" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/format" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) // ListCommand creates the "zone list" command diff --git a/internal/commands/zone/list_test.go b/internal/commands/zone/list_test.go index 7cb69033b..29b3d9967 100644 --- a/internal/commands/zone/list_test.go +++ b/internal/commands/zone/list_test.go @@ -3,10 +3,10 @@ package zone import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/mockexecute" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/mockexecute" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/commands/zone/zone.go b/internal/commands/zone/zone.go index b49b7237e..db96c8f82 100644 --- a/internal/commands/zone/zone.go +++ b/internal/commands/zone/zone.go @@ -1,7 +1,7 @@ package zone import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" ) // BaseZoneCommand creates the base "zone" command diff --git a/internal/completion/completionprovider.go b/internal/completion/completionprovider.go index f5e536837..1d9ec9d4f 100644 --- a/internal/completion/completionprovider.go +++ b/internal/completion/completionprovider.go @@ -3,7 +3,7 @@ package completion import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/spf13/cobra" ) diff --git a/internal/completion/database.go b/internal/completion/database.go index 85632d27e..4e31007b2 100644 --- a/internal/completion/database.go +++ b/internal/completion/database.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/cobra" ) diff --git a/internal/completion/database_test.go b/internal/completion/database_test.go index 258e0afbe..2bf535969 100644 --- a/internal/completion/database_test.go +++ b/internal/completion/database_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/internal/completion/helpers_test.go b/internal/completion/helpers_test.go index 380880fb3..23ec28962 100644 --- a/internal/completion/helpers_test.go +++ b/internal/completion/helpers_test.go @@ -3,7 +3,7 @@ package completion_test import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" "github.com/stretchr/testify/assert" ) diff --git a/internal/completion/ipaddress.go b/internal/completion/ipaddress.go index 1265c9fba..c984a3c83 100644 --- a/internal/completion/ipaddress.go +++ b/internal/completion/ipaddress.go @@ -3,7 +3,7 @@ package completion import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/spf13/cobra" ) diff --git a/internal/completion/ipaddress_test.go b/internal/completion/ipaddress_test.go index 1f9f6e151..e36070465 100644 --- a/internal/completion/ipaddress_test.go +++ b/internal/completion/ipaddress_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" diff --git a/internal/completion/kubernetes.go b/internal/completion/kubernetes.go index 9f0feae39..cf84aca81 100644 --- a/internal/completion/kubernetes.go +++ b/internal/completion/kubernetes.go @@ -3,7 +3,7 @@ package completion import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/cobra" diff --git a/internal/completion/kubernetes_test.go b/internal/completion/kubernetes_test.go index 9ccff0a32..9b643d1ba 100644 --- a/internal/completion/kubernetes_test.go +++ b/internal/completion/kubernetes_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" diff --git a/internal/completion/loadbalancer.go b/internal/completion/loadbalancer.go index 048443947..38ed77c1a 100644 --- a/internal/completion/loadbalancer.go +++ b/internal/completion/loadbalancer.go @@ -3,7 +3,7 @@ package completion import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/cobra" ) diff --git a/internal/completion/loadbalancer_test.go b/internal/completion/loadbalancer_test.go index 0fa4454de..bfb1bfe87 100644 --- a/internal/completion/loadbalancer_test.go +++ b/internal/completion/loadbalancer_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/internal/completion/network.go b/internal/completion/network.go index efe7201a3..b4c90c06e 100644 --- a/internal/completion/network.go +++ b/internal/completion/network.go @@ -3,7 +3,7 @@ package completion import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/spf13/cobra" ) diff --git a/internal/completion/network_test.go b/internal/completion/network_test.go index 838c7a173..e021e399f 100644 --- a/internal/completion/network_test.go +++ b/internal/completion/network_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" diff --git a/internal/completion/router.go b/internal/completion/router.go index a9b43bfc6..951b4e742 100644 --- a/internal/completion/router.go +++ b/internal/completion/router.go @@ -3,7 +3,7 @@ package completion import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/spf13/cobra" ) diff --git a/internal/completion/router_test.go b/internal/completion/router_test.go index 29b7132db..d5c589940 100644 --- a/internal/completion/router_test.go +++ b/internal/completion/router_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" diff --git a/internal/completion/server.go b/internal/completion/server.go index b70e961d7..11689b0df 100644 --- a/internal/completion/server.go +++ b/internal/completion/server.go @@ -3,7 +3,7 @@ package completion import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/spf13/cobra" ) diff --git a/internal/completion/server_test.go b/internal/completion/server_test.go index 04526e540..b7f6ec68f 100644 --- a/internal/completion/server_test.go +++ b/internal/completion/server_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/internal/completion/servergroup.go b/internal/completion/servergroup.go index 9cd29a178..1573253cb 100644 --- a/internal/completion/servergroup.go +++ b/internal/completion/servergroup.go @@ -5,7 +5,7 @@ import ( "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/spf13/cobra" ) diff --git a/internal/completion/servergroup_test.go b/internal/completion/servergroup_test.go index c727897fd..8a4f7fea3 100644 --- a/internal/completion/servergroup_test.go +++ b/internal/completion/servergroup_test.go @@ -7,8 +7,8 @@ import ( "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/internal/completion/storage.go b/internal/completion/storage.go index 849dde51d..6ea3460b7 100644 --- a/internal/completion/storage.go +++ b/internal/completion/storage.go @@ -3,7 +3,7 @@ package completion import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" "github.com/spf13/cobra" diff --git a/internal/completion/storage_test.go b/internal/completion/storage_test.go index c765a7cf8..82bace4fe 100644 --- a/internal/completion/storage_test.go +++ b/internal/completion/storage_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/spf13/cobra" diff --git a/internal/completion/zone.go b/internal/completion/zone.go index a09c8c0c9..2f9eb19b7 100644 --- a/internal/completion/zone.go +++ b/internal/completion/zone.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/spf13/cobra" ) diff --git a/internal/config/config.go b/internal/config/config.go index 54df3dc2e..19c9f21f3 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/clierrors" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/clierrors" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/client" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/service" diff --git a/internal/core/core.go b/internal/core/core.go index 79533fb54..1a1336766 100644 --- a/internal/core/core.go +++ b/internal/core/core.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/clierrors" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands/all" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/terminal" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/clierrors" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/all" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/terminal" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" valid "github.com/asaskevich/govalidator" "github.com/gemalto/flume" diff --git a/internal/format/common.go b/internal/format/common.go index b64995fbf..f065cc79b 100644 --- a/internal/format/common.go +++ b/internal/format/common.go @@ -3,7 +3,7 @@ package format import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/internal/format/database.go b/internal/format/database.go index 2d5629435..4d7000842 100644 --- a/internal/format/database.go +++ b/internal/format/database.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/internal/labels/output.go b/internal/labels/output.go index aa17142bd..7a3c60cb4 100644 --- a/internal/labels/output.go +++ b/internal/labels/output.go @@ -3,7 +3,7 @@ package labels import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" ) diff --git a/internal/mockexecute/mockexecute.go b/internal/mockexecute/mockexecute.go index 71a5a1a1d..28f6d12a0 100644 --- a/internal/mockexecute/mockexecute.go +++ b/internal/mockexecute/mockexecute.go @@ -3,10 +3,10 @@ package mockexecute import ( "bytes" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/gemalto/flume" "github.com/spf13/cobra" diff --git a/internal/namedargs/complete.go b/internal/namedargs/complete.go index 4bb85d33c..2e9b85955 100644 --- a/internal/namedargs/complete.go +++ b/internal/namedargs/complete.go @@ -1,8 +1,8 @@ package namedargs import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" "github.com/spf13/cobra" ) diff --git a/internal/namedargs/network.go b/internal/namedargs/network.go index cf6361556..578fb358c 100644 --- a/internal/namedargs/network.go +++ b/internal/namedargs/network.go @@ -3,8 +3,8 @@ package namedargs import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" ) // ResolveNetwork resolves network UUID from values provided to named args (e.g., --network net-name) diff --git a/internal/namedargs/resolve.go b/internal/namedargs/resolve.go index 5c019d5aa..b51eecd75 100644 --- a/internal/namedargs/resolve.go +++ b/internal/namedargs/resolve.go @@ -3,8 +3,8 @@ package namedargs import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" ) // Resolve initializes given resolution provider and uses it to resolve given argument diff --git a/internal/namedargs/server.go b/internal/namedargs/server.go index e1316ba95..6012e4a5a 100644 --- a/internal/namedargs/server.go +++ b/internal/namedargs/server.go @@ -3,8 +3,8 @@ package namedargs import ( "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/commands" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" ) // ResolveServer resolves server UUID from values provided to named args (e.g., --server server-name) diff --git a/internal/output/combined.go b/internal/output/combined.go index 95727c631..115bdae28 100644 --- a/internal/output/combined.go +++ b/internal/output/combined.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" ) // CombinedSection represents a single section of a combined output diff --git a/internal/output/combined_test.go b/internal/output/combined_test.go index ef1c930d5..5eccf591c 100644 --- a/internal/output/combined_test.go +++ b/internal/output/combined_test.go @@ -3,7 +3,7 @@ package output_test import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) func TestCombined(t *testing.T) { diff --git a/internal/output/details.go b/internal/output/details.go index b932cbb56..cb9363a77 100644 --- a/internal/output/details.go +++ b/internal/output/details.go @@ -7,7 +7,7 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" ) // DetailRow represents a single row in the details view, with a title and a value diff --git a/internal/output/details_test.go b/internal/output/details_test.go index 44506de3d..387418c7e 100644 --- a/internal/output/details_test.go +++ b/internal/output/details_test.go @@ -3,7 +3,7 @@ package output_test import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) func TestDetails(t *testing.T) { diff --git a/internal/output/error_test.go b/internal/output/error_test.go index 56478c199..14c01b88e 100644 --- a/internal/output/error_test.go +++ b/internal/output/error_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) func TestError(t *testing.T) { diff --git a/internal/output/marshaledwithhumandetails_test.go b/internal/output/marshaledwithhumandetails_test.go index 794c8aa18..0e2199c55 100644 --- a/internal/output/marshaledwithhumandetails_test.go +++ b/internal/output/marshaledwithhumandetails_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) func TestMarshaledWithHumanDetails(t *testing.T) { diff --git a/internal/output/marshaledwithhumanoutput_test.go b/internal/output/marshaledwithhumanoutput_test.go index 43d4976b8..7c9caf0e9 100644 --- a/internal/output/marshaledwithhumanoutput_test.go +++ b/internal/output/marshaledwithhumanoutput_test.go @@ -3,7 +3,7 @@ package output_test import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) func TestMarshaledWithHumanOutput(t *testing.T) { diff --git a/internal/output/onlymarshaled_test.go b/internal/output/onlymarshaled_test.go index f5582bfca..220cb3d1c 100644 --- a/internal/output/onlymarshaled_test.go +++ b/internal/output/onlymarshaled_test.go @@ -3,7 +3,7 @@ package output_test import ( "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) func TestOnlyMarshaled(t *testing.T) { diff --git a/internal/output/output_test.go b/internal/output/output_test.go index 9f850cbe8..c877d1987 100644 --- a/internal/output/output_test.go +++ b/internal/output/output_test.go @@ -6,7 +6,7 @@ import ( "github.com/jedib0t/go-pretty/v6/text" "github.com/stretchr/testify/assert" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) type outputTestCase struct { diff --git a/internal/output/render.go b/internal/output/render.go index 32f2de232..7e38f7aef 100644 --- a/internal/output/render.go +++ b/internal/output/render.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/clierrors" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/clierrors" ) const ( diff --git a/internal/output/render_test.go b/internal/output/render_test.go index be7f94f59..2855974a7 100644 --- a/internal/output/render_test.go +++ b/internal/output/render_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/config" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/config" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" "github.com/stretchr/testify/assert" ) diff --git a/internal/output/table.go b/internal/output/table.go index 10d05371f..323340a3b 100644 --- a/internal/output/table.go +++ b/internal/output/table.go @@ -9,8 +9,8 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/ui" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/validation" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/ui" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/validation" ) // TableRow represents a single row of data in a table diff --git a/internal/output/table_test.go b/internal/output/table_test.go index b9c8eb9d5..380a87c31 100644 --- a/internal/output/table_test.go +++ b/internal/output/table_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/output" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/output" ) func TestTable(t *testing.T) { diff --git a/internal/resolver/database.go b/internal/resolver/database.go index ae2883b64..841bf229b 100644 --- a/internal/resolver/database.go +++ b/internal/resolver/database.go @@ -3,7 +3,7 @@ package resolver import ( "context" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/resolver/database_test.go b/internal/resolver/database_test.go index ddc0cf0c0..40fd67836 100644 --- a/internal/resolver/database_test.go +++ b/internal/resolver/database_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/resolver/ipaddress.go b/internal/resolver/ipaddress.go index 1c1c23bb6..f99ea971f 100644 --- a/internal/resolver/ipaddress.go +++ b/internal/resolver/ipaddress.go @@ -3,7 +3,7 @@ package resolver import ( "context" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" ) // CachingIPAddress implements resolver for ip addresses that resolve with ptr records, caching the results diff --git a/internal/resolver/ipaddress_test.go b/internal/resolver/ipaddress_test.go index 78651ff09..c23e1e338 100644 --- a/internal/resolver/ipaddress_test.go +++ b/internal/resolver/ipaddress_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/resolver/kubernetes.go b/internal/resolver/kubernetes.go index ebda9fc20..8afc7f4cf 100644 --- a/internal/resolver/kubernetes.go +++ b/internal/resolver/kubernetes.go @@ -3,7 +3,7 @@ package resolver import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/resolver/kubernetes_test.go b/internal/resolver/kubernetes_test.go index 4ae2f8558..79c48e6f7 100644 --- a/internal/resolver/kubernetes_test.go +++ b/internal/resolver/kubernetes_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/resolver/loadbalancer.go b/internal/resolver/loadbalancer.go index 87b3e37ef..a5c93e044 100644 --- a/internal/resolver/loadbalancer.go +++ b/internal/resolver/loadbalancer.go @@ -3,7 +3,7 @@ package resolver import ( "context" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" ) diff --git a/internal/resolver/loadbalancer_test.go b/internal/resolver/loadbalancer_test.go index d5f576b43..2c4160726 100644 --- a/internal/resolver/loadbalancer_test.go +++ b/internal/resolver/loadbalancer_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/resolver/matchers.go b/internal/resolver/matchers.go index b55ea7906..addca6d43 100644 --- a/internal/resolver/matchers.go +++ b/internal/resolver/matchers.go @@ -1,7 +1,7 @@ package resolver import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/completion" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/completion" ) // MatchStringWithWhitespace checks if arg that may include whitespace matches given value. This checks both quoted args and auto-completed args handled with completion.RemoveWordBreaks. diff --git a/internal/resolver/network.go b/internal/resolver/network.go index 90240e4c7..9b46cef90 100644 --- a/internal/resolver/network.go +++ b/internal/resolver/network.go @@ -4,7 +4,7 @@ import ( "context" "errors" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" ) diff --git a/internal/resolver/network_test.go b/internal/resolver/network_test.go index 85d7188f0..9173fa7b3 100644 --- a/internal/resolver/network_test.go +++ b/internal/resolver/network_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go index 3a74c889d..23cb3004c 100644 --- a/internal/resolver/resolver.go +++ b/internal/resolver/resolver.go @@ -3,7 +3,7 @@ package resolver import ( "context" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" ) const helpUUIDTitle = "" diff --git a/internal/resolver/router.go b/internal/resolver/router.go index f0c2b4dab..513dac546 100644 --- a/internal/resolver/router.go +++ b/internal/resolver/router.go @@ -4,7 +4,7 @@ import ( "context" "errors" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" ) diff --git a/internal/resolver/router_test.go b/internal/resolver/router_test.go index d3d8ccde9..56d8787b5 100644 --- a/internal/resolver/router_test.go +++ b/internal/resolver/router_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/resolver/server.go b/internal/resolver/server.go index c96cf0bc5..8e407aa1d 100644 --- a/internal/resolver/server.go +++ b/internal/resolver/server.go @@ -3,7 +3,7 @@ package resolver import ( "context" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" ) // CachingServer implements resolver for servers, caching the results diff --git a/internal/resolver/server_test.go b/internal/resolver/server_test.go index 0964e6e62..3ffdaaea0 100644 --- a/internal/resolver/server_test.go +++ b/internal/resolver/server_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/resolver/servergroup.go b/internal/resolver/servergroup.go index 87ab03dde..5ba80bf6c 100644 --- a/internal/resolver/servergroup.go +++ b/internal/resolver/servergroup.go @@ -5,7 +5,7 @@ import ( "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" ) // CachingServerGroup implements resolver for servers, caching the results diff --git a/internal/resolver/servergroup_test.go b/internal/resolver/servergroup_test.go index 10076f604..e88d5c4e4 100644 --- a/internal/resolver/servergroup_test.go +++ b/internal/resolver/servergroup_test.go @@ -7,8 +7,8 @@ import ( "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/resolver/storage.go b/internal/resolver/storage.go index 96dd445f1..90bf37c0e 100644 --- a/internal/resolver/storage.go +++ b/internal/resolver/storage.go @@ -4,7 +4,7 @@ import ( "context" "errors" - internal "github.com/UpCloudLtd/upcloud-cli/v2/internal/service" + internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request" diff --git a/internal/resolver/storage_test.go b/internal/resolver/storage_test.go index 63b4632f4..6bb0a3951 100644 --- a/internal/resolver/storage_test.go +++ b/internal/resolver/storage_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - smock "github.com/UpCloudLtd/upcloud-cli/v2/internal/mock" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/resolver" + smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver" "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud" "github.com/stretchr/testify/assert" diff --git a/internal/ui/datatable.go b/internal/ui/datatable.go index b77a5b817..673ccd79a 100644 --- a/internal/ui/datatable.go +++ b/internal/ui/datatable.go @@ -8,7 +8,7 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" - "github.com/UpCloudLtd/upcloud-cli/v2/internal/validation" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/validation" ) func styleDataTable() table.Style { diff --git a/internal/ui/details.go b/internal/ui/details.go index 309fabe3c..40c7efa32 100644 --- a/internal/ui/details.go +++ b/internal/ui/details.go @@ -1,7 +1,7 @@ package ui import ( - "github.com/UpCloudLtd/upcloud-cli/v2/internal/terminal" + "github.com/UpCloudLtd/upcloud-cli/v3/internal/terminal" "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" From 45e3d95a29313f459ab10b4790ae74f8a72545a8 Mon Sep 17 00:00:00 2001 From: Toni Kangas Date: Wed, 18 Oct 2023 13:22:36 +0300 Subject: [PATCH 2/3] chore: update changelog --- CHANGELOG.md | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bd20a011..bda8c2ac0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,25 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [3.0.0] - 2023-10-18 + +This release updates output of `show` and `list` commands to return the API response as defined in the UpCloud Go SDK. See below for detailed list of changes. + +In addition, `kubernetes create` will now, by default, block all access to the cluster. To be able to connect to the cluster, define list of allowed IP addresses and/or CIDR blocks or allow access from any IP. + ### Added -- **Breaking**: Add `Kubernetes API allowed IPs` field to `kubernetes show` output. This changes default behavior from _allow access from any IP_ to _block access from all IPs_. To be able to connect to the cluster, define list of allowed IP addresses and/or CIDR blocks or allow access from any IP. +- **Breaking**: Add `--kubernetes-api-allow-ip` argument to `kubernetes create` command. This changes default behavior from _allow access from any IP_ to _block access from all IPs_. To be able to connect to the cluster, define list of allowed IP addresses and/or CIDR blocks or allow access from any IP. +- Add `Kubernetes API allowed IPs` field to `kubernetes show` output. - Add `kubernetes nodegroup show` for displaying node-group details. This also adds _Nodes_ table and _Anti-affinity_ field that were not available in previous `kubernetes show` output. - Add `kubernetes modify` command for modifying IP addresses that are allowed to access cluster's Kubernetes API. -- Add `--kubernetes-api-allow-ip` argument to `kubernetes create` command. - Add `Kubernetes API allowed IPs` field to `kubernetes show` output. -- Add `database session list` for listing active database sessions -- Add `database session cancel` for cancelling an active database session +- Add `database session list` for listing active database sessions. +- Add `database session cancel` for cancelling an active database session. ### Changed -- **Breaking**: In JSON and YAML output of `loadbalancer list`: display full API response. This changes `state` field to `operational_state`. -- **Breaking**: `storage list` and `storage show` JSON and YAML outputs to return full API response. This changes `servers` field to contain `server` field, which in turn contains the servers. `labels` field will not be outputted if empty. -- **Breaking**: `server list` and `server show` JSON and YAML outputs to return full API response. This changes field `host_id` to `host`. `nics` is replaced with `networking` subfield `interfaces`. `storage` is replaced with `storage_devices`. `labels` contain subfield `label` which in turn contains the labels. -- **Breaking**: `server firewall show` JSON and YAML outputs to return full API response. This removes fields `destination` and `source` fields in favor of `[destination|source]_address_start`, `[destination|source]_address_end`, `[destination|source]_port_start` and `[destination|source]_port_end` -- In JSON and YAML output of `kubernetes list`: display full API response. -- **Breaking**: In JSON and YAML output of `database list`: display the full API response. Value of `title` is not replaced with value from `name`, if `title` is empty. -- **Breaking**: In JSON and YAML output of `database types`: display the full API response. This changes the top level datatype from list to object, where keys are the available database type, e.g., `pg` and `mysql`. -- **Breaking**: In JSON and YAML output of `ip-address list`: display full API response. This changes `partofplan` key to `part_of_plan` and `ptrrecord` key to `ptr_record`. -- **Breaking**: In JSON and YAML output of `network list` and `network show`: display full API response. Servers list will only contain server UUID and name. `ip_networks` contains subfield `ip_network` which in turn contains the networks. +- **Breaking**: In JSON and YAML output of `database list`: return the full API response. Value of `title` is not replaced with value from `name`, if `title` is empty. +- **Breaking**: In JSON and YAML output of `database types`: return the full API response. This changes the top level datatype from list to object, where keys are the available database type, e.g., `pg` and `mysql`. +- **Breaking**: In JSON and YAML output of `ip-address list`: return the full API response. This changes `partofplan` key to `part_of_plan` and `ptrrecord` key to `ptr_record`. The top level data-type changes from list to object. +- **Breaking**: In JSON and YAML output of `loadbalancer list`: return the full API response. This changes `state` field to `operational_state`. +- **Breaking**: In JSON and YAML output of `network list` and `network show`: return the full API response. Servers list will only contain server UUID and name. In `network list` output, the top level data-type changes from list to object. +- **Breaking**: In JSON and YAML output of `storage list` and `storage show`: return the full API response. This changes `servers` field to contain `server` field, which in turn contains the servers. `labels` field will not be outputted if empty. In `storage list` output, the top level data-type changes from list to object. +- **Breaking**: In JSON and YAML output of `server list` and `server show`: return the full API response. This changes field `host_id` to `host`. `nics` is replaced with `networking` subfield `interfaces`. `storage` is replaced with `storage_devices`. `labels` contain subfield `label` which in turn contains the labels. In `server list` output, the top level data-type changes from list to object. +- **Breaking**: In JSON and YAML output of `server firewall show`: return the full API response. This removes fields `destination` and `source` fields in favor of `[destination|source]_address_start`, `[destination|source]_address_end`, `[destination|source]_port_start` and `[destination|source]_port_end`. +- **Breaking**: In JSON and YAML output of `zone list`: return the full API response. The top level data-type changes from list to object. +- In JSON and YAML output of `kubernetes list`: return the full API response. - In human readable output of `kubernetes show` command, show node-groups as table. Node-group details are available with `kubernetes nodegroup show` command. ## Fixed @@ -285,7 +292,8 @@ Initial public beta release :tada: ### Added - Current feature set added! First internal release -[Unreleased]: https://github.com/UpCloudLtd/upcloud-cli/compare/v2.10.0...HEAD +[Unreleased]: https://github.com/UpCloudLtd/upcloud-cli/compare/v3.0.0...HEAD +[3.0.0]: https://github.com/UpCloudLtd/upcloud-cli/compare/v2.10.0...v3.0.0 [2.10.0]: https://github.com/UpCloudLtd/upcloud-cli/compare/v2.9.1...v2.10.0 [2.9.1]: https://github.com/UpCloudLtd/upcloud-cli/compare/v2.9.0...v2.9.1 [2.9.0]: https://github.com/UpCloudLtd/upcloud-cli/compare/v2.8.0...v2.9.0 From efb8ecd7fdad966e32f57ed11c7e9bc0efc98580 Mon Sep 17 00:00:00 2001 From: Toni Kangas Date: Wed, 18 Oct 2023 13:35:35 +0300 Subject: [PATCH 3/3] fix(server): pass-through API respose in `server plans` marshaled output --- CHANGELOG.md | 3 ++- internal/commands/server/plan_list.go | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bda8c2ac0..80d7cb2b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,9 +28,10 @@ In addition, `kubernetes create` will now, by default, block all access to the c - **Breaking**: In JSON and YAML output of `ip-address list`: return the full API response. This changes `partofplan` key to `part_of_plan` and `ptrrecord` key to `ptr_record`. The top level data-type changes from list to object. - **Breaking**: In JSON and YAML output of `loadbalancer list`: return the full API response. This changes `state` field to `operational_state`. - **Breaking**: In JSON and YAML output of `network list` and `network show`: return the full API response. Servers list will only contain server UUID and name. In `network list` output, the top level data-type changes from list to object. -- **Breaking**: In JSON and YAML output of `storage list` and `storage show`: return the full API response. This changes `servers` field to contain `server` field, which in turn contains the servers. `labels` field will not be outputted if empty. In `storage list` output, the top level data-type changes from list to object. - **Breaking**: In JSON and YAML output of `server list` and `server show`: return the full API response. This changes field `host_id` to `host`. `nics` is replaced with `networking` subfield `interfaces`. `storage` is replaced with `storage_devices`. `labels` contain subfield `label` which in turn contains the labels. In `server list` output, the top level data-type changes from list to object. - **Breaking**: In JSON and YAML output of `server firewall show`: return the full API response. This removes fields `destination` and `source` fields in favor of `[destination|source]_address_start`, `[destination|source]_address_end`, `[destination|source]_port_start` and `[destination|source]_port_end`. +- **Breaking**: In JSON and YAML output of `server plans`: return the full API response. The top level data-type changes from list to object. +- **Breaking**: In JSON and YAML output of `storage list` and `storage show`: return the full API response. This changes `servers` field to contain `server` field, which in turn contains the servers. `labels` field will not be outputted if empty. In `storage list` output, the top level data-type changes from list to object. - **Breaking**: In JSON and YAML output of `zone list`: return the full API response. The top level data-type changes from list to object. - In JSON and YAML output of `kubernetes list`: return the full API response. - In human readable output of `kubernetes show` command, show node-groups as table. Node-group details are available with `kubernetes nodegroup show` command. diff --git a/internal/commands/server/plan_list.go b/internal/commands/server/plan_list.go index 815658b5c..e615605e5 100644 --- a/internal/commands/server/plan_list.go +++ b/internal/commands/server/plan_list.go @@ -35,15 +35,18 @@ func (s *planListCommand) ExecuteWithoutArguments(exec commands.Executor) (outpu }) } - return output.Table{ - Columns: []output.TableColumn{ - {Key: "name", Header: "Name"}, - {Key: "cores", Header: "Cores"}, - {Key: "memory", Header: "Memory"}, - {Key: "storage", Header: "Storage size"}, - {Key: "storage_tier", Header: "Storage tier"}, - {Key: "egress_transfer", Header: "Transfer out (GiB/month)"}, + return output.MarshaledWithHumanOutput{ + Value: plans, + Output: output.Table{ + Columns: []output.TableColumn{ + {Key: "name", Header: "Name"}, + {Key: "cores", Header: "Cores"}, + {Key: "memory", Header: "Memory"}, + {Key: "storage", Header: "Storage size"}, + {Key: "storage_tier", Header: "Storage tier"}, + {Key: "egress_transfer", Header: "Transfer out (GiB/month)"}, + }, + Rows: rows, }, - Rows: rows, }, nil }