Skip to content

Modern Docker Management, Designed for Everyone

chore: update linter config and formatting

Kyle Mendell3ca02a3e2eae
diff --git a/.depot/workflows/build-next-images.yml b/.depot/workflows/build-next-images.yml
index 1caa8c665..0b6760de9 100644
--- a/.depot/workflows/build-next-images.yml
+++ b/.depot/workflows/build-next-images.yml
@@ -30,7 +30,7 @@ jobs:
- name: Compute next image version
id: next-version
- run: just next-image-version github-output
+ run: just release version github-output
build-next-images:
needs: next-version
diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 000000000..fad6f7578
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,144 @@
+# Slightly Modified Version docker's golangci lint configuration to fit my project standards
+version: "2"
+
+run:
+ go: "1.27.1"
+ build-tags:
+ - exclude_frontend
+ - playwright
+ timeout: 5m
+
+issues:
+ max-issues-per-linter: 0
+ max-same-issues: 0
+
+formatters:
+ enable:
+ - gci
+ - gofumpt
+ exclusions:
+ generated: lax
+ paths:
+ - third_party$
+ - builtin$
+ - examples$
+ settings:
+ gci:
+ sections:
+ # Include Go 1.27 packages missing from gci's built-in standard-library list.
+ - prefix(arena,archive/,bufio,bytes,cmp,compress/,container/,context,crypto,database/,debug/,embed,encoding,errors,expvar,flag,fmt,go/,hash,html,image,index/,io,iter,log,maps,math,mime,net,os,path,plugin,reflect,regexp,runtime,slices,sort,strconv,strings,structs,sync,syscall,testing,text/,time,unicode,unique,unsafe,uuid,weak)
+ - default
+ - localmodule
+ custom-order: true
+ gofumpt:
+ extra:
+ group-params: true
+ clothe-returns: true
+ balance-calls: true
+
+linters:
+ default: none
+ enable:
+ - copyloopvar
+ - depguard
+ - errcheck
+ - errorlint
+ - forbidigo
+ - gocognit
+ - gocritic
+ - gomodguard_v2
+ - govet
+ - ineffassign
+ - lll
+ - misspell
+ - nakedret
+ - nolintlint
+ - perfsprint
+ - revive
+ - staticcheck
+ - testifylint
+ - unconvert
+ - unparam
+ - unused
+
+ disable:
+ - gocyclo
+
+ settings:
+ depguard:
+ rules:
+ main:
+ deny:
+ - pkg: io/ioutil
+ desc: io/ioutil package has been deprecated
+ - pkg: github.com/docker/docker/errdefs
+ desc: use github.com/containerd/errdefs instead.
+ - pkg: golang.org/x/exp/maps
+ desc: use stdlib maps package
+ - pkg: golang.org/x/exp/slices
+ desc: use stdlib slices package
+ - pkg: "github.com/google/uuid"
+ desc: Use stdlib uuid instead.
+ - pkg: "gopkg.in/yaml.v3"
+ desc: Use go.yaml.in/yaml/v4 instead.
+ - pkg: github.com/stretchr/testify/assert
+ desc: Use "gotest.tools/v3/assert" instead
+ - pkg: github.com/stretchr/testify/require
+ desc: Use "gotest.tools/v3/assert" instead
+ - pkg: github.com/stretchr/testify/suite
+ desc: Do not use
+
+ forbidigo:
+ analyze-types: true
+ forbid:
+ - pattern: 'context\.Background'
+ pkg: "^context$"
+ msg: "in tests, use t.Context() instead of context.Background()"
+ - pattern: 'context\.TODO'
+ pkg: "^context$"
+ msg: "in tests, use t.Context() instead of context.TODO()"
+
+ gocritic:
+ disabled-checks:
+ - paramTypeCombine
+ - unnamedResult
+ - whyNoLint
+ enabled-tags:
+ - diagnostic
+ - opinionated
+ - style
+
+ gocognit:
+ min-complexity: 40
+
+ lll:
+ line-length: 200
+
+ govet:
+ enable:
+ - shadow
+ settings:
+ shadow:
+ strict: true
+
+ grouper:
+ const-require-single-const: true
+
+ nakedret:
+ # Disallow naked returns if func has more lines of code than this setting.
+ # Default: 30
+ max-func-lines: 0
+
+ revive:
+ rules:
+ - name: package-comments
+ disabled: true
+
+ sloglint:
+ context: "all" # https://github.com/go-simpler/sloglint#context-only
+ kv-only: true # https://github.com/go-simpler/sloglint#key-value-pairs-only
+ static-msg: true # https://github.com/go-simpler/sloglint#static-message
+ key-naming-case: snake
+
+ exclusions:
+ generated: strict
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5a388a173..60928208c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,10 +20,10 @@ Thanks for helping make Arcane better! We've built a modern, streamlined develop
- **Docker & Docker Compose**
- **VS Code** based IDE (recommended for the best developer experience)
- **[Vite+](https://viteplus.dev)** (`curl -fsSL https://vite.plus | bash`) — manages the Node toolchain, formatting, linting, and pre-commit hooks when working outside Docker
-- **[goimports-reviser](https://github.com/incu6us/goimports-reviser) and [gofumpt](https://github.com/mvdan/gofumpt)** — required for Go import grouping and code formatting. Install both with Go:
+- **[gci](https://github.com/daixiang0/gci) and [gofumpt](https://github.com/mvdan/gofumpt)** — required for Go import grouping and code formatting. Install both with Go:
```bash
- go install github.com/incu6us/goimports-reviser/v3@latest
+ go install github.com/daixiang0/gci@latest
go install mvdan.cc/gofumpt@latest
```
diff --git a/Justfile b/Justfile
index 8a8d1c0c2..2d92caf64 100644
--- a/Justfile
+++ b/Justfile
@@ -7,6 +7,9 @@ set working-directory := './'
edge_proto_dir := 'backend/proto'
modules := './backend ./cli ./types'
+# Match the standard-library group in .golangci.yml until gci supports Go 1.27.
+go_stdlib_section := 'prefix(arena,archive/,bufio,bytes,cmp,compress/,container/,context,crypto,database/,debug/,embed,encoding,errors,expvar,flag,fmt,go/,hash,html,image,index/,io,iter,log,maps,math,mime,net,os,path,plugin,reflect,regexp,runtime,slices,sort,strconv,strings,structs,sync,syscall,testing,text/,time,unicode,unique,unsafe,uuid,weak)'
+
_default:
@just --list
@@ -15,17 +18,17 @@ _default:
# -----------------------------------------------------------------------------
# Run frontend dev server on port 3000
-[group('dev')]
-_dev-frontend:
+[group('development')]
+_dev_frontend:
vp -C frontend run dev
# Run backend with hot reload on port 3552
-[group('dev')]
-_dev-backend:
+[group('development')]
+_dev_backend:
cd backend && air
-[group('dev')]
-_dev-agent:
+[group('development')]
+_dev_agent:
#!/usr/bin/env bash
set -euo pipefail
@@ -63,8 +66,8 @@ _dev-agent:
ENCRYPTION_KEY="${encryption_key}" \
go run ./backend/cmd
-[group('dev')]
-_dev-all:
+[group('development')]
+_dev_all:
#!/usr/bin/env bash
set -euo pipefail
@@ -87,61 +90,19 @@ _dev-all:
wait "$frontend_pid"
# Rebuild Docker dev environment
-[group('dev')]
-_dev-docker:
+[group('development')]
+_dev_docker:
./scripts/development/dev.sh rebuild
# View Docker dev environment logs
-[group('dev')]
-_dev-logs:
+[group('development')]
+_dev_logs:
./scripts/development/dev.sh logs
# Run development servers. Valid targets: "frontend", "backend", "agent", "all", "docker", "logs".
-[group('dev')]
+[group('development')]
dev target="docker":
- @just "_dev-{{ target }}"
-
-# Generate a self-signed TLS cert + key for the local manager (used by the
-# backend HTTPS listener on :3552 and pinned as EDGE_MTLS_CA_FILE by the
-# local edge agent). Writes to backend/local-manager.{crt,key} with SANs for
-# localhost + 127.0.0.1. Both files are gitignored via *.crt / *.key.
-#
-# Usage:
-# just dev-tls # generate if missing
-
-# just dev-tls force=true # overwrite existing files
-[group('dev')]
-dev-tls force="false":
- #!/usr/bin/env bash
- set -euo pipefail
-
- cert_path="./backend/local-manager.crt"
- key_path="./backend/local-manager.key"
-
- if [ "{{ force }}" != "true" ] && [ -f "${cert_path}" ] && [ -f "${key_path}" ]; then
- echo "Cert already exists at ${cert_path}; pass force=true to regenerate."
- exit 0
- fi
-
- go run ./cli generate tls \
- --out-dir ./backend \
- --cert-name "$(basename "${cert_path}")" \
- --key-name "$(basename "${key_path}")" \
- --common-name arcane-local-manager \
- --host localhost \
- --host arcane-local \
- --host 127.0.0.1 \
- --host ::1
-
- echo ""
- echo "Generated self-signed TLS cert:"
- echo " cert: ${cert_path}"
- echo " key: ${key_path}"
- echo ""
- echo "Run the backend with HTTPS enabled:"
- echo " TLS_ENABLED=true TLS_CERT_FILE=${cert_path} TLS_KEY_FILE=${key_path} just dev backend"
- echo ""
- echo "The local edge agent recipe already pins this cert via EDGE_MTLS_CA_FILE."
+ @just "_dev_{{ target }}"
# -----------------------------------------------------------------------------
# Build
@@ -149,37 +110,35 @@ dev-tls force="false":
# Build the frontend
[group('build')]
-_build-frontend:
+_build_frontend:
vp -C frontend run build
# Build the backend
[group('build')]
-_build-backend:
+_build_backend:
cd backend && go build ./...
# Build both frontend and backend
[group('build')]
-_build-all:
- @just _build-frontend
- @just _build-backend
+_build_all:
+ @just _build_frontend
+ @just _build_backend
# Build manager container image
[group('build')]
-_build-image-manager tag="ghcr.io/getarcaneapp/arcane:development" flag='':
+_build_image_manager tag="ghcr.io/getarcaneapp/arcane:development" flag='':
docker buildx build {{ if flag == "--push" { "--push" } else { "" } }} --platform linux/arm64,linux/amd64,linux/arm/v7 -f 'docker/Dockerfile' --build-arg ENABLED_FEATURES="{{ env('ENABLED_FEATURES', env('BUILD_FEATURES', '')) }}" -t "{{ tag }}" .
# Build agent container image
[group('build')]
-_build-image-agent tag="ghcr.io/getarcaneapp/agent:development" flag='':
+_build_image_agent tag="ghcr.io/getarcaneapp/agent:development" flag='':
docker buildx build {{ if flag == "--push" { "--push" } else { "" } }} --platform linux/arm64,linux/amd64,linux/arm/v7 -f 'docker/Dockerfile-agent' --build-arg ENABLED_FEATURES="{{ env('ENABLED_FEATURES', env('BUILD_FEATURES', '')) }}" -t "{{ tag }}" .
-# Build targets:
-# just build single {frontend|backend|all}
-# just build image {manager|agent} [tag] [--push]
+# Build application code: single {frontend|backend|all}; containers: image {manager|agent} [tag] [--push]
[group('build')]
build buildtype type="" tag="" flag="":
- @if [ "{{ buildtype }}" = "single" ]; then just _build-{{ type }}; \
- elif [ "{{ buildtype }}" = "image" ]; then just _build-image-{{ type }} "{{ if tag != "" { tag } else if type == "manager" { "arcane:latest" } else { "arcane-agent:latest" } }}" "{{ flag }}"; \
+ @if [ "{{ buildtype }}" = "single" ]; then just _build_{{ type }}; \
+ elif [ "{{ buildtype }}" = "image" ]; then just _build_image_{{ type }} "{{ if tag != "" { tag } else if type == "manager" { "arcane:latest" } else { "arcane-agent:latest" } }}" "{{ flag }}"; \
else echo "Unknown build target: {{ buildtype }}. Try: just build single|image" >&2; exit 1; \
fi
@@ -188,13 +147,13 @@ build buildtype type="" tag="" flag="":
# -----------------------------------------------------------------------------
# Run Playwright E2E tests
-[group('test')]
-_test-e2e:
+[group('checks')]
+_test_e2e:
vp -C tests run test
# Run backend Go tests
-[group('test')]
-_test-backend:
+[group('checks')]
+_test_backend:
#!/usr/bin/env bash
set -euo pipefail
@@ -207,8 +166,8 @@ _test-backend:
fi
# Run CLI tests
-[group('test')]
-_test-cli:
+[group('checks')]
+_test_cli:
#!/usr/bin/env bash
set -euo pipefail
@@ -221,8 +180,8 @@ _test-cli:
fi
# Run shared types Go tests
-[group('test')]
-_test-types:
+[group('checks')]
+_test_types:
#!/usr/bin/env bash
set -euo pipefail
@@ -234,253 +193,254 @@ _test-types:
go test ./... -race -coverprofile=coverage.txt -covermode=atomic -v
fi
-[group('test')]
-_test-all:
- @just _test-e2e
- @just _test-backend
- @just _test-cli
- @just _test-types
+[group('checks')]
+_test_all:
+ @just _test_e2e
+ @just _test_backend
+ @just _test_cli
+ @just _test_types
# Run tests. Valid targets: "e2e", "backend", "cli", "types", "all".
-[group('test')]
+[group('checks')]
test target="all":
- @just "_test-{{ target }}"
+ @just "_test_{{ target }}"
# -----------------------------------------------------------------------------
# Quality: format, lint, and fixes
# -----------------------------------------------------------------------------
-# Format frontend/test/email TypeScript with vp fmt (Vite+) and Go modules with goimports-reviser and gofumpt
-[group('quality')]
-_format-frontend:
+# Format frontend/test/email TypeScript with vp fmt (Vite+) and Go modules with gci and gofumpt
+[group('checks')]
+_format_frontend:
vp fmt frontend
-[group('quality')]
-_format-js:
+[group('checks')]
+_format_js:
vp fmt tests
vp fmt email-templates
-[group('quality')]
-_format-go:
+[group('checks')]
+_format_go:
#!/usr/bin/env bash
set -euo pipefail
for module in {{ modules }}; do
- # A non-matching project name keeps all non-stdlib imports in one group.
- (cd "$module" && goimports-reviser -project-name . ./...)
+ (cd "$module" && gci write --skip-generated --skip-vendor --custom-order -s "{{ go_stdlib_section }}" -s default -s localmodule .)
gofumpt -w -extra "$module"
done
-[group('quality')]
-_format-just:
+[group('checks')]
+_format_just:
just --fmt --unstable
-[group('quality')]
-_format-check-frontend:
+[group('checks')]
+_format_check_frontend:
vp fmt --check frontend
-[group('quality')]
-_format-check-js:
+[group('checks')]
+_format_check_js:
vp fmt --check tests
vp fmt --check email-templates
-[group('quality')]
-_format-check-go:
+[group('checks')]
+_format_check_go:
#!/usr/bin/env bash
set -euo pipefail
- unformatted=$(gofumpt -l -extra {{ modules }})
+ unformatted=$(
+ for module in {{ modules }}; do
+ (cd "$module" && gci list --skip-generated --skip-vendor --custom-order -s "{{ go_stdlib_section }}" -s default -s localmodule .) || exit 1
+ done
+ gofumpt -l -extra {{ modules }}
+ )
if [ -n "$unformatted" ]; then
echo "Unformatted Go files:"
echo "$unformatted"
exit 1
fi
-[group('quality')]
-_format-all:
+[group('checks')]
+_format_all:
#!/usr/bin/env bash
# Run every formatter even if one fails, so e.g. a vp/pnpm hiccup can't skip gofumpt
failed=0
for target in frontend js go just; do
- just "_format-${target}" || failed=1
+ just "_format_${target}" || failed=1
done
exit "${failed}"
-[group('quality')]
-_format-check-all:
- @just _format-check-frontend
- @just _format-check-js
- @just _format-check-go
+[group('checks')]
+_format_check_all:
+ @just _format_check_frontend
+ @just _format_check_js
+ @just _format_check_go
# Format targets. Valid: "frontend", "js", "go", "just", "all". Use --check to verify formatting.
-[group('quality')]
+[group('checks')]
format target="all" check="":
- @if [ "{{ check }}" = "--check" ]; then just "_format-check-{{ target }}"; else just "_format-{{ target }}"; fi
+ @if [ "{{ check }}" = "--check" ]; then just "_format_check_{{ target }}"; else just "_format_{{ target }}"; fi
# Type check/Lint frontend
-[group('quality')]
-_lint-frontend:
+[group('checks')]
+_lint_frontend:
vp -C frontend run check
# Type check Playwright tests
-[group('quality')]
-_lint-tests:
+[group('checks')]
+_lint_tests:
vp -C tests run check
# Type check email templates
-[group('quality')]
-_lint-email-templates:
+[group('checks')]
+_lint_email:
vp -C email-templates run check
# Type check all JavaScript/TypeScript workspaces
-[group('quality')]
-_lint-js:
- @just _lint-frontend
- @just _lint-tests
- @just _lint-email-templates
+[group('checks')]
+_lint_js:
+ @just _lint_frontend
+ @just _lint_tests
+ @just _lint_email
# Build golangci-lint with the custom linters enabled by the shared config
-[group('quality')]
-_build-golangci-lint:
+[group('checks')]
+_build_golangci_lint:
golangci-lint custom
# Lint Go backend
-[group('quality')]
-_lint-backend: _build-golangci-lint
- cd backend && ../.bin/golangci-lint-custom run -c ../.github/.golangci.yml ./...
+[group('checks')]
+_lint_backend:
+ cd backend && golangci-lint run -c ../.golangci.yml ./...
# Lint Go CLI
-[group('quality')]
-_lint-cli: _build-golangci-lint
- cd cli && ../.bin/golangci-lint-custom run -c ../.github/.golangci.yml ./...
+[group('checks')]
+_lint_cli:
+ cd cli && golangci-lint run -c ../.golangci.yml ./...
# Lint Types
-[group('quality')]
-_lint-types: _build-golangci-lint
- cd types && ../.bin/golangci-lint-custom run -c ../.github/.golangci.yml ./...
+[group('checks')]
+_lint_types:
+ cd types && golangci-lint run -c ../.golangci.yml ./...
# Lint edge tunnel protobuf definitions.
-[group('quality')]
-_lint-proto:
+[group('checks')]
+_lint_proto:
cd {{ edge_proto_dir }} && go run github.com/bufbuild/buf/cmd/buf@latest lint
# Lint all Go code
-[group('quality')]
-_lint-go: _lint-backend _lint-cli _lint-types
+[group('checks')]
+_lint_go: _lint_backend _lint_cli _lint_types
-[group('quality')]
-_lint-all:
- @just _lint-js
- @just _lint-go
- @just _lint-proto
+[group('checks')]
+_lint_all:
+ @just _lint_js
+ @just _lint_go
+ @just _lint_proto
-# Lint targets. Valid: "backend", "frontend", "tests", "email-templates", "js", "cli", "types", "go", "proto", "all".
-[group('quality')]
+# Lint targets. Valid: "backend", "frontend", "tests", "email", "js", "cli", "types", "go", "proto", "all".
+[group('checks')]
lint target="all":
- @just "_lint-{{ target }}"
+ @just "_lint_{{ target }}"
# Fix Go backend
-[group('quality')]
-_fix-backend:
+[group('checks')]
+_fix_backend:
cd backend && go fix ./...
# Fix Go CLI
-[group('quality')]
-_fix-cli:
+[group('checks')]
+_fix_cli:
cd cli && go fix ./...
# Fix Types
-[group('quality')]
-_fix-types:
+[group('checks')]
+_fix_types:
cd types && go fix ./...
# Fix all Go code
-[group('quality')]
-_fix-go: _fix-backend _fix-cli _fix-types
+[group('checks')]
+_fix_go: _fix_backend _fix_cli _fix_types
-[group('quality')]
-_fix-all:
- @just _fix-go
+[group('checks')]
+_fix_all:
+ @just _fix_go
# Fix targets. Valid: "backend", "cli", "types", "go", "all".
-[group('quality')]
+[group('checks')]
fix target="all":
- @just "_fix-{{ target }}"
+ @just "_fix_{{ target }}"
# -----------------------------------------------------------------------------
# Security
# -----------------------------------------------------------------------------
# Run Snyk against all projects including dev dependencies
-[group('security')]
-_snyk-scan:
+[group('checks')]
+_snyk_scan:
snyk test --all-projects --dev --policy-path=.snyk
# Snyk targets. Valid: "scan".
-[group('security')]
+[group('checks')]
snyk target="scan":
- @just "_snyk-{{ target }}"
+ @just "_snyk_{{ target }}"
# -----------------------------------------------------------------------------
# Dependencies
# -----------------------------------------------------------------------------
-# Install frontend dependencies
-[group('deps')]
-_deps-install-viteplus:
- vp migrate
-
-_deps-install-frontend:
+# Install Node.js workspace dependencies
+[group('dependencies')]
+_deps_install_frontend:
vp install
# Install tests dependencies
-[group('deps')]
-_deps-install-tests:
+[group('dependencies')]
+_deps_install_tests:
vp -C tests install
vp -C tests exec playwright install --with-deps chromium
# Install backend Go dependencies
-[group('deps')]
-_deps-install-backend:
+[group('dependencies')]
+_deps_install_backend:
cd backend && go mod download && go mod tidy && go mod verify
go work sync
# Install CLI Go dependencies
-[group('deps')]
-_deps-install-cli:
+[group('dependencies')]
+_deps_install_cli:
cd cli && go mod download && go mod tidy && go mod verify
go work sync
# Install types Go dependencies
-[group('deps')]
-_deps-install-types:
+[group('dependencies')]
+_deps_install_types:
cd types && go mod download && go mod tidy && go mod verify
go work sync
# Install all Go dependencies
-[group('deps')]
-_deps-install-go: _deps-install-backend _deps-install-cli _deps-install-types
+[group('dependencies')]
+_deps_install_go: _deps_install_backend _deps_install_cli _deps_install_types
# Install all Node.js dependencies
-[group('deps')]
-_deps-install-node: _deps-install-frontend _deps-install-tests _deps-install-viteplus
+[group('dependencies')]
+_deps_install_node: _deps_install_frontend _deps_install_tests
# Install all dependencies
-[group('deps')]
-_deps-install-all: _deps-install-node _deps-install-go
+[group('dependencies')]
+_deps_install_all: _deps_install_node _deps_install_go
# Update frontend dependencies
-[group('deps')]
-_deps-update-frontend:
+[group('dependencies')]
+_deps_update_frontend:
vp update
# Update backend Go dependencies
-[group('deps')]
-_deps-update-backend:
+[group('dependencies')]
+_deps_update_backend:
cd backend && go get -u ./... && go mod tidy
# Update direct Go dependencies in all modules, then sync the workspace (requires jq).
-[group('deps')]
-_deps-update-go *args:
+[group('dependencies')]
+_deps_update_go *args:
#!/usr/bin/env bash
set -euo pipefail
version=upgrade
@@ -514,24 +474,20 @@ _deps-update-go *args:
go work sync
done
-# Update pnpm version via corepack
-[group('deps')]
-_deps-update-pnpm:
- npx corepack up
-
-[group('deps')]
-_deps-update-all: _deps-update-frontend _deps-update-backend _deps-update-pnpm
+# Update Node.js and direct Go dependencies
+[group('dependencies')]
+_deps_update_all: _deps_update_frontend _deps_update_go
# Dedupe all pnpm workspace dependencies
-[group('deps')]
-_deps-dedupe-node:
+[group('dependencies')]
+_deps_dedupe_node:
vp dedupe
-[group('deps')]
-_deps-dedupe-all: _deps-dedupe-node
+[group('dependencies')]
+_deps_dedupe_all: _deps_dedupe_node
-# Deps targets. Also supports "go update [--patch]" for direct Go dependency updates.
-[group('deps')]
+# Manage dependencies: {install|update|dedupe} [target], or go update [--patch]
+[group('dependencies')]
deps action="update" target="all" *args:
#!/usr/bin/env bash
set -euo pipefail
@@ -540,29 +496,33 @@ deps action="update" target="all" *args:
echo 'Usage: just deps go update [--patch]' >&2
exit 1
fi
- just _deps-update-go {{ args }}
+ just _deps_update_go {{ args }}
else
- just "_deps-{{ action }}-{{ target }}" {{ args }}
+ just "_deps_{{ action }}_{{ target }}" {{ args }}
fi
# -----------------------------------------------------------------------------
-# Code generation and docs
+# Code generation
# -----------------------------------------------------------------------------
# Generate edge tunnel protobuf/gRPC code.
-[group('codegen')]
-_generate-proto:
+[group('generation')]
+_generate_proto:
cd {{ edge_proto_dir }} && go run github.com/bufbuild/buf/cmd/buf@latest lint
cd {{ edge_proto_dir }} && go run github.com/bufbuild/buf/cmd/buf@latest generate
# Generate targets. Valid: "proto".
-[group('codegen')]
+[group('generation')]
generate target:
- @just "_generate-{{ target }}"
+ @just "_generate_{{ target }}"
+
+# -----------------------------------------------------------------------------
+# Documentation and localization
+# -----------------------------------------------------------------------------
# Generate the docs config schema JSON.
-[group('docs')]
-_docs-config output="" source_root=".":
+[group('generation')]
+_docs_config output="" source_root=".":
#!/usr/bin/env bash
set -euo pipefail
@@ -574,24 +534,18 @@ _docs-config output="" source_root=".":
"${cmd[@]}"
# Docs targets. Example: just docs config
-[group('docs')]
+[group('generation')]
docs target *args:
- @just "_docs-{{ target }}" {{ args }}
-
-# -----------------------------------------------------------------------------
-# Localization
-# -----------------------------------------------------------------------------
-
-# Add a new i18n locale. Example:
+ @just "_docs_{{ target }}" {{ args }}
-# just i18n-add es "Español"
-[group('i18n')]
-i18n-add locale native_name settings="frontend/project.inlang/settings.json" picker="frontend/src/lib/components/locale-picker.svelte" messages_dir="frontend/messages" base_locale="en":
+# Add an i18n locale
+[group('generation')]
+_i18n_add locale native_name settings="frontend/project.inlang/settings.json" picker="frontend/src/lib/components/locale-picker.svelte" messages_dir="frontend/messages" base_locale="en":
#!/usr/bin/env bash
set -euo pipefail
if [ -z "{{ locale }}" ] || [ -z "{{ native_name }}" ]; then
- echo "Usage: just i18n-add <locale> <native_name> [settings] [picker] [messages_dir] [base_locale]"
+ echo "Usage: just i18n add <locale> <native_name> [settings] [picker] [messages_dir] [base_locale]"
exit 1
fi
@@ -766,272 +720,29 @@ i18n-add locale native_name settings="frontend/project.inlang/settings.json" pic
echo "Created messages file: $target_file"
fi
+# Localization targets: add <locale> <native_name>. Example: just i18n add es "Español"
+[group('generation')]
+i18n target *args:
+ @just "_i18n_{{ target }}" {{ args }}
+
# -----------------------------------------------------------------------------
# Benchmarks
# -----------------------------------------------------------------------------
-# Benchmark edge tunnel transport performance (gRPC vs WebSocket) with allocations.
-
-# Usage: just bench-edge-tunnel [count] [benchtime]
-[group('bench')]
-bench-edge-tunnel count="3" benchtime="2s":
+# Benchmark edge tunnel transports with allocation counts
+[group('performance')]
+_bench_edge count="3" benchtime="2s":
cd backend && go test -run '^$' -bench '^BenchmarkEdgeTunnelProxyRequest$' -benchmem -count={{ count }} -benchtime={{ benchtime }} ./pkg/libarcane/edge
-# Benchmark edge tunnel transport and write memory profile.
-
-# Usage: just bench-edge-tunnel-mem [profile] [benchtime]
-[group('bench')]
-bench-edge-tunnel-mem profile="edge_tunnel.mem.out" benchtime="5s":
+# Benchmark edge tunnel transports and write a memory profile
+[group('performance')]
+_bench_memory profile="edge_tunnel.mem.out" benchtime="5s":
cd backend && go test -run '^$' -bench '^BenchmarkEdgeTunnelProxyRequest$' -benchmem -benchtime={{ benchtime }} -memprofile={{ profile }} ./pkg/libarcane/edge
-# -----------------------------------------------------------------------------
-# Deploy
-# -----------------------------------------------------------------------------
-
-# Deploy a local DinD engine plus a locally built Arcane edge agent.
-# The swarm form joins the engine to the host swarm; the normal agent form leaves
-# it outside the swarm so Arcane Easy Join can perform the join later.
-#
-# Usage:
-
-# just deploy swarm agent [agent_token] [manager_url] [node_name] [agent_name] [dind_image] [local_image]
-# just deploy agent [agent_token] [manager_url] [node_name] [agent_name] [dind_image] [local_image]
-[group('deploy')]
-_deploy-agent join_swarm agent_token="" manager_url="http://host.docker.internal:3552" node_name="arcane-agent-1" agent_name="arcane-agent" dind_image="docker:29-dind" local_image="ghcr.io/getarcaneapp/agent:local":
- #!/usr/bin/env bash
- set -euo pipefail
-
- if ! command -v docker >/dev/null 2>&1; then
- echo "docker is required"
- exit 1
- fi
-
- if ! docker info >/dev/null 2>&1; then
- echo "docker daemon is not running"
- exit 1
- fi
-
- if [ "{{ join_swarm }}" = "true" ]; then
- swarm_state="$(docker info 2>/dev/null | awk -F': ' '/Swarm:/{print tolower($2); exit}')"
- swarm_control="$(docker info 2>/dev/null | awk -F': ' '/Is Manager:/{print tolower($2); exit}')"
- if [ "$swarm_state" != "active" ] || [ "$swarm_control" != "true" ]; then
- echo "host docker must already be an active swarm manager"
- exit 1
- fi
- fi
-
- echo "Building local agent image {{ local_image }}..."
- docker buildx build --load -f docker/Dockerfile-agent -t "{{ local_image }}" .
-
- if docker inspect "{{ node_name }}" >/dev/null 2>&1; then
- echo "Reusing existing DinD engine {{ node_name }}..."
- docker start "{{ node_name }}" >/dev/null 2>&1 || true
- else
- echo "Starting DinD engine {{ node_name }} from {{ dind_image }}..."
- docker run -d \
- --privileged \
- --name "{{ node_name }}" \
- --hostname "{{ node_name }}" \
- --restart unless-stopped \
- --add-host=host.docker.internal:host-gateway \
- -e DOCKER_TLS_CERTDIR= \
- "{{ dind_image }}"
- fi
-
- echo "Waiting for inner Docker daemon..."
- for _ in $(seq 1 30); do
- if docker exec "{{ node_name }}" docker info >/dev/null 2>&1; then
- break
- fi
- sleep 1
- done
-
- if ! docker exec "{{ node_name }}" docker info >/dev/null 2>&1; then
- echo "inner docker daemon did not become ready"
- exit 1
- fi
-
- local_node_state="$(docker exec "{{ node_name }}" docker info --format '{{ "{{.Swarm.LocalNodeState}}" }}')"
- if [ "{{ join_swarm }}" = "true" ]; then
- if [ "$local_node_state" != "active" ]; then
- join_token="$(docker swarm join-token -q worker)"
- echo "Joining {{ node_name }} to host swarm..."
- docker exec "{{ node_name }}" docker swarm join --token "$join_token" host.docker.internal:2377
- else
- echo "{{ node_name }} is already part of the swarm."
- fi
- else
- if [ "$local_node_state" = "active" ]; then
- echo "{{ node_name }} is already part of a swarm. Remove it first with: just remove agent {{ node_name }} {{ agent_name }}"
- exit 1
- fi
- echo "Leaving {{ node_name }} outside the swarm for Arcane Easy Join."
- fi
-
- current_node_id="$(docker exec "{{ node_name }}" docker info --format '{{ "{{.Swarm.NodeID}}" }}')"
- if [ -n "$current_node_id" ]; then
- echo "Current swarm node ID: $current_node_id"
- fi
-
- if [ -n "{{ agent_token }}" ] && command -v sqlite3 >/dev/null 2>&1 && [ -f backend/data/arcane.db ]; then
- expected_node_id="$(sqlite3 backend/data/arcane.db "SELECT COALESCE(swarm_node_id, '') FROM environments WHERE access_token = '{{ agent_token }}' LIMIT 1;")"
- if [ -n "$expected_node_id" ] && [ "$expected_node_id" != "$current_node_id" ]; then
- echo "agent token belongs to swarm node $expected_node_id, but {{ node_name }} is $current_node_id"
- if [ "{{ join_swarm }}" = "true" ]; then
- echo "Create a fresh Remote Environment from the Connect Agent dialog for node {{ node_name }}, then rerun this command with its token."
- else
- echo "Create a fresh visible Edge Agent under Environments, then rerun this command with its token."
- fi
- exit 1
- fi
- fi
-
- if [ -z "{{ agent_token }}" ]; then
- echo ""
- if [ "{{ join_swarm }}" = "true" ]; then
- echo "Swarm worker {{ node_name }} is ready, but no Arcane agent token was provided."
- echo "Open Arcane, click Connect Agent for node {{ node_name }} (node ID: $current_node_id), create its Remote Environment, copy the generated token, and rerun:"
- echo " just deploy swarm agent <arcane_agent_token> {{ manager_url }} {{ node_name }} {{ agent_name }} {{ dind_image }} {{ local_image }}"
- else
- echo "Docker engine {{ node_name }} is ready, but no Arcane agent token was provided."
- echo "Create a visible Edge Agent under Environments, copy its token, and rerun:"
- echo " just deploy agent <arcane_agent_token> {{ manager_url }} {{ node_name }} {{ agent_name }} {{ dind_image }} {{ local_image }}"
- fi
- exit 0
- fi
-
- echo "Loading local agent image into {{ node_name }}..."
- docker save "{{ local_image }}" | docker exec -i "{{ node_name }}" docker load >/dev/null
-
- echo "Starting agent container {{ agent_name }} inside {{ node_name }}..."
- docker exec "{{ node_name }}" sh -lc '
- docker rm -f "{{ agent_name }}" >/dev/null 2>&1 || true
- docker run -d \
- --name "{{ agent_name }}" \
- --restart unless-stopped \
- -e EDGE_AGENT=true \
- -e EDGE_TRANSPORT=poll \
- -e AGENT_TOKEN="{{ agent_token }}" \
- -e MANAGER_API_URL="{{ manager_url }}" \
- -v /var/run/docker.sock:/var/run/docker.sock \
- -v arcane-data:/app/data \
- "{{ local_image }}"
- '
-
- echo ""
- if [ "{{ join_swarm }}" = "true" ]; then
- echo "Swarm worker {{ node_name }} and local agent {{ agent_name }} are up."
- else
- echo "Docker engine {{ node_name }} and local agent {{ agent_name }} are up."
- echo "The engine is connected to Arcane and remains outside the swarm."
- fi
- echo "Verify:"
- if [ "{{ join_swarm }}" = "true" ]; then
- echo " docker node ls"
- else
- echo " docker exec {{ node_name }} docker info --format '{{ "{{.Swarm.LocalNodeState}}" }}'"
- fi
- echo " docker exec {{ node_name }} docker ps"
- echo " docker exec {{ node_name }} docker logs {{ agent_name }}"
-
-# Remove a local DinD engine plus its Arcane edge agent.
-#
-# Usage:
-#
-
-# just remove swarm agent [node_name] [agent_name]
-# just remove agent [node_name] [agent_name]
-[group('deploy')]
-_remove-agent node_name="arcane-agent-1" agent_name="arcane-agent":
- #!/usr/bin/env bash
- set -euo pipefail
-
- if ! command -v docker >/dev/null 2>&1; then
- echo "docker is required"
- exit 1
- fi
-
- if ! docker info >/dev/null 2>&1; then
- echo "docker daemon is not running"
- exit 1
- fi
-
- if ! docker inspect "{{ node_name }}" >/dev/null 2>&1; then
- echo "container {{ node_name }} does not exist"
- exit 1
- fi
-
- echo "Stopping inner agent container {{ agent_name }} inside {{ node_name }}..."
- docker exec "{{ node_name }}" sh -lc 'docker rm -f "{{ agent_name }}" >/dev/null 2>&1 || true'
-
- node_id=""
- if docker exec "{{ node_name }}" docker info >/dev/null 2>&1; then
- local_node_state="$(docker exec "{{ node_name }}" docker info --format '{{ "{{.Swarm.LocalNodeState}}" }}' 2>/dev/null || true)"
- if [ "$local_node_state" = "active" ]; then
- node_id="$(docker exec "{{ node_name }}" docker info --format '{{ "{{.Swarm.NodeID}}" }}' 2>/dev/null || true)"
- echo "Leaving swarm from {{ node_name }}..."
- docker exec "{{ node_name }}" docker swarm leave -f >/dev/null 2>&1 || true
- fi
- fi
-
- if [ -n "$node_id" ]; then
- echo "Removing swarm node $node_id from host manager..."
- docker node rm -f "$node_id" >/dev/null 2>&1 || true
- fi
-
- echo "Removing DinD engine container {{ node_name }} from host..."
- docker rm -f "{{ node_name }}" >/dev/null
-
- echo ""
- echo "Removed Docker engine {{ node_name }} and inner agent {{ agent_name }}."
-
-# Deploy targets. Examples: just deploy agent [agent_token], just deploy swarm agent [agent_token]
-[group('deploy')]
-deploy target *args:
- #!/usr/bin/env bash
- set -euo pipefail
- set -- {{ args }}
- case "{{ target }}" in
- agent)
- just _deploy-agent false "$@"
- ;;
- swarm)
- if [ "${1:-}" != "agent" ]; then
- echo "usage: just deploy swarm agent [agent_token] [manager_url] [node_name] [agent_name] [dind_image] [local_image]"
- exit 1
- fi
- shift
- just _deploy-agent true "$@"
- ;;
- *)
- echo "unknown deploy target: {{ target }}"
- exit 1
- ;;
- esac
-
-# Remove deployed targets. Examples: just remove agent, just remove swarm agent
-[group('deploy')]
-remove target *args:
- #!/usr/bin/env bash
- set -euo pipefail
- set -- {{ args }}
- case "{{ target }}" in
- agent)
- just _remove-agent "$@"
- ;;
- swarm)
- if [ "${1:-}" != "agent" ]; then
- echo "usage: just remove swarm agent [node_name] [agent_name]"
- exit 1
- fi
- shift
- just _remove-agent "$@"
- ;;
- *)
- echo "unknown remove target: {{ target }}"
- exit 1
- ;;
- esac
+# Benchmark edge transports: edge [count] [benchtime], or memory [profile] [benchtime]
+[group('performance')]
+bench target="edge" *args:
+ @just "_bench_{{ target }}" {{ args }}
# -----------------------------------------------------------------------------
# Release
@@ -1042,9 +753,9 @@ remove target *args:
# The -next.N counter continues from tags already published to GHCR; set
# GHCR_TAGS (newline separated) to bypass the registry query for testing.
#
-# Usage: just next-image-version [github-output]
+# Compute the next image version; use github-output to export workflow outputs
[group('release')]
-next-image-version mode="":
+_release_version mode="":
#!/usr/bin/env bash
set -euo pipefail
@@ -1122,8 +833,29 @@ next-image-version mode="":
"image_tag=${IMAGE_TAG}" >> "${GITHUB_OUTPUT:?GITHUB_OUTPUT is not set}"
fi
+# Compute the next image version: version [github-output]
[group('release')]
-_utils-list-feats:
+release target="version" *args:
+ @just "_release_{{ target }}" {{ args }}
+
+# -----------------------------------------------------------------------------
+# Repository maintenance
+# -----------------------------------------------------------------------------
+
+# Clean build artifacts
+[group('maintenance')]
+_repo_clean:
+ rm -rf frontend/.svelte-kit frontend/build backend/.bin
+ find . -type d -name node_modules -prune -exec rm -rf {} \;
+
+# Repo targets. Valid: "clean".
+[group('maintenance')]
+repo target="clean":
+ @just "_repo_{{ target }}"
+
+# List open feature requests by votes
+[group('maintenance')]
+_utils_feats:
#!/usr/bin/env bash
set -euo pipefail
@@ -1161,8 +893,9 @@ _utils-list-feats:
printf " %s\n\n" "$url"
done <<< "$discussions"
-[group('release')]
-_utils-list-fixes:
+# List fix commits since the latest release
+[group('maintenance')]
+_utils_fixes:
#!/usr/bin/env bash
set -euo pipefail
@@ -1225,22 +958,7 @@ _utils-list-fixes:
echo "Test mode: no changes were made."
fi
-# Utils targets. Valid: "list-feats", "list-fixes".
-[group('release')]
-utils target *args:
- @just "_utils-{{ target }}" {{ args }}
-
-# -----------------------------------------------------------------------------
-# Repository maintenance
-# -----------------------------------------------------------------------------
-
-# Clean build artifacts
-[group('maintenance')]
-_repo-clean:
- rm -rf frontend/.svelte-kit frontend/build backend/.bin
- find . -type d -name node_modules -prune -exec rm -rf {} \;
-
-# Repo targets. Valid: "clean".
+# Utils targets. Valid: "feats", "fixes".
[group('maintenance')]
-repo target="clean":
- @just "_repo-{{ target }}"
+utils target *args:
+ @just "_utils_{{ target }}" {{ args }}
diff --git a/backend/api/api.go b/backend/api/api.go
index dfdd0175e..9b337f5aa 100644
--- a/backend/api/api.go
+++ b/backend/api/api.go
@@ -11,6 +11,10 @@ import (
"github.com/danielgtaylor/huma/v2"
"github.com/danielgtaylor/huma/v2/adapters/humaecho"
+ "github.com/labstack/echo/v5"
+ kit "go.getarcane.app/kit/pkg"
+ "go.uber.org/fx"
+
"github.com/getarcaneapp/arcane/backend/v2/api/handlers"
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
@@ -58,9 +62,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
"github.com/getarcaneapp/arcane/backend/v2/internal/webhook"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/labstack/echo/v5"
- kit "go.getarcane.app/kit/pkg"
- "go.uber.org/fx"
)
const (
diff --git a/backend/api/api_test.go b/backend/api/api_test.go
index 6ff56f7ae..c3bfdcc22 100644
--- a/backend/api/api_test.go
+++ b/backend/api/api_test.go
@@ -11,9 +11,6 @@ import (
"time"
humav2 "github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
basetypes "github.com/getarcaneapp/arcane/types/v2/base"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
envtypes "github.com/getarcaneapp/arcane/types/v2/env"
@@ -26,6 +23,10 @@ import (
dockernetwork "github.com/moby/moby/api/types/network"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
func TestWorkspaceRoutesReplaceProjectAndVolumeLegacyRoutes(t *testing.T) {
diff --git a/backend/api/buildables.go b/backend/api/buildables.go
index f89b2f0bf..9965cd86d 100644
--- a/backend/api/buildables.go
+++ b/backend/api/buildables.go
@@ -7,14 +7,15 @@ import (
"net/http"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/buildables"
- "github.com/getarcaneapp/arcane/backend/v2/internal/auth"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
authtypes "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/v5"
"go.getarcane.app/kit/pkg/mapping"
+
+ "github.com/getarcaneapp/arcane/backend/v2/buildables"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/auth"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
)
// SetupBuildablesRoutes registers buildable feature routes based on EnabledFeatures.
diff --git a/backend/api/handlers/diagnostics.go b/backend/api/handlers/diagnostics.go
index 58466bb44..d2d93667f 100644
--- a/backend/api/handlers/diagnostics.go
+++ b/backend/api/handlers/diagnostics.go
@@ -5,13 +5,14 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/system"
+ "go.getarcane.app/streams/logs"
+
"github.com/getarcaneapp/arcane/backend/v2/api/ws"
"github.com/getarcaneapp/arcane/backend/v2/internal/diagnostics"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/system"
- "go.getarcane.app/streams/logs"
)
// DiagnosticsHandler serves the REST diagnostics endpoints. The live WebSocket
diff --git a/backend/api/handlers/stream.go b/backend/api/handlers/stream.go
index 266d37221..c08fc0a5e 100644
--- a/backend/api/handlers/stream.go
+++ b/backend/api/handlers/stream.go
@@ -9,6 +9,14 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard"
+ environmenttypes "github.com/getarcaneapp/arcane/types/v2/environment"
+ eventtypes "github.com/getarcaneapp/arcane/types/v2/event"
+ streamtypes "github.com/getarcaneapp/arcane/types/v2/stream"
+ versiontypes "github.com/getarcaneapp/arcane/types/v2/version"
+ "go.getarcane.app/streams/agg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/dashboard"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
@@ -18,13 +26,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard"
- environmenttypes "github.com/getarcaneapp/arcane/types/v2/environment"
- eventtypes "github.com/getarcaneapp/arcane/types/v2/event"
- streamtypes "github.com/getarcaneapp/arcane/types/v2/stream"
- versiontypes "github.com/getarcaneapp/arcane/types/v2/version"
- "go.getarcane.app/streams/agg"
)
const (
diff --git a/backend/api/webhooks_trigger.go b/backend/api/webhooks_trigger.go
index f0df29378..b8df3f162 100644
--- a/backend/api/webhooks_trigger.go
+++ b/backend/api/webhooks_trigger.go
@@ -4,10 +4,11 @@ import (
"errors"
"net/http"
+ "github.com/labstack/echo/v5"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/webhook"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/labstack/echo/v5"
)
// RegisterWebhookTrigger registers the public (unauthenticated) trigger endpoint.
diff --git a/backend/api/ws/container_stats.go b/backend/api/ws/container_stats.go
index 67804ad58..f4dfc5191 100644
--- a/backend/api/ws/container_stats.go
+++ b/backend/api/ws/container_stats.go
@@ -10,9 +10,10 @@ import (
"sync"
"time"
- wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
"github.com/labstack/echo/v5"
+
+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
)
// ============================================================================
diff --git a/backend/api/ws/diagnostics.go b/backend/api/ws/diagnostics.go
index 1c29692d4..0453dfa09 100644
--- a/backend/api/ws/diagnostics.go
+++ b/backend/api/ws/diagnostics.go
@@ -9,14 +9,15 @@ import (
"time"
"github.com/coder/websocket"
+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
+ "github.com/labstack/echo/v5"
+ "go.getarcane.app/streams/logs"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/diagnostics"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
- systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
- "github.com/labstack/echo/v5"
- "go.getarcane.app/streams/logs"
)
const (
diff --git a/backend/api/ws/exec.go b/backend/api/ws/exec.go
index b061c7212..d84559215 100644
--- a/backend/api/ws/exec.go
+++ b/backend/api/ws/exec.go
@@ -13,9 +13,10 @@ import (
"time"
"github.com/coder/websocket"
- wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
"github.com/labstack/echo/v5"
+
+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
)
// ============================================================================
diff --git a/backend/api/ws/handler.go b/backend/api/ws/handler.go
index 2ba41e64a..7ee4e63bf 100644
--- a/backend/api/ws/handler.go
+++ b/backend/api/ws/handler.go
@@ -9,6 +9,11 @@ import (
"time"
"github.com/coder/websocket"
+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
+ "github.com/labstack/echo/v5"
+ "github.com/samber/hot"
+ "go.getarcane.app/sys/cgroup"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/container"
@@ -21,10 +26,6 @@ import (
wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
- "github.com/labstack/echo/v5"
- "github.com/samber/hot"
- "go.getarcane.app/sys/cgroup"
)
var defaultWebSocketMetrics = wshub.NewWebSocketMetrics()
diff --git a/backend/api/ws/log_streams.go b/backend/api/ws/log_streams.go
index a87e7611c..48946b35a 100644
--- a/backend/api/ws/log_streams.go
+++ b/backend/api/ws/log_streams.go
@@ -12,9 +12,10 @@ import (
"sync/atomic"
"time"
- wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
"github.com/labstack/echo/v5"
+
+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
)
// ============================================================================
diff --git a/backend/api/ws/proxy_permissions.go b/backend/api/ws/proxy_permissions.go
index 2f2357f00..a6c07589d 100644
--- a/backend/api/ws/proxy_permissions.go
+++ b/backend/api/ws/proxy_permissions.go
@@ -3,8 +3,9 @@ package ws
import (
"net/http"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/labstack/echo/v5"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
)
// proxiedWSRoute couples a proxied WebSocket route (relative to the
diff --git a/backend/api/ws/system_stats.go b/backend/api/ws/system_stats.go
index a25f6df73..3ef229a8c 100644
--- a/backend/api/ws/system_stats.go
+++ b/backend/api/ws/system_stats.go
@@ -10,7 +10,6 @@ import (
"time"
"github.com/coder/websocket"
- httputil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
"github.com/labstack/echo/v5"
"github.com/samber/hot"
@@ -20,6 +19,8 @@ import (
"github.com/shirou/gopsutil/v4/mem"
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/cgroup"
+
+ httputil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
)
const (
diff --git a/backend/cli/admin/reset_mfa.go b/backend/cli/admin/reset_mfa.go
index 19935b8a6..e54a886cf 100644
--- a/backend/cli/admin/reset_mfa.go
+++ b/backend/cli/admin/reset_mfa.go
@@ -8,12 +8,13 @@ import (
"log/slog"
"strings"
+ "github.com/spf13/cobra"
+
"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/passkey"
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
- "github.com/spf13/cobra"
)
var resetMFAUsername string
diff --git a/backend/cli/admin/reset_mfa_test.go b/backend/cli/admin/reset_mfa_test.go
index dcf862dc7..bee43bfc1 100644
--- a/backend/cli/admin/reset_mfa_test.go
+++ b/backend/cli/admin/reset_mfa_test.go
@@ -6,15 +6,16 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"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/passkey"
"github.com/getarcaneapp/arcane/backend/v2/internal/session"
- "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func newResetMFATestDBInternal(t *testing.T) *database.DB {
diff --git a/backend/cli/admin/reset_password.go b/backend/cli/admin/reset_password.go
index 2bf0ac3ff..62a146a10 100644
--- a/backend/cli/admin/reset_password.go
+++ b/backend/cli/admin/reset_password.go
@@ -9,6 +9,10 @@ import (
"os"
"strings"
+ "github.com/spf13/cobra"
+ kit "go.getarcane.app/kit/pkg"
+ "golang.org/x/term"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -16,9 +20,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
- "github.com/spf13/cobra"
- kit "go.getarcane.app/kit/pkg"
- "golang.org/x/term"
)
const defaultAdminUsername = "arcane"
diff --git a/backend/cli/admin/reset_password_test.go b/backend/cli/admin/reset_password_test.go
index bcef74295..df5aad004 100644
--- a/backend/cli/admin/reset_password_test.go
+++ b/backend/cli/admin/reset_password_test.go
@@ -5,6 +5,11 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -13,10 +18,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
- "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func newResetPasswordTestDBInternal(t *testing.T) *database.DB {
diff --git a/backend/cli/config_schema.go b/backend/cli/config_schema.go
index e812deaab..00e50f640 100644
--- a/backend/cli/config_schema.go
+++ b/backend/cli/config_schema.go
@@ -3,9 +3,10 @@ package cli
import (
"os"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config/schema"
"github.com/spf13/cobra"
"go.getarcane.app/acfs/atomic"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config/schema"
)
var configSchemaCmd = &cobra.Command{
diff --git a/backend/cli/health.go b/backend/cli/health.go
index 6b2d72805..5e869220d 100644
--- a/backend/cli/health.go
+++ b/backend/cli/health.go
@@ -12,8 +12,9 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/spf13/cobra"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
)
const (
diff --git a/backend/cli/health_test.go b/backend/cli/health_test.go
index 83ac350b2..12b67c6ce 100644
--- a/backend/cli/health_test.go
+++ b/backend/cli/health_test.go
@@ -10,9 +10,10 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
)
func TestBuildHealthURLInternalDefaults(t *testing.T) {
diff --git a/backend/cli/openapi.go b/backend/cli/openapi.go
index a9156665f..1b35be80c 100644
--- a/backend/cli/openapi.go
+++ b/backend/cli/openapi.go
@@ -3,9 +3,10 @@ package cli
import (
"os"
- "github.com/getarcaneapp/arcane/backend/v2/api"
"github.com/spf13/cobra"
"go.getarcane.app/acfs/atomic"
+
+ "github.com/getarcaneapp/arcane/backend/v2/api"
)
var openapiCmd = &cobra.Command{
diff --git a/backend/cli/recovery/recovery.go b/backend/cli/recovery/recovery.go
index 3d96bac3d..c4ddb8065 100644
--- a/backend/cli/recovery/recovery.go
+++ b/backend/cli/recovery/recovery.go
@@ -11,14 +11,6 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/cli/upgrade"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/systembackup"
- dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- rusticruntime "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/rustic"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
dbtypes "github.com/getarcaneapp/arcane/types/v2/database"
@@ -31,6 +23,15 @@ import (
"go.getarcane.app/docker/compat"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "github.com/getarcaneapp/arcane/backend/v2/cli/upgrade"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/systembackup"
+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ rusticruntime "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/rustic"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
)
const rusticImage = rusticruntime.DefaultImage
diff --git a/backend/cli/recovery/recovery_test.go b/backend/cli/recovery/recovery_test.go
index b1229c10a..e64cf1b4d 100644
--- a/backend/cli/recovery/recovery_test.go
+++ b/backend/cli/recovery/recovery_test.go
@@ -6,16 +6,17 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/systembackup"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
dbtypes "github.com/getarcaneapp/arcane/types/v2/database"
recoverytypes "github.com/getarcaneapp/arcane/types/v2/recovery"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/systembackup"
)
func newRestoredDatabaseForTestInternal(t *testing.T, runIDs ...string) (string, string) {
diff --git a/backend/cli/root.go b/backend/cli/root.go
index 7bf427f77..634388653 100644
--- a/backend/cli/root.go
+++ b/backend/cli/root.go
@@ -5,14 +5,15 @@ import (
"log/slog"
"os"
+ "github.com/spf13/cobra"
+ "go.getarcane.app/kit/pkg/signals"
+
"github.com/getarcaneapp/arcane/backend/v2/cli/admin"
"github.com/getarcaneapp/arcane/backend/v2/cli/generate"
"github.com/getarcaneapp/arcane/backend/v2/cli/recovery"
"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/spf13/cobra"
- "go.getarcane.app/kit/pkg/signals"
)
var rootCmd = &cobra.Command{
diff --git a/backend/cli/upgrade/upgrade.go b/backend/cli/upgrade/upgrade.go
index 329deb25a..25ba15c59 100644
--- a/backend/cli/upgrade/upgrade.go
+++ b/backend/cli/upgrade/upgrade.go
@@ -11,9 +11,6 @@ import (
"strings"
"time"
- docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/network"
"github.com/moby/moby/client"
@@ -22,6 +19,10 @@ import (
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/cgroup"
"go.getarcane.app/updater/labels"
+
+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
var (
diff --git a/backend/cli/version.go b/backend/cli/version.go
index 98b00bcb6..7ff3f5ff3 100644
--- a/backend/cli/version.go
+++ b/backend/cli/version.go
@@ -4,8 +4,9 @@ import (
"fmt"
"runtime"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/spf13/cobra"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
)
var versionCmd = &cobra.Command{
diff --git a/backend/internal/activity/handler.go b/backend/internal/activity/handler.go
index bd1c83c74..9f298ecf0 100644
--- a/backend/internal/activity/handler.go
+++ b/backend/internal/activity/handler.go
@@ -13,6 +13,13 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/samber/mo"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/streams/agg"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
@@ -20,12 +27,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/samber/mo"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/streams/agg"
- "gorm.io/gorm"
)
type ActivityHandler struct {
diff --git a/backend/internal/activity/job.go b/backend/internal/activity/job.go
index 164441df3..b1a3d3ffc 100644
--- a/backend/internal/activity/job.go
+++ b/backend/internal/activity/job.go
@@ -7,11 +7,12 @@ import (
"fmt"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
// SyncJobRun updates a durable job summary without taking an execution slot.
diff --git a/backend/internal/activity/job_test.go b/backend/internal/activity/job_test.go
index 7b7479d26..ec1193560 100644
--- a/backend/internal/activity/job_test.go
+++ b/backend/internal/activity/job_test.go
@@ -7,12 +7,13 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
func TestJobSummaryReopensAndRejectsStaleSnapshots(t *testing.T) {
diff --git a/backend/internal/activity/limiter.go b/backend/internal/activity/limiter.go
index dfcd13fe9..782f0b117 100644
--- a/backend/internal/activity/limiter.go
+++ b/backend/internal/activity/limiter.go
@@ -5,8 +5,9 @@ import (
"sync"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/samber/mo"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
const (
diff --git a/backend/internal/activity/model.go b/backend/internal/activity/model.go
index 5344b89ee..41c41e657 100644
--- a/backend/internal/activity/model.go
+++ b/backend/internal/activity/model.go
@@ -3,8 +3,9 @@ package activity
import (
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
type Activity struct {
diff --git a/backend/internal/activity/remote.go b/backend/internal/activity/remote.go
index 520bca046..5fb78cb92 100644
--- a/backend/internal/activity/remote.go
+++ b/backend/internal/activity/remote.go
@@ -5,9 +5,10 @@ import (
"context"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
// remoteActivityPageCeiling mirrors the agent's page clamp in PaginateAndSortDB.
diff --git a/backend/internal/activity/service.go b/backend/internal/activity/service.go
index 03f2916b8..563cbe48d 100644
--- a/backend/internal/activity/service.go
+++ b/backend/internal/activity/service.go
@@ -13,6 +13,10 @@ import (
"sync"
"time"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/samber/mo"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
@@ -22,9 +26,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/samber/mo"
- "gorm.io/gorm"
)
const (
diff --git a/backend/internal/activity/service_test.go b/backend/internal/activity/service_test.go
index 3dfddf1d9..7f09bddcb 100644
--- a/backend/internal/activity/service_test.go
+++ b/backend/internal/activity/service_test.go
@@ -5,16 +5,17 @@ import (
"testing"
"time"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
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"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func setupActivityServiceTestDBInternal(t *testing.T) *database.DB {
diff --git a/backend/internal/activity/visibility.go b/backend/internal/activity/visibility.go
index c5540495b..b333ed0a3 100644
--- a/backend/internal/activity/visibility.go
+++ b/backend/internal/activity/visibility.go
@@ -4,10 +4,11 @@ import (
"cmp"
"context"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
)
// Job summaries live in their target environment's environment_id column.
diff --git a/backend/internal/activity/visibility_test.go b/backend/internal/activity/visibility_test.go
index c368bd009..042540732 100644
--- a/backend/internal/activity/visibility_test.go
+++ b/backend/internal/activity/visibility_test.go
@@ -5,12 +5,13 @@ import (
"testing"
"time"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/stretchr/testify/require"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/stretchr/testify/require"
)
func TestJobActivityVisibilityFiltersBeforePagination(t *testing.T) {
diff --git a/backend/internal/apikey/handler.go b/backend/internal/apikey/handler.go
index 3799bdafc..803ec1508 100644
--- a/backend/internal/apikey/handler.go
+++ b/backend/internal/apikey/handler.go
@@ -6,11 +6,12 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ apikeytypes "github.com/getarcaneapp/arcane/types/v2/apikey"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- apikeytypes "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/internal/apikey/service.go b/backend/internal/apikey/service.go
index c9c5c1537..b5b7a7dbe 100644
--- a/backend/internal/apikey/service.go
+++ b/backend/internal/apikey/service.go
@@ -16,6 +16,11 @@ import (
"sync/atomic"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/apikey"
+ "github.com/samber/hot"
+ "go.getarcane.app/kit/normalization"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/role"
@@ -23,10 +28,6 @@ import (
"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"
- "github.com/samber/hot"
- "go.getarcane.app/kit/normalization"
- "gorm.io/gorm"
)
const (
diff --git a/backend/internal/apikey/service_test.go b/backend/internal/apikey/service_test.go
index 3f350286a..c909bba9c 100644
--- a/backend/internal/apikey/service_test.go
+++ b/backend/internal/apikey/service_test.go
@@ -9,6 +9,11 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/apikey"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/role"
@@ -17,10 +22,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"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/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func setupAPIKeyServiceTestDB(t *testing.T) *database.DB {
diff --git a/backend/internal/apns/handler.go b/backend/internal/apns/handler.go
index 4dd7ff2f0..01464636c 100644
--- a/backend/internal/apns/handler.go
+++ b/backend/internal/apns/handler.go
@@ -6,10 +6,11 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
apnstypes "github.com/getarcaneapp/arcane/types/v2/apns"
"github.com/getarcaneapp/arcane/types/v2/base"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
type ApnsHandler struct {
diff --git a/backend/internal/apns/service.go b/backend/internal/apns/service.go
index 209af3c3a..1c668855d 100644
--- a/backend/internal/apns/service.go
+++ b/backend/internal/apns/service.go
@@ -20,6 +20,11 @@ import (
"time"
"uuid"
+ apnstypes "github.com/getarcaneapp/arcane/types/v2/apns"
+ "go.getarcane.app/kit/normalization"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -29,10 +34,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
- apnstypes "github.com/getarcaneapp/arcane/types/v2/apns"
- "go.getarcane.app/kit/normalization"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
const (
diff --git a/backend/internal/appimages/service.go b/backend/internal/appimages/service.go
index 8d3c6ea60..7863a7489 100644
--- a/backend/internal/appimages/service.go
+++ b/backend/internal/appimages/service.go
@@ -8,9 +8,10 @@ import (
"strings"
"sync"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
type ApplicationImagesService struct {
diff --git a/backend/internal/auth/buildables.go b/backend/internal/auth/buildables.go
index 8a9afb7a7..24d4b3991 100644
--- a/backend/internal/auth/buildables.go
+++ b/backend/internal/auth/buildables.go
@@ -6,8 +6,9 @@ import (
"context"
"log/slog"
- "github.com/getarcaneapp/arcane/backend/v2/buildables"
"github.com/getarcaneapp/arcane/types/v2/auth"
+
+ "github.com/getarcaneapp/arcane/backend/v2/buildables"
)
// GetAutoLoginConfig returns the auto-login configuration for the frontend.
diff --git a/backend/internal/auth/buildables_test.go b/backend/internal/auth/buildables_test.go
index e134ec877..4f058fd6d 100644
--- a/backend/internal/auth/buildables_test.go
+++ b/backend/internal/auth/buildables_test.go
@@ -6,9 +6,10 @@ import (
"context"
"testing"
+ "github.com/stretchr/testify/require"
+
"github.com/getarcaneapp/arcane/backend/v2/buildables"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/stretchr/testify/require"
)
func enableAutoLoginFeature(t *testing.T) {
diff --git a/backend/internal/auth/handler.go b/backend/internal/auth/handler.go
index 655fcb8b4..2dba4aa32 100644
--- a/backend/internal/auth/handler.go
+++ b/backend/internal/auth/handler.go
@@ -17,6 +17,12 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
+ usertypes "github.com/getarcaneapp/arcane/types/v2/user"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/internal/session"
@@ -25,11 +31,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
- authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/getarcaneapp/arcane/types/v2/base"
- settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
- usertypes "github.com/getarcaneapp/arcane/types/v2/user"
- kit "go.getarcane.app/kit/pkg"
)
type AuthHandler struct {
diff --git a/backend/internal/auth/huma_middleware.go b/backend/internal/auth/huma_middleware.go
index 706dbf6e3..e67a9c9d2 100644
--- a/backend/internal/auth/huma_middleware.go
+++ b/backend/internal/auth/huma_middleware.go
@@ -8,6 +8,8 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -16,7 +18,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
)
// securityRequirements holds parsed security requirements from an operation.
diff --git a/backend/internal/auth/huma_middleware_test.go b/backend/internal/auth/huma_middleware_test.go
index e84b6671d..ecfc53b91 100644
--- a/backend/internal/auth/huma_middleware_test.go
+++ b/backend/internal/auth/huma_middleware_test.go
@@ -11,6 +11,14 @@ import (
"github.com/danielgtaylor/huma/v2"
"github.com/danielgtaylor/huma/v2/adapters/humaecho"
+ authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/labstack/echo/v5"
+ "github.com/lestrrat-go/jwx/v4/jwa"
+ "github.com/lestrrat-go/jwx/v4/jwt"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -21,13 +29,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
- authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/labstack/echo/v5"
- "github.com/lestrrat-go/jwx/v4/jwa"
- "github.com/lestrrat-go/jwx/v4/jwt"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
type secureInput struct{}
diff --git a/backend/internal/auth/middleware.go b/backend/internal/auth/middleware.go
index dc7f64a6f..e37b7a367 100644
--- a/backend/internal/auth/middleware.go
+++ b/backend/internal/auth/middleware.go
@@ -8,6 +8,9 @@ import (
"net/http"
"strings"
+ "github.com/labstack/echo/v5"
+ "github.com/samber/mo"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -15,8 +18,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
- "github.com/labstack/echo/v5"
- "github.com/samber/mo"
)
type AuthOptions struct {
diff --git a/backend/internal/auth/middleware_test.go b/backend/internal/auth/middleware_test.go
index 01f86d586..1e5673483 100644
--- a/backend/internal/auth/middleware_test.go
+++ b/backend/internal/auth/middleware_test.go
@@ -7,6 +7,10 @@ import (
"testing"
"time"
+ authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/labstack/echo/v5"
+ "github.com/stretchr/testify/require"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -15,9 +19,6 @@ import (
usersvc "github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
- authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/labstack/echo/v5"
- "github.com/stretchr/testify/require"
)
type testEnvironmentTokenResolver struct {
diff --git a/backend/internal/auth/module.go b/backend/internal/auth/module.go
index 36c98715e..0073eb41d 100644
--- a/backend/internal/auth/module.go
+++ b/backend/internal/auth/module.go
@@ -6,9 +6,10 @@ import (
"context"
"github.com/danielgtaylor/huma/v2"
+ authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
- authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
)
type Module struct {
diff --git a/backend/internal/auth/service.go b/backend/internal/auth/service.go
index 3216e4193..1d857c4b4 100644
--- a/backend/internal/auth/service.go
+++ b/backend/internal/auth/service.go
@@ -14,6 +14,13 @@ import (
"time"
"uuid"
+ "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/lestrrat-go/jwx/v4/jwa"
+ "github.com/lestrrat-go/jwx/v4/jwt"
+ "github.com/samber/hot"
+ "go.getarcane.app/kit/normalization"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -25,12 +32,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
- "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/lestrrat-go/jwx/v4/jwa"
- "github.com/lestrrat-go/jwx/v4/jwt"
- "github.com/samber/hot"
- "go.getarcane.app/kit/normalization"
- kit "go.getarcane.app/kit/pkg"
)
var (
diff --git a/backend/internal/auth/service_test.go b/backend/internal/auth/service_test.go
index 18d354bd3..3ef5cf5ef 100644
--- a/backend/internal/auth/service_test.go
+++ b/backend/internal/auth/service_test.go
@@ -9,6 +9,15 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/lestrrat-go/jwx/v4/jwa"
+ "github.com/lestrrat-go/jwx/v4/jwt"
+ "github.com/libtnb/sqlite"
+ "github.com/samber/hot"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -18,14 +27,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/session"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
- "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/lestrrat-go/jwx/v4/jwa"
- "github.com/lestrrat-go/jwx/v4/jwt"
- "github.com/libtnb/sqlite"
- "github.com/samber/hot"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func setupAuthServiceTestDB(t *testing.T) *database.DB {
diff --git a/backend/internal/auth/token.go b/backend/internal/auth/token.go
index 3b7210d1b..c0ebaab79 100644
--- a/backend/internal/auth/token.go
+++ b/backend/internal/auth/token.go
@@ -6,11 +6,12 @@ import (
"errors"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/lestrrat-go/jwx/v4/jwa"
"github.com/lestrrat-go/jwx/v4/jws"
"github.com/lestrrat-go/jwx/v4/jwt"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
const (
diff --git a/backend/internal/backup/engine.go b/backend/internal/backup/engine.go
index 3eb27086a..4a2f2c392 100644
--- a/backend/internal/backup/engine.go
+++ b/backend/internal/backup/engine.go
@@ -23,13 +23,6 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/image"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- rusticruntime "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/rustic"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/italypaleale/francis/actor"
@@ -39,6 +32,14 @@ import (
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/image"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ rusticruntime "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/rustic"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
)
const (
diff --git a/backend/internal/backup/engine_test.go b/backend/internal/backup/engine_test.go
index eef8dc481..b343bd7e3 100644
--- a/backend/internal/backup/engine_test.go
+++ b/backend/internal/backup/engine_test.go
@@ -3,12 +3,13 @@ package backup
import (
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/libtnb/sqlite"
"github.com/moby/moby/api/types/mount"
"github.com/stretchr/testify/require"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
func TestMarkSnapshotDirectoriesInternal(t *testing.T) {
diff --git a/backend/internal/backup/policies.go b/backend/internal/backup/policies.go
index 2f6bf1f3c..0e22993aa 100644
--- a/backend/internal/backup/policies.go
+++ b/backend/internal/backup/policies.go
@@ -6,11 +6,12 @@ import (
"fmt"
"strings"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- "gorm.io/gorm"
)
// PolicyReconciliation reconciles a full set of policy updates against the
diff --git a/backend/internal/backup/remote.go b/backend/internal/backup/remote.go
index 21bbb7ae1..0885adc9d 100644
--- a/backend/internal/backup/remote.go
+++ b/backend/internal/backup/remote.go
@@ -6,10 +6,11 @@ import (
"fmt"
"time"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
s3util "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/s3"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
)
var ErrRemoteRepositoryMissing = errors.New("S3 backup storage is missing")
diff --git a/backend/internal/backup/runs.go b/backend/internal/backup/runs.go
index 9c0f48c3e..0d1102f97 100644
--- a/backend/internal/backup/runs.go
+++ b/backend/internal/backup/runs.go
@@ -8,15 +8,16 @@ import (
"sync"
"time"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/italypaleale/francis/actor"
+ "github.com/italypaleale/francis/host/local"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- st "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/italypaleale/francis/actor"
- "github.com/italypaleale/francis/host/local"
)
const backupRunTypeInternal = "backup-run"
diff --git a/backend/internal/backup/runs_test.go b/backend/internal/backup/runs_test.go
index f9e0ced1f..c14b2b390 100644
--- a/backend/internal/backup/runs_test.go
+++ b/backend/internal/backup/runs_test.go
@@ -7,12 +7,13 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
- francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
bt "github.com/getarcaneapp/arcane/types/v2/backup"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
+ francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
)
func TestDurableBackupRestartKeepsCompletionInternal(t *testing.T) {
diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.go
index 8ca1bb1b6..87a394ac3 100644
--- a/backend/internal/bootstrap/bootstrap.go
+++ b/backend/internal/bootstrap/bootstrap.go
@@ -12,6 +12,15 @@ import (
"strings"
"time"
+ httpxtypes "github.com/getarcaneapp/arcane/types/v2/httpx"
+ "github.com/labstack/echo/v5"
+ "github.com/moby/moby/client"
+ "github.com/subosito/gotenv"
+ "go.getarcane.app/streams/logs"
+ "go.getarcane.app/sys/crypto"
+ "go.uber.org/fx"
+ "go.uber.org/fx/fxevent"
+
"github.com/getarcaneapp/arcane/backend/v2/api/ws"
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -32,14 +41,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/startup"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- httpxtypes "github.com/getarcaneapp/arcane/types/v2/httpx"
- "github.com/labstack/echo/v5"
- "github.com/moby/moby/client"
- "github.com/subosito/gotenv"
- "go.getarcane.app/streams/logs"
- "go.getarcane.app/sys/crypto"
- "go.uber.org/fx"
- "go.uber.org/fx/fxevent"
)
func Bootstrap(ctx context.Context) error {
diff --git a/backend/internal/bootstrap/bootstrap_test.go b/backend/internal/bootstrap/bootstrap_test.go
index a3589b9a5..389fde4e1 100644
--- a/backend/internal/bootstrap/bootstrap_test.go
+++ b/backend/internal/bootstrap/bootstrap_test.go
@@ -11,6 +11,17 @@ import (
"testing"
"time"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/labstack/echo/v5"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ libcrypto "go.getarcane.app/sys/crypto"
+ "go.uber.org/fx"
+ "go.uber.org/fx/fxtest"
+ "golang.org/x/net/http2"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/api"
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -28,16 +39,6 @@ import (
francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/labstack/echo/v5"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
- libcrypto "go.getarcane.app/sys/crypto"
- "go.uber.org/fx"
- "go.uber.org/fx/fxtest"
- "golang.org/x/net/http2"
- "gorm.io/gorm"
)
type blockingBusWatcherInternal struct {
diff --git a/backend/internal/bootstrap/buildables_router_bootstrap.go b/backend/internal/bootstrap/buildables_router_bootstrap.go
index a718c1fa8..d24cdf110 100644
--- a/backend/internal/bootstrap/buildables_router_bootstrap.go
+++ b/backend/internal/bootstrap/buildables_router_bootstrap.go
@@ -3,8 +3,9 @@
package bootstrap
import (
- "github.com/getarcaneapp/arcane/backend/v2/api"
"github.com/labstack/echo/v5"
+
+ "github.com/getarcaneapp/arcane/backend/v2/api"
)
func init() {
diff --git a/backend/internal/bootstrap/edge_bootstrap.go b/backend/internal/bootstrap/edge_bootstrap.go
index 9c8132c69..dec29c111 100644
--- a/backend/internal/bootstrap/edge_bootstrap.go
+++ b/backend/internal/bootstrap/edge_bootstrap.go
@@ -7,6 +7,11 @@ import (
"fmt"
"log/slog"
+ notificationdto "github.com/getarcaneapp/arcane/types/v2/notification"
+ "github.com/labstack/echo/v5"
+ kit "go.getarcane.app/kit/pkg"
+ "go.uber.org/fx"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
@@ -15,10 +20,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/notification"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
- notificationdto "github.com/getarcaneapp/arcane/types/v2/notification"
- "github.com/labstack/echo/v5"
- kit "go.getarcane.app/kit/pkg"
- "go.uber.org/fx"
)
// registerEdgeTunnelRoutes configures the manager-side edge tunnel server.
diff --git a/backend/internal/bootstrap/jobs_bootstrap.go b/backend/internal/bootstrap/jobs_bootstrap.go
index 91235dcad..4e766a503 100644
--- a/backend/internal/bootstrap/jobs_bootstrap.go
+++ b/backend/internal/bootstrap/jobs_bootstrap.go
@@ -11,6 +11,10 @@ import (
"sync"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/features"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "go.uber.org/fx"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/apns"
"github.com/getarcaneapp/arcane/backend/v2/internal/backup"
@@ -26,9 +30,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
- "github.com/getarcaneapp/arcane/types/v2/features"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "go.uber.org/fx"
)
func newJobScheduler(appCtx context.Context, lc fx.Lifecycle, cfg *config.Config, runtime *runs.Coordinator, _ *runs.Admission, imageUpdateWatcher *scheduler.ImageUpdateWatcher, analytics *scheduler.AnalyticsJob, systemUpgrade *system.SystemUpgradeService, jobService *job.JobService, backupEngine *backup.Engine, updaterService *updater.UpdaterService, volumes *volume.VolumeService, systemBackups *systembackup.SystemBackupService, gitopsSync *gitops.GitOpsSyncService) (schedulertypes.JobScheduler, error) {
diff --git a/backend/internal/bootstrap/jobs_bootstrap_test.go b/backend/internal/bootstrap/jobs_bootstrap_test.go
index a4ed99212..7bb26ec82 100644
--- a/backend/internal/bootstrap/jobs_bootstrap_test.go
+++ b/backend/internal/bootstrap/jobs_bootstrap_test.go
@@ -6,14 +6,15 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler"
"github.com/getarcaneapp/arcane/types/v2/features"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/stretchr/testify/require"
"go.uber.org/fx/fxtest"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler"
)
type settingsSubscriptionStubInternal struct {
diff --git a/backend/internal/bootstrap/logger_bootstrap.go b/backend/internal/bootstrap/logger_bootstrap.go
index ebb9e1d80..aff9cf68d 100644
--- a/backend/internal/bootstrap/logger_bootstrap.go
+++ b/backend/internal/bootstrap/logger_bootstrap.go
@@ -9,11 +9,12 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/lmittmann/tint"
slogGorm "github.com/orandin/slog-gorm"
"gorm.io/gorm"
"gorm.io/gorm/logger"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
)
type requestLogHandler struct {
diff --git a/backend/internal/bootstrap/playwright_router_bootstrap.go b/backend/internal/bootstrap/playwright_router_bootstrap.go
index 57bb76eb8..b98c134ec 100644
--- a/backend/internal/bootstrap/playwright_router_bootstrap.go
+++ b/backend/internal/bootstrap/playwright_router_bootstrap.go
@@ -5,9 +5,10 @@ package bootstrap
import (
"log/slog"
+ "github.com/labstack/echo/v5"
+
"github.com/getarcaneapp/arcane/backend/v2/api"
"github.com/getarcaneapp/arcane/backend/v2/internal/playwright"
- "github.com/labstack/echo/v5"
)
func init() {
diff --git a/backend/internal/bootstrap/router_bootstrap.go b/backend/internal/bootstrap/router_bootstrap.go
index 3dfd04e59..17e94f351 100644
--- a/backend/internal/bootstrap/router_bootstrap.go
+++ b/backend/internal/bootstrap/router_bootstrap.go
@@ -9,6 +9,12 @@ import (
"path"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2"
+ "github.com/labstack/echo/v5"
+ echomiddleware "github.com/labstack/echo/v5/middleware"
+ slogecho "github.com/samber/slog-echo/v2"
+ "go.uber.org/fx"
+
"github.com/getarcaneapp/arcane/backend/v2/api"
"github.com/getarcaneapp/arcane/backend/v2/api/ws"
"github.com/getarcaneapp/arcane/backend/v2/frontend"
@@ -23,11 +29,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- "github.com/getarcaneapp/arcane/types/v2"
- "github.com/labstack/echo/v5"
- echomiddleware "github.com/labstack/echo/v5/middleware"
- slogecho "github.com/samber/slog-echo/v2"
- "go.uber.org/fx"
)
var (
diff --git a/backend/internal/bootstrap/router_bootstrap_test.go b/backend/internal/bootstrap/router_bootstrap_test.go
index 4fac63a3d..afe8318cd 100644
--- a/backend/internal/bootstrap/router_bootstrap_test.go
+++ b/backend/internal/bootstrap/router_bootstrap_test.go
@@ -9,10 +9,11 @@ import (
"github.com/danielgtaylor/huma/v2"
"github.com/danielgtaylor/huma/v2/adapters/humaecho"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
"github.com/labstack/echo/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
)
func TestNewEchoInternal_DecodesPathParams(t *testing.T) {
diff --git a/backend/internal/bootstrap/server_bootstrap.go b/backend/internal/bootstrap/server_bootstrap.go
index b0f193af1..703d9bbdb 100644
--- a/backend/internal/bootstrap/server_bootstrap.go
+++ b/backend/internal/bootstrap/server_bootstrap.go
@@ -10,14 +10,15 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/labstack/echo/v5"
"go.uber.org/fx"
"google.golang.org/grpc"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
var serverOptions = fx.Options(
diff --git a/backend/internal/build/service.go b/backend/internal/build/service.go
index e5ec0de7b..892ce1ce8 100644
--- a/backend/internal/build/service.go
+++ b/backend/internal/build/service.go
@@ -13,6 +13,15 @@ import (
"strings"
"time"
+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
+ buildapi "go.getarcane.app/builds/api"
+ "go.getarcane.app/builds/pkg/contextsource"
+ buildtypes "go.getarcane.app/builds/types"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/kit/pkg/capture"
+ gitkit "go.getarcane.app/kit/pkg/git"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
@@ -23,14 +32,6 @@ import (
dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
buildgit "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
- buildapi "go.getarcane.app/builds/api"
- "go.getarcane.app/builds/pkg/contextsource"
- buildtypes "go.getarcane.app/builds/types"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/kit/pkg/capture"
- gitkit "go.getarcane.app/kit/pkg/git"
- "gorm.io/gorm"
)
type BuildService struct {
diff --git a/backend/internal/build/service_test.go b/backend/internal/build/service_test.go
index 3cb5c8788..26e50c983 100644
--- a/backend/internal/build/service_test.go
+++ b/backend/internal/build/service_test.go
@@ -12,6 +12,13 @@ import (
"strings"
"testing"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ buildtypes "go.getarcane.app/builds/types"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -19,12 +26,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
buildgit "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
- buildtypes "go.getarcane.app/builds/types"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
func TestBuildService_ResolveBuildRequest_PassesThroughLocalContext(t *testing.T) {
diff --git a/backend/internal/build/workspace_handler.go b/backend/internal/build/workspace_handler.go
index 3c4768c42..e84347b01 100644
--- a/backend/internal/build/workspace_handler.go
+++ b/backend/internal/build/workspace_handler.go
@@ -6,13 +6,14 @@ import (
"path"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+ workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/internal/upload"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
- workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
)
// BuildWorkspaceHandler provides file browsing endpoints for manual build workspaces.
diff --git a/backend/internal/build/workspace_service.go b/backend/internal/build/workspace_service.go
index a71224b94..079dddebb 100644
--- a/backend/internal/build/workspace_service.go
+++ b/backend/internal/build/workspace_service.go
@@ -13,11 +13,12 @@ import (
"path/filepath"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- acfsutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/acfs"
workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
"go.getarcane.app/acfs"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ acfsutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/acfs"
)
const defaultBuildsDirectory = "/builds"
diff --git a/backend/internal/build/workspace_service_test.go b/backend/internal/build/workspace_service_test.go
index 8b17d8054..59b5e1a68 100644
--- a/backend/internal/build/workspace_service_test.go
+++ b/backend/internal/build/workspace_service_test.go
@@ -6,11 +6,12 @@ import (
"path/filepath"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func TestBuildWorkspaceServiceDeleteFileRejectsCurrentDirectoryInternal(t *testing.T) {
diff --git a/backend/internal/common/user.go b/backend/internal/common/user.go
index e1d621941..88bfe0049 100644
--- a/backend/internal/common/user.go
+++ b/backend/internal/common/user.go
@@ -4,8 +4,9 @@ import (
"context"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/types/v2/user"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
type User struct {
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index 7ca63f608..6f1f610dc 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -12,9 +12,10 @@ import (
"strings"
"time"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- kit "go.getarcane.app/kit/pkg"
)
type AppEnvironment string
diff --git a/backend/internal/config/config_test.go b/backend/internal/config/config_test.go
index a9250f0db..2c200ca28 100644
--- a/backend/internal/config/config_test.go
+++ b/backend/internal/config/config_test.go
@@ -7,10 +7,11 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
)
func TestConfig_LoadPermissions(t *testing.T) {
diff --git a/backend/internal/config/schema/schema.go b/backend/internal/config/schema/schema.go
index 66dd1de20..ced593e03 100644
--- a/backend/internal/config/schema/schema.go
+++ b/backend/internal/config/schema/schema.go
@@ -19,9 +19,10 @@ import (
"strconv"
"strings"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- kit "go.getarcane.app/kit/pkg"
)
const (
diff --git a/backend/internal/config/schema/schema_test.go b/backend/internal/config/schema/schema_test.go
index 5ae2949c8..5d3d54134 100644
--- a/backend/internal/config/schema/schema_test.go
+++ b/backend/internal/config/schema/schema_test.go
@@ -7,10 +7,11 @@ import (
"strings"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func TestGenerate_EnvConfigIncludesTaggedFields(t *testing.T) {
diff --git a/backend/internal/container/handler.go b/backend/internal/container/handler.go
index ed525046d..df7bac478 100644
--- a/backend/internal/container/handler.go
+++ b/backend/internal/container/handler.go
@@ -12,6 +12,14 @@ import (
"github.com/containerd/errdefs"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "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"
+ "github.com/samber/mo"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -24,13 +32,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "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"
- "github.com/samber/mo"
- kit "go.getarcane.app/kit/pkg"
)
type ContainerHandler struct {
diff --git a/backend/internal/container/logs.go b/backend/internal/container/logs.go
index 07da81301..7af9903c0 100644
--- a/backend/internal/container/logs.go
+++ b/backend/internal/container/logs.go
@@ -6,10 +6,11 @@ import (
"fmt"
"io"
- dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
"github.com/moby/moby/api/pkg/stdcopy"
"github.com/moby/moby/client"
"go.getarcane.app/docker/compat"
+
+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
)
type demuxedLogsInternal struct {
diff --git a/backend/internal/container/logs_test.go b/backend/internal/container/logs_test.go
index 934a21b50..e3a5cdd25 100644
--- a/backend/internal/container/logs_test.go
+++ b/backend/internal/container/logs_test.go
@@ -11,10 +11,11 @@ import (
"strings"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
)
func newLogsTestServiceInternal(t *testing.T, tty bool, logsBody []byte, gotQuery *url.Values) *ContainerService {
diff --git a/backend/internal/container/module.go b/backend/internal/container/module.go
index 68fba5fe2..79c426e0a 100644
--- a/backend/internal/container/module.go
+++ b/backend/internal/container/module.go
@@ -4,6 +4,7 @@ package container
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
diff --git a/backend/internal/container/resource_stats.go b/backend/internal/container/resource_stats.go
index abe0eecdd..81225f983 100644
--- a/backend/internal/container/resource_stats.go
+++ b/backend/internal/container/resource_stats.go
@@ -11,9 +11,6 @@ import (
"sync"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
@@ -21,6 +18,10 @@ import (
kit "go.getarcane.app/kit/pkg"
containerstats "go.getarcane.app/streams/stats"
"golang.org/x/sync/errgroup"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
const (
diff --git a/backend/internal/container/resource_stats_test.go b/backend/internal/container/resource_stats_test.go
index 014be0fb1..103bdebc4 100644
--- a/backend/internal/container/resource_stats_test.go
+++ b/backend/internal/container/resource_stats_test.go
@@ -12,13 +12,14 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
"github.com/moby/moby/api/types/container"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
type resourceStatsServerInternal struct {
diff --git a/backend/internal/container/service.go b/backend/internal/container/service.go
index 4c451faaf..7358d503e 100644
--- a/backend/internal/container/service.go
+++ b/backend/internal/container/service.go
@@ -16,19 +16,6 @@ import (
"time"
"github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/image"
- "github.com/getarcaneapp/arcane/backend/v2/internal/project"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- 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"
- "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"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
@@ -45,6 +32,20 @@ import (
"go.getarcane.app/updater/labels"
"go.getarcane.app/updater/pkg/utils/tagpolicy"
"golang.org/x/sync/singleflight"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/image"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/project"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ 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"
+ "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"
)
type ContainerService struct {
diff --git a/backend/internal/container/service_test.go b/backend/internal/container/service_test.go
index 5cb4665a9..4a1b5713b 100644
--- a/backend/internal/container/service_test.go
+++ b/backend/internal/container/service_test.go
@@ -14,15 +14,6 @@ import (
"time"
"github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/project"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/libtnb/sqlite"
@@ -32,6 +23,16 @@ import (
"github.com/moby/moby/client"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/project"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
func TestPaginateContainerProjectGroupsKeepsProjectWhole(t *testing.T) {
diff --git a/backend/internal/dashboard/handler.go b/backend/internal/dashboard/handler.go
index fe2f74500..417de4929 100644
--- a/backend/internal/dashboard/handler.go
+++ b/backend/internal/dashboard/handler.go
@@ -8,12 +8,6 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/types/v2/base"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard"
@@ -21,6 +15,13 @@ import (
versiontypes "github.com/getarcaneapp/arcane/types/v2/version"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"go.getarcane.app/streams/agg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
type DashboardHandler struct {
diff --git a/backend/internal/dashboard/module.go b/backend/internal/dashboard/module.go
index d5c210a07..b52047b59 100644
--- a/backend/internal/dashboard/module.go
+++ b/backend/internal/dashboard/module.go
@@ -5,6 +5,7 @@ package dashboard
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
)
diff --git a/backend/internal/dashboard/service.go b/backend/internal/dashboard/service.go
index 3dc972168..98fb8bb36 100644
--- a/backend/internal/dashboard/service.go
+++ b/backend/internal/dashboard/service.go
@@ -9,6 +9,19 @@ import (
"sync/atomic"
"time"
+ "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"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ dockercontainer "github.com/moby/moby/api/types/container"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/cgroup"
+ "go.getarcane.app/updater/labels"
+ "golang.org/x/sync/errgroup"
+ "golang.org/x/sync/singleflight"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/container"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -23,18 +36,6 @@ import (
dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"
- "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"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- dockercontainer "github.com/moby/moby/api/types/container"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/cgroup"
- "go.getarcane.app/updater/labels"
- "golang.org/x/sync/errgroup"
- "golang.org/x/sync/singleflight"
)
const (
diff --git a/backend/internal/dashboard/service_test.go b/backend/internal/dashboard/service_test.go
index fafd88521..c5caa6dec 100644
--- a/backend/internal/dashboard/service_test.go
+++ b/backend/internal/dashboard/service_test.go
@@ -11,19 +11,6 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/container"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
- "github.com/getarcaneapp/arcane/backend/v2/internal/image"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/project"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/volume"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard"
usertypes "github.com/getarcaneapp/arcane/types/v2/user"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
@@ -37,6 +24,20 @@ import (
"github.com/stretchr/testify/require"
"go.getarcane.app/updater/labels"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/container"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/image"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/project"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/volume"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
func setupDashboardServiceTestDB(t *testing.T) (*database.DB, *settings.SettingsService) {
diff --git a/backend/internal/database/database.go b/backend/internal/database/database.go
index 43a9a6ba1..2d3074e74 100644
--- a/backend/internal/database/database.go
+++ b/backend/internal/database/database.go
@@ -15,8 +15,6 @@ import (
"strings"
"time"
- sqliteutil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/sqlite"
- "github.com/getarcaneapp/arcane/backend/v2/resources"
dbtypes "github.com/getarcaneapp/arcane/types/v2/database"
"github.com/libtnb/sqlite"
"github.com/pressly/goose/v3"
@@ -25,6 +23,9 @@ import (
"gorm.io/driver/postgres"
"gorm.io/gorm"
"gorm.io/gorm/logger"
+
+ sqliteutil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/sqlite"
+ "github.com/getarcaneapp/arcane/backend/v2/resources"
)
type DB struct {
diff --git a/backend/internal/database/database_test.go b/backend/internal/database/database_test.go
index aabe8311e..7a66e95d3 100644
--- a/backend/internal/database/database_test.go
+++ b/backend/internal/database/database_test.go
@@ -13,10 +13,11 @@ import (
"testing"
"time"
- sqliteutil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/sqlite"
dbtypes "github.com/getarcaneapp/arcane/types/v2/database"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ sqliteutil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/sqlite"
)
func TestGetEmbeddedMigrationVersions_ProvidersMatch(t *testing.T) {
diff --git a/backend/internal/di/di.go b/backend/internal/di/di.go
index c177ba331..f3d2ce21c 100644
--- a/backend/internal/di/di.go
+++ b/backend/internal/di/di.go
@@ -5,6 +5,8 @@ import (
"context"
"log/slog"
+ "go.uber.org/fx"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/apns"
@@ -49,7 +51,6 @@ import (
activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler"
"github.com/getarcaneapp/arcane/backend/v2/resources"
- "go.uber.org/fx"
)
// ActorOptions provides the durable Francis runtime and admission.
diff --git a/backend/internal/di/di_test.go b/backend/internal/di/di_test.go
index 9616981ad..eac14a41f 100644
--- a/backend/internal/di/di_test.go
+++ b/backend/internal/di/di_test.go
@@ -10,6 +10,13 @@ import (
"testing"
"time"
+ "github.com/libtnb/sqlite"
+ "github.com/moby/moby/api/types/events"
+ "github.com/stretchr/testify/require"
+ "go.uber.org/fx"
+ "go.uber.org/fx/fxtest"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/appimages"
@@ -55,12 +62,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/webhook"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/oidcjwk"
- "github.com/libtnb/sqlite"
- "github.com/moby/moby/api/types/events"
- "github.com/stretchr/testify/require"
- "go.uber.org/fx"
- "go.uber.org/fx/fxtest"
- "gorm.io/gorm"
)
type graphParams struct {
diff --git a/backend/internal/di/providers.go b/backend/internal/di/providers.go
index 421af882c..222f313f0 100644
--- a/backend/internal/di/providers.go
+++ b/backend/internal/di/providers.go
@@ -8,6 +8,11 @@ import (
"time"
"uuid"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ "github.com/moby/moby/api/types/events"
+ "go.getarcane.app/streams/bus"
+ "go.uber.org/fx"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
@@ -41,10 +46,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/oidcjwk"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- "github.com/moby/moby/api/types/events"
- "go.getarcane.app/streams/bus"
- "go.uber.org/fx"
)
func provideActivityModuleInternal(service *activity.ActivityService, environment *environment.EnvironmentService) *activity.Module {
diff --git a/backend/internal/docker/service.go b/backend/internal/docker/service.go
index bece18286..8bb89cb2a 100644
--- a/backend/internal/docker/service.go
+++ b/backend/internal/docker/service.go
@@ -11,12 +11,6 @@ import (
"time"
"github.com/cenkalti/backoff/v5"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
dashboardtypes "github.com/getarcaneapp/arcane/types/v2/dashboard"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/moby/moby/api/types/container"
@@ -31,6 +25,13 @@ import (
"go.getarcane.app/streams/bus"
"golang.org/x/sync/errgroup"
"golang.org/x/sync/singleflight"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
const (
diff --git a/backend/internal/docker/service_test.go b/backend/internal/docker/service_test.go
index ff2fb3517..b3319872c 100644
--- a/backend/internal/docker/service_test.go
+++ b/backend/internal/docker/service_test.go
@@ -10,8 +10,6 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/events"
@@ -19,6 +17,9 @@ import (
"github.com/moby/moby/client"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
)
func TestNewDockerClient_PinsEffectiveAPIVersion(t *testing.T) {
diff --git a/backend/internal/environment/edge_mtls_handler.go b/backend/internal/environment/edge_mtls_handler.go
index 75bd66afd..61b4870b8 100644
--- a/backend/internal/environment/edge_mtls_handler.go
+++ b/backend/internal/environment/edge_mtls_handler.go
@@ -10,9 +10,10 @@ import (
"strings"
"time"
+ typesenvironment "github.com/getarcaneapp/arcane/types/v2/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.Hour
diff --git a/backend/internal/environment/environment.go b/backend/internal/environment/environment.go
index ee43a132e..e537f78e7 100644
--- a/backend/internal/environment/environment.go
+++ b/backend/internal/environment/environment.go
@@ -10,6 +10,14 @@ import (
"time"
"uuid"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"
+ "github.com/samber/hot"
+ "go.getarcane.app/kit/normalization"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -23,13 +31,6 @@ import (
"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/validation"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/containerregistry"
- "github.com/samber/hot"
- "go.getarcane.app/kit/normalization"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
type EnvironmentService struct {
diff --git a/backend/internal/environment/environment_health.go b/backend/internal/environment/environment_health.go
index 848ce192a..57e67177a 100644
--- a/backend/internal/environment/environment_health.go
+++ b/backend/internal/environment/environment_health.go
@@ -8,14 +8,15 @@ import (
"net/http"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/types/v2/environment"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/moby/moby/client"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
)
const (
diff --git a/backend/internal/environment/environment_listing.go b/backend/internal/environment/environment_listing.go
index 0685daebc..831c0b11a 100644
--- a/backend/internal/environment/environment_listing.go
+++ b/backend/internal/environment/environment_listing.go
@@ -5,11 +5,12 @@ import (
"fmt"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/types/v2/environment"
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/kit/pkg/mapping"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
func (s *EnvironmentService) ListEnvironmentsPaginated(ctx context.Context, params pagination.QueryParams, accessibleEnvIDs []string) ([]environment.Environment, pagination.Response, error) {
diff --git a/backend/internal/environment/environment_proxy.go b/backend/internal/environment/environment_proxy.go
index 95eebb289..0ed8bf9f6 100644
--- a/backend/internal/environment/environment_proxy.go
+++ b/backend/internal/environment/environment_proxy.go
@@ -12,6 +12,11 @@ import (
"strings"
"time"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+ "go.getarcane.app/sys/crypto"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/internal/registry"
@@ -21,10 +26,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- "github.com/getarcaneapp/arcane/types/v2/containerregistry"
- "github.com/getarcaneapp/arcane/types/v2/gitops"
- "go.getarcane.app/sys/crypto"
)
// SyncRegistriesToRemoteEnvironments syncs container registries to all eligible remote environments.
diff --git a/backend/internal/environment/environment_swarm_nodes.go b/backend/internal/environment/environment_swarm_nodes.go
index 9456e88ca..7d2c0e1fa 100644
--- a/backend/internal/environment/environment_swarm_nodes.go
+++ b/backend/internal/environment/environment_swarm_nodes.go
@@ -8,8 +8,9 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
)
func (s *EnvironmentService) ListSwarmNodeAgentEnvironments(ctx context.Context, parentEnvironmentID string) ([]Environment, error) {
diff --git a/backend/internal/environment/environment_sync_test.go b/backend/internal/environment/environment_sync_test.go
index 915004350..e67448b15 100644
--- a/backend/internal/environment/environment_sync_test.go
+++ b/backend/internal/environment/environment_sync_test.go
@@ -11,6 +11,13 @@ import (
"sync/atomic"
"testing"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -18,12 +25,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
"github.com/getarcaneapp/arcane/backend/v2/internal/registry"
s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/gitops"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
func setupSyncDBInternal(t *testing.T) *database.DB {
diff --git a/backend/internal/environment/handler.go b/backend/internal/environment/handler.go
index 384d01736..859c62eb1 100644
--- a/backend/internal/environment/handler.go
+++ b/backend/internal/environment/handler.go
@@ -19,6 +19,14 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/environment"
+ "github.com/getarcaneapp/arcane/types/v2/version"
+ "github.com/samber/mo"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/kit/pkg/mapping"
+ "go.getarcane.app/streams/agg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -32,13 +40,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/environment"
- "github.com/getarcaneapp/arcane/types/v2/version"
- "github.com/samber/mo"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/kit/pkg/mapping"
- "go.getarcane.app/streams/agg"
)
const (
diff --git a/backend/internal/environment/module.go b/backend/internal/environment/module.go
index 9ffe9aa82..bfe7f99d1 100644
--- a/backend/internal/environment/module.go
+++ b/backend/internal/environment/module.go
@@ -4,6 +4,7 @@ package environment
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
diff --git a/backend/internal/environment/service_test.go b/backend/internal/environment/service_test.go
index c07f20e27..22338444a 100644
--- a/backend/internal/environment/service_test.go
+++ b/backend/internal/environment/service_test.go
@@ -15,6 +15,17 @@ import (
"time"
"github.com/coder/websocket"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ "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/libtnb/sqlite"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -29,16 +40,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/entityjobs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- "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/libtnb/sqlite"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
func TestEnvironmentService_OverlappingHealthCheckIsSkippedInternal(t *testing.T) {
diff --git a/backend/internal/event/docker_correlation_test.go b/backend/internal/event/docker_correlation_test.go
index f674c34ef..3ec7c6ea0 100644
--- a/backend/internal/event/docker_correlation_test.go
+++ b/backend/internal/event/docker_correlation_test.go
@@ -5,9 +5,10 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
func TestDockerExpectationIdentityAndExpiry(t *testing.T) {
diff --git a/backend/internal/event/docker_events.go b/backend/internal/event/docker_events.go
index 46c73d4f0..bb5b65eeb 100644
--- a/backend/internal/event/docker_events.go
+++ b/backend/internal/event/docker_events.go
@@ -10,10 +10,11 @@ import (
"sync"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/moby/moby/api/types/events"
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/streams/bus"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
const daemonEventChanBuffer = 256
diff --git a/backend/internal/event/docker_events_test.go b/backend/internal/event/docker_events_test.go
index 7b235e64f..0f7bfee3d 100644
--- a/backend/internal/event/docker_events_test.go
+++ b/backend/internal/event/docker_events_test.go
@@ -8,12 +8,13 @@ import (
"testing/synctest"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/moby/moby/api/types/events"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/streams/bus"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
func TestMapDaemonEventInternal(t *testing.T) {
diff --git a/backend/internal/event/handler.go b/backend/internal/event/handler.go
index afffbcd26..5df43569c 100644
--- a/backend/internal/event/handler.go
+++ b/backend/internal/event/handler.go
@@ -7,12 +7,13 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/types/v2/base"
eventtypes "github.com/getarcaneapp/arcane/types/v2/event"
"github.com/labstack/echo/v5"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
// EventHandler handles event management endpoints.
diff --git a/backend/internal/event/service.go b/backend/internal/event/service.go
index 6b9c2a1e1..2287104b0 100644
--- a/backend/internal/event/service.go
+++ b/backend/internal/event/service.go
@@ -14,13 +14,6 @@ import (
"strings"
"time"
- "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/pkg/libarcane/edge"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
eventtypes "github.com/getarcaneapp/arcane/types/v2/event"
"github.com/samber/mo"
"github.com/samber/mo/option"
@@ -30,6 +23,14 @@ import (
"golang.org/x/text/language"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "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/pkg/libarcane/edge"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
)
type EventService struct {
diff --git a/backend/internal/event/service_test.go b/backend/internal/event/service_test.go
index 8a40dd2fb..ccee0edbe 100644
--- a/backend/internal/event/service_test.go
+++ b/backend/internal/event/service_test.go
@@ -9,15 +9,16 @@ import (
"testing"
"time"
- "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/pkg/pagination"
"github.com/libtnb/sqlite"
"github.com/moby/moby/api/types/events"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "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/pkg/pagination"
)
func setupEventServiceTestDB(t *testing.T) *database.DB {
diff --git a/backend/internal/federated/credential.go b/backend/internal/federated/credential.go
index f069144d5..b5ff2718c 100644
--- a/backend/internal/federated/credential.go
+++ b/backend/internal/federated/credential.go
@@ -8,13 +8,14 @@ import (
"net/url"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/auth"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
"github.com/samber/mo"
"go.getarcane.app/kit/normalization"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/auth"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
func normalizeCreateFederatedCredentialInternal(req federatedtypes.CreateFederatedCredential) (federatedtypes.CreateFederatedCredential, error) {
diff --git a/backend/internal/federated/exchange.go b/backend/internal/federated/exchange.go
index feed9dd11..2fabf7593 100644
--- a/backend/internal/federated/exchange.go
+++ b/backend/internal/federated/exchange.go
@@ -11,14 +11,15 @@ import (
"time"
"github.com/coreos/go-oidc/v3/oidc"
+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
+ "github.com/samber/mo"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/oidcjwk"
- federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
- "github.com/samber/mo"
- kit "go.getarcane.app/kit/pkg"
)
func (s *FederatedCredentialService) ExchangeToken(ctx context.Context, req federatedtypes.TokenExchangeRequest) (*federatedtypes.FederatedTokenResponse, error) {
diff --git a/backend/internal/federated/handler.go b/backend/internal/federated/handler.go
index ca0d04bc1..f7396bdbe 100644
--- a/backend/internal/federated/handler.go
+++ b/backend/internal/federated/handler.go
@@ -6,13 +6,14 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
+ "github.com/labstack/echo/v5"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
- "github.com/labstack/echo/v5"
)
// FederatedCredentialHandler provides Huma-based federated credential
diff --git a/backend/internal/federated/playwright.go b/backend/internal/federated/playwright.go
index 26dc218e4..7bae42b9e 100644
--- a/backend/internal/federated/playwright.go
+++ b/backend/internal/federated/playwright.go
@@ -9,10 +9,11 @@ import (
"strings"
"uuid"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/role"
- "gorm.io/gorm"
)
// CreatePlaywrightCredential creates the service identity, credential, and role
diff --git a/backend/internal/federated/service.go b/backend/internal/federated/service.go
index f0945933d..c615994f9 100644
--- a/backend/internal/federated/service.go
+++ b/backend/internal/federated/service.go
@@ -11,6 +11,12 @@ import (
"uuid"
"github.com/coreos/go-oidc/v3/oidc"
+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
+ httpxtypes "github.com/getarcaneapp/arcane/types/v2/httpx"
+ "github.com/samber/mo"
+ "golang.org/x/sync/singleflight"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -23,11 +29,6 @@ import (
"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/oidcjwk"
- federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
- httpxtypes "github.com/getarcaneapp/arcane/types/v2/httpx"
- "github.com/samber/mo"
- "golang.org/x/sync/singleflight"
- "gorm.io/gorm"
)
const (
diff --git a/backend/internal/federated/service_test.go b/backend/internal/federated/service_test.go
index 1a8ae7485..731c715ef 100644
--- a/backend/internal/federated/service_test.go
+++ b/backend/internal/federated/service_test.go
@@ -13,6 +13,15 @@ import (
"testing"
"time"
+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
+ "github.com/lestrrat-go/jwx/v4/jwa"
+ "github.com/lestrrat-go/jwx/v4/jws"
+ "github.com/lestrrat-go/jwx/v4/jwt"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -24,14 +33,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/oidcjwk"
- federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
- "github.com/lestrrat-go/jwx/v4/jwa"
- "github.com/lestrrat-go/jwx/v4/jws"
- "github.com/lestrrat-go/jwx/v4/jwt"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
type federatedTestIssuerInternal struct {
diff --git a/backend/internal/gitops/backup.go b/backend/internal/gitops/backup.go
index 5f84bab06..b9a88233c 100644
--- a/backend/internal/gitops/backup.go
+++ b/backend/internal/gitops/backup.go
@@ -15,12 +15,6 @@ import (
"sync"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- projectpkg "github.com/getarcaneapp/arcane/backend/v2/internal/project"
- git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/getarcaneapp/arcane/types/v2/gitops"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
@@ -28,6 +22,13 @@ import (
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ projectpkg "github.com/getarcaneapp/arcane/backend/v2/internal/project"
+ git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
const (
diff --git a/backend/internal/gitops/backup_test.go b/backend/internal/gitops/backup_test.go
index c2206212f..ebb49db6e 100644
--- a/backend/internal/gitops/backup_test.go
+++ b/backend/internal/gitops/backup_test.go
@@ -9,14 +9,6 @@ import (
"testing"
"time"
- "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/environment"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
- projectpkg "github.com/getarcaneapp/arcane/backend/v2/internal/project"
- git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"
"github.com/getarcaneapp/arcane/types/v2/gitops"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/go-git/go-billy/v5/osfs"
@@ -26,6 +18,15 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
+
+ "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/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
+ projectpkg "github.com/getarcaneapp/arcane/backend/v2/internal/project"
+ git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"
)
var installBackupTestTransportOnceInternal sync.Once
diff --git a/backend/internal/gitops/gitops_sync.go b/backend/internal/gitops/gitops_sync.go
index d5db703d7..e74bd0e71 100644
--- a/backend/internal/gitops/gitops_sync.go
+++ b/backend/internal/gitops/gitops_sync.go
@@ -17,6 +17,19 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
+ gogit "github.com/go-git/go-git/v5"
+ "github.com/go-git/go-git/v5/plumbing"
+ "go.getarcane.app/acfs"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/kit/pkg/mapping"
+ "gorm.io/gorm"
+ "gorm.io/gorm/clause"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
@@ -30,18 +43,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/gitops"
- projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
- gogit "github.com/go-git/go-git/v5"
- "github.com/go-git/go-git/v5/plumbing"
- "go.getarcane.app/acfs"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/kit/pkg/mapping"
- "gorm.io/gorm"
- "gorm.io/gorm/clause"
)
type GitOpsSyncService struct {
diff --git a/backend/internal/gitops/handler.go b/backend/internal/gitops/handler.go
index c69ee73d9..e8f33fdd3 100644
--- a/backend/internal/gitops/handler.go
+++ b/backend/internal/gitops/handler.go
@@ -5,13 +5,14 @@ import (
"context"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/internal/project"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/gitops"
)
// GitOpsSyncHandler handles GitOps sync management endpoints.
diff --git a/backend/internal/gitops/service_test.go b/backend/internal/gitops/service_test.go
index ff3407ffa..35db493f8 100644
--- a/backend/internal/gitops/service_test.go
+++ b/backend/internal/gitops/service_test.go
@@ -11,6 +11,15 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -25,14 +34,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/entityjobs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/gitops"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func setupGitOpsProjectTestDBInternal(t *testing.T) *database.DB {
diff --git a/backend/internal/gitops/service_unix_test.go b/backend/internal/gitops/service_unix_test.go
index a46df0858..12463298c 100644
--- a/backend/internal/gitops/service_unix_test.go
+++ b/backend/internal/gitops/service_unix_test.go
@@ -9,11 +9,12 @@ import (
"path/filepath"
"testing"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
projectpkg "github.com/getarcaneapp/arcane/backend/v2/internal/project"
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
)
// TestGitOpsSyncService_SyncProjectDirectory_PreservesUnreadableBindMountData verifies
diff --git a/backend/internal/gitrepo/handler.go b/backend/internal/gitrepo/handler.go
index af12d10eb..d239aaafa 100644
--- a/backend/internal/gitrepo/handler.go
+++ b/backend/internal/gitrepo/handler.go
@@ -4,11 +4,12 @@ import (
"context"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/gitops"
)
// GitRepositoryHandler handles git repository management endpoints.
diff --git a/backend/internal/gitrepo/service.go b/backend/internal/gitrepo/service.go
index fa2301d41..283e017fd 100644
--- a/backend/internal/gitrepo/service.go
+++ b/backend/internal/gitrepo/service.go
@@ -7,6 +7,14 @@ import (
"fmt"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+ "github.com/samber/mo"
+ "go.getarcane.app/builds/pkg/contextsource"
+ "go.getarcane.app/kit/normalization"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
@@ -16,13 +24,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/gitops"
- "github.com/samber/mo"
- "go.getarcane.app/builds/pkg/contextsource"
- "go.getarcane.app/kit/normalization"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
type GitRepositoryService struct {
diff --git a/backend/internal/gitrepo/service_test.go b/backend/internal/gitrepo/service_test.go
index 980804434..3584a3e58 100644
--- a/backend/internal/gitrepo/service_test.go
+++ b/backend/internal/gitrepo/service_test.go
@@ -7,12 +7,6 @@ import (
"strings"
"testing"
- "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/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/getarcaneapp/arcane/types/v2/gitops"
"github.com/libtnb/sqlite"
@@ -21,6 +15,13 @@ import (
"go.getarcane.app/kit/pkg/mapping"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "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/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
func setupGitRepositoryServiceTestInternal(t *testing.T) (*GitRepositoryService, *database.DB) {
diff --git a/backend/internal/image/handler.go b/backend/internal/image/handler.go
index 36063a6f3..15a50f80c 100644
--- a/backend/internal/image/handler.go
+++ b/backend/internal/image/handler.go
@@ -11,6 +11,15 @@ import (
"github.com/containerd/platforms"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/image"
+ "github.com/getarcaneapp/arcane/types/v2/system"
+ uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+ buildtypes "go.getarcane.app/builds/types"
+ kit "go.getarcane.app/kit/pkg"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/build"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -24,14 +33,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/image"
- "github.com/getarcaneapp/arcane/types/v2/system"
- uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
- buildtypes "go.getarcane.app/builds/types"
- kit "go.getarcane.app/kit/pkg"
- "gorm.io/gorm"
)
// ImageHandler provides Huma-based image management endpoints.
diff --git a/backend/internal/image/image.go b/backend/internal/image/image.go
index 8a225e21f..ecdd87fad 100644
--- a/backend/internal/image/image.go
+++ b/backend/internal/image/image.go
@@ -13,18 +13,6 @@ import (
"time"
ref "github.com/distribution/reference"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
- "github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
- 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/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
@@ -38,6 +26,19 @@ import (
"go.getarcane.app/updater"
"go.getarcane.app/updater/pkg/utils/tagpolicy"
"golang.org/x/sync/errgroup"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
+ 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/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
type ImageService struct {
diff --git a/backend/internal/image/image_attestations.go b/backend/internal/image/image_attestations.go
index f901d8148..20d672550 100644
--- a/backend/internal/image/image_attestations.go
+++ b/backend/internal/image/image_attestations.go
@@ -14,7 +14,6 @@ import (
"strings"
"github.com/containerd/platforms"
- utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/name"
@@ -24,6 +23,8 @@ import (
"github.com/klauspost/compress/zstd"
attestationTypes "github.com/moby/buildkit/util/attestation"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+
+ utilsregistry "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"
)
const (
diff --git a/backend/internal/image/module.go b/backend/internal/image/module.go
index 9d8886090..657dced84 100644
--- a/backend/internal/image/module.go
+++ b/backend/internal/image/module.go
@@ -3,6 +3,7 @@ package image
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/build"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
diff --git a/backend/internal/image/service_test.go b/backend/internal/image/service_test.go
index 995b9483f..7a8884317 100644
--- a/backend/internal/image/service_test.go
+++ b/backend/internal/image/service_test.go
@@ -13,17 +13,6 @@ import (
"testing"
"time"
- "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/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/libtnb/sqlite"
@@ -37,6 +26,18 @@ import (
"github.com/stretchr/testify/require"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "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/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
var imageDockerAPIVersionPrefixInternal = regexp.MustCompile(`^/v[0-9]+\.[0-9]+`)
diff --git a/backend/internal/imagepatch/handler.go b/backend/internal/imagepatch/handler.go
index fbd2c5bfe..77b80bc61 100644
--- a/backend/internal/imagepatch/handler.go
+++ b/backend/internal/imagepatch/handler.go
@@ -6,13 +6,14 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/features"
+ "github.com/getarcaneapp/arcane/types/v2/imagepatch"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/features"
- "github.com/getarcaneapp/arcane/types/v2/imagepatch"
)
// ImagePatchHandler provides Huma-based image patching endpoints.
diff --git a/backend/internal/imagepatch/imagepatch.go b/backend/internal/imagepatch/imagepatch.go
index dcb7b3b43..348ac671a 100644
--- a/backend/internal/imagepatch/imagepatch.go
+++ b/backend/internal/imagepatch/imagepatch.go
@@ -16,18 +16,6 @@ import (
"github.com/containerd/platforms"
"github.com/distribution/reference"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
- activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/logging"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
"github.com/getarcaneapp/arcane/types/v2/features"
"github.com/getarcaneapp/arcane/types/v2/imagepatch"
@@ -42,6 +30,19 @@ import (
copatypes "github.com/project-copacetic/copacetic/pkg/types"
"github.com/samber/mo"
"go.getarcane.app/acfs"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/logging"
)
// ImagePatchService patches image OS packages in place using the Copacetic
diff --git a/backend/internal/imagepatch/imagepatch_feature_test.go b/backend/internal/imagepatch/imagepatch_feature_test.go
index 9976c0dea..c72102451 100644
--- a/backend/internal/imagepatch/imagepatch_feature_test.go
+++ b/backend/internal/imagepatch/imagepatch_feature_test.go
@@ -8,6 +8,13 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/features"
+ "github.com/getarcaneapp/arcane/types/v2/imagepatch"
+ "github.com/libtnb/sqlite"
+ "github.com/moby/moby/client"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -15,12 +22,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/types/v2/features"
- "github.com/getarcaneapp/arcane/types/v2/imagepatch"
- "github.com/libtnb/sqlite"
- "github.com/moby/moby/client"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func patchFeatureSettingsInternal(t *testing.T) (*settings.SettingsService, *database.DB) {
diff --git a/backend/internal/imagepatch/imagepatch_test.go b/backend/internal/imagepatch/imagepatch_test.go
index 81a7e0c39..defeb1307 100644
--- a/backend/internal/imagepatch/imagepatch_test.go
+++ b/backend/internal/imagepatch/imagepatch_test.go
@@ -6,14 +6,15 @@ import (
"testing"
"time"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func TestResolvePatchedRef(t *testing.T) {
diff --git a/backend/internal/imagepatch/model.go b/backend/internal/imagepatch/model.go
index 6f9531a47..6cdb8712c 100644
--- a/backend/internal/imagepatch/model.go
+++ b/backend/internal/imagepatch/model.go
@@ -1,8 +1,9 @@
package imagepatch
import (
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/types/v2/imagepatch"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
// ImagePatchRecord stores one Copacetic image patch run.
diff --git a/backend/internal/imagepatch/module.go b/backend/internal/imagepatch/module.go
index 6b1f58d17..39964f6b2 100644
--- a/backend/internal/imagepatch/module.go
+++ b/backend/internal/imagepatch/module.go
@@ -3,6 +3,7 @@ package imagepatch
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
diff --git a/backend/internal/imageupdate/handler.go b/backend/internal/imageupdate/handler.go
index cc3674357..1b2b7128c 100644
--- a/backend/internal/imageupdate/handler.go
+++ b/backend/internal/imageupdate/handler.go
@@ -6,14 +6,15 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/types/v2/base"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/getarcaneapp/arcane/types/v2/imageupdate"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
type ImageUpdateHandler struct {
diff --git a/backend/internal/imageupdate/image_update.go b/backend/internal/imageupdate/image_update.go
index 841f3ec8f..c660f70ac 100644
--- a/backend/internal/imageupdate/image_update.go
+++ b/backend/internal/imageupdate/image_update.go
@@ -14,6 +14,20 @@ import (
cerrdefs "github.com/containerd/errdefs"
ref "github.com/distribution/reference"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"
+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"
+ "github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/api/types/image"
+ "github.com/moby/moby/client"
+ "github.com/samber/mo"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/crypto"
+ "go.getarcane.app/updater/digest"
+ "go.getarcane.app/updater/refs"
+ "golang.org/x/sync/errgroup"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -30,19 +44,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/containerregistry"
- "github.com/getarcaneapp/arcane/types/v2/imageupdate"
- "github.com/moby/moby/api/types/container"
- "github.com/moby/moby/api/types/image"
- "github.com/moby/moby/client"
- "github.com/samber/mo"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/crypto"
- "go.getarcane.app/updater/digest"
- "go.getarcane.app/updater/refs"
- "golang.org/x/sync/errgroup"
- "gorm.io/gorm"
)
type ImageUpdateService struct {
diff --git a/backend/internal/imageupdate/model.go b/backend/internal/imageupdate/model.go
index 652d42950..70e049b1d 100644
--- a/backend/internal/imageupdate/model.go
+++ b/backend/internal/imageupdate/model.go
@@ -3,9 +3,10 @@ package imageupdate
import (
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/samber/mo"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
type ImageUpdateRecord struct {
diff --git a/backend/internal/imageupdate/module.go b/backend/internal/imageupdate/module.go
index 2af798dba..414e7a622 100644
--- a/backend/internal/imageupdate/module.go
+++ b/backend/internal/imageupdate/module.go
@@ -5,8 +5,9 @@ import (
"context"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
type Module struct {
diff --git a/backend/internal/imageupdate/service_test.go b/backend/internal/imageupdate/service_test.go
index 68df16ce5..77c445298 100644
--- a/backend/internal/imageupdate/service_test.go
+++ b/backend/internal/imageupdate/service_test.go
@@ -14,17 +14,6 @@ import (
"time"
ref "github.com/distribution/reference"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/notification"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
"github.com/getarcaneapp/arcane/types/v2/imageupdate"
@@ -43,6 +32,18 @@ import (
"go.getarcane.app/sys/crypto"
"go.getarcane.app/updater/labels"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/notification"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
)
type fakeRegistryDaemonClient struct {
diff --git a/backend/internal/imageupdate/tag_updates.go b/backend/internal/imageupdate/tag_updates.go
index 2438516fc..d37eacaf0 100644
--- a/backend/internal/imageupdate/tag_updates.go
+++ b/backend/internal/imageupdate/tag_updates.go
@@ -9,12 +9,6 @@ import (
"sync"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
imageupdatetypes "github.com/getarcaneapp/arcane/types/v2/imageupdate"
"github.com/moby/moby/api/types/container"
@@ -25,6 +19,13 @@ import (
"golang.org/x/sync/errgroup"
"golang.org/x/sync/singleflight"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
const (
diff --git a/backend/internal/job/activity.go b/backend/internal/job/activity.go
index 307832bc5..ebacb8b46 100644
--- a/backend/internal/job/activity.go
+++ b/backend/internal/job/activity.go
@@ -6,9 +6,10 @@ import (
"strings"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/types/v2/meta"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
)
// ActivityID assigns a summary identity before a visible run is persisted.
diff --git a/backend/internal/job/activity_test.go b/backend/internal/job/activity_test.go
index b95cb451a..cc284721b 100644
--- a/backend/internal/job/activity_test.go
+++ b/backend/internal/job/activity_test.go
@@ -6,12 +6,13 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
func newJobActivityTestServiceInternal(t *testing.T) (*JobService, *activity.ActivityService, *database.DB) {
diff --git a/backend/internal/job/execution.go b/backend/internal/job/execution.go
index add6a7e28..0883ef6ac 100644
--- a/backend/internal/job/execution.go
+++ b/backend/internal/job/execution.go
@@ -8,15 +8,16 @@ import (
"net"
"strings"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/meta"
+ st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/meta"
- st "github.com/getarcaneapp/arcane/types/v2/scheduler"
- kit "go.getarcane.app/kit/pkg"
)
// Submit validates job eligibility and persists acceptance before execution.
diff --git a/backend/internal/job/handler.go b/backend/internal/job/handler.go
index 434701e8b..d178bd4ca 100644
--- a/backend/internal/job/handler.go
+++ b/backend/internal/job/handler.go
@@ -5,13 +5,14 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/jobschedule"
+ st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/jobschedule"
- st "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
type GetJobSchedulesInput struct {
diff --git a/backend/internal/job/module.go b/backend/internal/job/module.go
index e1fc6bfb0..638ba0202 100644
--- a/backend/internal/job/module.go
+++ b/backend/internal/job/module.go
@@ -3,6 +3,7 @@ package job
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
)
diff --git a/backend/internal/job/remote.go b/backend/internal/job/remote.go
index bda5cd2dd..89cce28c6 100644
--- a/backend/internal/job/remote.go
+++ b/backend/internal/job/remote.go
@@ -9,13 +9,14 @@ import (
"sort"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/types/v2/jobschedule"
"github.com/getarcaneapp/arcane/types/v2/meta"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
)
func remoteFailureInternal(err error) (st.Outcome, error) {
diff --git a/backend/internal/job/remote_history.go b/backend/internal/job/remote_history.go
index f3345e1e0..c0816186b 100644
--- a/backend/internal/job/remote_history.go
+++ b/backend/internal/job/remote_history.go
@@ -8,9 +8,10 @@ import (
"sort"
"strconv"
+ st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
- st "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
// ListRuns merges agent history with requests accepted by this manager.
diff --git a/backend/internal/job/remote_resolution.go b/backend/internal/job/remote_resolution.go
index f7523a073..6bea81000 100644
--- a/backend/internal/job/remote_resolution.go
+++ b/backend/internal/job/remote_resolution.go
@@ -8,10 +8,11 @@ import (
"net/url"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/types/v2/jobschedule"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
)
// TODO(v3): remove adoption of legacy agent-owned runs.
diff --git a/backend/internal/job/remote_resolution_test.go b/backend/internal/job/remote_resolution_test.go
index 7cd8e15d2..d576eaeef 100644
--- a/backend/internal/job/remote_resolution_test.go
+++ b/backend/internal/job/remote_resolution_test.go
@@ -9,14 +9,15 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/types/v2/jobschedule"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
)
func TestResolveRemoteRunConfirmsOwnerAfterLostResponse(t *testing.T) {
diff --git a/backend/internal/job/resolution.go b/backend/internal/job/resolution.go
index ba33acdf1..7d168686a 100644
--- a/backend/internal/job/resolution.go
+++ b/backend/internal/job/resolution.go
@@ -5,10 +5,11 @@ import (
"errors"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/types/v2/jobschedule"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
)
// ResolveRun records legacy operator review.
diff --git a/backend/internal/job/resolution_test.go b/backend/internal/job/resolution_test.go
index f01f94717..cf172f850 100644
--- a/backend/internal/job/resolution_test.go
+++ b/backend/internal/job/resolution_test.go
@@ -4,10 +4,11 @@ import (
"context"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
)
func TestResolveRunChecksCurrentOperatorPermission(t *testing.T) {
diff --git a/backend/internal/job/run_routes.go b/backend/internal/job/run_routes.go
index 4dd213639..dee537a93 100644
--- a/backend/internal/job/run_routes.go
+++ b/backend/internal/job/run_routes.go
@@ -7,12 +7,13 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/jobschedule"
+ st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/jobschedule"
- st "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
func (h *JobSchedulesHandler) registerRunRoutesInternal(api huma.API) {
diff --git a/backend/internal/job/runtime_status.go b/backend/internal/job/runtime_status.go
index bddb7bd85..4a1e96893 100644
--- a/backend/internal/job/runtime_status.go
+++ b/backend/internal/job/runtime_status.go
@@ -7,9 +7,10 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/types/v2/jobschedule"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
func (s *JobService) addRuntimeStatusInternal(ctx context.Context, environmentID string, jobs *[]jobschedule.JobStatus) error {
diff --git a/backend/internal/job/service.go b/backend/internal/job/service.go
index 30b716016..e5f629759 100644
--- a/backend/internal/job/service.go
+++ b/backend/internal/job/service.go
@@ -10,6 +10,11 @@ import (
"sync"
"time"
+ "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"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -20,10 +25,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
- "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"
)
// JobService manages configuration for background job schedules.
diff --git a/backend/internal/job/service_test.go b/backend/internal/job/service_test.go
index 89cf1b2d8..af21e7e52 100644
--- a/backend/internal/job/service_test.go
+++ b/backend/internal/job/service_test.go
@@ -6,6 +6,12 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/jobschedule"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -15,11 +21,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
- "github.com/getarcaneapp/arcane/types/v2/jobschedule"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func setupSettingsTestDBInternal(t *testing.T) *database.DB {
diff --git a/backend/internal/kv/service.go b/backend/internal/kv/service.go
index b38e31746..7292b89a0 100644
--- a/backend/internal/kv/service.go
+++ b/backend/internal/kv/service.go
@@ -8,9 +8,10 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
// KVService persists lightweight application state in the kv table.
diff --git a/backend/internal/kv/service_test.go b/backend/internal/kv/service_test.go
index 50df2b300..e5f5db356 100644
--- a/backend/internal/kv/service_test.go
+++ b/backend/internal/kv/service_test.go
@@ -4,11 +4,12 @@ import (
"context"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func setupKVServiceInternal(t *testing.T) *KVService {
diff --git a/backend/internal/middleware/context.go b/backend/internal/middleware/context.go
index e99d0d29a..bc6e1fd16 100644
--- a/backend/internal/middleware/context.go
+++ b/backend/internal/middleware/context.go
@@ -5,6 +5,7 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
diff --git a/backend/internal/middleware/cors_middleware.go b/backend/internal/middleware/cors_middleware.go
index 2343eb5f7..d2bdaca5f 100644
--- a/backend/internal/middleware/cors_middleware.go
+++ b/backend/internal/middleware/cors_middleware.go
@@ -5,10 +5,11 @@ import (
"net/url"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/labstack/echo/v5"
echomiddleware "github.com/labstack/echo/v5/middleware"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
)
type CORSMiddleware struct {
diff --git a/backend/internal/middleware/csrf_middleware.go b/backend/internal/middleware/csrf_middleware.go
index eee8b739a..b73ab8ec6 100644
--- a/backend/internal/middleware/csrf_middleware.go
+++ b/backend/internal/middleware/csrf_middleware.go
@@ -5,9 +5,10 @@ import (
"net/http"
"strings"
+ "github.com/labstack/echo/v5"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/labstack/echo/v5"
)
// publicCrossOriginBypassPaths are endpoints intentionally reachable cross-origin
diff --git a/backend/internal/middleware/csrf_middleware_test.go b/backend/internal/middleware/csrf_middleware_test.go
index 5371b549d..48ec61094 100644
--- a/backend/internal/middleware/csrf_middleware_test.go
+++ b/backend/internal/middleware/csrf_middleware_test.go
@@ -5,9 +5,10 @@ import (
"net/http/httptest"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/labstack/echo/v5"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
)
func newCSRFTestRouterInternal() *echo.Echo {
diff --git a/backend/internal/middleware/environment_middleware.go b/backend/internal/middleware/environment_middleware.go
index 314a68d7c..9aa7cb285 100644
--- a/backend/internal/middleware/environment_middleware.go
+++ b/backend/internal/middleware/environment_middleware.go
@@ -17,17 +17,18 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "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"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
"github.com/getarcaneapp/arcane/types/v2/gitops"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/labstack/echo/v5"
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "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"
)
const (
diff --git a/backend/internal/middleware/environment_middleware_authz_test.go b/backend/internal/middleware/environment_middleware_authz_test.go
index ae50c7516..f333cd43d 100644
--- a/backend/internal/middleware/environment_middleware_authz_test.go
+++ b/backend/internal/middleware/environment_middleware_authz_test.go
@@ -9,10 +9,11 @@ import (
"net/http/httptest"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/labstack/echo/v5"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
)
const proxyTestEnvID = "remote-1"
diff --git a/backend/internal/middleware/environment_middleware_test.go b/backend/internal/middleware/environment_middleware_test.go
index 3f5b8ba9a..5c329d552 100644
--- a/backend/internal/middleware/environment_middleware_test.go
+++ b/backend/internal/middleware/environment_middleware_test.go
@@ -6,12 +6,13 @@ import (
"net/http/httptest"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
"github.com/labstack/echo/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
)
func newTestEnvironmentMiddleware() *EnvironmentMiddleware {
diff --git a/backend/internal/middleware/role.go b/backend/internal/middleware/role.go
index d1fc7d325..3bea8a7d1 100644
--- a/backend/internal/middleware/role.go
+++ b/backend/internal/middleware/role.go
@@ -6,9 +6,10 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/labstack/echo/v5"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/labstack/echo/v5"
)
// RegisterWithPermission registers a Huma operation that requires perm. It
diff --git a/backend/internal/middleware/role_test.go b/backend/internal/middleware/role_test.go
index ae85aea33..1e6493751 100644
--- a/backend/internal/middleware/role_test.go
+++ b/backend/internal/middleware/role_test.go
@@ -8,9 +8,10 @@ import (
"github.com/danielgtaylor/huma/v2"
"github.com/danielgtaylor/huma/v2/adapters/humaecho"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/labstack/echo/v5"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
)
func TestRequirePermission_RejectsCallerMissingPermission(t *testing.T) {
diff --git a/backend/internal/network/handler.go b/backend/internal/network/handler.go
index efe19720c..0308cd57b 100644
--- a/backend/internal/network/handler.go
+++ b/backend/internal/network/handler.go
@@ -9,6 +9,15 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ networktypes "github.com/getarcaneapp/arcane/types/v2/network"
+ dockernetwork "github.com/moby/moby/api/types/network"
+ "github.com/moby/moby/client"
+ "github.com/samber/mo"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/kit/pkg/mapping"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -18,14 +27,6 @@ import (
activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/base"
- networktypes "github.com/getarcaneapp/arcane/types/v2/network"
- dockernetwork "github.com/moby/moby/api/types/network"
- "github.com/moby/moby/client"
- "github.com/samber/mo"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/kit/pkg/mapping"
)
type NetworkHandler struct {
diff --git a/backend/internal/network/service.go b/backend/internal/network/service.go
index 0ee4b4dad..70a0dc920 100644
--- a/backend/internal/network/service.go
+++ b/backend/internal/network/service.go
@@ -10,13 +10,6 @@ import (
"sort"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
networktypes "github.com/getarcaneapp/arcane/types/v2/network"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/network"
@@ -25,6 +18,14 @@ import (
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/kit/pkg/mapping"
"golang.org/x/sync/errgroup"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
type NetworkService struct {
diff --git a/backend/internal/notification/email_templates.go b/backend/internal/notification/email_templates.go
index 3e1b7692c..494dd7721 100644
--- a/backend/internal/notification/email_templates.go
+++ b/backend/internal/notification/email_templates.go
@@ -9,10 +9,11 @@ import (
"sort"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
- "github.com/getarcaneapp/arcane/backend/v2/resources"
"github.com/getarcaneapp/arcane/types/v2/imageupdate"
"github.com/getarcaneapp/arcane/types/v2/system"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
+ "github.com/getarcaneapp/arcane/backend/v2/resources"
)
func (s *NotificationService) renderBatchContainerUpdateEmailTemplateInternal(environmentName string, entries []notifications.ContainerUpdateBatchEntry) (string, string, error) {
diff --git a/backend/internal/notification/handler.go b/backend/internal/notification/handler.go
index 60a7c961c..9b0e870e1 100644
--- a/backend/internal/notification/handler.go
+++ b/backend/internal/notification/handler.go
@@ -7,6 +7,10 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/notification"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -14,9 +18,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/notification"
- kit "go.getarcane.app/kit/pkg"
)
type NotificationHandler struct {
diff --git a/backend/internal/notification/module.go b/backend/internal/notification/module.go
index 4dc1baddc..c053c2d08 100644
--- a/backend/internal/notification/module.go
+++ b/backend/internal/notification/module.go
@@ -3,6 +3,7 @@ package notification
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
)
diff --git a/backend/internal/notification/notification.go b/backend/internal/notification/notification.go
index d30596b1b..649c492fa 100644
--- a/backend/internal/notification/notification.go
+++ b/backend/internal/notification/notification.go
@@ -16,6 +16,13 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"
+ notificationdto "github.com/getarcaneapp/arcane/types/v2/notification"
+ "github.com/getarcaneapp/arcane/types/v2/system"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/crypto"
+ "golang.org/x/sync/errgroup"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apns"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -28,12 +35,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
- "github.com/getarcaneapp/arcane/types/v2/imageupdate"
- notificationdto "github.com/getarcaneapp/arcane/types/v2/notification"
- "github.com/getarcaneapp/arcane/types/v2/system"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/crypto"
- "golang.org/x/sync/errgroup"
)
var notificationCredentialFieldsByProviderInternal = map[notifications.NotificationProvider][]string{
diff --git a/backend/internal/notification/service_test.go b/backend/internal/notification/service_test.go
index 0faf5d8c3..cc8c0d66b 100644
--- a/backend/internal/notification/service_test.go
+++ b/backend/internal/notification/service_test.go
@@ -15,13 +15,6 @@ import (
"testing"
"time"
- "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/environment"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "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"
@@ -30,6 +23,14 @@ import (
"github.com/stretchr/testify/require"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "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/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
)
func setupNotificationTestDB(t *testing.T) *database.DB {
diff --git a/backend/internal/oidc/handler.go b/backend/internal/oidc/handler.go
index a05361c9b..cb8a479d4 100644
--- a/backend/internal/oidc/handler.go
+++ b/backend/internal/oidc/handler.go
@@ -9,6 +9,9 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
+ roletypes "github.com/getarcaneapp/arcane/types/v2/role"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -21,8 +24,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
- roletypes "github.com/getarcaneapp/arcane/types/v2/role"
)
// OidcHandler handles OIDC authentication endpoints, plus OIDC group → role
diff --git a/backend/internal/oidc/service.go b/backend/internal/oidc/service.go
index e917dd087..005e5f924 100644
--- a/backend/internal/oidc/service.go
+++ b/backend/internal/oidc/service.go
@@ -17,15 +17,16 @@ import (
"time"
"github.com/coreos/go-oidc/v3/oidc"
+ authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/samber/hot"
+ kit "go.getarcane.app/kit/pkg"
+ "golang.org/x/oauth2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/jwtclaims"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/oidcjwk"
- authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/samber/hot"
- kit "go.getarcane.app/kit/pkg"
- "golang.org/x/oauth2"
)
type OidcService struct {
diff --git a/backend/internal/oidc/service_test.go b/backend/internal/oidc/service_test.go
index ca63ecd1a..ecb27b06d 100644
--- a/backend/internal/oidc/service_test.go
+++ b/backend/internal/oidc/service_test.go
@@ -4,12 +4,13 @@ import (
"context"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func TestValidateMobileRedirectURI(t *testing.T) {
diff --git a/backend/internal/passkey/handler.go b/backend/internal/passkey/handler.go
index e6d5bec30..fc3ebfd84 100644
--- a/backend/internal/passkey/handler.go
+++ b/backend/internal/passkey/handler.go
@@ -9,6 +9,9 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/auth"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
@@ -16,8 +19,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- authtypes "github.com/getarcaneapp/arcane/types/v2/auth"
- "github.com/getarcaneapp/arcane/types/v2/base"
)
type PasskeyHandler struct {
diff --git a/backend/internal/passkey/service.go b/backend/internal/passkey/service.go
index 178d06c24..e60b97154 100644
--- a/backend/internal/passkey/service.go
+++ b/backend/internal/passkey/service.go
@@ -19,18 +19,19 @@ import (
"unicode/utf8"
"uuid"
- "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/session"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/resources"
"github.com/getarcaneapp/arcane/types/v2/auth"
"github.com/go-webauthn/webauthn/protocol"
"github.com/go-webauthn/webauthn/webauthn"
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "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/session"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/resources"
)
const (
diff --git a/backend/internal/passkey/service_test.go b/backend/internal/passkey/service_test.go
index ad5c0277d..0b3653ea3 100644
--- a/backend/internal/passkey/service_test.go
+++ b/backend/internal/passkey/service_test.go
@@ -6,14 +6,15 @@ import (
"time"
"uuid"
- "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/session"
"github.com/getarcaneapp/arcane/types/v2/auth"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "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/session"
)
func newPasskeyServiceTestDB(t *testing.T) *database.DB {
diff --git a/backend/internal/playwright/gitops.go b/backend/internal/playwright/gitops.go
index 1374909cc..0573e5af4 100644
--- a/backend/internal/playwright/gitops.go
+++ b/backend/internal/playwright/gitops.go
@@ -8,11 +8,12 @@ import (
"fmt"
"time"
+ gitopstypes "github.com/getarcaneapp/arcane/types/v2/gitops"
+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/project"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- gitopstypes "github.com/getarcaneapp/arcane/types/v2/gitops"
- projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
)
const (
diff --git a/backend/internal/playwright/handler.go b/backend/internal/playwright/handler.go
index 9da784152..d5d7af756 100644
--- a/backend/internal/playwright/handler.go
+++ b/backend/internal/playwright/handler.go
@@ -5,8 +5,9 @@ package playwright
import (
"net/http"
- "github.com/getarcaneapp/arcane/backend/v2/internal/federated"
"github.com/labstack/echo/v5"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/federated"
)
type playwrightHandlerInternal struct {
diff --git a/backend/internal/playwright/service.go b/backend/internal/playwright/service.go
index 7ebc627ac..7577fca25 100644
--- a/backend/internal/playwright/service.go
+++ b/backend/internal/playwright/service.go
@@ -7,6 +7,8 @@ import (
"fmt"
"log/slog"
+ apikeytypes "github.com/getarcaneapp/arcane/types/v2/apikey"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apikey"
"github.com/getarcaneapp/arcane/backend/v2/internal/gitops"
"github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
@@ -14,7 +16,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/user"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- apikeytypes "github.com/getarcaneapp/arcane/types/v2/apikey"
)
type PlaywrightService struct {
diff --git a/backend/internal/port/handler.go b/backend/internal/port/handler.go
index 977fe06b7..4c3e99c01 100644
--- a/backend/internal/port/handler.go
+++ b/backend/internal/port/handler.go
@@ -5,11 +5,12 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ porttypes "github.com/getarcaneapp/arcane/types/v2/port"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- porttypes "github.com/getarcaneapp/arcane/types/v2/port"
)
type PortHandler struct {
diff --git a/backend/internal/port/service.go b/backend/internal/port/service.go
index f3194a644..9e9299943 100644
--- a/backend/internal/port/service.go
+++ b/backend/internal/port/service.go
@@ -6,12 +6,13 @@ import (
"strconv"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
porttypes "github.com/getarcaneapp/arcane/types/v2/port"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
type PortService struct {
diff --git a/backend/internal/port/service_test.go b/backend/internal/port/service_test.go
index 0a7dd2baa..542bc3a10 100644
--- a/backend/internal/port/service_test.go
+++ b/backend/internal/port/service_test.go
@@ -9,12 +9,13 @@ import (
"strings"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
dockercontainer "github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
func newPortServiceTestDockerService(t *testing.T, containers []dockercontainer.Summary) *docker.DockerClientService {
diff --git a/backend/internal/project/deployment.go b/backend/internal/project/deployment.go
index 39ee31829..4337e28b1 100644
--- a/backend/internal/project/deployment.go
+++ b/backend/internal/project/deployment.go
@@ -13,14 +13,6 @@ import (
"time"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
"github.com/getarcaneapp/arcane/types/v2"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
@@ -30,6 +22,15 @@ import (
"go.getarcane.app/sys/cgroup"
"go.getarcane.app/updater/labels"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
)
var (
diff --git a/backend/internal/project/details.go b/backend/internal/project/details.go
index b19bbbd2e..7b1261318 100644
--- a/backend/internal/project/details.go
+++ b/backend/internal/project/details.go
@@ -17,13 +17,6 @@ import (
"time"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/getarcaneapp/arcane/types/v2/project"
"github.com/moby/moby/api/types/container"
@@ -34,6 +27,14 @@ import (
"go.getarcane.app/updater"
"go.getarcane.app/updater/labels"
"go.getarcane.app/updater/pkg/utils/tagpolicy"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
type ProjectServiceInfo struct {
diff --git a/backend/internal/project/handler.go b/backend/internal/project/handler.go
index 85c4ec6db..92df5b476 100644
--- a/backend/internal/project/handler.go
+++ b/backend/internal/project/handler.go
@@ -12,6 +12,15 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
+ "github.com/samber/mo"
+ "go.getarcane.app/kit/pkg/mapping"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -23,14 +32,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/base"
- projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
- "github.com/samber/mo"
- "go.getarcane.app/kit/pkg/mapping"
- "gorm.io/gorm"
)
// ProjectHandler provides Huma-based project management endpoints.
diff --git a/backend/internal/project/lifecycle.go b/backend/internal/project/lifecycle.go
index 158c0d8b7..efc8ddb8f 100644
--- a/backend/internal/project/lifecycle.go
+++ b/backend/internal/project/lifecycle.go
@@ -16,16 +16,6 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/image"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- 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"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
lifecycletype "github.com/getarcaneapp/arcane/types/v2/lifecycle"
"github.com/moby/moby/api/pkg/stdcopy"
containertypes "github.com/moby/moby/api/types/container"
@@ -36,6 +26,17 @@ import (
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/kit/pkg/capture"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/image"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ 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"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
const (
diff --git a/backend/internal/project/lifecycle_test.go b/backend/internal/project/lifecycle_test.go
index 2b1623626..8596c81ba 100644
--- a/backend/internal/project/lifecycle_test.go
+++ b/backend/internal/project/lifecycle_test.go
@@ -8,14 +8,15 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func setupLifecycleTestDB(t *testing.T) *database.DB {
diff --git a/backend/internal/project/listing.go b/backend/internal/project/listing.go
index 113efd7bd..5a23736dc 100644
--- a/backend/internal/project/listing.go
+++ b/backend/internal/project/listing.go
@@ -13,14 +13,6 @@ import (
"time"
composeapi "github.com/docker/compose/v5/pkg/api"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/image"
- 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"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/getarcaneapp/arcane/types/v2/project"
"github.com/moby/moby/api/types/container"
@@ -32,6 +24,15 @@ import (
"go.getarcane.app/updater/labels"
"golang.org/x/sync/errgroup"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/image"
+ 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"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"
)
// listGlobalComposeContainersInternal routes the global compose-container
diff --git a/backend/internal/project/model.go b/backend/internal/project/model.go
index 09116dfca..d0542c364 100644
--- a/backend/internal/project/model.go
+++ b/backend/internal/project/model.go
@@ -3,10 +3,11 @@ package project
import (
"time"
+ gitopstypes "github.com/getarcaneapp/arcane/types/v2/gitops"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
"github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
- gitopstypes "github.com/getarcaneapp/arcane/types/v2/gitops"
)
type ProjectStatus string
diff --git a/backend/internal/project/module.go b/backend/internal/project/module.go
index e35d847a4..9546b5f98 100644
--- a/backend/internal/project/module.go
+++ b/backend/internal/project/module.go
@@ -3,6 +3,7 @@ package project
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
diff --git a/backend/internal/project/service.go b/backend/internal/project/service.go
index 2af36b453..ae2259961 100644
--- a/backend/internal/project/service.go
+++ b/backend/internal/project/service.go
@@ -14,6 +14,15 @@ import (
"time"
composetypes "github.com/compose-spec/compose-go/v2/types"
+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"
+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
+ dockerregistry "github.com/moby/moby/api/types/registry"
+ "github.com/moby/moby/client"
+ "github.com/samber/mo"
+ buildtypes "go.getarcane.app/builds/types"
+ kit "go.getarcane.app/kit/pkg"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -25,14 +34,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
- "github.com/getarcaneapp/arcane/types/v2/containerregistry"
- projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
- dockerregistry "github.com/moby/moby/api/types/registry"
- "github.com/moby/moby/client"
- "github.com/samber/mo"
- buildtypes "go.getarcane.app/builds/types"
- kit "go.getarcane.app/kit/pkg"
- "gorm.io/gorm"
)
type buildServiceInternal interface {
diff --git a/backend/internal/project/service_test.go b/backend/internal/project/service_test.go
index 5ee767768..7d2fbc500 100644
--- a/backend/internal/project/service_test.go
+++ b/backend/internal/project/service_test.go
@@ -22,22 +22,6 @@ import (
composetypes "github.com/compose-spec/compose-go/v2/types"
composeapi "github.com/docker/compose/v5/pkg/api"
- "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/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/image"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumes"
- "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"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
@@ -58,6 +42,23 @@ import (
"go.getarcane.app/updater/labels"
updatertypes "go.getarcane.app/updater/types"
"gorm.io/gorm"
+
+ "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/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/image"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumes"
+ "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"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
type testBuildBuilder struct {
diff --git a/backend/internal/project/service_unix_test.go b/backend/internal/project/service_unix_test.go
index 26beca368..25706e4c0 100644
--- a/backend/internal/project/service_unix_test.go
+++ b/backend/internal/project/service_unix_test.go
@@ -10,12 +10,13 @@ import (
"testing"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
)
// TestProjectService_ApplyGitSyncProjectFiles_TolerantOfPermissionLockedEnv verifies
diff --git a/backend/internal/project/sync.go b/backend/internal/project/sync.go
index 83ced465c..f67307ec0 100644
--- a/backend/internal/project/sync.go
+++ b/backend/internal/project/sync.go
@@ -12,11 +12,12 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
// projectCleanupDecision records a project the reconcile pass intends to delete,
diff --git a/backend/internal/project/tags.go b/backend/internal/project/tags.go
index a7c92c30b..e5e6ce0c5 100644
--- a/backend/internal/project/tags.go
+++ b/backend/internal/project/tags.go
@@ -7,14 +7,15 @@ import (
"sort"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- projectpkg "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
gitopstypes "github.com/getarcaneapp/arcane/types/v2/gitops"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ projectpkg "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
var errComposeTagReadOnly = errors.New("tag is defined in Compose and can only be changed through x-arcane metadata")
diff --git a/backend/internal/project/tags_test.go b/backend/internal/project/tags_test.go
index d6999893d..66c078170 100644
--- a/backend/internal/project/tags_test.go
+++ b/backend/internal/project/tags_test.go
@@ -4,9 +4,10 @@ import (
"context"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
func TestProjectTags_ReconcilePreservesUIAndComposeOwnershipIsReadOnly(t *testing.T) {
diff --git a/backend/internal/project/update.go b/backend/internal/project/update.go
index 85ca5822b..c93dff824 100644
--- a/backend/internal/project/update.go
+++ b/backend/internal/project/update.go
@@ -16,11 +16,6 @@ import (
"unicode/utf8"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/moby/moby/client"
@@ -32,6 +27,12 @@ import (
updatertypes "go.getarcane.app/updater/types"
"go.yaml.in/yaml/v4"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, name, composeContent, envContent, overrideContent *string, user common.User) (*Project, error) {
diff --git a/backend/internal/project/workspace.go b/backend/internal/project/workspace.go
index 5550527dc..3b2ad78ea 100644
--- a/backend/internal/project/workspace.go
+++ b/backend/internal/project/workspace.go
@@ -11,17 +11,18 @@ import (
"path/filepath"
"strings"
+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
+ workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
+ "go.getarcane.app/acfs"
+ acfstypes "go.getarcane.app/acfs/types"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
acfsutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/acfs"
workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
- projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
- workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
- "go.getarcane.app/acfs"
- acfstypes "go.getarcane.app/acfs/types"
- kit "go.getarcane.app/kit/pkg"
)
func (s *ProjectService) GetProjectWorkspace(ctx context.Context, projectID string) (*workspacetypes.Workspace, error) {
diff --git a/backend/internal/registry/browse.go b/backend/internal/registry/browse.go
index e14e820fe..a67ce0bc8 100644
--- a/backend/internal/registry/browse.go
+++ b/backend/internal/registry/browse.go
@@ -10,9 +10,6 @@ import (
"strings"
"sync"
- "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/pagination"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/name"
@@ -20,6 +17,10 @@ import (
"github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/google/go-containerregistry/pkg/v1/remote/transport"
"golang.org/x/sync/errgroup"
+
+ "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/pagination"
)
const tagDetailsConcurrency = 4
diff --git a/backend/internal/registry/browse_handler.go b/backend/internal/registry/browse_handler.go
index 278381df6..7f3075eed 100644
--- a/backend/internal/registry/browse_handler.go
+++ b/backend/internal/registry/browse_handler.go
@@ -4,12 +4,13 @@ import (
"context"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/containerregistry"
)
// ListRegistryRepositoriesInput is the input for listing the repositories of a registry.
diff --git a/backend/internal/registry/browse_test.go b/backend/internal/registry/browse_test.go
index 82f324ab7..a72312fad 100644
--- a/backend/internal/registry/browse_test.go
+++ b/backend/internal/registry/browse_test.go
@@ -10,9 +10,6 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/name"
@@ -25,6 +22,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.getarcane.app/sys/crypto"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
func createBrowseTestRegistryInternal(t *testing.T, db *database.DB, registryURL, username, token string) string {
diff --git a/backend/internal/registry/handler.go b/backend/internal/registry/handler.go
index 1b4a9da72..c4b1291e1 100644
--- a/backend/internal/registry/handler.go
+++ b/backend/internal/registry/handler.go
@@ -6,14 +6,15 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/crypto"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
const registryRemoteSyncFailureMessageInternal = "Failed to fan out registry sync to remote environments"
diff --git a/backend/internal/registry/service.go b/backend/internal/registry/service.go
index aa1924dce..a29a9484d 100644
--- a/backend/internal/registry/service.go
+++ b/backend/internal/registry/service.go
@@ -13,15 +13,6 @@ import (
"github.com/cenkalti/backoff/v5"
cerrdefs "github.com/containerd/errdefs"
ref "github.com/distribution/reference"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- utilsregistry "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/pagination"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
"github.com/google/go-containerregistry/pkg/authn"
@@ -38,6 +29,16 @@ import (
"go.getarcane.app/updater/registry"
"golang.org/x/sync/singleflight"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ utilsregistry "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/pagination"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
)
const (
diff --git a/backend/internal/registry/service_label.go b/backend/internal/registry/service_label.go
index d74e4442a..21366db41 100644
--- a/backend/internal/registry/service_label.go
+++ b/backend/internal/registry/service_label.go
@@ -8,10 +8,11 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
"github.com/google/go-containerregistry/pkg/name"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/remote"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
)
const (
diff --git a/backend/internal/registry/service_test.go b/backend/internal/registry/service_test.go
index 03eff3785..bd398b0a6 100644
--- a/backend/internal/registry/service_test.go
+++ b/backend/internal/registry/service_test.go
@@ -12,9 +12,6 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
"github.com/libtnb/sqlite"
@@ -27,6 +24,10 @@ import (
"github.com/stretchr/testify/require"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
)
type fakeRegistryDaemonClient struct {
diff --git a/backend/internal/registry/tags.go b/backend/internal/registry/tags.go
index a7423abb3..87928afa9 100644
--- a/backend/internal/registry/tags.go
+++ b/backend/internal/registry/tags.go
@@ -4,11 +4,12 @@ import (
"context"
"errors"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
"github.com/google/go-containerregistry/pkg/authn"
"go.getarcane.app/updater/refs"
updaterregistry "go.getarcane.app/updater/registry"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
)
// ListImageTags discovers repository tags with the same credential precedence as
diff --git a/backend/internal/role/handler.go b/backend/internal/role/handler.go
index d11c3f308..cba79ffb2 100644
--- a/backend/internal/role/handler.go
+++ b/backend/internal/role/handler.go
@@ -6,12 +6,13 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ roletypes "github.com/getarcaneapp/arcane/types/v2/role"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- roletypes "github.com/getarcaneapp/arcane/types/v2/role"
)
type RoleHandler struct {
diff --git a/backend/internal/role/service.go b/backend/internal/role/service.go
index e963ddfe5..45593a43d 100644
--- a/backend/internal/role/service.go
+++ b/backend/internal/role/service.go
@@ -13,12 +13,6 @@ import (
"sync/atomic"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "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"
roletypes "github.com/getarcaneapp/arcane/types/v2/role"
"github.com/samber/hot"
"github.com/samber/mo"
@@ -26,6 +20,13 @@ import (
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "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"
)
const (
diff --git a/backend/internal/role/service_test.go b/backend/internal/role/service_test.go
index d20edeaee..6c7b203dc 100644
--- a/backend/internal/role/service_test.go
+++ b/backend/internal/role/service_test.go
@@ -8,14 +8,15 @@ import (
"testing"
"time"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/session"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func TestValidatePermissionsAgainstCallerRejectsEscalation(t *testing.T) {
diff --git a/backend/internal/s3/handler.go b/backend/internal/s3/handler.go
index e8846dedb..f7cd02cd6 100644
--- a/backend/internal/s3/handler.go
+++ b/backend/internal/s3/handler.go
@@ -7,10 +7,11 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
"github.com/getarcaneapp/arcane/types/v2/base"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
const (
diff --git a/backend/internal/s3/model.go b/backend/internal/s3/model.go
index 74fbf68a2..62d278618 100644
--- a/backend/internal/s3/model.go
+++ b/backend/internal/s3/model.go
@@ -3,8 +3,9 @@ package s3
import (
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
type S3Destination struct {
diff --git a/backend/internal/s3/service.go b/backend/internal/s3/service.go
index a72cc4577..748fba341 100644
--- a/backend/internal/s3/service.go
+++ b/backend/internal/s3/service.go
@@ -6,15 +6,16 @@ import (
"fmt"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- s3config "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/s3"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
"github.com/samber/mo"
"go.getarcane.app/kit/normalization"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ s3config "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/s3"
)
var (
diff --git a/backend/internal/s3/service_test.go b/backend/internal/s3/service_test.go
index 2f72115f5..77b40e731 100644
--- a/backend/internal/s3/service_test.go
+++ b/backend/internal/s3/service_test.go
@@ -10,16 +10,17 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- s3config "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/s3"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ s3config "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/s3"
)
func setupS3DestinationServiceTestInternal(t *testing.T) (*S3DestinationService, *gorm.DB) {
diff --git a/backend/internal/search/customize_handler.go b/backend/internal/search/customize_handler.go
index 9b42f7d37..00c2430ef 100644
--- a/backend/internal/search/customize_handler.go
+++ b/backend/internal/search/customize_handler.go
@@ -6,11 +6,12 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/category"
+ searchtypes "github.com/getarcaneapp/arcane/types/v2/search"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/category"
- searchtypes "github.com/getarcaneapp/arcane/types/v2/search"
)
// CustomizeHandler handles customization search endpoints.
diff --git a/backend/internal/search/metadata.go b/backend/internal/search/metadata.go
index 804a4b852..23bfb6b5c 100644
--- a/backend/internal/search/metadata.go
+++ b/backend/internal/search/metadata.go
@@ -7,11 +7,12 @@ import (
"sort"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/types/v2/category"
"github.com/getarcaneapp/arcane/types/v2/meta"
searchtypes "github.com/getarcaneapp/arcane/types/v2/search"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
// BuildCategories extracts searchable metadata in model field order.
diff --git a/backend/internal/session/service.go b/backend/internal/session/service.go
index 122d8c89b..2d6727513 100644
--- a/backend/internal/session/service.go
+++ b/backend/internal/session/service.go
@@ -10,13 +10,14 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"
"github.com/getarcaneapp/arcane/types/v2/auth"
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"
)
type SessionService struct {
diff --git a/backend/internal/session/service_test.go b/backend/internal/session/service_test.go
index f4c8aaf48..4bb93c7b6 100644
--- a/backend/internal/session/service_test.go
+++ b/backend/internal/session/service_test.go
@@ -5,15 +5,16 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/role"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/types/v2/auth"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/role"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func TestSessionService_RotateRefreshTokenRequiresCurrentHash(t *testing.T) {
diff --git a/backend/internal/settings/features.go b/backend/internal/settings/features.go
index a509ecce9..b22ea621a 100644
--- a/backend/internal/settings/features.go
+++ b/backend/internal/settings/features.go
@@ -5,9 +5,10 @@ import (
"fmt"
"strconv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/types/v2/features"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
// IsFeatureEnabled resolves feature availability on this environment.
diff --git a/backend/internal/settings/features_test.go b/backend/internal/settings/features_test.go
index 7f0951f23..e7499fec1 100644
--- a/backend/internal/settings/features_test.go
+++ b/backend/internal/settings/features_test.go
@@ -5,11 +5,12 @@ import (
"net/http"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/getarcaneapp/arcane/types/v2/features"
settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
)
func TestSettingsService_FeatureDefaultsAndUnknownFeature(t *testing.T) {
diff --git a/backend/internal/settings/handler.go b/backend/internal/settings/handler.go
index c91e9baa1..5c6399b96 100644
--- a/backend/internal/settings/handler.go
+++ b/backend/internal/settings/handler.go
@@ -10,6 +10,14 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/category"
+ searchtypes "github.com/getarcaneapp/arcane/types/v2/search"
+ settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/kit/pkg/mapping"
+ "go.yaml.in/yaml/v4"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
@@ -19,13 +27,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/category"
- searchtypes "github.com/getarcaneapp/arcane/types/v2/search"
- settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/kit/pkg/mapping"
- "go.yaml.in/yaml/v4"
)
const (
diff --git a/backend/internal/settings/handler_test.go b/backend/internal/settings/handler_test.go
index 1cb568686..184de83a7 100644
--- a/backend/internal/settings/handler_test.go
+++ b/backend/internal/settings/handler_test.go
@@ -10,12 +10,13 @@ import (
"testing"
"github.com/danielgtaylor/huma/v2"
+ settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
+ "github.com/stretchr/testify/require"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
- settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
- "github.com/stretchr/testify/require"
)
func TestSettingsHandlerAppendRuntimeSettingsInternal(t *testing.T) {
diff --git a/backend/internal/settings/module.go b/backend/internal/settings/module.go
index 6d478c750..720d9464c 100644
--- a/backend/internal/settings/module.go
+++ b/backend/internal/settings/module.go
@@ -3,6 +3,7 @@ package settings
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
diff --git a/backend/internal/settings/service.go b/backend/internal/settings/service.go
index d082aa26a..f057c8279 100644
--- a/backend/internal/settings/service.go
+++ b/backend/internal/settings/service.go
@@ -21,6 +21,15 @@ import (
"time"
"uuid"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/features"
+ settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
+ "github.com/samber/mo"
+ "go.getarcane.app/kit/normalization"
+ kit "go.getarcane.app/kit/pkg"
+ libcrypto "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -30,14 +39,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/features"
- settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
- "github.com/samber/mo"
- "go.getarcane.app/kit/normalization"
- kit "go.getarcane.app/kit/pkg"
- libcrypto "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
const (
diff --git a/backend/internal/settings/service_test.go b/backend/internal/settings/service_test.go
index 3315cec3a..dcdba8651 100644
--- a/backend/internal/settings/service_test.go
+++ b/backend/internal/settings/service_test.go
@@ -10,15 +10,16 @@ import (
"testing"
"time"
- "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/pkg/libarcane"
settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
libcrypto "go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "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/pkg/libarcane"
)
func setupSettingsTestDB(t *testing.T) *database.DB {
diff --git a/backend/internal/settings/settings_search.go b/backend/internal/settings/settings_search.go
index 6ec2ce127..38c072024 100644
--- a/backend/internal/settings/settings_search.go
+++ b/backend/internal/settings/settings_search.go
@@ -1,9 +1,10 @@
package settings
import (
- "github.com/getarcaneapp/arcane/backend/v2/internal/search"
"github.com/getarcaneapp/arcane/types/v2/category"
searchtypes "github.com/getarcaneapp/arcane/types/v2/search"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/search"
)
type SettingsSearchService struct {
diff --git a/backend/internal/swarm/handler.go b/backend/internal/swarm/handler.go
index 09a5798eb..8643f68d7 100644
--- a/backend/internal/swarm/handler.go
+++ b/backend/internal/swarm/handler.go
@@ -12,6 +12,9 @@ import (
"github.com/containerd/errdefs"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -22,8 +25,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
)
type SwarmHandler struct {
diff --git a/backend/internal/swarm/module.go b/backend/internal/swarm/module.go
index 4253c5dd6..6ff6963e0 100644
--- a/backend/internal/swarm/module.go
+++ b/backend/internal/swarm/module.go
@@ -3,6 +3,7 @@ package swarm
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
diff --git a/backend/internal/swarm/service_test.go b/backend/internal/swarm/service_test.go
index ceac33ca9..eaa5c9c28 100644
--- a/backend/internal/swarm/service_test.go
+++ b/backend/internal/swarm/service_test.go
@@ -11,12 +11,6 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
"github.com/libtnb/sqlite"
"github.com/moby/moby/api/types/swarm"
@@ -25,6 +19,13 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
)
func setupSwarmServiceTestDBInternal(t *testing.T) *database.DB {
diff --git a/backend/internal/swarm/swarm.go b/backend/internal/swarm/swarm.go
index 50760ca0c..28aecc59a 100644
--- a/backend/internal/swarm/swarm.go
+++ b/backend/internal/swarm/swarm.go
@@ -22,6 +22,17 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
+ 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"
+ dockerclient "github.com/moby/moby/client"
+ "github.com/samber/hot"
+ "go.getarcane.app/acfs"
+ acfstypes "go.getarcane.app/acfs/types"
+ kit "go.getarcane.app/kit/pkg"
+ "golang.org/x/sync/errgroup"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
@@ -35,16 +46,6 @@ import (
appfs "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- 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"
- dockerclient "github.com/moby/moby/client"
- "github.com/samber/hot"
- "go.getarcane.app/acfs"
- acfstypes "go.getarcane.app/acfs/types"
- kit "go.getarcane.app/kit/pkg"
- "golang.org/x/sync/errgroup"
)
const (
diff --git a/backend/internal/system/handler.go b/backend/internal/system/handler.go
index 98f25e835..5d8e8103f 100644
--- a/backend/internal/system/handler.go
+++ b/backend/internal/system/handler.go
@@ -9,15 +9,6 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/types/v2/base"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
"github.com/getarcaneapp/arcane/types/v2/dockerinfo"
@@ -28,6 +19,16 @@ import (
converttypes "go.getarcane.app/docker/convert/types"
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/cgroup"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
// SystemHandler handles system management endpoints.
diff --git a/backend/internal/system/module.go b/backend/internal/system/module.go
index ade18c91c..d94738705 100644
--- a/backend/internal/system/module.go
+++ b/backend/internal/system/module.go
@@ -4,6 +4,7 @@ package system
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
diff --git a/backend/internal/system/prune_recovery.go b/backend/internal/system/prune_recovery.go
index 5fe8990b7..74e094c3b 100644
--- a/backend/internal/system/prune_recovery.go
+++ b/backend/internal/system/prune_recovery.go
@@ -12,13 +12,14 @@ import (
"time"
"github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
"github.com/moby/moby/client"
"go.getarcane.app/docker/compat"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
)
type pruneResourceInternal struct {
diff --git a/backend/internal/system/system.go b/backend/internal/system/system.go
index 4088fd5aa..4be9add17 100644
--- a/backend/internal/system/system.go
+++ b/backend/internal/system/system.go
@@ -10,6 +10,17 @@ import (
"sync"
"time"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ containertypes "github.com/getarcaneapp/arcane/types/v2/container"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/getarcaneapp/arcane/types/v2/system"
+ mobycontainer "github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/client"
+ "github.com/samber/hot"
+ "github.com/samber/mo"
+ "go.getarcane.app/updater/labels"
+ "golang.org/x/sync/errgroup"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -24,16 +35,6 @@ import (
activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- containertypes "github.com/getarcaneapp/arcane/types/v2/container"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/getarcaneapp/arcane/types/v2/system"
- mobycontainer "github.com/moby/moby/api/types/container"
- "github.com/moby/moby/client"
- "github.com/samber/hot"
- "github.com/samber/mo"
- "go.getarcane.app/updater/labels"
- "golang.org/x/sync/errgroup"
)
type SystemService struct {
diff --git a/backend/internal/system/upgrade_service.go b/backend/internal/system/upgrade_service.go
index 37245809e..84f2d9715 100644
--- a/backend/internal/system/upgrade_service.go
+++ b/backend/internal/system/upgrade_service.go
@@ -18,6 +18,18 @@ import (
cerrdefs "github.com/containerd/errdefs"
ref "github.com/distribution/reference"
+ versiontypes "github.com/getarcaneapp/arcane/types/v2/version"
+ "github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/api/types/mount"
+ "github.com/moby/moby/client"
+ "github.com/opencontainers/go-digest"
+ "go.getarcane.app/docker/compat"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/cgroup"
+ "go.getarcane.app/updater"
+ "go.getarcane.app/updater/labels"
+ "golang.org/x/mod/semver"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
@@ -32,17 +44,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- versiontypes "github.com/getarcaneapp/arcane/types/v2/version"
- "github.com/moby/moby/api/types/container"
- "github.com/moby/moby/api/types/mount"
- "github.com/moby/moby/client"
- "github.com/opencontainers/go-digest"
- "go.getarcane.app/docker/compat"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/cgroup"
- "go.getarcane.app/updater"
- "go.getarcane.app/updater/labels"
- "golang.org/x/mod/semver"
)
var upgradeLogNameInternal = regexp.MustCompile(`^arcane-upgrade-[0-9]+\.log$`)
diff --git a/backend/internal/system/upgrade_service_test.go b/backend/internal/system/upgrade_service_test.go
index 41211800b..91356e8ee 100644
--- a/backend/internal/system/upgrade_service_test.go
+++ b/backend/internal/system/upgrade_service_test.go
@@ -6,13 +6,14 @@ import (
"fmt"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
versiontypes "github.com/getarcaneapp/arcane/types/v2/version"
containertypes "github.com/moby/moby/api/types/container"
mounttypes "github.com/moby/moby/api/types/mount"
networktypes "github.com/moby/moby/api/types/network"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
)
// TestSystemUpgradeService_UpgradeFlag tests the upgrading flag behavior
diff --git a/backend/internal/system/upgrade_update_all_test.go b/backend/internal/system/upgrade_update_all_test.go
index 39b2952ac..258029ab5 100644
--- a/backend/internal/system/upgrade_update_all_test.go
+++ b/backend/internal/system/upgrade_update_all_test.go
@@ -5,13 +5,14 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/version"
versiontypes "github.com/getarcaneapp/arcane/types/v2/version"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/version"
)
func TestUpdateAllResolveResumeAction(t *testing.T) {
diff --git a/backend/internal/systembackup/background.go b/backend/internal/systembackup/background.go
index 999873f97..13595fe55 100644
--- a/backend/internal/systembackup/background.go
+++ b/backend/internal/systembackup/background.go
@@ -7,6 +7,12 @@ import (
"fmt"
"log/slog"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/moby/moby/client"
+ "go.getarcane.app/sys/crypto"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/backup"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -15,11 +21,6 @@ import (
"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/scheduler/jobcontext"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/moby/moby/client"
- "go.getarcane.app/sys/crypto"
)
// StartBackup prepares a manual backup before submitting its snapshot work.
diff --git a/backend/internal/systembackup/handler.go b/backend/internal/systembackup/handler.go
index d6d23d56d..b62f3ba5f 100644
--- a/backend/internal/systembackup/handler.go
+++ b/backend/internal/systembackup/handler.go
@@ -7,6 +7,11 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/samber/mo"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -15,10 +20,6 @@ import (
activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/samber/mo"
)
type SystemBackupHandler struct {
diff --git a/backend/internal/systembackup/model.go b/backend/internal/systembackup/model.go
index 616f9c952..532b4db3a 100644
--- a/backend/internal/systembackup/model.go
+++ b/backend/internal/systembackup/model.go
@@ -3,8 +3,9 @@ package systembackup
import (
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
type SystemBackupStatus string
diff --git a/backend/internal/systembackup/module.go b/backend/internal/systembackup/module.go
index f30343640..0d6c75235 100644
--- a/backend/internal/systembackup/module.go
+++ b/backend/internal/systembackup/module.go
@@ -3,6 +3,7 @@ package systembackup
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
diff --git a/backend/internal/systembackup/service.go b/backend/internal/systembackup/service.go
index a51ce3fc0..0f99a19b9 100644
--- a/backend/internal/systembackup/service.go
+++ b/backend/internal/systembackup/service.go
@@ -18,6 +18,19 @@ import (
"time"
"uuid"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ recoverytypes "github.com/getarcaneapp/arcane/types/v2/recovery"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ containertypes "github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/api/types/mount"
+ "github.com/moby/moby/client"
+ "go.getarcane.app/acfs"
+ "go.getarcane.app/docker/compat"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/cgroup"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/backup"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
@@ -38,18 +51,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/backupbrowser"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- recoverytypes "github.com/getarcaneapp/arcane/types/v2/recovery"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- containertypes "github.com/moby/moby/api/types/container"
- "github.com/moby/moby/api/types/mount"
- "github.com/moby/moby/client"
- "go.getarcane.app/acfs"
- "go.getarcane.app/docker/compat"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/cgroup"
- "gorm.io/gorm"
)
const (
diff --git a/backend/internal/systembackup/service_test.go b/backend/internal/systembackup/service_test.go
index 86af6eb4d..8ee5043bd 100644
--- a/backend/internal/systembackup/service_test.go
+++ b/backend/internal/systembackup/service_test.go
@@ -11,13 +11,6 @@ import (
"slices"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/backup"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/entityjobs"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
- francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
recoverytypes "github.com/getarcaneapp/arcane/types/v2/recovery"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
@@ -27,6 +20,14 @@ import (
"github.com/stretchr/testify/require"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/backup"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/entityjobs"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
+ francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
)
func newSystemBackupAdmissionGateForTestInternal(t testing.TB) *runs.Admission {
diff --git a/backend/internal/systembackup/snapshot.go b/backend/internal/systembackup/snapshot.go
index fa955bd17..f728f97cc 100644
--- a/backend/internal/systembackup/snapshot.go
+++ b/backend/internal/systembackup/snapshot.go
@@ -11,8 +11,9 @@ import (
"syscall"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/backup"
"github.com/moby/moby/client"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/backup"
)
// snapshotWithStagedDatabaseInternal archives a consistent database without blocking actor leases during the upload.
diff --git a/backend/internal/systembackup/system_volume.go b/backend/internal/systembackup/system_volume.go
index 7168e47dd..7ce079933 100644
--- a/backend/internal/systembackup/system_volume.go
+++ b/backend/internal/systembackup/system_volume.go
@@ -10,6 +10,11 @@ import (
"strings"
"uuid"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ kit "go.getarcane.app/kit/pkg"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/backup"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
@@ -18,10 +23,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- kit "go.getarcane.app/kit/pkg"
- "gorm.io/gorm"
)
const (
diff --git a/backend/internal/systembackup/system_volume_test.go b/backend/internal/systembackup/system_volume_test.go
index 192c7bd02..4702e2159 100644
--- a/backend/internal/systembackup/system_volume_test.go
+++ b/backend/internal/systembackup/system_volume_test.go
@@ -5,15 +5,16 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
- "github.com/getarcaneapp/arcane/backend/v2/internal/volume"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ s3domain "github.com/getarcaneapp/arcane/backend/v2/internal/s3"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/volume"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
func TestSystemVolumeBackupSelectionInternal(t *testing.T) {
diff --git a/backend/internal/template/handler.go b/backend/internal/template/handler.go
index 7d12a3f9d..e4025605b 100644
--- a/backend/internal/template/handler.go
+++ b/backend/internal/template/handler.go
@@ -7,13 +7,14 @@ import (
"errors"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ templatetypes "github.com/getarcaneapp/arcane/types/v2/template"
+ "go.getarcane.app/kit/pkg/mapping"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- templatetypes "github.com/getarcaneapp/arcane/types/v2/template"
- "go.getarcane.app/kit/pkg/mapping"
)
// TemplateHandler handles template management endpoints.
diff --git a/backend/internal/template/service.go b/backend/internal/template/service.go
index 8f3591437..519ec08b9 100644
--- a/backend/internal/template/service.go
+++ b/backend/internal/template/service.go
@@ -17,13 +17,6 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "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/types/v2/env"
tmpl "github.com/getarcaneapp/arcane/types/v2/template"
"github.com/samber/hot"
@@ -34,6 +27,14 @@ import (
"go.getarcane.app/kit/pkg/mapping"
"golang.org/x/sync/errgroup"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "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"
)
type registryFetchMeta struct {
diff --git a/backend/internal/template/service_test.go b/backend/internal/template/service_test.go
index 69f805cb0..2c839de68 100644
--- a/backend/internal/template/service_test.go
+++ b/backend/internal/template/service_test.go
@@ -14,16 +14,17 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
tmpl "github.com/getarcaneapp/arcane/types/v2/template"
"github.com/libtnb/sqlite"
"github.com/samber/mo"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ httputils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
)
func setupTemplateServiceTestDB(t *testing.T) *database.DB {
diff --git a/backend/internal/updater/actors.go b/backend/internal/updater/actors.go
index b9eaa8d2a..15632b237 100644
--- a/backend/internal/updater/actors.go
+++ b/backend/internal/updater/actors.go
@@ -5,15 +5,16 @@ import (
"errors"
"time"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ arcaneupdater "github.com/getarcaneapp/arcane/types/v2/updater"
+ "github.com/italypaleale/francis/actor"
+ "github.com/italypaleale/francis/host/local"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- arcaneupdater "github.com/getarcaneapp/arcane/types/v2/updater"
- "github.com/italypaleale/francis/actor"
- "github.com/italypaleale/francis/host/local"
)
const (
diff --git a/backend/internal/updater/handler.go b/backend/internal/updater/handler.go
index 4b616176c..49e59f902 100644
--- a/backend/internal/updater/handler.go
+++ b/backend/internal/updater/handler.go
@@ -7,15 +7,16 @@ import (
"reflect"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
+ "github.com/getarcaneapp/arcane/types/v2/updater"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/base"
- projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
- "github.com/getarcaneapp/arcane/types/v2/updater"
)
// UpdaterHandler provides Huma-based updater management endpoints.
diff --git a/backend/internal/updater/module.go b/backend/internal/updater/module.go
index 8d2548935..22d003010 100644
--- a/backend/internal/updater/module.go
+++ b/backend/internal/updater/module.go
@@ -4,6 +4,7 @@ package updater
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
diff --git a/backend/internal/updater/recovery.go b/backend/internal/updater/recovery.go
index afbf3068d..de8f38846 100644
--- a/backend/internal/updater/recovery.go
+++ b/backend/internal/updater/recovery.go
@@ -9,8 +9,6 @@ import (
"strings"
"sync"
- activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
arcaneupdater "github.com/getarcaneapp/arcane/types/v2/updater"
@@ -18,6 +16,9 @@ import (
"go.getarcane.app/docker/compat"
"go.getarcane.app/updater"
"go.getarcane.app/updater/refs"
+
+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
)
type (
diff --git a/backend/internal/updater/recovery_test.go b/backend/internal/updater/recovery_test.go
index 58b1b70a8..e932b2f62 100644
--- a/backend/internal/updater/recovery_test.go
+++ b/backend/internal/updater/recovery_test.go
@@ -9,17 +9,18 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
- francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
arcaneupdater "github.com/getarcaneapp/arcane/types/v2/updater"
"github.com/moby/moby/api/types/container"
image "github.com/moby/moby/api/types/image"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
+ francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
)
func TestFrozenTargetsPreserveAllSelectedContainers(t *testing.T) {
diff --git a/backend/internal/updater/service.go b/backend/internal/updater/service.go
index 30abb00a7..a6cadf970 100644
--- a/backend/internal/updater/service.go
+++ b/backend/internal/updater/service.go
@@ -13,6 +13,20 @@ import (
"sync"
"time"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ arcaneupdater "github.com/getarcaneapp/arcane/types/v2/updater"
+ "github.com/italypaleale/francis/actor"
+ "github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/client"
+ "github.com/samber/mo"
+ "go.getarcane.app/docker/compat"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/cgroup"
+ "go.getarcane.app/updater"
+ "go.getarcane.app/updater/labels"
+ "go.getarcane.app/updater/refs"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
@@ -34,19 +48,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- arcaneupdater "github.com/getarcaneapp/arcane/types/v2/updater"
- "github.com/italypaleale/francis/actor"
- "github.com/moby/moby/api/types/container"
- "github.com/moby/moby/client"
- "github.com/samber/mo"
- "go.getarcane.app/docker/compat"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/cgroup"
- "go.getarcane.app/updater"
- "go.getarcane.app/updater/labels"
- "go.getarcane.app/updater/refs"
)
// UpdaterService is Arcane's handler-facing service for the standalone updater engine.
diff --git a/backend/internal/updater/service_test.go b/backend/internal/updater/service_test.go
index 6ea7f435d..d9690270c 100644
--- a/backend/internal/updater/service_test.go
+++ b/backend/internal/updater/service_test.go
@@ -19,26 +19,6 @@ import (
"time"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "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/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/image"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/notification"
- "github.com/getarcaneapp/arcane/backend/v2/internal/project"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- 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/scheduler/jobcontext"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
@@ -59,6 +39,27 @@ import (
"go.getarcane.app/updater/refs"
updatertypes "go.getarcane.app/updater/types"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "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/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/environment"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/image"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/notification"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/project"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ 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/scheduler/jobcontext"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
)
type fakeDockerClientProviderInternal struct {
diff --git a/backend/internal/updater/tag_updates.go b/backend/internal/updater/tag_updates.go
index cb62a59a3..e4e0e263c 100644
--- a/backend/internal/updater/tag_updates.go
+++ b/backend/internal/updater/tag_updates.go
@@ -10,9 +10,6 @@ import (
composetypes "github.com/compose-spec/compose-go/v2/types"
cerrdefs "github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/project"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
"github.com/moby/moby/client"
@@ -21,6 +18,10 @@ import (
"go.getarcane.app/updater/refs"
updatertypes "go.getarcane.app/updater/types"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/project"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
// ListTags supplies Arcane's registry credentials to the updater's tag checker.
diff --git a/backend/internal/upload/handler.go b/backend/internal/upload/handler.go
index c45048118..029d45732 100644
--- a/backend/internal/upload/handler.go
+++ b/backend/internal/upload/handler.go
@@ -12,12 +12,13 @@ import (
"github.com/danielgtaylor/huma/v2"
"github.com/danielgtaylor/huma/v2/adapters/humaecho"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
)
// UploadHandler provides the Huma-based chunked upload-session endpoints.
diff --git a/backend/internal/upload/service_test.go b/backend/internal/upload/service_test.go
index 81af125e4..b0f828799 100644
--- a/backend/internal/upload/service_test.go
+++ b/backend/internal/upload/service_test.go
@@ -9,8 +9,9 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
func TestSessionChunkRoundTrip(t *testing.T) {
diff --git a/backend/internal/upload/upload.go b/backend/internal/upload/upload.go
index f43649ad9..4cc7e6963 100644
--- a/backend/internal/upload/upload.go
+++ b/backend/internal/upload/upload.go
@@ -17,11 +17,12 @@ import (
"strings"
"time"
+ uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+ "go.getarcane.app/acfs"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
- "go.getarcane.app/acfs"
)
const (
diff --git a/backend/internal/user/handler.go b/backend/internal/user/handler.go
index 546329d43..d874ba26b 100644
--- a/backend/internal/user/handler.go
+++ b/backend/internal/user/handler.go
@@ -7,14 +7,15 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ usertypes "github.com/getarcaneapp/arcane/types/v2/user"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"
- "github.com/getarcaneapp/arcane/types/v2/base"
- usertypes "github.com/getarcaneapp/arcane/types/v2/user"
)
// UserHandler handles user management endpoints.
diff --git a/backend/internal/user/module.go b/backend/internal/user/module.go
index 15921f17a..9aea66100 100644
--- a/backend/internal/user/module.go
+++ b/backend/internal/user/module.go
@@ -4,6 +4,7 @@ package user
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
diff --git a/backend/internal/user/service.go b/backend/internal/user/service.go
index bb7aef4f3..133459bc3 100644
--- a/backend/internal/user/service.go
+++ b/backend/internal/user/service.go
@@ -12,6 +12,13 @@ import (
"slices"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2/user"
+ "go.getarcane.app/kit/normalization"
+ kit "go.getarcane.app/kit/pkg"
+ "golang.org/x/crypto/argon2"
+ "gorm.io/gorm"
+ "gorm.io/gorm/clause"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/role"
@@ -19,12 +26,6 @@ import (
"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"
- "go.getarcane.app/kit/normalization"
- kit "go.getarcane.app/kit/pkg"
- "golang.org/x/crypto/argon2"
- "gorm.io/gorm"
- "gorm.io/gorm/clause"
)
type Argon2Params struct {
diff --git a/backend/internal/user/service_test.go b/backend/internal/user/service_test.go
index 219295aa2..5852899a7 100644
--- a/backend/internal/user/service_test.go
+++ b/backend/internal/user/service_test.go
@@ -5,6 +5,11 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/user"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/role"
@@ -12,10 +17,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/types/v2/user"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func setupAuthServiceTestDBInternal(t *testing.T) *database.DB {
diff --git a/backend/internal/variable/handler.go b/backend/internal/variable/handler.go
index b47adb583..428cf07cf 100644
--- a/backend/internal/variable/handler.go
+++ b/backend/internal/variable/handler.go
@@ -6,13 +6,14 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/env"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/env"
)
// VariableHandler handles manager-level global variables and the separate
diff --git a/backend/internal/variable/module.go b/backend/internal/variable/module.go
index c228aa13e..80763dd8f 100644
--- a/backend/internal/variable/module.go
+++ b/backend/internal/variable/module.go
@@ -3,6 +3,7 @@ package variable
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
)
diff --git a/backend/internal/variable/service_test.go b/backend/internal/variable/service_test.go
index 1ad6557f9..002c36832 100644
--- a/backend/internal/variable/service_test.go
+++ b/backend/internal/variable/service_test.go
@@ -15,6 +15,13 @@ import (
"sync"
"testing"
+ envtypes "github.com/getarcaneapp/arcane/types/v2/env"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
@@ -22,12 +29,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- envtypes "github.com/getarcaneapp/arcane/types/v2/env"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
func newSettingsServiceForVariableTestInternal(t testing.TB, ctx context.Context, db *database.DB) (*settings.SettingsService, error) {
diff --git a/backend/internal/variable/variable.go b/backend/internal/variable/variable.go
index c03abfc74..d47f3b13d 100644
--- a/backend/internal/variable/variable.go
+++ b/backend/internal/variable/variable.go
@@ -19,6 +19,12 @@ import (
"sync"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/env"
+ "go.getarcane.app/acfs"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
@@ -26,11 +32,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/types/v2/env"
- "go.getarcane.app/acfs"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
// envKeyPattern is the POSIX env-name shape used to validate variable keys
diff --git a/backend/internal/version/service.go b/backend/internal/version/service.go
index 8dbfc8ef6..2e558a735 100644
--- a/backend/internal/version/service.go
+++ b/backend/internal/version/service.go
@@ -11,14 +11,6 @@ import (
"time"
ref "github.com/distribution/reference"
- "github.com/getarcaneapp/arcane/backend/v2/buildables"
- "github.com/getarcaneapp/arcane/backend/v2/internal/apns"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/getarcaneapp/arcane/types/v2/version"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
@@ -29,6 +21,15 @@ import (
"go.getarcane.app/streams/agg"
"go.getarcane.app/sys/cgroup"
"golang.org/x/mod/semver"
+
+ "github.com/getarcaneapp/arcane/backend/v2/buildables"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/apns"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
)
const (
diff --git a/backend/internal/version/service_test.go b/backend/internal/version/service_test.go
index c0721e0ca..03435f6f2 100644
--- a/backend/internal/version/service_test.go
+++ b/backend/internal/version/service_test.go
@@ -13,12 +13,6 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
- "github.com/getarcaneapp/arcane/backend/v2/internal/project"
- "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
"github.com/google/go-containerregistry/pkg/name"
ggcrregistry "github.com/google/go-containerregistry/pkg/registry"
"github.com/google/go-containerregistry/pkg/v1/mutate"
@@ -33,6 +27,13 @@ import (
"github.com/stretchr/testify/require"
"go.getarcane.app/updater/labels"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/project"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/registry"
)
func TestVersionService_GetAppVersionInfoDoesNotUseStoredDigestUpdateForSemverBuildInternal(t *testing.T) {
diff --git a/backend/internal/volume/backup.go b/backend/internal/volume/backup.go
index 5fdc2d37e..9c4a353c8 100644
--- a/backend/internal/volume/backup.go
+++ b/backend/internal/volume/backup.go
@@ -17,6 +17,17 @@ import (
"uuid"
cerrdefs "github.com/containerd/errdefs"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ 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/client"
+ "github.com/samber/mo"
+ kit "go.getarcane.app/kit/pkg"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/backup"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -32,16 +43,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/backupbrowser"
s3utils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/s3"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- 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/client"
- "github.com/samber/mo"
- kit "go.getarcane.app/kit/pkg"
- "gorm.io/gorm"
)
type backupStorageMode string
diff --git a/backend/internal/volume/backup_management_test.go b/backend/internal/volume/backup_management_test.go
index 4572977ad..135e0cb00 100644
--- a/backend/internal/volume/backup_management_test.go
+++ b/backend/internal/volume/backup_management_test.go
@@ -6,9 +6,6 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/backup"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/libtnb/sqlite"
@@ -16,6 +13,10 @@ import (
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/backup"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
func TestListBackupsPaginatedByManagementTypeInternal(t *testing.T) {
diff --git a/backend/internal/volume/backup_run.go b/backend/internal/volume/backup_run.go
index f08f5f6bf..9f26ac586 100644
--- a/backend/internal/volume/backup_run.go
+++ b/backend/internal/volume/backup_run.go
@@ -5,6 +5,12 @@ import (
"encoding/json/v2"
"errors"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ "github.com/moby/moby/client"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/backup"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -12,11 +18,6 @@ import (
"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/scheduler/jobcontext"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- "github.com/moby/moby/client"
)
// StartBackup persists a running backup and submits application-owned work.
diff --git a/backend/internal/volume/handler.go b/backend/internal/volume/handler.go
index 6e7b63a89..9b4d35be9 100644
--- a/backend/internal/volume/handler.go
+++ b/backend/internal/volume/handler.go
@@ -13,6 +13,14 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ "github.com/moby/moby/client"
+ "github.com/samber/mo"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -25,13 +33,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
- "github.com/getarcaneapp/arcane/types/v2/base"
- uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- "github.com/moby/moby/client"
- "github.com/samber/mo"
)
// VolumeHandler provides Huma-based volume management endpoints.
diff --git a/backend/internal/volume/helper_container.go b/backend/internal/volume/helper_container.go
index 84dc80ea7..f66e43a74 100644
--- a/backend/internal/volume/helper_container.go
+++ b/backend/internal/volume/helper_container.go
@@ -13,17 +13,18 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- dockerutil "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/libarcane/volumehelper"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
"github.com/samber/mo"
acfstypes "go.getarcane.app/acfs/types"
"go.getarcane.app/docker/compat"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ dockerutil "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/libarcane/volumehelper"
)
// volumeHelper tracks a reused helper container and the last
diff --git a/backend/internal/volume/listing.go b/backend/internal/volume/listing.go
index a8d98d360..2a74c188c 100644
--- a/backend/internal/volume/listing.go
+++ b/backend/internal/volume/listing.go
@@ -9,10 +9,6 @@ import (
"strings"
"time"
- 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"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/moby/moby/api/types/container"
@@ -21,6 +17,11 @@ import (
"github.com/moby/moby/client"
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
+
+ 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"
)
func (s *VolumeService) GetVolumeUsage(ctx context.Context, name string) (bool, []string, error) {
diff --git a/backend/internal/volume/model.go b/backend/internal/volume/model.go
index 897258a8f..b395d911d 100644
--- a/backend/internal/volume/model.go
+++ b/backend/internal/volume/model.go
@@ -3,9 +3,10 @@ package volume
import (
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
"github.com/getarcaneapp/arcane/types/v2/volume"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
type VolumeBackupStatus string
diff --git a/backend/internal/volume/module.go b/backend/internal/volume/module.go
index d627ed47c..914d66b38 100644
--- a/backend/internal/volume/module.go
+++ b/backend/internal/volume/module.go
@@ -4,6 +4,7 @@ package volume
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
diff --git a/backend/internal/volume/rename.go b/backend/internal/volume/rename.go
index 25e66762d..9516db4b8 100644
--- a/backend/internal/volume/rename.go
+++ b/backend/internal/volume/rename.go
@@ -8,14 +8,15 @@ import (
"strings"
cerrdefs "github.com/containerd/errdefs"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ "github.com/moby/moby/client"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
volumeops "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumes"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- "github.com/moby/moby/client"
- "gorm.io/gorm"
)
// RenameVolume copies an unused volume to a new name and removes the source.
diff --git a/backend/internal/volume/service.go b/backend/internal/volume/service.go
index 14b12a774..4af9e07c7 100644
--- a/backend/internal/volume/service.go
+++ b/backend/internal/volume/service.go
@@ -7,6 +7,11 @@ import (
"strings"
"sync"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ "github.com/moby/moby/client"
+ "golang.org/x/sync/singleflight"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/backup"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
@@ -25,10 +30,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- "github.com/moby/moby/client"
- "golang.org/x/sync/singleflight"
)
type VolumeService struct {
diff --git a/backend/internal/volume/service_test.go b/backend/internal/volume/service_test.go
index 3b4a131e6..61b39f696 100644
--- a/backend/internal/volume/service_test.go
+++ b/backend/internal/volume/service_test.go
@@ -10,6 +10,18 @@ import (
"testing"
"time"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ "github.com/libtnb/sqlite"
+ "github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/api/types/mount"
+ "github.com/moby/moby/api/types/volume"
+ "github.com/moby/moby/client"
+ "github.com/stretchr/testify/require"
+ "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/backup"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
@@ -25,17 +37,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/entityjobs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- "github.com/libtnb/sqlite"
- "github.com/moby/moby/api/types/container"
- "github.com/moby/moby/api/types/mount"
- "github.com/moby/moby/api/types/volume"
- "github.com/moby/moby/client"
- "github.com/stretchr/testify/require"
- "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
func newVolumeBackupEngineForTestInternal(t testing.TB) *backup.Engine {
diff --git a/backend/internal/volume/workspace.go b/backend/internal/volume/workspace.go
index 9ff636e2a..cc161760f 100644
--- a/backend/internal/volume/workspace.go
+++ b/backend/internal/volume/workspace.go
@@ -21,14 +21,6 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
- acfsutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/acfs"
- workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
"github.com/moby/moby/api/types/container"
@@ -38,6 +30,15 @@ import (
acfstypes "go.getarcane.app/acfs/types"
"go.getarcane.app/docker/compat"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
+ acfsutils "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/acfs"
+ workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
)
func (s *VolumeService) GetVolumeWorkspace(ctx context.Context, volumeName string) (*workspacetypes.Workspace, error) {
diff --git a/backend/internal/volume/workspace_handler.go b/backend/internal/volume/workspace_handler.go
index 6257ae3ae..30c81db2f 100644
--- a/backend/internal/volume/workspace_handler.go
+++ b/backend/internal/volume/workspace_handler.go
@@ -9,6 +9,12 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
+ "github.com/samber/mo"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
@@ -17,11 +23,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/getarcaneapp/arcane/types/v2/base"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
- "github.com/samber/mo"
)
type GetVolumeWorkspaceInput struct {
diff --git a/backend/internal/volume/workspace_handler_test.go b/backend/internal/volume/workspace_handler_test.go
index 7934a12aa..488ecaa1f 100644
--- a/backend/internal/volume/workspace_handler_test.go
+++ b/backend/internal/volume/workspace_handler_test.go
@@ -7,15 +7,16 @@ import (
"testing"
"github.com/danielgtaylor/huma/v2"
+ uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/internal/upload"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
)
func volumeWorkspacePermissionContextInternal(environmentID string, permissions ...string) context.Context {
diff --git a/backend/internal/volume/workspace_test.go b/backend/internal/volume/workspace_test.go
index 560490945..a1e741634 100644
--- a/backend/internal/volume/workspace_test.go
+++ b/backend/internal/volume/workspace_test.go
@@ -21,9 +21,6 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
"github.com/moby/moby/api/types/container"
@@ -33,6 +30,10 @@ import (
"go.getarcane.app/acfs"
acfstypes "go.getarcane.app/acfs/types"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
)
func newVolumeWorkspaceTestDockerClientInternal(t *testing.T, server *httptest.Server) *client.Client {
diff --git a/backend/internal/vulnerability/handler.go b/backend/internal/vulnerability/handler.go
index 1301ee115..ca439d072 100644
--- a/backend/internal/vulnerability/handler.go
+++ b/backend/internal/vulnerability/handler.go
@@ -10,15 +10,16 @@ import (
"time"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/features"
+ "github.com/getarcaneapp/arcane/types/v2/vulnerability"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/features"
- "github.com/getarcaneapp/arcane/types/v2/vulnerability"
)
// VulnerabilityHandler provides Huma-based vulnerability scanning endpoints.
diff --git a/backend/internal/vulnerability/model.go b/backend/internal/vulnerability/model.go
index bacc04afb..6b53baec1 100644
--- a/backend/internal/vulnerability/model.go
+++ b/backend/internal/vulnerability/model.go
@@ -4,10 +4,11 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
// VulnerabilityScanRecord stores vulnerability scan results for images
diff --git a/backend/internal/vulnerability/module.go b/backend/internal/vulnerability/module.go
index e4057a81c..f1bf3cde2 100644
--- a/backend/internal/vulnerability/module.go
+++ b/backend/internal/vulnerability/module.go
@@ -3,6 +3,7 @@ package vulnerability
import (
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
)
diff --git a/backend/internal/vulnerability/service_test.go b/backend/internal/vulnerability/service_test.go
index b367df70f..2404190e2 100644
--- a/backend/internal/vulnerability/service_test.go
+++ b/backend/internal/vulnerability/service_test.go
@@ -12,17 +12,18 @@ import (
"testing"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/vulnerability"
+ "github.com/libtnb/sqlite"
+ "github.com/moby/moby/client"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/kv"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/types/v2/vulnerability"
- "github.com/libtnb/sqlite"
- "github.com/moby/moby/client"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
func TestBuildTrivyContainerResourcesInternal_Defaults(t *testing.T) {
diff --git a/backend/internal/vulnerability/vulnerability_feature_test.go b/backend/internal/vulnerability/vulnerability_feature_test.go
index 08915579c..f8022d47b 100644
--- a/backend/internal/vulnerability/vulnerability_feature_test.go
+++ b/backend/internal/vulnerability/vulnerability_feature_test.go
@@ -8,17 +8,18 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
- "github.com/getarcaneapp/arcane/backend/v2/internal/notification"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/types/v2/features"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
"github.com/libtnb/sqlite"
"github.com/moby/moby/client"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/notification"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func featureSettingsInternal(t *testing.T) (*settings.SettingsService, *database.DB) {
diff --git a/backend/internal/vulnerability/vulnerability_ignores.go b/backend/internal/vulnerability/vulnerability_ignores.go
index fdb96d5b7..bf8bf3dc5 100644
--- a/backend/internal/vulnerability/vulnerability_ignores.go
+++ b/backend/internal/vulnerability/vulnerability_ignores.go
@@ -9,11 +9,12 @@ import (
"slices"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"
)
func vulnerabilityIgnoreKeyInternal(imageID, vulnerabilityID, pkgName, installedVersion string) string {
diff --git a/backend/internal/vulnerability/vulnerability_ignores_test.go b/backend/internal/vulnerability/vulnerability_ignores_test.go
index 2b2711166..3de593447 100644
--- a/backend/internal/vulnerability/vulnerability_ignores_test.go
+++ b/backend/internal/vulnerability/vulnerability_ignores_test.go
@@ -7,11 +7,12 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
// seedBulkIgnoreFixtureInternal stores nginx with 45 findings (more than one page) and redis with three findings covering every filter dimension.
diff --git a/backend/internal/vulnerability/vulnerability_query.go b/backend/internal/vulnerability/vulnerability_query.go
index 9cfc5ab05..2e9e472e8 100644
--- a/backend/internal/vulnerability/vulnerability_query.go
+++ b/backend/internal/vulnerability/vulnerability_query.go
@@ -17,9 +17,6 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/types/v2/features"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
"github.com/moby/moby/api/types/container"
@@ -27,6 +24,10 @@ import (
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
// GetScanResult retrieves the most recent scan result for an image, with risk insights for completed scans.
diff --git a/backend/internal/vulnerability/vulnerability_scan.go b/backend/internal/vulnerability/vulnerability_scan.go
index 69e2d0253..f5adae375 100644
--- a/backend/internal/vulnerability/vulnerability_scan.go
+++ b/backend/internal/vulnerability/vulnerability_scan.go
@@ -11,13 +11,6 @@ import (
"sync/atomic"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/event"
- "github.com/getarcaneapp/arcane/backend/v2/internal/notification"
- activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
"github.com/getarcaneapp/arcane/types/v2/features"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
@@ -25,6 +18,14 @@ import (
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
"golang.org/x/sync/errgroup"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/event"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/notification"
+ activitylib "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/activity"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
func (s *VulnerabilityService) setScanPhaseInternal(imageID string, phase vulnerability.ScanPhase) {
diff --git a/backend/internal/vulnerability/vulnerability_store.go b/backend/internal/vulnerability/vulnerability_store.go
index 8b5fa838a..2381b48c1 100644
--- a/backend/internal/vulnerability/vulnerability_store.go
+++ b/backend/internal/vulnerability/vulnerability_store.go
@@ -14,9 +14,6 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"
"github.com/getarcaneapp/arcane/types/v2"
"github.com/getarcaneapp/arcane/types/v2/features"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
@@ -24,6 +21,10 @@ import (
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
"gorm.io/gorm/clause"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/dbutil"
)
// deleteScanChildRowsInternal best-effort removes the raw report and CVE item
diff --git a/backend/internal/vulnerability/vulnerability_trivy.go b/backend/internal/vulnerability/vulnerability_trivy.go
index d620f3224..2833bc6a1 100644
--- a/backend/internal/vulnerability/vulnerability_trivy.go
+++ b/backend/internal/vulnerability/vulnerability_trivy.go
@@ -13,14 +13,6 @@ import (
"sync"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- 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"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/getarcaneapp/arcane/types/v2/features"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
containertypes "github.com/moby/moby/api/types/container"
@@ -30,6 +22,15 @@ import (
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/cgroup"
"gorm.io/gorm/clause"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ 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"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/vuln"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
type trivyRuntimeSecurityInternal struct {
diff --git a/backend/internal/webhook/handler.go b/backend/internal/webhook/handler.go
index a02554c25..4b919619e 100644
--- a/backend/internal/webhook/handler.go
+++ b/backend/internal/webhook/handler.go
@@ -6,12 +6,13 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/webhook"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/handlerutil"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/webhook"
)
type WebhookHandler struct {
diff --git a/backend/internal/webhook/webhook.go b/backend/internal/webhook/webhook.go
index 6010bc70a..2df0e178c 100644
--- a/backend/internal/webhook/webhook.go
+++ b/backend/internal/webhook/webhook.go
@@ -15,6 +15,15 @@ import (
"sync"
"time"
+ "github.com/getarcaneapp/arcane/types/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ updatertypes "github.com/getarcaneapp/arcane/types/v2/updater"
+ webhooktypes "github.com/getarcaneapp/arcane/types/v2/webhook"
+ "go.getarcane.app/kit/normalization"
+ kit "go.getarcane.app/kit/pkg"
+ libcrypto "go.getarcane.app/sys/crypto"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/container"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
@@ -24,14 +33,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/project"
"github.com/getarcaneapp/arcane/backend/v2/internal/updater"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/types/v2"
- "github.com/getarcaneapp/arcane/types/v2/base"
- updatertypes "github.com/getarcaneapp/arcane/types/v2/updater"
- webhooktypes "github.com/getarcaneapp/arcane/types/v2/webhook"
- "go.getarcane.app/kit/normalization"
- kit "go.getarcane.app/kit/pkg"
- libcrypto "go.getarcane.app/sys/crypto"
- "gorm.io/gorm"
)
const (
diff --git a/backend/internal/webhook/webhook_test.go b/backend/internal/webhook/webhook_test.go
index 1ece4171d..8a1fa782f 100644
--- a/backend/internal/webhook/webhook_test.go
+++ b/backend/internal/webhook/webhook_test.go
@@ -12,9 +12,6 @@ import (
"sync"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/types/v2"
"github.com/labstack/echo/v5"
"github.com/libtnb/sqlite"
@@ -23,6 +20,10 @@ import (
kit "go.getarcane.app/kit/pkg"
libcrypto "go.getarcane.app/sys/crypto"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
)
// 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.go
index c3d7bb6e6..6c30b63b0 100644
--- a/backend/pkg/authz/access_policy_test.go
+++ b/backend/pkg/authz/access_policy_test.go
@@ -8,10 +8,11 @@ import (
"strings"
"testing"
+ "github.com/stretchr/testify/require"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/search"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
- "github.com/stretchr/testify/require"
)
func TestAccessSurfaceRegistryDefinesSettingsCustomizeAndLandingSemantics(t *testing.T) {
diff --git a/backend/pkg/dockerutil/mount_utils.go b/backend/pkg/dockerutil/mount_utils.go
index 21ceadabe..bdf16bdeb 100644
--- a/backend/pkg/dockerutil/mount_utils.go
+++ b/backend/pkg/dockerutil/mount_utils.go
@@ -8,10 +8,11 @@ import (
"slices"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/mount"
"github.com/moby/moby/client"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
)
// MountForCurrentContainerSubpath inspects the current container, finds the
diff --git a/backend/pkg/fswatch/watcher.go b/backend/pkg/fswatch/watcher.go
index c29858acb..386c33840 100644
--- a/backend/pkg/fswatch/watcher.go
+++ b/backend/pkg/fswatch/watcher.go
@@ -16,6 +16,7 @@ import (
"time"
"github.com/fsnotify/fsnotify"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
diff --git a/backend/pkg/libarcane/activity/handler.go b/backend/pkg/libarcane/activity/handler.go
index 6381fb669..7446bb8ec 100644
--- a/backend/pkg/libarcane/activity/handler.go
+++ b/backend/pkg/libarcane/activity/handler.go
@@ -10,13 +10,14 @@ import (
"net/http"
"strings"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/samber/mo"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/samber/mo"
)
const (
diff --git a/backend/pkg/libarcane/activity/requests.go b/backend/pkg/libarcane/activity/requests.go
index 30663447f..212078f19 100644
--- a/backend/pkg/libarcane/activity/requests.go
+++ b/backend/pkg/libarcane/activity/requests.go
@@ -3,9 +3,10 @@ package activity
import (
"context"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
- 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.go
index f923845c2..33925ba58 100644
--- a/backend/pkg/libarcane/activity/writer.go
+++ b/backend/pkg/libarcane/activity/writer.go
@@ -10,10 +10,11 @@ import (
"strings"
"sync"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
type Writer struct {
diff --git a/backend/pkg/libarcane/edge/client.go b/backend/pkg/libarcane/edge/client.go
index d54757ba2..7d4e2d56d 100644
--- a/backend/pkg/libarcane/edge/client.go
+++ b/backend/pkg/libarcane/edge/client.go
@@ -17,12 +17,13 @@ import (
"github.com/cenkalti/backoff/v5"
"github.com/coder/websocket"
+ "github.com/samber/mo"
+ kit "go.getarcane.app/kit/pkg"
+
wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- "github.com/samber/mo"
- kit "go.getarcane.app/kit/pkg"
)
const (
diff --git a/backend/pkg/libarcane/edge/client_test.go b/backend/pkg/libarcane/edge/client_test.go
index e8b618b12..7af6efae0 100644
--- a/backend/pkg/libarcane/edge/client_test.go
+++ b/backend/pkg/libarcane/edge/client_test.go
@@ -20,8 +20,6 @@ import (
"time"
"github.com/coder/websocket"
- httputil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"github.com/labstack/echo/v5"
slogecho "github.com/samber/slog-echo/v2"
"github.com/stretchr/testify/assert"
@@ -29,6 +27,9 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
+
+ httputil "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
func TestTunnelClient_HandleRequest(t *testing.T) {
diff --git a/backend/pkg/libarcane/edge/client_transport_grpc.go b/backend/pkg/libarcane/edge/client_transport_grpc.go
index 0e98d83cd..4c147201b 100644
--- a/backend/pkg/libarcane/edge/client_transport_grpc.go
+++ b/backend/pkg/libarcane/edge/client_transport_grpc.go
@@ -10,8 +10,6 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"google.golang.org/grpc"
"google.golang.org/grpc/backoff"
"google.golang.org/grpc/connectivity"
@@ -19,6 +17,9 @@ import (
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/keepalive"
"google.golang.org/grpc/metadata"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
func (c *TunnelClient) connectAndServeGRPC(ctx context.Context) error {
diff --git a/backend/pkg/libarcane/edge/client_transport_grpc_test.go b/backend/pkg/libarcane/edge/client_transport_grpc_test.go
index f9a73fca3..0507fbc6c 100644
--- a/backend/pkg/libarcane/edge/client_transport_grpc_test.go
+++ b/backend/pkg/libarcane/edge/client_transport_grpc_test.go
@@ -9,7 +9,6 @@ import (
"testing"
"time"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
@@ -18,6 +17,8 @@ import (
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
"google.golang.org/grpc/test/bufconn"
+
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
func TestGRPCTunnel_RequestResponse(t *testing.T) {
diff --git a/backend/pkg/libarcane/edge/client_transport_poll.go b/backend/pkg/libarcane/edge/client_transport_poll.go
index fd24aafb6..f17721bb9 100644
--- a/backend/pkg/libarcane/edge/client_transport_poll.go
+++ b/backend/pkg/libarcane/edge/client_transport_poll.go
@@ -13,6 +13,7 @@ import (
"time"
"github.com/cenkalti/backoff/v5"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
)
diff --git a/backend/pkg/libarcane/edge/poll_control.go b/backend/pkg/libarcane/edge/poll_control.go
index 9cfb4867b..1f4259369 100644
--- a/backend/pkg/libarcane/edge/poll_control.go
+++ b/backend/pkg/libarcane/edge/poll_control.go
@@ -9,10 +9,11 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/labstack/echo/v5"
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
)
const (
diff --git a/backend/pkg/libarcane/edge/proxy_test.go b/backend/pkg/libarcane/edge/proxy_test.go
index 95b55121e..f5260155d 100644
--- a/backend/pkg/libarcane/edge/proxy_test.go
+++ b/backend/pkg/libarcane/edge/proxy_test.go
@@ -13,12 +13,13 @@ import (
"time"
"github.com/coder/websocket"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"github.com/labstack/echo/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
+
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
// setupMockAgentServer creates a WS server that acts as an agent
diff --git a/backend/pkg/libarcane/edge/registry.go b/backend/pkg/libarcane/edge/registry.go
index 2b9c88f9b..ad03c473c 100644
--- a/backend/pkg/libarcane/edge/registry.go
+++ b/backend/pkg/libarcane/edge/registry.go
@@ -7,8 +7,9 @@ import (
"sync"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
"github.com/samber/mo"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
)
// NewAgentTunnelWithConn creates a new agent tunnel from a transport-agnostic connection.
diff --git a/backend/pkg/libarcane/edge/remenv.go b/backend/pkg/libarcane/edge/remenv.go
index d6a6167a5..3d8f03057 100644
--- a/backend/pkg/libarcane/edge/remenv.go
+++ b/backend/pkg/libarcane/edge/remenv.go
@@ -5,9 +5,10 @@ import (
"net/http"
"strings"
+ "github.com/labstack/echo/v5"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/cookie"
- "github.com/labstack/echo/v5"
)
const (
diff --git a/backend/pkg/libarcane/edge/remenv_test.go b/backend/pkg/libarcane/edge/remenv_test.go
index a33658405..544c34f6b 100644
--- a/backend/pkg/libarcane/edge/remenv_test.go
+++ b/backend/pkg/libarcane/edge/remenv_test.go
@@ -12,13 +12,14 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"github.com/labstack/echo/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
type chunkReader struct {
diff --git a/backend/pkg/libarcane/edge/server.go b/backend/pkg/libarcane/edge/server.go
index a9f4cd038..37c158bc9 100644
--- a/backend/pkg/libarcane/edge/server.go
+++ b/backend/pkg/libarcane/edge/server.go
@@ -13,10 +13,6 @@ import (
"time"
"uuid"
- wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
certgen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"
"github.com/labstack/echo/v5"
"github.com/samber/mo"
@@ -27,6 +23,11 @@ import (
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/peer"
"google.golang.org/grpc/status"
+
+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
const (
diff --git a/backend/pkg/libarcane/edge/tls.go b/backend/pkg/libarcane/edge/tls.go
index bc8d297f8..4a9563b3b 100644
--- a/backend/pkg/libarcane/edge/tls.go
+++ b/backend/pkg/libarcane/edge/tls.go
@@ -29,8 +29,6 @@ import (
"syscall"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
certgen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"
"go.getarcane.app/acfs"
"go.getarcane.app/acfs/atomic"
@@ -38,6 +36,9 @@ import (
libcrypto "go.getarcane.app/sys/crypto"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/peer"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
)
const (
diff --git a/backend/pkg/libarcane/edge/tls_test.go b/backend/pkg/libarcane/edge/tls_test.go
index 2f77e6eb6..079bbf44f 100644
--- a/backend/pkg/libarcane/edge/tls_test.go
+++ b/backend/pkg/libarcane/edge/tls_test.go
@@ -20,13 +20,14 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
certgen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
libcrypto "go.getarcane.app/sys/crypto"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/peer"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
type testAuthInfo struct{}
diff --git a/backend/pkg/libarcane/edge/transport_test.go b/backend/pkg/libarcane/edge/transport_test.go
index 53d8166ec..f4f31032c 100644
--- a/backend/pkg/libarcane/edge/transport_test.go
+++ b/backend/pkg/libarcane/edge/transport_test.go
@@ -14,11 +14,12 @@ import (
"github.com/coder/websocket"
"github.com/coder/websocket/wsjson"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
+
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
func TestNormalizeEdgeTransport(t *testing.T) {
diff --git a/backend/pkg/libarcane/edge/tunnel.go b/backend/pkg/libarcane/edge/tunnel.go
index 491738218..9b477a9fa 100644
--- a/backend/pkg/libarcane/edge/tunnel.go
+++ b/backend/pkg/libarcane/edge/tunnel.go
@@ -9,10 +9,11 @@ import (
"net"
"github.com/coder/websocket"
- wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
+
+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
// TunnelMessageType represents the type of message sent over the tunnel.
diff --git a/backend/pkg/libarcane/edge/tunnel_proto_adapter_test.go b/backend/pkg/libarcane/edge/tunnel_proto_adapter_test.go
index a413ddfea..79781f19b 100644
--- a/backend/pkg/libarcane/edge/tunnel_proto_adapter_test.go
+++ b/backend/pkg/libarcane/edge/tunnel_proto_adapter_test.go
@@ -6,9 +6,10 @@ import (
"testing"
"github.com/coder/websocket"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
func TestTunnelMessageToManagerProto_RoundTripRequest(t *testing.T) {
diff --git a/backend/pkg/libarcane/edge/tunnel_test.go b/backend/pkg/libarcane/edge/tunnel_test.go
index 52223683b..dff4bb0a8 100644
--- a/backend/pkg/libarcane/edge/tunnel_test.go
+++ b/backend/pkg/libarcane/edge/tunnel_test.go
@@ -11,9 +11,10 @@ import (
"time"
"github.com/coder/websocket"
- tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"
)
func newWebSocketAgentTunnel(envID string, conn *websocket.Conn) *AgentTunnel {
diff --git a/backend/pkg/libarcane/edge/types.go b/backend/pkg/libarcane/edge/types.go
index 5bd8f8ac5..cccbb2298 100644
--- a/backend/pkg/libarcane/edge/types.go
+++ b/backend/pkg/libarcane/edge/types.go
@@ -9,8 +9,9 @@ import (
"time"
"github.com/coder/websocket"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
"google.golang.org/grpc"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
)
// activeWSStream tracks an active WebSocket stream on the agent side.
diff --git a/backend/pkg/libarcane/edge/ws_proxy.go b/backend/pkg/libarcane/edge/ws_proxy.go
index 6b78ee2e7..a00ab0770 100644
--- a/backend/pkg/libarcane/edge/ws_proxy.go
+++ b/backend/pkg/libarcane/edge/ws_proxy.go
@@ -8,8 +8,9 @@ import (
"uuid"
"github.com/coder/websocket"
- wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
"github.com/labstack/echo/v5"
+
+ wshub "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/ws"
)
const (
diff --git a/backend/pkg/libarcane/rustic/run.go b/backend/pkg/libarcane/rustic/run.go
index a405e9d66..353b4961d 100644
--- a/backend/pkg/libarcane/rustic/run.go
+++ b/backend/pkg/libarcane/rustic/run.go
@@ -10,12 +10,13 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
"github.com/moby/moby/api/pkg/stdcopy"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/mount"
"github.com/moby/moby/client"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
)
// Run executes one Rustic command in an ephemeral container built from
diff --git a/backend/pkg/libarcane/startup/runtime_identity.go b/backend/pkg/libarcane/startup/runtime_identity.go
index a128e3116..6e2a2ed73 100644
--- a/backend/pkg/libarcane/startup/runtime_identity.go
+++ b/backend/pkg/libarcane/startup/runtime_identity.go
@@ -11,9 +11,10 @@ import (
"strconv"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
const (
diff --git a/backend/pkg/libarcane/swarm/convert_mounts.go b/backend/pkg/libarcane/swarm/convert_mounts.go
index 52925c703..bfd4f2d38 100644
--- a/backend/pkg/libarcane/swarm/convert_mounts.go
+++ b/backend/pkg/libarcane/swarm/convert_mounts.go
@@ -10,9 +10,10 @@ import (
"strings"
composegotypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
"github.com/moby/moby/api/types/mount"
"github.com/moby/moby/api/types/swarm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
func convertServiceMountsInternal(
diff --git a/backend/pkg/libarcane/swarm/convert_test.go b/backend/pkg/libarcane/swarm/convert_test.go
index 0e6482797..226bbd695 100644
--- a/backend/pkg/libarcane/swarm/convert_test.go
+++ b/backend/pkg/libarcane/swarm/convert_test.go
@@ -7,13 +7,14 @@ import (
"testing"
composegotypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
"github.com/moby/moby/api/types/mount"
"github.com/moby/moby/api/types/swarm"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
func TestConvertServiceMountsResolvesComposeResourceNames(t *testing.T) {
diff --git a/backend/pkg/libarcane/swarm/deploy.go b/backend/pkg/libarcane/swarm/deploy.go
index 04bd1cb6f..2cb27a274 100644
--- a/backend/pkg/libarcane/swarm/deploy.go
+++ b/backend/pkg/libarcane/swarm/deploy.go
@@ -9,11 +9,12 @@ import (
"strings"
composegotypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
swarmtypes "github.com/getarcaneapp/arcane/types/v2/swarm"
"github.com/moby/moby/api/types/swarm"
dockerclient "github.com/moby/moby/client"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
// StackDeployOptions controls how a swarm stack is deployed.
diff --git a/backend/pkg/libarcane/swarm/load_test.go b/backend/pkg/libarcane/swarm/load_test.go
index 05c646bb5..965b5a008 100644
--- a/backend/pkg/libarcane/swarm/load_test.go
+++ b/backend/pkg/libarcane/swarm/load_test.go
@@ -4,9 +4,10 @@ import (
"context"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
func TestLoadComposeProjectMergesOverrideContent(t *testing.T) {
diff --git a/backend/pkg/libarcane/swarm/render.go b/backend/pkg/libarcane/swarm/render.go
index 37c99d285..e1afe4c49 100644
--- a/backend/pkg/libarcane/swarm/render.go
+++ b/backend/pkg/libarcane/swarm/render.go
@@ -8,8 +8,9 @@ import (
"slices"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
type StackRenderOptions struct {
diff --git a/backend/pkg/libarcane/volumehelper/helper.go b/backend/pkg/libarcane/volumehelper/helper.go
index af531a56a..b074d1dc2 100644
--- a/backend/pkg/libarcane/volumehelper/helper.go
+++ b/backend/pkg/libarcane/volumehelper/helper.go
@@ -10,13 +10,14 @@ import (
"strings"
ref "github.com/distribution/reference"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/mount"
"github.com/moby/moby/client"
"github.com/samber/mo"
"go.getarcane.app/docker/compat"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
)
// RuntimeImage describes the Arcane runtime image that can run internal helper
diff --git a/backend/pkg/libarcane/volumehelper/helper_test.go b/backend/pkg/libarcane/volumehelper/helper_test.go
index a1dc314f2..f0d1289be 100644
--- a/backend/pkg/libarcane/volumehelper/helper_test.go
+++ b/backend/pkg/libarcane/volumehelper/helper_test.go
@@ -9,11 +9,12 @@ import (
"sync/atomic"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
)
func TestLabels(t *testing.T) {
diff --git a/backend/pkg/libarcane/volumes/volume_rename.go b/backend/pkg/libarcane/volumes/volume_rename.go
index 2dcdd83b4..18a94a768 100644
--- a/backend/pkg/libarcane/volumes/volume_rename.go
+++ b/backend/pkg/libarcane/volumes/volume_rename.go
@@ -12,13 +12,14 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
- dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
kit "go.getarcane.app/kit/pkg"
+
+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
)
type dockerProjectVolumeRenameMigrationInternal struct {
diff --git a/backend/pkg/libarcane/volumes/volume_rename_runtime_test.go b/backend/pkg/libarcane/volumes/volume_rename_runtime_test.go
index d0b5eef3c..528447c5c 100644
--- a/backend/pkg/libarcane/volumes/volume_rename_runtime_test.go
+++ b/backend/pkg/libarcane/volumes/volume_rename_runtime_test.go
@@ -8,9 +8,10 @@ import (
"strings"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
)
func TestGetProjectVolumeCopyRuntimeInternal_UsesToolsImageWhenAvailable(t *testing.T) {
diff --git a/backend/pkg/libarcane/volumes/volume_rename_safety_test.go b/backend/pkg/libarcane/volumes/volume_rename_safety_test.go
index 195b7d411..46f3704b9 100644
--- a/backend/pkg/libarcane/volumes/volume_rename_safety_test.go
+++ b/backend/pkg/libarcane/volumes/volume_rename_safety_test.go
@@ -11,12 +11,13 @@ import (
"syscall"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/mount"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
)
func TestIsProjectVolumeCopyNoSpaceErrorInternal(t *testing.T) {
diff --git a/backend/pkg/libarcane/volumes/volume_rename_test.go b/backend/pkg/libarcane/volumes/volume_rename_test.go
index 9791f21ca..7790ae63e 100644
--- a/backend/pkg/libarcane/volumes/volume_rename_test.go
+++ b/backend/pkg/libarcane/volumes/volume_rename_test.go
@@ -7,13 +7,14 @@ import (
"strings"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/volume"
"github.com/moby/moby/client"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
)
func newTestDockerClientInternal(t *testing.T, server *httptest.Server) *client.Client {
diff --git a/backend/pkg/libarcane/vuln/driver.go b/backend/pkg/libarcane/vuln/driver.go
index 043c20b42..1c1d47625 100644
--- a/backend/pkg/libarcane/vuln/driver.go
+++ b/backend/pkg/libarcane/vuln/driver.go
@@ -20,14 +20,15 @@ import (
"time"
cerrdefs "github.com/containerd/errdefs"
- dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
"github.com/moby/moby/api/pkg/stdcopy"
containertypes "github.com/moby/moby/api/types/container"
mounttypes "github.com/moby/moby/api/types/mount"
"github.com/moby/moby/client"
kit "go.getarcane.app/kit/pkg"
+
+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
)
const (
diff --git a/backend/pkg/libarcane/vuln/driver_test.go b/backend/pkg/libarcane/vuln/driver_test.go
index b33686571..aabb893a4 100644
--- a/backend/pkg/libarcane/vuln/driver_test.go
+++ b/backend/pkg/libarcane/vuln/driver_test.go
@@ -10,11 +10,12 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
containertypes "github.com/moby/moby/api/types/container"
mounttypes "github.com/moby/moby/api/types/mount"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
)
func TestDecodeTrivyReportFromFileInternal_LargePayload(t *testing.T) {
diff --git a/backend/pkg/libarcane/vuln/trivy.go b/backend/pkg/libarcane/vuln/trivy.go
index f3e98d5fc..317af5d6f 100644
--- a/backend/pkg/libarcane/vuln/trivy.go
+++ b/backend/pkg/libarcane/vuln/trivy.go
@@ -14,10 +14,11 @@ import (
"runtime"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
containertypes "github.com/moby/moby/api/types/container"
dockerregistry "github.com/moby/moby/api/types/registry"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
)
const (
diff --git a/backend/pkg/projects/build.go b/backend/pkg/projects/build.go
index 2745d3481..28fea0280 100644
--- a/backend/pkg/projects/build.go
+++ b/backend/pkg/projects/build.go
@@ -10,11 +10,12 @@ import (
"strings"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
"go.getarcane.app/builds/pkg/contextsource"
buildtypes "go.getarcane.app/builds/types"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
// ResolveBuildContext resolves a service build context against workingDir.
diff --git a/backend/pkg/projects/cmds.go b/backend/pkg/projects/cmds.go
index 7137b6756..730df41d9 100644
--- a/backend/pkg/projects/cmds.go
+++ b/backend/pkg/projects/cmds.go
@@ -11,13 +11,14 @@ import (
composetypes "github.com/compose-spec/compose-go/v2/types"
"github.com/docker/compose/v5/pkg/api"
"github.com/docker/compose/v5/pkg/compose"
- docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/registry"
"github.com/moby/moby/client"
kit "go.getarcane.app/kit/pkg"
+
+ docker "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/timeouts"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
// defaultComposeTimeout is applied to compose operations that have been
diff --git a/backend/pkg/projects/cmds_test.go b/backend/pkg/projects/cmds_test.go
index 88235c3eb..6836fdefd 100644
--- a/backend/pkg/projects/cmds_test.go
+++ b/backend/pkg/projects/cmds_test.go
@@ -11,11 +11,12 @@ import (
composetypes "github.com/compose-spec/compose-go/v2/types"
"github.com/docker/compose/v5/pkg/api"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
func TestDetachFromHTTPContextInternal(t *testing.T) {
diff --git a/backend/pkg/projects/compose.go b/backend/pkg/projects/compose.go
index d01f9fe00..4a181734a 100644
--- a/backend/pkg/projects/compose.go
+++ b/backend/pkg/projects/compose.go
@@ -15,11 +15,12 @@ import (
"github.com/docker/compose/v5/cmd/display"
"github.com/docker/compose/v5/pkg/api"
"github.com/docker/compose/v5/pkg/compose"
- dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
"github.com/moby/moby/api/types/registry"
"github.com/moby/moby/client"
"go.getarcane.app/docker/compat"
kit "go.getarcane.app/kit/pkg"
+
+ dockerutils "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
)
type Client struct {
diff --git a/backend/pkg/projects/custom_labels.go b/backend/pkg/projects/custom_labels.go
index 6b89120dd..c23aa2424 100644
--- a/backend/pkg/projects/custom_labels.go
+++ b/backend/pkg/projects/custom_labels.go
@@ -16,12 +16,13 @@ import (
"github.com/compose-spec/compose-go/v2/loader"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
kit "go.getarcane.app/kit/pkg"
updaterlabels "go.getarcane.app/updater/labels"
"go.yaml.in/yaml/v4"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/iconcatalog"
)
const (
diff --git a/backend/pkg/projects/discovery.go b/backend/pkg/projects/discovery.go
index 5d7e13836..b106c89e5 100644
--- a/backend/pkg/projects/discovery.go
+++ b/backend/pkg/projects/discovery.go
@@ -12,9 +12,10 @@ import (
"strings"
"github.com/compose-spec/compose-go/v2/loader"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
kit "go.getarcane.app/kit/pkg"
"go.yaml.in/yaml/v4"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
type DiscoveredProjectDir struct {
diff --git a/backend/pkg/projects/env.go b/backend/pkg/projects/env.go
index 55cb16d79..45eeab568 100644
--- a/backend/pkg/projects/env.go
+++ b/backend/pkg/projects/env.go
@@ -17,11 +17,12 @@ import (
"github.com/compose-spec/compose-go/v2/consts"
"github.com/compose-spec/compose-go/v2/dotenv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
"github.com/samber/hot"
"go.getarcane.app/acfs"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
const (
diff --git a/backend/pkg/projects/env_test.go b/backend/pkg/projects/env_test.go
index cff1b00d4..6620f7298 100644
--- a/backend/pkg/projects/env_test.go
+++ b/backend/pkg/projects/env_test.go
@@ -8,10 +8,11 @@ import (
"runtime"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
func TestLoadEnvironment(t *testing.T) {
diff --git a/backend/pkg/projects/env_unix_test.go b/backend/pkg/projects/env_unix_test.go
index 9a7b5940c..6f9c579f8 100644
--- a/backend/pkg/projects/env_unix_test.go
+++ b/backend/pkg/projects/env_unix_test.go
@@ -8,9 +8,10 @@ import (
"path/filepath"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
// TestReadProjectEnvState_TreatsPermissionLockedEnvAsUnreadable verifies that a
diff --git a/backend/pkg/projects/fs_backup.go b/backend/pkg/projects/fs_backup.go
index 380d1a3bf..fecddce39 100644
--- a/backend/pkg/projects/fs_backup.go
+++ b/backend/pkg/projects/fs_backup.go
@@ -11,10 +11,11 @@ import (
"slices"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"go.getarcane.app/acfs"
"go.getarcane.app/acfs/atomic"
acfstypes "go.getarcane.app/acfs/types"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
// ProjectUpdateBackupScope describes exactly what a project update can mutate,
diff --git a/backend/pkg/projects/fs_templates.go b/backend/pkg/projects/fs_templates.go
index 09748d552..2af2e004d 100644
--- a/backend/pkg/projects/fs_templates.go
+++ b/backend/pkg/projects/fs_templates.go
@@ -12,10 +12,11 @@ import (
composeloader "github.com/compose-spec/compose-go/v2/loader"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/samber/mo"
"go.getarcane.app/acfs"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
// ReadFolderComposeTemplate stays on os.* for its reads: template folders are
diff --git a/backend/pkg/projects/fs_util.go b/backend/pkg/projects/fs_util.go
index 8a672d290..787601989 100644
--- a/backend/pkg/projects/fs_util.go
+++ b/backend/pkg/projects/fs_util.go
@@ -13,13 +13,14 @@ import (
"slices"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/samber/mo"
"go.getarcane.app/acfs"
kit "go.getarcane.app/kit/pkg"
"go.yaml.in/yaml/v4"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
func ResolveConfiguredContainerDirectory(configuredPath, defaultPath string) string {
diff --git a/backend/pkg/projects/fs_writer.go b/backend/pkg/projects/fs_writer.go
index ac6c50a32..b57df46d8 100644
--- a/backend/pkg/projects/fs_writer.go
+++ b/backend/pkg/projects/fs_writer.go
@@ -14,10 +14,11 @@ import (
"time"
"github.com/compose-spec/compose-go/v2/cli"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"go.getarcane.app/acfs"
"go.getarcane.app/acfs/atomic"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
const (
diff --git a/backend/pkg/projects/fs_writer_test.go b/backend/pkg/projects/fs_writer_test.go
index aa177c3cf..cc8e63bf9 100644
--- a/backend/pkg/projects/fs_writer_test.go
+++ b/backend/pkg/projects/fs_writer_test.go
@@ -8,11 +8,12 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.getarcane.app/acfs"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
func TestWriteFilesPermissions(t *testing.T) {
diff --git a/backend/pkg/projects/load.go b/backend/pkg/projects/load.go
index f0b9a2311..08bd7dc00 100644
--- a/backend/pkg/projects/load.go
+++ b/backend/pkg/projects/load.go
@@ -22,10 +22,11 @@ import (
composetypes "github.com/compose-spec/compose-go/v2/types"
"github.com/docker/compose/v5/pkg/api"
"github.com/docker/go-units"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
"github.com/samber/mo"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
)
// ProjectFileCandidates enumerates known project files: base compose names,
diff --git a/backend/pkg/projects/path_mapper.go b/backend/pkg/projects/path_mapper.go
index d149004e2..f35b51ac5 100644
--- a/backend/pkg/projects/path_mapper.go
+++ b/backend/pkg/projects/path_mapper.go
@@ -10,12 +10,13 @@ import (
"strings"
composetypes "github.com/compose-spec/compose-go/v2/types"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
mounttypes "github.com/moby/moby/api/types/mount"
"github.com/moby/moby/client"
"github.com/samber/mo"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
)
// HostMount is one container→host mount (bind or named volume) from Arcane's own
diff --git a/backend/pkg/projects/volume_migration.go b/backend/pkg/projects/volume_migration.go
index 1024c605d..f7fd6321a 100644
--- a/backend/pkg/projects/volume_migration.go
+++ b/backend/pkg/projects/volume_migration.go
@@ -14,12 +14,13 @@ import (
cerrdefs "github.com/containerd/errdefs"
"github.com/docker/compose/v5/pkg/api"
composepkg "github.com/docker/compose/v5/pkg/compose"
- dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumes"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/moby/moby/client"
"go.yaml.in/yaml/v4"
+
+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumes"
)
func PlanVolumeMigration(ctx context.Context, dockerClient *client.Client, composeProject *composetypes.Project, oldComposeName, newComposeName, toolsImage string) (volumetypes.Migration, error) {
diff --git a/backend/pkg/projects/workspace.go b/backend/pkg/projects/workspace.go
index e5da1e696..8ea5e557e 100644
--- a/backend/pkg/projects/workspace.go
+++ b/backend/pkg/projects/workspace.go
@@ -16,12 +16,13 @@ import (
"slices"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
"github.com/getarcaneapp/arcane/types/v2/project"
workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
+ workspacepkg "github.com/getarcaneapp/arcane/backend/v2/pkg/workspace"
)
const (
diff --git a/backend/pkg/scheduler/activity_sweep_job.go b/backend/pkg/scheduler/activity_sweep_job.go
index ae804b7a6..f8c0792f0 100644
--- a/backend/pkg/scheduler/activity_sweep_job.go
+++ b/backend/pkg/scheduler/activity_sweep_job.go
@@ -4,8 +4,9 @@ import (
"context"
"log/slog"
- "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/activity"
)
const ActivitySweepJobName = "activity-sweep"
diff --git a/backend/pkg/scheduler/actor_test.go b/backend/pkg/scheduler/actor_test.go
index 05445140c..d0c3f3fad 100644
--- a/backend/pkg/scheduler/actor_test.go
+++ b/backend/pkg/scheduler/actor_test.go
@@ -6,6 +6,11 @@ import (
"testing"
"time"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/libtnb/sqlite"
+ "github.com/stretchr/testify/require"
+ "gorm.io/gorm"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/kv"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
@@ -13,10 +18,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/libtnb/sqlite"
- "github.com/stretchr/testify/require"
- "gorm.io/gorm"
)
var schedulerTestRuntimesInternal sync.Map
diff --git a/backend/pkg/scheduler/analytics_job.go b/backend/pkg/scheduler/analytics_job.go
index 9ad79a7b4..8c91dd122 100644
--- a/backend/pkg/scheduler/analytics_job.go
+++ b/backend/pkg/scheduler/analytics_job.go
@@ -14,11 +14,12 @@ import (
"time"
"github.com/cenkalti/backoff/v5"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/kv"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- kit "go.getarcane.app/kit/pkg"
)
const (
diff --git a/backend/pkg/scheduler/analytics_job_test.go b/backend/pkg/scheduler/analytics_job_test.go
index 4306668a4..1f9b7d8cc 100644
--- a/backend/pkg/scheduler/analytics_job_test.go
+++ b/backend/pkg/scheduler/analytics_job_test.go
@@ -11,14 +11,15 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func setupAnalyticsStateServicesInternal(t *testing.T) (*database.DB, *settings.SettingsService, *kv.KVService) {
diff --git a/backend/pkg/scheduler/apns_outbox_job.go b/backend/pkg/scheduler/apns_outbox_job.go
index cff6c32d3..adad24a17 100644
--- a/backend/pkg/scheduler/apns_outbox_job.go
+++ b/backend/pkg/scheduler/apns_outbox_job.go
@@ -3,9 +3,10 @@ package scheduler
import (
"context"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/apns"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
const ApnsOutboxJobName = "apns-outbox"
diff --git a/backend/pkg/scheduler/auto_heal_job.go b/backend/pkg/scheduler/auto_heal_job.go
index fb272462f..e6d009201 100644
--- a/backend/pkg/scheduler/auto_heal_job.go
+++ b/backend/pkg/scheduler/auto_heal_job.go
@@ -11,6 +11,14 @@ import (
"sync"
"time"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/client"
+ "go.getarcane.app/docker/compat"
+ kit "go.getarcane.app/kit/pkg"
+ "go.getarcane.app/sys/cgroup"
+ "golang.org/x/sync/errgroup"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
@@ -22,13 +30,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/moby/moby/api/types/container"
- "github.com/moby/moby/client"
- "go.getarcane.app/docker/compat"
- kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/sys/cgroup"
- "golang.org/x/sync/errgroup"
)
const (
diff --git a/backend/pkg/scheduler/auto_heal_job_test.go b/backend/pkg/scheduler/auto_heal_job_test.go
index b352dcf53..896efa7f4 100644
--- a/backend/pkg/scheduler/auto_heal_job_test.go
+++ b/backend/pkg/scheduler/auto_heal_job_test.go
@@ -6,13 +6,14 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/libtnb/sqlite"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func newTestAutoHealJob() *AutoHealJob {
diff --git a/backend/pkg/scheduler/auto_patch_job.go b/backend/pkg/scheduler/auto_patch_job.go
index 3fb556070..3ee347e9c 100644
--- a/backend/pkg/scheduler/auto_patch_job.go
+++ b/backend/pkg/scheduler/auto_patch_job.go
@@ -6,14 +6,15 @@ import (
"errors"
"log/slog"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/imagepatch"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
"github.com/getarcaneapp/arcane/types/v2"
"github.com/getarcaneapp/arcane/types/v2/features"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/imagepatch"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
)
const AutoPatchJobName = "auto-patch"
diff --git a/backend/pkg/scheduler/auto_update_job.go b/backend/pkg/scheduler/auto_update_job.go
index bb5938153..13805d4b1 100644
--- a/backend/pkg/scheduler/auto_update_job.go
+++ b/backend/pkg/scheduler/auto_update_job.go
@@ -7,13 +7,14 @@ import (
"log/slog"
"strings"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ updatertypes "github.com/getarcaneapp/arcane/types/v2/updater"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/updater"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- updatertypes "github.com/getarcaneapp/arcane/types/v2/updater"
- kit "go.getarcane.app/kit/pkg"
)
const autoUpdateAdmissionScopeInternal = "auto-update"
diff --git a/backend/pkg/scheduler/auto_update_job_test.go b/backend/pkg/scheduler/auto_update_job_test.go
index 20f77e8eb..c9125998e 100644
--- a/backend/pkg/scheduler/auto_update_job_test.go
+++ b/backend/pkg/scheduler/auto_update_job_test.go
@@ -6,10 +6,11 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/getarcaneapp/arcane/types/v2/updater"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
)
func TestAutoUpdateJob_ShouldSchedule_RequiresAutoUpdateAndPolling(t *testing.T) {
diff --git a/backend/pkg/scheduler/docker_client_refresh_job.go b/backend/pkg/scheduler/docker_client_refresh_job.go
index 5a4fb64df..f7ef36d15 100644
--- a/backend/pkg/scheduler/docker_client_refresh_job.go
+++ b/backend/pkg/scheduler/docker_client_refresh_job.go
@@ -5,10 +5,11 @@ import (
"context"
"log/slog"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
const (
diff --git a/backend/pkg/scheduler/entityjobs/entityjobs.go b/backend/pkg/scheduler/entityjobs/entityjobs.go
index cc7a9a9ea..9eb7c12fd 100644
--- a/backend/pkg/scheduler/entityjobs/entityjobs.go
+++ b/backend/pkg/scheduler/entityjobs/entityjobs.go
@@ -9,8 +9,9 @@ import (
"fmt"
"log/slog"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
)
// GitOpsSyncJobPrefix is shared by the GitOps registry and environment cleanup.
diff --git a/backend/pkg/scheduler/event_cleanup_job.go b/backend/pkg/scheduler/event_cleanup_job.go
index ef7e6b4c8..578ae424d 100644
--- a/backend/pkg/scheduler/event_cleanup_job.go
+++ b/backend/pkg/scheduler/event_cleanup_job.go
@@ -5,11 +5,12 @@ import (
"log/slog"
"time"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- kit "go.getarcane.app/kit/pkg"
)
const EventCleanupJobName = "event-cleanup"
diff --git a/backend/pkg/scheduler/expired_sessions_cleanup_job.go b/backend/pkg/scheduler/expired_sessions_cleanup_job.go
index 36ef620c1..9464e9c54 100644
--- a/backend/pkg/scheduler/expired_sessions_cleanup_job.go
+++ b/backend/pkg/scheduler/expired_sessions_cleanup_job.go
@@ -5,10 +5,11 @@ import (
"log/slog"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/session"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/session"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
const ExpiredSessionsCleanupJobName = "expired-sessions-cleanup"
diff --git a/backend/pkg/scheduler/git_clone_cleanup_job.go b/backend/pkg/scheduler/git_clone_cleanup_job.go
index 2ce7ba8b4..abdf4aa69 100644
--- a/backend/pkg/scheduler/git_clone_cleanup_job.go
+++ b/backend/pkg/scheduler/git_clone_cleanup_job.go
@@ -5,9 +5,10 @@ import (
"log/slog"
"time"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
const (
diff --git a/backend/pkg/scheduler/git_clone_cleanup_job_test.go b/backend/pkg/scheduler/git_clone_cleanup_job_test.go
index a5ecff328..11f055e77 100644
--- a/backend/pkg/scheduler/git_clone_cleanup_job_test.go
+++ b/backend/pkg/scheduler/git_clone_cleanup_job_test.go
@@ -7,10 +7,11 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
- git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
+ git "github.com/getarcaneapp/arcane/backend/v2/pkg/gitutil"
)
func TestGitCloneCleanupJob_NameAndSchedule(t *testing.T) {
diff --git a/backend/pkg/scheduler/image_update_watcher.go b/backend/pkg/scheduler/image_update_watcher.go
index ce920f22d..ce8620a51 100644
--- a/backend/pkg/scheduler/image_update_watcher.go
+++ b/backend/pkg/scheduler/image_update_watcher.go
@@ -9,6 +9,12 @@ import (
"sync/atomic"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"
+ imageupdatetypes "github.com/getarcaneapp/arcane/types/v2/imageupdate"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ "github.com/moby/moby/api/types/events"
+ "go.getarcane.app/streams/bus"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/docker"
@@ -19,11 +25,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
- "github.com/getarcaneapp/arcane/types/v2/containerregistry"
- imageupdatetypes "github.com/getarcaneapp/arcane/types/v2/imageupdate"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- "github.com/moby/moby/api/types/events"
- "go.getarcane.app/streams/bus"
)
const (
diff --git a/backend/pkg/scheduler/image_update_watcher_test.go b/backend/pkg/scheduler/image_update_watcher_test.go
index b983ca6cb..39d735a96 100644
--- a/backend/pkg/scheduler/image_update_watcher_test.go
+++ b/backend/pkg/scheduler/image_update_watcher_test.go
@@ -11,14 +11,15 @@ import (
"testing/synctest"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
"github.com/getarcaneapp/arcane/types/v2/imageupdate"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/moby/moby/api/types/events"
"github.com/stretchr/testify/require"
"go.getarcane.app/streams/bus"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
)
type imageUpdateScannerFakeInternal struct {
diff --git a/backend/pkg/scheduler/job_schedule_integration_test.go b/backend/pkg/scheduler/job_schedule_integration_test.go
index 1e6dd22b2..e9cd88e6c 100644
--- a/backend/pkg/scheduler/job_schedule_integration_test.go
+++ b/backend/pkg/scheduler/job_schedule_integration_test.go
@@ -5,16 +5,17 @@ import (
"path/filepath"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/config"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/job"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/types/v2/jobschedule"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
"gorm.io/gorm/logger"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/config"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/job"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func TestDeprecatedImagePollingSchedulePersistsWithoutRuntimeJob(t *testing.T) {
diff --git a/backend/pkg/scheduler/runs/actors.go b/backend/pkg/scheduler/runs/actors.go
index 018a8e5f1..5aa1e1e41 100644
--- a/backend/pkg/scheduler/runs/actors.go
+++ b/backend/pkg/scheduler/runs/actors.go
@@ -10,13 +10,14 @@ import (
"time"
"uuid"
- scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/italypaleale/francis/actor"
"github.com/italypaleale/francis/host/local"
"github.com/robfig/cron/v3"
kit "go.getarcane.app/kit/pkg"
+
+ scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
)
const (
diff --git a/backend/pkg/scheduler/runs/actors_test.go b/backend/pkg/scheduler/runs/actors_test.go
index 3a12f0a6b..01bdc9291 100644
--- a/backend/pkg/scheduler/runs/actors_test.go
+++ b/backend/pkg/scheduler/runs/actors_test.go
@@ -14,15 +14,16 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/italypaleale/francis/actor"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
)
func TestLegacyImportSurvivesRestartAndDeduplicates(t *testing.T) {
diff --git a/backend/pkg/scheduler/runs/admission.go b/backend/pkg/scheduler/runs/admission.go
index 6e908f04a..8a9e7c6c0 100644
--- a/backend/pkg/scheduler/runs/admission.go
+++ b/backend/pkg/scheduler/runs/admission.go
@@ -8,10 +8,11 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/italypaleale/francis/actor"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
)
const admissionTypeInternal = "resource-admission"
diff --git a/backend/pkg/scheduler/runs/coordinator.go b/backend/pkg/scheduler/runs/coordinator.go
index bc51f7ee4..85df6bfc0 100644
--- a/backend/pkg/scheduler/runs/coordinator.go
+++ b/backend/pkg/scheduler/runs/coordinator.go
@@ -15,11 +15,12 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/italypaleale/francis/actor"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
)
// Coordinator persists work before dispatching it to the owning domain.
diff --git a/backend/pkg/scheduler/runs/coordinator_store.go b/backend/pkg/scheduler/runs/coordinator_store.go
index 62c4939e4..891e1a9bf 100644
--- a/backend/pkg/scheduler/runs/coordinator_store.go
+++ b/backend/pkg/scheduler/runs/coordinator_store.go
@@ -11,11 +11,12 @@ import (
"time"
"uuid"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/italypaleale/francis/actor"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
)
const queuePrefixInternal = "jobs."
diff --git a/backend/pkg/scheduler/runs/resolution_test.go b/backend/pkg/scheduler/runs/resolution_test.go
index d0f13cef8..6a3377ed3 100644
--- a/backend/pkg/scheduler/runs/resolution_test.go
+++ b/backend/pkg/scheduler/runs/resolution_test.go
@@ -5,13 +5,14 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
- francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
st "github.com/getarcaneapp/arcane/types/v2/scheduler"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/kv"
+ francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
)
func newResolutionQueueInternal(t *testing.T) *Coordinator {
diff --git a/backend/pkg/scheduler/scheduled_prune_job.go b/backend/pkg/scheduler/scheduled_prune_job.go
index 54ab99c98..f3856b560 100644
--- a/backend/pkg/scheduler/scheduled_prune_job.go
+++ b/backend/pkg/scheduler/scheduled_prune_job.go
@@ -5,12 +5,13 @@ import (
"context"
"log/slog"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+ systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/notification"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/system"
scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- systemtypes "github.com/getarcaneapp/arcane/types/v2/system"
)
const ScheduledPruneJobName = "scheduled-prune"
diff --git a/backend/pkg/scheduler/scheduled_prune_job_test.go b/backend/pkg/scheduler/scheduled_prune_job_test.go
index a900cb224..ebae1a896 100644
--- a/backend/pkg/scheduler/scheduled_prune_job_test.go
+++ b/backend/pkg/scheduler/scheduled_prune_job_test.go
@@ -4,12 +4,13 @@ import (
"context"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/types/v2/system"
"github.com/libtnb/sqlite"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
)
func setupScheduledPruneSettingsServiceInternal(t *testing.T) *settings.SettingsService {
diff --git a/backend/pkg/scheduler/scheduler.go b/backend/pkg/scheduler/scheduler.go
index a92dd1f62..2fd0a4d32 100644
--- a/backend/pkg/scheduler/scheduler.go
+++ b/backend/pkg/scheduler/scheduler.go
@@ -8,9 +8,10 @@ import (
"sync"
"time"
+ st "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
- st "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
var (
diff --git a/backend/pkg/scheduler/upgrade_log_cleanup_job.go b/backend/pkg/scheduler/upgrade_log_cleanup_job.go
index 68625169c..861aee0a3 100644
--- a/backend/pkg/scheduler/upgrade_log_cleanup_job.go
+++ b/backend/pkg/scheduler/upgrade_log_cleanup_job.go
@@ -5,9 +5,10 @@ import (
"log/slog"
"time"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/system"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
const UpgradeLogCleanupJobName = "upgrade-log-cleanup"
diff --git a/backend/pkg/scheduler/upload_sessions_cleanup_job.go b/backend/pkg/scheduler/upload_sessions_cleanup_job.go
index 075bb8df5..e76a0a1f3 100644
--- a/backend/pkg/scheduler/upload_sessions_cleanup_job.go
+++ b/backend/pkg/scheduler/upload_sessions_cleanup_job.go
@@ -5,8 +5,9 @@ import (
"log/slog"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/upload"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/upload"
)
const (
diff --git a/backend/pkg/scheduler/volume_helper_reaper_job.go b/backend/pkg/scheduler/volume_helper_reaper_job.go
index 8a58d32ce..e0e8d29a6 100644
--- a/backend/pkg/scheduler/volume_helper_reaper_job.go
+++ b/backend/pkg/scheduler/volume_helper_reaper_job.go
@@ -5,9 +5,10 @@ import (
"log/slog"
"time"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/volume"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
const (
diff --git a/backend/pkg/scheduler/vulnerability_risk_job.go b/backend/pkg/scheduler/vulnerability_risk_job.go
index e44d50631..a9a0e3789 100644
--- a/backend/pkg/scheduler/vulnerability_risk_job.go
+++ b/backend/pkg/scheduler/vulnerability_risk_job.go
@@ -4,11 +4,12 @@ import (
"context"
"log/slog"
+ "github.com/getarcaneapp/arcane/types/v2/features"
+ schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
+
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
- "github.com/getarcaneapp/arcane/types/v2/features"
- schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
)
const VulnerabilityRiskJobName = "vulnerability-risk"
diff --git a/backend/pkg/scheduler/vulnerability_scan_job.go b/backend/pkg/scheduler/vulnerability_scan_job.go
index 3f3fb00d3..0cd1ba6bc 100644
--- a/backend/pkg/scheduler/vulnerability_scan_job.go
+++ b/backend/pkg/scheduler/vulnerability_scan_job.go
@@ -6,14 +6,15 @@ import (
"errors"
"log/slog"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
- scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
"github.com/getarcaneapp/arcane/types/v2"
"github.com/getarcaneapp/arcane/types/v2/features"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/vulnerability"
+ scheduleutil "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
)
const VulnerabilityScanJobName = "vulnerability-scan"
diff --git a/backend/pkg/utils/backupbrowser/browser.go b/backend/pkg/utils/backupbrowser/browser.go
index fcc69c77a..cfde96180 100644
--- a/backend/pkg/utils/backupbrowser/browser.go
+++ b/backend/pkg/utils/backupbrowser/browser.go
@@ -11,9 +11,10 @@ import (
"sort"
"strings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
kit "go.getarcane.app/kit/pkg"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
// NormalizePath validates and normalizes a path relative to a backup root.
diff --git a/backend/pkg/utils/backupbrowser/browser_test.go b/backend/pkg/utils/backupbrowser/browser_test.go
index 41cd50735..eb0aa1c0c 100644
--- a/backend/pkg/utils/backupbrowser/browser_test.go
+++ b/backend/pkg/utils/backupbrowser/browser_test.go
@@ -3,9 +3,10 @@ package backupbrowser
import (
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
backuptypes "github.com/getarcaneapp/arcane/types/v2/backup"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
func TestBuildEntriesSynthesizesAndSortsDirectoriesInternal(t *testing.T) {
diff --git a/backend/pkg/utils/francis/provider.go b/backend/pkg/utils/francis/provider.go
index d0e652204..e6e85d491 100644
--- a/backend/pkg/utils/francis/provider.go
+++ b/backend/pkg/utils/francis/provider.go
@@ -8,12 +8,13 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
dbtypes "github.com/getarcaneapp/arcane/types/v2/database"
"github.com/italypaleale/francis/components"
"github.com/italypaleale/francis/components/postgres"
"github.com/italypaleale/francis/components/sqlite"
"github.com/italypaleale/francis/host/local"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
func providerOptionInternal(databaseURL string) (local.HostOption, error) {
diff --git a/backend/pkg/utils/francis/testing/host.go b/backend/pkg/utils/francis/testing/host.go
index 22e3e5f55..8b70c91f4 100644
--- a/backend/pkg/utils/francis/testing/host.go
+++ b/backend/pkg/utils/francis/testing/host.go
@@ -8,9 +8,10 @@ import (
stdtesting "testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
"github.com/italypaleale/francis/components/standalone"
"github.com/italypaleale/francis/host/local"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis"
)
// New constructs a host whose factories can be registered before Start.
diff --git a/backend/pkg/utils/handlerutil/handlerutil.go b/backend/pkg/utils/handlerutil/handlerutil.go
index a645f8fb7..8b8d64e99 100644
--- a/backend/pkg/utils/handlerutil/handlerutil.go
+++ b/backend/pkg/utils/handlerutil/handlerutil.go
@@ -11,13 +11,14 @@ import (
"strings"
"github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
- "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
"github.com/getarcaneapp/arcane/types/v2/auth"
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/getarcaneapp/arcane/types/v2/features"
"go.getarcane.app/kit/pkg/mapping"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
)
// Out is the huma response envelope for endpoints returning base.ApiResponse[T].
diff --git a/backend/pkg/utils/handlerutil/remote_proxy.go b/backend/pkg/utils/handlerutil/remote_proxy.go
index 747307911..5b910e681 100644
--- a/backend/pkg/utils/handlerutil/remote_proxy.go
+++ b/backend/pkg/utils/handlerutil/remote_proxy.go
@@ -7,6 +7,7 @@ import (
"net/http"
"github.com/danielgtaylor/huma/v2"
+
"github.com/getarcaneapp/arcane/backend/v2/pkg/remenv"
)
diff --git a/backend/pkg/utils/httpx/safe_remote_test.go b/backend/pkg/utils/httpx/safe_remote_test.go
index 3e3d3802c..2e3642d1a 100644
--- a/backend/pkg/utils/httpx/safe_remote_test.go
+++ b/backend/pkg/utils/httpx/safe_remote_test.go
@@ -9,8 +9,9 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
func TestValidateSafeRemoteURL(t *testing.T) {
diff --git a/backend/pkg/utils/imageref/update_lookup.go b/backend/pkg/utils/imageref/update_lookup.go
index 493c4eefb..808af761e 100644
--- a/backend/pkg/utils/imageref/update_lookup.go
+++ b/backend/pkg/utils/imageref/update_lookup.go
@@ -7,11 +7,12 @@ import (
"strings"
ref "github.com/distribution/reference"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"
kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/updater"
"go.getarcane.app/updater/pkg/utils/tagpolicy"
"go.getarcane.app/updater/refs"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/registryauth"
)
const (
diff --git a/backend/pkg/utils/notifications/config_credentials.go b/backend/pkg/utils/notifications/config_credentials.go
index 6760a5812..4f1446936 100644
--- a/backend/pkg/utils/notifications/config_credentials.go
+++ b/backend/pkg/utils/notifications/config_credentials.go
@@ -7,8 +7,9 @@ import (
"fmt"
"log/slog"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"go.getarcane.app/sys/crypto"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
// DecodeConfig round-trips a provider config (database.JSON) into a typed struct T.
diff --git a/backend/pkg/utils/notifications/deliver_test.go b/backend/pkg/utils/notifications/deliver_test.go
index c6142d4fc..07a1b07b9 100644
--- a/backend/pkg/utils/notifications/deliver_test.go
+++ b/backend/pkg/utils/notifications/deliver_test.go
@@ -4,8 +4,9 @@ import (
"context"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"
)
func TestDeliver_UnknownProviderIsNotHandled(t *testing.T) {
diff --git a/backend/pkg/utils/oidcjwk/oidcjwk_test.go b/backend/pkg/utils/oidcjwk/oidcjwk_test.go
index 3b5336a35..347a5325a 100644
--- a/backend/pkg/utils/oidcjwk/oidcjwk_test.go
+++ b/backend/pkg/utils/oidcjwk/oidcjwk_test.go
@@ -13,9 +13,10 @@ import (
"time"
"github.com/coreos/go-oidc/v3/oidc"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/oidcjwk"
"github.com/lestrrat-go/httprc/v3"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/oidcjwk"
)
func signCompactInternal(t *testing.T, sk *mldsa.PrivateKey, alg, kid string, claims map[string]any) string {
diff --git a/backend/pkg/utils/validation/credential_target_test.go b/backend/pkg/utils/validation/credential_target_test.go
index 686db42c9..27b996144 100644
--- a/backend/pkg/utils/validation/credential_target_test.go
+++ b/backend/pkg/utils/validation/credential_target_test.go
@@ -5,10 +5,11 @@ import (
"strings"
"testing"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
func TestValidateCredentialTargetChange(t *testing.T) {
diff --git a/backend/pkg/utils/validation/password.go b/backend/pkg/utils/validation/password.go
index e478594f1..662a4e67f 100644
--- a/backend/pkg/utils/validation/password.go
+++ b/backend/pkg/utils/validation/password.go
@@ -8,8 +8,9 @@ import (
"strings"
"unicode"
- "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/types/v2/base"
+
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
)
const (
diff --git a/cli/internal/benchmark/baseline_benchmark_test.go b/cli/internal/benchmark/baseline_benchmark_test.go
index be7d671f9..a0f7f4bb1 100644
--- a/cli/internal/benchmark/baseline_benchmark_test.go
+++ b/cli/internal/benchmark/baseline_benchmark_test.go
@@ -8,9 +8,10 @@ import (
"net/http/httptest"
"testing"
+ "github.com/stretchr/testify/require"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/client"
clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types"
- "github.com/stretchr/testify/require"
)
func BenchmarkClientListMediumPayload(b *testing.B) {
diff --git a/cli/internal/client/client.go b/cli/internal/client/client.go
index 9df4d92e2..bb60cac2f 100644
--- a/cli/internal/client/client.go
+++ b/cli/internal/client/client.go
@@ -39,12 +39,13 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/auth"
+ "github.com/getarcaneapp/arcane/types/v2/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.go
index 0d0233316..62a6dc375 100644
--- a/cli/internal/client/client_test.go
+++ b/cli/internal/client/client_test.go
@@ -7,8 +7,9 @@ import (
"net/http/httptest"
"testing"
- "github.com/getarcaneapp/arcane/cli/v2/internal/types"
"github.com/stretchr/testify/require"
+
+ "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.go
index 4dd13584f..abf22f1dd 100644
--- a/cli/internal/client/retry_test.go
+++ b/cli/internal/client/retry_test.go
@@ -9,8 +9,9 @@ import (
"testing"
"time"
- "github.com/getarcaneapp/arcane/cli/v2/internal/types"
"github.com/stretchr/testify/require"
+
+ "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.go
index e90952d64..714a082d7 100644
--- a/cli/internal/cmdutil/context.go
+++ b/cli/internal/cmdutil/context.go
@@ -6,9 +6,10 @@ import (
"io"
"strings"
+ "github.com/spf13/cobra"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/client"
runtimectx "github.com/getarcaneapp/arcane/cli/v2/internal/runtime"
- "github.com/spf13/cobra"
)
// ClientFromCommand returns a configured authenticated client for the command.
diff --git a/cli/internal/cmdutil/pagination.go b/cli/internal/cmdutil/pagination.go
index cf35d3ff3..ce1cde4e8 100644
--- a/cli/internal/cmdutil/pagination.go
+++ b/cli/internal/cmdutil/pagination.go
@@ -7,11 +7,12 @@ import (
"net/url"
"strconv"
+ "github.com/spf13/cobra"
+ kit "go.getarcane.app/kit/pkg"
+
"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"
- kit "go.getarcane.app/kit/pkg"
)
const (
diff --git a/cli/internal/cmdutil/resolve.go b/cli/internal/cmdutil/resolve.go
index 498eaf75e..2d15226e5 100644
--- a/cli/internal/cmdutil/resolve.go
+++ b/cli/internal/cmdutil/resolve.go
@@ -9,9 +9,10 @@ import (
"net/url"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/client"
"github.com/getarcaneapp/arcane/cli/v2/internal/prompt"
- "github.com/getarcaneapp/arcane/types/v2/base"
)
// MaxPromptOptions caps how many search matches the resolver offers
diff --git a/cli/internal/cmdutil/run.go b/cli/internal/cmdutil/run.go
index 61ce256df..9e43e4e49 100644
--- a/cli/internal/cmdutil/run.go
+++ b/cli/internal/cmdutil/run.go
@@ -6,10 +6,11 @@ import (
"net/url"
"time"
- "github.com/getarcaneapp/arcane/cli/v2/internal/client"
- "github.com/getarcaneapp/arcane/cli/v2/internal/output"
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/spf13/cobra"
+
+ "github.com/getarcaneapp/arcane/cli/v2/internal/client"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"
)
// ListSpec describes one standard list command: fetch a paginated endpoint,
diff --git a/cli/internal/cmdutil/upload.go b/cli/internal/cmdutil/upload.go
index 95ce33786..5623ca088 100644
--- a/cli/internal/cmdutil/upload.go
+++ b/cli/internal/cmdutil/upload.go
@@ -10,12 +10,13 @@ import (
"path/filepath"
"strings"
+ uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+ kit "go.getarcane.app/kit/pkg"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/client"
"github.com/getarcaneapp/arcane/cli/v2/internal/logger"
"github.com/getarcaneapp/arcane/cli/v2/internal/output"
"github.com/getarcaneapp/arcane/cli/v2/internal/types"
- uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
- kit "go.getarcane.app/kit/pkg"
)
const uploadChunkAttempts = 3
diff --git a/cli/internal/config/config.go b/cli/internal/config/config.go
index 617ecc8dc..961b6edc9 100644
--- a/cli/internal/config/config.go
+++ b/cli/internal/config/config.go
@@ -27,10 +27,11 @@ import (
"strings"
"time"
- "github.com/getarcaneapp/arcane/cli/v2/internal/types"
"github.com/go-viper/mapstructure/v2"
"github.com/samber/hot"
"github.com/spf13/viper"
+
+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"
)
// Version and build information - set via ldflags at build time
diff --git a/cli/internal/integrationtest/command_helpers_test.go b/cli/internal/integrationtest/command_helpers_test.go
index 0519b44c2..75122ea91 100644
--- a/cli/internal/integrationtest/command_helpers_test.go
+++ b/cli/internal/integrationtest/command_helpers_test.go
@@ -9,10 +9,11 @@ import (
"sync"
"testing"
- clipkg "github.com/getarcaneapp/arcane/cli/v2/pkg"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/stretchr/testify/require"
+
+ clipkg "github.com/getarcaneapp/arcane/cli/v2/pkg"
)
var stdoutCaptureMuInternal sync.Mutex
diff --git a/cli/internal/integrationtest/command_naming_test.go b/cli/internal/integrationtest/command_naming_test.go
index ed02bdb6a..b5f9c0bf0 100644
--- a/cli/internal/integrationtest/command_naming_test.go
+++ b/cli/internal/integrationtest/command_naming_test.go
@@ -4,8 +4,9 @@ import (
"strings"
"testing"
- clipkg "github.com/getarcaneapp/arcane/cli/v2/pkg"
"github.com/spf13/cobra"
+
+ clipkg "github.com/getarcaneapp/arcane/cli/v2/pkg"
)
// Command names must never contain hyphens; multi-word actions are flags or
diff --git a/cli/pkg/activities/cmd.go b/cli/pkg/activities/cmd.go
index 5bb718806..d41ab93b0 100644
--- a/cli/pkg/activities/cmd.go
+++ b/cli/pkg/activities/cmd.go
@@ -8,11 +8,12 @@ import (
"strconv"
"time"
+ activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
+ "github.com/spf13/cobra"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
"github.com/getarcaneapp/arcane/cli/v2/internal/output"
"github.com/getarcaneapp/arcane/cli/v2/internal/types"
- activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/admin/apikeys/cmd.go b/cli/pkg/admin/apikeys/cmd.go
index ac21dd05c..1559b2aea 100644
--- a/cli/pkg/admin/apikeys/cmd.go
+++ b/cli/pkg/admin/apikeys/cmd.go
@@ -7,12 +7,13 @@ import (
"strings"
"time"
- "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"
+
+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"
)
var (
diff --git a/cli/pkg/admin/cmd.go b/cli/pkg/admin/cmd.go
index f63bf074a..c28384a1b 100644
--- a/cli/pkg/admin/cmd.go
+++ b/cli/pkg/admin/cmd.go
@@ -1,6 +1,8 @@
package admin
import (
+ "github.com/spf13/cobra"
+
"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/federatedcredentials"
@@ -8,7 +10,6 @@ import (
"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"
)
// AdminCmd is the parent command for administrative operations.
diff --git a/cli/pkg/admin/events/cmd.go b/cli/pkg/admin/events/cmd.go
index 2edaa0609..3ae67b716 100644
--- a/cli/pkg/admin/events/cmd.go
+++ b/cli/pkg/admin/events/cmd.go
@@ -3,13 +3,14 @@ package events
import (
"fmt"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/event"
+ "github.com/spf13/cobra"
+
"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"
)
var (
diff --git a/cli/pkg/admin/federatedcredentials/cmd.go b/cli/pkg/admin/federatedcredentials/cmd.go
index 7e7857dca..375331dd6 100644
--- a/cli/pkg/admin/federatedcredentials/cmd.go
+++ b/cli/pkg/admin/federatedcredentials/cmd.go
@@ -10,12 +10,13 @@ import (
"fmt"
"time"
- "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"
federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
"github.com/spf13/cobra"
+
+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"
)
var (
diff --git a/cli/pkg/admin/notifications/cmd.go b/cli/pkg/admin/notifications/cmd.go
index 496bd3e6e..63cc81b39 100644
--- a/cli/pkg/admin/notifications/cmd.go
+++ b/cli/pkg/admin/notifications/cmd.go
@@ -8,13 +8,14 @@ import (
"os"
"strconv"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/notification"
+ "github.com/spf13/cobra"
+
"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"
)
var (
diff --git a/cli/pkg/admin/oidcmappings/cmd.go b/cli/pkg/admin/oidcmappings/cmd.go
index af593aad7..80e93cd6c 100644
--- a/cli/pkg/admin/oidcmappings/cmd.go
+++ b/cli/pkg/admin/oidcmappings/cmd.go
@@ -6,11 +6,12 @@ package oidcmappings
import (
"fmt"
+ roletypes "github.com/getarcaneapp/arcane/types/v2/role"
+ "github.com/spf13/cobra"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
"github.com/getarcaneapp/arcane/cli/v2/internal/output"
"github.com/getarcaneapp/arcane/cli/v2/internal/types"
- roletypes "github.com/getarcaneapp/arcane/types/v2/role"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/admin/roles/cmd.go b/cli/pkg/admin/roles/cmd.go
index 5c994e038..2d8219039 100644
--- a/cli/pkg/admin/roles/cmd.go
+++ b/cli/pkg/admin/roles/cmd.go
@@ -11,11 +11,12 @@ import (
"strconv"
"strings"
+ roletypes "github.com/getarcaneapp/arcane/types/v2/role"
+ "github.com/spf13/cobra"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
"github.com/getarcaneapp/arcane/cli/v2/internal/output"
"github.com/getarcaneapp/arcane/cli/v2/internal/types"
- roletypes "github.com/getarcaneapp/arcane/types/v2/role"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/admin/users/cmd.go b/cli/pkg/admin/users/cmd.go
index 24580bd6d..ba130806e 100644
--- a/cli/pkg/admin/users/cmd.go
+++ b/cli/pkg/admin/users/cmd.go
@@ -6,12 +6,13 @@ import (
"strings"
"github.com/charmbracelet/x/term"
+ "github.com/getarcaneapp/arcane/types/v2/user"
+ "github.com/spf13/cobra"
+
"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/user"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/auth/apikeys.go b/cli/pkg/auth/apikeys.go
index 7d88c26a3..6b830aca5 100644
--- a/cli/pkg/auth/apikeys.go
+++ b/cli/pkg/auth/apikeys.go
@@ -4,11 +4,12 @@ import (
"fmt"
"time"
+ apikeytypes "github.com/getarcaneapp/arcane/types/v2/apikey"
+ "github.com/spf13/cobra"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
"github.com/getarcaneapp/arcane/cli/v2/internal/output"
"github.com/getarcaneapp/arcane/cli/v2/internal/types"
- apikeytypes "github.com/getarcaneapp/arcane/types/v2/apikey"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/auth/cmd.go b/cli/pkg/auth/cmd.go
index 33b0fbffb..1662193b5 100644
--- a/cli/pkg/auth/cmd.go
+++ b/cli/pkg/auth/cmd.go
@@ -12,14 +12,15 @@ import (
"time"
"github.com/charmbracelet/x/term"
- "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/getarcaneapp/arcane/types/v2/user"
"github.com/spf13/cobra"
+
+ "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"
)
var jsonOutput bool
diff --git a/cli/pkg/auth/federated.go b/cli/pkg/auth/federated.go
index 4146dceb5..ccd3334da 100644
--- a/cli/pkg/auth/federated.go
+++ b/cli/pkg/auth/federated.go
@@ -11,15 +11,16 @@ import (
"strings"
"time"
+ federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"
+ "github.com/spf13/cobra"
+ kit "go.getarcane.app/kit/pkg"
+
"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"
- kit "go.getarcane.app/kit/pkg"
)
const (
diff --git a/cli/pkg/backups/cmd.go b/cli/pkg/backups/cmd.go
index 45e397bea..4636616ae 100644
--- a/cli/pkg/backups/cmd.go
+++ b/cli/pkg/backups/cmd.go
@@ -10,15 +10,16 @@ import (
"strconv"
"github.com/charmbracelet/x/term"
+ "github.com/getarcaneapp/arcane/types/v2/backup"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/spf13/cobra"
+ kit "go.getarcane.app/kit/pkg"
+
"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/backup"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/spf13/cobra"
- kit "go.getarcane.app/kit/pkg"
)
var (
diff --git a/cli/pkg/backups/resolve.go b/cli/pkg/backups/resolve.go
index 82f3ad264..694ef031f 100644
--- a/cli/pkg/backups/resolve.go
+++ b/cli/pkg/backups/resolve.go
@@ -6,10 +6,11 @@ import (
"net/http"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2/backup"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/client"
"github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
"github.com/getarcaneapp/arcane/cli/v2/internal/types"
- "github.com/getarcaneapp/arcane/types/v2/backup"
)
// s3DestinationRef resolves an S3 destination by ID or name: exact ID via the
diff --git a/cli/pkg/backups/s3.go b/cli/pkg/backups/s3.go
index ef83267bb..59b39d7e4 100644
--- a/cli/pkg/backups/s3.go
+++ b/cli/pkg/backups/s3.go
@@ -6,13 +6,14 @@ import (
"net/http"
"strconv"
+ "github.com/getarcaneapp/arcane/types/v2/backup"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/spf13/cobra"
+
"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/backup"
- "github.com/getarcaneapp/arcane/types/v2/base"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/config/cmd.go b/cli/pkg/config/cmd.go
index dae1518fc..f6b895d58 100644
--- a/cli/pkg/config/cmd.go
+++ b/cli/pkg/config/cmd.go
@@ -12,9 +12,10 @@ import (
"strings"
"time"
+ "github.com/spf13/cobra"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/config"
"github.com/getarcaneapp/arcane/cli/v2/internal/types"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/config/cmd_test.go b/cli/pkg/config/cmd_test.go
index a99563e06..1bb9bb5ca 100644
--- a/cli/pkg/config/cmd_test.go
+++ b/cli/pkg/config/cmd_test.go
@@ -3,8 +3,9 @@ package config
import (
"testing"
- clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types"
"github.com/stretchr/testify/require"
+
+ clitypes "github.com/getarcaneapp/arcane/cli/v2/internal/types"
)
func TestApplyConfigSetArgs(t *testing.T) {
diff --git a/cli/pkg/containers/actions.go b/cli/pkg/containers/actions.go
index 2afd86c07..c701a386f 100644
--- a/cli/pkg/containers/actions.go
+++ b/cli/pkg/containers/actions.go
@@ -8,12 +8,13 @@ import (
"strings"
"time"
- "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/container"
"github.com/spf13/cobra"
+
+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"
)
var (
diff --git a/cli/pkg/containers/cmd.go b/cli/pkg/containers/cmd.go
index 2ed674bf1..d231c6b48 100644
--- a/cli/pkg/containers/cmd.go
+++ b/cli/pkg/containers/cmd.go
@@ -11,15 +11,16 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/container"
+ "github.com/getarcaneapp/arcane/types/v2/updater"
+ "github.com/spf13/cobra"
+
"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/getarcaneapp/arcane/types/v2/updater"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/doctor/cmd.go b/cli/pkg/doctor/cmd.go
index 58f03e4e4..5156cb125 100644
--- a/cli/pkg/doctor/cmd.go
+++ b/cli/pkg/doctor/cmd.go
@@ -5,11 +5,12 @@ import (
"fmt"
"strings"
+ "github.com/spf13/cobra"
+
"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/runtime"
- "github.com/spf13/cobra"
)
type checkResult struct {
diff --git a/cli/pkg/environments/cmd.go b/cli/pkg/environments/cmd.go
index b4cb30efb..ff3f698df 100644
--- a/cli/pkg/environments/cmd.go
+++ b/cli/pkg/environments/cmd.go
@@ -10,16 +10,17 @@ import (
"strings"
"charm.land/lipgloss/v2"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/environment"
+ "github.com/getarcaneapp/arcane/types/v2/version"
+ "github.com/spf13/cobra"
+
"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/getarcaneapp/arcane/types/v2/version"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/generate/api_key_test.go b/cli/pkg/generate/api_key_test.go
index 9f6012c26..548d905b2 100644
--- a/cli/pkg/generate/api_key_test.go
+++ b/cli/pkg/generate/api_key_test.go
@@ -4,8 +4,9 @@ import (
"strings"
"testing"
- gen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"
"github.com/stretchr/testify/require"
+
+ 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.go
index f1a7fac5a..5ec2f9d75 100644
--- a/cli/pkg/generate/certs_test.go
+++ b/cli/pkg/generate/certs_test.go
@@ -11,8 +11,9 @@ import (
"path/filepath"
"testing"
- gen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"
"github.com/stretchr/testify/require"
+
+ gen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"
)
func TestGenerateMTLSCommandWritesMLDSA87Assets(t *testing.T) {
diff --git a/cli/pkg/generate/secret_test.go b/cli/pkg/generate/secret_test.go
index e4b093b32..bf644efcd 100644
--- a/cli/pkg/generate/secret_test.go
+++ b/cli/pkg/generate/secret_test.go
@@ -9,8 +9,9 @@ import (
"strings"
"testing"
- gen "github.com/getarcaneapp/arcane/cli/v2/pkg/generate"
"github.com/stretchr/testify/require"
+
+ 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.go
index f33804d73..666b8281b 100644
--- a/cli/pkg/gitops/cmd.go
+++ b/cli/pkg/gitops/cmd.go
@@ -5,13 +5,14 @@ import (
"net/url"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+ "github.com/spf13/cobra"
+
"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/gitops"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/images/cmd.go b/cli/pkg/images/cmd.go
index 4ecbe1be9..4af1d22be 100644
--- a/cli/pkg/images/cmd.go
+++ b/cli/pkg/images/cmd.go
@@ -13,6 +13,10 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/image"
+ uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
+ "github.com/spf13/cobra"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/client"
"github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
"github.com/getarcaneapp/arcane/cli/v2/internal/logger"
@@ -20,9 +24,6 @@ import (
"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"
- uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/images/extra.go b/cli/pkg/images/extra.go
index 930335c05..a34fd9e72 100644
--- a/cli/pkg/images/extra.go
+++ b/cli/pkg/images/extra.go
@@ -14,14 +14,15 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/image"
+ "github.com/spf13/cobra"
+
"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/types/v2/base"
- "github.com/getarcaneapp/arcane/types/v2/image"
- "github.com/spf13/cobra"
)
var imagesSearchCmd = &cobra.Command{
diff --git a/cli/pkg/images/updates/cmd.go b/cli/pkg/images/updates/cmd.go
index 94ebd4be6..6acb82a22 100644
--- a/cli/pkg/images/updates/cmd.go
+++ b/cli/pkg/images/updates/cmd.go
@@ -7,12 +7,13 @@ import (
"slices"
"strconv"
+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"
+ "github.com/spf13/cobra"
+
"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/imageupdate"
- "github.com/spf13/cobra"
)
var jsonOutput bool
diff --git a/cli/pkg/jobs/cmd.go b/cli/pkg/jobs/cmd.go
index 626cbebdc..224afa5aa 100644
--- a/cli/pkg/jobs/cmd.go
+++ b/cli/pkg/jobs/cmd.go
@@ -8,12 +8,13 @@ import (
"strconv"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/jobschedule"
+ "github.com/spf13/cobra"
+
"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/jobschedule"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/networks/cmd.go b/cli/pkg/networks/cmd.go
index e34d11c23..51b12b83d 100644
--- a/cli/pkg/networks/cmd.go
+++ b/cli/pkg/networks/cmd.go
@@ -6,14 +6,15 @@ import (
"net/url"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/network"
+ "github.com/spf13/cobra"
+
"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"
)
var (
diff --git a/cli/pkg/projects/actions.go b/cli/pkg/projects/actions.go
index c8d783a6a..0c624f308 100644
--- a/cli/pkg/projects/actions.go
+++ b/cli/pkg/projects/actions.go
@@ -11,13 +11,14 @@ import (
"strings"
"time"
- "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/project"
workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
"github.com/spf13/cobra"
+
+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"
)
var (
diff --git a/cli/pkg/projects/cmd.go b/cli/pkg/projects/cmd.go
index d64514370..784dfb4db 100644
--- a/cli/pkg/projects/cmd.go
+++ b/cli/pkg/projects/cmd.go
@@ -16,15 +16,16 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/project"
+ workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
+ "github.com/spf13/cobra"
+
"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"
- workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/registries/cmd.go b/cli/pkg/registries/cmd.go
index 7c61bc3d5..cdffbf52e 100644
--- a/cli/pkg/registries/cmd.go
+++ b/cli/pkg/registries/cmd.go
@@ -5,13 +5,14 @@ import (
"fmt"
"strconv"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"
+ "github.com/spf13/cobra"
+
"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"
)
var (
diff --git a/cli/pkg/repos/cmd.go b/cli/pkg/repos/cmd.go
index f281b04dd..e4a16f51c 100644
--- a/cli/pkg/repos/cmd.go
+++ b/cli/pkg/repos/cmd.go
@@ -7,14 +7,15 @@ import (
"strconv"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/gitops"
+ "github.com/spf13/cobra"
+
"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"
)
var (
diff --git a/cli/pkg/root.go b/cli/pkg/root.go
index 399225268..5ae6cfd6b 100644
--- a/cli/pkg/root.go
+++ b/cli/pkg/root.go
@@ -43,6 +43,8 @@ import (
"charm.land/fang/v2"
"charm.land/lipgloss/v2"
+ "github.com/spf13/cobra"
+
"github.com/getarcaneapp/arcane/cli/v2/internal/config"
"github.com/getarcaneapp/arcane/cli/v2/internal/logger"
"github.com/getarcaneapp/arcane/cli/v2/internal/output"
@@ -75,7 +77,6 @@ import (
"github.com/getarcaneapp/arcane/cli/v2/pkg/volumes"
"github.com/getarcaneapp/arcane/cli/v2/pkg/vulnerabilities"
"github.com/getarcaneapp/arcane/cli/v2/pkg/webhooks"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/selfupdate/cmd.go b/cli/pkg/selfupdate/cmd.go
index 4af35df7f..862a6b58f 100644
--- a/cli/pkg/selfupdate/cmd.go
+++ b/cli/pkg/selfupdate/cmd.go
@@ -19,10 +19,11 @@ import (
"strings"
"time"
+ "github.com/spf13/cobra"
+
"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/spf13/cobra"
)
const (
diff --git a/cli/pkg/settings/cmd.go b/cli/pkg/settings/cmd.go
index 0294b7467..0db9cdc5b 100644
--- a/cli/pkg/settings/cmd.go
+++ b/cli/pkg/settings/cmd.go
@@ -6,12 +6,13 @@ import (
"net/http"
"os"
+ "github.com/getarcaneapp/arcane/types/v2/settings"
+ "github.com/spf13/cobra"
+
"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"
)
var jsonOutput bool
diff --git a/cli/pkg/system/cmd.go b/cli/pkg/system/cmd.go
index 8a50e668f..b46b85d25 100644
--- a/cli/pkg/system/cmd.go
+++ b/cli/pkg/system/cmd.go
@@ -8,14 +8,15 @@ import (
"strconv"
"time"
- "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/container"
"github.com/getarcaneapp/arcane/types/v2/dockerinfo"
"github.com/getarcaneapp/arcane/types/v2/system"
"github.com/spf13/cobra"
+
+ "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"
)
var jsonOutput bool
diff --git a/cli/pkg/templates/cmd.go b/cli/pkg/templates/cmd.go
index 38b67cad1..4553f909c 100644
--- a/cli/pkg/templates/cmd.go
+++ b/cli/pkg/templates/cmd.go
@@ -13,15 +13,16 @@ import (
"strings"
"unicode"
+ "github.com/getarcaneapp/arcane/types/v2/base"
+ "github.com/getarcaneapp/arcane/types/v2/template"
+ "github.com/spf13/cobra"
+ kit "go.getarcane.app/kit/pkg"
+
"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/template"
- "github.com/spf13/cobra"
- kit "go.getarcane.app/kit/pkg"
)
var (
diff --git a/cli/pkg/updater/cmd.go b/cli/pkg/updater/cmd.go
index 88ca73d38..722cd029a 100644
--- a/cli/pkg/updater/cmd.go
+++ b/cli/pkg/updater/cmd.go
@@ -6,12 +6,13 @@ import (
"strconv"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/updater"
+ "github.com/spf13/cobra"
+
"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/updater"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/variables/cmd.go b/cli/pkg/variables/cmd.go
index e286742e4..25424fd8b 100644
--- a/cli/pkg/variables/cmd.go
+++ b/cli/pkg/variables/cmd.go
@@ -8,12 +8,13 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/env"
+ "github.com/spf13/cobra"
+
"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/env"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/version/cmd.go b/cli/pkg/version/cmd.go
index 7c39074cb..0a314bd6f 100644
--- a/cli/pkg/version/cmd.go
+++ b/cli/pkg/version/cmd.go
@@ -4,13 +4,14 @@ import (
"fmt"
"net/http"
+ "github.com/getarcaneapp/arcane/types/v2/version"
+ "github.com/spf13/cobra"
+
"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"
)
// VersionCmd gets the server version
diff --git a/cli/pkg/volumes/backup.go b/cli/pkg/volumes/backup.go
index 563d3fc72..a93a3e652 100644
--- a/cli/pkg/volumes/backup.go
+++ b/cli/pkg/volumes/backup.go
@@ -12,16 +12,17 @@ import (
"strconv"
"time"
- "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"
uploadtypes "github.com/getarcaneapp/arcane/types/v2/upload"
"github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/spf13/cobra"
kit "go.getarcane.app/kit/pkg"
+
+ "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"
)
var (
diff --git a/cli/pkg/volumes/cmd.go b/cli/pkg/volumes/cmd.go
index 937ee0bd6..5e4ec80bc 100644
--- a/cli/pkg/volumes/cmd.go
+++ b/cli/pkg/volumes/cmd.go
@@ -7,13 +7,14 @@ import (
"strconv"
"strings"
+ "github.com/getarcaneapp/arcane/types/v2/volume"
+ "github.com/spf13/cobra"
+
"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/volume"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/volumes/workspace.go b/cli/pkg/volumes/workspace.go
index be005731d..4a969d13d 100644
--- a/cli/pkg/volumes/workspace.go
+++ b/cli/pkg/volumes/workspace.go
@@ -14,14 +14,15 @@ import (
"strings"
"time"
- "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"
workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
"github.com/spf13/cobra"
+
+ "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"
)
var workspaceCmd = &cobra.Command{
diff --git a/cli/pkg/vulnerabilities/cmd.go b/cli/pkg/vulnerabilities/cmd.go
index d512688dc..cbea46d8d 100644
--- a/cli/pkg/vulnerabilities/cmd.go
+++ b/cli/pkg/vulnerabilities/cmd.go
@@ -15,13 +15,14 @@ import (
"strings"
"time"
+ "github.com/getarcaneapp/arcane/types/v2/vulnerability"
+ "github.com/spf13/cobra"
+
"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/cli/v2/pkg/images"
- "github.com/getarcaneapp/arcane/types/v2/vulnerability"
- "github.com/spf13/cobra"
)
var (
diff --git a/cli/pkg/webhooks/cmd.go b/cli/pkg/webhooks/cmd.go
index 488edd399..846c9a66c 100644
--- a/cli/pkg/webhooks/cmd.go
+++ b/cli/pkg/webhooks/cmd.go
@@ -9,12 +9,13 @@ import (
"net/http"
"time"
- "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/webhook"
"github.com/spf13/cobra"
+
+ "github.com/getarcaneapp/arcane/cli/v2/internal/cmdutil"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/output"
+ "github.com/getarcaneapp/arcane/cli/v2/internal/types"
)
var (
diff --git a/types/container/container.go b/types/container/container.go
index b5a0bfc07..8f767c07c 100644
--- a/types/container/container.go
+++ b/types/container/container.go
@@ -6,10 +6,11 @@ import (
"strings"
"time"
- "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"
+
+ "github.com/getarcaneapp/arcane/types/v2/containerregistry"
+ imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
)
// RestartPolicyCreate represents restart policy options for container creation.
diff --git a/types/dashboard/dashboard.go b/types/dashboard/dashboard.go
index 9e95c97cf..35dcca89f 100644
--- a/types/dashboard/dashboard.go
+++ b/types/dashboard/dashboard.go
@@ -3,15 +3,16 @@ package dashboard
import (
"time"
+ dockercontainer "github.com/moby/moby/api/types/container"
+ dockerimage "github.com/moby/moby/api/types/image"
+ dockernetwork "github.com/moby/moby/api/types/network"
+ "github.com/moby/moby/client"
+
"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"
volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
- dockercontainer "github.com/moby/moby/api/types/container"
- dockerimage "github.com/moby/moby/api/types/image"
- dockernetwork "github.com/moby/moby/api/types/network"
- "github.com/moby/moby/client"
)
type ActionItemKind string
diff --git a/types/image/image.go b/types/image/image.go
index 8f86e60ad..d8b294ad9 100644
--- a/types/image/image.go
+++ b/types/image/image.go
@@ -6,10 +6,11 @@ import (
"strings"
"time"
+ "github.com/moby/moby/api/types/image"
+
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
"github.com/getarcaneapp/arcane/types/v2/vulnerability"
- "github.com/moby/moby/api/types/image"
)
// ListResponse is the paginated image list together with the upload limit the
diff --git a/types/project/project.go b/types/project/project.go
index c27f8a4de..60949bc67 100644
--- a/types/project/project.go
+++ b/types/project/project.go
@@ -4,6 +4,7 @@ import (
"time"
composetypes "github.com/compose-spec/compose-go/v2/types"
+
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
)
diff --git a/types/project/rename.go b/types/project/rename.go
index cb35ad68e..02b6aea7f 100644
--- a/types/project/rename.go
+++ b/types/project/rename.go
@@ -4,8 +4,9 @@ import (
"context"
"time"
- volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/moby/moby/client"
+
+ volumetypes "github.com/getarcaneapp/arcane/types/v2/volume"
)
const (