Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: update gomodule imports to /v2
Kyle Mendell6cb491328f92
diff --git a/.goreleaser.yaml b/.goreleaser.yamlindex 23754df6a..36481639f 100644--- a/.goreleaser.yaml+++ b/.goreleaser.yaml@@ -40,9 +40,9 @@ builds:ldflags:- -w -s- -buildid={{ .Version }}- - -X github.com/getarcaneapp/arcane/backend/internal/config.Version={{ .Version }}- - -X github.com/getarcaneapp/arcane/backend/internal/config.Revision={{ .ShortCommit }}- - -X github.com/getarcaneapp/arcane/backend/internal/config.BuildTime={{ .Date }}+ - -X github.com/getarcaneapp/arcane/backend/v2/internal/config.Version={{ .Version }}+ - -X github.com/getarcaneapp/arcane/backend/v2/internal/config.Revision={{ .ShortCommit }}+ - -X github.com/getarcaneapp/arcane/backend/v2/internal/config.BuildTime={{ .Date }}flags:- -trimpathmod_timestamp: "{{ .CommitTimestamp }}"@@ -72,9 +72,9 @@ builds:ldflags:- -w -s- -buildid={{ .Version }}- - -X github.com/getarcaneapp/arcane/backend/internal/config.Version={{ .Version }}- - -X github.com/getarcaneapp/arcane/backend/internal/config.Revision={{ .ShortCommit }}- - -X github.com/getarcaneapp/arcane/backend/internal/config.BuildTime={{ .Date }}+ - -X github.com/getarcaneapp/arcane/backend/v2/internal/config.Version={{ .Version }}+ - -X github.com/getarcaneapp/arcane/backend/v2/internal/config.Revision={{ .ShortCommit }}+ - -X github.com/getarcaneapp/arcane/backend/v2/internal/config.BuildTime={{ .Date }}flags:- -trimpathmod_timestamp: "{{ .CommitTimestamp }}"@@ -102,8 +102,8 @@ builds:ldflags:- -w -s- -buildid={{ .Version }}- - -X github.com/getarcaneapp/arcane/cli/internal/config.Version={{ .Version }}- - -X github.com/getarcaneapp/arcane/cli/internal/config.Revision={{ .ShortCommit }}+ - -X github.com/getarcaneapp/arcane/cli/v2/internal/config.Version={{ .Version }}+ - -X github.com/getarcaneapp/arcane/cli/v2/internal/config.Revision={{ .ShortCommit }}flags:- -trimpathmod_timestamp: "{{ .CommitTimestamp }}"diff --git a/Justfile b/Justfileindex 23eeb6a56..4800a9d41 100644--- a/Justfile+++ b/Justfile@@ -227,9 +227,9 @@ _test-backend:cd backendif [ -n "${GO_JUNIT_REPORT_FILE:-}" ]; thenmkdir -p "$(dirname "$GO_JUNIT_REPORT_FILE")"- go test -json -tags=exclude_frontend,buildables -ldflags "-X github.com/getarcaneapp/arcane/backend/buildables.EnabledFeatures=autologin" ./... -race -coverprofile=coverage.txt -covermode=atomic -v 2>&1 | go run github.com/jstemmer/go-junit-report/[email protected] -parser gojson -set-exit-code -out "$GO_JUNIT_REPORT_FILE"+ go test -json -tags=exclude_frontend,buildables -ldflags "-X github.com/getarcaneapp/arcane/backend/v2/buildables.EnabledFeatures=autologin" ./... -race -coverprofile=coverage.txt -covermode=atomic -v 2>&1 | go run github.com/jstemmer/go-junit-report/[email protected] -parser gojson -set-exit-code -out "$GO_JUNIT_REPORT_FILE"else- go test -tags=exclude_frontend,buildables -ldflags "-X github.com/getarcaneapp/arcane/backend/buildables.EnabledFeatures=autologin" ./... -race -coverprofile=coverage.txt -covermode=atomic -v+ go test -tags=exclude_frontend,buildables -ldflags "-X github.com/getarcaneapp/arcane/backend/v2/buildables.EnabledFeatures=autologin" ./... -race -coverprofile=coverage.txt -covermode=atomic -vfi# Run CLI testsdiff --git a/backend/api/api.go b/backend/api/api.goindex 265178e27..a134b27cc 100644--- a/backend/api/api.go+++ b/backend/api/api.go@@ -8,15 +8,15 @@ import ("github.com/danielgtaylor/huma/v2""github.com/danielgtaylor/huma/v2/adapters/humaecho"- "github.com/getarcaneapp/arcane/backend/api/handlers"- "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/di"+ "github.com/getarcaneapp/arcane/backend/v2/api/handlers"+ "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/di""github.com/labstack/echo/v4")const (- arcaneTypesPrefix = "github.com/getarcaneapp/arcane/types/"+ arcaneTypesPrefix = "github.com/getarcaneapp/arcane/types/v2/"dockerSDKPrefix = "github.com/moby/moby")@@ -37,7 +37,7 @@ var dockerSchemaPrefixes = map[string]string{}// customSchemaNamer creates unique schema names using package prefix for types-// from github.com/getarcaneapp/arcane/types to avoid conflicts between packages that have+// from github.com/getarcaneapp/arcane/types/v2 to avoid conflicts between packages that have// types with the same name (e.g., image.Summary vs env.Summary).func customSchemaNamer(t reflect.Type, hint string) string {name := huma.DefaultSchemaNamer(t, hint)diff --git a/backend/api/api_test.go b/backend/api/api_test.goindex 0a10da75a..1694914df 100644--- a/backend/api/api_test.go+++ b/backend/api/api_test.go@@ -6,10 +6,10 @@ import ("testing"humav2 "github.com/danielgtaylor/huma/v2"- basetypes "github.com/getarcaneapp/arcane/types/base"- envtypes "github.com/getarcaneapp/arcane/types/env"- imagetypes "github.com/getarcaneapp/arcane/types/image"- volumetypes "github.com/getarcaneapp/arcane/types/volume"+ basetypes "github.com/getarcaneapp/arcane/types/v2/base"+ envtypes "github.com/getarcaneapp/arcane/types/v2/env"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"dockernetwork "github.com/moby/moby/api/types/network")diff --git a/backend/api/buildables.go b/backend/api/buildables.goindex 7992e356b..30b19d442 100644--- a/backend/api/buildables.go+++ b/backend/api/buildables.go@@ -7,14 +7,14 @@ import ("net/http""time"- "github.com/getarcaneapp/arcane/backend/buildables"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cookie"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/auth"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/user"+ "github.com/getarcaneapp/arcane/backend/v2/buildables"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/auth"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/user""github.com/labstack/echo/v4")diff --git a/backend/api/handlers/activities.go b/backend/api/handlers/activities.goindex 890584e1d..0010127eb 100644--- a/backend/api/handlers/activities.go+++ b/backend/api/handlers/activities.go@@ -12,13 +12,13 @@ import ("time""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- "github.com/getarcaneapp/arcane/types/activity"- "github.com/getarcaneapp/arcane/types/base"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/types/v2/activity"+ "github.com/getarcaneapp/arcane/types/v2/base""gorm.io/gorm")diff --git a/backend/api/handlers/activities_test.go b/backend/api/handlers/activities_test.goindex f9be5ff53..1b042963a 100644--- a/backend/api/handlers/activities_test.go+++ b/backend/api/handlers/activities_test.go@@ -11,9 +11,9 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services")func setupActivityHandlerTestDBInternal(t *testing.T) *database.DB {diff --git a/backend/api/handlers/apikeys.go b/backend/api/handlers/apikeys.goindex e6777ade0..29a4d99c9 100644--- a/backend/api/handlers/apikeys.go+++ b/backend/api/handlers/apikeys.go@@ -6,13 +6,13 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/types/apikey"- "github.com/getarcaneapp/arcane/types/base"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/types/v2/apikey"+ "github.com/getarcaneapp/arcane/types/v2/base")// ApiKeyHandler provides Huma-based API key management endpoints.diff --git a/backend/api/handlers/appimages.go b/backend/api/handlers/appimages.goindex c9a7593cc..7f402d1b1 100644--- a/backend/api/handlers/appimages.go+++ b/backend/api/handlers/appimages.go@@ -7,8 +7,8 @@ import ("strings""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services")// AppImagesHandler provides Huma-based application image endpoints.diff --git a/backend/api/handlers/appimages_test.go b/backend/api/handlers/appimages_test.goindex a101ed417..48f33122c 100644--- a/backend/api/handlers/appimages_test.go+++ b/backend/api/handlers/appimages_test.go@@ -6,8 +6,8 @@ import ("testing""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/resources"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/resources""github.com/stretchr/testify/require")diff --git a/backend/api/handlers/auth.go b/backend/api/handlers/auth.goindex cac6d2b9d..7d712a09f 100644--- a/backend/api/handlers/auth.go+++ b/backend/api/handlers/auth.go@@ -8,13 +8,13 @@ import ("time""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cookie"- "github.com/getarcaneapp/arcane/types/auth"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/user"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"+ "github.com/getarcaneapp/arcane/types/v2/auth"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/user")type AuthHandler struct {diff --git a/backend/api/handlers/build_workspaces.go b/backend/api/handlers/build_workspaces.goindex efaee82c2..ab4de5921 100644--- a/backend/api/handlers/build_workspaces.go+++ b/backend/api/handlers/build_workspaces.go@@ -7,12 +7,12 @@ import ("path""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- volumetypes "github.com/getarcaneapp/arcane/types/volume"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume")// BuildWorkspaceHandler provides file browsing endpoints for manual build workspaces.diff --git a/backend/api/handlers/container_registries.go b/backend/api/handlers/container_registries.goindex 020f97a84..660661911 100644--- a/backend/api/handlers/container_registries.go+++ b/backend/api/handlers/container_registries.go@@ -6,15 +6,15 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/containerregistry"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry")// ContainerRegistryHandler handles container registry management endpoints.diff --git a/backend/api/handlers/containers.go b/backend/api/handlers/containers.goindex 55611364f..bb65479fd 100644--- a/backend/api/handlers/containers.go+++ b/backend/api/handlers/containers.go@@ -9,18 +9,18 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/base"- containertypes "github.com/getarcaneapp/arcane/types/container"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/base"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"dockercontainer "github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/network")diff --git a/backend/api/handlers/customize.go b/backend/api/handlers/customize.goindex 597ca4262..f62866196 100644--- a/backend/api/handlers/customize.go+++ b/backend/api/handlers/customize.go@@ -6,12 +6,12 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/category"- "github.com/getarcaneapp/arcane/types/search"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/category"+ "github.com/getarcaneapp/arcane/types/v2/search")// CustomizeHandler handles customization search endpoints.diff --git a/backend/api/handlers/dashboard.go b/backend/api/handlers/dashboard.goindex 4d95e2ce2..10f5eb954 100644--- a/backend/api/handlers/dashboard.go+++ b/backend/api/handlers/dashboard.go@@ -5,11 +5,11 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- dashboardtypes "github.com/getarcaneapp/arcane/types/dashboard"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard")type DashboardHandler struct {diff --git a/backend/api/handlers/dashboard_test.go b/backend/api/handlers/dashboard_test.goindex fd65304bb..2371e5a5c 100644--- a/backend/api/handlers/dashboard_test.go+++ b/backend/api/handlers/dashboard_test.go@@ -9,11 +9,11 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- dashboardtypes "github.com/getarcaneapp/arcane/types/dashboard"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard"glsqlite "github.com/glebarez/sqlite"dockercontainer "github.com/moby/moby/api/types/container"dockerimage "github.com/moby/moby/api/types/image"diff --git a/backend/api/handlers/diagnostics.go b/backend/api/handlers/diagnostics.goindex 0b815eb51..4fd7c96d7 100644--- a/backend/api/handlers/diagnostics.go+++ b/backend/api/handlers/diagnostics.go@@ -6,12 +6,12 @@ import ("github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/api/ws"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/logstream"- "github.com/getarcaneapp/arcane/types/system"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/api/ws"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/logstream"+ "github.com/getarcaneapp/arcane/types/v2/system")// DiagnosticsHandler serves the REST diagnostics endpoints. The live WebSocketdiff --git a/backend/api/handlers/edge_mtls_ca.go b/backend/api/handlers/edge_mtls_ca.goindex 579ea151a..68d7642c6 100644--- a/backend/api/handlers/edge_mtls_ca.go+++ b/backend/api/handlers/edge_mtls_ca.go@@ -10,9 +10,9 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- typesenvironment "github.com/getarcaneapp/arcane/types/environment"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ typesenvironment "github.com/getarcaneapp/arcane/types/v2/environment")const edgeMTLSCertificateExpiryWarningWindow = 30 * 24 * time.Hourdiff --git a/backend/api/handlers/edge_mtls_ca_test.go b/backend/api/handlers/edge_mtls_ca_test.goindex 37fd3f6d8..841933f4d 100644--- a/backend/api/handlers/edge_mtls_ca_test.go+++ b/backend/api/handlers/edge_mtls_ca_test.go@@ -7,9 +7,9 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- libcrypto "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ libcrypto "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge""github.com/stretchr/testify/require")diff --git a/backend/api/handlers/environments.go b/backend/api/handlers/environments.goindex 2d7032fd1..6fa778e06 100644--- a/backend/api/handlers/environments.go+++ b/backend/api/handlers/environments.go@@ -15,20 +15,20 @@ import ("time""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- httputils "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/environment"- "github.com/getarcaneapp/arcane/types/version"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/environment"+ "github.com/getarcaneapp/arcane/types/v2/version")const localDockerEnvironmentID = "0"diff --git a/backend/api/handlers/environments_test.go b/backend/api/handlers/environments_test.goindex 6f2da62cb..a1d04b5f7 100644--- a/backend/api/handlers/environments_test.go+++ b/backend/api/handlers/environments_test.go@@ -7,11 +7,11 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- envtypes "github.com/getarcaneapp/arcane/types/environment"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ envtypes "github.com/getarcaneapp/arcane/types/v2/environment""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/api/handlers/events.go b/backend/api/handlers/events.goindex 84ff89677..e48ace47b 100644--- a/backend/api/handlers/events.go+++ b/backend/api/handlers/events.go@@ -8,14 +8,14 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/event"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/event""github.com/labstack/echo/v4")diff --git a/backend/api/handlers/events_test.go b/backend/api/handlers/events_test.goindex ed7f1457e..11ccf3f01 100644--- a/backend/api/handlers/events_test.go+++ b/backend/api/handlers/events_test.go@@ -8,12 +8,12 @@ import ("net/http/httptest""testing"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"glsqlite "github.com/glebarez/sqlite""github.com/labstack/echo/v4""github.com/stretchr/testify/require"diff --git a/backend/api/handlers/federated.go b/backend/api/handlers/federated.goindex b33c20729..1a399b68f 100644--- a/backend/api/handlers/federated.go+++ b/backend/api/handlers/federated.go@@ -5,13 +5,13 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/types/base"- federatedtypes "github.com/getarcaneapp/arcane/types/federated"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/types/v2/base"+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated""github.com/labstack/echo/v4")diff --git a/backend/api/handlers/git_repositories.go b/backend/api/handlers/git_repositories.goindex c77860f27..938aea929 100644--- a/backend/api/handlers/git_repositories.go+++ b/backend/api/handlers/git_repositories.go@@ -4,12 +4,12 @@ import ("context""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/gitops"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/gitops")// GitRepositoryHandler handles git repository management endpoints.diff --git a/backend/api/handlers/git_repositories_test.go b/backend/api/handlers/git_repositories_test.goindex c1cd984d6..d5ce48363 100644--- a/backend/api/handlers/git_repositories_test.go+++ b/backend/api/handlers/git_repositories_test.go@@ -11,9 +11,9 @@ import ("github.com/labstack/echo/v4""github.com/stretchr/testify/require"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz")// TestGitRepositoryHandlers_PermissionGating verifies that the mutatingdiff --git a/backend/api/handlers/gitops_syncs.go b/backend/api/handlers/gitops_syncs.goindex edfbb8af0..619e50d07 100644--- a/backend/api/handlers/gitops_syncs.go+++ b/backend/api/handlers/gitops_syncs.go@@ -4,12 +4,12 @@ import ("context""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/gitops"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/gitops")// GitOpsSyncHandler handles GitOps sync management endpoints.diff --git a/backend/api/handlers/health.go b/backend/api/handlers/health.goindex 854c6cfb2..ef3aa36e8 100644--- a/backend/api/handlers/health.go+++ b/backend/api/handlers/health.go@@ -5,7 +5,7 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/types/v2/system")// HealthOutput is the response for health checkdiff --git a/backend/api/handlers/helpers.go b/backend/api/handlers/helpers.goindex 8552ca6d3..e6fe1693a 100644--- a/backend/api/handlers/helpers.go+++ b/backend/api/handlers/helpers.go@@ -6,13 +6,13 @@ import ("errors""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/remenv"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/base"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/base")// ActivityAppContext carries the app lifecycle context through handler registration.diff --git a/backend/api/handlers/image_updates.go b/backend/api/handlers/image_updates.goindex fe859a591..3b9ccb74d 100644--- a/backend/api/handlers/image_updates.go+++ b/backend/api/handlers/image_updates.go@@ -6,14 +6,14 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/base"- imagetypes "github.com/getarcaneapp/arcane/types/image"- "github.com/getarcaneapp/arcane/types/imageupdate"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/base"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate")type ImageUpdateHandler struct {diff --git a/backend/api/handlers/images.go b/backend/api/handlers/images.goindex 59b1a7426..646694dc7 100644--- a/backend/api/handlers/images.go+++ b/backend/api/handlers/images.go@@ -9,18 +9,18 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/image"- "github.com/getarcaneapp/arcane/types/system"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/image"+ "github.com/getarcaneapp/arcane/types/v2/system""gorm.io/gorm")diff --git a/backend/api/handlers/job_schedules.go b/backend/api/handlers/job_schedules.goindex 454e2c108..334197beb 100644--- a/backend/api/handlers/job_schedules.go+++ b/backend/api/handlers/job_schedules.go@@ -5,11 +5,11 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/jobschedule"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/jobschedule")type GetJobSchedulesInput struct {diff --git a/backend/api/handlers/networks.go b/backend/api/handlers/networks.goindex e39f7bf0c..85bdf2aa8 100644--- a/backend/api/handlers/networks.go+++ b/backend/api/handlers/networks.go@@ -9,17 +9,17 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/base"- networktypes "github.com/getarcaneapp/arcane/types/network"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/base"+ networktypes "github.com/getarcaneapp/arcane/types/v2/network"dockernetwork "github.com/moby/moby/api/types/network")diff --git a/backend/api/handlers/notifications.go b/backend/api/handlers/notifications.goindex 353fad9e4..9109ff65c 100644--- a/backend/api/handlers/notifications.go+++ b/backend/api/handlers/notifications.go@@ -7,14 +7,14 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/notification"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/notification")type NotificationHandler struct {diff --git a/backend/api/handlers/notifications_test.go b/backend/api/handlers/notifications_test.goindex 5452a7288..dbdaaa08d 100644--- a/backend/api/handlers/notifications_test.go+++ b/backend/api/handlers/notifications_test.go@@ -7,11 +7,11 @@ import ("time""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- notificationdto "github.com/getarcaneapp/arcane/types/notification"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ notificationdto "github.com/getarcaneapp/arcane/types/v2/notification"glsqlite "github.com/glebarez/sqlite""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/backend/api/handlers/oidc.go b/backend/api/handlers/oidc.goindex e8856fba9..4c91bb256 100644--- a/backend/api/handlers/oidc.go+++ b/backend/api/handlers/oidc.go@@ -8,15 +8,15 @@ import ("time""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cookie"- httputils "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- "github.com/getarcaneapp/arcane/types/auth"- roletypes "github.com/getarcaneapp/arcane/types/role"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"+ httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/types/v2/auth"+ roletypes "github.com/getarcaneapp/arcane/types/v2/role")// OidcHandler handles OIDC authentication endpoints, plus OIDC group → rolediff --git a/backend/api/handlers/permission_gating_test.go b/backend/api/handlers/permission_gating_test.goindex 671a2b141..1d703058c 100644--- a/backend/api/handlers/permission_gating_test.go+++ b/backend/api/handlers/permission_gating_test.go@@ -6,8 +6,8 @@ import ("github.com/danielgtaylor/huma/v2""github.com/danielgtaylor/huma/v2/adapters/humaecho"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz""github.com/labstack/echo/v4")diff --git a/backend/api/handlers/ports.go b/backend/api/handlers/ports.goindex 06acd90f3..d9cca0808 100644--- a/backend/api/handlers/ports.go+++ b/backend/api/handlers/ports.go@@ -6,12 +6,12 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/types/base"- porttypes "github.com/getarcaneapp/arcane/types/port"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/types/v2/base"+ porttypes "github.com/getarcaneapp/arcane/types/v2/port")type PortHandler struct {diff --git a/backend/api/handlers/projects.go b/backend/api/handlers/projects.goindex fa2ce25d6..7b01f9e2f 100644--- a/backend/api/handlers/projects.go+++ b/backend/api/handlers/projects.go@@ -10,19 +10,19 @@ import ("time""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/project"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/project")// ProjectHandler provides Huma-based project management endpoints.diff --git a/backend/api/handlers/remenv_handlers_test.go b/backend/api/handlers/remenv_handlers_test.goindex c771c4816..6777cb214 100644--- a/backend/api/handlers/remenv_handlers_test.go+++ b/backend/api/handlers/remenv_handlers_test.go@@ -9,15 +9,15 @@ import ("time""github.com/danielgtaylor/huma/v2"- humamiddleware "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/env"- "github.com/getarcaneapp/arcane/types/jobschedule"- settingstypes "github.com/getarcaneapp/arcane/types/settings"+ humamiddleware "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/env"+ "github.com/getarcaneapp/arcane/types/v2/jobschedule"+ settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"glsqlite "github.com/glebarez/sqlite""github.com/stretchr/testify/require""gorm.io/gorm"diff --git a/backend/api/handlers/roles.go b/backend/api/handlers/roles.goindex 377895b03..5ee8e805b 100644--- a/backend/api/handlers/roles.go+++ b/backend/api/handlers/roles.go@@ -5,13 +5,13 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- roletypes "github.com/getarcaneapp/arcane/types/role"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ roletypes "github.com/getarcaneapp/arcane/types/v2/role")type RoleHandler struct {diff --git a/backend/api/handlers/roles_access_policy_test.go b/backend/api/handlers/roles_access_policy_test.goindex 6408bf9e6..e607125ed 100644--- a/backend/api/handlers/roles_access_policy_test.go+++ b/backend/api/handlers/roles_access_policy_test.go@@ -3,7 +3,7 @@ package handlersimport ("testing"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz""github.com/stretchr/testify/require")diff --git a/backend/api/handlers/settings.go b/backend/api/handlers/settings.goindex f9caed42a..73e00c9c9 100644--- a/backend/api/handlers/settings.go+++ b/backend/api/handlers/settings.go@@ -10,18 +10,18 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/category"- "github.com/getarcaneapp/arcane/types/search"- "github.com/getarcaneapp/arcane/types/settings"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/category"+ "github.com/getarcaneapp/arcane/types/v2/search"+ "github.com/getarcaneapp/arcane/types/v2/settings")// SettingsHandler provides Huma-based settings management endpoints.diff --git a/backend/api/handlers/settings_test.go b/backend/api/handlers/settings_test.goindex 3b1cc145d..c83ee1c48 100644--- a/backend/api/handlers/settings_test.go+++ b/backend/api/handlers/settings_test.go@@ -9,12 +9,12 @@ import ("testing""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- apitypes "github.com/getarcaneapp/arcane/types/settings"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ apitypes "github.com/getarcaneapp/arcane/types/v2/settings"glsqlite "github.com/glebarez/sqlite""github.com/stretchr/testify/require""gorm.io/gorm"diff --git a/backend/api/handlers/settings_validation_test.go b/backend/api/handlers/settings_validation_test.goindex 00d14bc61..b4d415458 100644--- a/backend/api/handlers/settings_validation_test.go+++ b/backend/api/handlers/settings_validation_test.go@@ -4,7 +4,7 @@ import ("strings""testing"- "github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects""github.com/stretchr/testify/assert")diff --git a/backend/api/handlers/swarm.go b/backend/api/handlers/swarm.goindex adbd92f90..4ec1fa26e 100644--- a/backend/api/handlers/swarm.go+++ b/backend/api/handlers/swarm.go@@ -9,16 +9,16 @@ import ("github.com/containerd/errdefs""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/types/base"- swarmtypes "github.com/getarcaneapp/arcane/types/swarm"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/types/v2/base"+ swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm")type SwarmHandler struct {diff --git a/backend/api/handlers/system.go b/backend/api/handlers/system.goindex 15a65f21b..28fd01119 100644--- a/backend/api/handlers/system.go+++ b/backend/api/handlers/system.go@@ -7,17 +7,17 @@ import ("strings""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/base"- containertypes "github.com/getarcaneapp/arcane/types/container"- "github.com/getarcaneapp/arcane/types/dockerinfo"- "github.com/getarcaneapp/arcane/types/system"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/base"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"+ "github.com/getarcaneapp/arcane/types/v2/dockerinfo"+ "github.com/getarcaneapp/arcane/types/v2/system"dockersystem "github.com/moby/moby/api/types/system""github.com/moby/moby/client")diff --git a/backend/api/handlers/templates.go b/backend/api/handlers/templates.goindex 3122f8b42..46f23a595 100644--- a/backend/api/handlers/templates.go+++ b/backend/api/handlers/templates.go@@ -7,15 +7,15 @@ import ("net/url""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/env"- "github.com/getarcaneapp/arcane/types/template"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/env"+ "github.com/getarcaneapp/arcane/types/v2/template")// TemplateHandler handles template management endpoints.diff --git a/backend/api/handlers/templates_test.go b/backend/api/handlers/templates_test.goindex 225a5eb9a..9bb7b0961 100644--- a/backend/api/handlers/templates_test.go+++ b/backend/api/handlers/templates_test.go@@ -12,12 +12,12 @@ import ("github.com/danielgtaylor/huma/v2""github.com/danielgtaylor/huma/v2/adapters/humaecho"- humamiddleware "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ humamiddleware "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"glsqlite "github.com/glebarez/sqlite""github.com/golang-jwt/jwt/v5""github.com/labstack/echo/v4"diff --git a/backend/api/handlers/updater.go b/backend/api/handlers/updater.goindex b156d0d1b..c23176806 100644--- a/backend/api/handlers/updater.go+++ b/backend/api/handlers/updater.go@@ -5,14 +5,14 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/updater"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/updater")// UpdaterHandler provides Huma-based updater management endpoints.diff --git a/backend/api/handlers/users.go b/backend/api/handlers/users.goindex bbf934145..95df046de 100644--- a/backend/api/handlers/users.go+++ b/backend/api/handlers/users.go@@ -7,14 +7,14 @@ import ("time""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/utils/validation"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/user"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/user")// UserHandler handles user management endpoints.diff --git a/backend/api/handlers/users_test.go b/backend/api/handlers/users_test.goindex 9913be812..468761143 100644--- a/backend/api/handlers/users_test.go+++ b/backend/api/handlers/users_test.go@@ -6,15 +6,15 @@ import ("testing""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"glsqlite "github.com/glebarez/sqlite""github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database")func setupUserHandlerTestDB(t *testing.T) *database.DB {diff --git a/backend/api/handlers/version.go b/backend/api/handlers/version.goindex 2c019b5f0..f789ab5ae 100644--- a/backend/api/handlers/version.go+++ b/backend/api/handlers/version.go@@ -5,8 +5,8 @@ import ("strings""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/types/version"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/types/v2/version")// VersionHandler handles version information endpoints.diff --git a/backend/api/handlers/volumes.go b/backend/api/handlers/volumes.goindex 461c49f6a..143d6dad4 100644--- a/backend/api/handlers/volumes.go+++ b/backend/api/handlers/volumes.go@@ -9,16 +9,16 @@ import ("strconv""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/base"- volumetypes "github.com/getarcaneapp/arcane/types/volume"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/base"+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume""github.com/moby/moby/client")diff --git a/backend/api/handlers/volumes_upload_test.go b/backend/api/handlers/volumes_upload_test.goindex b0c6417a1..be8af7514 100644--- a/backend/api/handlers/volumes_upload_test.go+++ b/backend/api/handlers/volumes_upload_test.go@@ -7,9 +7,9 @@ import ("testing""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/api/handlers/vulnerabilities.go b/backend/api/handlers/vulnerabilities.goindex 65c7186f0..82bd69e12 100644--- a/backend/api/handlers/vulnerabilities.go+++ b/backend/api/handlers/vulnerabilities.go@@ -5,13 +5,13 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/vulnerability"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/vulnerability")// VulnerabilityHandler provides Huma-based vulnerability scanning endpoints.diff --git a/backend/api/handlers/webhooks.go b/backend/api/handlers/webhooks.goindex f130bb420..6ef4ba230 100644--- a/backend/api/handlers/webhooks.go+++ b/backend/api/handlers/webhooks.go@@ -6,12 +6,12 @@ import ("net/http""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/webhook"+ humamw "github.com/getarcaneapp/arcane/backend/v2/api/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/webhook")type WebhookHandler struct {diff --git a/backend/api/middleware/auth.go b/backend/api/middleware/auth.goindex ae3fb6b0c..9fa767bcd 100644--- a/backend/api/middleware/auth.go+++ b/backend/api/middleware/auth.go@@ -8,13 +8,13 @@ import ("strings""github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cookie"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie")// ContextKey is a type for context keys used by Huma handlers.diff --git a/backend/api/middleware/auth_test.go b/backend/api/middleware/auth_test.goindex ded9df8dc..a8e19b99d 100644--- a/backend/api/middleware/auth_test.go+++ b/backend/api/middleware/auth_test.go@@ -9,11 +9,11 @@ import ("github.com/danielgtaylor/huma/v2""github.com/danielgtaylor/huma/v2/adapters/humaecho"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/types/auth"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/types/v2/auth"glsqlite "github.com/glebarez/sqlite""github.com/golang-jwt/jwt/v5""github.com/labstack/echo/v4"diff --git a/backend/api/middleware/role.go b/backend/api/middleware/role.goindex 4e7779617..10900f10c 100644--- a/backend/api/middleware/role.go+++ b/backend/api/middleware/role.go@@ -6,7 +6,7 @@ import ("github.com/danielgtaylor/huma/v2"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz")// RequirePermission returns a per-operation Huma middleware that rejectsdiff --git a/backend/api/middleware/role_test.go b/backend/api/middleware/role_test.goindex 2bc3933cc..b2c697a17 100644--- a/backend/api/middleware/role_test.go+++ b/backend/api/middleware/role_test.go@@ -11,7 +11,7 @@ import ("github.com/labstack/echo/v4""github.com/stretchr/testify/require"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz")func TestRequirePermission_RejectsCallerMissingPermission(t *testing.T) {diff --git a/backend/api/playwright.go b/backend/api/playwright.goindex b1780fd6f..45d4156aa 100644--- a/backend/api/playwright.go+++ b/backend/api/playwright.go@@ -5,7 +5,7 @@ package apiimport ("net/http"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/labstack/echo/v4")diff --git a/backend/api/webhooks_trigger.go b/backend/api/webhooks_trigger.goindex b24b1a787..4eaf39b93 100644--- a/backend/api/webhooks_trigger.go+++ b/backend/api/webhooks_trigger.go@@ -4,9 +4,9 @@ import ("errors""net/http"- "github.com/getarcaneapp/arcane/backend/api/handlers"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/api/handlers"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/labstack/echo/v4")diff --git a/backend/api/ws/diagnostics.go b/backend/api/ws/diagnostics.goindex 9d74e04a1..181156951 100644--- a/backend/api/ws/diagnostics.go+++ b/backend/api/ws/diagnostics.go@@ -6,12 +6,12 @@ import ("net/http/pprof""time"- "github.com/getarcaneapp/arcane/backend/internal/middleware"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/logstream"- wshub "github.com/getarcaneapp/arcane/backend/pkg/libarcane/ws"- systemtypes "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/logstream"+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system""github.com/gorilla/websocket""github.com/labstack/echo/v4")diff --git a/backend/api/ws/handler.go b/backend/api/ws/handler.goindex 25151255f..30c73457a 100644--- a/backend/api/ws/handler.go+++ b/backend/api/ws/handler.go@@ -14,16 +14,16 @@ import ("sync/atomic""time"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/middleware"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/system"- wshub "github.com/getarcaneapp/arcane/backend/pkg/libarcane/ws"- httputil "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- systemtypes "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/system"+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"+ httputil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system""github.com/gorilla/websocket""github.com/labstack/echo/v4""github.com/shirou/gopsutil/v4/cpu"diff --git a/backend/api/ws/handler_test.go b/backend/api/ws/handler_test.goindex 80bb76542..c769dc0ec 100644--- a/backend/api/ws/handler_test.go+++ b/backend/api/ws/handler_test.go@@ -12,10 +12,10 @@ import ("testing""time"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/system"- wshub "github.com/getarcaneapp/arcane/backend/pkg/libarcane/ws"- systemtypes "github.com/getarcaneapp/arcane/types/system"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/system"+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system""github.com/gorilla/websocket""github.com/labstack/echo/v4""github.com/stretchr/testify/require"diff --git a/backend/cli/config_schema.go b/backend/cli/config_schema.goindex 24cdaf951..1c5a9238e 100644--- a/backend/cli/config_schema.go+++ b/backend/cli/config_schema.go@@ -4,7 +4,7 @@ import ("fmt""os"- "github.com/getarcaneapp/arcane/backend/internal/configschema"+ "github.com/getarcaneapp/arcane/backend/v2/internal/configschema""github.com/spf13/cobra")diff --git a/backend/cli/generate/generate.go b/backend/cli/generate/generate.goindex d22679a9d..1f050e947 100644--- a/backend/cli/generate/generate.go+++ b/backend/cli/generate/generate.go@@ -1,7 +1,7 @@package generateimport (- cligenerate "github.com/getarcaneapp/arcane/cli/pkg/generate"+ cligenerate "github.com/getarcaneapp/arcane/cli/v2/pkg/generate")var GenerateCmd = cligenerate.GenerateCmddiff --git a/backend/cli/openapi.go b/backend/cli/openapi.goindex 7cba984cc..9ae0f08f3 100644--- a/backend/cli/openapi.go+++ b/backend/cli/openapi.go@@ -4,7 +4,7 @@ import ("fmt""os"- "github.com/getarcaneapp/arcane/backend/api"+ "github.com/getarcaneapp/arcane/backend/v2/api""github.com/spf13/cobra")diff --git a/backend/cli/root.go b/backend/cli/root.goindex ba7690ceb..2c3c820ba 100644--- a/backend/cli/root.go+++ b/backend/cli/root.go@@ -7,11 +7,11 @@ import ("github.com/spf13/cobra"- "github.com/getarcaneapp/arcane/backend/cli/generate"- "github.com/getarcaneapp/arcane/backend/cli/upgrade"- "github.com/getarcaneapp/arcane/backend/internal/bootstrap"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/pkg/utils/signals"+ "github.com/getarcaneapp/arcane/backend/v2/cli/generate"+ "github.com/getarcaneapp/arcane/backend/v2/cli/upgrade"+ "github.com/getarcaneapp/arcane/backend/v2/internal/bootstrap"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/signals")var rootCmd = &cobra.Command{diff --git a/backend/cli/upgrade/upgrade.go b/backend/cli/upgrade/upgrade.goindex 5584119f1..03f08f360 100644--- a/backend/cli/upgrade/upgrade.go+++ b/backend/cli/upgrade/upgrade.go@@ -9,8 +9,8 @@ import ("strings""time"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"updaterlabels "github.com/getarcaneapp/updater/pkg/labels"updaterlogs "github.com/getarcaneapp/updater/pkg/logs""github.com/moby/moby/api/types/container"diff --git a/backend/cli/version.go b/backend/cli/version.goindex 13e7455b0..7ff3f5ff3 100644--- a/backend/cli/version.go+++ b/backend/cli/version.go@@ -6,7 +6,7 @@ import ("github.com/spf13/cobra"- "github.com/getarcaneapp/arcane/backend/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config")var versionCmd = &cobra.Command{diff --git a/backend/cmd/main.go b/backend/cmd/main.goindex ae8274fad..bf1248dc0 100644--- a/backend/cmd/main.go+++ b/backend/cmd/main.go@@ -1,7 +1,7 @@package mainimport (- "github.com/getarcaneapp/arcane/backend/cli"+ "github.com/getarcaneapp/arcane/backend/v2/cli")// @title Arcane APIdiff --git a/backend/go.mod b/backend/go.modindex e585cf7d8..194132310 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -1,10 +1,10 @@-module github.com/getarcaneapp/arcane/backend+module github.com/getarcaneapp/arcane/backend/v2go 1.26.4replace (- github.com/getarcaneapp/arcane/cli => ../cli- github.com/getarcaneapp/arcane/types => ../types+ github.com/getarcaneapp/arcane/cli/v2 => ../cli+ github.com/getarcaneapp/arcane/types/v2 => ../types)tool github.com/google/wire/cmd/wire@@ -24,8 +24,8 @@ require (github.com/docker/compose/v5 v5.1.4github.com/docker/go-units v0.5.0github.com/fsnotify/fsnotify v1.10.1- github.com/getarcaneapp/arcane/cli v1.19.5- github.com/getarcaneapp/arcane/types v1.19.5+ github.com/getarcaneapp/arcane/cli/v2 v2.0.0+ github.com/getarcaneapp/arcane/types/v2 v2.0.0github.com/getarcaneapp/updater v0.3.6github.com/glebarez/sqlite v1.11.0github.com/go-git/go-git/v5 v5.19.1diff --git a/backend/go.sum b/backend/go.sumindex cc6874c12..7b38b1f5b 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -172,6 +172,7 @@ github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui72github.com/fxamacker/cbor/v2 v2.9.1 h1:2rWm8B193Ll4VdjsJY28jxs70IdDsHRWgQYAI80+rMQ=github.com/fxamacker/cbor/v2 v2.9.1/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=github.com/getarcaneapp/updater v0.3.6 h1:OKoXANvlGZ/s6mQuqVeVHXJXn9Pc3cUwUSG8A3ToOQ4=+github.com/getarcaneapp/updater v0.3.6/go.mod h1:2ENitZR/lA5MuBn60OZYR5wvU3ZCE+pAgfrebfOlRDA=github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.goindex 7a975d104..2374c2e5e 100644--- a/backend/internal/bootstrap/bootstrap.go+++ b/backend/internal/bootstrap/bootstrap.go@@ -16,17 +16,17 @@ import ("github.com/joho/godotenv""github.com/moby/moby/client"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/di"- "github.com/getarcaneapp/arcane/backend/internal/services"- libcrypto "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/logstream"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/startup"- "github.com/getarcaneapp/arcane/backend/pkg/scheduler"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- httputils "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/di"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ libcrypto "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/logstream"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/startup"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx""google.golang.org/grpc")diff --git a/backend/internal/bootstrap/bootstrap_test.go b/backend/internal/bootstrap/bootstrap_test.goindex 5924efc2d..277e1c32f 100644--- a/backend/internal/bootstrap/bootstrap_test.go+++ b/backend/internal/bootstrap/bootstrap_test.go@@ -11,11 +11,11 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/di"- "github.com/getarcaneapp/arcane/backend/internal/middleware"- libcrypto "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/di"+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"+ libcrypto "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""golang.org/x/net/http2"diff --git a/backend/internal/bootstrap/buildables_router_bootstrap.go b/backend/internal/bootstrap/buildables_router_bootstrap.goindex 082c09165..909f6a6a3 100644--- a/backend/internal/bootstrap/buildables_router_bootstrap.go+++ b/backend/internal/bootstrap/buildables_router_bootstrap.go@@ -3,8 +3,8 @@package bootstrapimport (- "github.com/getarcaneapp/arcane/backend/api"- "github.com/getarcaneapp/arcane/backend/internal/di"+ "github.com/getarcaneapp/arcane/backend/v2/api"+ "github.com/getarcaneapp/arcane/backend/v2/internal/di""github.com/labstack/echo/v4")diff --git a/backend/internal/bootstrap/db_bootstrap.go b/backend/internal/bootstrap/db_bootstrap.goindex 8a1206cd2..c29269d79 100644--- a/backend/internal/bootstrap/db_bootstrap.go+++ b/backend/internal/bootstrap/db_bootstrap.go@@ -5,8 +5,8 @@ import ("fmt""log/slog"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database")func initializeDBAndMigrate(ctx context.Context, cfg *config.Config) (*database.DB, error) {diff --git a/backend/internal/bootstrap/edge_bootstrap.go b/backend/internal/bootstrap/edge_bootstrap.goindex f8493cfa6..8ec45279b 100644--- a/backend/internal/bootstrap/edge_bootstrap.go+++ b/backend/internal/bootstrap/edge_bootstrap.go@@ -7,12 +7,12 @@ import ("fmt""log/slog"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/di"- "github.com/getarcaneapp/arcane/backend/internal/middleware"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/di"+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge""github.com/labstack/echo/v4")diff --git a/backend/internal/bootstrap/jobs_bootstrap.go b/backend/internal/bootstrap/jobs_bootstrap.goindex 29808f5a8..e8040b5fe 100644--- a/backend/internal/bootstrap/jobs_bootstrap.go+++ b/backend/internal/bootstrap/jobs_bootstrap.go@@ -6,10 +6,10 @@ import ("log/slog""net/http"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/di"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- pkg_scheduler "github.com/getarcaneapp/arcane/backend/pkg/scheduler"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/di"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ pkg_scheduler "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler")func registerJobs(appCtx context.Context, newScheduler *pkg_scheduler.JobScheduler, appServices *di.Services, appConfig *config.Config) {diff --git a/backend/internal/bootstrap/logger_bootstrap.go b/backend/internal/bootstrap/logger_bootstrap.goindex bca888c75..72dc7e259 100644--- a/backend/internal/bootstrap/logger_bootstrap.go+++ b/backend/internal/bootstrap/logger_bootstrap.go@@ -10,8 +10,8 @@ import ("github.com/lmittmann/tint"slogGorm "github.com/orandin/slog-gorm"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database""gorm.io/gorm/logger")diff --git a/backend/internal/bootstrap/playwright_router_bootstrap.go b/backend/internal/bootstrap/playwright_router_bootstrap.goindex a72ac5387..3537a3d66 100644--- a/backend/internal/bootstrap/playwright_router_bootstrap.go+++ b/backend/internal/bootstrap/playwright_router_bootstrap.go@@ -5,9 +5,9 @@ package bootstrapimport ("log/slog"- "github.com/getarcaneapp/arcane/backend/api"- "github.com/getarcaneapp/arcane/backend/internal/di"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/api"+ "github.com/getarcaneapp/arcane/backend/v2/internal/di"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/labstack/echo/v4")diff --git a/backend/internal/bootstrap/router_bootstrap.go b/backend/internal/bootstrap/router_bootstrap.goindex 1c6343470..a3e837bf6 100644--- a/backend/internal/bootstrap/router_bootstrap.go+++ b/backend/internal/bootstrap/router_bootstrap.go@@ -12,16 +12,16 @@ import (echomiddleware "github.com/labstack/echo/v4/middleware"slogecho "github.com/samber/slog-echo"- "github.com/getarcaneapp/arcane/backend/api"- "github.com/getarcaneapp/arcane/backend/api/handlers"- "github.com/getarcaneapp/arcane/backend/api/ws"- "github.com/getarcaneapp/arcane/backend/frontend"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/di"- "github.com/getarcaneapp/arcane/backend/internal/middleware"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cookie"- "github.com/getarcaneapp/arcane/types"+ "github.com/getarcaneapp/arcane/backend/v2/api"+ "github.com/getarcaneapp/arcane/backend/v2/api/handlers"+ "github.com/getarcaneapp/arcane/backend/v2/api/ws"+ "github.com/getarcaneapp/arcane/backend/v2/frontend"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/di"+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"+ "github.com/getarcaneapp/arcane/types/v2")var (diff --git a/backend/internal/bootstrap/router_bootstrap_test.go b/backend/internal/bootstrap/router_bootstrap_test.goindex 9187494b3..5b31f247f 100644--- a/backend/internal/bootstrap/router_bootstrap_test.go+++ b/backend/internal/bootstrap/router_bootstrap_test.go@@ -5,7 +5,7 @@ import ("net/http/httptest""testing"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cookie"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie""github.com/labstack/echo/v4""github.com/stretchr/testify/assert")diff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 6c99c0273..a144a2306 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -11,8 +11,8 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/common"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils")type AppEnvironment stringdiff --git a/backend/internal/config/config_test.go b/backend/internal/config/config_test.goindex c2ac6870c..6527e5261 100644--- a/backend/internal/config/config_test.go+++ b/backend/internal/config/config_test.go@@ -7,7 +7,7 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/internal/configschema/schema.go b/backend/internal/configschema/schema.goindex 6481b361b..0f9179981 100644--- a/backend/internal/configschema/schema.go+++ b/backend/internal/configschema/schema.go@@ -17,9 +17,9 @@ import ("strconv""strings"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils")const (diff --git a/backend/internal/configschema/schema_test.go b/backend/internal/configschema/schema_test.goindex b23d49e6e..dfd0e4dd1 100644--- a/backend/internal/configschema/schema_test.go+++ b/backend/internal/configschema/schema_test.go@@ -7,7 +7,7 @@ import ("strings""testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/internal/database/database.go b/backend/internal/database/database.goindex 46edc59fc..c54f475e1 100644--- a/backend/internal/database/database.go+++ b/backend/internal/database/database.go@@ -21,7 +21,7 @@ import ("gorm.io/gorm""gorm.io/gorm/logger"- "github.com/getarcaneapp/arcane/backend/resources"+ "github.com/getarcaneapp/arcane/backend/v2/resources")type DB struct {diff --git a/backend/internal/di/providers.go b/backend/internal/di/providers.goindex bd29a10c8..df932e557 100644--- a/backend/internal/di/providers.go+++ b/backend/internal/di/providers.go@@ -10,12 +10,12 @@ import ("log/slog""net/http"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/middleware"- "github.com/getarcaneapp/arcane/backend/internal/services"- pkg_scheduler "github.com/getarcaneapp/arcane/backend/pkg/scheduler"- "github.com/getarcaneapp/arcane/backend/resources"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ pkg_scheduler "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler"+ "github.com/getarcaneapp/arcane/backend/v2/resources")// Services is the single aggregate of every constructed service. wire populatesdiff --git a/backend/internal/di/wire.go b/backend/internal/di/wire.goindex 0182f3fde..666baba17 100644--- a/backend/internal/di/wire.go+++ b/backend/internal/di/wire.go@@ -12,10 +12,10 @@ import ("github.com/google/wire"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/services"- pkg_scheduler "github.com/getarcaneapp/arcane/backend/pkg/scheduler"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ pkg_scheduler "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler")// ServiceSet is the single, central provider set for the whole backend. Everydiff --git a/backend/internal/di/wire_gen.go b/backend/internal/di/wire_gen.goindex 23676af2c..1b6032f6d 100644--- a/backend/internal/di/wire_gen.go+++ b/backend/internal/di/wire_gen.go@@ -8,10 +8,10 @@ package diimport ("context"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/scheduler"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler""github.com/google/wire""net/http")diff --git a/backend/internal/middleware/auth_middleware.go b/backend/internal/middleware/auth_middleware.goindex c1bdc6092..180b52a6d 100644--- a/backend/internal/middleware/auth_middleware.go+++ b/backend/internal/middleware/auth_middleware.go@@ -7,13 +7,13 @@ import ("net/http""strings"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cookie"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie""github.com/labstack/echo/v4")diff --git a/backend/internal/middleware/auth_middleware_test.go b/backend/internal/middleware/auth_middleware_test.goindex 3932ace73..032c5846c 100644--- a/backend/internal/middleware/auth_middleware_test.go+++ b/backend/internal/middleware/auth_middleware_test.go@@ -6,8 +6,8 @@ import ("net/http/httptest""testing"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/labstack/echo/v4""github.com/stretchr/testify/require")diff --git a/backend/internal/middleware/cors_middleware.go b/backend/internal/middleware/cors_middleware.goindex f79fc9001..fb5a8638b 100644--- a/backend/internal/middleware/cors_middleware.go+++ b/backend/internal/middleware/cors_middleware.go@@ -5,7 +5,7 @@ import ("net/url""strings"- "github.com/getarcaneapp/arcane/backend/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config""github.com/labstack/echo/v4"echomiddleware "github.com/labstack/echo/v4/middleware")diff --git a/backend/internal/middleware/csrf_middleware.go b/backend/internal/middleware/csrf_middleware.goindex 6707e9eb2..d935bdc5b 100644--- a/backend/internal/middleware/csrf_middleware.go+++ b/backend/internal/middleware/csrf_middleware.go@@ -5,9 +5,9 @@ import ("net/http""strings"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/labstack/echo/v4")diff --git a/backend/internal/middleware/csrf_middleware_test.go b/backend/internal/middleware/csrf_middleware_test.goindex c66fc0a70..0b2dd1d19 100644--- a/backend/internal/middleware/csrf_middleware_test.go+++ b/backend/internal/middleware/csrf_middleware_test.go@@ -5,7 +5,7 @@ import ("net/http/httptest""testing"- "github.com/getarcaneapp/arcane/backend/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config""github.com/labstack/echo/v4""github.com/stretchr/testify/require")diff --git a/backend/internal/middleware/environment_middleware.go b/backend/internal/middleware/environment_middleware.goindex 668eedcfc..dfaa5066b 100644--- a/backend/internal/middleware/environment_middleware.go+++ b/backend/internal/middleware/environment_middleware.go@@ -12,10 +12,10 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- wsutil "github.com/getarcaneapp/arcane/backend/pkg/libarcane/ws"- httputils "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ wsutil "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"+ httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx""github.com/gorilla/websocket""github.com/labstack/echo/v4")diff --git a/backend/internal/middleware/environment_middleware_test.go b/backend/internal/middleware/environment_middleware_test.goindex 3dddc1ca8..a61bd689c 100644--- a/backend/internal/middleware/environment_middleware_test.go+++ b/backend/internal/middleware/environment_middleware_test.go@@ -6,7 +6,7 @@ import ("net/http/httptest""testing"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge""github.com/labstack/echo/v4""github.com/stretchr/testify/assert")diff --git a/backend/internal/models/volume_backup.go b/backend/internal/models/volume_backup.goindex 5384860cc..853b40f64 100644--- a/backend/internal/models/volume_backup.go+++ b/backend/internal/models/volume_backup.go@@ -3,7 +3,7 @@ package modelsimport ("time"- "github.com/getarcaneapp/arcane/types/volume"+ "github.com/getarcaneapp/arcane/types/v2/volume")type VolumeBackup struct {diff --git a/backend/internal/services/activity_service.go b/backend/internal/services/activity_service.goindex 409efddca..3876da666 100644--- a/backend/internal/services/activity_service.go+++ b/backend/internal/services/activity_service.go@@ -11,12 +11,12 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- activitytypes "github.com/getarcaneapp/arcane/types/activity"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity""gorm.io/gorm")diff --git a/backend/internal/services/activity_service_test.go b/backend/internal/services/activity_service_test.goindex e8cbdfa70..49d0843d7 100644--- a/backend/internal/services/activity_service_test.go+++ b/backend/internal/services/activity_service_test.go@@ -9,12 +9,12 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- activitytypes "github.com/getarcaneapp/arcane/types/activity"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity")func setupActivityServiceTestDBInternal(t *testing.T) *database.DB {diff --git a/backend/internal/services/api_key_service.go b/backend/internal/services/api_key_service.goindex ca0acdb00..86ae15ac9 100644--- a/backend/internal/services/api_key_service.go+++ b/backend/internal/services/api_key_service.go@@ -10,12 +10,12 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils/dbutil"- "github.com/getarcaneapp/arcane/types/apikey"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"+ "github.com/getarcaneapp/arcane/types/v2/apikey""gorm.io/gorm")diff --git a/backend/internal/services/api_key_service_test.go b/backend/internal/services/api_key_service_test.goindex 22204def6..de507788d 100644--- a/backend/internal/services/api_key_service_test.go+++ b/backend/internal/services/api_key_service_test.go@@ -12,10 +12,10 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/types/apikey"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/types/v2/apikey")func setupAPIKeyServiceTestDB(t *testing.T) *database.DB {diff --git a/backend/internal/services/app_images_service.go b/backend/internal/services/app_images_service.goindex 13ef4970a..949a1ee4d 100644--- a/backend/internal/services/app_images_service.go+++ b/backend/internal/services/app_images_service.go@@ -8,8 +8,8 @@ import ("strings""sync"- "github.com/getarcaneapp/arcane/backend/pkg/utils/image"- "github.com/getarcaneapp/arcane/types/settings"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/image"+ "github.com/getarcaneapp/arcane/types/v2/settings")type ApplicationImagesService struct {diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex 37fad3306..79e555626 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -10,12 +10,12 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- "github.com/getarcaneapp/arcane/backend/pkg/utils/jwtclaims"- "github.com/getarcaneapp/arcane/types/auth"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"+ "github.com/getarcaneapp/arcane/types/v2/auth""github.com/golang-jwt/jwt/v5""github.com/google/uuid")diff --git a/backend/internal/services/auth_service_buildables.go b/backend/internal/services/auth_service_buildables.goindex 889e00474..8610fb8c5 100644--- a/backend/internal/services/auth_service_buildables.go+++ b/backend/internal/services/auth_service_buildables.go@@ -6,8 +6,8 @@ import ("context""log/slog"- "github.com/getarcaneapp/arcane/backend/buildables"- "github.com/getarcaneapp/arcane/types/auth"+ "github.com/getarcaneapp/arcane/backend/v2/buildables"+ "github.com/getarcaneapp/arcane/types/v2/auth")// GetAutoLoginConfig returns the auto-login configuration for the frontend.diff --git a/backend/internal/services/auth_service_buildables_test.go b/backend/internal/services/auth_service_buildables_test.goindex 807222ad1..38acdf519 100644--- a/backend/internal/services/auth_service_buildables_test.go+++ b/backend/internal/services/auth_service_buildables_test.go@@ -6,8 +6,8 @@ import ("context""testing"- "github.com/getarcaneapp/arcane/backend/buildables"- "github.com/getarcaneapp/arcane/backend/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/buildables"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config""github.com/stretchr/testify/require")diff --git a/backend/internal/services/auth_service_test.go b/backend/internal/services/auth_service_test.goindex d4c88af15..04e58993d 100644--- a/backend/internal/services/auth_service_test.go+++ b/backend/internal/services/auth_service_test.go@@ -11,12 +11,12 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- "github.com/getarcaneapp/arcane/types/auth"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/types/v2/auth""github.com/golang-jwt/jwt/v5")diff --git a/backend/internal/services/build_service.go b/backend/internal/services/build_service.goindex ffb1db384..dba7b5f74 100644--- a/backend/internal/services/build_service.go+++ b/backend/internal/services/build_service.go@@ -13,13 +13,13 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- buildgit "github.com/getarcaneapp/arcane/backend/pkg/gitutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/libbuild"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- buildtypes "github.com/getarcaneapp/arcane/types/builds"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ buildgit "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/libbuild"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ buildtypes "github.com/getarcaneapp/arcane/types/v2/builds"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"dockerregistry "github.com/moby/moby/api/types/registry""gorm.io/gorm")diff --git a/backend/internal/services/build_service_test.go b/backend/internal/services/build_service_test.goindex 7d9dee42f..8c2041b17 100644--- a/backend/internal/services/build_service_test.go+++ b/backend/internal/services/build_service_test.go@@ -9,12 +9,12 @@ import ("path/filepath""testing"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- buildgit "github.com/getarcaneapp/arcane/backend/pkg/gitutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/types/image"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ buildgit "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/types/v2/image"glsqlite "github.com/glebarez/sqlite""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/backend/internal/services/build_workspace_service.go b/backend/internal/services/build_workspace_service.goindex 77a72c1a6..d3b3c6f8d 100644--- a/backend/internal/services/build_workspace_service.go+++ b/backend/internal/services/build_workspace_service.go@@ -13,7 +13,7 @@ import ("log/slog"- volumetypes "github.com/getarcaneapp/arcane/types/volume"+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume")const defaultBuildsDirectory = "/builds"diff --git a/backend/internal/services/container_registry_service.go b/backend/internal/services/container_registry_service.goindex 9379622c2..8f2077e49 100644--- a/backend/internal/services/container_registry_service.go+++ b/backend/internal/services/container_registry_service.go@@ -15,14 +15,14 @@ import ("golang.org/x/sync/singleflight"cerrdefs "github.com/containerd/errdefs"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- utilsregistry "github.com/getarcaneapp/arcane/backend/pkg/libarcane/registryauth"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- "github.com/getarcaneapp/arcane/types/containerregistry"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"updaterdigest "github.com/getarcaneapp/updater/pkg/digest"updaterrefs "github.com/getarcaneapp/updater/pkg/refs"updaterregistry "github.com/getarcaneapp/updater/pkg/registry"diff --git a/backend/internal/services/container_registry_service_test.go b/backend/internal/services/container_registry_service_test.goindex 77a2098a2..8a7dac069 100644--- a/backend/internal/services/container_registry_service_test.go+++ b/backend/internal/services/container_registry_service_test.go@@ -10,9 +10,9 @@ import ("strings""testing"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/types/containerregistry"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"dockerregistry "github.com/moby/moby/api/types/registry""github.com/moby/moby/client""github.com/opencontainers/go-digest"diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.goindex 6b887dd68..f37eb96ec 100644--- a/backend/internal/services/container_service.go+++ b/backend/internal/services/container_service.go@@ -12,20 +12,20 @@ import ("time"composetypes "github.com/compose-spec/compose-go/v2/types"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutils "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/containerstats"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- "github.com/getarcaneapp/arcane/backend/pkg/utils/iconcatalog"- containertypes "github.com/getarcaneapp/arcane/types/container"- "github.com/getarcaneapp/arcane/types/containerregistry"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/containerstats"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"libupdater "github.com/getarcaneapp/updater/pkg/labels""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/events"diff --git a/backend/internal/services/container_service_test.go b/backend/internal/services/container_service_test.goindex 73ccfbfcc..2d91a74b3 100644--- a/backend/internal/services/container_service_test.go+++ b/backend/internal/services/container_service_test.go@@ -4,9 +4,9 @@ import ("net/netip""testing"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- containertypes "github.com/getarcaneapp/arcane/types/container"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/network""github.com/stretchr/testify/require"diff --git a/backend/internal/services/customize_search_service.go b/backend/internal/services/customize_search_service.goindex be39784cf..9d001dac9 100644--- a/backend/internal/services/customize_search_service.go+++ b/backend/internal/services/customize_search_service.go@@ -6,11 +6,11 @@ import ("strings""sync"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/category"- "github.com/getarcaneapp/arcane/types/meta"- "github.com/getarcaneapp/arcane/types/search"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/category"+ "github.com/getarcaneapp/arcane/types/v2/meta"+ "github.com/getarcaneapp/arcane/types/v2/search")type CustomizeSearchService struct {diff --git a/backend/internal/services/dashboard_service.go b/backend/internal/services/dashboard_service.goindex 7c7248128..f68667246 100644--- a/backend/internal/services/dashboard_service.go+++ b/backend/internal/services/dashboard_service.go@@ -7,14 +7,14 @@ import ("sort""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutils "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/types/base"- containertypes "github.com/getarcaneapp/arcane/types/container"- dashboardtypes "github.com/getarcaneapp/arcane/types/dashboard"- imagetypes "github.com/getarcaneapp/arcane/types/image"- versiontypes "github.com/getarcaneapp/arcane/types/version"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/types/v2/base"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"+ dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ versiontypes "github.com/getarcaneapp/arcane/types/v2/version"libupdater "github.com/getarcaneapp/updater/pkg/labels"dockercontainer "github.com/moby/moby/api/types/container""golang.org/x/sync/errgroup"diff --git a/backend/internal/services/dashboard_service_test.go b/backend/internal/services/dashboard_service_test.goindex 47563991d..e1edad2e1 100644--- a/backend/internal/services/dashboard_service_test.go+++ b/backend/internal/services/dashboard_service_test.go@@ -11,10 +11,10 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- dashboardtypes "github.com/getarcaneapp/arcane/types/dashboard"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard"glsqlite "github.com/glebarez/sqlite"dockercontainer "github.com/moby/moby/api/types/container"dockerimage "github.com/moby/moby/api/types/image"diff --git a/backend/internal/services/diagnostics_service.go b/backend/internal/services/diagnostics_service.goindex 63a784f08..429a0f1b4 100644--- a/backend/internal/services/diagnostics_service.go+++ b/backend/internal/services/diagnostics_service.go@@ -5,7 +5,7 @@ import ("runtime/debug""time"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/types/v2/system")// recentGCPauseSamples is the number of recent GC pause durations reported.diff --git a/backend/internal/services/docker_client_service.go b/backend/internal/services/docker_client_service.goindex d7973288f..2de2f8c42 100644--- a/backend/internal/services/docker_client_service.go+++ b/backend/internal/services/docker_client_service.go@@ -11,14 +11,14 @@ import ("time""github.com/cenkalti/backoff/v5"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/eventbus"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- dashboardtypes "github.com/getarcaneapp/arcane/types/dashboard"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/eventbus"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache"+ dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/events""github.com/moby/moby/api/types/image"diff --git a/backend/internal/services/docker_client_service_test.go b/backend/internal/services/docker_client_service_test.goindex e35da0b63..7732634df 100644--- a/backend/internal/services/docker_client_service_test.go+++ b/backend/internal/services/docker_client_service_test.go@@ -9,7 +9,7 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/image""github.com/moby/moby/client"diff --git a/backend/internal/services/ecr_token_service.go b/backend/internal/services/ecr_token_service.goindex 8f6c1c022..72e40ac5e 100644--- a/backend/internal/services/ecr_token_service.go+++ b/backend/internal/services/ecr_token_service.go@@ -11,9 +11,9 @@ import ("github.com/aws/aws-sdk-go-v2/config""github.com/aws/aws-sdk-go-v2/credentials""github.com/aws/aws-sdk-go-v2/service/ecr"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto")const ecrTokenTTL = 12 * time.Hourdiff --git a/backend/internal/services/environment_runtime_state.go b/backend/internal/services/environment_runtime_state.goindex 9b203f930..4cca86a48 100644--- a/backend/internal/services/environment_runtime_state.go+++ b/backend/internal/services/environment_runtime_state.go@@ -3,9 +3,9 @@ package servicesimport ("time"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- environmenttypes "github.com/getarcaneapp/arcane/types/environment"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ environmenttypes "github.com/getarcaneapp/arcane/types/v2/environment")// ApplyEnvironmentRuntimeState normalizes edge environment runtime status usingdiff --git a/backend/internal/services/environment_service.go b/backend/internal/services/environment_service.goindex 569f58124..d4dc2a503 100644--- a/backend/internal/services/environment_service.go+++ b/backend/internal/services/environment_service.go@@ -12,19 +12,19 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/remenv"- httputils "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/containerregistry"- "github.com/getarcaneapp/arcane/types/environment"- "github.com/getarcaneapp/arcane/types/gitops"- schedulertypes "github.com/getarcaneapp/arcane/types/scheduler"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"+ httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ "github.com/getarcaneapp/arcane/types/v2/environment"+ "github.com/getarcaneapp/arcane/types/v2/gitops"+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler""github.com/google/uuid""github.com/moby/moby/client""gorm.io/gorm"diff --git a/backend/internal/services/environment_service_test.go b/backend/internal/services/environment_service_test.goindex d90b868cd..6c6fceb4d 100644--- a/backend/internal/services/environment_service_test.go+++ b/backend/internal/services/environment_service_test.go@@ -17,15 +17,15 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/types/containerregistry"- "github.com/getarcaneapp/arcane/types/environment"- "github.com/getarcaneapp/arcane/types/gitops"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ "github.com/getarcaneapp/arcane/types/v2/environment"+ "github.com/getarcaneapp/arcane/types/v2/gitops""github.com/gorilla/websocket")diff --git a/backend/internal/services/event_service.go b/backend/internal/services/event_service.goindex 0349dcfb6..cbabbe183 100644--- a/backend/internal/services/event_service.go+++ b/backend/internal/services/event_service.go@@ -13,14 +13,14 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/event"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/event""golang.org/x/text/cases""golang.org/x/text/language""gorm.io/gorm"diff --git a/backend/internal/services/event_service_test.go b/backend/internal/services/event_service_test.goindex f21e0156e..822c60b65 100644--- a/backend/internal/services/event_service_test.go+++ b/backend/internal/services/event_service_test.go@@ -9,10 +9,10 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"glsqlite "github.com/glebarez/sqlite""github.com/stretchr/testify/require""gorm.io/gorm"diff --git a/backend/internal/services/federated_credential_service.go b/backend/internal/services/federated_credential_service.goindex a996ab0a3..1cc3a5aa1 100644--- a/backend/internal/services/federated_credential_service.go+++ b/backend/internal/services/federated_credential_service.go@@ -19,15 +19,15 @@ import ("golang.org/x/sync/singleflight""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/dbutil"- "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- "github.com/getarcaneapp/arcane/backend/pkg/utils/jwtclaims"- federatedtypes "github.com/getarcaneapp/arcane/types/federated"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated")const (diff --git a/backend/internal/services/federated_credential_service_test.go b/backend/internal/services/federated_credential_service_test.goindex 745d982bd..15490ddc8 100644--- a/backend/internal/services/federated_credential_service_test.go+++ b/backend/internal/services/federated_credential_service_test.go@@ -19,12 +19,12 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- federatedtypes "github.com/getarcaneapp/arcane/types/federated"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated")type federatedTestIssuerInternal struct {diff --git a/backend/internal/services/git_repository_service.go b/backend/internal/services/git_repository_service.goindex ec9c17302..a817108a0 100644--- a/backend/internal/services/git_repository_service.go+++ b/backend/internal/services/git_repository_service.go@@ -6,15 +6,15 @@ import ("fmt""strings"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- git "github.com/getarcaneapp/arcane/backend/pkg/gitutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/libbuild"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/gitops"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/libbuild"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/gitops""gorm.io/gorm")diff --git a/backend/internal/services/git_repository_service_test.go b/backend/internal/services/git_repository_service_test.goindex 824707d77..21de7ebe9 100644--- a/backend/internal/services/git_repository_service_test.go+++ b/backend/internal/services/git_repository_service_test.go@@ -11,10 +11,10 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto")func setupGitRepositoryServiceTestInternal(t *testing.T) (*GitRepositoryService, *database.DB) {diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.goindex 2ec306faa..35568ba84 100644--- a/backend/internal/services/gitops_sync_service.go+++ b/backend/internal/services/gitops_sync_service.go@@ -13,17 +13,17 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/gitops"- projecttypes "github.com/getarcaneapp/arcane/types/project"- schedulertypes "github.com/getarcaneapp/arcane/types/scheduler"- "github.com/getarcaneapp/arcane/types/swarm"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/gitops"+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project"+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"+ "github.com/getarcaneapp/arcane/types/v2/swarm""gorm.io/gorm")diff --git a/backend/internal/services/gitops_sync_service_test.go b/backend/internal/services/gitops_sync_service_test.goindex df6567200..fac4a20db 100644--- a/backend/internal/services/gitops_sync_service_test.go+++ b/backend/internal/services/gitops_sync_service_test.go@@ -8,11 +8,11 @@ import ("path/filepath""testing"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- git "github.com/getarcaneapp/arcane/backend/pkg/gitutil"- "github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""gorm.io/gorm"diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex 2adafacc9..311042581 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -12,15 +12,15 @@ import ("time"ref "github.com/distribution/reference"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutils "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- utilsregistry "github.com/getarcaneapp/arcane/backend/pkg/libarcane/registryauth"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/types/containerregistry"- imagetypes "github.com/getarcaneapp/arcane/types/image"- systemtypes "github.com/getarcaneapp/arcane/types/system"- "github.com/getarcaneapp/arcane/types/vulnerability"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system"+ "github.com/getarcaneapp/arcane/types/v2/vulnerability""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/image""github.com/moby/moby/client"diff --git a/backend/internal/services/image_service_test.go b/backend/internal/services/image_service_test.goindex a64e325bc..f8990663b 100644--- a/backend/internal/services/image_service_test.go+++ b/backend/internal/services/image_service_test.go@@ -14,13 +14,13 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/types/containerregistry"- imagetypes "github.com/getarcaneapp/arcane/types/image"- "github.com/getarcaneapp/arcane/types/vulnerability"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ "github.com/getarcaneapp/arcane/types/v2/vulnerability"dockerauthconfig "github.com/moby/moby/api/pkg/authconfig"dockerregistry "github.com/moby/moby/api/types/registry""github.com/moby/moby/client"diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.goindex 9c2e4c555..97154e1d5 100644--- a/backend/internal/services/image_update_service.go+++ b/backend/internal/services/image_update_service.go@@ -11,16 +11,16 @@ import ("time"ref "github.com/distribution/reference"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/ratelimit"- registry "github.com/getarcaneapp/arcane/backend/pkg/libarcane/registryauth"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/containerregistry"- "github.com/getarcaneapp/arcane/types/imageupdate"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ratelimit"+ registry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"updaterdigest "github.com/getarcaneapp/updater/pkg/digest""github.com/moby/moby/api/types/image""github.com/moby/moby/client"diff --git a/backend/internal/services/image_update_service_test.go b/backend/internal/services/image_update_service_test.goindex 553fee70b..0ba18870d 100644--- a/backend/internal/services/image_update_service_test.go+++ b/backend/internal/services/image_update_service_test.go@@ -13,9 +13,9 @@ import ("time"ref "github.com/distribution/reference"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/types/imageupdate"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"glsqlite "github.com/glebarez/sqlite"dockertypescontainer "github.com/moby/moby/api/types/container"dockertypesimage "github.com/moby/moby/api/types/image"diff --git a/backend/internal/services/job_service.go b/backend/internal/services/job_service.goindex 0eb61e094..d6bad27d5 100644--- a/backend/internal/services/job_service.go+++ b/backend/internal/services/job_service.go@@ -8,12 +8,12 @@ import ("sort""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/types/jobschedule"- "github.com/getarcaneapp/arcane/types/meta"- schedulertypes "github.com/getarcaneapp/arcane/types/scheduler"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/types/v2/jobschedule"+ "github.com/getarcaneapp/arcane/types/v2/meta"+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler""github.com/robfig/cron/v3""gorm.io/gorm")diff --git a/backend/internal/services/job_service_test.go b/backend/internal/services/job_service_test.goindex 59f8b93b0..c668b5e70 100644--- a/backend/internal/services/job_service_test.go+++ b/backend/internal/services/job_service_test.go@@ -4,9 +4,9 @@ import ("context""testing"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/types/jobschedule"- schedulertypes "github.com/getarcaneapp/arcane/types/scheduler"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/types/v2/jobschedule"+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler""github.com/stretchr/testify/require")diff --git a/backend/internal/services/kv_service.go b/backend/internal/services/kv_service.goindex 2dae9b5df..23b213e0d 100644--- a/backend/internal/services/kv_service.go+++ b/backend/internal/services/kv_service.go@@ -6,8 +6,8 @@ import ("fmt""strconv"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""gorm.io/gorm""gorm.io/gorm/clause")diff --git a/backend/internal/services/kv_service_test.go b/backend/internal/services/kv_service_test.goindex 64687d24f..4a18f5c13 100644--- a/backend/internal/services/kv_service_test.go+++ b/backend/internal/services/kv_service_test.go@@ -4,7 +4,7 @@ import ("context""testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/require")diff --git a/backend/internal/services/network_service.go b/backend/internal/services/network_service.goindex 14c85fcee..af4453c13 100644--- a/backend/internal/services/network_service.go+++ b/backend/internal/services/network_service.go@@ -7,12 +7,12 @@ import ("sort""strings"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutil "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- networktypes "github.com/getarcaneapp/arcane/types/network"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ networktypes "github.com/getarcaneapp/arcane/types/v2/network""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/network""github.com/moby/moby/client"diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.goindex 5f0f2d2dc..97f0d5713 100644--- a/backend/internal/services/notification_service.go+++ b/backend/internal/services/notification_service.go@@ -14,15 +14,15 @@ import ("text/template""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/utils/notifications"- "github.com/getarcaneapp/arcane/backend/resources"- "github.com/getarcaneapp/arcane/types/imageupdate"- notificationdto "github.com/getarcaneapp/arcane/types/notification"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"+ "github.com/getarcaneapp/arcane/backend/v2/resources"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"+ notificationdto "github.com/getarcaneapp/arcane/types/v2/notification"+ "github.com/getarcaneapp/arcane/types/v2/system")const (diff --git a/backend/internal/services/notification_service_test.go b/backend/internal/services/notification_service_test.goindex 203c7bfb1..741b97ff8 100644--- a/backend/internal/services/notification_service_test.go+++ b/backend/internal/services/notification_service_test.go@@ -17,14 +17,14 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/backend/pkg/utils/notifications"- "github.com/getarcaneapp/arcane/types/imageupdate"- notificationdto "github.com/getarcaneapp/arcane/types/notification"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"+ notificationdto "github.com/getarcaneapp/arcane/types/v2/notification"+ "github.com/getarcaneapp/arcane/types/v2/system")func setupNotificationTestDB(t *testing.T) *database.DB {diff --git a/backend/internal/services/oidc_service.go b/backend/internal/services/oidc_service.goindex d77092784..3e6ef3f8c 100644--- a/backend/internal/services/oidc_service.go+++ b/backend/internal/services/oidc_service.go@@ -20,12 +20,12 @@ import ("golang.org/x/oauth2""golang.org/x/sync/singleflight"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/jwtclaims"- "github.com/getarcaneapp/arcane/types/auth"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"+ "github.com/getarcaneapp/arcane/types/v2/auth")type OidcService struct {diff --git a/backend/internal/services/oidc_service_test.go b/backend/internal/services/oidc_service_test.goindex 8de787a7b..1f2129f6d 100644--- a/backend/internal/services/oidc_service_test.go+++ b/backend/internal/services/oidc_service_test.go@@ -4,7 +4,7 @@ import ("context""testing"- "github.com/getarcaneapp/arcane/backend/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config")func TestValidateMobileRedirectURI(t *testing.T) {diff --git a/backend/internal/services/playwright_service.go b/backend/internal/services/playwright_service.goindex 4a4f13b18..f8e7eb196 100644--- a/backend/internal/services/playwright_service.go+++ b/backend/internal/services/playwright_service.go@@ -8,10 +8,10 @@ import ("log/slog""strings"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/types/apikey"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/types/v2/apikey""github.com/google/uuid""gorm.io/gorm")diff --git a/backend/internal/services/port_service.go b/backend/internal/services/port_service.goindex b7dcb0088..c611077ba 100644--- a/backend/internal/services/port_service.go+++ b/backend/internal/services/port_service.go@@ -6,9 +6,9 @@ import ("strconv""strings"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- containertypes "github.com/getarcaneapp/arcane/types/container"- porttypes "github.com/getarcaneapp/arcane/types/port"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"+ porttypes "github.com/getarcaneapp/arcane/types/v2/port""github.com/moby/moby/client")diff --git a/backend/internal/services/port_service_test.go b/backend/internal/services/port_service_test.goindex cff141b6e..65c960c32 100644--- a/backend/internal/services/port_service_test.go+++ b/backend/internal/services/port_service_test.go@@ -9,7 +9,7 @@ import ("strings""testing"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"dockercontainer "github.com/moby/moby/api/types/container""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 70722ed8a..30972bee7 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -20,23 +20,23 @@ import ("github.com/compose-spec/compose-go/v2/loader"composetypes "github.com/compose-spec/compose-go/v2/types""github.com/docker/compose/v5/pkg/api"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutil "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/libbuild"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- "github.com/getarcaneapp/arcane/backend/pkg/utils/iconcatalog"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types"- "github.com/getarcaneapp/arcane/types/containerregistry"- imagetypes "github.com/getarcaneapp/arcane/types/image"- "github.com/getarcaneapp/arcane/types/project"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/libbuild"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ "github.com/getarcaneapp/arcane/types/v2/project"libupdater "github.com/getarcaneapp/updater/pkg/labels""github.com/moby/moby/api/types/container""gorm.io/gorm"diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex d58b86961..88fce1d3f 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -20,15 +20,15 @@ import (composetypes "github.com/compose-spec/compose-go/v2/types"composeapi "github.com/docker/compose/v5/pkg/api"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils/iconcatalog"- buildtypes "github.com/getarcaneapp/arcane/types/builds"- "github.com/getarcaneapp/arcane/types/containerregistry"- imagetypes "github.com/getarcaneapp/arcane/types/image"- projecttypes "github.com/getarcaneapp/arcane/types/project"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"+ buildtypes "github.com/getarcaneapp/arcane/types/v2/builds"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project"libupdater "github.com/getarcaneapp/updater/pkg/labels"glsqlite "github.com/glebarez/sqlite""github.com/moby/moby/api/types/container"@@ -38,8 +38,8 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models")func TestWriteProjectProgressInternal_SuppressedContextSkipsProgress(t *testing.T) {diff --git a/backend/internal/services/role_service.go b/backend/internal/services/role_service.goindex 39ac9dccf..69e21baa9 100644--- a/backend/internal/services/role_service.go+++ b/backend/internal/services/role_service.go@@ -12,15 +12,15 @@ import ("gorm.io/gorm""gorm.io/gorm/clause"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- "github.com/getarcaneapp/arcane/backend/pkg/utils/dbutil"- roletypes "github.com/getarcaneapp/arcane/types/role"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"+ roletypes "github.com/getarcaneapp/arcane/types/v2/role")// permissionCacheTTL bounds how long a resolved PermissionSet is reuseddiff --git a/backend/internal/services/role_service_test.go b/backend/internal/services/role_service_test.goindex 7409b63fd..d62d8b59c 100644--- a/backend/internal/services/role_service_test.go+++ b/backend/internal/services/role_service_test.go@@ -5,9 +5,9 @@ import ("slices""testing"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz""github.com/stretchr/testify/require")diff --git a/backend/internal/services/session_service.go b/backend/internal/services/session_service.goindex ef3d7d39b..fbabeac1b 100644--- a/backend/internal/services/session_service.go+++ b/backend/internal/services/session_service.go@@ -10,11 +10,11 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/dbutil"- "github.com/getarcaneapp/arcane/types/auth"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"+ "github.com/getarcaneapp/arcane/types/v2/auth""github.com/google/uuid""gorm.io/gorm")diff --git a/backend/internal/services/session_service_test.go b/backend/internal/services/session_service_test.goindex c4e5e9a5f..9166eaea7 100644--- a/backend/internal/services/session_service_test.go+++ b/backend/internal/services/session_service_test.go@@ -5,8 +5,8 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/types/auth"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/types/v2/auth""github.com/stretchr/testify/require")diff --git a/backend/internal/services/settings_search_service.go b/backend/internal/services/settings_search_service.goindex 5b9fa414d..a7672b3b7 100644--- a/backend/internal/services/settings_search_service.go+++ b/backend/internal/services/settings_search_service.go@@ -6,11 +6,11 @@ import ("strings""sync"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/category"- "github.com/getarcaneapp/arcane/types/meta"- "github.com/getarcaneapp/arcane/types/search"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/category"+ "github.com/getarcaneapp/arcane/types/v2/meta"+ "github.com/getarcaneapp/arcane/types/v2/search")type SettingsSearchService struct {diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex fc6ce493c..524096d04 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -19,13 +19,13 @@ import ("github.com/hashicorp/go-uuid""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/settings"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/settings")type SettingsService struct {diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.goindex 8ebd97a45..f5e6d9cab 100644--- a/backend/internal/services/settings_service_test.go+++ b/backend/internal/services/settings_service_test.go@@ -9,11 +9,11 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/types/settings"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/types/v2/settings")func setupSettingsTestDB(t *testing.T) *database.DB {diff --git a/backend/internal/services/swarm_service.go b/backend/internal/services/swarm_service.goindex 8e1c683e8..855d4040f 100644--- a/backend/internal/services/swarm_service.go+++ b/backend/internal/services/swarm_service.go@@ -19,14 +19,14 @@ import ("time"cerrdefs "github.com/containerd/errdefs"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutil "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"- libswarm "github.com/getarcaneapp/arcane/backend/pkg/libarcane/swarm"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- appfs "github.com/getarcaneapp/arcane/backend/pkg/projects"- swarmtypes "github.com/getarcaneapp/arcane/types/swarm"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ libswarm "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/swarm"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ appfs "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"networktypes "github.com/moby/moby/api/types/network""github.com/moby/moby/api/types/swarm""github.com/moby/moby/api/types/system"diff --git a/backend/internal/services/swarm_service_test.go b/backend/internal/services/swarm_service_test.goindex 245bf9166..ac4854b19 100644--- a/backend/internal/services/swarm_service_test.go+++ b/backend/internal/services/swarm_service_test.go@@ -9,8 +9,8 @@ import ("testing"cerrdefs "github.com/containerd/errdefs"- "github.com/getarcaneapp/arcane/backend/internal/models"- swarmtypes "github.com/getarcaneapp/arcane/types/swarm"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm""github.com/moby/moby/api/types/swarm""github.com/moby/moby/api/types/system""github.com/stretchr/testify/require"diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.goindex 8a72b48a5..6abb7bcbb 100644--- a/backend/internal/services/system_service.go+++ b/backend/internal/services/system_service.go@@ -9,13 +9,13 @@ import ("strings""sync"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/dockerrun"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- containertypes "github.com/getarcaneapp/arcane/types/container"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/dockerrun"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"+ "github.com/getarcaneapp/arcane/types/v2/system"libupdater "github.com/getarcaneapp/updater/pkg/labels""github.com/goccy/go-yaml""github.com/moby/moby/api/types/container"diff --git a/backend/internal/services/system_upgrade_service.go b/backend/internal/services/system_upgrade_service.goindex 9349f4e39..b9180c458 100644--- a/backend/internal/services/system_upgrade_service.go+++ b/backend/internal/services/system_upgrade_service.go@@ -10,11 +10,11 @@ import ("sync/atomic""time"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutils "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"libupdater "github.com/getarcaneapp/updater/pkg/labels"containertypes "github.com/moby/moby/api/types/container"mounttypes "github.com/moby/moby/api/types/mount"diff --git a/backend/internal/services/system_upgrade_service_test.go b/backend/internal/services/system_upgrade_service_test.goindex 3bf4a30a2..e8d1ab353 100644--- a/backend/internal/services/system_upgrade_service_test.go+++ b/backend/internal/services/system_upgrade_service_test.go@@ -5,7 +5,7 @@ import ("errors""testing"- "github.com/getarcaneapp/arcane/backend/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"libupdater "github.com/getarcaneapp/updater/pkg/labels"containertypes "github.com/moby/moby/api/types/container"mounttypes "github.com/moby/moby/api/types/mount"diff --git a/backend/internal/services/template_service.go b/backend/internal/services/template_service.goindex a60a7b231..d70d8cccf 100644--- a/backend/internal/services/template_service.go+++ b/backend/internal/services/template_service.go@@ -19,16 +19,16 @@ import (composeloader "github.com/compose-spec/compose-go/v2/loader"composetypes "github.com/compose-spec/compose-go/v2/types"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- httputils "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"- "github.com/getarcaneapp/arcane/types/env"- tmpl "github.com/getarcaneapp/arcane/types/template"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/v2/env"+ tmpl "github.com/getarcaneapp/arcane/types/v2/template""github.com/google/uuid""golang.org/x/sync/errgroup""gorm.io/gorm"diff --git a/backend/internal/services/template_service_test.go b/backend/internal/services/template_service_test.goindex 30d8835e9..1647a2f52 100644--- a/backend/internal/services/template_service_test.go+++ b/backend/internal/services/template_service_test.go@@ -17,13 +17,13 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- httputils "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"- envtypes "github.com/getarcaneapp/arcane/types/env"- tmpl "github.com/getarcaneapp/arcane/types/template"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ envtypes "github.com/getarcaneapp/arcane/types/v2/env"+ tmpl "github.com/getarcaneapp/arcane/types/v2/template")func setupTemplateServiceTestDB(t *testing.T) *database.DB {diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex 7e45fef45..86fcd4deb 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -12,15 +12,15 @@ import ("time""github.com/compose-spec/compose-go/v2/loader"- "github.com/getarcaneapp/arcane/backend/internal/common"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutil "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- projectspkg "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/updater"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ projectspkg "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/updater"moduleapi "github.com/getarcaneapp/updater/api"updaterdigest "github.com/getarcaneapp/updater/pkg/digest""github.com/getarcaneapp/updater/pkg/labels"diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.goindex 99b8f6bed..483a088e8 100644--- a/backend/internal/services/updater_service_test.go+++ b/backend/internal/services/updater_service_test.go@@ -13,10 +13,10 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- arcaneupdater "github.com/getarcaneapp/arcane/types/updater"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ arcaneupdater "github.com/getarcaneapp/arcane/types/v2/updater"moduleapi "github.com/getarcaneapp/updater/api"updaterlabels "github.com/getarcaneapp/updater/pkg/labels"moduletypes "github.com/getarcaneapp/updater/types"diff --git a/backend/internal/services/user_service.go b/backend/internal/services/user_service.goindex 6a1a94fc0..7b9444f9d 100644--- a/backend/internal/services/user_service.go+++ b/backend/internal/services/user_service.go@@ -15,12 +15,12 @@ import ("gorm.io/gorm""gorm.io/gorm/clause"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils/dbutil"- "github.com/getarcaneapp/arcane/types/user"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"+ "github.com/getarcaneapp/arcane/types/v2/user")type Argon2Params struct {diff --git a/backend/internal/services/user_service_test.go b/backend/internal/services/user_service_test.goindex 207b2fa92..a59742b08 100644--- a/backend/internal/services/user_service_test.go+++ b/backend/internal/services/user_service_test.go@@ -4,9 +4,9 @@ import ("context""testing"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination""github.com/stretchr/testify/require")diff --git a/backend/internal/services/version_service.go b/backend/internal/services/version_service.goindex ef6a5b5e5..8e00152d6 100644--- a/backend/internal/services/version_service.go+++ b/backend/internal/services/version_service.go@@ -11,12 +11,12 @@ import ("time"ref "github.com/distribution/reference"- "github.com/getarcaneapp/arcane/backend/buildables"- "github.com/getarcaneapp/arcane/backend/internal/config"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- "github.com/getarcaneapp/arcane/types/version"+ "github.com/getarcaneapp/arcane/backend/v2/buildables"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/types/v2/version"libupdater "github.com/getarcaneapp/updater/pkg/labels"containertypes "github.com/moby/moby/api/types/container""github.com/moby/moby/client"diff --git a/backend/internal/services/version_service_test.go b/backend/internal/services/version_service_test.goindex 3a767f418..a390554ab 100644--- a/backend/internal/services/version_service_test.go+++ b/backend/internal/services/version_service_test.go@@ -11,7 +11,7 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"libupdater "github.com/getarcaneapp/updater/pkg/labels""github.com/moby/moby/api/types/container"dockertypesimage "github.com/moby/moby/api/types/image"diff --git a/backend/internal/services/volume_service.go b/backend/internal/services/volume_service.goindex 747840bc0..e6e24aabd 100644--- a/backend/internal/services/volume_service.go+++ b/backend/internal/services/volume_service.go@@ -18,13 +18,13 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- volumetypes "github.com/getarcaneapp/arcane/types/volume"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume""github.com/google/uuid""github.com/moby/moby/api/pkg/stdcopy""github.com/moby/moby/api/types/container"diff --git a/backend/internal/services/volume_service_test.go b/backend/internal/services/volume_service_test.goindex 5b46df409..59b7ec443 100644--- a/backend/internal/services/volume_service_test.go+++ b/backend/internal/services/volume_service_test.go@@ -5,8 +5,8 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- volumetypes "github.com/getarcaneapp/arcane/types/volume"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/mount""github.com/moby/moby/api/types/volume"diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.goindex fc59ca09e..56c5c3438 100644--- a/backend/internal/services/vulnerability_service.go+++ b/backend/internal/services/vulnerability_service.go@@ -23,15 +23,15 @@ import ("time"cerrdefs "github.com/containerd/errdefs"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- dockerutils "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/vulnerability"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/vulnerability"libupdater "github.com/getarcaneapp/updater/pkg/labels""github.com/moby/moby/api/pkg/stdcopy"containertypes "github.com/moby/moby/api/types/container"diff --git a/backend/internal/services/vulnerability_service_test.go b/backend/internal/services/vulnerability_service_test.goindex 8e68fc29a..89153f2f3 100644--- a/backend/internal/services/vulnerability_service_test.go+++ b/backend/internal/services/vulnerability_service_test.go@@ -13,11 +13,11 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- "github.com/getarcaneapp/arcane/backend/pkg/pagination"- "github.com/getarcaneapp/arcane/types/vulnerability"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"+ "github.com/getarcaneapp/arcane/types/v2/vulnerability"glsqlite "github.com/glebarez/sqlite"containertypes "github.com/moby/moby/api/types/container"mounttypes "github.com/moby/moby/api/types/mount"diff --git a/backend/internal/services/webhook_service.go b/backend/internal/services/webhook_service.goindex ed135c1e5..4a6de12e2 100644--- a/backend/internal/services/webhook_service.go+++ b/backend/internal/services/webhook_service.go@@ -11,11 +11,11 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- libcrypto "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- "github.com/getarcaneapp/arcane/types/updater"- webhooktypes "github.com/getarcaneapp/arcane/types/webhook"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ libcrypto "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/types/v2/updater"+ webhooktypes "github.com/getarcaneapp/arcane/types/v2/webhook""gorm.io/gorm")diff --git a/backend/internal/services/webhook_service_test.go b/backend/internal/services/webhook_service_test.goindex badbbec9f..5d6e4507c 100644--- a/backend/internal/services/webhook_service_test.go+++ b/backend/internal/services/webhook_service_test.go@@ -9,14 +9,14 @@ import ("strings""testing"- libcrypto "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"+ libcrypto "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"glsqlite "github.com/glebarez/sqlite""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models")// setupWebhookServiceTestDB creates an isolated in-memory SQLite DB for each test.diff --git a/backend/pkg/authz/access_policy_test.go b/backend/pkg/authz/access_policy_test.goindex e35879765..e6ab9bb9b 100644--- a/backend/pkg/authz/access_policy_test.go+++ b/backend/pkg/authz/access_policy_test.go@@ -8,8 +8,8 @@ import ("strings""testing"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/authz"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz""github.com/stretchr/testify/require")diff --git a/backend/pkg/dockerutil/mount_utils.go b/backend/pkg/dockerutil/mount_utils.goindex 27d3f82ed..c3c1459c2 100644--- a/backend/pkg/dockerutil/mount_utils.go+++ b/backend/pkg/dockerutil/mount_utils.go@@ -5,8 +5,8 @@ import ("os""strings"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"- "github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"containertypes "github.com/moby/moby/api/types/container"mounttypes "github.com/moby/moby/api/types/mount""github.com/moby/moby/client"diff --git a/backend/pkg/fswatch/watcher.go b/backend/pkg/fswatch/watcher.goindex 2cbc9ea5b..197255b7f 100644--- a/backend/pkg/fswatch/watcher.go+++ b/backend/pkg/fswatch/watcher.go@@ -12,7 +12,7 @@ import ("time""github.com/fsnotify/fsnotify"- "github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects")type Watcher struct {diff --git a/backend/pkg/gitutil/git.go b/backend/pkg/gitutil/git.goindex 9ff7e007d..f8c34413b 100644--- a/backend/pkg/gitutil/git.go+++ b/backend/pkg/gitutil/git.go@@ -15,7 +15,7 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/types/gitops"+ "github.com/getarcaneapp/arcane/types/v2/gitops""github.com/go-git/go-git/v5""github.com/go-git/go-git/v5/config""github.com/go-git/go-git/v5/plumbing"diff --git a/backend/pkg/libarcane/activity/handler.go b/backend/pkg/libarcane/activity/handler.goindex 23da05ed5..815d4be51 100644--- a/backend/pkg/libarcane/activity/handler.go+++ b/backend/pkg/libarcane/activity/handler.go@@ -9,8 +9,8 @@ import ("log/slog""strings"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils")// ErrCanceled is the cancellation cause set on an activity's work context when adiff --git a/backend/pkg/libarcane/activity/requests.go b/backend/pkg/libarcane/activity/requests.goindex cddfb7dff..9bcd2f6c5 100644--- a/backend/pkg/libarcane/activity/requests.go+++ b/backend/pkg/libarcane/activity/requests.go@@ -3,8 +3,8 @@ package activityimport ("context"- "github.com/getarcaneapp/arcane/backend/internal/models"- activitytypes "github.com/getarcaneapp/arcane/types/activity"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity")type Service interface {diff --git a/backend/pkg/libarcane/activity/writer.go b/backend/pkg/libarcane/activity/writer.goindex 993cfde5b..3cccb3ca4 100644--- a/backend/pkg/libarcane/activity/writer.go+++ b/backend/pkg/libarcane/activity/writer.go@@ -10,7 +10,7 @@ import ("strings""sync"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models")type Writer struct {diff --git a/backend/pkg/libarcane/activity/writer_test.go b/backend/pkg/libarcane/activity/writer_test.goindex ae02cbe6f..76e76a7a8 100644--- a/backend/pkg/libarcane/activity/writer_test.go+++ b/backend/pkg/libarcane/activity/writer_test.go@@ -7,8 +7,8 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/models"- activitytypes "github.com/getarcaneapp/arcane/types/activity"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity""github.com/stretchr/testify/require")diff --git a/backend/pkg/libarcane/containerstats/history.go b/backend/pkg/libarcane/containerstats/history.goindex ec4032fa8..dea9f487d 100644--- a/backend/pkg/libarcane/containerstats/history.go+++ b/backend/pkg/libarcane/containerstats/history.go@@ -5,7 +5,7 @@ import ("sync""time"- containertypes "github.com/getarcaneapp/arcane/types/container"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"dockercontainer "github.com/moby/moby/api/types/container")diff --git a/backend/pkg/libarcane/containerstats/history_test.go b/backend/pkg/libarcane/containerstats/history_test.goindex c723674cc..5031491f5 100644--- a/backend/pkg/libarcane/containerstats/history_test.go+++ b/backend/pkg/libarcane/containerstats/history_test.go@@ -4,7 +4,7 @@ import ("testing""time"- containertypes "github.com/getarcaneapp/arcane/types/container"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container""github.com/moby/moby/api/types/container""github.com/stretchr/testify/require")diff --git a/backend/pkg/libarcane/dockerrun/dockerrun.go b/backend/pkg/libarcane/dockerrun/dockerrun.goindex 981d3964e..994252d39 100644--- a/backend/pkg/libarcane/dockerrun/dockerrun.go+++ b/backend/pkg/libarcane/dockerrun/dockerrun.go@@ -5,7 +5,7 @@ import ("fmt""strings"- systemtypes "github.com/getarcaneapp/arcane/types/system"+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system")func ParseTokens(tokens []string, result *systemtypes.DockerRunCommand) error {diff --git a/backend/pkg/libarcane/edge/client_grpc_test.go b/backend/pkg/libarcane/edge/client_grpc_test.goindex b9b26d264..92572674e 100644--- a/backend/pkg/libarcane/edge/client_grpc_test.go+++ b/backend/pkg/libarcane/edge/client_grpc_test.go@@ -13,7 +13,7 @@ import ("testing""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""github.com/gorilla/websocket""github.com/labstack/echo/v4""github.com/stretchr/testify/assert"diff --git a/backend/pkg/libarcane/edge/client_poll_test.go b/backend/pkg/libarcane/edge/client_poll_test.goindex 1b33ac88b..c3066e97e 100644--- a/backend/pkg/libarcane/edge/client_poll_test.go+++ b/backend/pkg/libarcane/edge/client_poll_test.go@@ -13,7 +13,7 @@ import ("testing""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""github.com/gorilla/websocket""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/backend/pkg/libarcane/edge/client_test.go b/backend/pkg/libarcane/edge/client_test.goindex 5159b0815..448458ecb 100644--- a/backend/pkg/libarcane/edge/client_test.go+++ b/backend/pkg/libarcane/edge/client_test.go@@ -13,7 +13,7 @@ import ("testing""time"- httputil "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx"+ httputil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx""github.com/gorilla/websocket""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/backend/pkg/libarcane/edge/client_transport_grpc.go b/backend/pkg/libarcane/edge/client_transport_grpc.goindex a3410f53b..bc93dc010 100644--- a/backend/pkg/libarcane/edge/client_transport_grpc.go+++ b/backend/pkg/libarcane/edge/client_transport_grpc.go@@ -10,7 +10,7 @@ import ("strings""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""google.golang.org/grpc""google.golang.org/grpc/backoff""google.golang.org/grpc/credentials"diff --git a/backend/pkg/libarcane/edge/grpc_tunnel_integration_test.go b/backend/pkg/libarcane/edge/grpc_tunnel_integration_test.goindex 5cf549878..f55e14e63 100644--- a/backend/pkg/libarcane/edge/grpc_tunnel_integration_test.go+++ b/backend/pkg/libarcane/edge/grpc_tunnel_integration_test.go@@ -8,7 +8,7 @@ import ("testing""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""google.golang.org/grpc"diff --git a/backend/pkg/libarcane/edge/poll_control.go b/backend/pkg/libarcane/edge/poll_control.goindex 3bc5b973e..bd8db3a0a 100644--- a/backend/pkg/libarcane/edge/poll_control.go+++ b/backend/pkg/libarcane/edge/poll_control.go@@ -10,7 +10,7 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/backend/pkg/remenv"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv""github.com/labstack/echo/v4")diff --git a/backend/pkg/libarcane/edge/proto/tunnel/v1/tunnel.pb.go b/backend/pkg/libarcane/edge/proto/tunnel/v1/tunnel.pb.goindex 5ba8320ef..d4f848f99 100644--- a/backend/pkg/libarcane/edge/proto/tunnel/v1/tunnel.pb.go+++ b/backend/pkg/libarcane/edge/proto/tunnel/v1/tunnel.pb.go@@ -2025,7 +2025,7 @@ const file_tunnel_v1_tunnel_proto_rawDesc = "" +"\rmetadata_json\x18\n" +" \x01(\fR\fmetadataJson2R\n" +"\rTunnelService\x12A\n" +- "\aConnect\x12\x17.tunnel.v1.AgentMessage\x1a\x19.tunnel.v1.ManagerMessage(\x010\x01BTZRgithub.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1;tunnelpbb\x06proto3"+ "\aConnect\x12\x17.tunnel.v1.AgentMessage\x1a\x19.tunnel.v1.ManagerMessage(\x010\x01BWZUgithub.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1;tunnelpbb\x06proto3"var (file_tunnel_v1_tunnel_proto_rawDescOnce sync.Oncediff --git a/backend/pkg/libarcane/edge/proto/tunnel/v1/tunnel.proto b/backend/pkg/libarcane/edge/proto/tunnel/v1/tunnel.protoindex c7cedc235..fc57740c2 100644--- a/backend/pkg/libarcane/edge/proto/tunnel/v1/tunnel.proto+++ b/backend/pkg/libarcane/edge/proto/tunnel/v1/tunnel.proto@@ -2,7 +2,7 @@ syntax = "proto3";package tunnel.v1;-option go_package = "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1;tunnelpb";+option go_package = "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1;tunnelpb";// TunnelService is the reverse tunnel between an edge agent and manager.service TunnelService {diff --git a/backend/pkg/libarcane/edge/proxy_test.go b/backend/pkg/libarcane/edge/proxy_test.goindex df6aeb8e7..476ac9120 100644--- a/backend/pkg/libarcane/edge/proxy_test.go+++ b/backend/pkg/libarcane/edge/proxy_test.go@@ -12,7 +12,7 @@ import ("testing""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""github.com/gorilla/websocket""github.com/labstack/echo/v4""github.com/stretchr/testify/assert"diff --git a/backend/pkg/libarcane/edge/remenv.go b/backend/pkg/libarcane/edge/remenv.goindex 6253b5d26..cf087d14b 100644--- a/backend/pkg/libarcane/edge/remenv.go+++ b/backend/pkg/libarcane/edge/remenv.go@@ -5,7 +5,7 @@ import ("net/http""strings"- "github.com/getarcaneapp/arcane/backend/pkg/remenv"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv""github.com/labstack/echo/v4")diff --git a/backend/pkg/libarcane/edge/remenv_client_integration_test.go b/backend/pkg/libarcane/edge/remenv_client_integration_test.goindex 283690058..4e360d4e3 100644--- a/backend/pkg/libarcane/edge/remenv_client_integration_test.go+++ b/backend/pkg/libarcane/edge/remenv_client_integration_test.go@@ -9,8 +9,8 @@ import ("testing""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"- "github.com/getarcaneapp/arcane/backend/pkg/remenv"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""google.golang.org/grpc"diff --git a/backend/pkg/libarcane/edge/server.go b/backend/pkg/libarcane/edge/server.goindex 13910a05a..32b3bc2c9 100644--- a/backend/pkg/libarcane/edge/server.go+++ b/backend/pkg/libarcane/edge/server.go@@ -11,8 +11,8 @@ import ("strings""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"- "github.com/getarcaneapp/arcane/backend/pkg/remenv"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv""github.com/google/uuid""github.com/gorilla/websocket""github.com/labstack/echo/v4"diff --git a/backend/pkg/libarcane/edge/tls.go b/backend/pkg/libarcane/edge/tls.goindex 075750c86..ba72b4a20 100644--- a/backend/pkg/libarcane/edge/tls.go+++ b/backend/pkg/libarcane/edge/tls.go@@ -25,9 +25,9 @@ import ("syscall""time"- "github.com/getarcaneapp/arcane/backend/internal/common"- libcrypto "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"- certgen "github.com/getarcaneapp/arcane/cli/pkg/generate"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ libcrypto "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto"+ certgen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate""google.golang.org/grpc/credentials""google.golang.org/grpc/peer")diff --git a/backend/pkg/libarcane/edge/tls_test.go b/backend/pkg/libarcane/edge/tls_test.goindex bcd28be0d..ac712b062 100644--- a/backend/pkg/libarcane/edge/tls_test.go+++ b/backend/pkg/libarcane/edge/tls_test.go@@ -19,8 +19,8 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/common"- libcrypto "github.com/getarcaneapp/arcane/backend/pkg/libarcane/crypto"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ libcrypto "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/crypto""github.com/stretchr/testify/require""google.golang.org/grpc/credentials""google.golang.org/grpc/peer"diff --git a/backend/pkg/libarcane/edge/transport_benchmark_test.go b/backend/pkg/libarcane/edge/transport_benchmark_test.goindex 92ff310ca..922213c38 100644--- a/backend/pkg/libarcane/edge/transport_benchmark_test.go+++ b/backend/pkg/libarcane/edge/transport_benchmark_test.go@@ -12,7 +12,7 @@ import ("testing""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""github.com/gorilla/websocket""google.golang.org/grpc""google.golang.org/grpc/credentials/insecure"diff --git a/backend/pkg/libarcane/edge/tunnel.go b/backend/pkg/libarcane/edge/tunnel.goindex b4523f7f0..5f073bb0c 100644--- a/backend/pkg/libarcane/edge/tunnel.go+++ b/backend/pkg/libarcane/edge/tunnel.go@@ -8,7 +8,7 @@ import ("sync""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""github.com/gorilla/websocket""google.golang.org/grpc/codes""google.golang.org/grpc/status"diff --git a/backend/pkg/libarcane/edge/tunnel_proto_adapter.go b/backend/pkg/libarcane/edge/tunnel_proto_adapter.goindex 16cefebf5..6ce7c968f 100644--- a/backend/pkg/libarcane/edge/tunnel_proto_adapter.go+++ b/backend/pkg/libarcane/edge/tunnel_proto_adapter.go@@ -6,7 +6,7 @@ import ("maps""math"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1")func tunnelMessageToManagerProto(msg *TunnelMessage) (*tunnelpb.ManagerMessage, error) {diff --git a/backend/pkg/libarcane/edge/tunnel_test.go b/backend/pkg/libarcane/edge/tunnel_test.goindex 1a94b7309..071f3379c 100644--- a/backend/pkg/libarcane/edge/tunnel_test.go+++ b/backend/pkg/libarcane/edge/tunnel_test.go@@ -10,7 +10,7 @@ import ("testing""time"- tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge/proto/tunnel/v1""github.com/gorilla/websocket""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/backend/pkg/libarcane/libbuild/build_provider.go b/backend/pkg/libarcane/libbuild/build_provider.goindex e6ba44789..424d96558 100644--- a/backend/pkg/libarcane/libbuild/build_provider.go+++ b/backend/pkg/libarcane/libbuild/build_provider.go@@ -11,8 +11,8 @@ import (depotbuild "github.com/depot/depot-go/build"depotmachine "github.com/depot/depot-go/machine"cliv1 "github.com/depot/depot-go/proto/depot/cli/v1"- buildtypes "github.com/getarcaneapp/arcane/types/builds"- "github.com/getarcaneapp/arcane/types/image"+ buildtypes "github.com/getarcaneapp/arcane/types/v2/builds"+ "github.com/getarcaneapp/arcane/types/v2/image""github.com/moby/buildkit/client")diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit.go b/backend/pkg/libarcane/libbuild/builder_buildkit.goindex ccb57ba90..f6df36ebd 100644--- a/backend/pkg/libarcane/libbuild/builder_buildkit.go+++ b/backend/pkg/libarcane/libbuild/builder_buildkit.go@@ -8,8 +8,8 @@ import ("path/filepath""strings"- dockerutils "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"buildkit "github.com/moby/buildkit/client")diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit_local.go b/backend/pkg/libarcane/libbuild/builder_buildkit_local.goindex 83af481c7..fe9aefc76 100644--- a/backend/pkg/libarcane/libbuild/builder_buildkit_local.go+++ b/backend/pkg/libarcane/libbuild/builder_buildkit_local.go@@ -9,8 +9,8 @@ import ("strings""time"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"buildkitclient "github.com/moby/buildkit/client")diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit_local_test.go b/backend/pkg/libarcane/libbuild/builder_buildkit_local_test.goindex 7a32dfb0d..5d57c1cad 100644--- a/backend/pkg/libarcane/libbuild/builder_buildkit_local_test.go+++ b/backend/pkg/libarcane/libbuild/builder_buildkit_local_test.go@@ -5,7 +5,7 @@ import ("path/filepath""testing"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit_test.go b/backend/pkg/libarcane/libbuild/builder_buildkit_test.goindex 7f2efe46b..bbd0439bb 100644--- a/backend/pkg/libarcane/libbuild/builder_buildkit_test.go+++ b/backend/pkg/libarcane/libbuild/builder_buildkit_test.go@@ -9,7 +9,7 @@ import ("path/filepath""testing"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"dockerclient "github.com/moby/moby/client""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/backend/pkg/libarcane/libbuild/builder_core.go b/backend/pkg/libarcane/libbuild/builder_core.goindex e76fe7dc9..fbcfb7f6e 100644--- a/backend/pkg/libarcane/libbuild/builder_core.go+++ b/backend/pkg/libarcane/libbuild/builder_core.go@@ -11,11 +11,11 @@ import ("github.com/docker/cli/cli/config"configtypes "github.com/docker/cli/cli/config/types"- "github.com/getarcaneapp/arcane/backend/internal/common"- utilsregistry "github.com/getarcaneapp/arcane/backend/pkg/libarcane/registryauth"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts"- buildtypes "github.com/getarcaneapp/arcane/types/builds"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"+ buildtypes "github.com/getarcaneapp/arcane/types/v2/builds"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"buildkit "github.com/moby/buildkit/client""github.com/moby/buildkit/session/auth/authprovider")diff --git a/backend/pkg/libarcane/libbuild/builder_core_test.go b/backend/pkg/libarcane/libbuild/builder_core_test.goindex 440e00806..c29ac10a1 100644--- a/backend/pkg/libarcane/libbuild/builder_core_test.go+++ b/backend/pkg/libarcane/libbuild/builder_core_test.go@@ -6,7 +6,7 @@ import ("testing"configtypes "github.com/docker/cli/cli/config/types"- utilsregistry "github.com/getarcaneapp/arcane/backend/pkg/libarcane/registryauth"+ utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth""github.com/moby/buildkit/session/auth/authprovider"dockerregistry "github.com/moby/moby/api/types/registry""github.com/stretchr/testify/assert"diff --git a/backend/pkg/libarcane/libbuild/builder_docker.go b/backend/pkg/libarcane/libbuild/builder_docker.goindex 9718c991a..72c416081 100644--- a/backend/pkg/libarcane/libbuild/builder_docker.go+++ b/backend/pkg/libarcane/libbuild/builder_docker.go@@ -12,8 +12,8 @@ import ("strconv""strings"- dockerutils "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image""github.com/moby/go-archive"dockercontainer "github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/jsonstream"diff --git a/backend/pkg/libarcane/libbuild/builder_docker_test.go b/backend/pkg/libarcane/libbuild/builder_docker_test.goindex 857f35919..f1c2e606e 100644--- a/backend/pkg/libarcane/libbuild/builder_docker_test.go+++ b/backend/pkg/libarcane/libbuild/builder_docker_test.go@@ -5,7 +5,7 @@ import ("path/filepath""testing"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"dockerregistry "github.com/moby/moby/api/types/registry""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/backend/pkg/libarcane/libbuild/builder_progress.go b/backend/pkg/libarcane/libbuild/builder_progress.goindex 90a5a36f7..816e18428 100644--- a/backend/pkg/libarcane/libbuild/builder_progress.go+++ b/backend/pkg/libarcane/libbuild/builder_progress.go@@ -4,7 +4,7 @@ import ("encoding/json""io"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image")type flusher interface{ Flush() }diff --git a/backend/pkg/libarcane/libbuild/builder_utils.go b/backend/pkg/libarcane/libbuild/builder_utils.goindex 840c446e6..0096fb2c8 100644--- a/backend/pkg/libarcane/libbuild/builder_utils.go+++ b/backend/pkg/libarcane/libbuild/builder_utils.go@@ -8,7 +8,7 @@ import ("sort""strings"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image")func normalizeBuildRequestInternal(req imagetypes.BuildRequest, providerName string) imagetypes.BuildRequest {diff --git a/backend/pkg/libarcane/libbuild/builder_utils_test.go b/backend/pkg/libarcane/libbuild/builder_utils_test.goindex 626a59b9f..a350d6e3b 100644--- a/backend/pkg/libarcane/libbuild/builder_utils_test.go+++ b/backend/pkg/libarcane/libbuild/builder_utils_test.go@@ -5,7 +5,7 @@ import ("path/filepath""testing"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/libarcane/libbuild/log_capture.go b/backend/pkg/libarcane/libbuild/log_capture.goindex 668ae29c5..37c3c548b 100644--- a/backend/pkg/libarcane/libbuild/log_capture.go+++ b/backend/pkg/libarcane/libbuild/log_capture.go@@ -3,7 +3,7 @@ package libbuildimport ("bytes"- buildtypes "github.com/getarcaneapp/arcane/types/builds"+ buildtypes "github.com/getarcaneapp/arcane/types/v2/builds")// logCapture stores build output up to a max byte size.diff --git a/backend/pkg/libarcane/logstream/logstream.go b/backend/pkg/libarcane/logstream/logstream.goindex 11d031f27..1848491b8 100644--- a/backend/pkg/libarcane/logstream/logstream.go+++ b/backend/pkg/libarcane/logstream/logstream.go@@ -11,7 +11,7 @@ import ("log/slog""sync"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/types/v2/system")// defaultRingCapacity is the number of recent log entries retained in memory.diff --git a/backend/pkg/libarcane/startup/runtime_identity.go b/backend/pkg/libarcane/startup/runtime_identity.goindex b148599e6..c518a0bd3 100644--- a/backend/pkg/libarcane/startup/runtime_identity.go+++ b/backend/pkg/libarcane/startup/runtime_identity.go@@ -8,7 +8,7 @@ import ("path/filepath""strings"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils")const (diff --git a/backend/pkg/libarcane/startup/startup.go b/backend/pkg/libarcane/startup/startup.goindex 29c8be8f5..c36b82987 100644--- a/backend/pkg/libarcane/startup/startup.go+++ b/backend/pkg/libarcane/startup/startup.go@@ -4,7 +4,7 @@ import ("context""log/slog"- "github.com/getarcaneapp/arcane/backend/buildables"+ "github.com/getarcaneapp/arcane/backend/v2/buildables")type RuntimeConfig struct {diff --git a/backend/pkg/libarcane/swarm/stack_deploy_engine.go b/backend/pkg/libarcane/swarm/stack_deploy_engine.goindex 0e480b809..1e1d424ee 100644--- a/backend/pkg/libarcane/swarm/stack_deploy_engine.go+++ b/backend/pkg/libarcane/swarm/stack_deploy_engine.go@@ -18,9 +18,9 @@ import (composegotypes "github.com/compose-spec/compose-go/v2/types"cerrdefs "github.com/containerd/errdefs""github.com/docker/compose/v5/pkg/api"- "github.com/getarcaneapp/arcane/backend/pkg/projects"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- swarmtypes "github.com/getarcaneapp/arcane/types/swarm"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm""github.com/moby/moby/api/types/mount""github.com/moby/moby/api/types/network""github.com/moby/moby/api/types/swarm"diff --git a/backend/pkg/libarcane/system/cgroup.go b/backend/pkg/libarcane/system/cgroup.goindex a4e3ad2e0..a5b336c5b 100644--- a/backend/pkg/libarcane/system/cgroup.go+++ b/backend/pkg/libarcane/system/cgroup.go@@ -7,7 +7,7 @@ import ("sync""time"- docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil")// CgroupCache memoizes the result of cgroup limit detection for a configurable TTL.diff --git a/backend/pkg/libarcane/system/gpu.go b/backend/pkg/libarcane/system/gpu.goindex 29889fcb6..5a1c1d417 100644--- a/backend/pkg/libarcane/system/gpu.go+++ b/backend/pkg/libarcane/system/gpu.go@@ -14,7 +14,7 @@ import ("sync""time"- systemtypes "github.com/getarcaneapp/arcane/types/system"+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system")// AMDGPUSysfsPath is the sysfs base used to discover AMD GPUs.diff --git a/backend/pkg/pagination/db_utils.go b/backend/pkg/pagination/db_utils.goindex a8e3e58bc..b20d5346d 100644--- a/backend/pkg/pagination/db_utils.go+++ b/backend/pkg/pagination/db_utils.go@@ -4,7 +4,7 @@ import ("fmt""strings"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/mapper""gorm.io/gorm")diff --git a/backend/pkg/pagination/reflect.go b/backend/pkg/pagination/reflect.goindex 6e0a1a02d..1b4810e26 100644--- a/backend/pkg/pagination/reflect.go+++ b/backend/pkg/pagination/reflect.go@@ -4,7 +4,7 @@ import ("reflect""strconv"- stringutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ stringutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""gorm.io/gorm""gorm.io/gorm/clause")diff --git a/backend/pkg/projects/cmds.go b/backend/pkg/projects/cmds.goindex cdd6a6663..79d6e0973 100644--- a/backend/pkg/projects/cmds.go+++ b/backend/pkg/projects/cmds.go@@ -12,7 +12,7 @@ import ("github.com/moby/moby/api/types/container""github.com/moby/moby/client"- "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils")// ProgressWriterKey can be set on a context to enable JSON-line progress updates.diff --git a/backend/pkg/projects/cmds_test.go b/backend/pkg/projects/cmds_test.goindex e16585d5b..a0ff5f8ec 100644--- a/backend/pkg/projects/cmds_test.go+++ b/backend/pkg/projects/cmds_test.go@@ -7,7 +7,7 @@ import (composetypes "github.com/compose-spec/compose-go/v2/types""github.com/docker/compose/v5/pkg/api"- "github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/stretchr/testify/require")diff --git a/backend/pkg/projects/compose.go b/backend/pkg/projects/compose.goindex 13fc84bf9..fd63d5e54 100644--- a/backend/pkg/projects/compose.go+++ b/backend/pkg/projects/compose.go@@ -9,7 +9,7 @@ import ("github.com/docker/cli/cli/flags""github.com/docker/compose/v5/pkg/api"composev2 "github.com/docker/compose/v5/pkg/compose"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane""github.com/moby/moby/client")diff --git a/backend/pkg/projects/custom_labels.go b/backend/pkg/projects/custom_labels.goindex f92e67b74..0980e6635 100644--- a/backend/pkg/projects/custom_labels.go+++ b/backend/pkg/projects/custom_labels.go@@ -11,8 +11,8 @@ import ("github.com/compose-spec/compose-go/v2/loader"composetypes "github.com/compose-spec/compose-go/v2/types"- "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/iconcatalog"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog""github.com/goccy/go-yaml")diff --git a/backend/pkg/projects/env.go b/backend/pkg/projects/env.goindex c39f44193..62e64d657 100644--- a/backend/pkg/projects/env.go+++ b/backend/pkg/projects/env.go@@ -18,7 +18,7 @@ import ("time""github.com/compose-spec/compose-go/v2/dotenv"- "github.com/getarcaneapp/arcane/backend/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cache")const (diff --git a/backend/pkg/projects/env_test.go b/backend/pkg/projects/env_test.goindex 20ead0585..f0f5ffaa2 100644--- a/backend/pkg/projects/env_test.go+++ b/backend/pkg/projects/env_test.go@@ -6,7 +6,7 @@ import ("path/filepath""testing"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/projects/env_variables.go b/backend/pkg/projects/env_variables.goindex 999b07845..e57873c49 100644--- a/backend/pkg/projects/env_variables.go+++ b/backend/pkg/projects/env_variables.go@@ -4,7 +4,7 @@ import ("bufio""strings"- "github.com/getarcaneapp/arcane/types/env"+ "github.com/getarcaneapp/arcane/types/v2/env")// ParseEnvContent parses environment variables from .env file contentdiff --git a/backend/pkg/projects/fs_templates.go b/backend/pkg/projects/fs_templates.goindex a7fc6a4f0..30320b86e 100644--- a/backend/pkg/projects/fs_templates.go+++ b/backend/pkg/projects/fs_templates.go@@ -9,7 +9,7 @@ import ("regexp""strings"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils")func ReadFolderComposeTemplate(baseDir, folder string) (string, *string, string, bool, error) {diff --git a/backend/pkg/projects/fs_util.go b/backend/pkg/projects/fs_util.goindex 5ce01be28..7ec73779d 100644--- a/backend/pkg/projects/fs_util.go+++ b/backend/pkg/projects/fs_util.go@@ -11,9 +11,9 @@ import ("slices""strings"- "github.com/getarcaneapp/arcane/backend/internal/config"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/types/project"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/project""github.com/goccy/go-yaml")diff --git a/backend/pkg/projects/fs_writer.go b/backend/pkg/projects/fs_writer.goindex acf732884..088aa80ca 100644--- a/backend/pkg/projects/fs_writer.go+++ b/backend/pkg/projects/fs_writer.go@@ -8,7 +8,7 @@ import ("path/filepath""strings"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils")var composeFileCandidates = []string{diff --git a/backend/pkg/projects/fs_writer_test.go b/backend/pkg/projects/fs_writer_test.goindex ac3763d61..971047c5b 100644--- a/backend/pkg/projects/fs_writer_test.go+++ b/backend/pkg/projects/fs_writer_test.go@@ -6,7 +6,7 @@ import ("runtime""testing"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/projects/image_refs.go b/backend/pkg/projects/image_refs.goindex ccf8ef159..fdffff2de 100644--- a/backend/pkg/projects/image_refs.go+++ b/backend/pkg/projects/image_refs.go@@ -5,7 +5,7 @@ import ("strings"composetypes "github.com/compose-spec/compose-go/v2/types"- projecttypes "github.com/getarcaneapp/arcane/types/project"+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project")// ImageRefsFromComposeServices returns unique, non-empty image references fromdiff --git a/backend/pkg/projects/includes.go b/backend/pkg/projects/includes.goindex ca4ac0465..f60bf3053 100644--- a/backend/pkg/projects/includes.go+++ b/backend/pkg/projects/includes.go@@ -7,7 +7,7 @@ import ("path/filepath""strings"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/goccy/go-yaml")diff --git a/backend/pkg/projects/includes_test.go b/backend/pkg/projects/includes_test.goindex c2cdb499b..d40c1a919 100644--- a/backend/pkg/projects/includes_test.go+++ b/backend/pkg/projects/includes_test.go@@ -6,7 +6,7 @@ import ("runtime""testing"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils"+ pkgutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils")func TestParseIncludes_NormalizesRelativePaths(t *testing.T) {diff --git a/backend/pkg/scheduler/analytics_job.go b/backend/pkg/scheduler/analytics_job.goindex 061e752e4..0fd1d52bf 100644--- a/backend/pkg/scheduler/analytics_job.go+++ b/backend/pkg/scheduler/analytics_job.go@@ -14,8 +14,8 @@ import ("time""github.com/cenkalti/backoff/v5"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services")const (diff --git a/backend/pkg/scheduler/analytics_job_test.go b/backend/pkg/scheduler/analytics_job_test.goindex 304b1e995..b36b40136 100644--- a/backend/pkg/scheduler/analytics_job_test.go+++ b/backend/pkg/scheduler/analytics_job_test.go@@ -15,10 +15,10 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/config"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services")func setupAnalyticsStateServicesInternal(t *testing.T) (*database.DB, *services.SettingsService, *services.KVService) {diff --git a/backend/pkg/scheduler/auto_heal_job.go b/backend/pkg/scheduler/auto_heal_job.goindex 98c146caf..452dc9fd6 100644--- a/backend/pkg/scheduler/auto_heal_job.go+++ b/backend/pkg/scheduler/auto_heal_job.go@@ -7,10 +7,10 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- dockerutil "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"- "github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane""github.com/moby/moby/api/types/container""github.com/moby/moby/client""github.com/robfig/cron/v3"diff --git a/backend/pkg/scheduler/auto_heal_job_test.go b/backend/pkg/scheduler/auto_heal_job_test.goindex 720bc3fa1..e5658bbbd 100644--- a/backend/pkg/scheduler/auto_heal_job_test.go+++ b/backend/pkg/scheduler/auto_heal_job_test.go@@ -6,9 +6,9 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"glsqlite "github.com/glebarez/sqlite""github.com/moby/moby/api/types/container""github.com/moby/moby/client"diff --git a/backend/pkg/scheduler/auto_update_job.go b/backend/pkg/scheduler/auto_update_job.goindex fa6f4b03d..cb7f782f2 100644--- a/backend/pkg/scheduler/auto_update_job.go+++ b/backend/pkg/scheduler/auto_update_job.go@@ -4,8 +4,8 @@ import ("context""log/slog"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/types/updater"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/types/v2/updater")type AutoUpdateJob struct {diff --git a/backend/pkg/scheduler/docker_client_refresh_job.go b/backend/pkg/scheduler/docker_client_refresh_job.goindex 4fb1ec331..21c02de7d 100644--- a/backend/pkg/scheduler/docker_client_refresh_job.go+++ b/backend/pkg/scheduler/docker_client_refresh_job.go@@ -4,7 +4,7 @@ import ("context""log/slog"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services""github.com/robfig/cron/v3")diff --git a/backend/pkg/scheduler/event_cleanup_job.go b/backend/pkg/scheduler/event_cleanup_job.goindex 08daff1ab..30952499f 100644--- a/backend/pkg/scheduler/event_cleanup_job.go+++ b/backend/pkg/scheduler/event_cleanup_job.go@@ -5,7 +5,7 @@ import ("log/slog""time"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services")const EventCleanupJobName = "event-cleanup"diff --git a/backend/pkg/scheduler/expired_sessions_cleanup_job.go b/backend/pkg/scheduler/expired_sessions_cleanup_job.goindex 89b013b29..7b84fa57b 100644--- a/backend/pkg/scheduler/expired_sessions_cleanup_job.go+++ b/backend/pkg/scheduler/expired_sessions_cleanup_job.go@@ -5,7 +5,7 @@ import ("log/slog""time"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services")const ExpiredSessionsCleanupJobName = "expired-sessions-cleanup"diff --git a/backend/pkg/scheduler/filesystem_watcher_job.go b/backend/pkg/scheduler/filesystem_watcher_job.goindex 0f375494d..c1b3732f7 100644--- a/backend/pkg/scheduler/filesystem_watcher_job.go+++ b/backend/pkg/scheduler/filesystem_watcher_job.go@@ -7,9 +7,9 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/backend/pkg/fswatch"- "github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/fswatch"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects")type FilesystemWatcherJob struct {diff --git a/backend/pkg/scheduler/image_polling_job.go b/backend/pkg/scheduler/image_polling_job.goindex bb5126d3f..9c6a8b14e 100644--- a/backend/pkg/scheduler/image_polling_job.go+++ b/backend/pkg/scheduler/image_polling_job.go@@ -4,7 +4,7 @@ import ("context""log/slog"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services")type ImagePollingJob struct {diff --git a/backend/pkg/scheduler/scheduled_prune_job.go b/backend/pkg/scheduler/scheduled_prune_job.goindex d2670b82d..4a8517b5e 100644--- a/backend/pkg/scheduler/scheduled_prune_job.go+++ b/backend/pkg/scheduler/scheduled_prune_job.go@@ -4,8 +4,8 @@ import ("context""log/slog"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/types/v2/system""github.com/robfig/cron/v3")diff --git a/backend/pkg/scheduler/scheduled_prune_job_test.go b/backend/pkg/scheduler/scheduled_prune_job_test.goindex 57cc857f4..7cbd9d2b9 100644--- a/backend/pkg/scheduler/scheduled_prune_job_test.go+++ b/backend/pkg/scheduler/scheduled_prune_job_test.go@@ -8,10 +8,10 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/getarcaneapp/arcane/backend/internal/database"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/types/v2/system")func setupScheduledPruneSettingsServiceInternal(t *testing.T) *services.SettingsService {diff --git a/backend/pkg/scheduler/scheduler.go b/backend/pkg/scheduler/scheduler.goindex 7d9099f58..e43696d71 100644--- a/backend/pkg/scheduler/scheduler.go+++ b/backend/pkg/scheduler/scheduler.go@@ -6,7 +6,7 @@ import ("sync""time"- schedulertypes "github.com/getarcaneapp/arcane/types/scheduler"+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler""github.com/robfig/cron/v3")diff --git a/backend/pkg/scheduler/scheduler_test.go b/backend/pkg/scheduler/scheduler_test.goindex 854af182b..60b7bd47e 100644--- a/backend/pkg/scheduler/scheduler_test.go+++ b/backend/pkg/scheduler/scheduler_test.go@@ -6,7 +6,7 @@ import ("testing""time"- schedulertypes "github.com/getarcaneapp/arcane/types/scheduler"+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler""github.com/stretchr/testify/require")diff --git a/backend/pkg/scheduler/volume_helper_reaper_job.go b/backend/pkg/scheduler/volume_helper_reaper_job.goindex a9e2b0e50..beca81c66 100644--- a/backend/pkg/scheduler/volume_helper_reaper_job.go+++ b/backend/pkg/scheduler/volume_helper_reaper_job.go@@ -5,7 +5,7 @@ import ("log/slog""time"- "github.com/getarcaneapp/arcane/backend/internal/services"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services")const (diff --git a/backend/pkg/scheduler/vulnerability_scan_job.go b/backend/pkg/scheduler/vulnerability_scan_job.goindex 090ce325d..6fd1a2595 100644--- a/backend/pkg/scheduler/vulnerability_scan_job.go+++ b/backend/pkg/scheduler/vulnerability_scan_job.go@@ -4,9 +4,9 @@ import ("context""log/slog"- "github.com/getarcaneapp/arcane/backend/internal/models"- "github.com/getarcaneapp/arcane/backend/internal/services"- "github.com/getarcaneapp/arcane/types"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/services"+ "github.com/getarcaneapp/arcane/types/v2""github.com/robfig/cron/v3")diff --git a/backend/pkg/utils/httpx/safe_remote.go b/backend/pkg/utils/httpx/safe_remote.goindex 079889f58..3b44df04f 100644--- a/backend/pkg/utils/httpx/safe_remote.go+++ b/backend/pkg/utils/httpx/safe_remote.go@@ -11,7 +11,7 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/backend/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common")type LookupIPFunc func(ctx context.Context, host string) ([]net.IP, error)diff --git a/backend/pkg/utils/httpx/safe_remote_test.go b/backend/pkg/utils/httpx/safe_remote_test.goindex 77c5c7af5..3e034d385 100644--- a/backend/pkg/utils/httpx/safe_remote_test.go+++ b/backend/pkg/utils/httpx/safe_remote_test.go@@ -9,7 +9,7 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/common"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/discord_sender.go b/backend/pkg/utils/notifications/discord_sender.goindex 97d7024eb..a2551826a 100644--- a/backend/pkg/utils/notifications/discord_sender.go+++ b/backend/pkg/utils/notifications/discord_sender.go@@ -5,7 +5,7 @@ import ("errors""fmt"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr""github.com/nicholas-fedor/shoutrrr/pkg/services/chat/discord")diff --git a/backend/pkg/utils/notifications/discord_sender_test.go b/backend/pkg/utils/notifications/discord_sender_test.goindex b59f11657..14b78d871 100644--- a/backend/pkg/utils/notifications/discord_sender_test.go+++ b/backend/pkg/utils/notifications/discord_sender_test.go@@ -4,7 +4,7 @@ import ("fmt""testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/email_sender.go b/backend/pkg/utils/notifications/email_sender.goindex d18597d09..774cef7f6 100644--- a/backend/pkg/utils/notifications/email_sender.go+++ b/backend/pkg/utils/notifications/email_sender.go@@ -7,7 +7,7 @@ import ("fmt""time"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/wneessen/go-mail")diff --git a/backend/pkg/utils/notifications/email_sender_test.go b/backend/pkg/utils/notifications/email_sender_test.goindex 0e7b053ba..cb2c7c1ff 100644--- a/backend/pkg/utils/notifications/email_sender_test.go+++ b/backend/pkg/utils/notifications/email_sender_test.go@@ -21,7 +21,7 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/generic_sender.go b/backend/pkg/utils/notifications/generic_sender.goindex 71e026845..d254d77b9 100644--- a/backend/pkg/utils/notifications/generic_sender.go+++ b/backend/pkg/utils/notifications/generic_sender.go@@ -11,7 +11,7 @@ import ("net/url""strings"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr"shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types")diff --git a/backend/pkg/utils/notifications/generic_sender_test.go b/backend/pkg/utils/notifications/generic_sender_test.goindex 55b9e5d10..aa47e20dd 100644--- a/backend/pkg/utils/notifications/generic_sender_test.go+++ b/backend/pkg/utils/notifications/generic_sender_test.go@@ -3,7 +3,7 @@ package notificationsimport ("testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/gotify_sender.go b/backend/pkg/utils/notifications/gotify_sender.goindex 9661f5bb4..a73a91fc7 100644--- a/backend/pkg/utils/notifications/gotify_sender.go+++ b/backend/pkg/utils/notifications/gotify_sender.go@@ -8,7 +8,7 @@ import ("strconv""strings"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr"shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types")diff --git a/backend/pkg/utils/notifications/gotify_sender_test.go b/backend/pkg/utils/notifications/gotify_sender_test.goindex 8f9a43c71..b3213e847 100644--- a/backend/pkg/utils/notifications/gotify_sender_test.go+++ b/backend/pkg/utils/notifications/gotify_sender_test.go@@ -3,7 +3,7 @@ package notificationsimport ("testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/matrix_sender.go b/backend/pkg/utils/notifications/matrix_sender.goindex 020eefebc..07921d974 100644--- a/backend/pkg/utils/notifications/matrix_sender.go+++ b/backend/pkg/utils/notifications/matrix_sender.go@@ -7,7 +7,7 @@ import ("net/url""strings"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr"shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types")diff --git a/backend/pkg/utils/notifications/matrix_sender_test.go b/backend/pkg/utils/notifications/matrix_sender_test.goindex 77f1deefb..8ee03b72c 100644--- a/backend/pkg/utils/notifications/matrix_sender_test.go+++ b/backend/pkg/utils/notifications/matrix_sender_test.go@@ -3,7 +3,7 @@ package notificationsimport ("testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/messages.go b/backend/pkg/utils/notifications/messages.goindex 43cf50c7b..5fc5b3382 100644--- a/backend/pkg/utils/notifications/messages.go+++ b/backend/pkg/utils/notifications/messages.go@@ -5,8 +5,8 @@ import ("sort""strings"- "github.com/getarcaneapp/arcane/types/imageupdate"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"+ "github.com/getarcaneapp/arcane/types/v2/system")type MessageFormat stringdiff --git a/backend/pkg/utils/notifications/ntfy_sender.go b/backend/pkg/utils/notifications/ntfy_sender.goindex 662c82bd0..8186df644 100644--- a/backend/pkg/utils/notifications/ntfy_sender.go+++ b/backend/pkg/utils/notifications/ntfy_sender.go@@ -7,7 +7,7 @@ import ("net/url""strings"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr"shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types")diff --git a/backend/pkg/utils/notifications/ntfy_sender_test.go b/backend/pkg/utils/notifications/ntfy_sender_test.goindex 295299b3e..6c0c5a448 100644--- a/backend/pkg/utils/notifications/ntfy_sender_test.go+++ b/backend/pkg/utils/notifications/ntfy_sender_test.go@@ -3,7 +3,7 @@ package notificationsimport ("testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/pushover_sender.go b/backend/pkg/utils/notifications/pushover_sender.goindex 72faaf613..cabff16ea 100644--- a/backend/pkg/utils/notifications/pushover_sender.go+++ b/backend/pkg/utils/notifications/pushover_sender.go@@ -8,7 +8,7 @@ import ("strconv""strings"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr")diff --git a/backend/pkg/utils/notifications/pushover_sender_test.go b/backend/pkg/utils/notifications/pushover_sender_test.goindex 0be24faa9..e47e26758 100644--- a/backend/pkg/utils/notifications/pushover_sender_test.go+++ b/backend/pkg/utils/notifications/pushover_sender_test.go@@ -4,7 +4,7 @@ import ("net/url""testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/signal_sender.go b/backend/pkg/utils/notifications/signal_sender.goindex 10d37dd80..01d13f30c 100644--- a/backend/pkg/utils/notifications/signal_sender.go+++ b/backend/pkg/utils/notifications/signal_sender.go@@ -5,7 +5,7 @@ import ("errors""fmt"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr""github.com/nicholas-fedor/shoutrrr/pkg/services/chat/signal")diff --git a/backend/pkg/utils/notifications/signal_sender_test.go b/backend/pkg/utils/notifications/signal_sender_test.goindex 05b4ed293..7cbf05661 100644--- a/backend/pkg/utils/notifications/signal_sender_test.go+++ b/backend/pkg/utils/notifications/signal_sender_test.go@@ -4,7 +4,7 @@ import ("fmt""testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/slack_sender.go b/backend/pkg/utils/notifications/slack_sender.goindex 6c844fcff..a7a743b00 100644--- a/backend/pkg/utils/notifications/slack_sender.go+++ b/backend/pkg/utils/notifications/slack_sender.go@@ -5,7 +5,7 @@ import ("errors""fmt"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr""github.com/nicholas-fedor/shoutrrr/pkg/services/chat/slack")diff --git a/backend/pkg/utils/notifications/slack_sender_test.go b/backend/pkg/utils/notifications/slack_sender_test.goindex 5890121ce..f5cdfea5a 100644--- a/backend/pkg/utils/notifications/slack_sender_test.go+++ b/backend/pkg/utils/notifications/slack_sender_test.go@@ -3,7 +3,7 @@ package notificationsimport ("testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/backend/pkg/utils/notifications/telegram_sender.go b/backend/pkg/utils/notifications/telegram_sender.goindex be58243a6..466f0b470 100644--- a/backend/pkg/utils/notifications/telegram_sender.go+++ b/backend/pkg/utils/notifications/telegram_sender.go@@ -5,7 +5,7 @@ import ("errors""fmt"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/nicholas-fedor/shoutrrr""github.com/nicholas-fedor/shoutrrr/pkg/services/chat/telegram")diff --git a/backend/pkg/utils/notifications/telegram_sender_test.go b/backend/pkg/utils/notifications/telegram_sender_test.goindex dd0098882..b307e7511 100644--- a/backend/pkg/utils/notifications/telegram_sender_test.go+++ b/backend/pkg/utils/notifications/telegram_sender_test.go@@ -3,7 +3,7 @@ package notificationsimport ("testing"- "github.com/getarcaneapp/arcane/backend/internal/models"+ "github.com/getarcaneapp/arcane/backend/v2/internal/models""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/cli/README.md b/cli/README.mdindex 3edae7308..f535b7d22 100644--- a/cli/README.md+++ b/cli/README.md@@ -3,8 +3,8 @@<img src="../.github/assets/img/PNG-3.png" alt="Arcane Logo" width="500" /><p>The Official Command Line Client</p>-<a href="https://pkg.go.dev/github.com/getarcaneapp/arcane/cli"><img src="https://pkg.go.dev/badge/github.com/getarcaneapp/arcane/cli.svg" alt="Go Reference"></a>-<a href="https://goreportcard.com/report/github.com/getarcaneapp/arcane/cli"><img src="https://goreportcard.com/badge/github.com/getarcaneapp/arcane/cli" alt="Go Report Card"></a>+<a href="https://pkg.go.dev/github.com/getarcaneapp/arcane/cli/v2"><img src="https://pkg.go.dev/badge/github.com/getarcaneapp/arcane/cli/v2.svg" alt="Go Reference"></a>+<a href="https://goreportcard.com/report/github.com/getarcaneapp/arcane/cli/v2"><img src="https://goreportcard.com/badge/github.com/getarcaneapp/arcane/cli/v2" alt="Go Report Card"></a><a href="https://github.com/getarcaneapp/cli/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-BSD--3--Clause-blue.svg" alt="License"></a><br />@@ -15,13 +15,13 @@This module lives inside the main Arcane repo. To build the CLI locally:-- `go install github.com/getarcaneapp/arcane/cli@latest`+- `go install github.com/getarcaneapp/arcane/cli/v2@latest`## VersionsCLI versions are tagged as `cli/vX.Y.Z` in the main repo. Use module tags to pin a specific release:-- `go install github.com/getarcaneapp/arcane/cli@cli/vX.Y.Z`+- `go install github.com/getarcaneapp/arcane/cli/v2@cli/vX.Y.Z`## Configurediff --git a/cli/go.mod b/cli/go.modindex 06d9b002a..f71c1cc6f 100644--- a/cli/go.mod+++ b/cli/go.mod@@ -1,4 +1,4 @@-module github.com/getarcaneapp/arcane/cli+module github.com/getarcaneapp/arcane/cli/v2go 1.26.4@@ -10,7 +10,7 @@ require (charm.land/log/v2 v2.0.0github.com/charmbracelet/x/term v0.2.2github.com/fatih/color v1.19.0- github.com/getarcaneapp/arcane/types v1.19.5+ github.com/getarcaneapp/arcane/types/v2 v2.0.0github.com/go-viper/mapstructure/v2 v2.5.0github.com/mattn/go-runewidth v0.0.23github.com/spf13/cobra v1.10.2diff --git a/cli/go.sum b/cli/go.sumindex d89cf1f2d..ab3b145b2 100644--- a/cli/go.sum+++ b/cli/go.sum@@ -61,8 +61,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkgithub.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=-github.com/getarcaneapp/arcane/types v1.19.5 h1:NmdBfeQhJ+OETxnk2crN82DfQJ3DTbruWLZSq/JkE1c=-github.com/getarcaneapp/arcane/types v1.19.5/go.mod h1:Ts4t4KmeMu5S1Qc5Mg9qjvYft9O3EYnlfEzSi+9GNKE=github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE=github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk=github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=@@ -157,7 +155,9 @@ go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOgo.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=+go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=+go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=go.withmatt.com/size v0.0.0-20250220224316-11aee5773e67 h1:nHPqmzoLZv+9OqER7S2oXnIBDAbIaIKKrVtNtDvJzjc=diff --git a/cli/internal/benchmark/baseline_benchmark_test.go b/cli/internal/benchmark/baseline_benchmark_test.goindex 2a84a41f5..2e533cc03 100644--- a/cli/internal/benchmark/baseline_benchmark_test.go+++ b/cli/internal/benchmark/baseline_benchmark_test.go@@ -8,8 +8,8 @@ import ("net/http/httptest""testing"- "github.com/getarcaneapp/arcane/cli/internal/client"- clitypes "github.com/getarcaneapp/arcane/cli/internal/types"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types")func BenchmarkClientListMediumPayload(b *testing.B) {diff --git a/cli/internal/client/client.go b/cli/internal/client/client.goindex d875577bf..16a359800 100644--- a/cli/internal/client/client.go+++ b/cli/internal/client/client.go@@ -36,12 +36,12 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/cli/internal/config"- "github.com/getarcaneapp/arcane/cli/internal/logger"- "github.com/getarcaneapp/arcane/cli/internal/runstate"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/auth"- "github.com/getarcaneapp/arcane/types/base"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ "github.com/getarcaneapp/arcane/cli/v2/internal/logger"+ "github.com/getarcaneapp/arcane/cli/v2/internal/runstate"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/auth"+ "github.com/getarcaneapp/arcane/types/v2/base")const (diff --git a/cli/internal/client/client_test.go b/cli/internal/client/client_test.goindex e79b270d7..1710566a8 100644--- a/cli/internal/client/client_test.go+++ b/cli/internal/client/client_test.go@@ -7,7 +7,7 @@ import ("net/http/httptest""testing"- "github.com/getarcaneapp/arcane/cli/internal/types"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types")func TestClient_UsesAPIKeyHeader(t *testing.T) {diff --git a/cli/internal/client/retry_test.go b/cli/internal/client/retry_test.goindex 1b59c18e3..317d1bc11 100644--- a/cli/internal/client/retry_test.go+++ b/cli/internal/client/retry_test.go@@ -9,7 +9,7 @@ import ("testing""time"- "github.com/getarcaneapp/arcane/cli/internal/types"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types")func TestClient_RetriesIdempotentRequests(t *testing.T) {diff --git a/cli/internal/cmdutil/context.go b/cli/internal/cmdutil/context.goindex 3e6e140e6..216cbcd93 100644--- a/cli/internal/cmdutil/context.go+++ b/cli/internal/cmdutil/context.go@@ -5,8 +5,8 @@ import ("fmt""strings"- "github.com/getarcaneapp/arcane/cli/internal/client"- runtimectx "github.com/getarcaneapp/arcane/cli/internal/runtime"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ runtimectx "github.com/getarcaneapp/arcane/cli/v2/internal/runtime""github.com/spf13/cobra")diff --git a/cli/internal/cmdutil/limit.go b/cli/internal/cmdutil/limit.goindex f0894791e..aff663229 100644--- a/cli/internal/cmdutil/limit.go+++ b/cli/internal/cmdutil/limit.go@@ -4,9 +4,9 @@ import ("strconv""strings"- "github.com/getarcaneapp/arcane/cli/internal/config"- runtimectx "github.com/getarcaneapp/arcane/cli/internal/runtime"- clitypes "github.com/getarcaneapp/arcane/cli/internal/types"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ runtimectx "github.com/getarcaneapp/arcane/cli/v2/internal/runtime"+ clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types""github.com/spf13/cobra")diff --git a/cli/internal/config/config.go b/cli/internal/config/config.goindex e7379cec6..29e082912 100644--- a/cli/internal/config/config.go+++ b/cli/internal/config/config.go@@ -17,7 +17,7 @@//// Version and Revision variables are set at build time via ldflags://-// go build -ldflags "-X github.com/getarcaneapp/arcane/cli/internal/config.Version=1.0.0"+// go build -ldflags "-X github.com/getarcaneapp/arcane/cli/v2/internal/config.Version=1.0.0"package configimport (@@ -28,7 +28,7 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/cli/internal/types"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types""github.com/go-viper/mapstructure/v2""github.com/spf13/viper")diff --git a/cli/internal/integrationtest/command_helpers_test.go b/cli/internal/integrationtest/command_helpers_test.goindex dbb623d48..08b936d2b 100644--- a/cli/internal/integrationtest/command_helpers_test.go+++ b/cli/internal/integrationtest/command_helpers_test.go@@ -9,7 +9,7 @@ import ("sync""testing"- clipkg "github.com/getarcaneapp/arcane/cli/pkg"+ clipkg "github.com/getarcaneapp/arcane/cli/v2/pkg""github.com/spf13/cobra""github.com/spf13/pflag")diff --git a/cli/internal/runtime/context.go b/cli/internal/runtime/context.goindex 9c0aaa2e4..12b15e91f 100644--- a/cli/internal/runtime/context.go+++ b/cli/internal/runtime/context.go@@ -7,9 +7,9 @@ import ("sync""time"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/config"- clitypes "github.com/getarcaneapp/arcane/cli/internal/types"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types")type contextKey stringdiff --git a/cli/main.go b/cli/main.goindex 7966b2396..f885a9e0a 100644--- a/cli/main.go+++ b/cli/main.go@@ -1,6 +1,6 @@package main-import cli "github.com/getarcaneapp/arcane/cli/pkg"+import cli "github.com/getarcaneapp/arcane/cli/v2/pkg"func main() {cli.Execute()diff --git a/cli/pkg/admin/apikeys/cmd.go b/cli/pkg/admin/apikeys/cmd.goindex 3d44fc151..c40f88410 100644--- a/cli/pkg/admin/apikeys/cmd.go+++ b/cli/pkg/admin/apikeys/cmd.go@@ -7,11 +7,11 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/apikey"- "github.com/getarcaneapp/arcane/types/base"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/apikey"+ "github.com/getarcaneapp/arcane/types/v2/base""github.com/spf13/cobra")diff --git a/cli/pkg/admin/cmd.go b/cli/pkg/admin/cmd.goindex 43339b73e..0c00dc78d 100644--- a/cli/pkg/admin/cmd.go+++ b/cli/pkg/admin/cmd.go@@ -1,12 +1,12 @@package adminimport (- "github.com/getarcaneapp/arcane/cli/pkg/admin/apikeys"- "github.com/getarcaneapp/arcane/cli/pkg/admin/events"- "github.com/getarcaneapp/arcane/cli/pkg/admin/notifications"- "github.com/getarcaneapp/arcane/cli/pkg/admin/oidcmappings"- "github.com/getarcaneapp/arcane/cli/pkg/admin/roles"- "github.com/getarcaneapp/arcane/cli/pkg/admin/users"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/admin/apikeys"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/admin/events"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/admin/notifications"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/admin/oidcmappings"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/admin/roles"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/admin/users""github.com/spf13/cobra")diff --git a/cli/pkg/admin/events/cmd.go b/cli/pkg/admin/events/cmd.goindex 42bab6f22..6e4e193aa 100644--- a/cli/pkg/admin/events/cmd.go+++ b/cli/pkg/admin/events/cmd.go@@ -4,12 +4,12 @@ import ("encoding/json""fmt"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/event"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/event""github.com/spf13/cobra")diff --git a/cli/pkg/admin/notifications/cmd.go b/cli/pkg/admin/notifications/cmd.goindex 5d1290949..4ab12f42c 100644--- a/cli/pkg/admin/notifications/cmd.go+++ b/cli/pkg/admin/notifications/cmd.go@@ -5,12 +5,12 @@ import ("fmt""strconv"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/notification"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/notification""github.com/spf13/cobra")diff --git a/cli/pkg/admin/oidcmappings/cmd.go b/cli/pkg/admin/oidcmappings/cmd.goindex b3e699f06..647b9d157 100644--- a/cli/pkg/admin/oidcmappings/cmd.go+++ b/cli/pkg/admin/oidcmappings/cmd.go@@ -6,11 +6,11 @@ package oidcmappingsimport ("fmt"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- roletypes "github.com/getarcaneapp/arcane/types/role"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ roletypes "github.com/getarcaneapp/arcane/types/v2/role""github.com/spf13/cobra")diff --git a/cli/pkg/admin/roles/cmd.go b/cli/pkg/admin/roles/cmd.goindex 0336da350..b789d4050 100644--- a/cli/pkg/admin/roles/cmd.go+++ b/cli/pkg/admin/roles/cmd.go@@ -11,11 +11,11 @@ import ("strconv""strings"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- roletypes "github.com/getarcaneapp/arcane/types/role"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ roletypes "github.com/getarcaneapp/arcane/types/v2/role""github.com/spf13/cobra")diff --git a/cli/pkg/admin/users/cmd.go b/cli/pkg/admin/users/cmd.goindex 7683c7b8a..b6062ac97 100644--- a/cli/pkg/admin/users/cmd.go+++ b/cli/pkg/admin/users/cmd.go@@ -7,12 +7,12 @@ import ("strings""github.com/charmbracelet/x/term"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/user"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/user""github.com/spf13/cobra")diff --git a/cli/pkg/auth/cmd.go b/cli/pkg/auth/cmd.goindex 83c62468e..b50524745 100644--- a/cli/pkg/auth/cmd.go+++ b/cli/pkg/auth/cmd.go@@ -11,12 +11,12 @@ import ("time""github.com/charmbracelet/x/term"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/config"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/auth"- "github.com/getarcaneapp/arcane/types/base"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/auth"+ "github.com/getarcaneapp/arcane/types/v2/base""github.com/spf13/cobra")diff --git a/cli/pkg/auth/federated.go b/cli/pkg/auth/federated.goindex 4f4f20b23..b0818f469 100644--- a/cli/pkg/auth/federated.go+++ b/cli/pkg/auth/federated.go@@ -11,13 +11,13 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/cli/internal/ci"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/config"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- federatedtypes "github.com/getarcaneapp/arcane/types/federated"+ "github.com/getarcaneapp/arcane/cli/v2/internal/ci"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated""github.com/spf13/cobra")diff --git a/cli/pkg/config/cmd.go b/cli/pkg/config/cmd.goindex 6f541bc2a..c29b4e52d 100644--- a/cli/pkg/config/cmd.go+++ b/cli/pkg/config/cmd.go@@ -11,8 +11,8 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/cli/internal/config"- clitypes "github.com/getarcaneapp/arcane/cli/internal/types"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types""github.com/spf13/cobra")diff --git a/cli/pkg/config/cmd_test.go b/cli/pkg/config/cmd_test.goindex 587f4c6c9..211d0476c 100644--- a/cli/pkg/config/cmd_test.go+++ b/cli/pkg/config/cmd_test.go@@ -4,7 +4,7 @@ import ("strings""testing"- clitypes "github.com/getarcaneapp/arcane/cli/internal/types"+ clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types")func TestApplyConfigSetArgs(t *testing.T) {diff --git a/cli/pkg/containers/cmd.go b/cli/pkg/containers/cmd.goindex 642b96cc2..1f19daadc 100644--- a/cli/pkg/containers/cmd.go+++ b/cli/pkg/containers/cmd.go@@ -12,13 +12,13 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/container"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/container""github.com/spf13/cobra")diff --git a/cli/pkg/doctor/cmd.go b/cli/pkg/doctor/cmd.goindex e66824a6b..9f408dd12 100644--- a/cli/pkg/doctor/cmd.go+++ b/cli/pkg/doctor/cmd.go@@ -6,9 +6,9 @@ import ("fmt""strings"- "github.com/getarcaneapp/arcane/cli/internal/config"- "github.com/getarcaneapp/arcane/cli/internal/output"- runtimectx "github.com/getarcaneapp/arcane/cli/internal/runtime"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ runtimectx "github.com/getarcaneapp/arcane/cli/v2/internal/runtime""github.com/spf13/cobra")diff --git a/cli/pkg/environments/cmd.go b/cli/pkg/environments/cmd.goindex 6ff715618..31c19986c 100644--- a/cli/pkg/environments/cmd.go+++ b/cli/pkg/environments/cmd.go@@ -9,14 +9,14 @@ import ("strings""charm.land/lipgloss/v2"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/config"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/environment"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/environment""github.com/spf13/cobra")diff --git a/cli/pkg/generate/api_key_test.go b/cli/pkg/generate/api_key_test.goindex 0c7fec83c..e8d57f531 100644--- a/cli/pkg/generate/api_key_test.go+++ b/cli/pkg/generate/api_key_test.go@@ -4,7 +4,7 @@ import ("strings""testing"- gen "github.com/getarcaneapp/arcane/cli/pkg/generate"+ gen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate")func TestAPIKeyDefaultOutput(t *testing.T) {diff --git a/cli/pkg/generate/certs_test.go b/cli/pkg/generate/certs_test.goindex 4d5d6ed1c..b47e53e1c 100644--- a/cli/pkg/generate/certs_test.go+++ b/cli/pkg/generate/certs_test.go@@ -10,7 +10,7 @@ import ("path/filepath""testing"- gen "github.com/getarcaneapp/arcane/cli/pkg/generate"+ gen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate")func TestGenerateMTLSCommandWritesECDSAP384Assets(t *testing.T) {diff --git a/cli/pkg/generate/secret_test.go b/cli/pkg/generate/secret_test.goindex 37cf2b509..2eb5f245e 100644--- a/cli/pkg/generate/secret_test.go+++ b/cli/pkg/generate/secret_test.go@@ -9,7 +9,7 @@ import ("strings""testing"- gen "github.com/getarcaneapp/arcane/cli/pkg/generate"+ gen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate")// captureOutput captures stdout produced by fn and returns it as a string.diff --git a/cli/pkg/gitops/cmd.go b/cli/pkg/gitops/cmd.goindex 59d7068d6..2d4351327 100644--- a/cli/pkg/gitops/cmd.go+++ b/cli/pkg/gitops/cmd.go@@ -10,13 +10,13 @@ import ("net/url""strings"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/gitops"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/gitops""github.com/spf13/cobra")diff --git a/cli/pkg/images/cmd.go b/cli/pkg/images/cmd.goindex 7ede2f47b..e8699c570 100644--- a/cli/pkg/images/cmd.go+++ b/cli/pkg/images/cmd.go@@ -46,14 +46,14 @@ import ("time""github.com/fatih/color"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/logger"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/cli/pkg/images/updates"- "github.com/getarcaneapp/arcane/types/image"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/logger"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/images/updates"+ "github.com/getarcaneapp/arcane/types/v2/image""github.com/spf13/cobra""go.withmatt.com/size")diff --git a/cli/pkg/images/updates/cmd.go b/cli/pkg/images/updates/cmd.goindex 65544d61d..5faaa1319 100644--- a/cli/pkg/images/updates/cmd.go+++ b/cli/pkg/images/updates/cmd.go@@ -5,11 +5,11 @@ import ("fmt""strconv"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/imageupdate"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate""github.com/spf13/cobra")diff --git a/cli/pkg/jobs/cmd.go b/cli/pkg/jobs/cmd.goindex d3b9f3737..bee51341d 100644--- a/cli/pkg/jobs/cmd.go+++ b/cli/pkg/jobs/cmd.go@@ -5,12 +5,12 @@ import ("errors""fmt"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/jobschedule"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/jobschedule""github.com/spf13/cobra")diff --git a/cli/pkg/networks/cmd.go b/cli/pkg/networks/cmd.goindex e92459e0f..89a982ceb 100644--- a/cli/pkg/networks/cmd.go+++ b/cli/pkg/networks/cmd.go@@ -10,13 +10,13 @@ import ("net/url""strings"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/network"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/network""github.com/spf13/cobra")diff --git a/cli/pkg/projects/cmd.go b/cli/pkg/projects/cmd.goindex 9c1eccbe6..df437e2af 100644--- a/cli/pkg/projects/cmd.go+++ b/cli/pkg/projects/cmd.go@@ -14,13 +14,13 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/project"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/project""github.com/spf13/cobra")diff --git a/cli/pkg/registries/cmd.go b/cli/pkg/registries/cmd.goindex 464bfbf1f..496a17fb1 100644--- a/cli/pkg/registries/cmd.go+++ b/cli/pkg/registries/cmd.go@@ -5,12 +5,12 @@ import ("errors""fmt"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/containerregistry"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry""github.com/spf13/cobra")diff --git a/cli/pkg/repos/cmd.go b/cli/pkg/repos/cmd.goindex 058874a51..82b55b2a5 100644--- a/cli/pkg/repos/cmd.go+++ b/cli/pkg/repos/cmd.go@@ -12,13 +12,13 @@ import ("strconv""strings"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/gitops"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/gitops""github.com/spf13/cobra")diff --git a/cli/pkg/root.go b/cli/pkg/root.goindex 97c4e71e5..cf42db19b 100644--- a/cli/pkg/root.go+++ b/cli/pkg/root.go@@ -41,33 +41,33 @@ import ("charm.land/fang/v2""charm.land/lipgloss/v2""github.com/fatih/color"- "github.com/getarcaneapp/arcane/cli/internal/config"- "github.com/getarcaneapp/arcane/cli/internal/logger"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/runstate"- runtimectx "github.com/getarcaneapp/arcane/cli/internal/runtime"- "github.com/getarcaneapp/arcane/cli/pkg/admin"- "github.com/getarcaneapp/arcane/cli/pkg/auth"- "github.com/getarcaneapp/arcane/cli/pkg/completion"- configClient "github.com/getarcaneapp/arcane/cli/pkg/config"- "github.com/getarcaneapp/arcane/cli/pkg/containers"- "github.com/getarcaneapp/arcane/cli/pkg/doctor"- "github.com/getarcaneapp/arcane/cli/pkg/environments"- "github.com/getarcaneapp/arcane/cli/pkg/generate"- "github.com/getarcaneapp/arcane/cli/pkg/gitops"- "github.com/getarcaneapp/arcane/cli/pkg/images"- "github.com/getarcaneapp/arcane/cli/pkg/jobs"- "github.com/getarcaneapp/arcane/cli/pkg/networks"- "github.com/getarcaneapp/arcane/cli/pkg/projects"- "github.com/getarcaneapp/arcane/cli/pkg/registries"- "github.com/getarcaneapp/arcane/cli/pkg/repos"- "github.com/getarcaneapp/arcane/cli/pkg/selfupdate"- "github.com/getarcaneapp/arcane/cli/pkg/settings"- "github.com/getarcaneapp/arcane/cli/pkg/system"- "github.com/getarcaneapp/arcane/cli/pkg/templates"- "github.com/getarcaneapp/arcane/cli/pkg/updater"- "github.com/getarcaneapp/arcane/cli/pkg/version"- "github.com/getarcaneapp/arcane/cli/pkg/volumes"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ "github.com/getarcaneapp/arcane/cli/v2/internal/logger"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/runstate"+ runtimectx "github.com/getarcaneapp/arcane/cli/v2/internal/runtime"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/admin"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/auth"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/completion"+ configClient "github.com/getarcaneapp/arcane/cli/v2/pkg/config"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/containers"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/doctor"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/environments"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/gitops"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/images"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/jobs"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/networks"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/projects"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/registries"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/repos"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/selfupdate"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/settings"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/system"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/templates"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/updater"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/version"+ "github.com/getarcaneapp/arcane/cli/v2/pkg/volumes""github.com/spf13/cobra")diff --git a/cli/pkg/selfupdate/cmd.go b/cli/pkg/selfupdate/cmd.goindex 50703f131..602bc7583 100644--- a/cli/pkg/selfupdate/cmd.go+++ b/cli/pkg/selfupdate/cmd.go@@ -19,8 +19,8 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/cli/internal/config"- "github.com/getarcaneapp/arcane/cli/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/config"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output""github.com/spf13/cobra")diff --git a/cli/pkg/settings/cmd.go b/cli/pkg/settings/cmd.goindex 88f593789..50e07edc8 100644--- a/cli/pkg/settings/cmd.go+++ b/cli/pkg/settings/cmd.go@@ -5,11 +5,11 @@ import ("fmt""os"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/settings"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/settings""github.com/spf13/cobra")diff --git a/cli/pkg/system/cmd.go b/cli/pkg/system/cmd.goindex 23700fbf9..a870c521c 100644--- a/cli/pkg/system/cmd.go+++ b/cli/pkg/system/cmd.go@@ -5,13 +5,13 @@ import ("fmt""strconv"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/dockerinfo"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/dockerinfo"+ "github.com/getarcaneapp/arcane/types/v2/system""github.com/spf13/cobra")diff --git a/cli/pkg/templates/cmd.go b/cli/pkg/templates/cmd.goindex 6c51cd390..3b470b195 100644--- a/cli/pkg/templates/cmd.go+++ b/cli/pkg/templates/cmd.go@@ -14,14 +14,14 @@ import ("strings""unicode"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/env"- "github.com/getarcaneapp/arcane/types/template"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/env"+ "github.com/getarcaneapp/arcane/types/v2/template""github.com/spf13/cobra")diff --git a/cli/pkg/updater/cmd.go b/cli/pkg/updater/cmd.goindex f13aee0aa..af06eaa0c 100644--- a/cli/pkg/updater/cmd.go+++ b/cli/pkg/updater/cmd.go@@ -6,11 +6,11 @@ import ("strconv""time"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/updater"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/updater""github.com/spf13/cobra")diff --git a/cli/pkg/version/cmd.go b/cli/pkg/version/cmd.goindex 570b0ea5b..a7d57f9a3 100644--- a/cli/pkg/version/cmd.go+++ b/cli/pkg/version/cmd.go@@ -5,12 +5,12 @@ import ("fmt""io"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/logger"- "github.com/getarcaneapp/arcane/cli/internal/output"- clitypes "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/version"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/logger"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/version""github.com/spf13/cobra")diff --git a/cli/pkg/volumes/cmd.go b/cli/pkg/volumes/cmd.goindex 809fc4fce..5d2024325 100644--- a/cli/pkg/volumes/cmd.go+++ b/cli/pkg/volumes/cmd.go@@ -10,13 +10,13 @@ import ("net/url""strings"- "github.com/getarcaneapp/arcane/cli/internal/client"- "github.com/getarcaneapp/arcane/cli/internal/cmdutil"- "github.com/getarcaneapp/arcane/cli/internal/output"- "github.com/getarcaneapp/arcane/cli/internal/prompt"- "github.com/getarcaneapp/arcane/cli/internal/types"- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/volume"+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"+ "github.com/getarcaneapp/arcane/cli/v2/internal/prompt"+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/volume""github.com/spf13/cobra")diff --git a/types/auth/auth.go b/types/auth/auth.goindex 684c4f116..4fa8ce446 100644--- a/types/auth/auth.go+++ b/types/auth/auth.go@@ -3,7 +3,7 @@ package authimport ("time"- "github.com/getarcaneapp/arcane/types/user"+ "github.com/getarcaneapp/arcane/types/v2/user")// Login represents the login request body.diff --git a/types/auth/oidc.go b/types/auth/oidc.goindex 83a210267..fbd02538b 100644--- a/types/auth/oidc.go+++ b/types/auth/oidc.go@@ -3,7 +3,7 @@ package authimport ("time"- "github.com/getarcaneapp/arcane/types/user"+ "github.com/getarcaneapp/arcane/types/v2/user")// OidcUserInfo represents user information retrieved from an OIDC provider.diff --git a/types/builds/builds.go b/types/builds/builds.goindex 37236460a..3815ca9df 100644--- a/types/builds/builds.go+++ b/types/builds/builds.go@@ -4,7 +4,7 @@ import ("context""io"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"dockerregistry "github.com/moby/moby/api/types/registry"dockerclient "github.com/moby/moby/client")diff --git a/types/category/category.go b/types/category/category.goindex 2d1a3ae5a..815e975cd 100644--- a/types/category/category.go+++ b/types/category/category.go@@ -1,6 +1,6 @@package category-import "github.com/getarcaneapp/arcane/types/meta"+import "github.com/getarcaneapp/arcane/types/v2/meta"// Category represents a category with associated metadata and settings.type Category struct {diff --git a/types/container/container.go b/types/container/container.goindex f0f3a5df8..f5d952dc6 100644--- a/types/container/container.go+++ b/types/container/container.go@@ -6,8 +6,8 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/types/containerregistry"- imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/network")diff --git a/types/dashboard/dashboard.go b/types/dashboard/dashboard.goindex fb5a71bde..a8f900aa9 100644--- a/types/dashboard/dashboard.go+++ b/types/dashboard/dashboard.go@@ -1,10 +1,10 @@package dashboardimport (- "github.com/getarcaneapp/arcane/types/base"- containertypes "github.com/getarcaneapp/arcane/types/container"- imagetypes "github.com/getarcaneapp/arcane/types/image"- versiontypes "github.com/getarcaneapp/arcane/types/version"+ "github.com/getarcaneapp/arcane/types/v2/base"+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"+ versiontypes "github.com/getarcaneapp/arcane/types/v2/version"dockercontainer "github.com/moby/moby/api/types/container"dockerimage "github.com/moby/moby/api/types/image"dockernetwork "github.com/moby/moby/api/types/network"diff --git a/types/go.mod b/types/go.modindex b236d69bf..877ab5ff3 100644--- a/types/go.mod+++ b/types/go.mod@@ -1,4 +1,4 @@-module github.com/getarcaneapp/arcane/types+module github.com/getarcaneapp/arcane/types/v2go 1.26.4diff --git a/types/go.sum b/types/go.sumindex ca6da9b27..8d3c6207f 100644--- a/types/go.sum+++ b/types/go.sum@@ -52,11 +52,17 @@ github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXgo.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo=+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0/go.mod h1:z9+yiacE0IHRqM4qFfkbt/JYlmYXgss8GY/jXoNuPJI=go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=+go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=+go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=+go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=+go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=+go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=diff --git a/types/image/image.go b/types/image/image.goindex 86c53b098..931529118 100644--- a/types/image/image.go+++ b/types/image/image.go@@ -5,8 +5,8 @@ import ("strings""time"- "github.com/getarcaneapp/arcane/types/containerregistry"- "github.com/getarcaneapp/arcane/types/vulnerability"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"+ "github.com/getarcaneapp/arcane/types/v2/vulnerability""github.com/moby/moby/api/types/image")diff --git a/types/imageupdate/image_update.go b/types/imageupdate/image_update.goindex 2991711b8..b15ee4ae3 100644--- a/types/imageupdate/image_update.go+++ b/types/imageupdate/image_update.go@@ -3,7 +3,7 @@ package imageupdateimport ("time"- "github.com/getarcaneapp/arcane/types/containerregistry"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry")type Response struct {diff --git a/types/meta/job_metadata.go b/types/meta/job_metadata.goindex d333839a7..ded0b650f 100644--- a/types/meta/job_metadata.go+++ b/types/meta/job_metadata.go@@ -3,7 +3,7 @@ package metaimport ("time"- "github.com/getarcaneapp/arcane/types/jobschedule"+ "github.com/getarcaneapp/arcane/types/v2/jobschedule")type JobMetadata struct {diff --git a/types/notification/notification.go b/types/notification/notification.goindex 7e8d5c1cb..02d00ea05 100644--- a/types/notification/notification.go+++ b/types/notification/notification.go@@ -1,9 +1,9 @@package notificationimport (- "github.com/getarcaneapp/arcane/types/base"- "github.com/getarcaneapp/arcane/types/imageupdate"- "github.com/getarcaneapp/arcane/types/system"+ "github.com/getarcaneapp/arcane/types/v2/base"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"+ "github.com/getarcaneapp/arcane/types/v2/system")// Provider is the type for notification provider identifiers.diff --git a/types/project/project.go b/types/project/project.goindex 7b040788a..08dba0d0a 100644--- a/types/project/project.go+++ b/types/project/project.go@@ -4,7 +4,7 @@ import ("time"composetypes "github.com/compose-spec/compose-go/v2/types"- "github.com/getarcaneapp/arcane/types/containerregistry"+ "github.com/getarcaneapp/arcane/types/v2/containerregistry")// IncludeFile represents an included file within a project.diff --git a/types/search/search.go b/types/search/search.goindex d5daca4e9..534eb0170 100644--- a/types/search/search.go+++ b/types/search/search.go@@ -1,6 +1,6 @@package search-import "github.com/getarcaneapp/arcane/types/category"+import "github.com/getarcaneapp/arcane/types/v2/category"// Request represents a search request.type Request struct {diff --git a/types/template/template.go b/types/template/template.goindex 4d7a34f9b..c0910185c 100644--- a/types/template/template.go+++ b/types/template/template.go@@ -1,8 +1,8 @@package templateimport (- "github.com/getarcaneapp/arcane/types/env"- "github.com/getarcaneapp/arcane/types/meta"+ "github.com/getarcaneapp/arcane/types/v2/env"+ "github.com/getarcaneapp/arcane/types/v2/meta")// BaseTemplate contains common fields shared by all template types.