diff --git a/.golangci.yml b/.golangci.yml index ab7b8f4f4ae..a8fa13ed5c4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,6 +3,7 @@ linters: - gci - godot - gofmt + - goimports - misspell - whitespace - revive diff --git a/cmd/incus-agent/api_1.0.go b/cmd/incus-agent/api_1.0.go index 48dc739fc68..c8ff6913faa 100644 --- a/cmd/incus-agent/api_1.0.go +++ b/cmd/incus-agent/api_1.0.go @@ -10,7 +10,7 @@ import ( "github.com/mdlayher/vsock" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/linux" "github.com/lxc/incus/v6/internal/ports" "github.com/lxc/incus/v6/internal/server/response" diff --git a/cmd/incus-agent/dev_incus.go b/cmd/incus-agent/dev_incus.go index aa121f362b5..9c900249570 100644 --- a/cmd/incus-agent/dev_incus.go +++ b/cmd/incus-agent/dev_incus.go @@ -12,11 +12,11 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/daemon" "github.com/lxc/incus/v6/internal/server/device/config" localUtil "github.com/lxc/incus/v6/internal/server/util" - "github.com/lxc/incus/v6/shared/api/guest" + api "github.com/lxc/incus/v6/shared/api/guest" "github.com/lxc/incus/v6/shared/logger" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/incus-benchmark/benchmark.go b/cmd/incus-benchmark/benchmark.go index 76ba5614a3d..fec6eab4c36 100644 --- a/cmd/incus-benchmark/benchmark.go +++ b/cmd/incus-benchmark/benchmark.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/version" "github.com/lxc/incus/v6/shared/api" config "github.com/lxc/incus/v6/shared/cliconfig" diff --git a/cmd/incus-benchmark/benchmark_operation.go b/cmd/incus-benchmark/benchmark_operation.go index f5081a7ebad..f81506b0c2d 100644 --- a/cmd/incus-benchmark/benchmark_operation.go +++ b/cmd/incus-benchmark/benchmark_operation.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/api" ) diff --git a/cmd/incus-benchmark/main.go b/cmd/incus-benchmark/main.go index af22840209c..6572baf5be7 100644 --- a/cmd/incus-benchmark/main.go +++ b/cmd/incus-benchmark/main.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/version" "github.com/lxc/incus/v6/shared/api" "github.com/lxc/incus/v6/shared/util" diff --git a/cmd/incus-migrate/main_migrate.go b/cmd/incus-migrate/main_migrate.go index bc60e07918b..0a6b9723430 100644 --- a/cmd/incus-migrate/main_migrate.go +++ b/cmd/incus-migrate/main_migrate.go @@ -18,7 +18,7 @@ import ( "golang.org/x/sys/unix" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/linux" "github.com/lxc/incus/v6/internal/version" diff --git a/cmd/incus-migrate/utils.go b/cmd/incus-migrate/utils.go index a1a065e734b..a7e940268dc 100644 --- a/cmd/incus-migrate/utils.go +++ b/cmd/incus-migrate/utils.go @@ -15,7 +15,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/migration" "github.com/lxc/incus/v6/internal/ports" internalUtil "github.com/lxc/incus/v6/internal/util" diff --git a/cmd/incus-user/main_daemon.go b/cmd/incus-user/main_daemon.go index 6eb1cc3de0b..e97b204d64c 100644 --- a/cmd/incus-user/main_daemon.go +++ b/cmd/incus-user/main_daemon.go @@ -13,7 +13,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/linux" internalUtil "github.com/lxc/incus/v6/internal/util" ) diff --git a/cmd/incus-user/server.go b/cmd/incus-user/server.go index 3d5b9a85317..f6cccae89d8 100644 --- a/cmd/incus-user/server.go +++ b/cmd/incus-user/server.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/linux" internalUtil "github.com/lxc/incus/v6/internal/util" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/admin_init.go b/cmd/incus/admin_init.go index 86ff8fef9be..1f9f1197543 100644 --- a/cmd/incus/admin_init.go +++ b/cmd/incus/admin_init.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/ports" diff --git a/cmd/incus/admin_init_auto.go b/cmd/incus/admin_init_auto.go index 2ffff412ac6..75135fbb358 100644 --- a/cmd/incus/admin_init_auto.go +++ b/cmd/incus/admin_init_auto.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/linux" "github.com/lxc/incus/v6/internal/ports" diff --git a/cmd/incus/admin_init_dump.go b/cmd/incus/admin_init_dump.go index 6c1a7d70e02..faacfe3e0c8 100644 --- a/cmd/incus/admin_init_dump.go +++ b/cmd/incus/admin_init_dump.go @@ -7,7 +7,7 @@ import ( yaml "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" ) diff --git a/cmd/incus/admin_init_interactive.go b/cmd/incus/admin_init_interactive.go index eb8627d965b..4bf1c8a7c70 100644 --- a/cmd/incus/admin_init_interactive.go +++ b/cmd/incus/admin_init_interactive.go @@ -17,7 +17,7 @@ import ( "golang.org/x/sys/unix" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/linux" "github.com/lxc/incus/v6/internal/ports" diff --git a/cmd/incus/admin_init_preseed.go b/cmd/incus/admin_init_preseed.go index afd23d6459c..ff37f7fb15a 100644 --- a/cmd/incus/admin_init_preseed.go +++ b/cmd/incus/admin_init_preseed.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" ) diff --git a/cmd/incus/admin_recover.go b/cmd/incus/admin_recover.go index c229ec739d9..472b80247cd 100644 --- a/cmd/incus/admin_recover.go +++ b/cmd/incus/admin_recover.go @@ -10,7 +10,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/recover" diff --git a/cmd/incus/admin_shutdown.go b/cmd/incus/admin_shutdown.go index 1db53d3db52..911a70454ac 100644 --- a/cmd/incus/admin_shutdown.go +++ b/cmd/incus/admin_shutdown.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" ) diff --git a/cmd/incus/admin_sql.go b/cmd/incus/admin_sql.go index 626129f9232..e1fbc1d8f08 100644 --- a/cmd/incus/admin_sql.go +++ b/cmd/incus/admin_sql.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" internalSQL "github.com/lxc/incus/v6/internal/sql" diff --git a/cmd/incus/admin_waitready.go b/cmd/incus/admin_waitready.go index f7abf2329d0..41b9f33b879 100644 --- a/cmd/incus/admin_waitready.go +++ b/cmd/incus/admin_waitready.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/logger" diff --git a/cmd/incus/config.go b/cmd/incus/config.go index 0c13edffe1a..783429791b7 100644 --- a/cmd/incus/config.go +++ b/cmd/incus/config.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/instance" diff --git a/cmd/incus/console.go b/cmd/incus/console.go index 17441096655..c2b6679436c 100644 --- a/cmd/incus/console.go +++ b/cmd/incus/console.go @@ -14,7 +14,7 @@ import ( "github.com/gorilla/websocket" "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/copy.go b/cmd/incus/copy.go index e62e602bbc4..6e631ceed0f 100644 --- a/cmd/incus/copy.go +++ b/cmd/incus/copy.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/instance" diff --git a/cmd/incus/create.go b/cmd/incus/create.go index 92932953e93..45c13868b1e 100644 --- a/cmd/incus/create.go +++ b/cmd/incus/create.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/delete.go b/cmd/incus/delete.go index 69c8549cb68..999ada1cf20 100644 --- a/cmd/incus/delete.go +++ b/cmd/incus/delete.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/exec.go b/cmd/incus/exec.go index 067e877c35f..9f2f36973b9 100644 --- a/cmd/incus/exec.go +++ b/cmd/incus/exec.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/websocket" "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/export.go b/cmd/incus/export.go index 445cfe1dde6..97a17a1daaa 100644 --- a/cmd/incus/export.go +++ b/cmd/incus/export.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/file.go b/cmd/incus/file.go index 579854737f0..e9424d186c4 100644 --- a/cmd/incus/file.go +++ b/cmd/incus/file.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/crypto/ssh" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" internalIO "github.com/lxc/incus/v6/internal/io" diff --git a/cmd/incus/image.go b/cmd/incus/image.go index b02b5174931..09f52443363 100644 --- a/cmd/incus/image.go +++ b/cmd/incus/image.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" internalUtil "github.com/lxc/incus/v6/internal/util" diff --git a/cmd/incus/import.go b/cmd/incus/import.go index 4a9eae07ba3..31ca613397f 100644 --- a/cmd/incus/import.go +++ b/cmd/incus/import.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/ioprogress" diff --git a/cmd/incus/info.go b/cmd/incus/info.go index a5d1dfff6a0..e126b760a49 100644 --- a/cmd/incus/info.go +++ b/cmd/incus/info.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/instance" diff --git a/cmd/incus/list.go b/cmd/incus/list.go index c898c2cf2e5..f0f336edcf4 100644 --- a/cmd/incus/list.go +++ b/cmd/incus/list.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/instance" diff --git a/cmd/incus/main.go b/cmd/incus/main.go index ee46045c96f..c12f0e4165a 100644 --- a/cmd/incus/main.go +++ b/cmd/incus/main.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" internalUtil "github.com/lxc/incus/v6/internal/util" diff --git a/cmd/incus/monitor.go b/cmd/incus/monitor.go index 0decc2ad3c0..c80c21368e4 100644 --- a/cmd/incus/monitor.go +++ b/cmd/incus/monitor.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/publish.go b/cmd/incus/publish.go index ff6ad790a06..a8028023470 100644 --- a/cmd/incus/publish.go +++ b/cmd/incus/publish.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/instance" diff --git a/cmd/incus/remote.go b/cmd/incus/remote.go index aa9972bb478..2a8b03aa4df 100644 --- a/cmd/incus/remote.go +++ b/cmd/incus/remote.go @@ -16,7 +16,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/ports" diff --git a/cmd/incus/remote_unix.go b/cmd/incus/remote_unix.go index 5a428f83e6f..85279c2b0d4 100644 --- a/cmd/incus/remote_unix.go +++ b/cmd/incus/remote_unix.go @@ -17,7 +17,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/snapshot.go b/cmd/incus/snapshot.go index 10bd53c2136..d8a75ea2178 100644 --- a/cmd/incus/snapshot.go +++ b/cmd/incus/snapshot.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/instance" diff --git a/cmd/incus/storage_bucket.go b/cmd/incus/storage_bucket.go index 9a62e22b3cd..fb5b36f468f 100644 --- a/cmd/incus/storage_bucket.go +++ b/cmd/incus/storage_bucket.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incus/storage_volume.go b/cmd/incus/storage_volume.go index 279278c862a..9e4c4110586 100644 --- a/cmd/incus/storage_volume.go +++ b/cmd/incus/storage_volume.go @@ -16,7 +16,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/instance" diff --git a/cmd/incus/top.go b/cmd/incus/top.go index 2a38eb75442..69192079b20 100644 --- a/cmd/incus/top.go +++ b/cmd/incus/top.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/units" diff --git a/cmd/incus/utils.go b/cmd/incus/utils.go index 7966c233f4e..ec5000eebf7 100644 --- a/cmd/incus/utils.go +++ b/cmd/incus/utils.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/incusd/api_1.0.go b/cmd/incusd/api_1.0.go index 746ea572550..24f253c67aa 100644 --- a/cmd/incusd/api_1.0.go +++ b/cmd/incusd/api_1.0.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/auth/oidc" "github.com/lxc/incus/v6/internal/server/cluster" diff --git a/cmd/incusd/api_cluster.go b/cmd/incusd/api_cluster.go index d19f16b24fd..e1db42c3c07 100644 --- a/cmd/incusd/api_cluster.go +++ b/cmd/incusd/api_cluster.go @@ -18,7 +18,7 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/certificate" diff --git a/cmd/incusd/api_cluster_certificate.go b/cmd/incusd/api_cluster_certificate.go index 705afe885db..efc97ae561b 100644 --- a/cmd/incusd/api_cluster_certificate.go +++ b/cmd/incusd/api_cluster_certificate.go @@ -8,7 +8,7 @@ import ( "net/http" "os" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/acme" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/cluster" diff --git a/cmd/incusd/api_cluster_evacuation.go b/cmd/incusd/api_cluster_evacuation.go index cf942ee73f7..e2f3756a33e 100644 --- a/cmd/incusd/api_cluster_evacuation.go +++ b/cmd/incusd/api_cluster_evacuation.go @@ -17,7 +17,7 @@ import ( "golang.org/x/sync/errgroup" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/cluster" "github.com/lxc/incus/v6/internal/server/db" dbCluster "github.com/lxc/incus/v6/internal/server/db/cluster" diff --git a/cmd/incusd/api_cluster_test.go b/cmd/incusd/api_cluster_test.go index ff6e78aaf42..58432b9f896 100644 --- a/cmd/incusd/api_cluster_test.go +++ b/cmd/incusd/api_cluster_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/api" ) diff --git a/cmd/incusd/api_project.go b/cmd/incusd/api_project.go index 250739dae02..6689e9dbba9 100644 --- a/cmd/incusd/api_project.go +++ b/cmd/incusd/api_project.go @@ -14,7 +14,7 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/jmap" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/db" diff --git a/cmd/incusd/certificates.go b/cmd/incusd/certificates.go index 55f1229ff15..51cf1442e1b 100644 --- a/cmd/incusd/certificates.go +++ b/cmd/incusd/certificates.go @@ -15,7 +15,7 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/certificate" diff --git a/cmd/incusd/daemon_images.go b/cmd/incusd/daemon_images.go index 96ff5d2bcdb..5795c23cb97 100644 --- a/cmd/incusd/daemon_images.go +++ b/cmd/incusd/daemon_images.go @@ -11,7 +11,7 @@ import ( "slices" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalIO "github.com/lxc/incus/v6/internal/io" "github.com/lxc/incus/v6/internal/server/db" "github.com/lxc/incus/v6/internal/server/db/cluster" diff --git a/cmd/incusd/daemon_integration_test.go b/cmd/incusd/daemon_integration_test.go index e4e4c363d28..eacd34524e4 100644 --- a/cmd/incusd/daemon_integration_test.go +++ b/cmd/incusd/daemon_integration_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sys/unix" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/sys" ) diff --git a/cmd/incusd/images.go b/cmd/incusd/images.go index e3ca1c612cc..3cb4c0eb2ca 100644 --- a/cmd/incusd/images.go +++ b/cmd/incusd/images.go @@ -29,7 +29,7 @@ import ( "github.com/kballard/go-shellquote" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/filter" internalInstance "github.com/lxc/incus/v6/internal/instance" internalIO "github.com/lxc/incus/v6/internal/io" diff --git a/cmd/incusd/instance_post.go b/cmd/incusd/instance_post.go index d50b2cb4a1a..dfd30737193 100644 --- a/cmd/incusd/instance_post.go +++ b/cmd/incusd/instance_post.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/cluster" diff --git a/cmd/incusd/main_activateifneeded.go b/cmd/incusd/main_activateifneeded.go index 1f7760add86..beef1f4ff70 100644 --- a/cmd/incusd/main_activateifneeded.go +++ b/cmd/incusd/main_activateifneeded.go @@ -9,7 +9,7 @@ import ( sqlite3 "github.com/mattn/go-sqlite3" "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/db" "github.com/lxc/incus/v6/internal/server/instance" "github.com/lxc/incus/v6/internal/server/instance/instancetype" diff --git a/cmd/incusd/main_callhook.go b/cmd/incusd/main_callhook.go index 5d61b292b04..012b4cfd630 100644 --- a/cmd/incusd/main_callhook.go +++ b/cmd/incusd/main_callhook.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" ) type cmdCallhook struct { diff --git a/cmd/incusd/main_cluster.go b/cmd/incusd/main_cluster.go index 391af406a64..e9da7c2f84b 100644 --- a/cmd/incusd/main_cluster.go +++ b/cmd/incusd/main_cluster.go @@ -16,7 +16,7 @@ import ( "golang.org/x/sys/unix" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/ports" "github.com/lxc/incus/v6/internal/server/cluster" diff --git a/cmd/incusd/main_migratedumpsuccess.go b/cmd/incusd/main_migratedumpsuccess.go index 085cff7dff2..d850cbd922a 100644 --- a/cmd/incusd/main_migratedumpsuccess.go +++ b/cmd/incusd/main_migratedumpsuccess.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/api" ) diff --git a/cmd/incusd/main_shutdown.go b/cmd/incusd/main_shutdown.go index 62a2093f3c7..951bb7c9399 100644 --- a/cmd/incusd/main_shutdown.go +++ b/cmd/incusd/main_shutdown.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" ) type cmdShutdown struct { diff --git a/cmd/incusd/main_waitready.go b/cmd/incusd/main_waitready.go index 41062885989..2163bc366ee 100644 --- a/cmd/incusd/main_waitready.go +++ b/cmd/incusd/main_waitready.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/logger" ) diff --git a/cmd/incusd/networks.go b/cmd/incusd/networks.go index 357f0adac26..c919278cb48 100644 --- a/cmd/incusd/networks.go +++ b/cmd/incusd/networks.go @@ -16,7 +16,7 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/cluster" clusterRequest "github.com/lxc/incus/v6/internal/server/cluster/request" diff --git a/cmd/incusd/profiles.go b/cmd/incusd/profiles.go index 21451d5ae82..b3258f5cfdf 100644 --- a/cmd/incusd/profiles.go +++ b/cmd/incusd/profiles.go @@ -14,7 +14,7 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/jmap" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/cluster" diff --git a/cmd/incusd/storage_pools.go b/cmd/incusd/storage_pools.go index 40a39b51633..b2bb78d9c92 100644 --- a/cmd/incusd/storage_pools.go +++ b/cmd/incusd/storage_pools.go @@ -12,7 +12,7 @@ import ( "github.com/gorilla/mux" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/auth" "github.com/lxc/incus/v6/internal/server/cluster" clusterRequest "github.com/lxc/incus/v6/internal/server/cluster/request" diff --git a/cmd/lxc-to-incus/main_migrate.go b/cmd/lxc-to-incus/main_migrate.go index 0ecbc457cef..789a956a0b6 100644 --- a/cmd/lxc-to-incus/main_migrate.go +++ b/cmd/lxc-to-incus/main_migrate.go @@ -12,7 +12,7 @@ import ( liblxc "github.com/lxc/go-lxc" "github.com/spf13/cobra" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" cli "github.com/lxc/incus/v6/internal/cmd" "github.com/lxc/incus/v6/internal/i18n" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/lxc-to-incus/utils.go b/cmd/lxc-to-incus/utils.go index 460e33e249f..4cc1bb3bed5 100644 --- a/cmd/lxc-to-incus/utils.go +++ b/cmd/lxc-to-incus/utils.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/migration" "github.com/lxc/incus/v6/shared/api" ) diff --git a/cmd/lxd-to-incus/main.go b/cmd/lxd-to-incus/main.go index f580193c289..5374438fdf8 100644 --- a/cmd/lxd-to-incus/main.go +++ b/cmd/lxd-to-incus/main.go @@ -15,7 +15,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/sys/unix" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/linux" "github.com/lxc/incus/v6/internal/version" "github.com/lxc/incus/v6/shared/api" diff --git a/cmd/lxd-to-incus/sources.go b/cmd/lxd-to-incus/sources.go index e7e203c174b..d5ec5767d1c 100644 --- a/cmd/lxd-to-incus/sources.go +++ b/cmd/lxd-to-incus/sources.go @@ -1,8 +1,6 @@ package main -import ( - "github.com/lxc/incus/v6/client" -) +import incus "github.com/lxc/incus/v6/client" type source interface { present() bool diff --git a/cmd/lxd-to-incus/sources_apk.go b/cmd/lxd-to-incus/sources_apk.go index 2d43fe6ec48..4bcf7cb4f63 100644 --- a/cmd/lxd-to-incus/sources_apk.go +++ b/cmd/lxd-to-incus/sources_apk.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/lxd-to-incus/sources_copr.go b/cmd/lxd-to-incus/sources_copr.go index a77af825ace..04d82a45803 100644 --- a/cmd/lxd-to-incus/sources_copr.go +++ b/cmd/lxd-to-incus/sources_copr.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/lxd-to-incus/sources_deb.go b/cmd/lxd-to-incus/sources_deb.go index 3e2c3dacb3b..85bf1baceeb 100644 --- a/cmd/lxd-to-incus/sources_deb.go +++ b/cmd/lxd-to-incus/sources_deb.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/lxd-to-incus/sources_manual.go b/cmd/lxd-to-incus/sources_manual.go index 655ef28480f..36f0f1a577e 100644 --- a/cmd/lxd-to-incus/sources_manual.go +++ b/cmd/lxd-to-incus/sources_manual.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/lxd-to-incus/sources_snap.go b/cmd/lxd-to-incus/sources_snap.go index 3101c800070..0a4c851a1dd 100644 --- a/cmd/lxd-to-incus/sources_snap.go +++ b/cmd/lxd-to-incus/sources_snap.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/lxd-to-incus/sources_xbps.go b/cmd/lxd-to-incus/sources_xbps.go index 412f1fe9a9e..5152067c3ea 100644 --- a/cmd/lxd-to-incus/sources_xbps.go +++ b/cmd/lxd-to-incus/sources_xbps.go @@ -1,7 +1,7 @@ package main import ( - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go index ef257e490a4..8dd8f02fa2e 100644 --- a/cmd/lxd-to-incus/targets.go +++ b/cmd/lxd-to-incus/targets.go @@ -1,8 +1,6 @@ package main -import ( - "github.com/lxc/incus/v6/client" -) +import incus "github.com/lxc/incus/v6/client" type target interface { present() bool diff --git a/cmd/lxd-to-incus/targets_openrc.go b/cmd/lxd-to-incus/targets_openrc.go index d987f05e8c2..dd9988d0362 100644 --- a/cmd/lxd-to-incus/targets_openrc.go +++ b/cmd/lxd-to-incus/targets_openrc.go @@ -3,7 +3,7 @@ package main import ( "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/lxd-to-incus/targets_systemd.go b/cmd/lxd-to-incus/targets_systemd.go index ea8700716d9..85ec526a17b 100644 --- a/cmd/lxd-to-incus/targets_systemd.go +++ b/cmd/lxd-to-incus/targets_systemd.go @@ -3,7 +3,7 @@ package main import ( "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/cmd/lxd-to-incus/targets_xbps.go b/cmd/lxd-to-incus/targets_xbps.go index a99cbd3a9f0..23f5b4fa648 100644 --- a/cmd/lxd-to-incus/targets_xbps.go +++ b/cmd/lxd-to-incus/targets_xbps.go @@ -3,7 +3,7 @@ package main import ( "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/internal/cmd/cancel.go b/internal/cmd/cancel.go index c0e4be11af3..190bd6edfb0 100644 --- a/internal/cmd/cancel.go +++ b/internal/cmd/cancel.go @@ -6,7 +6,7 @@ import ( "os/signal" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/i18n" ) diff --git a/internal/migration/migrate.pb.go b/internal/migration/migrate.pb.go index 1d23fb2959b..ab86c2869ca 100644 --- a/internal/migration/migrate.pb.go +++ b/internal/migration/migrate.pb.go @@ -9,10 +9,11 @@ package migration import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/internal/server/cluster/connect.go b/internal/server/cluster/connect.go index 43bbe6dfe4e..b014f24f40f 100644 --- a/internal/server/cluster/connect.go +++ b/internal/server/cluster/connect.go @@ -9,7 +9,7 @@ import ( "net/url" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" clusterRequest "github.com/lxc/incus/v6/internal/server/cluster/request" "github.com/lxc/incus/v6/internal/server/db" "github.com/lxc/incus/v6/internal/server/instance/instancetype" diff --git a/internal/server/cluster/events.go b/internal/server/cluster/events.go index a47db7aedce..60aa295c9c6 100644 --- a/internal/server/cluster/events.go +++ b/internal/server/cluster/events.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/db" "github.com/lxc/incus/v6/internal/server/endpoints" "github.com/lxc/incus/v6/internal/server/events" diff --git a/internal/server/cluster/notify.go b/internal/server/cluster/notify.go index 510bab72455..7f4d079c2f0 100644 --- a/internal/server/cluster/notify.go +++ b/internal/server/cluster/notify.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/db" "github.com/lxc/incus/v6/internal/server/state" "github.com/lxc/incus/v6/shared/logger" diff --git a/internal/server/cluster/notify_test.go b/internal/server/cluster/notify_test.go index be91cb72752..67802195a86 100644 --- a/internal/server/cluster/notify_test.go +++ b/internal/server/cluster/notify_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/cluster" "github.com/lxc/incus/v6/internal/server/db" "github.com/lxc/incus/v6/internal/server/node" diff --git a/internal/server/cluster/upgrade.go b/internal/server/cluster/upgrade.go index 7c18ef77d00..cb1eef10632 100644 --- a/internal/server/cluster/upgrade.go +++ b/internal/server/cluster/upgrade.go @@ -10,7 +10,7 @@ import ( "github.com/cowsql/go-cowsql/client" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/db" "github.com/lxc/incus/v6/internal/server/state" "github.com/lxc/incus/v6/shared/logger" diff --git a/internal/server/endpoints/socket.go b/internal/server/endpoints/socket.go index 4ddabfa5bbb..048663a7fbf 100644 --- a/internal/server/endpoints/socket.go +++ b/internal/server/endpoints/socket.go @@ -10,7 +10,7 @@ import ( "os/user" "strconv" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/logger" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go index 38be7d614f5..49844d10ddc 100644 --- a/internal/server/instance/drivers/driver_qemu.go +++ b/internal/server/instance/drivers/driver_qemu.go @@ -40,7 +40,7 @@ import ( "google.golang.org/protobuf/proto" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/instancewriter" "github.com/lxc/incus/v6/internal/jmap" diff --git a/internal/server/instance/drivers/driver_qemu_cmd.go b/internal/server/instance/drivers/driver_qemu_cmd.go index 81477c62515..a83cea00541 100644 --- a/internal/server/instance/drivers/driver_qemu_cmd.go +++ b/internal/server/instance/drivers/driver_qemu_cmd.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/api" "github.com/lxc/incus/v6/shared/logger" ) diff --git a/internal/server/instance/instance_utils.go b/internal/server/instance/instance_utils.go index 394b47d54aa..b3911babb70 100644 --- a/internal/server/instance/instance_utils.go +++ b/internal/server/instance/instance_utils.go @@ -19,7 +19,7 @@ import ( "github.com/google/uuid" liblxc "github.com/lxc/go-lxc" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/migration" "github.com/lxc/incus/v6/internal/server/backup" diff --git a/internal/server/network/acl/driver_common.go b/internal/server/network/acl/driver_common.go index 231234f3a92..d5bb59bd464 100644 --- a/internal/server/network/acl/driver_common.go +++ b/internal/server/network/acl/driver_common.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/server/cluster" "github.com/lxc/incus/v6/internal/server/cluster/request" diff --git a/internal/server/network/driver_bridge.go b/internal/server/network/driver_bridge.go index 71f8030845a..f3c693bc532 100644 --- a/internal/server/network/driver_bridge.go +++ b/internal/server/network/driver_bridge.go @@ -16,7 +16,7 @@ import ( "github.com/mdlayher/netx/eui64" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/server/apparmor" "github.com/lxc/incus/v6/internal/server/cluster" "github.com/lxc/incus/v6/internal/server/cluster/request" diff --git a/internal/server/network/driver_common.go b/internal/server/network/driver_common.go index 27450d39650..25e0acb4c26 100644 --- a/internal/server/network/driver_common.go +++ b/internal/server/network/driver_common.go @@ -10,7 +10,7 @@ import ( "strings" "unicode" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/iprange" "github.com/lxc/incus/v6/internal/server/cluster" diff --git a/internal/server/network/driver_ovn.go b/internal/server/network/driver_ovn.go index e9c642e0b4c..5fec203d981 100644 --- a/internal/server/network/driver_ovn.go +++ b/internal/server/network/driver_ovn.go @@ -20,7 +20,7 @@ import ( ovsClient "github.com/ovn-org/libovsdb/client" ovsdbModel "github.com/ovn-org/libovsdb/model" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/internal/iprange" "github.com/lxc/incus/v6/internal/server/cluster" "github.com/lxc/incus/v6/internal/server/cluster/request" diff --git a/internal/server/network/zone/zone.go b/internal/server/network/zone/zone.go index 5aec8709768..daa1597858c 100644 --- a/internal/server/network/zone/zone.go +++ b/internal/server/network/zone/zone.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/server/cluster" "github.com/lxc/incus/v6/internal/server/cluster/request" diff --git a/internal/server/response/response.go b/internal/server/response/response.go index 000631fbdc4..6ef394f45f8 100644 --- a/internal/server/response/response.go +++ b/internal/server/response/response.go @@ -11,7 +11,7 @@ import ( "os" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" localUtil "github.com/lxc/incus/v6/internal/server/util" "github.com/lxc/incus/v6/shared/api" "github.com/lxc/incus/v6/shared/logger" diff --git a/internal/server/storage/backend.go b/internal/server/storage/backend.go index 8bc6c59a9df..5a4956fa2e7 100644 --- a/internal/server/storage/backend.go +++ b/internal/server/storage/backend.go @@ -24,7 +24,7 @@ import ( "golang.org/x/sync/errgroup" "gopkg.in/yaml.v2" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/instancewriter" internalIO "github.com/lxc/incus/v6/internal/io" diff --git a/shared/cliconfig/keepalive.go b/shared/cliconfig/keepalive.go index fe977c68cb6..a0df452aece 100644 --- a/shared/cliconfig/keepalive.go +++ b/shared/cliconfig/keepalive.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/subprocess" "github.com/lxc/incus/v6/shared/util" ) diff --git a/shared/cliconfig/keepalive_windows.go b/shared/cliconfig/keepalive_windows.go index 0cd50e67426..b97ecda7532 100644 --- a/shared/cliconfig/keepalive_windows.go +++ b/shared/cliconfig/keepalive_windows.go @@ -5,7 +5,7 @@ package cliconfig import ( "fmt" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" ) func (c *Config) handleKeepAlive(remote Remote, name string, args *incus.ConnectionArgs) (incus.InstanceServer, error) { diff --git a/shared/cliconfig/remote.go b/shared/cliconfig/remote.go index ec9d6545f54..44c2df6c4e0 100644 --- a/shared/cliconfig/remote.go +++ b/shared/cliconfig/remote.go @@ -18,7 +18,7 @@ import ( "github.com/zitadel/oidc/v3/pkg/oidc" "golang.org/x/crypto/ssh" - "github.com/lxc/incus/v6/client" + incus "github.com/lxc/incus/v6/client" "github.com/lxc/incus/v6/shared/api" "github.com/lxc/incus/v6/shared/util" )