Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: migrate to moby dependencies (#1878)
Kyle Mendell2660d5b8392d
diff --git a/Justfile b/Justfileindex 33aa94e85..88eb5b8ed 100644--- a/Justfile+++ b/Justfile@@ -594,6 +594,7 @@ _utils-hotfix:utils target *args:@just "_utils-{{ target }}" {{ args }}+# Build the frontend[group('build')]_build-frontend:@@ -964,6 +965,34 @@ _lint-go: _lint-backend _lint-cli _lint-typeslint target="all":@just "_lint-{{ target }}"+# Fix Go backend+[group('fix')]+_fix-backend:+ cd backend && go fix ./...++# Fix Go CLI+[group('fix')]+_fix-cli:+ cd cli && go fix ./...++# Fix Types+[group('fix')]+_fix-types:+ cd types && go fix ./...++# Fix all Go code+[group('fix')]+_fix-go: _fix-backend _fix-cli _fix-types++[group('fix')]+_fix-all:+ @just _fix-go++# Fix targets. Valid: "backend", "cli", "types", "go", "all".+[group('fix')]+fix target="all":+ @just "_fix-{{ target }}"+# Format frontend (Prettier) and Go modules (gofmt)[group('format')]_format-frontend:diff --git a/backend/cli/upgrade/upgrade.go b/backend/cli/upgrade/upgrade.goindex b2030107b..6d75d3bd6 100644--- a/backend/cli/upgrade/upgrade.go+++ b/backend/cli/upgrade/upgrade.go@@ -8,14 +8,12 @@ import ("strings""time"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters"- "github.com/docker/docker/api/types/image"- "github.com/docker/docker/api/types/network"- "github.com/docker/docker/client""github.com/getarcaneapp/arcane/backend/internal/utils/arcaneupdater""github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/network"+ "github.com/moby/moby/client""github.com/spf13/cobra")@@ -67,7 +65,7 @@ func runUpgrade(cmd *cobra.Command, args []string) error {}// Connect to Docker- dockerClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())+ dockerClient, err := client.New(client.FromEnv)if err != nil {return fmt.Errorf("failed to connect to Docker: %w", err)}@@ -84,7 +82,9 @@ func runUpgrade(cmd *cobra.Command, args []string) error {containerName = strings.TrimPrefix(targetContainer.Name, "/")slog.Info("Found Arcane container", "name", containerName, "id", targetContainer.ID[:12])} else {- targetContainer, err = dockerClient.ContainerInspect(ctx, containerName)+ inspectResult, inspectErr := dockerClient.ContainerInspect(ctx, containerName, client.ContainerInspectOptions{})+ targetContainer = inspectResult.Container+ err = inspectErrif err != nil {return fmt.Errorf("failed to inspect container %s: %w", containerName, err)}@@ -115,28 +115,29 @@ func runUpgrade(cmd *cobra.Command, args []string) error {func findArcaneContainer(ctx context.Context, dockerClient *client.Client) (container.InspectResponse, error) {// Prefer explicit Arcane labels; fall back to image name heuristics.- filter := filters.NewArgs()- filter.Add("status", "running")+ filter := make(client.Filters)+ filter = filter.Add("status", "running")- containers, err := dockerClient.ContainerList(ctx, container.ListOptions{Filters: filter})+ containers, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{Filters: filter})if err != nil {return container.InspectResponse{}, err}selfID, _ := docker.GetCurrentContainerID()- slog.Info("Searching for Arcane container", "selfID", selfID, "totalContainers", len(containers))+ slog.Info("Searching for Arcane container", "selfID", selfID, "totalContainers", len(containers.Items))now := time.Now()- for _, c := range containers {+ for _, c := range containers.Items {if shouldSkipContainer(c, selfID, now) {continue}- inspect, err := dockerClient.ContainerInspect(ctx, c.ID)+ inspectResult, err := dockerClient.ContainerInspect(ctx, c.ID, client.ContainerInspectOptions{})if err != nil {continue}+ inspect := inspectResult.Containerif isAgentContainer(inspect) {slog.Debug("Skipping agent container", "id", c.ID[:12], "names", c.Names)@@ -321,7 +322,7 @@ func ensureDefaultTag(imageName string) string {}func pullImage(ctx context.Context, dockerClient *client.Client, imageName string) error {- reader, err := dockerClient.ImagePull(ctx, imageName, image.PullOptions{})+ reader, err := dockerClient.ImagePull(ctx, imageName, client.ImagePullOptions{})if err != nil {return err}@@ -388,35 +389,40 @@ func upgradeContainer(ctx context.Context, dockerClient *client.Client, oldContafmt.Println("PROGRESS:65:Renaming old container")slog.Info("Renaming old container", "from", originalName, "to", oldName)- if err := dockerClient.ContainerRename(ctx, oldContainer.ID, oldName); err != nil {+ if _, err := dockerClient.ContainerRename(ctx, oldContainer.ID, client.ContainerRenameOptions{NewName: oldName}); err != nil {return fmt.Errorf("rename old container: %w", err)}fmt.Println("PROGRESS:70:Stopping old container")slog.Info("Stopping old container", "name", oldName)timeout := 10- if err := dockerClient.ContainerStop(ctx, oldContainer.ID, container.StopOptions{Timeout: &timeout}); err != nil {- _ = dockerClient.ContainerRename(ctx, oldContainer.ID, originalName)+ if _, err := dockerClient.ContainerStop(ctx, oldContainer.ID, client.ContainerStopOptions{Timeout: &timeout}); err != nil {+ _, _ = dockerClient.ContainerRename(ctx, oldContainer.ID, client.ContainerRenameOptions{NewName: originalName})return fmt.Errorf("stop old container: %w", err)}fmt.Println("PROGRESS:75:Creating new container")slog.Info("Creating new container", "name", originalName)- resp, err := dockerClient.ContainerCreate(ctx, &config, hostConfig, networkConfig, nil, originalName)+ resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: &config,+ HostConfig: hostConfig,+ NetworkingConfig: networkConfig,+ Name: originalName,+ })if err != nil {// Try to restart and restore old container on failure- _ = dockerClient.ContainerStart(ctx, oldContainer.ID, container.StartOptions{})- _ = dockerClient.ContainerRename(ctx, oldContainer.ID, originalName)+ _, _ = dockerClient.ContainerStart(ctx, oldContainer.ID, client.ContainerStartOptions{})+ _, _ = dockerClient.ContainerRename(ctx, oldContainer.ID, client.ContainerRenameOptions{NewName: originalName})return fmt.Errorf("create new container: %w", err)}fmt.Println("PROGRESS:80:Starting new container")slog.Info("Starting new container", "id", resp.ID[:12])- if err := dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {+ if _, err := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {// Cleanup new container and restart old one- _ = dockerClient.ContainerRemove(ctx, resp.ID, container.RemoveOptions{Force: true})- _ = dockerClient.ContainerStart(ctx, oldContainer.ID, container.StartOptions{})- _ = dockerClient.ContainerRename(ctx, oldContainer.ID, originalName)+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, client.ContainerRemoveOptions{Force: true})+ _, _ = dockerClient.ContainerStart(ctx, oldContainer.ID, client.ContainerStartOptions{})+ _, _ = dockerClient.ContainerRename(ctx, oldContainer.ID, client.ContainerRenameOptions{NewName: originalName})return fmt.Errorf("start new container: %w", err)}@@ -427,7 +433,7 @@ func upgradeContainer(ctx context.Context, dockerClient *client.Client, oldContafmt.Println("PROGRESS:90:Removing old container")slog.Info("Removing old container", "id", oldContainer.ID[:12])- if err := dockerClient.ContainerRemove(ctx, oldContainer.ID, container.RemoveOptions{}); err != nil {+ if _, err := dockerClient.ContainerRemove(ctx, oldContainer.ID, client.ContainerRemoveOptions{}); err != nil {slog.Warn("Failed to remove old container", "error", err)}diff --git a/backend/go.mod b/backend/go.modindex 366baf2b7..4eb5862b0 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -2,17 +2,17 @@ module github.com/getarcaneapp/arcane/backendgo 1.26.0+replace github.com/getarcaneapp/arcane/types => ../types+require (github.com/cenkalti/backoff/v5 v5.0.3github.com/compose-spec/compose-go/v2 v2.10.1github.com/containerd/errdefs v1.0.0github.com/coreos/go-oidc/v3 v3.17.0github.com/danielgtaylor/huma/v2 v2.37.2- github.com/docker/cli v28.5.2+incompatible- github.com/docker/compose/v5 v5.0.2+ github.com/docker/cli v29.2.1+incompatible+ github.com/docker/compose/v5 v5.1.0github.com/docker/distribution v2.8.3+incompatible- github.com/docker/docker v28.5.2+incompatible- github.com/docker/go-connections v0.6.0github.com/fsnotify/fsnotify v1.9.0github.com/getarcaneapp/arcane/types v1.15.3github.com/gin-contrib/cors v1.7.6@@ -29,6 +29,8 @@ require (github.com/jinzhu/copier v0.4.0github.com/joho/godotenv v1.5.1github.com/lmittmann/tint v1.1.3+ github.com/moby/moby/api v1.53.0+ github.com/moby/moby/client v0.2.2github.com/nicholas-fedor/shoutrrr v0.13.2github.com/orandin/slog-gorm v1.4.0github.com/robfig/cron/v3 v3.0.1@@ -56,7 +58,6 @@ require (github.com/Microsoft/go-winio v0.6.2 // indirectgithub.com/ProtonMail/go-crypto v1.3.0 // indirectgithub.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect- github.com/beorn7/perks v1.0.1 // indirectgithub.com/buger/goterm v1.0.4 // indirectgithub.com/bytedance/gopkg v0.1.3 // indirectgithub.com/bytedance/sonic v1.15.0 // indirect@@ -74,14 +75,13 @@ require (github.com/containerd/platforms v1.0.0-rc.2 // indirectgithub.com/containerd/ttrpc v1.2.7 // indirectgithub.com/containerd/typeurl/v2 v2.2.3 // indirect- github.com/cyphar/filepath-securejoin v0.5.1 // indirect+ github.com/cyphar/filepath-securejoin v0.6.0 // indirectgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirectgithub.com/distribution/reference v0.6.0 // indirect- github.com/docker/buildx v0.30.1 // indirect- github.com/docker/cli-docs-tool v0.11.0 // indirect- github.com/docker/docker-credential-helpers v0.9.4 // indirect- github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect- github.com/docker/go-metrics v0.0.1 // indirect+ github.com/docker/buildx v0.31.1 // indirect+ github.com/docker/docker v28.5.2+incompatible // indirect+ github.com/docker/docker-credential-helpers v0.9.5 // indirect+ github.com/docker/go-connections v0.6.0 // indirectgithub.com/docker/go-units v0.5.0 // indirectgithub.com/dustin/go-humanize v1.0.1 // indirectgithub.com/ebitengine/purego v0.9.1 // indirect@@ -109,8 +109,7 @@ require (github.com/golang/protobuf v1.5.4 // indirectgithub.com/google/go-cmp v0.7.0 // indirectgithub.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect- github.com/gorilla/mux v1.8.1 // indirect- github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirectgithub.com/hashicorp/errwrap v1.1.0 // indirectgithub.com/hashicorp/go-multierror v1.1.1 // indirectgithub.com/hashicorp/go-version v1.8.0 // indirect@@ -137,11 +136,10 @@ require (github.com/mattn/go-runewidth v0.0.20 // indirectgithub.com/mattn/go-shellwords v1.0.12 // indirectgithub.com/mattn/go-sqlite3 v1.14.32 // indirect- github.com/miekg/pkcs11 v1.1.1 // indirectgithub.com/mitchellh/hashstructure/v2 v2.0.2 // indirect- github.com/moby/buildkit v0.26.3 // indirect+ github.com/moby/buildkit v0.27.1 // indirectgithub.com/moby/docker-image-spec v1.3.1 // indirect- github.com/moby/go-archive v0.1.0 // indirect+ github.com/moby/go-archive v0.2.0 // indirectgithub.com/moby/locker v1.0.1 // indirectgithub.com/moby/patternmatcher v0.6.0 // indirectgithub.com/moby/sys/atomicwriter v0.1.0 // indirect@@ -155,7 +153,6 @@ require (github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirectgithub.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirectgithub.com/morikuni/aec v1.1.0 // indirect- github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirectgithub.com/ncruces/go-strftime v0.1.9 // indirectgithub.com/opencontainers/go-digest v1.0.0 // indirectgithub.com/opencontainers/image-spec v1.1.1 // indirect@@ -166,27 +163,24 @@ require (github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirectgithub.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirectgithub.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect- github.com/prometheus/client_golang v1.23.2 // indirect- github.com/prometheus/client_model v0.6.2 // indirect- github.com/prometheus/common v0.66.1 // indirect- github.com/prometheus/procfs v0.17.0 // indirectgithub.com/quic-go/qpack v0.6.0 // indirectgithub.com/quic-go/quic-go v0.59.0 // indirectgithub.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirectgithub.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirectgithub.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect- github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect+ github.com/sergi/go-diff v1.4.0 // indirectgithub.com/shibumi/go-pathspec v1.3.0 // indirect+ github.com/sigstore/sigstore v1.10.0 // indirect+ github.com/sigstore/sigstore-go v1.1.4-0.20251124094504-b5fe07a5a7d7 // indirectgithub.com/sirupsen/logrus v1.9.4 // indirectgithub.com/skeema/knownhosts v1.3.1 // indirectgithub.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirectgithub.com/spf13/pflag v1.0.10 // indirect- github.com/theupdateframework/notary v0.7.0 // indirectgithub.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 // indirectgithub.com/tklauser/go-sysconf v0.3.16 // indirectgithub.com/tklauser/numcpus v0.11.0 // indirectgithub.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 // indirect- github.com/tonistiigi/fsutil v0.0.0-20250605211040-586307ad452f // indirect+ github.com/tonistiigi/fsutil v0.0.0-20251211185533-a2aa163d723f // indirectgithub.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirectgithub.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirectgithub.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab // indirect@@ -211,8 +205,7 @@ require (go.opentelemetry.io/otel/trace v1.39.0 // indirectgo.opentelemetry.io/proto/otlp v1.8.0 // indirectgo.podman.io/storage v1.62.0 // indirect- go.yaml.in/yaml/v2 v2.4.3 // indirect- go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect+ go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirectgolang.org/x/arch v0.24.0 // indirectgolang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirectgolang.org/x/sys v0.41.0 // indirectdiff --git a/backend/go.sum b/backend/go.sumindex ef41977c0..9683c3af1 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -1,10 +1,11 @@+cyphar.com/go-pathrs v0.2.1 h1:9nx1vOgwVvX1mNBWDu93+vaceedpbsDqo+XuBGL40b8=+cyphar.com/go-pathrs v0.2.1/go.mod h1:y8f1EMG7r+hCuFf/rXsKqMJrJAUoADZGNh5/vZPKcGc=dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=github.com/DefangLabs/secret-detector v0.0.0-20250811234530-d4b4214cd679 h1:qNT7R4qrN+5u5ajSbqSW1opHP4LA8lzA+ASyw5MQZjs=github.com/DefangLabs/secret-detector v0.0.0-20250811234530-d4b4214cd679/go.mod h1:blbwPQh4DTlCZEfk1BLU4oMIhLda2U+A840Uag9DsZw=github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=@@ -16,34 +17,22 @@ github.com/Microsoft/hcsshim v0.14.0-rc.1 h1:qAPXKwGOkVn8LlqgBN8GS0bxZ83hOJpcjxzgithub.com/Microsoft/hcsshim v0.14.0-rc.1/go.mod h1:hTKFGbnDtQb1wHiOWv4v0eN+7boSWAHyK/tNAaYZL0c=github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=-github.com/Shopify/logrus-bugsnag v0.0.0-20170309145241-6dbc35f2c30d h1:hi6J4K6DKrR4/ljxn6SF6nURyu785wKMuQcjt7H3VCQ=-github.com/Shopify/logrus-bugsnag v0.0.0-20170309145241-6dbc35f2c30d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=-github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 h1:aM1rlcoLz8y5B2r4tTLMiVTrMtpfY0O8EScKJxaSaEc=-github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA=+github.com/anchore/go-struct-converter v0.1.0 h1:2rDRssAl6mgKBSLNiVCMADgZRhoqtw9dedlWa0OhD30=+github.com/anchore/go-struct-converter v0.1.0/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA=github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=-github.com/beorn7/perks v0.0.0-20150223135152-b965b613227f/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=-github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw=-github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=+github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=+github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=github.com/buger/goterm v1.0.4 h1:Z9YvGmOih81P0FbVtEYTFF6YsSgxSUKEhf/f9bTMXbY=github.com/buger/goterm v1.0.4/go.mod h1:HiFWV3xnkolgrBV3mY8m0X0Pumt4zg4QhbdOzQtB8tE=-github.com/bugsnag/bugsnag-go v1.0.5-0.20150529004307-13fd6b8acda0 h1:s7+5BfS4WFJoVF9pnB8kBk03S7pZXRdKamnV0FOl5Sc=-github.com/bugsnag/bugsnag-go v1.0.5-0.20150529004307-13fd6b8acda0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=-github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ=-github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=-github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o=-github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=@@ -56,8 +45,6 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFgithub.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=-github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e85keuznYcH5rqI438v41pKcBl4ZxQ=-github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=@@ -84,8 +71,8 @@ github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmYgithub.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o=github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=-github.com/containerd/nydus-snapshotter v0.15.4 h1:l59kGRVMtwMLDLh322HsWhEsBCkRKMkGWYV5vBeLYCE=-github.com/containerd/nydus-snapshotter v0.15.4/go.mod h1:eRJqnxQDr48HNop15kZdLZpFF5B6vf6Q11Aq1K0E4Ms=+github.com/containerd/nydus-snapshotter v0.15.10 h1:hphjuKOqSHLGznNJiAvmsOWkdu4qFXjf4DzGrWSuIsM=+github.com/containerd/nydus-snapshotter v0.15.10/go.mod h1:EWRd/QJ0b6UKHAqYgiV5gHlqLC2qq5cQiSlXEdVovrA=github.com/containerd/platforms v1.0.0-rc.2 h1:0SPgaNZPVWGEi4grZdV8VRYQn78y+nm6acgLGv/QzE4=github.com/containerd/platforms v1.0.0-rc.2/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=github.com/containerd/plugin v1.0.0 h1:c8Kf1TNl6+e2TtMHZt+39yAPDbouRH9WAToRjex483Y=@@ -100,54 +87,48 @@ github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxgithub.com/coreos/go-oidc/v3 v3.17.0 h1:hWBGaQfbi0iVviX4ibC7bk8OKT5qNr4klBaCHVNvehc=github.com/coreos/go-oidc/v3 v3.17.0/go.mod h1:wqPbKFrVnE90vty060SB40FCJ8fTHTxSwyXJqZH+sI8=github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=-github.com/cyphar/filepath-securejoin v0.5.1 h1:eYgfMq5yryL4fbWfkLpFFy2ukSELzaJOTaUTuh+oF48=-github.com/cyphar/filepath-securejoin v0.5.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=+github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 h1:uX1JmpONuD549D73r6cgnxyUu18Zb7yHAy5AYU0Pm4Q=+github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=+github.com/cyphar/filepath-securejoin v0.6.0 h1:BtGB77njd6SVO6VztOHfPxKitJvd/VPT+OFBFMOi1Is=+github.com/cyphar/filepath-securejoin v0.6.0/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=github.com/danielgtaylor/huma/v2 v2.37.2 h1:Nf9vjy2sxBJFaupPlthXL/Hy2+LurfVbaKHmCMEI7xE=github.com/danielgtaylor/huma/v2 v2.37.2/go.mod h1:95S04G/lExFRYlBkKaBaZm9lVmxRmqX9f2CgoOZ11AM=github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=-github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=github.com/dhui/dktest v0.4.6 h1:+DPKyScKSEp3VLtbMDHcUq6V5Lm5zfZZVb0Sk7Ahom4=github.com/dhui/dktest v0.4.6/go.mod h1:JHTSYDtKkvFNFHJKqCzVzqXecyv+tKt8EzceOmQOgbU=+github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 h1:ge14PCmCvPjpMQMIAH7uKg0lrtNSOdpYsRXlwk3QbaE=+github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352/go.mod h1:SKVExuS+vpu2l9IoOc0RwqE7NYnb0JlcFHFnEJkVDzc=+github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 h1:lxmTCgmHE1GUYL7P0MlNa00M67axePTq+9nBSGddR8I=+github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7/go.mod h1:GvWntX9qiTlOud0WkQ6ewFm0LPy5JUR1Xo0Ngbd1w6Y=github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=-github.com/docker/buildx v0.30.1 h1:3vthfaTQOLt5QfN2nl7rKuPLUvx69nL5ZikFIXp//c8=-github.com/docker/buildx v0.30.1/go.mod h1:8nwT0V6UNYNo9rXq6WO/BQd9KrJ0JYcY/QX6x0y1Oro=-github.com/docker/cli v28.5.2+incompatible h1:XmG99IHcBmIAoC1PPg9eLBZPlTrNUAijsHLm8PjhBlg=-github.com/docker/cli v28.5.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=-github.com/docker/cli-docs-tool v0.11.0 h1:7d8QARFb7QEobizqxmEM7fOteZEHwH/zWgHQtHZEcfE=-github.com/docker/cli-docs-tool v0.11.0/go.mod h1:ma8BKiisUo8D6W05XEYIh3oa1UbgrZhi1nowyKFJa8Q=-github.com/docker/compose/v5 v5.0.2 h1:OTBsvKsim2rVNUBrb9pP5byiGG5trTt+uO3qr6WIQYo=-github.com/docker/compose/v5 v5.0.2/go.mod h1:MbI7iBpjcgTN27JC4cYYR1mmfmaWEqEgqKKfbEGFK1c=-github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=+github.com/docker/buildx v0.31.1 h1:zbvbrb9nxBNVV8nnI33f2F+4aAZBA1gY+AmeBFflMqY=+github.com/docker/buildx v0.31.1/go.mod h1:SD+jYLnt3S4SXqohVtV+8z+dihnOgwMJ8t+bLQvsaCk=+github.com/docker/cli v29.2.1+incompatible h1:n3Jt0QVCN65eiVBoUTZQM9mcQICCJt3akW4pKAbKdJg=+github.com/docker/cli v29.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=+github.com/docker/compose/v5 v5.1.0 h1:HofsoOEJZSAjXzzeGxOub3WK/uEAL0v7g7J1kgmYETY=+github.com/docker/compose/v5 v5.1.0/go.mod h1:vpHFFnEFlKTz9HjSkRqQz8x77ZuoMoq6CN1VicxFeQM=github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=-github.com/docker/docker-credential-helpers v0.9.4 h1:76ItO69/AP/V4yT9V4uuuItG0B1N8hvt0T0c0NN/DzI=-github.com/docker/docker-credential-helpers v0.9.4/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c=-github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=-github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=+github.com/docker/docker-credential-helpers v0.9.5 h1:EFNN8DHvaiK8zVqFA2DT6BjXE0GzfLOZ38ggPTKePkY=+github.com/docker/docker-credential-helpers v0.9.5/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c=github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=-github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=-github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=-github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=-github.com/dvsekhvalnov/jose2go v0.0.0-20170216131308-f21a8cedbbae/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM=github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 h1:XBBHcIb256gUJtLmY22n99HaZTz+r2Z51xUPi01m3wg=@@ -156,12 +137,10 @@ github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+ogithub.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=-github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=github.com/fsnotify/fsevents v0.2.0 h1:BRlvlqjvNTfogHfeBOFvSC9N0Ddy+wzQCQukyoD7o/c=github.com/fsnotify/fsevents v0.2.0/go.mod h1:B3eEk39i4hz8y1zaWS/wPrAP4O6wkIl7HQwKBr1qH/w=-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=@@ -170,8 +149,6 @@ github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sagithub.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM=github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=-github.com/getarcaneapp/arcane/types v1.15.3 h1:UMhhWPNvy+lGVdg+5w9b47hr83aMe2KfV6dJIs4RHZY=-github.com/getarcaneapp/arcane/types v1.15.3/go.mod h1:kqkuqZZ9TkfWOvAuzCKq5UTX/11NO77lyPg5ECJrMXo=github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY=github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk=github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=@@ -194,9 +171,6 @@ github.com/go-git/go-git/v5 v5.16.5 h1:mdkuqblwr57kVfXri5TTH+nMFLNUxIj9Z7F5ykFbwgithub.com/go-git/go-git/v5 v5.16.5/go.mod h1:QOMLpNf1qxuSY4StA/ArOdfFR2TrKEjJiye2kel2m+M=github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=@@ -205,6 +179,48 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRregithub.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=+github.com/go-openapi/analysis v0.24.1 h1:Xp+7Yn/KOnVWYG8d+hPksOYnCYImE3TieBa7rBOesYM=+github.com/go-openapi/analysis v0.24.1/go.mod h1:dU+qxX7QGU1rl7IYhBC8bIfmWQdX4Buoea4TGtxXY84=+github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM=+github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk=+github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk=+github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM=+github.com/go-openapi/jsonreference v0.21.3 h1:96Dn+MRPa0nYAR8DR1E03SblB5FJvh7W6krPI0Z7qMc=+github.com/go-openapi/jsonreference v0.21.3/go.mod h1:RqkUP0MrLf37HqxZxrIAtTWW4ZJIK1VzduhXYBEeGc4=+github.com/go-openapi/loads v0.23.2 h1:rJXAcP7g1+lWyBHC7iTY+WAF0rprtM+pm8Jxv1uQJp4=+github.com/go-openapi/loads v0.23.2/go.mod h1:IEVw1GfRt/P2Pplkelxzj9BYFajiWOtY2nHZNj4UnWY=+github.com/go-openapi/runtime v0.29.2 h1:UmwSGWNmWQqKm1c2MGgXVpC2FTGwPDQeUsBMufc5Yj0=+github.com/go-openapi/runtime v0.29.2/go.mod h1:biq5kJXRJKBJxTDJXAa00DOTa/anflQPhT0/wmjuy+0=+github.com/go-openapi/spec v0.22.1 h1:beZMa5AVQzRspNjvhe5aG1/XyBSMeX1eEOs7dMoXh/k=+github.com/go-openapi/spec v0.22.1/go.mod h1:c7aeIQT175dVowfp7FeCvXXnjN/MrpaONStibD2WtDA=+github.com/go-openapi/strfmt v0.25.0 h1:7R0RX7mbKLa9EYCTHRcCuIPcaqlyQiWNPTXwClK0saQ=+github.com/go-openapi/strfmt v0.25.0/go.mod h1:nNXct7OzbwrMY9+5tLX4I21pzcmE6ccMGXl3jFdPfn8=+github.com/go-openapi/swag v0.25.3 h1:FAa5wJXyDtI7yUztKDfZxDrSx+8WTg31MfCQ9s3PV+s=+github.com/go-openapi/swag v0.25.3/go.mod h1:tX9vI8Mj8Ny+uCEk39I1QADvIPI7lkndX4qCsEqhkS8=+github.com/go-openapi/swag/cmdutils v0.25.3 h1:EIwGxN143JCThNHnqfqs85R8lJcJG06qjJRZp3VvjLI=+github.com/go-openapi/swag/cmdutils v0.25.3/go.mod h1:pdae/AFo6WxLl5L0rq87eRzVPm/XRHM3MoYgRMvG4A0=+github.com/go-openapi/swag/conv v0.25.3 h1:PcB18wwfba7MN5BVlBIV+VxvUUeC2kEuCEyJ2/t2X7E=+github.com/go-openapi/swag/conv v0.25.3/go.mod h1:n4Ibfwhn8NJnPXNRhBO5Cqb9ez7alBR40JS4rbASUPU=+github.com/go-openapi/swag/fileutils v0.25.3 h1:P52Uhd7GShkeU/a1cBOuqIcHMHBrA54Z2t5fLlE85SQ=+github.com/go-openapi/swag/fileutils v0.25.3/go.mod h1:cdOT/PKbwcysVQ9Tpr0q20lQKH7MGhOEb6EwmHOirUk=+github.com/go-openapi/swag/jsonname v0.25.3 h1:U20VKDS74HiPaLV7UZkztpyVOw3JNVsit+w+gTXRj0A=+github.com/go-openapi/swag/jsonname v0.25.3/go.mod h1:GPVEk9CWVhNvWhZgrnvRA6utbAltopbKwDu8mXNUMag=+github.com/go-openapi/swag/jsonutils v0.25.3 h1:kV7wer79KXUM4Ea4tBdAVTU842Rg6tWstX3QbM4fGdw=+github.com/go-openapi/swag/jsonutils v0.25.3/go.mod h1:ILcKqe4HC1VEZmJx51cVuZQ6MF8QvdfXsQfiaCs0z9o=+github.com/go-openapi/swag/loading v0.25.3 h1:Nn65Zlzf4854MY6Ft0JdNrtnHh2bdcS/tXckpSnOb2Y=+github.com/go-openapi/swag/loading v0.25.3/go.mod h1:xajJ5P4Ang+cwM5gKFrHBgkEDWfLcsAKepIuzTmOb/c=+github.com/go-openapi/swag/mangling v0.25.3 h1:rGIrEzXaYWuUW1MkFmG3pcH+EIA0/CoUkQnIyB6TUyo=+github.com/go-openapi/swag/mangling v0.25.3/go.mod h1:6dxwu6QyORHpIIApsdZgb6wBk/DPU15MdyYj/ikn0Hg=+github.com/go-openapi/swag/netutils v0.25.3 h1:XWXHZfL/65ABiv8rvGp9dtE0C6QHTYkCrNV77jTl358=+github.com/go-openapi/swag/netutils v0.25.3/go.mod h1:m2W8dtdaoX7oj9rEttLyTeEFFEBvnAx9qHd5nJEBzYg=+github.com/go-openapi/swag/stringutils v0.25.3 h1:nAmWq1fUTWl/XiaEPwALjp/8BPZJun70iDHRNq/sH6w=+github.com/go-openapi/swag/stringutils v0.25.3/go.mod h1:GTsRvhJW5xM5gkgiFe0fV3PUlFm0dr8vki6/VSRaZK0=+github.com/go-openapi/swag/typeutils v0.25.3 h1:2w4mEEo7DQt3V4veWMZw0yTPQibiL3ri2fdDV4t2TQc=+github.com/go-openapi/swag/typeutils v0.25.3/go.mod h1:Ou7g//Wx8tTLS9vG0UmzfCsjZjKhpjxayRKTHXf2pTE=+github.com/go-openapi/swag/yamlutils v0.25.3 h1:LKTJjCn/W1ZfMec0XDL4Vxh8kyAnv1orH5F2OREDUrg=+github.com/go-openapi/swag/yamlutils v0.25.3/go.mod h1:Y7QN6Wc5DOBXK14/xeo1cQlq0EA0wvLoSv13gDQoCao=+github.com/go-openapi/validate v0.25.1 h1:sSACUI6Jcnbo5IWqbYHgjibrhhmt3vR6lCzKZnmAgBw=+github.com/go-openapi/validate v0.25.1/go.mod h1:RMVyVFYte0gbSTaZ0N4KmTn6u/kClvAFp+mAVfS/DQc=github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=@@ -213,10 +229,6 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJngithub.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w=github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=-github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=-github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=@@ -227,28 +239,22 @@ github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=-github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=github.com/golang-migrate/migrate/v4 v4.19.1 h1:OCyb44lFuQfYXYLx1SCxPZQGU7mcaZ7gH9yH4jSFbBA=github.com/golang-migrate/migrate/v4 v4.19.1/go.mod h1:CTcgfjxhaUtsLipnLoQRWCrjYXycRz/g5+RWDuYgPrE=-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=-github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93 h1:jc2UWq7CbdszqeH6qu1ougXMIUBfSy8Pbh/anURYbGI=-github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=+github.com/google/certificate-transparency-go v1.3.2 h1:9ahSNZF2o7SYMaKaXhAumVEzXB2QaayzII9C8rv7v+A=+github.com/google/certificate-transparency-go v1.3.2/go.mod h1:H5FpMUaGa5Ab2+KCYsxg6sELw3Flkl7pGZzWdBoYLXs=github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=+github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=+github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc=github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=@@ -256,15 +262,12 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUgithub.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=-github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU=-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs=-github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=-github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg=+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4=github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=@@ -274,10 +277,10 @@ github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Cgithub.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4=github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=+github.com/in-toto/attestation v1.1.2 h1:MBFn6lsMq6dptQZJBhalXTcWMb/aJy3V+GX3VYj/V1E=+github.com/in-toto/attestation v1.1.2/go.mod h1:gYFddHMZj3DiQ0b62ltNi1Vj5rC879bTmBbrv9CRHpM=github.com/in-toto/in-toto-golang v0.9.0 h1:tHny7ac4KgtsfrG6ybU8gVOZux2H8jN05AXJ9EBM1XU=github.com/in-toto/in-toto-golang v0.9.0/go.mod h1:xsBVrVsHNsB61++S6Dy2vWosKhuA3lUTQd+eF9HdeMo=-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf h1:FtEj8sfIcaaBfAKrE1Cwb61YDtYq9JxChK1c7AKce7s=@@ -296,24 +299,16 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlgithub.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=-github.com/jinzhu/gorm v0.0.0-20170222002820-5409931a1bb8 h1:CZkYfurY6KGhVtlalI4QwQ6T0Cu6iuY3e0x5RLu96WE=-github.com/jinzhu/gorm v0.0.0-20170222002820-5409931a1bb8/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo=-github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=-github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=-github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=-github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=@@ -322,9 +317,6 @@ github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzEgithub.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=@@ -332,18 +324,14 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=-github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=github.com/lmittmann/tint v1.1.3 h1:Hv4EaHWXQr+GTFnOU4VKf8UvAtZgn0VuKT+G0wFlO3I=github.com/lmittmann/tint v1.1.3/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 h1:mFWunSatvkQQDhpdyuFAYwyAan3hzCuma+Pz8sqvOfg=github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=-github.com/magiconair/properties v1.5.3/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=@@ -352,24 +340,22 @@ github.com/mattn/go-runewidth v0.0.20 h1:WcT52H91ZUAwy8+HUkdM3THM6gXqXuLJi9O3rjcgithub.com/mattn/go-runewidth v0.0.20/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=-github.com/mattn/go-sqlite3 v1.6.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=-github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=-github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=-github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=-github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=-github.com/moby/buildkit v0.26.3 h1:D+ruZVAk/3ipRq5XRxBH9/DIFpRjSlTtMbghT5gQP9g=-github.com/moby/buildkit v0.26.3/go.mod h1:4T4wJzQS4kYWIfFRjsbJry4QoxDBjK+UGOEOs1izL7w=+github.com/moby/buildkit v0.27.1 h1:qlIWpnZzqCkrYiGkctM1gBD/YZPOJTjtUdRBlI0oBOU=+github.com/moby/buildkit v0.27.1/go.mod h1:99qLrCrIAFgEOiFnCi9Y0Wwp6/qA7QvZ3uq/6wF0IsI=github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=-github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=-github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=+github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8=+github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU=github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=+github.com/moby/moby/api v1.53.0 h1:PihqG1ncw4W+8mZs69jlwGXdaYBeb5brF6BL7mPIS/w=+github.com/moby/moby/api v1.53.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=+github.com/moby/moby/client v0.2.2 h1:Pt4hRMCAIlyjL3cr8M5TrXCwKzguebPAc2do2ur7dEM=+github.com/moby/moby/client v0.2.2/go.mod h1:2EkIPVNCqR05CMIzL1mfA07t0HvVUUOl85pasRz/GmQ=github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=@@ -393,8 +379,6 @@ github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLgithub.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=@@ -402,33 +386,25 @@ github.com/morikuni/aec v1.1.0 h1:vBBl0pUnvi/Je71dsRrhMBtreIqNMYErSAbEeb8jrXQ=github.com/morikuni/aec v1.1.0/go.mod h1:xDRgiq/iw5l+zkao76YTKzKttOp2cwPEne25HDkJnBw=github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=github.com/nicholas-fedor/shoutrrr v0.13.2 h1:hfsYBIqSFYGg92pZP5CXk/g7/OJIkLYmiUnRl+AD1IA=github.com/nicholas-fedor/shoutrrr v0.13.2/go.mod h1:ZqzV3gY/Wj6AvWs1etlO7+yKbh4iptSbeL8avBpMQbA=-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=-github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=+github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=-github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=-github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=-github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=github.com/opencontainers/runtime-spec v1.3.0 h1:YZupQUdctfhpZy3TM39nN9Ika5CBWT5diQ8ibYCRkxg=github.com/opencontainers/runtime-spec v1.3.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=github.com/opencontainers/selinux v1.13.1 h1:A8nNeceYngH9Ow++M+VVEwJVpdFmrlxsN22F+ISDCJE=github.com/opencontainers/selinux v1.13.1/go.mod h1:S10WXZ/osk2kWOYKy1x2f/eXF5ZHJoUs8UU/2caNRbg=-github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=github.com/orandin/slog-gorm v1.4.0 h1:FgA8hJufF9/jeNSYoEXmHPPBwET2gwlF3B85JdpsTUU=github.com/orandin/slog-gorm v1.4.0/go.mod h1:MoZ51+b7xE9lwGNPYEhxcUtRNrYzjdcKvA8QXQQGEPA=github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=@@ -437,8 +413,6 @@ github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=@@ -448,26 +422,12 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIgithub.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=-github.com/prometheus/client_golang v0.9.0-pre1.0.20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=-github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=-github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=-github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=-github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=-github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=-github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=@@ -481,23 +441,30 @@ github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGgithub.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=-github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=-github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=github.com/samber/slog-gin v1.21.0 h1:/yLKbQhA2+35PLf1Q1AQKB/pTlDbpSAapu6CbZCLxQs=github.com/samber/slog-gin v1.21.0/go.mod h1:7R4VMQGENllRLLnwGyoB5nUSB+qzxThpGe5G02xla6o=github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=github.com/secure-systems-lab/go-securesystemslib v0.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g=github.com/secure-systems-lab/go-securesystemslib v0.9.1/go.mod h1:np53YzT0zXGMv6x4iEWc9Z59uR+x+ndLwCLqPYpLXVU=-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=+github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=+github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh5dkI=github.com/shibumi/go-pathspec v1.3.0/go.mod h1:Xutfslp817l2I1cZvgcfeMQJG5QnU2lh5tVaaMCl3jE=github.com/shirou/gopsutil/v4 v4.26.1 h1:TOkEyriIXk2HX9d4isZJtbjXbEjf5qyKPAzbzY0JWSo=github.com/shirou/gopsutil/v4 v4.26.1/go.mod h1:medLI9/UNAb0dOI9Q3/7yWSqKkj00u+1tgY8nvv41pc=-github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=+github.com/sigstore/protobuf-specs v0.5.0 h1:F8YTI65xOHw70NrvPwJ5PhAzsvTnuJMGLkA4FIkofAY=+github.com/sigstore/protobuf-specs v0.5.0/go.mod h1:+gXR+38nIa2oEupqDdzg4qSBT0Os+sP7oYv6alWewWc=+github.com/sigstore/rekor v1.4.3 h1:2+aw4Gbgumv8vYM/QVg6b+hvr4x4Cukur8stJrVPKU0=+github.com/sigstore/rekor v1.4.3/go.mod h1:o0zgY087Q21YwohVvGwV9vK1/tliat5mfnPiVI3i75o=+github.com/sigstore/rekor-tiles/v2 v2.0.1 h1:1Wfz15oSRNGF5Dzb0lWn5W8+lfO50ork4PGIfEKjZeo=+github.com/sigstore/rekor-tiles/v2 v2.0.1/go.mod h1:Pjsbhzj5hc3MKY8FfVTYHBUHQEnP0ozC4huatu4x7OU=+github.com/sigstore/sigstore v1.10.0 h1:lQrmdzqlR8p9SCfWIpFoGUqdXEzJSZT2X+lTXOMPaQI=+github.com/sigstore/sigstore v1.10.0/go.mod h1:Ygq+L/y9Bm3YnjpJTlQrOk/gXyrjkpn3/AEJpmk1n9Y=+github.com/sigstore/sigstore-go v1.1.4-0.20251124094504-b5fe07a5a7d7 h1:94NLPmq4bxvdmslzcG670IOkrlS98CGpmob8cjpFHuI=+github.com/sigstore/sigstore-go v1.1.4-0.20251124094504-b5fe07a5a7d7/go.mod h1:4r/PNX0G7uzkLpc3PSdYs5E2k4bWEJNXTK6kwAyw9TM=+github.com/sigstore/timestamp-authority/v2 v2.0.2 h1:WavlEeLh6HKt+osbmsHDg6/FaM/8Pz9iVUMh9pAsl/o=+github.com/sigstore/timestamp-authority/v2 v2.0.2/go.mod h1:D+wbQg8ASQzKnwBhLo7rIJD+9Zev4Ppqd4myPe8k57E=github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=@@ -505,34 +472,20 @@ github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBgithub.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=-github.com/spdx/tools-golang v0.5.5 h1:61c0KLfAcNqAjlg6UNMdkwpMernhw3zVRwDZ2x9XOmk=-github.com/spdx/tools-golang v0.5.5/go.mod h1:MVIsXx8ZZzaRWNQpUDhC4Dud34edUYJYecciXgrw5vE=-github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=-github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=-github.com/spf13/cast v0.0.0-20150508191742-4d07383ffe94/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=-github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=-github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=-github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=+github.com/spdx/tools-golang v0.5.7 h1:+sWcKGnhwp3vLdMqPcLdA6QK679vd86cK9hQWH3AwCg=+github.com/spdx/tools-golang v0.5.7/go.mod h1:jg7w0LOpoNAw6OxKEzCoqPC2GCTj45LyTlVmXubDsYw=github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=-github.com/spf13/jwalterweatherman v0.0.0-20141219030609-3d60171a6431/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=-github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=-github.com/spf13/viper v0.0.0-20150530192845-be5ff3e4840c/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=-github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=-github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=@@ -540,10 +493,9 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlgithub.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=-github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=-github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=-github.com/theupdateframework/notary v0.7.0 h1:QyagRZ7wlSpjT5N2qQAh/pN+DVqgekv4DzbAiAiEL3c=-github.com/theupdateframework/notary v0.7.0/go.mod h1:c9DRxcmhHmVLDay4/2fUYdISnHqbFDGRSlXPO0AhYWw=+github.com/theupdateframework/go-tuf v0.7.0 h1:CqbQFrWo1ae3/I0UCblSbczevCCbS31Qvs5LdxRWqRI=+github.com/theupdateframework/go-tuf/v2 v2.3.0 h1:gt3X8xT8qu/HT4w+n1jgv+p7koi5ad8XEkLXXZqG9AA=+github.com/theupdateframework/go-tuf/v2 v2.3.0/go.mod h1:xW8yNvgXRncmovMLvBxKwrKpsOwJZu/8x+aB0KtFcdw=github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 h1:QB54BJwA6x8QU9nHY3xJSZR2kX9bgpZekRKGkLTmEXA=github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375/go.mod h1:xRroudyp5iVtxKqZCrA6n2TLFRBf8bmnjr1UD4x+z7g=github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=@@ -552,14 +504,18 @@ github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9Rgithub.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ=github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 h1:r0p7fK56l8WPequOaR3i9LBqfPtEdXIQbUTzT55iqT4=github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323/go.mod h1:3Iuxbr0P7D3zUzBMAZB+ois3h/et0shEz0qApgHYGpY=-github.com/tonistiigi/fsutil v0.0.0-20250605211040-586307ad452f h1:MoxeMfHAe5Qj/ySSBfL8A7l1V+hxuluj8owsIEEZipI=-github.com/tonistiigi/fsutil v0.0.0-20250605211040-586307ad452f/go.mod h1:BKdcez7BiVtBvIcef90ZPc6ebqIWr4JWD7+EvLm6J98=+github.com/tonistiigi/fsutil v0.0.0-20251211185533-a2aa163d723f h1:Z4NEQ86qFl1mHuCu9gwcE+EYCwDKfXAYXZbdIXyxmEA=+github.com/tonistiigi/fsutil v0.0.0-20251211185533-a2aa163d723f/go.mod h1:BKdcez7BiVtBvIcef90ZPc6ebqIWr4JWD7+EvLm6J98=github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 h1:2f304B10LaZdB8kkVEaoXvAMVan2tl9AiK4G0odjQtE=github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0/go.mod h1:278M4p8WsNh3n4a1eqiFcV2FGk7wE5fwUpUom9mK9lE=github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea h1:SXhTLE6pb6eld/v/cCndK0AMpt1wiVFb/YYmqB3/QG0=github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk=github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab h1:H6aJ0yKQ0gF49Qb2z5hI1UHxSQt4JMyxebFR15KnApw=github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab/go.mod h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc=+github.com/transparency-dev/formats v0.0.0-20251017110053-404c0d5b696c h1:5a2XDQ2LiAUV+/RjckMyq9sXudfrPSuCY4FuPC1NyAw=+github.com/transparency-dev/formats v0.0.0-20251017110053-404c0d5b696c/go.mod h1:g85IafeFJZLxlzZCDRu4JLpfS7HKzR+Hw9qRh3bVzDI=+github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG81+twTK4=+github.com/transparency-dev/merkle v0.0.2/go.mod h1:pqSy+OXefQ1EDUVmAJ8MUhHB9TXGuzVAT58PqBoHz1A=github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY=@@ -576,6 +532,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9degithub.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=+go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=+go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=@@ -620,17 +578,13 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=-go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=-go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=+go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=+go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=golang.org/x/arch v0.24.0 h1:qlJ3M9upxvFfwRM51tTg3Yl+8CP9vCC1E7vlFpgv99Y=golang.org/x/arch v0.24.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=-golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=@@ -640,10 +594,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=@@ -652,23 +603,15 @@ golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=-golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=@@ -683,7 +626,6 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=@@ -710,33 +652,19 @@ google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=-google.golang.org/grpc v1.0.5/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=google.golang.org/grpc v1.79.1 h1:zGhSi45ODB9/p3VAawt9a+O/MULLl9dpizzNNpq7flY=google.golang.org/grpc v1.79.1/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=-gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=-gopkg.in/cenkalti/backoff.v2 v2.2.1 h1:eJ9UAg01/HIHG987TwxvnzK2MgxXq97YY6rYDpY9aII=-gopkg.in/cenkalti/backoff.v2 v2.2.1/go.mod h1:S0QdOvT2AlerfSBkp0O+dk+bbIMaNbEmVk876gPCthU=gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=-gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=-gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.1 h1:d4KQkxAaAiRY2h5Zqis161Pv91A37uZyJOx73duwUwM=-gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.1/go.mod h1:WbjuEoo1oadwzQ4apSDU+JTvmllEHtsNHS6y7vFc7iw=-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=@@ -773,5 +701,7 @@ modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=+pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk=+pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=tags.cncf.io/container-device-interface v1.1.0 h1:RnxNhxF1JOu6CJUVpetTYvrXHdxw9j9jFYgZpI+anSY=tags.cncf.io/container-device-interface v1.1.0/go.mod h1:76Oj0Yqp9FwTx/pySDc8Bxjpg+VqXfDb50cKAXVJ34Q=diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.goindex 01b108ce0..a82d139a4 100644--- a/backend/internal/bootstrap/bootstrap.go+++ b/backend/internal/bootstrap/bootstrap.go@@ -14,6 +14,7 @@ import ("time""github.com/joho/godotenv"+ "github.com/moby/moby/client""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/services"@@ -133,10 +134,7 @@ func initializeStartupState(appCtx context.Context, cfg *config.Config, appServireturn err}- // Force version negotiation before logging effective client API version.- dockerClient.NegotiateAPIVersion(ctx)-- version, err := dockerClient.ServerVersion(ctx)+ version, err := dockerClient.ServerVersion(ctx, client.ServerVersionOptions{})if err != nil {return err}diff --git a/backend/internal/huma/handlers/containers.go b/backend/internal/huma/handlers/containers.goindex 21c8b9624..cb626475e 100644--- a/backend/internal/huma/handlers/containers.go+++ b/backend/internal/huma/handlers/containers.go@@ -4,12 +4,10 @@ import ("context""maps""net/http"+ "net/netip""strings""github.com/danielgtaylor/huma/v2"- dockercontainer "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/network"- "github.com/docker/go-connections/nat""github.com/getarcaneapp/arcane/backend/internal/common"humamw "github.com/getarcaneapp/arcane/backend/internal/huma/middleware""github.com/getarcaneapp/arcane/backend/internal/services"@@ -17,6 +15,8 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/libarcane""github.com/getarcaneapp/arcane/types/base"containertypes "github.com/getarcaneapp/arcane/types/container"+ dockercontainer "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/network")type ContainerHandler struct {@@ -286,18 +286,12 @@ func (h *ContainerHandler) GetContainerStatusCounts(ctx context.Context, input *}, nil}-func parsePortSpec(spec string) (nat.Port, error) {- proto := "tcp"- port := spec+func parsePortSpec(spec string) (network.Port, error) {if strings.Contains(spec, "/") {- parts := strings.SplitN(spec, "/", 2)- port = parts[0]- if parts[1] != "" {- proto = parts[1]- }+ return network.ParsePort(spec)}- return nat.NewPort(proto, port)+ return network.ParsePort(spec + "/tcp")}func resolveCreateCommand(body containertypes.Create) []string {@@ -333,7 +327,7 @@ func buildContainerConfig(body containertypes.Create) *dockercontainer.Config {WorkingDir: body.WorkingDir,User: body.User,Env: resolveCreateEnv(body),- ExposedPorts: nat.PortSet{},+ ExposedPorts: network.PortSet{},Labels: buildCreateLabels(body),Hostname: body.Hostname,Domainname: body.Domainname,@@ -347,14 +341,14 @@ func buildContainerConfig(body containertypes.Create) *dockercontainer.Config {}}-func applyLegacyPortBindings(body containertypes.Create, config *dockercontainer.Config, portBindings nat.PortMap) error {+func applyLegacyPortBindings(body containertypes.Create, config *dockercontainer.Config, portBindings network.PortMap) error {for containerPort, hostPort := range body.Ports {- port, err := nat.NewPort("tcp", containerPort)+ port, err := network.ParsePort(containerPort + "/tcp")if err != nil {return err}config.ExposedPorts[port] = struct{}{}- portBindings[port] = []nat.PortBinding{{HostPort: hostPort}}+ portBindings[port] = []network.PortBinding{{HostPort: hostPort}}}return nil@@ -372,7 +366,7 @@ func applyExposedPorts(exposedPorts map[string]struct{}, config *dockercontainerreturn nil}-func buildHostConfigBase(body containertypes.Create, portBindings nat.PortMap) *dockercontainer.HostConfig {+func buildHostConfigBase(body containertypes.Create, portBindings network.PortMap) *dockercontainer.HostConfig {return &dockercontainer.HostConfig{Binds: body.Volumes,PortBindings: portBindings,@@ -382,7 +376,7 @@ func buildHostConfigBase(body containertypes.Create, portBindings nat.PortMap) *}}-func applyHostConfigPortBindings(config *dockercontainer.Config, portBindings nat.PortMap, bindings map[string][]containertypes.PortBindingCreate) error {+func applyHostConfigPortBindings(config *dockercontainer.Config, portBindings network.PortMap, bindings map[string][]containertypes.PortBindingCreate) error {for portSpec, bindingList := range bindings {port, err := parsePortSpec(portSpec)if err != nil {@@ -390,10 +384,15 @@ func applyHostConfigPortBindings(config *dockercontainer.Config, portBindings na}config.ExposedPorts[port] = struct{}{}for _, binding := range bindingList {- portBindings[port] = append(portBindings[port], nat.PortBinding{- HostPort: binding.HostPort,- HostIP: binding.HostIP,- })+ pb := network.PortBinding{HostPort: binding.HostPort}+ if hostIP := strings.TrimSpace(binding.HostIP); hostIP != "" {+ parsedIP, err := netip.ParseAddr(hostIP)+ if err != nil {+ return err+ }+ pb.HostIP = parsedIP+ }+ portBindings[port] = append(portBindings[port], pb)}}@@ -440,7 +439,7 @@ func applyHostConfigSettings(hostConfig *dockercontainer.HostConfig, input *cont}}-func applyHostConfigOverrides(body containertypes.Create, config *dockercontainer.Config, hostConfig *dockercontainer.HostConfig, portBindings nat.PortMap) error {+func applyHostConfigOverrides(body containertypes.Create, config *dockercontainer.Config, hostConfig *dockercontainer.HostConfig, portBindings network.PortMap) error {if body.HostConfig == nil {return nil}@@ -499,7 +498,7 @@ func (h *ContainerHandler) CreateContainer(ctx context.Context, input *CreateCon}config := buildContainerConfig(input.Body)- portBindings := nat.PortMap{}+ portBindings := network.PortMap{}if err := applyLegacyPortBindings(input.Body, config, portBindings); err != nil {return nil, huma.Error400BadRequest((&common.InvalidPortFormatError{Err: err}).Error())}@@ -524,7 +523,7 @@ func (h *ContainerHandler) CreateContainer(ctx context.Context, input *CreateConID: containerJSON.ID,Name: containerJSON.Name,Image: containerJSON.Config.Image,- Status: containerJSON.State.Status,+ Status: string(containerJSON.State.Status),Created: containerJSON.Created,}diff --git a/backend/internal/huma/handlers/networks.go b/backend/internal/huma/handlers/networks.goindex 4462dbba1..b3cac3747 100644--- a/backend/internal/huma/handlers/networks.go+++ b/backend/internal/huma/handlers/networks.go@@ -9,7 +9,6 @@ import ("strings""github.com/danielgtaylor/huma/v2"- dockernetwork "github.com/docker/docker/api/types/network""github.com/getarcaneapp/arcane/backend/internal/common"humamw "github.com/getarcaneapp/arcane/backend/internal/huma/middleware""github.com/getarcaneapp/arcane/backend/internal/services"@@ -17,6 +16,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/types/base"networktypes "github.com/getarcaneapp/arcane/types/network"+ dockernetwork "github.com/moby/moby/api/types/network")type NetworkHandler struct {@@ -286,13 +286,21 @@ func (h *NetworkHandler) GetNetwork(ctx context.Context, input *GetNetworkInput)// Populate ContainersListout.ContainersList = make([]networktypes.ContainerEndpoint, 0, len(out.Containers))for id, container := range out.Containers {+ ipv4Address := ""+ if container.IPv4Address.IsValid() {+ ipv4Address = container.IPv4Address.String()+ }+ ipv6Address := ""+ if container.IPv6Address.IsValid() {+ ipv6Address = container.IPv6Address.String()+ }out.ContainersList = append(out.ContainersList, networktypes.ContainerEndpoint{ID: id,Name: container.Name,EndpointID: container.EndpointID,- IPv4Address: container.IPv4Address,- IPv6Address: container.IPv6Address,- MacAddress: container.MacAddress,+ IPv4Address: ipv4Address,+ IPv6Address: ipv6Address,+ MacAddress: container.MacAddress.String(),})}diff --git a/backend/internal/huma/handlers/system.go b/backend/internal/huma/handlers/system.goindex 88d737d35..02e0f09b9 100644--- a/backend/internal/huma/handlers/system.go+++ b/backend/internal/huma/handlers/system.go@@ -5,6 +5,7 @@ import ("errors""log/slog""net/http"+ "strings""github.com/danielgtaylor/huma/v2""github.com/getarcaneapp/arcane/backend/internal/common"@@ -17,6 +18,8 @@ import (containertypes "github.com/getarcaneapp/arcane/types/container""github.com/getarcaneapp/arcane/types/dockerinfo""github.com/getarcaneapp/arcane/types/system"+ dockersystem "github.com/moby/moby/api/types/system"+ "github.com/moby/moby/client")// SystemHandler handles system management endpoints.@@ -251,7 +254,7 @@ func (h *SystemHandler) Health(ctx context.Context, input *SystemHealthInput) (*return nil, huma.Error503ServiceUnavailable((&common.DockerConnectionError{Err: err}).Error())}- _, err = dockerClient.Ping(ctx)+ _, err = dockerClient.Ping(ctx, client.PingOptions{})if err != nil {return nil, huma.Error503ServiceUnavailable((&common.DockerPingError{Err: err}).Error())}@@ -270,15 +273,16 @@ func (h *SystemHandler) GetDockerInfo(ctx context.Context, input *GetDockerInfoIreturn nil, huma.Error500InternalServerError((&common.DockerConnectionError{Err: err}).Error())}- version, err := dockerClient.ServerVersion(ctx)+ version, err := dockerClient.ServerVersion(ctx, client.ServerVersionOptions{})if err != nil {return nil, huma.Error500InternalServerError((&common.DockerVersionError{Err: err}).Error())}- info, err := dockerClient.Info(ctx)+ infoResult, err := dockerClient.Info(ctx, client.InfoOptions{})if err != nil {return nil, huma.Error500InternalServerError((&common.DockerInfoError{Err: err}).Error())}+ info := infoResult.InfocpuCount := info.NCPUmemTotal := info.MemTotal@@ -299,20 +303,49 @@ func (h *SystemHandler) GetDockerInfo(ctx context.Context, input *GetDockerInfoIinfo.NCPU = cpuCountinfo.MemTotal = memTotal+ gitCommit, goVersion, buildTime := extractVersionDetailsFromComponents(version.Components)+return &GetDockerInfoOutput{Body: dockerinfo.Info{Success: true,APIVersion: version.APIVersion,- GitCommit: version.GitCommit,- GoVersion: version.GoVersion,+ GitCommit: gitCommit,+ GoVersion: goVersion,Os: version.Os,Arch: version.Arch,- BuildTime: version.BuildTime,+ BuildTime: buildTime,Info: info,},}, nil}+func extractVersionDetailsFromComponents(components []dockersystem.ComponentVersion) (gitCommit, goVersion, buildTime string) {+ for _, component := range components {+ if component.Details == nil {+ continue+ }++ for key, value := range component.Details {+ switch strings.ToLower(key) {+ case "gitcommit":+ if gitCommit == "" {+ gitCommit = value+ }+ case "goversion":+ if goVersion == "" {+ goVersion = value+ }+ case "buildtime":+ if buildTime == "" {+ buildTime = value+ }+ }+ }+ }++ return gitCommit, goVersion, buildTime+}+// PruneAll removes unused Docker resources.func (h *SystemHandler) PruneAll(ctx context.Context, input *PruneAllInput) (*PruneAllOutput, error) {if h.systemService == nil {diff --git a/backend/internal/huma/handlers/volumes.go b/backend/internal/huma/handlers/volumes.goindex 7b1d090f0..3c4868349 100644--- a/backend/internal/huma/handlers/volumes.go+++ b/backend/internal/huma/handlers/volumes.go@@ -8,7 +8,6 @@ import ("path""github.com/danielgtaylor/huma/v2"- "github.com/docker/docker/api/types/volume""github.com/getarcaneapp/arcane/backend/internal/common"humamw "github.com/getarcaneapp/arcane/backend/internal/huma/middleware""github.com/getarcaneapp/arcane/backend/internal/models"@@ -16,6 +15,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/types/base"volumetypes "github.com/getarcaneapp/arcane/types/volume"+ "github.com/moby/moby/client")// VolumeHandler provides Huma-based volume management endpoints.@@ -725,7 +725,7 @@ func (h *VolumeHandler) CreateVolume(ctx context.Context, input *CreateVolumeInpreturn nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())}- options := volume.CreateOptions{+ options := client.VolumeCreateOptions{Name: input.Body.Name,Driver: input.Body.Driver,Labels: input.Body.Labels,diff --git a/backend/internal/huma/huma.go b/backend/internal/huma/huma.goindex 3abdee52d..9bbec8220 100644--- a/backend/internal/huma/huma.go+++ b/backend/internal/huma/huma.go@@ -13,103 +13,126 @@ import ("github.com/gin-gonic/gin")+const (+ arcaneTypesPrefix = "github.com/getarcaneapp/arcane/types/"+ dockerSDKPrefix = "github.com/moby/moby"+)++var dockerSchemaPrefixes = map[string]string{+ "types": "DockerTypes",+ "registry": "DockerRegistry",+ "system": "DockerSystem",+ "container": "DockerContainer",+ "network": "DockerNetwork",+ "volume": "DockerVolume",+ "swarm": "DockerSwarm",+ "mount": "DockerMount",+ "filters": "DockerFilters",+ "blkiodev": "DockerBlkiodev",+ "strslice": "DockerStrslice",+ "events": "DockerEvents",+ "image": "DockerImage",+}+// customSchemaNamer creates unique schema names using package prefix for types// from github.com/getarcaneapp/arcane/types to avoid conflicts between packages that have// types with the same name (e.g., image.Summary vs env.Summary).func customSchemaNamer(t reflect.Type, hint string) string {name := huma.DefaultSchemaNamer(t, hint)+ typeStr := t.String()+ pkgPath := packagePathForType(t)+ shortPkg := shortPackageFromTypeString(typeStr)- // Get the package path - for non-pointer types this gives the full import path- pkgPath := t.PkgPath()+ if pkgName, ok := arcanePackageName(pkgPath); ok {+ name = pkgName + name+ } else if dockerPrefix, ok := dockerSchemaPrefix(pkgPath, shortPkg); ok {+ name = dockerPrefix + name+ }+ if innerPkg, ok := genericInnerPackageName(pkgPath, typeStr); ok {+ return strings.Replace(name, "UsageCounts", innerPkg+"UsageCounts", 1)+ }- // For pointer types, get the element's package path- if pkgPath == "" && t.Kind() == reflect.Pointer {- pkgPath = t.Elem().PkgPath()+ return name+}++func packagePathForType(t reflect.Type) string {+ for t.Kind() == reflect.Pointer {+ t = t.Elem()}- // Use type string representation for package identification- // Format: "pkgname.TypeName" - we extract the pkgname part- typeStr := t.String()- var shortPkg string- if before, _, ok := strings.Cut(typeStr, "."); ok {- shortPkg = before+ return t.PkgPath()+}++func shortPackageFromTypeString(typeStr string) string {+ before, _, ok := strings.Cut(typeStr, ".")+ if !ok {+ return ""}- // For types from our types package, prefix with the package name- if strings.HasPrefix(pkgPath, "github.com/getarcaneapp/arcane/types/") {- // Extract package name (e.g., "image" from "github.com/getarcaneapp/arcane/types/image")- parts := strings.Split(pkgPath, "/")- if len(parts) > 0 {- pkgName := parts[len(parts)-1]- // Capitalize the package name and prefix it- pkgName = strings.ToUpper(pkgName[:1]) + pkgName[1:]- return pkgName + name- }+ return before+}++func arcanePackageName(pkgPath string) (string, bool) {+ if !strings.HasPrefix(pkgPath, arcaneTypesPrefix) {+ return "", false}- // Handle Docker SDK types that have name conflicts- // Docker has many packages with overlapping type names:- // types.ServiceConfig vs registry.ServiceConfig- // types.GenericResource vs swarm.GenericResource- // etc.- // We prefix ALL Docker types with their package name- dockerPackages := map[string]string{- "types": "DockerTypes",- "registry": "DockerRegistry",- "system": "DockerSystem",- "container": "DockerContainer",- "network": "DockerNetwork",- "volume": "DockerVolume",- "swarm": "DockerSwarm",- "mount": "DockerMount",- "filters": "DockerFilters",- "blkiodev": "DockerBlkiodev",- "strslice": "DockerStrslice",- "events": "DockerEvents",- "image": "DockerImage",+ parts := strings.Split(pkgPath, "/")+ if len(parts) == 0 {+ return "", false}- // Check if this is a Docker type based on pkgPath- if strings.Contains(pkgPath, "github.com/docker/docker") {- // Extract the last part of the package path+ pkg := parts[len(parts)-1]+ if pkg == "" {+ return "", false+ }++ return capitalizeFirst(pkg), true+}++func dockerSchemaPrefix(pkgPath, shortPkg string) (string, bool) {+ if strings.Contains(pkgPath, dockerSDKPrefix) {parts := strings.Split(pkgPath, "/")- lastPart := parts[len(parts)-1]- if prefix, ok := dockerPackages[lastPart]; ok {- return prefix + name+ last := parts[len(parts)-1]+ if prefix, ok := dockerSchemaPrefixes[last]; ok {+ return prefix, true}}- // Also check short package name from type string for nested/embedded types- if prefix, ok := dockerPackages[shortPkg]; ok {- return prefix + name+ prefix, ok := dockerSchemaPrefixes[shortPkg]+ if !ok {+ return "", false}- // Handle generic types like base.ApiResponse[T] where T is from github.com/getarcaneapp/arcane/types- // The name will be something like "BaseApiResponseUsageCounts" and we need to- // differentiate based on the inner type's package- if strings.HasPrefix(pkgPath, "github.com/getarcaneapp/arcane/types/base") {- // Check if this is a generic type by looking at string representation- typeName := t.String()- // For generics, Go's String() returns something like:- // "base.ApiResponse[github.com/getarcaneapp/arcane/types/volume.UsageCounts]"- if strings.Contains(typeName, "[") && strings.Contains(typeName, "github.com/getarcaneapp/arcane/types/") {- // Extract the inner package name- _, after, ok := strings.Cut(typeName, "github.com/getarcaneapp/arcane/types/")- if ok {- rest := after- before, _, ok := strings.Cut(rest, ".")- if ok {- innerPkg := before- innerPkg = strings.ToUpper(innerPkg[:1]) + innerPkg[1:]- // Insert the package name into the schema name- // BaseApiResponseUsageCounts -> BaseApiResponseVolumeUsageCounts- return strings.Replace(name, "UsageCounts", innerPkg+"UsageCounts", 1)- }- }- }+ return prefix, true+}++func genericInnerPackageName(pkgPath, typeName string) (string, bool) {+ if !strings.HasPrefix(pkgPath, arcaneTypesPrefix+"base") {+ return "", false+ }+ if !strings.Contains(typeName, "[") || !strings.Contains(typeName, arcaneTypesPrefix) {+ return "", false}- return name+ _, after, ok := strings.Cut(typeName, arcaneTypesPrefix)+ if !ok {+ return "", false+ }+ before, _, ok := strings.Cut(after, ".")+ if !ok || before == "" {+ return "", false+ }++ return capitalizeFirst(before), true+}++func capitalizeFirst(s string) string {+ if s == "" {+ return s+ }++ return strings.ToUpper(s[:1]) + s[1:]}// Services holds all service dependencies needed by Huma handlers.diff --git a/backend/internal/huma/huma_test.go b/backend/internal/huma/huma_test.gonew file mode 100644index 000000000..de9ceff0c--- /dev/null+++ b/backend/internal/huma/huma_test.go@@ -0,0 +1,59 @@+package huma++import (+ "reflect"+ "strings"+ "testing"++ basetypes "github.com/getarcaneapp/arcane/types/base"+ envtypes "github.com/getarcaneapp/arcane/types/env"+ imagetypes "github.com/getarcaneapp/arcane/types/image"+ volumetypes "github.com/getarcaneapp/arcane/types/volume"+ dockernetwork "github.com/moby/moby/api/types/network"+)++func TestCustomSchemaNamer_PrefixesArcaneTypesByPackage(t *testing.T) {+ imageName := customSchemaNamer(reflect.TypeFor[imagetypes.Summary](), "")+ envName := customSchemaNamer(reflect.TypeFor[envtypes.Summary](), "")++ if imageName != "ImageSummary" {+ t.Fatalf("expected ImageSummary, got %q", imageName)+ }+ if envName != "EnvSummary" {+ t.Fatalf("expected EnvSummary, got %q", envName)+ }+ if imageName == envName {+ t.Fatalf("expected unique schema names, got same value %q", imageName)+ }+}++func TestCustomSchemaNamer_PointerMatchesValue(t *testing.T) {+ valueName := customSchemaNamer(reflect.TypeFor[imagetypes.Summary](), "")+ pointerName := customSchemaNamer(reflect.TypeFor[*imagetypes.Summary](), "")++ if valueName != pointerName {+ t.Fatalf("expected pointer and value names to match, got %q and %q", valueName, pointerName)+ }+}++func TestCustomSchemaNamer_PrefixesDockerTypes(t *testing.T) {+ name := customSchemaNamer(reflect.TypeFor[dockernetwork.Inspect](), "")+ if !strings.HasPrefix(name, "DockerNetwork") {+ t.Fatalf("expected DockerNetwork prefix, got %q", name)+ }+}++func TestCustomSchemaNamer_DisambiguatesGenericUsageCounts(t *testing.T) {+ volumeResp := customSchemaNamer(reflect.TypeFor[basetypes.ApiResponse[volumetypes.UsageCounts]](), "")+ imageResp := customSchemaNamer(reflect.TypeFor[basetypes.ApiResponse[imagetypes.UsageCounts]](), "")++ if !strings.Contains(volumeResp, "VolumeUsageCounts") {+ t.Fatalf("expected VolumeUsageCounts in name, got %q", volumeResp)+ }+ if !strings.Contains(imageResp, "ImageUsageCounts") {+ t.Fatalf("expected ImageUsageCounts in name, got %q", imageResp)+ }+ if volumeResp == imageResp {+ t.Fatalf("expected unique generic schema names, got %q", volumeResp)+ }+}diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.goindex 8d1b8911c..b5e87b208 100644--- a/backend/internal/services/container_service.go+++ b/backend/internal/services/container_service.go@@ -12,20 +12,18 @@ import ("sync""time"- "github.com/docker/docker/api/types"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/image"- "github.com/docker/docker/api/types/network"- "github.com/docker/docker/client"- "github.com/docker/docker/pkg/stdcopy""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts""github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/stdcopy"containertypes "github.com/getarcaneapp/arcane/types/container""github.com/getarcaneapp/arcane/types/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/network"+ "github.com/moby/moby/client")type ContainerService struct {@@ -63,7 +61,7 @@ func (s *ContainerService) StartContainer(ctx context.Context, containerID strinfmt.Printf("Could not log container start action: %s\n", err)}- err = dockerClient.ContainerStart(ctx, containerID, container.StartOptions{})+ _, err = dockerClient.ContainerStart(ctx, containerID, client.ContainerStartOptions{})if err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "start"})}@@ -88,7 +86,7 @@ func (s *ContainerService) StopContainer(ctx context.Context, containerID string}timeout := 30- err = dockerClient.ContainerStop(ctx, containerID, container.StopOptions{Timeout: &timeout})+ _, err = dockerClient.ContainerStop(ctx, containerID, client.ContainerStopOptions{Timeout: &timeout})if err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "stop"})}@@ -112,7 +110,7 @@ func (s *ContainerService) RestartContainer(ctx context.Context, containerID strreturn fmt.Errorf("failed to log action: %w", err)}- err = dockerClient.ContainerRestart(ctx, containerID, container.StopOptions{})+ _, err = dockerClient.ContainerRestart(ctx, containerID, client.ContainerRestartOptions{})if err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "restart"})}@@ -125,12 +123,13 @@ func (s *ContainerService) GetContainerByID(ctx context.Context, id string) (*coreturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- container, err := dockerClient.ContainerInspect(ctx, id)+ containerInspect, err := dockerClient.ContainerInspect(ctx, id, client.ContainerInspectOptions{})if err != nil {return nil, fmt.Errorf("container not found: %w", err)}- return &container, nil+ containerInfo := containerInspect.Container+ return &containerInfo, nil}func (s *ContainerService) DeleteContainer(ctx context.Context, containerID string, force bool, removeVolumes bool, user models.User) error {@@ -143,9 +142,9 @@ func (s *ContainerService) DeleteContainer(ctx context.Context, containerID stri// Get container mounts before deletion if we need to remove volumesvar volumesToRemove []stringif removeVolumes {- containerJSON, inspectErr := dockerClient.ContainerInspect(ctx, containerID)+ containerJSON, inspectErr := dockerClient.ContainerInspect(ctx, containerID, client.ContainerInspectOptions{})if inspectErr == nil {- for _, mount := range containerJSON.Mounts {+ for _, mount := range containerJSON.Container.Mounts {// Only collect named volumes (not bind mounts or tmpfs)if mount.Type == "volume" && mount.Name != "" {volumesToRemove = append(volumesToRemove, mount.Name)@@ -154,7 +153,7 @@ func (s *ContainerService) DeleteContainer(ctx context.Context, containerID stri}}- err = dockerClient.ContainerRemove(ctx, containerID, container.RemoveOptions{+ _, err = dockerClient.ContainerRemove(ctx, containerID, client.ContainerRemoveOptions{Force: force,RemoveVolumes: removeVolumes,RemoveLinks: false,@@ -167,7 +166,7 @@ func (s *ContainerService) DeleteContainer(ctx context.Context, containerID stri// Remove named volumes if requestedif removeVolumes && len(volumesToRemove) > 0 {for _, volumeName := range volumesToRemove {- if removeErr := dockerClient.VolumeRemove(ctx, volumeName, false); removeErr != nil {+ if _, removeErr := dockerClient.VolumeRemove(ctx, volumeName, client.VolumeRemoveOptions{Force: false}); removeErr != nil {// Log but don't fail if volume removal fails (might be in use by another container)s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", volumeName, "", user.ID, user.Username, "0", removeErr, models.JSON{"action": "delete", "container": containerID})}@@ -202,7 +201,7 @@ func (s *ContainerService) CreateContainer(ctx context.Context, config *containeslog.WarnContext(ctx, "Failed to get registry authentication for container image; proceeding without auth","image", config.Image,"error", authErr.Error())- pullOptions = image.PullOptions{}+ pullOptions = client.ImagePullOptions{}}settings := s.settingsService.GetSettingsConfig()@@ -227,7 +226,12 @@ func (s *ContainerService) CreateContainer(ctx context.Context, config *containe}}- resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, networkingConfig, nil, containerName)+ resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: config,+ HostConfig: hostConfig,+ NetworkingConfig: networkingConfig,+ Name: containerName,+ })if err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", err, models.JSON{"action": "create", "image": config.Image, "step": "create"})return nil, fmt.Errorf("failed to create container: %w", err)@@ -242,19 +246,20 @@ func (s *ContainerService) CreateContainer(ctx context.Context, config *containefmt.Printf("Could not log container stop action: %s\n", logErr)}- if err := dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {- _ = dockerClient.ContainerRemove(ctx, resp.ID, container.RemoveOptions{Force: true})+ if _, err := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, client.ContainerRemoveOptions{Force: true})s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", resp.ID, containerName, user.ID, user.Username, "0", err, models.JSON{"action": "create", "image": config.Image, "step": "start"})return nil, fmt.Errorf("failed to start container: %w", err)}- containerJSON, err := dockerClient.ContainerInspect(ctx, resp.ID)+ containerJSON, err := dockerClient.ContainerInspect(ctx, resp.ID, client.ContainerInspectOptions{})if err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", resp.ID, containerName, user.ID, user.Username, "0", err, models.JSON{"action": "create", "image": config.Image, "step": "inspect"})return nil, fmt.Errorf("failed to inspect created container: %w", err)}- return &containerJSON, nil+ containerInfo := containerJSON.Container+ return &containerInfo, nil}func (s *ContainerService) StreamStats(ctx context.Context, containerID string, statsChan chan<- any) error {@@ -263,7 +268,7 @@ func (s *ContainerService) StreamStats(ctx context.Context, containerID string,return fmt.Errorf("failed to connect to Docker: %w", err)}- stats, err := dockerClient.ContainerStats(ctx, containerID, true)+ stats, err := dockerClient.ContainerStats(ctx, containerID, client.ContainerStatsOptions{Stream: true})if err != nil {return fmt.Errorf("failed to start stats stream: %w", err)}@@ -301,7 +306,7 @@ func (s *ContainerService) StreamLogs(ctx context.Context, containerID string, lreturn fmt.Errorf("failed to connect to Docker: %w", err)}- options := container.LogsOptions{+ options := client.ContainerLogsOptions{ShowStdout: true,ShowStderr: true,Follow: follow,@@ -436,10 +441,11 @@ func (s *ContainerService) ListContainersPaginated(ctx context.Context, params preturn nil, pagination.Response{}, containertypes.StatusCounts{}, fmt.Errorf("failed to connect to Docker: %w", err)}- dockerContainers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: includeAll})+ containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: includeAll})if err != nil {return nil, pagination.Response{}, containertypes.StatusCounts{}, fmt.Errorf("failed to list Docker containers: %w", err)}+ dockerContainers := containerList.ItemsdockerContainers = filterInternalContainers(dockerContainers, includeInternal)imageIDs := collectImageIDs(dockerContainers)@@ -620,15 +626,15 @@ func (s *ContainerService) CreateExec(ctx context.Context, containerID string, creturn "", fmt.Errorf("failed to connect to Docker: %w", err)}- execConfig := container.ExecOptions{+ execConfig := client.ExecCreateOptions{AttachStdin: true,AttachStdout: true,AttachStderr: true,- Tty: true,+ TTY: true,Cmd: cmd,}- execResp, err := dockerClient.ContainerExecCreate(ctx, containerID, execConfig)+ execResp, err := dockerClient.ExecCreate(ctx, containerID, execConfig)if err != nil {return "", fmt.Errorf("failed to create exec: %w", err)}@@ -640,7 +646,7 @@ func (s *ContainerService) CreateExec(ctx context.Context, containerID string, ctype ExecSession struct {execID stringcontainerID string- hijackedResp types.HijackedResponse+ hijackedResp client.HijackedResponsedockerClient *client.ClientcloseOnce sync.Once}@@ -673,8 +679,8 @@ func (s *ContainerService) AttachExec(ctx context.Context, containerID, execID sreturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- execAttach, err := dockerClient.ContainerExecAttach(ctx, execID, container.ExecAttachOptions{- Tty: true,+ execAttach, err := dockerClient.ExecAttach(ctx, execID, client.ExecAttachOptions{+ TTY: true,})if err != nil {return nil, fmt.Errorf("failed to attach to exec: %w", err)@@ -683,7 +689,7 @@ func (s *ContainerService) AttachExec(ctx context.Context, containerID, execID sreturn &ExecSession{execID: execID,containerID: containerID,- hijackedResp: execAttach,+ hijackedResp: execAttach.HijackedResponse,dockerClient: dockerClient,}, nil}diff --git a/backend/internal/services/docker_client_service.go b/backend/internal/services/docker_client_service.goindex 8a8024a83..600153e14 100644--- a/backend/internal/services/docker_client_service.go+++ b/backend/internal/services/docker_client_service.go@@ -5,16 +5,16 @@ import ("fmt""sync"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/image"- "github.com/docker/docker/api/types/mount"- "github.com/docker/docker/api/types/network"- "github.com/docker/docker/api/types/volume"- "github.com/docker/docker/client""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/image"+ "github.com/moby/moby/api/types/mount"+ "github.com/moby/moby/api/types/network"+ "github.com/moby/moby/api/types/volume"+ "github.com/moby/moby/client")type DockerClientService struct {@@ -48,10 +48,9 @@ func (s *DockerClientService) GetClient() (*client.Client, error) {return s.client, nil}- cli, err := client.NewClientWithOpts(+ cli, err := client.New(client.WithHost(s.config.DockerHost),- client.WithVersionFromEnv(),- client.WithAPIVersionNegotiation(),+ client.WithAPIVersionFromEnv(),)if err != nil {return nil, fmt.Errorf("failed to create Docker client: %w", err)@@ -71,10 +70,11 @@ func (s *DockerClientService) GetAllContainers(ctx context.Context) ([]containerapiCtx, cancel := timeouts.WithTimeout(ctx, settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI)defer cancel()- containers, err := dockerClient.ContainerList(apiCtx, container.ListOptions{All: true})+ containerList, err := dockerClient.ContainerList(apiCtx, client.ContainerListOptions{All: true})if err != nil {return nil, 0, 0, 0, fmt.Errorf("failed to list Docker containers: %w", err)}+ containers := containerList.Itemsvar running, stopped, total intfor _, c := range containers {@@ -99,15 +99,17 @@ func (s *DockerClientService) GetAllImages(ctx context.Context) ([]image.SummaryapiCtx, cancel := timeouts.WithTimeout(ctx, settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI)defer cancel()- images, err := dockerClient.ImageList(apiCtx, image.ListOptions{All: true})+ imageList, err := dockerClient.ImageList(apiCtx, client.ImageListOptions{All: true})if err != nil {return nil, 0, 0, 0, fmt.Errorf("failed to list Docker images: %w", err)}+ images := imageList.Items- containers, err := dockerClient.ContainerList(apiCtx, container.ListOptions{All: true})+ containerList, err := dockerClient.ContainerList(apiCtx, client.ContainerListOptions{All: true})if err != nil {return nil, 0, 0, 0, fmt.Errorf("failed to list Docker containers: %w", err)}+ containers := containerList.Itemsinuse, unused, total := countImageUsageInternal(images, containers)@@ -145,10 +147,11 @@ func (s *DockerClientService) GetAllNetworks(ctx context.Context) (_ []network.SapiCtx, cancel := timeouts.WithTimeout(ctx, settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI)defer cancel()- containers, err := dockerClient.ContainerList(apiCtx, container.ListOptions{All: true})+ containerList, err := dockerClient.ContainerList(apiCtx, client.ContainerListOptions{All: true})if err != nil {return nil, 0, 0, 0, fmt.Errorf("failed to list Docker containers: %w", err)}+ containers := containerList.ItemsinUseByID := make(map[string]bool)inUseByName := make(map[string]bool)for _, c := range containers {@@ -163,10 +166,11 @@ func (s *DockerClientService) GetAllNetworks(ctx context.Context) (_ []network.S}}- networks, err := dockerClient.NetworkList(apiCtx, network.ListOptions{})+ networkList, err := dockerClient.NetworkList(apiCtx, client.NetworkListOptions{})if err != nil {return nil, 0, 0, 0, fmt.Errorf("failed to list Docker networks: %w", err)}+ networks := networkList.Itemsvar inuse, unused, total intfor _, n := range networks {@@ -197,10 +201,11 @@ func (s *DockerClientService) GetAllVolumes(ctx context.Context) ([]*volume.VoluapiCtx, cancel := timeouts.WithTimeout(ctx, settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI)defer cancel()- containers, err := dockerClient.ContainerList(apiCtx, container.ListOptions{All: true})+ containerList, err := dockerClient.ContainerList(apiCtx, client.ContainerListOptions{All: true})if err != nil {return nil, 0, 0, 0, fmt.Errorf("failed to list Docker containers: %w", err)}+ containers := containerList.Itemsref := make(map[string]int64, len(containers))for _, c := range containers {for _, m := range c.Mounts {@@ -210,11 +215,15 @@ func (s *DockerClientService) GetAllVolumes(ctx context.Context) ([]*volume.Volu}}- volResp, err := dockerClient.VolumeList(apiCtx, volume.ListOptions{})+ volResp, err := dockerClient.VolumeList(apiCtx, client.VolumeListOptions{})if err != nil {return nil, 0, 0, 0, fmt.Errorf("failed to list Docker volumes: %w", err)}- volumes := volResp.Volumes+ volumeItems := volResp.Items+ volumes := make([]*volume.Volume, 0, len(volumeItems))+ for i := range volumeItems {+ volumes = append(volumes, &volumeItems[i])+ }var inuse, unused, total intfor _, v := range volumes {diff --git a/backend/internal/services/docker_client_service_test.go b/backend/internal/services/docker_client_service_test.goindex 06a784ed1..b04d11684 100644--- a/backend/internal/services/docker_client_service_test.go+++ b/backend/internal/services/docker_client_service_test.go@@ -3,8 +3,8 @@ package servicesimport ("testing"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/image"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/image""github.com/stretchr/testify/assert")diff --git a/backend/internal/services/environment_service.go b/backend/internal/services/environment_service.goindex 770b4ee55..a117169d3 100644--- a/backend/internal/services/environment_service.go+++ b/backend/internal/services/environment_service.go@@ -22,6 +22,7 @@ import ("github.com/getarcaneapp/arcane/types/environment""github.com/getarcaneapp/arcane/types/gitops""github.com/google/uuid"+ "github.com/moby/moby/client""gorm.io/gorm")@@ -330,7 +331,7 @@ func (s *EnvironmentService) testLocalDockerConnection(ctx context.Context, id sreturn "offline", fmt.Errorf("failed to connect to Docker: %w", err)}- _, err = dockerClient.Ping(reqCtx)+ _, err = dockerClient.Ping(reqCtx, client.PingOptions{})if err != nil {_ = s.updateEnvironmentStatusInternal(ctx, id, string(models.EnvironmentStatusOffline))return "offline", fmt.Errorf("docker ping failed: %w", err)diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex 68aa0381c..bd6a0b449 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -12,16 +12,16 @@ import ("net/http""strings"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters"- "github.com/docker/docker/api/types/image"- "github.com/docker/docker/api/types/registry""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/types/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/image""github.com/getarcaneapp/arcane/types/vulnerability"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/image"+ "github.com/moby/moby/api/types/registry"+ "github.com/moby/moby/client"ref "go.podman.io/image/v5/docker/reference""golang.org/x/sync/errgroup""gorm.io/gorm"@@ -65,19 +65,20 @@ func (s *ImageService) GetImageDetail(ctx context.Context, id string) (*imagetypg.Go(func() error {var err error- inspect, err = dockerClient.ImageInspect(gctx, id)+ inspectResult, err := dockerClient.ImageInspect(gctx, id)if err != nil {return fmt.Errorf("inspect not found: %w", err)}+ inspect = inspectResult.InspectResponsereturn nil})g.Go(func() error {- imgs, err := dockerClient.ImageList(gctx, image.ListOptions{})+ imageList, err := dockerClient.ImageList(gctx, client.ImageListOptions{})if err != nil {return fmt.Errorf("failed to list images: %w", err)}- for _, img := range imgs {+ for _, img := range imageList.Items {if img.ID == id {listSize = img.Sizebreak@@ -113,7 +114,7 @@ func (s *ImageService) RemoveImage(ctx context.Context, id string, force bool, uimageName = id}- options := image.RemoveOptions{+ options := client.ImageRemoveOptions{Force: force,PruneChildren: true,}@@ -169,7 +170,7 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progresspullOptions, err := s.getPullOptionsWithAuth(ctx, imageName, externalCreds)if err != nil {slog.WarnContext(ctx, "Failed to get registry authentication for image; proceeding without auth", "image", imageName, "error", err.Error())- pullOptions = image.PullOptions{}+ pullOptions = client.ImagePullOptions{}}initialHasAuth := pullOptions.RegistryAuth != ""@@ -179,7 +180,7 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progressif err != nil && shouldRetryAnonymousPullInternal(pullOptions, err) {retriedWithoutAuth = trueslog.WarnContext(ctx, "Docker ImagePull failed with registry auth; retrying anonymously", "image", imageName, "error", err.Error())- pullOptions = image.PullOptions{}+ pullOptions = client.ImagePullOptions{}reader, err = dockerClient.ImagePull(ctx, imageName, pullOptions)}if err != nil {@@ -250,10 +251,10 @@ func (s *ImageService) LoadImageFromReader(ctx context.Context, reader io.Readers.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", fileName, user.ID, user.Username, "0", err, models.JSON{"action": "load", "file": fileName})return nil, fmt.Errorf("failed to load image from tar: %w", err)}- defer func() { _ = loadResp.Body.Close() }()+ defer func() { _ = loadResp.Close() }()var result imagetypes.LoadResult- responseBytes, err := io.ReadAll(loadResp.Body)+ responseBytes, err := io.ReadAll(loadResp)if err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", fileName, user.ID, user.Username, "0", err, models.JSON{"action": "load", "file": fileName, "step": "read_response"})return nil, fmt.Errorf("failed to read load response: %w", err)@@ -291,8 +292,8 @@ func (s *ImageService) ImageExistsLocally(ctx context.Context, imageName string)return false, fmt.Errorf("failed to inspect image %s: %w", imageName, err)}-func (s *ImageService) getPullOptionsWithAuth(ctx context.Context, imageRef string, externalCreds []containerregistry.Credential) (image.PullOptions, error) {- pullOptions := image.PullOptions{}+func (s *ImageService) getPullOptionsWithAuth(ctx context.Context, imageRef string, externalCreds []containerregistry.Credential) (client.ImagePullOptions, error) {+ pullOptions := client.ImagePullOptions{}registryHost := s.extractRegistryHost(imageRef)@@ -422,7 +423,7 @@ func (s *ImageService) normalizeRegistryURL(url string) string {return result}-func shouldRetryAnonymousPullInternal(pullOptions image.PullOptions, pullErr error) bool {+func shouldRetryAnonymousPullInternal(pullOptions client.ImagePullOptions, pullErr error) bool {if pullOptions.RegistryAuth == "" || pullErr == nil {return false}@@ -457,19 +458,20 @@ func (s *ImageService) PruneImages(ctx context.Context, dangling bool) (*image.Preturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- filterArgs := filters.NewArgs()+ filterArgs := make(client.Filters)if dangling {- filterArgs.Add("dangling", "true")+ filterArgs = filterArgs.Add("dangling", "true")} else {- filterArgs.Add("dangling", "false")+ filterArgs = filterArgs.Add("dangling", "false")}- report, err := dockerClient.ImagesPrune(ctx, filterArgs)+ report, err := dockerClient.ImagePrune(ctx, client.ImagePruneOptions{Filters: filterArgs})if err != nil {return nil, fmt.Errorf("failed to prune images: %w", err)}+ pruneReport := report.Report- idsToDelete := getPrunedImageIDsInternal(report)+ idsToDelete := getPrunedImageIDsInternal(pruneReport)s.cleanupImageUpdateRecordsAfterPruneInternal(ctx, idsToDelete)s.cleanupVulnerabilityRecordsAfterPruneInternal(ctx, idsToDelete)s.cleanupOrphanedImageUpdatesAfterPruneInternal(ctx)@@ -477,14 +479,14 @@ func (s *ImageService) PruneImages(ctx context.Context, dangling bool) (*image.Pmetadata := models.JSON{"action": "prune","dangling": dangling,- "imagesDeleted": len(report.ImagesDeleted),- "spaceReclaimed": report.SpaceReclaimed,+ "imagesDeleted": len(pruneReport.ImagesDeleted),+ "spaceReclaimed": pruneReport.SpaceReclaimed,}if logErr := s.eventService.LogImageEvent(ctx, models.EventTypeImageDelete, "", "bulk_prune", systemUser.ID, systemUser.Username, "0", metadata); logErr != nil {slog.Warn("could not log image prune action", "err", logErr)}- return &report, nil+ return &pruneReport, nil}func getPrunedImageIDsInternal(report image.PruneReport) []string {@@ -574,20 +576,22 @@ func (s *ImageService) ListImagesPaginated(ctx context.Context, params paginatio// Fetch Docker imagesg.Go(func() error {var err error- dockerImages, err = dockerClient.ImageList(groupCtx, image.ListOptions{})+ imageList, err := dockerClient.ImageList(groupCtx, client.ImageListOptions{})if err != nil {return fmt.Errorf("failed to list Docker images: %w", err)}+ dockerImages = imageList.Itemsreturn nil})// Fetch containers to determine usageg.Go(func() error {var err error- containers, err = dockerClient.ContainerList(groupCtx, container.ListOptions{All: true})+ containerList, err := dockerClient.ContainerList(groupCtx, client.ContainerListOptions{All: true})if err != nil {return fmt.Errorf("failed to list containers: %w", err)}+ containers = containerList.Itemsreturn nil})@@ -647,13 +651,13 @@ func (s *ImageService) GetTotalImageSize(ctx context.Context) (int64, error) {return 0, fmt.Errorf("failed to connect to Docker: %w", err)}- images, err := dockerClient.ImageList(ctx, image.ListOptions{})+ imageList, err := dockerClient.ImageList(ctx, client.ImageListOptions{})if err != nil {return 0, fmt.Errorf("failed to list images: %w", err)}var total int64- for _, img := range images {+ for _, img := range imageList.Items {total += img.Size}diff --git a/backend/internal/services/image_service_test.go b/backend/internal/services/image_service_test.goindex 964e6f1f1..570c053ef 100644--- a/backend/internal/services/image_service_test.go+++ b/backend/internal/services/image_service_test.go@@ -11,14 +11,14 @@ import ("github.com/stretchr/testify/require""gorm.io/gorm"- "github.com/docker/docker/api/types/image"- dockerregistry "github.com/docker/docker/api/types/registry""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/crypto"imagetypes "github.com/getarcaneapp/arcane/types/image""github.com/getarcaneapp/arcane/types/vulnerability"+ dockerregistry "github.com/moby/moby/api/types/registry"+ "github.com/moby/moby/client""github.com/stretchr/testify/assert")@@ -135,13 +135,13 @@ func TestGetPullOptionsWithAuth_DBRegistryUsesValidCredentials(t *testing.T) {func TestShouldRetryAnonymousPullInternal_UnauthorizedWithAuth(t *testing.T) {err := errors.New(`Error response from daemon: Head "registry-1.docker.io/v2/library/nginx/manifests/latest": unauthorized: incorrect username or password`)- assert.True(t, shouldRetryAnonymousPullInternal(image.PullOptions{RegistryAuth: "encoded-auth"}, err))+ assert.True(t, shouldRetryAnonymousPullInternal(client.ImagePullOptions{RegistryAuth: "encoded-auth"}, err))}func TestShouldRetryAnonymousPullInternal_SkipsRetryWithoutUnauthorizedOrAuth(t *testing.T) {nonAuthErr := errors.New("Error response from daemon: i/o timeout")unauthorizedErr := errors.New("unauthorized: authentication required")- assert.False(t, shouldRetryAnonymousPullInternal(image.PullOptions{RegistryAuth: "encoded-auth"}, nonAuthErr))- assert.False(t, shouldRetryAnonymousPullInternal(image.PullOptions{}, unauthorizedErr))+ assert.False(t, shouldRetryAnonymousPullInternal(client.ImagePullOptions{RegistryAuth: "encoded-auth"}, nonAuthErr))+ assert.False(t, shouldRetryAnonymousPullInternal(client.ImagePullOptions{}, unauthorizedErr))}diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.goindex 6d906df15..872021357 100644--- a/backend/internal/services/image_update_service.go+++ b/backend/internal/services/image_update_service.go@@ -9,13 +9,14 @@ import ("sync""time"- "github.com/docker/docker/api/types/image""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/crypto"registry "github.com/getarcaneapp/arcane/backend/internal/utils/registry""github.com/getarcaneapp/arcane/types/containerregistry""github.com/getarcaneapp/arcane/types/imageupdate"+ "github.com/moby/moby/api/types/image"+ "github.com/moby/moby/client"ref "go.podman.io/image/v5/docker/reference""golang.org/x/sync/errgroup""gorm.io/gorm"@@ -365,12 +366,12 @@ func (s *ImageUpdateService) getAllImageRefsInternal(ctx context.Context, limitreturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- images, err := dockerClient.ImageList(ctx, image.ListOptions{})+ imageList, err := dockerClient.ImageList(ctx, client.ImageListOptions{})if err != nil {return nil, fmt.Errorf("failed to list Docker images: %w", err)}- return dedupeImageRefsFromSummariesInternal(images, limit), nil+ return dedupeImageRefsFromSummariesInternal(imageList.Items, limit), nil}func dedupeImageRefsFromSummariesInternal(images []image.Summary, limit int) []string {@@ -430,7 +431,7 @@ func (s *ImageUpdateService) inspectLocalImageSnapshotInternal(ctx context.ConteallDigests = []string{primaryDigest}}- repo, tag := extractRepoAndTagFromImage(inspectResponse)+ repo, tag := extractRepoAndTagFromImage(inspectResponse.InspectResponse)return &localImageSnapshot{ImageID: inspectResponse.ID,@@ -626,7 +627,7 @@ func (s *ImageUpdateService) saveUpdateResultByIDInternal(ctx context.Context, ireturn fmt.Errorf("failed to inspect image: %w", err)}- repo, tag := extractRepoAndTagFromImage(dockerImage)+ repo, tag := extractRepoAndTagFromImage(dockerImage.InspectResponse)return s.savePreparedUpdateResultInternal(ctx, imageID, repo, tag, result)}@@ -1116,10 +1117,11 @@ func (s *ImageUpdateService) CleanupOrphanedRecords(ctx context.Context) error {}// Get all image IDs from Docker- dockerImages, err := dockerClient.ImageList(ctx, image.ListOptions{})+ dockerImagesResult, err := dockerClient.ImageList(ctx, client.ImageListOptions{})if err != nil {return fmt.Errorf("failed to list Docker images: %w", err)}+ dockerImages := dockerImagesResult.ItemsdockerImageIDs := make([]string, 0, len(dockerImages))for _, img := range dockerImages {@@ -1150,10 +1152,11 @@ func (s *ImageUpdateService) GetUpdateSummary(ctx context.Context) (*imageupdatereturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- dockerImages, err := dockerClient.ImageList(ctx, image.ListOptions{})+ dockerImagesResult, err := dockerClient.ImageList(ctx, client.ImageListOptions{})if err != nil {return nil, fmt.Errorf("failed to list Docker images: %w", err)}+ dockerImages := dockerImagesResult.ItemsliveImageIDs := make([]string, 0, len(dockerImages))for _, img := range dockerImages {diff --git a/backend/internal/services/image_update_service_test.go b/backend/internal/services/image_update_service_test.goindex 51ba9d0a0..2da670cc6 100644--- a/backend/internal/services/image_update_service_test.go+++ b/backend/internal/services/image_update_service_test.go@@ -6,7 +6,6 @@ import ("testing""time"- dockertypesimage "github.com/docker/docker/api/types/image""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"@@ -14,6 +13,7 @@ import ("github.com/getarcaneapp/arcane/types/containerregistry""github.com/getarcaneapp/arcane/types/imageupdate"glsqlite "github.com/glebarez/sqlite"+ dockertypesimage "github.com/moby/moby/api/types/image""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"ref "go.podman.io/image/v5/docker/reference"diff --git a/backend/internal/services/network_service.go b/backend/internal/services/network_service.goindex 072b7e9b0..257ef1fb5 100644--- a/backend/internal/services/network_service.go+++ b/backend/internal/services/network_service.go@@ -5,14 +5,14 @@ import ("fmt""strings"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters"- "github.com/docker/docker/api/types/network""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"dockerutil "github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/internal/utils/pagination"networktypes "github.com/getarcaneapp/arcane/types/network"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/network"+ "github.com/moby/moby/client")type NetworkService struct {@@ -35,15 +35,16 @@ func (s *NetworkService) GetNetworkByID(ctx context.Context, id string) (*networreturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- networkInspect, err := dockerClient.NetworkInspect(ctx, id, network.InspectOptions{})+ networkInspect, err := dockerClient.NetworkInspect(ctx, id, client.NetworkInspectOptions{})if err != nil {return nil, fmt.Errorf("network not found: %w", err)}- return &networkInspect, nil+ inspect := networkInspect.Network+ return &inspect, nil}-func (s *NetworkService) CreateNetwork(ctx context.Context, name string, options network.CreateOptions, user models.User) (*network.CreateResponse, error) {+func (s *NetworkService) CreateNetwork(ctx context.Context, name string, options client.NetworkCreateOptions, user models.User) (*network.CreateResponse, error) {dockerClient, err := s.dockerService.GetClient()if err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeNetworkError, "network", "", name, user.ID, user.Username, "0", err, models.JSON{"action": "create", "driver": options.Driver})@@ -65,7 +66,17 @@ func (s *NetworkService) CreateNetwork(ctx context.Context, name string, optionsfmt.Printf("Could not log network creation action: %s\n", logErr)}- return &response, nil+ warning := ""+ if len(response.Warning) > 0 {+ warning = strings.Join(response.Warning, "; ")+ }++ out := network.CreateResponse{+ ID: response.ID,+ Warning: warning,+ }++ return &out, nil}func (s *NetworkService) RemoveNetwork(ctx context.Context, id string, user models.User) error {@@ -75,15 +86,15 @@ func (s *NetworkService) RemoveNetwork(ctx context.Context, id string, user modereturn fmt.Errorf("failed to connect to Docker: %w", err)}- networkInfo, err := dockerClient.NetworkInspect(ctx, id, network.InspectOptions{})+ networkInfo, err := dockerClient.NetworkInspect(ctx, id, client.NetworkInspectOptions{})var networkName stringif err == nil {- networkName = networkInfo.Name+ networkName = networkInfo.Network.Name} else {networkName = id}- if err := dockerClient.NetworkRemove(ctx, id); err != nil {+ if _, err := dockerClient.NetworkRemove(ctx, id, client.NetworkRemoveOptions{}); err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeNetworkError, "network", id, networkName, user.ID, user.Username, "0", err, models.JSON{"action": "delete"})return fmt.Errorf("failed to remove network: %w", err)}@@ -105,22 +116,23 @@ func (s *NetworkService) PruneNetworks(ctx context.Context) (*network.PruneReporreturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- filterArgs := filters.NewArgs()+ filterArgs := make(client.Filters)- report, err := dockerClient.NetworksPrune(ctx, filterArgs)+ report, err := dockerClient.NetworkPrune(ctx, client.NetworkPruneOptions{Filters: filterArgs})if err != nil {return nil, fmt.Errorf("failed to prune networks: %w", err)}+ pruneReport := report.Reportmetadata := models.JSON{"action": "prune",- "networksDeleted": len(report.NetworksDeleted),+ "networksDeleted": len(pruneReport.NetworksDeleted),}if logErr := s.eventService.LogNetworkEvent(ctx, models.EventTypeNetworkDelete, "", "bulk_prune", systemUser.ID, systemUser.Username, "0", metadata); logErr != nil {fmt.Printf("Could not log network prune action: %s\n", logErr)}- return &report, nil+ return &pruneReport, nil}func (s *NetworkService) ListNetworksPaginated(ctx context.Context, params pagination.QueryParams) ([]networktypes.Summary, pagination.Response, networktypes.UsageCounts, error) {@@ -129,17 +141,19 @@ func (s *NetworkService) ListNetworksPaginated(ctx context.Context, params paginreturn nil, pagination.Response{}, networktypes.UsageCounts{}, fmt.Errorf("failed to connect to Docker: %w", err)}- containers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})+ containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})if err != nil {return nil, pagination.Response{}, networktypes.UsageCounts{}, fmt.Errorf("failed to list containers: %w", err)}+ containers := containerList.ItemsinUseByID, inUseByName := s.buildNetworkUsageMaps(containers)- rawNets, err := dockerClient.NetworkList(ctx, network.ListOptions{})+ networkList, err := dockerClient.NetworkList(ctx, client.NetworkListOptions{})if err != nil {return nil, pagination.Response{}, networktypes.UsageCounts{}, fmt.Errorf("failed to list Docker networks: %w", err)}+ rawNets := networkList.Itemsitems := s.convertToNetworkSummaries(rawNets, inUseByID, inUseByName)config := s.buildNetworkPaginationConfig()diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 496e9b7ab..796b46e85 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -15,7 +15,6 @@ import ("github.com/compose-spec/compose-go/v2/loader"composetypes "github.com/compose-spec/compose-go/v2/types""github.com/docker/compose/v5/pkg/api"- "github.com/docker/docker/api/types/container""github.com/getarcaneapp/arcane/backend/internal/common""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"@@ -29,6 +28,7 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/projects""github.com/getarcaneapp/arcane/types/containerregistry""github.com/getarcaneapp/arcane/types/project"+ "github.com/moby/moby/api/types/container""gorm.io/gorm")@@ -298,7 +298,7 @@ func (s *ProjectService) GetProjectServices(ctx context.Context, projectID strinfor _, c := range containers {var health *stringif c.Health != "" {- health = new(c.Health)+ health = new(string(c.Health))}var svcConfig *composetypes.ServiceConfig@@ -309,7 +309,7 @@ func (s *ProjectService) GetProjectServices(ctx context.Context, projectID strinservices = append(services, ProjectServiceInfo{Name: c.Service,Image: c.Image,- Status: c.State,+ Status: string(c.State),ContainerID: c.ID,ContainerName: c.Name,Ports: formatPorts(c.Publishers),@@ -611,7 +611,7 @@ func formatPorts(publishers []api.PortPublisher) []string {return ports}-func formatDockerPorts(ports []container.Port) []string {+func formatDockerPorts(ports []container.PortSummary) []string {var res []stringfor _, p := range ports {if p.PublicPort == 0 {@@ -713,7 +713,7 @@ func (s *ProjectService) GetProjectStatusCounts(ctx context.Context) (folderCounvar services []ProjectServiceInfofor _, c := range projectContainers {services = append(services, ProjectServiceInfo{- Status: c.State,+ Status: string(c.State),})}@@ -1623,7 +1623,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, p models.Project,services = append(services, ProjectServiceInfo{Name: svcName,Image: c.Image,- Status: state,+ Status: string(state),ContainerID: c.ID,ContainerName: containerName,Ports: formatDockerPorts(c.Ports),diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex 8ef8b1460..e7cf4683e 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -8,8 +8,8 @@ import ("time"composetypes "github.com/compose-spec/compose-go/v2/types"- "github.com/docker/docker/api/types/container"glsqlite "github.com/glebarez/sqlite"+ "github.com/moby/moby/api/types/container""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""gorm.io/gorm"@@ -193,26 +193,26 @@ func TestProjectService_IncrementStatusCounts(t *testing.T) {func TestProjectService_FormatDockerPorts(t *testing.T) {tests := []struct {name string- input []container.Port+ input []container.PortSummaryexpected []string}{{name: "public port",- input: []container.Port{+ input: []container.PortSummary{{PublicPort: 8080, PrivatePort: 80, Type: "tcp"},},expected: []string{"8080:80/tcp"},},{name: "private only",- input: []container.Port{+ input: []container.PortSummary{{PrivatePort: 80, Type: "tcp"},},expected: []string{"80/tcp"},},{name: "empty",- input: []container.Port{},+ input: []container.PortSummary{},expected: nil,},}diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.goindex 46759e396..3de0ff82a 100644--- a/backend/internal/services/system_service.go+++ b/backend/internal/services/system_service.go@@ -8,9 +8,6 @@ import ("strings""sync"- "github.com/docker/docker/api/types/build"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/arcaneupdater"@@ -18,6 +15,8 @@ import (containertypes "github.com/getarcaneapp/arcane/types/container""github.com/getarcaneapp/arcane/types/system""github.com/goccy/go-yaml"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/client""golang.org/x/sync/errgroup")@@ -271,16 +270,16 @@ func (s *SystemService) pruneContainers(ctx context.Context, result *system.Prunreturn fmt.Errorf("failed to connect to Docker: %w", err)}- filterArgs := filters.NewArgs()+ filterArgs := make(client.Filters)- report, err := dockerClient.ContainersPrune(ctx, filterArgs)+ report, err := dockerClient.ContainerPrune(ctx, client.ContainerPruneOptions{Filters: filterArgs})if err != nil {return fmt.Errorf("failed to prune containers: %w", err)}- result.ContainersPruned = report.ContainersDeleted- result.SpaceReclaimed += report.SpaceReclaimed- result.ContainerSpaceReclaimed += report.SpaceReclaimed+ result.ContainersPruned = report.Report.ContainersDeleted+ result.SpaceReclaimed += report.Report.SpaceReclaimed+ result.ContainerSpaceReclaimed += report.Report.SpaceReclaimedreturn nil}@@ -292,26 +291,28 @@ func (s *SystemService) pruneImages(ctx context.Context, danglingOnly bool, resureturn fmt.Errorf("failed to connect to Docker: %w", err)}- var filterArgs filters.Args+ var filterArgs client.Filtersif danglingOnly {slog.DebugContext(ctx, "Configured to prune only dangling images")- filterArgs = filters.NewArgs(filters.Arg("dangling", "true"))+ filterArgs = make(client.Filters)+ filterArgs = filterArgs.Add("dangling", "true")} else {slog.DebugContext(ctx, "Configured to prune all unused images (including non-dangling)")- filterArgs = filters.NewArgs(filters.Arg("dangling", "false"))+ filterArgs = make(client.Filters)+ filterArgs = filterArgs.Add("dangling", "false")}- report, err := dockerClient.ImagesPrune(ctx, filterArgs)+ report, err := dockerClient.ImagePrune(ctx, client.ImagePruneOptions{Filters: filterArgs})if err != nil {return fmt.Errorf("failed to prune images: %w", err)}- slog.InfoContext(ctx, "Image pruning completed", "images_deleted", len(report.ImagesDeleted), "bytes_reclaimed", report.SpaceReclaimed)+ slog.InfoContext(ctx, "Image pruning completed", "images_deleted", len(report.Report.ImagesDeleted), "bytes_reclaimed", report.Report.SpaceReclaimed)// Collect IDs to delete from DBvar idsToDelete []string- for _, imgReport := range report.ImagesDeleted {+ for _, imgReport := range report.Report.ImagesDeleted {if imgReport.Deleted != "" {idsToDelete = append(idsToDelete, imgReport.Deleted)} else if imgReport.Untagged != "" {@@ -327,8 +328,8 @@ func (s *SystemService) pruneImages(ctx context.Context, danglingOnly bool, resu}result.ImagesDeleted = idsToDelete- result.SpaceReclaimed += report.SpaceReclaimed- result.ImageSpaceReclaimed += report.SpaceReclaimed+ result.SpaceReclaimed += report.Report.SpaceReclaimed+ result.ImageSpaceReclaimed += report.Report.SpaceReclaimedreturn nil}@@ -340,7 +341,7 @@ func (s *SystemService) pruneBuildCache(ctx context.Context, result *system.Prunreturn fmt.Errorf("failed to connect to Docker for build cache prune: %w", err)}- options := build.CachePruneOptions{+ options := client.BuildCachePruneOptions{All: pruneAllCache,}@@ -352,10 +353,10 @@ func (s *SystemService) pruneBuildCache(ctx context.Context, result *system.Prunreturn fmt.Errorf("failed to prune build cache: %w", err)}- slog.InfoContext(ctx, "build cache pruning completed", "cache_entries_deleted", len(report.CachesDeleted), "bytes_reclaimed", report.SpaceReclaimed)+ slog.InfoContext(ctx, "build cache pruning completed", "cache_entries_deleted", len(report.Report.CachesDeleted), "bytes_reclaimed", report.Report.SpaceReclaimed)- result.SpaceReclaimed += report.SpaceReclaimed- result.BuildCacheSpaceReclaimed += report.SpaceReclaimed+ result.SpaceReclaimed += report.Report.SpaceReclaimed+ result.BuildCacheSpaceReclaimed += report.Report.SpaceReclaimedreturn nil}diff --git a/backend/internal/services/system_upgrade_service.go b/backend/internal/services/system_upgrade_service.goindex 394161374..2fad9a1dd 100644--- a/backend/internal/services/system_upgrade_service.go+++ b/backend/internal/services/system_upgrade_service.go@@ -11,13 +11,12 @@ import ("sync/atomic""time"- containertypes "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters"- imagetypes "github.com/docker/docker/api/types/image"- mounttypes "github.com/docker/docker/api/types/mount""github.com/getarcaneapp/arcane/backend/internal/models"dockerutils "github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts"+ containertypes "github.com/moby/moby/api/types/container"+ mounttypes "github.com/moby/moby/api/types/mount"+ "github.com/moby/moby/client")var (@@ -138,7 +137,7 @@ func (s *SystemUpgradeService) TriggerUpgradeViaCLI(ctx context.Context, user mopullCtx, pullCancel := timeouts.WithTimeout(ctx, settings.DockerImagePullTimeout.AsInt(), timeouts.DefaultDockerImagePull)defer pullCancel()- pullReader, err := dockerClient.ImagePull(pullCtx, ArcaneUpgraderImage, imagetypes.PullOptions{})+ pullReader, err := dockerClient.ImagePull(pullCtx, ArcaneUpgraderImage, client.ImagePullOptions{})if err != nil {if errors.Is(pullCtx.Err(), context.DeadlineExceeded) {return fmt.Errorf("upgrader image pull timed out for %s (increase DOCKER_IMAGE_PULL_TIMEOUT or setting)", ArcaneUpgraderImage)@@ -189,14 +188,18 @@ func (s *SystemUpgradeService) TriggerUpgradeViaCLI(ctx context.Context, user mocontainerName = fmt.Sprintf("%s-upgrader-%d", containerName, time.Now().Unix())- resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, nil, nil, containerName)+ resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: config,+ HostConfig: hostConfig,+ Name: containerName,+ })if err != nil {return fmt.Errorf("create upgrader container: %w", err)}// Start the upgrader container - it will run the upgrade and auto-remove- if err := dockerClient.ContainerStart(ctx, resp.ID, containertypes.StartOptions{}); err != nil {- _ = dockerClient.ContainerRemove(ctx, resp.ID, containertypes.RemoveOptions{Force: true})+ if _, err := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, client.ContainerRemoveOptions{Force: true})return fmt.Errorf("start upgrader container: %w", err)}@@ -222,16 +225,16 @@ func (s *SystemUpgradeService) findArcaneContainer(ctx context.Context, containe}// Try to inspect the container directly- container, err := dockerClient.ContainerInspect(ctx, containerId)+ container, err := dockerClient.ContainerInspect(ctx, containerId, client.ContainerInspectOptions{})if err == nil {- return container, nil+ return container.Container, nil}// Fallback: search for containers with arcane image- filter := filters.NewArgs()- filter.Add("ancestor", "ghcr.io/getarcaneapp/arcane")+ filter := make(client.Filters)+ filter = filter.Add("ancestor", "ghcr.io/getarcaneapp/arcane")- containers, err := dockerClient.ContainerList(ctx, containertypes.ListOptions{+ containers, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true,Filters: filter,})@@ -239,21 +242,29 @@ func (s *SystemUpgradeService) findArcaneContainer(ctx context.Context, containereturn containertypes.InspectResponse{}, err}- for _, c := range containers {+ for _, c := range containers.Items {if strings.HasPrefix(c.ID, containerId) {- return dockerClient.ContainerInspect(ctx, c.ID)+ inspect, inspectErr := dockerClient.ContainerInspect(ctx, c.ID, client.ContainerInspectOptions{})+ if inspectErr != nil {+ return containertypes.InspectResponse{}, inspectErr+ }+ return inspect.Container, nil}}// Try without filter - search all containers- allContainers, err := dockerClient.ContainerList(ctx, containertypes.ListOptions{All: true})+ allContainers, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})if err != nil {return containertypes.InspectResponse{}, err}- for _, c := range allContainers {+ for _, c := range allContainers.Items {if strings.HasPrefix(c.ID, containerId) || c.ID == containerId {- return dockerClient.ContainerInspect(ctx, c.ID)+ inspect, inspectErr := dockerClient.ContainerInspect(ctx, c.ID, client.ContainerInspectOptions{})+ if inspectErr != nil {+ return containertypes.InspectResponse{}, inspectErr+ }+ return inspect.Container, nil}}diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex fea7690ab..67bfd364c 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -12,11 +12,9 @@ import ("time""github.com/compose-spec/compose-go/v2/loader"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters"- "github.com/docker/docker/api/types/image"- "github.com/docker/docker/api/types/network"- "github.com/docker/docker/client"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/network"+ "github.com/moby/moby/client""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"@@ -400,10 +398,13 @@ func (s *UpdaterService) UpdateSingleContainer(ctx context.Context, containerID}// Get container info- containers, err := dcli.ContainerList(ctx, container.ListOptions{All: true, Filters: filters.NewArgs(filters.Arg("id", containerID))})+ containerFilters := make(client.Filters)+ containerFilters = containerFilters.Add("id", containerID)+ containerList, err := dcli.ContainerList(ctx, client.ContainerListOptions{All: true, Filters: containerFilters})if err != nil {return nil, fmt.Errorf("list containers: %w", err)}+ containers := containerList.Itemsvar targetContainer *container.Summaryif len(containers) > 0 {@@ -418,7 +419,7 @@ func (s *UpdaterService) UpdateSingleContainer(ctx context.Context, containerIDslog.InfoContext(ctx, "UpdateSingleContainer: found container", "containerID", containerID, "name", containerName, "image", targetContainer.Image)// Inspect container to get full config (needed for label-based controls)- inspectBefore, err := dcli.ContainerInspect(ctx, targetContainer.ID)+ inspectBeforeResult, err := dcli.ContainerInspect(ctx, targetContainer.ID, client.ContainerInspectOptions{})if err != nil {out.Items = append(out.Items, updater.ResourceResult{ResourceID: targetContainer.ID,@@ -431,6 +432,7 @@ func (s *UpdaterService) UpdateSingleContainer(ctx context.Context, containerIDout.Duration = time.Since(start).String()return out, nil}+ inspectBefore := inspectBeforeResult.Containerlabels := map[string]string{}if inspectBefore.Config != nil && inspectBefore.Config.Labels != nil {@@ -661,7 +663,7 @@ func (s *UpdaterService) pruneImageIDsWithInUseSetInternal(ctx context.Context,continue}- if _, err := dcli.ImageRemove(ctx, id, image.RemoveOptions{PruneChildren: true}); err != nil {+ if _, err := dcli.ImageRemove(ctx, id, client.ImageRemoveOptions{PruneChildren: true}); err != nil {slog.Warn("image remove failed", "imageId", id, "err", err)continue}@@ -717,21 +719,21 @@ func (s *UpdaterService) updateContainer(ctx context.Context, cnt container.Summ// Get custom stop signal if configuredstopSignal := arcaneupdater.GetStopSignal(labels)- stopOpts := container.StopOptions{}+ stopOpts := client.ContainerStopOptions{}if stopSignal != "" {stopOpts.Signal = stopSignalslog.DebugContext(ctx, "updateContainer: using custom stop signal", "signal", stopSignal)}// Stop the container- if err := dcli.ContainerStop(ctx, cnt.ID, stopOpts); err != nil {+ if _, err := dcli.ContainerStop(ctx, cnt.ID, stopOpts); err != nil {slog.DebugContext(ctx, "updateContainer: stop failed", "containerId", cnt.ID, "err", err)return fmt.Errorf("stop: %w", err)}_ = s.eventService.LogContainerEvent(ctx, models.EventTypeContainerStop, cnt.ID, name, systemUser.ID, systemUser.Username, "0", models.JSON{"action": "updater_stop"})// Remove the container- if err := dcli.ContainerRemove(ctx, cnt.ID, container.RemoveOptions{}); err != nil {+ if _, err := dcli.ContainerRemove(ctx, cnt.ID, client.ContainerRemoveOptions{}); err != nil {slog.DebugContext(ctx, "updateContainer: remove failed", "containerId", cnt.ID, "err", err)return fmt.Errorf("remove: %w", err)}@@ -783,14 +785,19 @@ func (s *UpdaterService) updateContainer(ctx context.Context, cnt container.Summ// Use original name for new containercontainerName := strings.TrimPrefix(originalName, "/")- resp, err := dcli.ContainerCreate(ctx, cfg, inspect.HostConfig, networkingConfig, nil, containerName)+ resp, err := dcli.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: cfg,+ HostConfig: inspect.HostConfig,+ NetworkingConfig: networkingConfig,+ Name: containerName,+ })if err != nil {slog.DebugContext(ctx, "updateContainer: create failed", "containerName", containerName, "err", err)return fmt.Errorf("create: %w", err)}_ = s.eventService.LogContainerEvent(ctx, models.EventTypeContainerCreate, resp.ID, name, systemUser.ID, systemUser.Username, "0", models.JSON{"action": "updater_create", "newImageId": resp.ID})- if err := dcli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {+ if _, err := dcli.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {slog.DebugContext(ctx, "updateContainer: start failed", "newContainerId", resp.ID, "err", err)return fmt.Errorf("start: %w", err)}@@ -854,10 +861,11 @@ func (s *UpdaterService) collectUsedImagesFromContainersInternal(ctx context.Conif dcli == nil {return nil}- list, err := dcli.ContainerList(ctx, container.ListOptions{All: false})+ listResult, err := dcli.ContainerList(ctx, client.ContainerListOptions{All: false})if err != nil {return err}+ list := listResult.Itemsslog.DebugContext(ctx, "collectUsedImagesFromContainersInternal: container list fetched", "count", len(list))for _, c := range list {if arcaneupdater.IsUpdateDisabled(c.Labels) {@@ -871,11 +879,12 @@ func (s *UpdaterService) collectUsedImagesFromContainersInternal(ctx context.Concontinue}- inspect, err := dcli.ContainerInspect(ctx, c.ID)+ inspectResult, err := dcli.ContainerInspect(ctx, c.ID, client.ContainerInspectOptions{})if err != nil {slog.DebugContext(ctx, "collectUsedImagesFromContainersInternal: container inspect failed", "containerId", c.ID, "err", err)continue}+ inspect := inspectResult.Containerif inspect.Config != nil && arcaneupdater.IsUpdateDisabled(inspect.Config.Labels) {slog.DebugContext(ctx, "collectUsedImagesFromContainersInternal: container inspect labels opted out", "containerId", c.ID)continue@@ -1103,10 +1112,11 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDreturn nil, fmt.Errorf("docker connect: %w", err)}- list, err := dcli.ContainerList(ctx, container.ListOptions{All: false})+ listResult, err := dcli.ContainerList(ctx, client.ContainerListOptions{All: false})if err != nil {return nil, fmt.Errorf("list containers: %w", err)}+ list := listResult.Itemsslog.DebugContext(ctx, "restartContainersUsingOldIDs: scanning containers for matching images", "containers", len(list), "oldIDMatches", len(oldIDToNewRef), "oldRefMatches", len(oldRefToNewRef))// Parse excluded containers settings@@ -1201,10 +1211,11 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDif len(markedForRestart) > 0 {for i := range containersWithDeps {cwd := containersWithDeps[i]- inspect, ierr := dcli.ContainerInspect(ctx, cwd.Container.ID)+ inspectResult, ierr := dcli.ContainerInspect(ctx, cwd.Container.ID, client.ContainerInspectOptions{})if ierr != nil {continue}+ inspect := inspectResult.ContainercontainersWithDeps[i] = arcaneupdater.ExtractContainerDeps(ctx, dcli, cwd.Container, inspect)if p, ok := plansByName[containersWithDeps[i].Name]; ok {@@ -1262,7 +1273,7 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDname := cd.Namelabels := map[string]string{}if p.inspect == nil {- inspect, ierr := dcli.ContainerInspect(ctx, p.cnt.ID)+ inspectResult, ierr := dcli.ContainerInspect(ctx, p.cnt.ID, client.ContainerInspectOptions{})if ierr != nil {res := updater.ResourceResult{ResourceID: p.cnt.ID,@@ -1274,6 +1285,7 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDresults = append(results, res)continue}+ inspect := inspectResult.ContainerinspectCopy := inspectp.inspect = &inspectCopy}@@ -1552,15 +1564,17 @@ func (s *UpdaterService) anyImageIDsStillInUse(ctx context.Context, ids []stringreturn false, fmt.Errorf("docker connect: %w", err)}- list, err := dcli.ContainerList(ctx, container.ListOptions{All: false})+ listResult, err := dcli.ContainerList(ctx, client.ContainerListOptions{All: false})if err != nil {return false, fmt.Errorf("list containers: %w", err)}+ list := listResult.Itemsfor _, c := range list {- inspect, ierr := dcli.ContainerInspect(ctx, c.ID)+ inspectResult, ierr := dcli.ContainerInspect(ctx, c.ID, client.ContainerInspectOptions{})if ierr != nil {continue}+ inspect := inspectResult.Containerif _, ok := set[inspect.Image]; ok {slog.DebugContext(ctx, "anyImageIDsStillInUse: image still used by container", "imageId", inspect.Image, "containerId", c.ID)return true, nil@@ -1599,10 +1613,11 @@ func (s *UpdaterService) buildRunningImageIDSetInternal(ctx context.Context) (mareturn nil, fmt.Errorf("docker connect: %w", err)}- list, err := dcli.ContainerList(ctx, container.ListOptions{All: false})+ listResult, err := dcli.ContainerList(ctx, client.ContainerListOptions{All: false})if err != nil {return nil, fmt.Errorf("list containers: %w", err)}+ list := listResult.ItemsinUseSet := make(map[string]struct{}, len(list))for _, c := range list {@@ -1611,7 +1626,8 @@ func (s *UpdaterService) buildRunningImageIDSetInternal(ctx context.Context) (macontinue}- inspect, ierr := dcli.ContainerInspect(ctx, c.ID)+ inspectResult, ierr := dcli.ContainerInspect(ctx, c.ID, client.ContainerInspectOptions{})+ inspect := inspectResult.Containerif ierr == nil && inspect.Image != "" {inUseSet[inspect.Image] = struct{}{}}diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.goindex 9a2d11190..632c7b738 100644--- a/backend/internal/services/updater_service_test.go+++ b/backend/internal/services/updater_service_test.go@@ -6,10 +6,10 @@ import ("testing""time"- "github.com/docker/docker/api/types/container""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/database"glsqlite "github.com/glebarez/sqlite"+ "github.com/moby/moby/api/types/container""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""gorm.io/gorm"diff --git a/backend/internal/services/version_service.go b/backend/internal/services/version_service.goindex 14fa69df3..95593d4aa 100644--- a/backend/internal/services/version_service.go+++ b/backend/internal/services/version_service.go@@ -10,15 +10,14 @@ import ("strings""time"- containertypes "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters"- "github.com/docker/docker/client""github.com/getarcaneapp/arcane/backend/buildables""github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/internal/utils/arcaneupdater""github.com/getarcaneapp/arcane/backend/internal/utils/cache""github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/types/version"+ containertypes "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/client"ref "go.podman.io/image/v5/docker/reference""golang.org/x/mod/semver")@@ -294,11 +293,12 @@ func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (tag string}slog.Debug("detectCurrentImageInfo: detected container", "containerId", containerId)- container, err := dockerClient.ContainerInspect(ctx, containerId)+ inspectResult, err := dockerClient.ContainerInspect(ctx, containerId, client.ContainerInspectOptions{})if err != nil {slog.Debug("detectCurrentImageInfo: failed to inspect container", "containerId", containerId, "error", err)return "", "", ""}+ container := inspectResult.Container// Parse tag from container config image (user-specified reference)tag = s.extractTagFromImageRef(container.Config.Image)@@ -329,17 +329,17 @@ func (s *VersionService) detectContainerID(ctx context.Context, dockerClient *cl// findArcaneContainerByLabel searches for the Arcane container using labelsfunc (s *VersionService) findArcaneContainerByLabel(ctx context.Context, dockerClient *client.Client) string {- f := filters.NewArgs()- f.Add("label", arcaneupdater.LabelArcane+"=true")- list, err := dockerClient.ContainerList(ctx, containertypes.ListOptions{All: true, Filters: f})+ f := make(client.Filters)+ f = f.Add("label", arcaneupdater.LabelArcane+"=true")+ list, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true, Filters: f})if err != nil {slog.Debug("findArcaneContainerByLabel: failed to list containers", "error", err)return ""}- slog.Debug("findArcaneContainerByLabel: found containers with arcane label", "count", len(list))+ slog.Debug("findArcaneContainerByLabel: found containers with arcane label", "count", len(list.Items))var fallbackID string- for _, c := range list {+ for _, c := range list.Items {slog.Debug("findArcaneContainerByLabel: checking container", "id", c.ID[:12], "state", c.State, "labels", c.Labels)// Skip the upgrader helper containerif v, ok := c.Labels["com.getarcaneapp.arcane.upgrader"]; ok && strings.EqualFold(strings.TrimSpace(v), "true") {@@ -347,7 +347,7 @@ func (s *VersionService) findArcaneContainerByLabel(ctx context.Context, dockerCcontinue}// Prefer running containers- if strings.EqualFold(strings.TrimSpace(c.State), "running") {+ if c.State == containertypes.StateRunning {slog.Debug("findArcaneContainerByLabel: found running container", "id", c.ID[:12])return c.ID}diff --git a/backend/internal/services/volume_service.go b/backend/internal/services/volume_service.goindex 302de218b..6d3c1218b 100644--- a/backend/internal/services/volume_service.go+++ b/backend/internal/services/volume_service.go@@ -17,20 +17,19 @@ import ("sync""time"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters"- "github.com/docker/docker/api/types/mount"- "github.com/docker/docker/api/types/volume"- "github.com/docker/docker/client"- "github.com/docker/docker/pkg/stdcopy""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/docker""github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts""github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/stdcopy"volumetypes "github.com/getarcaneapp/arcane/types/volume""github.com/google/uuid"+ "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")type VolumeService struct {@@ -71,7 +70,8 @@ func (s *VolumeService) GetVolumeByName(ctx context.Context, name string) (*volureturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- vol, err := dockerClient.VolumeInspect(ctx, name)+ volResult, err := dockerClient.VolumeInspect(ctx, name, client.VolumeInspectOptions{})+ vol := volResult.Volumeif err != nil {return nil, fmt.Errorf("volume not found: %w", err)}@@ -103,7 +103,7 @@ func (s *VolumeService) GetVolumeByName(ctx context.Context, name string) (*volureturn &v, nil}-func (s *VolumeService) CreateVolume(ctx context.Context, options volume.CreateOptions, user models.User) (*volumetypes.Volume, error) {+func (s *VolumeService) CreateVolume(ctx context.Context, options client.VolumeCreateOptions, user models.User) (*volumetypes.Volume, error) {slog.DebugContext(ctx, "volume service: create volume", "volume", options.Name, "driver", options.Driver, "user", user.ID)dockerClient, err := s.dockerService.GetClient()if err != nil {@@ -117,24 +117,24 @@ func (s *VolumeService) CreateVolume(ctx context.Context, options volume.CreateOreturn nil, fmt.Errorf("failed to create volume: %w", err)}- vol, err := dockerClient.VolumeInspect(ctx, created.Name)+ vol, err := dockerClient.VolumeInspect(ctx, created.Volume.Name, client.VolumeInspectOptions{})if err != nil {- s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", created.Name, created.Name, user.ID, user.Username, "0", err, models.JSON{"action": "create", "driver": options.Driver, "step": "inspect"})+ s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", created.Volume.Name, created.Volume.Name, user.ID, user.Username, "0", err, models.JSON{"action": "create", "driver": options.Driver, "step": "inspect"})return nil, fmt.Errorf("failed to inspect created volume: %w", err)}metadata := models.JSON{"action": "create",- "driver": vol.Driver,- "name": vol.Name,+ "driver": vol.Volume.Driver,+ "name": vol.Volume.Name,}- if logErr := s.eventService.LogVolumeEvent(ctx, models.EventTypeVolumeCreate, vol.Name, vol.Name, user.ID, user.Username, "0", metadata); logErr != nil {- slog.WarnContext(ctx, "could not log volume creation action", "volume", vol.Name, "error", logErr.Error())+ if logErr := s.eventService.LogVolumeEvent(ctx, models.EventTypeVolumeCreate, vol.Volume.Name, vol.Volume.Name, user.ID, user.Username, "0", metadata); logErr != nil {+ slog.WarnContext(ctx, "could not log volume creation action", "volume", vol.Volume.Name, "error", logErr.Error())}docker.InvalidateVolumeUsageCache()- dtoVol := volumetypes.NewSummary(vol)+ dtoVol := volumetypes.NewSummary(vol.Volume)return &dtoVol, nil}@@ -146,7 +146,9 @@ func (s *VolumeService) DeleteVolume(ctx context.Context, name string, force booreturn fmt.Errorf("failed to connect to Docker: %w", err)}- if err := dockerClient.VolumeRemove(ctx, name, force); err != nil {+ if _, err := dockerClient.VolumeRemove(ctx, name, client.VolumeRemoveOptions{+ Force: force,+ }); err != nil {s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", name, name, user.ID, user.Username, "0", err, models.JSON{"action": "delete", "force": force})return fmt.Errorf("failed to remove volume: %w", err)}@@ -179,17 +181,9 @@ func (s *VolumeService) PruneVolumesWithOptions(ctx context.Context, all bool) (// - Without 'all' flag: Only removes anonymous (unnamed) volumes that are not in use// - With 'all=true' flag: Removes ALL unused volumes (both named and anonymous)// Note: Volumes are considered "in use" if referenced by any container (running or stopped)- filterArgs := filters.NewArgs()- if all {- // The 'all' filter was added in Docker API v1.42- // This tells Docker to prune ALL unused volumes, not just anonymous ones- filterArgs.Add("all", "true")- }- // Other valid filters for volume prune:- // - label=<key> or label=<key>=<value>- // - label!=<key> or label!=<key>=<value>-- report, err := dockerClient.VolumesPrune(ctx, filterArgs)+ volumePruneResult, err := dockerClient.VolumePrune(ctx, client.VolumePruneOptions{+ All: all,+ })if err != nil {return nil, fmt.Errorf("failed to prune volumes: %w", err)}@@ -197,22 +191,22 @@ func (s *VolumeService) PruneVolumesWithOptions(ctx context.Context, all bool) (metadata := models.JSON{"action": "prune","all": all,- "volumesDeleted": len(report.VolumesDeleted),- "spaceReclaimed": report.SpaceReclaimed,+ "volumesDeleted": len(volumePruneResult.Report.VolumesDeleted),+ "spaceReclaimed": volumePruneResult.Report.SpaceReclaimed,}if logErr := s.eventService.LogVolumeEvent(ctx, models.EventTypeVolumeDelete, "", "bulk_prune", systemUser.ID, systemUser.Username, "0", metadata); logErr != nil {slog.WarnContext(ctx, "could not log volume prune action", "error", logErr.Error())}- for _, volumeName := range report.VolumesDeleted {+ for _, volumeName := range volumePruneResult.Report.VolumesDeleted {s.removeHelperEntry(volumeName)}docker.InvalidateVolumeUsageCache()return &volumetypes.PruneReport{- VolumesDeleted: report.VolumesDeleted,- SpaceReclaimed: report.SpaceReclaimed,+ VolumesDeleted: volumePruneResult.Report.VolumesDeleted,+ SpaceReclaimed: volumePruneResult.Report.SpaceReclaimed,}, nil}@@ -347,11 +341,14 @@ func (s *VolumeService) DownloadFile(ctx context.Context, volumeName, filePath s}targetPath := path.Join("/volume", sanitizedPath)- reader, _, err := dockerClient.CopyFromContainer(ctx, containerID, targetPath)+ copyResult, err := dockerClient.CopyFromContainer(ctx, containerID, client.CopyFromContainerOptions{+ SourcePath: targetPath,+ })if err != nil {cleanup()return nil, 0, fmt.Errorf("failed to download: %w", err)}+ reader := copyResult.Contenttr := tar.NewReader(reader)hdr, err := tr.Next()@@ -411,15 +408,15 @@ func (s *VolumeService) getHelperImageInternal(ctx context.Context) (string, errfunc (s *VolumeService) resolveArcaneHelperImageInternal(ctx context.Context, dockerClient *client.Client) (string, string, bool) {hostname, _ := os.Hostname()if hostname != "" {- if inspect, err := dockerClient.ContainerInspect(ctx, hostname); err == nil && inspect.Config != nil && strings.TrimSpace(inspect.Config.Image) != "" {- return inspect.Config.Image, "hostname", true+ if inspect, err := dockerClient.ContainerInspect(ctx, hostname, client.ContainerInspectOptions{}); err == nil && inspect.Container.Config != nil && strings.TrimSpace(inspect.Container.Config.Image) != "" {+ return inspect.Container.Config.Image, "hostname", true}}- filter := filters.NewArgs()- filter.Add("label", "com.getarcaneapp.arcane=true")- if containers, err := dockerClient.ContainerList(ctx, container.ListOptions{Filters: filter, All: true}); err == nil && len(containers) > 0 && strings.TrimSpace(containers[0].Image) != "" {- return containers[0].Image, "arcane-label", true+ filter := make(client.Filters)+ filter = filter.Add("label", "com.getarcaneapp.arcane=true")+ if containers, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{Filters: filter, All: true}); err == nil && len(containers.Items) > 0 && strings.TrimSpace(containers.Items[0].Image) != "" {+ return containers.Items[0].Image, "arcane-label", true}return "", "", false@@ -436,14 +433,14 @@ func (s *VolumeService) BackupMountWarning(ctx context.Context) string {return ""}- inspect, err := dockerClient.ContainerInspect(ctx, containerID)+ inspect, err := dockerClient.ContainerInspect(ctx, containerID, client.ContainerInspectOptions{})if err != nil {return ""}hasBackups := falsehasRestores := false- for _, mount := range inspect.Mounts {+ for _, mount := range inspect.Container.Mounts {if mount.Destination == "/backups" {hasBackups = true}@@ -462,25 +459,25 @@ func (s *VolumeService) BackupMountWarning(ctx context.Context) string {func (s *VolumeService) getArcaneContainerIDInternal(ctx context.Context, dockerClient *client.Client) string {hostname, _ := os.Hostname()if hostname != "" {- if inspect, err := dockerClient.ContainerInspect(ctx, hostname); err == nil {- return inspect.ID+ if inspect, err := dockerClient.ContainerInspect(ctx, hostname, client.ContainerInspectOptions{}); err == nil {+ return inspect.Container.ID}}- filter := filters.NewArgs()- filter.Add("label", "com.getarcaneapp.arcane=true")- containers, err := dockerClient.ContainerList(ctx, container.ListOptions{Filters: filter, All: true})- if err != nil || len(containers) == 0 {+ filter := make(client.Filters)+ filter = filter.Add("label", "com.getarcaneapp.arcane=true")+ containers, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{Filters: filter, All: true})+ if err != nil || len(containers.Items) == 0 {return ""}- for _, c := range containers {- if strings.EqualFold(strings.TrimSpace(c.State), "running") {+ for _, c := range containers.Items {+ if c.State == container.StateRunning {return c.ID}}- return containers[0].ID+ return containers.Items[0].ID}type cleanupReadCloser struct {@@ -495,8 +492,8 @@ func buildVolumeHelperLabelsInternal() map[string]string {}}-func volumeHelperRemoveOptionsInternal() container.RemoveOptions {- return container.RemoveOptions{Force: true, RemoveVolumes: true}+func volumeHelperRemoveOptionsInternal() client.ContainerRemoveOptions {+ return client.ContainerRemoveOptions{Force: true, RemoveVolumes: true}}func isLegacyVolumeHelperContainerInternal(c container.Summary) bool {@@ -581,18 +578,21 @@ func (s *VolumeService) createTempContainerInternal(ctx context.Context, volumeN}()),})- resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, nil, nil, "")+ resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: config,+ HostConfig: hostConfig,+ })if err != nil {return "", nil, fmt.Errorf("failed to create temp container: %w", err)}- if err := dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {- _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())+ if _, err := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())return "", nil, fmt.Errorf("failed to start temp container: %w", err)}cleanup := func() {- _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())}if readOnly {@@ -613,8 +613,8 @@ func (s *VolumeService) getReusableReadOnlyContainerInternal(ctx context.Contextreturn "", false}- inspect, err := dockerClient.ContainerInspect(ctx, containerID)- if err != nil || inspect.State == nil || !inspect.State.Running {+ inspect, err := dockerClient.ContainerInspect(ctx, containerID, client.ContainerInspectOptions{})+ if err != nil || inspect.Container.State == nil || !inspect.Container.State.Running {s.helperMu.Lock()delete(s.helperByVolume, volumeName)s.helperMu.Unlock()@@ -642,7 +642,7 @@ func (s *VolumeService) CleanupHelperContainers(ctx context.Context) {s.helperMu.Unlock()for _, containerID := range helperIDs {- if err := dockerClient.ContainerRemove(ctx, containerID, volumeHelperRemoveOptionsInternal()); err != nil {+ if _, err := dockerClient.ContainerRemove(ctx, containerID, volumeHelperRemoveOptionsInternal()); err != nil {slog.WarnContext(ctx, "failed to remove helper container", "container_id", containerID, "error", err.Error())}}@@ -654,18 +654,18 @@ func (s *VolumeService) CleanupOrphanedVolumeHelpers(ctx context.Context) errorreturn fmt.Errorf("failed to get docker client for orphan helper cleanup: %w", err)}- containers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})+ containers, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})if err != nil {return fmt.Errorf("failed to list containers for orphan helper cleanup: %w", err)}removedCount := 0- for _, c := range containers {+ for _, c := range containers.Items {if !isVolumeHelperContainerInternal(c) {continue}- if err := dockerClient.ContainerRemove(ctx, c.ID, volumeHelperRemoveOptionsInternal()); err != nil {+ if _, err := dockerClient.ContainerRemove(ctx, c.ID, volumeHelperRemoveOptionsInternal()); err != nil {slog.WarnContext(ctx, "failed to remove orphaned volume helper container", "container_id", c.ID, "error", err.Error())continue}@@ -693,18 +693,18 @@ func (s *VolumeService) execInContainerInternal(ctx context.Context, containerIDreturn "", "", err}- execConfig := container.ExecOptions{+ execConfig := client.ExecCreateOptions{AttachStdout: true,AttachStderr: true,Cmd: cmd,}- execResp, err := dockerClient.ContainerExecCreate(ctx, containerID, execConfig)+ execResp, err := dockerClient.ExecCreate(ctx, containerID, execConfig)if err != nil {return "", "", err}- resp, err := dockerClient.ContainerExecAttach(ctx, execResp.ID, container.ExecAttachOptions{})+ resp, err := dockerClient.ExecAttach(ctx, execResp.ID, client.ExecAttachOptions{})if err != nil {return "", "", err}@@ -841,7 +841,10 @@ func (s *VolumeService) UploadFile(ctx context.Context, volumeName, destPath str}targetDir := path.Join("/volume", sanitizedPath)- err = dockerClient.CopyToContainer(ctx, containerID, targetDir, &buf, container.CopyToContainerOptions{})+ _, err = dockerClient.CopyToContainer(ctx, containerID, client.CopyToContainerOptions{+ DestinationPath: targetDir,+ Content: &buf,+ })if err != nil {return fmt.Errorf("failed to upload: %w", err)}@@ -869,9 +872,9 @@ func (s *VolumeService) ensureBackupVolumeInternal(ctx context.Context) error {return err}- _, err = dockerClient.VolumeInspect(ctx, s.backupVolumeName)+ _, err = dockerClient.VolumeInspect(ctx, s.backupVolumeName, client.VolumeInspectOptions{})if err != nil {- _, err = dockerClient.VolumeCreate(ctx, volume.CreateOptions{+ _, err = dockerClient.VolumeCreate(ctx, client.VolumeCreateOptions{Name: s.backupVolumeName,})if err != nil {@@ -911,23 +914,26 @@ func (s *VolumeService) CreateBackup(ctx context.Context, volumeName string, usefmt.Sprintf("%s:/backups", s.backupVolumeName),})- resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, nil, nil, "")+ resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: config,+ HostConfig: hostConfig,+ })if err != nil {return nil, fmt.Errorf("failed to create backup container: %w", err)}- if err := dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {- _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())+ if _, err := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())return nil, fmt.Errorf("failed to start backup container: %w", err)}- statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)+ waitResult := dockerClient.ContainerWait(ctx, resp.ID, client.ContainerWaitOptions{Condition: container.WaitConditionNotRunning})select {- case err := <-errCh:+ case err := <-waitResult.Error:if err != nil {return nil, err}- case status := <-statusCh:+ case status := <-waitResult.Result:if status.StatusCode != 0 {return nil, fmt.Errorf("backup container exited with status %d", status.StatusCode)}@@ -1142,24 +1148,27 @@ func (s *VolumeService) RestoreBackup(ctx context.Context, volumeName, backupIDfmt.Sprintf("%s:/backups:ro", s.backupVolumeName),})- resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, nil, nil, "")+ resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: config,+ HostConfig: hostConfig,+ })if err != nil {return fmt.Errorf("failed to create restore container: %w", err)}- if err := dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {- _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())+ if _, err := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())return fmt.Errorf("failed to start restore container: %w", err)}- statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)+ waitResult := dockerClient.ContainerWait(ctx, resp.ID, client.ContainerWaitOptions{Condition: container.WaitConditionNotRunning})var waitBody container.WaitResponseselect {- case err := <-errCh:+ case err := <-waitResult.Error:if err != nil {return err}- case waitBody = <-statusCh:+ case waitBody = <-waitResult.Result:}if waitBody.StatusCode != 0 {@@ -1371,18 +1380,21 @@ func (s *VolumeService) RestoreBackupFiles(ctx context.Context, volumeName, backfmt.Sprintf("%s:/backups:ro", s.backupVolumeName),})- resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, nil, nil, "")+ resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: config,+ HostConfig: hostConfig,+ })if err != nil {return fmt.Errorf("failed to create restore container: %w", err)}- if err := dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {- _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())+ if _, err := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())return fmt.Errorf("failed to start restore container: %w", err)}cleanup := func() {- _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, volumeHelperRemoveOptionsInternal())}defer cleanup()@@ -1499,7 +1511,10 @@ func (s *VolumeService) UploadAndRestore(ctx context.Context, volumeName string,if _, err := tmpFile.Seek(0, io.SeekStart); err != nil {return fmt.Errorf("failed to read buffered upload: %w", err)}- err = dockerClient.CopyToContainer(ctx, containerID, tmpDir, tmpFile, container.CopyToContainerOptions{})+ _, err = dockerClient.CopyToContainer(ctx, containerID, client.CopyToContainerOptions{+ DestinationPath: tmpDir,+ Content: tmpFile,+ })if err != nil {return fmt.Errorf("failed to restore from uploaded archive: %w", err)}@@ -1548,12 +1563,12 @@ func (s *VolumeService) GetVolumeUsage(ctx context.Context, name string) (bool,return false, nil, fmt.Errorf("failed to connect to Docker: %w", err)}- vol, err := dockerClient.VolumeInspect(ctx, name)+ vol, err := dockerClient.VolumeInspect(ctx, name, client.VolumeInspectOptions{})if err != nil {return false, nil, fmt.Errorf("volume not found: %w", err)}- containerIDs, err := docker.GetContainersUsingVolume(ctx, dockerClient, vol.Name)+ containerIDs, err := docker.GetContainersUsingVolume(ctx, dockerClient, vol.Volume.Name)if err != nil {return false, nil, fmt.Errorf("failed to get containers using volume: %w", err)}@@ -1595,7 +1610,7 @@ func (s *VolumeService) GetVolumeSizes(ctx context.Context) (map[string]VolumeSireturn result, nil}-func (s *VolumeService) enrichVolumesWithUsageDataInternal(volumes []*volume.Volume, usageVolumes []volume.Volume) []volume.Volume {+func (s *VolumeService) enrichVolumesWithUsageDataInternal(volumes []volume.Volume, usageVolumes []volume.Volume) []volume.Volume {slog.Debug("volume service: enrich volumes with usage data", "volumes", len(volumes), "usage_volumes", len(usageVolumes))usageByName := make(map[string]*volume.UsageData, len(usageVolumes))for _, uv := range usageVolumes {@@ -1610,26 +1625,24 @@ func (s *VolumeService) enrichVolumesWithUsageDataInternal(volumes []*volume.Volresult := make([]volume.Volume, 0, len(volumes))for _, v := range volumes {- if v != nil {- if usageData, exists := usageByName[v.Name]; exists {- v.UsageData = usageData- }-- result = append(result, *v)+ if usageData, exists := usageByName[v.Name]; exists {+ v.UsageData = usageData}++ result = append(result, v)}return result}func (s *VolumeService) buildVolumeContainerMapInternal(ctx context.Context, dockerClient *client.Client) (map[string][]string, error) {slog.DebugContext(ctx, "volume service: build volume container map")- containers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})+ containers, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})if err != nil {return nil, fmt.Errorf("failed to list containers: %w", err)}volumeContainerMap := make(map[string][]string)- for _, c := range containers {+ for _, c := range containers.Items {for _, m := range c.Mounts {if m.Type == mount.TypeVolume && m.Name != "" {volumeContainerMap[m.Name] = append(volumeContainerMap[m.Name], c.ID)@@ -1802,7 +1815,7 @@ func (s *VolumeService) ListVolumesPaginated(ctx context.Context, params paginat// Run volume list and container list in parallel for better performancetype volumeListResult struct {- volumes []*volume.Volume+ volumes []volume.Volumeerr error}type containerMapResult struct {@@ -1818,8 +1831,8 @@ func (s *VolumeService) ListVolumesPaginated(ctx context.Context, params paginatdefer cancel()go func(ctx context.Context) {- volListBody, err := dockerClient.VolumeList(ctx, volume.ListOptions{})- volChan <- volumeListResult{volumes: volListBody.Volumes, err: err}+ volListBody, err := dockerClient.VolumeList(ctx, client.VolumeListOptions{})+ volChan <- volumeListResult{volumes: volListBody.Items, err: err}}(apiCtx)go func(ctx context.Context) {diff --git a/backend/internal/services/volume_service_test.go b/backend/internal/services/volume_service_test.goindex fd429a7b1..42444b00a 100644--- a/backend/internal/services/volume_service_test.go+++ b/backend/internal/services/volume_service_test.go@@ -3,9 +3,9 @@ package servicesimport ("testing"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/volume""github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/volume""github.com/stretchr/testify/require")@@ -62,16 +62,15 @@ func TestEnrichVolumesWithUsageDataInternal(t *testing.T) {tests := []struct {name string- volumes []*volume.Volume+ volumes []volume.VolumeusageVolumes []volume.VolumewantLen intassertions func(t *testing.T, got []volume.Volume)}{{- name: "attaches usage by name and skips nil volumes",- volumes: []*volume.Volume{+ name: "attaches usage by name",+ volumes: []volume.Volume{{Name: "vol-a"},- nil,{Name: "vol-b"},},usageVolumes: []volume.Volume{@@ -88,7 +87,7 @@ func TestEnrichVolumesWithUsageDataInternal(t *testing.T) {},{name: "keeps first usage entry when duplicate usage names exist",- volumes: []*volume.Volume{+ volumes: []volume.Volume{{Name: "vol-dup"},},usageVolumes: []volume.Volume{diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.goindex 73fdfd668..8fe72f5ef 100644--- a/backend/internal/services/vulnerability_service.go+++ b/backend/internal/services/vulnerability_service.go@@ -18,18 +18,17 @@ import ("time"cerrdefs "github.com/containerd/errdefs"- containertypes "github.com/docker/docker/api/types/container"- imagetypes "github.com/docker/docker/api/types/image"- mounttypes "github.com/docker/docker/api/types/mount"- volumetypes "github.com/docker/docker/api/types/volume"- "github.com/docker/docker/client"- "github.com/docker/docker/pkg/stdcopy""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts""github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/stdcopy""github.com/getarcaneapp/arcane/types/vulnerability"+ containertypes "github.com/moby/moby/api/types/container"+ imagetypes "github.com/moby/moby/api/types/image"+ mounttypes "github.com/moby/moby/api/types/mount"+ "github.com/moby/moby/client""gorm.io/gorm""gorm.io/gorm/clause")@@ -1106,10 +1105,11 @@ func (s *VulnerabilityService) ScanAllImages(ctx context.Context, envID string,return 0, 0, fmt.Errorf("failed to connect to Docker: %w", err)}- images, err := dockerClient.ImageList(ctx, imagetypes.ListOptions{})+ imageList, err := dockerClient.ImageList(ctx, client.ImageListOptions{})if err != nil {return 0, 0, fmt.Errorf("failed to list images: %w", err)}+ images := imageList.ItemscontainerID, cleanup, err := s.setupTrivyBatchContainer(ctx)if err != nil {@@ -1271,18 +1271,18 @@ func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, conoutputPath := newTrivyOutputPathInternal()defer cleanupTrivyOutputFileInContainerInternal(ctx, dockerClient, containerID, outputPath)- execCfg := containertypes.ExecOptions{+ execCfg := client.ExecCreateOptions{Cmd: []string{"trivy", "image", "--format", "json", "--quiet", "--output", outputPath, "--timeout", trivyTimeout, imageName},AttachStdout: true,AttachStderr: true,}- execResp, err := dockerClient.ContainerExecCreate(ctx, containerID, execCfg)+ execResp, err := dockerClient.ExecCreate(ctx, containerID, execCfg)if err != nil {return nil, fmt.Errorf("failed to create exec: %w", err)}- attachResp, err := dockerClient.ContainerExecAttach(ctx, execResp.ID, containertypes.ExecAttachOptions{})+ attachResp, err := dockerClient.ExecAttach(ctx, execResp.ID, client.ExecAttachOptions{})if err != nil {return nil, fmt.Errorf("failed to attach to exec: %w", err)}@@ -1294,7 +1294,7 @@ func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, con}// Check exit code- execInspect, err := dockerClient.ContainerExecInspect(ctx, execResp.ID)+ execInspect, err := dockerClient.ExecInspect(ctx, execResp.ID, client.ExecInspectOptions{})if err != nil {return nil, fmt.Errorf("failed to inspect exec: %w", err)}@@ -1389,10 +1389,11 @@ func (s *VulnerabilityService) CleanupOrphanedScanRecords(ctx context.Context) (return 0, fmt.Errorf("failed to connect to Docker: %w", err)}- images, err := dockerClient.ImageList(ctx, imagetypes.ListOptions{})+ imageList, err := dockerClient.ImageList(ctx, client.ImageListOptions{})if err != nil {return 0, fmt.Errorf("failed to list images: %w", err)}+ images := imageList.ItemscurrentIDs := make(map[string]struct{}, len(images))for _, img := range images {@@ -1445,23 +1446,26 @@ func (s *VulnerabilityService) GetTrivyVersion(ctx context.Context) string {AutoRemove: true,}- resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, nil, nil, "")+ resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{+ Config: config,+ HostConfig: hostConfig,+ })if err != nil {return ""}- if err := dockerClient.ContainerStart(ctx, resp.ID, containertypes.StartOptions{}); err != nil {- _ = dockerClient.ContainerRemove(ctx, resp.ID, containertypes.RemoveOptions{Force: true})+ if _, err := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); err != nil {+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, client.ContainerRemoveOptions{Force: true})return ""}- logs, err := dockerClient.ContainerLogs(ctx, resp.ID, containertypes.LogsOptions{+ logs, err := dockerClient.ContainerLogs(ctx, resp.ID, client.ContainerLogsOptions{ShowStdout: true,ShowStderr: true,Follow: true,})if err != nil {- _ = dockerClient.ContainerRemove(ctx, resp.ID, containertypes.RemoveOptions{Force: true})+ _, _ = dockerClient.ContainerRemove(ctx, resp.ID, client.ContainerRemoveOptions{Force: true})return ""}var closeLogsOnce sync.Once@@ -1488,14 +1492,14 @@ func (s *VulnerabilityService) GetTrivyVersion(ctx context.Context) string {logDone := startDockerLogCopyInternal(logs, stdoutFile, stderrFile)- statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, containertypes.WaitConditionNotRunning)+ waitResult := dockerClient.ContainerWait(ctx, resp.ID, client.ContainerWaitOptions{Condition: containertypes.WaitConditionNotRunning})var waitResp containertypes.WaitResponseselect {- case err := <-errCh:+ case err := <-waitResult.Error:if err != nil {return ""}- case waitResp = <-statusCh:+ case waitResp = <-waitResult.Result:}closeLogs()@@ -1586,7 +1590,7 @@ func (s *VulnerabilityService) ensureTrivyImageInternal(ctx context.Context) (stpullCtx, pullCancel := timeouts.WithTimeout(ctx, pullTimeoutSeconds, timeouts.DefaultDockerImagePull)defer pullCancel()- pullReader, err := dockerClient.ImagePull(pullCtx, trivyImage, imagetypes.PullOptions{})+ pullReader, err := dockerClient.ImagePull(pullCtx, trivyImage, client.ImagePullOptions{})if err != nil {if errors.Is(pullCtx.Err(), context.DeadlineExceeded) {return "", fmt.Errorf("trivy image pull timed out for %s (increase DOCKER_IMAGE_PULL_TIMEOUT or setting)", trivyImage)@@ -1605,11 +1609,11 @@ func (s *VulnerabilityService) ensureTrivyCacheVolumeInternal(ctx context.Contexreturn "", err}- if _, err := dockerClient.VolumeInspect(ctx, trivyCacheVolumeName); err == nil {+ if _, err := dockerClient.VolumeInspect(ctx, trivyCacheVolumeName, client.VolumeInspectOptions{}); err == nil {return trivyCacheVolumeName, nil}- _, err = dockerClient.VolumeCreate(ctx, volumetypes.CreateOptions{+ _, err = dockerClient.VolumeCreate(ctx, client.VolumeCreateOptions{Name: trivyCacheVolumeName,Labels: map[string]string{libarcane.InternalResourceLabel: "true",@@ -1897,7 +1901,7 @@ func readTrivyStartupLogsInternal(ctx context.Context, dockerClient *client.ClielogsCtx, logsCancel := timeouts.WithTimeout(ctx, 0, timeouts.DefaultDockerAPI)defer logsCancel()- logs, err := dockerClient.ContainerLogs(logsCtx, containerID, containertypes.LogsOptions{+ logs, err := dockerClient.ContainerLogs(logsCtx, containerID, client.ContainerLogsOptions{ShowStdout: true,ShowStderr: true,Tail: "200",@@ -1932,7 +1936,7 @@ func removeDockerContainerInternal(ctx context.Context, dockerClient *client.ClicleanupCtx, cleanupCancel := timeouts.WithTimeout(cleanupCtx, 0, timeouts.DefaultDockerAPI)defer cleanupCancel()- if err := dockerClient.ContainerRemove(cleanupCtx, containerID, containertypes.RemoveOptions{Force: true}); err != nil && !cerrdefs.IsNotFound(err) {+ if _, err := dockerClient.ContainerRemove(cleanupCtx, containerID, client.ContainerRemoveOptions{Force: true}); err != nil && !cerrdefs.IsNotFound(err) {slog.WarnContext(cleanupCtx, warningMessage, "containerId", containerID, "error", err)}}@@ -1949,7 +1953,10 @@ func (s *VulnerabilityService) createAndStartTrivyContainerInternal(createCtx, createCancel := timeouts.WithTimeout(ctx, 0, timeouts.DefaultDockerAPI)defer createCancel()- resp, err := dockerClient.ContainerCreate(createCtx, config, hostConfig, nil, nil, "")+ resp, err := dockerClient.ContainerCreate(createCtx, client.ContainerCreateOptions{+ Config: config,+ HostConfig: hostConfig,+ })if err != nil {slog.WarnContext(ctx, "failed to create trivy container", "scope", scope, "error", err)return "", fmt.Errorf("failed to create container: %w", err)@@ -1958,7 +1965,7 @@ func (s *VulnerabilityService) createAndStartTrivyContainerInternal(startCtx, startCancel := timeouts.WithTimeout(ctx, 0, timeouts.DefaultDockerAPI)defer startCancel()- if err := dockerClient.ContainerStart(startCtx, resp.ID, containertypes.StartOptions{}); err != nil {+ if _, err := dockerClient.ContainerStart(startCtx, resp.ID, client.ContainerStartOptions{}); err != nil {stdoutLog, stderrLog := readTrivyStartupLogsInternal(ctx, dockerClient, resp.ID)slog.WarnContext(ctx,"failed to start trivy container",@@ -2076,7 +2083,7 @@ func (s *VulnerabilityService) getTrivyContainerResourceOptionsInternal(ctx contslog.DebugContext(ctx, "inspecting docker host for trivy resource strategy")- info, err := dockerClient.Info(infoCtx)+ info, err := dockerClient.Info(infoCtx, client.InfoOptions{})if err != nil {if errors.Is(infoCtx.Err(), context.DeadlineExceeded) || errors.Is(err, context.DeadlineExceeded) {slog.WarnContext(ctx,@@ -2092,27 +2099,27 @@ func (s *VulnerabilityService) getTrivyContainerResourceOptionsInternal(ctx contslog.DebugContext(ctx,"resolved docker host info for trivy resource strategy",- "operatingSystem", info.OperatingSystem,- "ncpu", info.NCPU,+ "operatingSystem", info.Info.OperatingSystem,+ "ncpu", info.Info.NCPU,)- if !isSynologyDockerHostInternal(info.OperatingSystem) {+ if !isSynologyDockerHostInternal(info.Info.OperatingSystem) {return resources, "", applyLimits}- cpuSet := buildTrivyCPUSetInternal(resources.NanoCPUs, info.NCPU)+ cpuSet := buildTrivyCPUSetInternal(resources.NanoCPUs, info.Info.NCPU)resources.NanoCPUs = 0if cpuSet != "" {slog.InfoContext(ctx,"detected Synology Docker host; applying Trivy CPU limit via cpuset",- "operatingSystem", info.OperatingSystem,+ "operatingSystem", info.Info.OperatingSystem,"cpuset", cpuSet,)} else {slog.InfoContext(ctx,"detected Synology Docker host; skipping Trivy NanoCPUs limit",- "operatingSystem", info.OperatingSystem,+ "operatingSystem", info.Info.OperatingSystem,)}@@ -2184,10 +2191,11 @@ func readTrivyOutputFromContainerFileInternal(ctx context.Context, dockerClientcopyCtx, copyCancel := timeouts.WithTimeout(ctx, 0, timeouts.DefaultDockerAPI)defer copyCancel()- archiveReader, _, err := dockerClient.CopyFromContainer(copyCtx, containerID, outputPath)+ copyResult, err := dockerClient.CopyFromContainer(copyCtx, containerID, client.CopyFromContainerOptions{SourcePath: outputPath})if err != nil {return nil, fmt.Errorf("copy trivy output file: %w", err)}+ archiveReader := copyResult.Contentdefer func() {if closeErr := archiveReader.Close(); closeErr != nil && !isExpectedDockerStreamEndErrorInternal(closeErr) {slog.WarnContext(ctx,@@ -2219,7 +2227,7 @@ func cleanupTrivyOutputFileInContainerInternal(ctx context.Context, dockerClientexecCtx, execCancel := timeouts.WithTimeout(ctx, 0, timeouts.DefaultDockerAPI)defer execCancel()- execResp, err := dockerClient.ContainerExecCreate(execCtx, containerID, containertypes.ExecOptions{+ execResp, err := dockerClient.ExecCreate(execCtx, containerID, client.ExecCreateOptions{Cmd: []string{"rm", "-f", outputPath},})if err != nil {@@ -2232,7 +2240,7 @@ func cleanupTrivyOutputFileInContainerInternal(ctx context.Context, dockerClientreturn}- if err := dockerClient.ContainerExecStart(execCtx, execResp.ID, containertypes.ExecStartOptions{}); err != nil {+ if _, err := dockerClient.ExecStart(execCtx, execResp.ID, client.ExecStartOptions{}); err != nil {slog.DebugContext(ctx,"failed to start cleanup exec for trivy output file","containerId", containerID,@@ -2522,7 +2530,7 @@ func (s *VulnerabilityService) runTrivyContainer(s.setScanPhaseInternal(imageID, vulnerability.ScanPhaseScanningImage)logsCtx, logsCancel := context.WithCancel(ctx)- logs, err := dockerClient.ContainerLogs(logsCtx, containerID, containertypes.LogsOptions{+ logs, err := dockerClient.ContainerLogs(logsCtx, containerID, client.ContainerLogsOptions{ShowStdout: true,ShowStderr: true,Follow: true,@@ -2597,9 +2605,9 @@ func (s *VulnerabilityService) waitForTrivyContainer(dockerClient *client.Client,containerID string,) (int64, error) {- statusCh, errCh := dockerClient.ContainerWait(ctx, containerID, containertypes.WaitConditionNotRunning)+ waitResult := dockerClient.ContainerWait(ctx, containerID, client.ContainerWaitOptions{Condition: containertypes.WaitConditionNotRunning})- statusCode, err := awaitContainerWaitResponseInternal(ctx, statusCh, errCh)+ statusCode, err := awaitContainerWaitResponseInternal(ctx, waitResult.Result, waitResult.Error)if err != nil {if errors.Is(err, context.DeadlineExceeded) {return 0, fmt.Errorf("trivy container wait timed out: %w", err)diff --git a/backend/internal/services/vulnerability_service_test.go b/backend/internal/services/vulnerability_service_test.goindex 66d7c5721..8c443375f 100644--- a/backend/internal/services/vulnerability_service_test.go+++ b/backend/internal/services/vulnerability_service_test.go@@ -12,14 +12,14 @@ import ("testing""time"- containertypes "github.com/docker/docker/api/types/container"- mounttypes "github.com/docker/docker/api/types/mount""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/pagination""github.com/getarcaneapp/arcane/backend/internal/utils/timeouts""github.com/getarcaneapp/arcane/types/vulnerability"glsqlite "github.com/glebarez/sqlite"+ containertypes "github.com/moby/moby/api/types/container"+ mounttypes "github.com/moby/moby/api/types/mount""github.com/stretchr/testify/require""gorm.io/gorm")diff --git a/backend/internal/utils/arcaneupdater/digest.go b/backend/internal/utils/arcaneupdater/digest.goindex 4576bd45f..758befa98 100644--- a/backend/internal/utils/arcaneupdater/digest.go+++ b/backend/internal/utils/arcaneupdater/digest.go@@ -6,9 +6,8 @@ import ("log/slog""strings"- "github.com/docker/docker/api/types/image"- "github.com/docker/docker/client""github.com/getarcaneapp/arcane/backend/internal/utils/registry"+ "github.com/moby/moby/client")// DigestChecker provides methods to check if an image needs updating by comparing digests@@ -132,10 +131,11 @@ func (c *DigestChecker) GetImageIDsForRef(ctx context.Context, ref string) ([]st}// Fall back to listing and filtering- images, err := c.dcli.ImageList(ctx, image.ListOptions{})+ imageList, err := c.dcli.ImageList(ctx, client.ImageListOptions{})if err != nil {return nil, err}+ images := imageList.ItemsnormalizedRef := normalizeRef(ref)var ids []stringdiff --git a/backend/internal/utils/arcaneupdater/logfile.go b/backend/internal/utils/arcaneupdater/logfile.goindex 8f17da0d2..31e3ab470 100644--- a/backend/internal/utils/arcaneupdater/logfile.go+++ b/backend/internal/utils/arcaneupdater/logfile.go@@ -13,36 +13,6 @@ import ("time")-type teeHandler struct {- a slog.Handler- b slog.Handler-}--func (t teeHandler) Enabled(ctx context.Context, level slog.Level) bool {- return t.a.Enabled(ctx, level) || t.b.Enabled(ctx, level)-}--func (t teeHandler) Handle(ctx context.Context, r slog.Record) error {- var err error- if t.a.Enabled(ctx, r.Level) {- err = t.a.Handle(ctx, r)- }- if t.b.Enabled(ctx, r.Level) {- if err2 := t.b.Handle(ctx, r); err == nil {- err = err2- }- }- return err-}--func (t teeHandler) WithAttrs(attrs []slog.Attr) slog.Handler {- return teeHandler{a: t.a.WithAttrs(attrs), b: t.b.WithAttrs(attrs)}-}--func (t teeHandler) WithGroup(name string) slog.Handler {- return teeHandler{a: t.a.WithGroup(name), b: t.b.WithGroup(name)}-}-type messageOnlyHandler struct {mu *sync.Mutexw io.Writer@@ -188,7 +158,7 @@ func SetupMessageOnlyLogFile(dataDir string, filePrefix string, minLevel slog.Le})fileHandler := newMessageOnlyHandler(logFile, minLevel)- slog.SetDefault(slog.New(teeHandler{a: stdoutHandler, b: fileHandler}))+ slog.SetDefault(slog.New(slog.NewMultiHandler(stdoutHandler, fileHandler)))return logFile, nil}diff --git a/backend/internal/utils/arcaneupdater/logfile_test.go b/backend/internal/utils/arcaneupdater/logfile_test.goindex 4893a1fd8..a1039de8f 100644--- a/backend/internal/utils/arcaneupdater/logfile_test.go+++ b/backend/internal/utils/arcaneupdater/logfile_test.go@@ -256,12 +256,12 @@ func TestFormatSlogValue_Duration(t *testing.T) {}}-func TestTeeHandler_Enabled(t *testing.T) {+func TestMultiHandler_Enabled(t *testing.T) {var buf1, buf2 bytes.Bufferhandler1 := newMessageOnlyHandler(&buf1, slog.LevelInfo)handler2 := newMessageOnlyHandler(&buf2, slog.LevelWarn)- tee := teeHandler{a: handler1, b: handler2}+ multi := slog.NewMultiHandler(handler1, handler2)tests := []struct {name string@@ -292,60 +292,75 @@ func TestTeeHandler_Enabled(t *testing.T) {for _, tt := range tests {t.Run(tt.name, func(t *testing.T) {- if got := tee.Enabled(context.Background(), tt.level); got != tt.want {+ if got := multi.Enabled(context.Background(), tt.level); got != tt.want {t.Errorf("Enabled() = %v, want %v", got, tt.want)}})}}-func TestTeeHandler_Handle(t *testing.T) {+func TestMultiHandler_Handle(t *testing.T) {var buf1, buf2 bytes.Bufferhandler1 := newMessageOnlyHandler(&buf1, slog.LevelInfo)handler2 := newMessageOnlyHandler(&buf2, slog.LevelInfo)- tee := teeHandler{a: handler1, b: handler2}+ multi := slog.NewMultiHandler(handler1, handler2)record := slog.NewRecord(time.Now(), slog.LevelInfo, "Test message", 0)- if err := tee.Handle(context.Background(), record); err != nil {+ if err := multi.Handle(context.Background(), record); err != nil {t.Errorf("Handle() error = %v", err)}// Both handlers should have received the messageif !strings.Contains(buf1.String(), "Test message") {- t.Error("teeHandler did not write to first handler")+ t.Error("multi handler did not write to first handler")}if !strings.Contains(buf2.String(), "Test message") {- t.Error("teeHandler did not write to second handler")+ t.Error("multi handler did not write to second handler")}}-func TestTeeHandler_WithAttrs(t *testing.T) {+func TestMultiHandler_WithAttrs(t *testing.T) {var buf1, buf2 bytes.Bufferhandler1 := newMessageOnlyHandler(&buf1, slog.LevelInfo)handler2 := newMessageOnlyHandler(&buf2, slog.LevelInfo)- tee := teeHandler{a: handler1, b: handler2}+ multi := slog.NewMultiHandler(handler1, handler2)attrs := []slog.Attr{slog.String("key", "value")}- newTee := tee.WithAttrs(attrs)+ withAttrs := multi.WithAttrs(attrs)- if _, ok := newTee.(teeHandler); !ok {- t.Error("WithAttrs() did not return teeHandler")+ record := slog.NewRecord(time.Now(), slog.LevelInfo, "Test", 0)+ if err := withAttrs.Handle(context.Background(), record); err != nil {+ t.Errorf("Handle() error = %v", err)+ }+ if !strings.Contains(buf1.String(), "key=\"value\"") {+ t.Errorf("WithAttrs() missing attr in first handler output: %q", buf1.String())+ }+ if !strings.Contains(buf2.String(), "key=\"value\"") {+ t.Errorf("WithAttrs() missing attr in second handler output: %q", buf2.String())}}-func TestTeeHandler_WithGroup(t *testing.T) {+func TestMultiHandler_WithGroup(t *testing.T) {var buf1, buf2 bytes.Bufferhandler1 := newMessageOnlyHandler(&buf1, slog.LevelInfo)handler2 := newMessageOnlyHandler(&buf2, slog.LevelInfo)- tee := teeHandler{a: handler1, b: handler2}+ multi := slog.NewMultiHandler(handler1, handler2)- newTee := tee.WithGroup("testgroup")+ withGroup := multi.WithGroup("testgroup")- if _, ok := newTee.(teeHandler); !ok {- t.Error("WithGroup() did not return teeHandler")+ record := slog.NewRecord(time.Now(), slog.LevelInfo, "Test", 0)+ record.AddAttrs(slog.String("key", "value"))+ if err := withGroup.Handle(context.Background(), record); err != nil {+ t.Errorf("Handle() error = %v", err)+ }+ if !strings.Contains(buf1.String(), "testgroup.key=\"value\"") {+ t.Errorf("WithGroup() missing grouped attr in first handler output: %q", buf1.String())+ }+ if !strings.Contains(buf2.String(), "testgroup.key=\"value\"") {+ t.Errorf("WithGroup() missing grouped attr in second handler output: %q", buf2.String())}}diff --git a/backend/internal/utils/arcaneupdater/sorter.go b/backend/internal/utils/arcaneupdater/sorter.goindex 6dd27645e..d61de3174 100644--- a/backend/internal/utils/arcaneupdater/sorter.go+++ b/backend/internal/utils/arcaneupdater/sorter.go@@ -7,8 +7,8 @@ import ("slices""strings"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/client"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/client")// ContainerWithDeps represents a container with its dependency information for sortingdiff --git a/backend/internal/utils/arcaneupdater/sorter_test.go b/backend/internal/utils/arcaneupdater/sorter_test.goindex 3f7681c2c..068865b23 100644--- a/backend/internal/utils/arcaneupdater/sorter_test.go+++ b/backend/internal/utils/arcaneupdater/sorter_test.go@@ -3,7 +3,7 @@ package arcaneupdaterimport ("testing"- "github.com/docker/docker/api/types/container"+ "github.com/moby/moby/api/types/container")func TestContainerSorter_Sort(t *testing.T) {diff --git a/backend/internal/utils/docker/mount_utils.go b/backend/internal/utils/docker/mount_utils.goindex a76d4c5f1..1e5a5aedd 100644--- a/backend/internal/utils/docker/mount_utils.go+++ b/backend/internal/utils/docker/mount_utils.go@@ -5,10 +5,10 @@ import ("os""strings"- containertypes "github.com/docker/docker/api/types/container"- mounttypes "github.com/docker/docker/api/types/mount"- "github.com/docker/docker/client""github.com/getarcaneapp/arcane/backend/internal/utils/pathmapper"+ containertypes "github.com/moby/moby/api/types/container"+ mounttypes "github.com/moby/moby/api/types/mount"+ "github.com/moby/moby/client")// GetHostPathForContainerPath attempts to discover the host-side path for a given container path@@ -26,7 +26,7 @@ func GetHostPathForContainerPath(ctx context.Context, dockerCli *client.Client,}// 2. Inspect self- inspect, err := dockerCli.ContainerInspect(ctx, hostname)+ inspect, err := dockerCli.ContainerInspect(ctx, hostname, client.ContainerInspectOptions{})if err != nil {// Not running in a container or can't reach docker daemonreturn "", err@@ -35,8 +35,8 @@ func GetHostPathForContainerPath(ctx context.Context, dockerCli *client.Client,// 3. Find mount point for the target path// We want to find the mount that most specifically matches our pathvar bestMatch *containertypes.MountPoint- for i := range inspect.Mounts {- m := &inspect.Mounts[i]+ for i := range inspect.Container.Mounts {+ m := &inspect.Container.Mounts[i]if strings.HasPrefix(containerPath, m.Destination) {if bestMatch == nil || len(m.Destination) > len(bestMatch.Destination) {bestMatch = mdiff --git a/backend/internal/utils/docker/volume_utils.go b/backend/internal/utils/docker/volume_utils.goindex b537cf025..c5ed69557 100644--- a/backend/internal/utils/docker/volume_utils.go+++ b/backend/internal/utils/docker/volume_utils.go@@ -7,11 +7,9 @@ import ("sync""time"- "github.com/docker/docker/api/types"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/mount"- "github.com/docker/docker/api/types/volume"- "github.com/docker/docker/client"+ "github.com/moby/moby/api/types/mount"+ "github.com/moby/moby/api/types/volume"+ "github.com/moby/moby/client")var (@@ -38,25 +36,21 @@ func GetVolumeUsageData(ctx context.Context, dockerClient *client.Client) ([]volslog.DebugContext(ctx, "returning cached volume usage data after lock", "volume_count", len(volumeUsageCache))return volumeUsageCache, nil}- diskUsage, err := dockerClient.DiskUsage(ctx, types.DiskUsageOptions{- Types: []types.DiskUsageObject{types.VolumeObject},+ diskUsage, err := dockerClient.DiskUsage(ctx, client.DiskUsageOptions{+ Volumes: true,})if err != nil {return nil, fmt.Errorf("failed to get disk usage: %w", err)}- slog.DebugContext(ctx, "disk usage returned volumes", "volume_count", len(diskUsage.Volumes))+ slog.DebugContext(ctx, "disk usage returned volumes", "volume_count", len(diskUsage.Volumes.Items))- if diskUsage.Volumes == nil {+ if len(diskUsage.Volumes.Items) == 0 {return []volume.Volume{}, nil}- volumes := make([]volume.Volume, 0, len(diskUsage.Volumes))- for _, v := range diskUsage.Volumes {- if v != nil {- volumes = append(volumes, *v)- }- }+ volumes := make([]volume.Volume, 0, len(diskUsage.Volumes.Items))+ volumes = append(volumes, diskUsage.Volumes.Items...)volumeUsageCache = volumesvolumeUsageCacheTime = time.Now()@@ -73,10 +67,11 @@ func InvalidateVolumeUsageCache() {}func GetContainersUsingVolume(ctx context.Context, dockerClient *client.Client, volumeName string) ([]string, error) {- containers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})+ containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})if err != nil {return nil, fmt.Errorf("failed to list containers: %w", err)}+ containers := containerList.ItemscontainerIDs := make([]string, 0)for _, c := range containers {diff --git a/backend/internal/utils/registry/ping.go b/backend/internal/utils/registry/ping.gonew file mode 100644index 000000000..611503dd1--- /dev/null+++ b/backend/internal/utils/registry/ping.go@@ -0,0 +1,66 @@+// Package registry is derived from Moby's registry implementation.+//+// Source: https://github.com/moby/moby/blob/v28.5.2/registry/auth.go+// License: Apache License 2.0+// SPDX-License-Identifier: Apache-2.0+//+// # Simplified Wrapper as Arcane only needs the Ping Function currently+//+// This local copy is vendored to avoid pulling conflicting module variants+// during dependency resolution in this monorepo.+package registry++import (+ "context"+ "net/http"+ "net/url"+ "strings"+ "time"++ "github.com/docker/distribution/registry/client/auth/challenge"+)++type PingResponseError struct {+ Err error+}++func (e PingResponseError) Error() string {+ if e.Err == nil {+ return "registry ping response error"+ }++ return e.Err.Error()+}++func (e PingResponseError) Unwrap() error {+ return e.Err+}++// PingV2Registry attempts to ping a v2 registry and on success return a+// challenge manager for the supported authentication types.+// If a response is received but cannot be interpreted, a PingResponseError will be returned.+func PingV2Registry(ctx context.Context, endpoint *url.URL, transport http.RoundTripper) (challenge.Manager, error) {+ pingClient := &http.Client{+ Transport: transport,+ Timeout: 15 * time.Second,+ }+ endpointStr := strings.TrimRight(endpoint.String(), "/") + "/v2/"+ req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpointStr, http.NoBody)+ if err != nil {+ return nil, err+ }+ resp, err := pingClient.Do(req) //nolint:gosec // intentional request to user-configured registry endpoint+ if err != nil {+ return nil, err+ }+ defer resp.Body.Close()++ challengeManager := challenge.NewSimpleManager()+ if err := challengeManager.AddResponse(resp); err != nil {+ return nil, PingResponseError{+ Err: err,+ }+ }++ return challengeManager, nil+}diff --git a/backend/internal/utils/registry/test_connection.go b/backend/internal/utils/registry/test_connection.goindex 7a1b57fbc..7f77d4774 100644--- a/backend/internal/utils/registry/test_connection.go+++ b/backend/internal/utils/registry/test_connection.go@@ -10,7 +10,6 @@ import ("time""github.com/docker/distribution/registry/client/auth/challenge"- dockerregistry "github.com/docker/docker/registry")type TestResult struct {@@ -24,32 +23,46 @@ type TestResult struct {Errors []string `json:"errors"`}+const (+ authTimeout = 10 * time.Second+ catalogTimeout = 15 * time.Second+ registryPing = "/v2/"+ registryCatalog = "/v2/_catalog"+)++type registryConnectionTester struct {+ client *Client+ registry string+ result *TestResult+ endpoint *url.URL+}+func TestRegistryConnection(ctx context.Context, registryURL string, creds *Credentials) (*TestResult, error) {- c := NewClient()- res := &TestResult{- URL: registryURL,- Domain: registryURL,- Timestamp: time.Now(),- Errors: []string{},+ tester := ®istryConnectionTester{+ client: NewClient(),+ registry: normalizeRegistry(registryURL),+ result: &TestResult{+ URL: registryURL,+ Domain: registryURL,+ Timestamp: time.Now(),+ Errors: []string{},+ },}- reg := normalizeRegistry(registryURL)- endpointURL, err := parseRegistryEndpoint(c, reg, res)- if err != nil {- return res, err+ if err := tester.parseEndpoint(); err != nil {+ return tester.result, err}- challengeManager, err := pingRegistry(endpointURL, c, res)+ challengeManager, err := tester.ping(ctx)if err != nil {- return res, err+ return tester.result, err}- authURL := extractAuthURL(challengeManager, endpointURL)- authHeader := performAuth(ctx, c, reg, authURL, creds, res)- testCatalog(ctx, c, reg, authHeader, res)+ authHeader := tester.performAuth(ctx, challengeManager, creds)+ tester.testCatalog(ctx, authHeader)- res.OverallSuccess = res.PingSuccess && res.AuthSuccess && res.CatalogSuccess- return res, nil+ tester.result.OverallSuccess = tester.result.PingSuccess && tester.result.AuthSuccess && tester.result.CatalogSuccess+ return tester.result, nil}func normalizeRegistry(registryURL string) string {@@ -60,29 +73,25 @@ func normalizeRegistry(registryURL string) string {return reg}-func parseRegistryEndpoint(c *Client, reg string, res *TestResult) (*url.URL, error) {- registryEndpoint := c.GetRegistryURL(reg)+func (t *registryConnectionTester) parseEndpoint() error {+ registryEndpoint := t.client.GetRegistryURL(t.registry)endpointURL, err := url.Parse(registryEndpoint)if err != nil {- res.Errors = append(res.Errors, fmt.Sprintf("Invalid registry URL: %v", err))- res.PingSuccess = false- res.OverallSuccess = false- return nil, err+ t.addErrorf("Invalid registry URL: %v", err)+ return err}- return endpointURL, nil++ t.endpoint = endpointURL+ return nil}-func pingRegistry(endpointURL *url.URL, c *Client, res *TestResult) (challenge.Manager, error) {- challengeManager, err := dockerregistry.PingV2Registry(endpointURL, c.http.Transport)+func (t *registryConnectionTester) ping(ctx context.Context) (challenge.Manager, error) {+ challengeManager, err := PingV2Registry(ctx, t.endpoint, t.client.http.Transport)if err != nil {- res.Errors = append(res.Errors, fmt.Sprintf("Connectivity test failed: %v", err))- res.PingSuccess = false- res.AuthSuccess = false- res.CatalogSuccess = false- res.OverallSuccess = false+ t.addErrorf("Connectivity test failed: %v", err)return nil, err}- res.PingSuccess = true+ t.result.PingSuccess = truereturn challengeManager, nil}@@ -96,104 +105,126 @@ func extractAuthURL(challengeManager challenge.Manager, endpointURL *url.URL) streturn ""}- for _, challenge := range challenges {- if challenge.Scheme == "bearer" {- if realm, ok := challenge.Parameters["realm"]; ok {- authURL := realm- if service, ok := challenge.Parameters["service"]; ok {- authURL = fmt.Sprintf("%s?service=%s", realm, service)- }- return authURL+ for _, ch := range challenges {+ if !strings.EqualFold(ch.Scheme, "bearer") {+ continue+ }+ realm, ok := ch.Parameters["realm"]+ if !ok || strings.TrimSpace(realm) == "" {+ continue+ }++ authURL, parseErr := url.Parse(realm)+ if parseErr != nil {+ return ""+ }+ if service, ok := ch.Parameters["service"]; ok && strings.TrimSpace(service) != "" {+ query := authURL.Query()+ if query.Get("service") == "" {+ query.Set("service", service)+ authURL.RawQuery = query.Encode()}}+ return authURL.String()}+return ""}-func performAuth(ctx context.Context, c *Client, reg, authURL string, creds *Credentials, res *TestResult) string {- if authURL == "" || creds == nil {- res.AuthSuccess = (authURL == "")+func (t *registryConnectionTester) performAuth(ctx context.Context, challengeManager challenge.Manager, creds *Credentials) string {+ authURL := extractAuthURL(challengeManager, t.endpoint)+ if authURL == "" {+ t.result.AuthSuccess = true+ return ""+ }+ if creds == nil {+ t.result.AuthSuccess = falsereturn ""}- if authHeader := tryBearerAuth(ctx, c, authURL, creds, res); authHeader != "" {+ if authHeader := t.tryBearerAuth(ctx, authURL, creds); authHeader != "" {+ t.result.AuthSuccess = truereturn authHeader}- return tryBasicAuth(ctx, c, reg, creds, res)+ authHeader, ok := t.tryBasicAuth(ctx, creds)+ t.result.AuthSuccess = ok+ return authHeader}-func tryBearerAuth(ctx context.Context, c *Client, authURL string, creds *Credentials, res *TestResult) string {- tok, err := c.GetTokenMulti(ctx, authURL, []string{}, creds)+func (t *registryConnectionTester) tryBearerAuth(ctx context.Context, authURL string, creds *Credentials) string {+ tok, err := t.client.GetTokenMulti(ctx, authURL, []string{}, creds)if err == nil && tok != "" {- res.AuthSuccess = truereturn "Bearer " + tok}+return ""}-func tryBasicAuth(ctx context.Context, c *Client, reg string, creds *Credentials, res *TestResult) string {- pingURL := c.GetRegistryURL(reg) + "/v2/"- ctx2, cancel := context.WithTimeout(ctx, 10*time.Second)- defer cancel()-- req, err := http.NewRequestWithContext(ctx2, http.MethodGet, pingURL, nil)+func (t *registryConnectionTester) tryBasicAuth(ctx context.Context, creds *Credentials) (string, bool) {+ resp, err := t.doRegistryGet(ctx, registryPing, authTimeout, func(req *http.Request) {+ req.SetBasicAuth(creds.Username, creds.Token)+ })if err != nil {- res.Errors = append(res.Errors, fmt.Sprintf("Auth request creation failed: %v", err))- res.AuthSuccess = false- return ""+ t.addErrorf("Auth request failed: %v", err)+ return "", false}+ defer func() { _ = resp.Body.Close() }()- req.SetBasicAuth(creds.Username, creds.Token)- resp, err := c.http.Do(req) //nolint:gosec // intentional request to user-provided registry for connection test+ if resp.StatusCode != http.StatusOK {+ t.addErrorf("Auth failed: status %d", resp.StatusCode)+ return "", false+ }++ ba := []byte(creds.Username + ":" + creds.Token)+ return "Basic " + base64.StdEncoding.EncodeToString(ba), true+}++func (t *registryConnectionTester) testCatalog(ctx context.Context, authHeader string) {+ resp, err := t.doRegistryGet(ctx, registryCatalog, catalogTimeout, func(req *http.Request) {+ if authHeader != "" {+ req.Header.Set("Authorization", authHeader)+ }+ })if err != nil {- res.Errors = append(res.Errors, fmt.Sprintf("Auth request failed: %v", err))- res.AuthSuccess = false- return ""+ t.addErrorf("Catalog request failed: %v", err)+ t.result.CatalogSuccess = false+ return}defer func() { _ = resp.Body.Close() }()- if resp.StatusCode == http.StatusOK {- res.AuthSuccess = true- ba := []byte(creds.Username + ":" + creds.Token)- return "Basic " + base64.StdEncoding.EncodeToString(ba)+ t.result.CatalogSuccess = resp.StatusCode == http.StatusOK+ if !t.result.CatalogSuccess {+ t.addErrorf("Catalog returned status: %d", resp.StatusCode)}-- res.Errors = append(res.Errors, fmt.Sprintf("Auth failed: status %d", resp.StatusCode))- res.AuthSuccess = false- return ""}-func testCatalog(ctx context.Context, c *Client, reg, authHeader string, res *TestResult) {- catalogURL := c.GetRegistryURL(reg) + "/v2/_catalog"- ctx3, cancel := context.WithTimeout(ctx, 15*time.Second)+func (t *registryConnectionTester) doRegistryGet(ctx context.Context, path string, timeout time.Duration, setup func(*http.Request)) (*http.Response, error) {+ reqCtx, cancel := context.WithTimeout(ctx, timeout)defer cancel()- req, err := http.NewRequestWithContext(ctx3, http.MethodGet, catalogURL, nil)+ req, err := http.NewRequestWithContext(reqCtx, http.MethodGet, t.registryURL(path), http.NoBody)if err != nil {- res.Errors = append(res.Errors, fmt.Sprintf("Catalog request creation failed: %v", err))- res.CatalogSuccess = false- return+ return nil, err}-- if authHeader != "" {- req.Header.Set("Authorization", authHeader)+ if setup != nil {+ setup(req)}- resp, err := c.http.Do(req) //nolint:gosec // intentional request to user-provided registry for connection test+ resp, err := t.client.http.Do(req) //nolint:gosec // intentional request to user-provided registry for connection testif err != nil {- res.Errors = append(res.Errors, fmt.Sprintf("Catalog request failed: %v", err))- res.CatalogSuccess = false- return+ return nil, err}- defer func() { _ = resp.Body.Close() }()- if resp.StatusCode == http.StatusOK {- res.CatalogSuccess = true- } else {- res.CatalogSuccess = false- res.Errors = append(res.Errors, fmt.Sprintf("Catalog returned status: %d", resp.StatusCode))- }+ return resp, nil+}++func (t *registryConnectionTester) registryURL(path string) string {+ return strings.TrimRight(t.client.GetRegistryURL(t.registry), "/") + path+}++func (t *registryConnectionTester) addErrorf(format string, args ...any) {+ t.result.Errors = append(t.result.Errors, fmt.Sprintf(format, args...))}func trimScheme(u string) string {diff --git a/backend/pkg/libarcane/docker_compat.go b/backend/pkg/libarcane/docker_compat.goindex bc3744777..c24d9f64c 100644--- a/backend/pkg/libarcane/docker_compat.go+++ b/backend/pkg/libarcane/docker_compat.go@@ -5,8 +5,8 @@ import ("strconv""strings"- "github.com/docker/docker/api/types/network"- "github.com/docker/docker/client"+ "github.com/moby/moby/api/types/network"+ "github.com/moby/moby/client")const NetworkScopedMacAddressMinAPIVersion = "1.44"@@ -22,7 +22,7 @@ func DetectDockerAPIVersion(ctx context.Context, dockerClient *client.Client) streturn version}- serverVersion, err := dockerClient.ServerVersion(ctx)+ serverVersion, err := dockerClient.ServerVersion(ctx, client.ServerVersionOptions{})if err != nil {return ""}@@ -81,7 +81,7 @@ func SanitizeContainerCreateEndpointSettingsForDockerAPI(endpoints map[string]*nendpointCopy := *endpointif !keepPerNetworkMAC {- endpointCopy.MacAddress = ""+ endpointCopy.MacAddress = nil}cloned[networkName] = &endpointCopydiff --git a/backend/pkg/libarcane/docker_compat_test.go b/backend/pkg/libarcane/docker_compat_test.goindex 2ff38a2e4..dfd5a01bf 100644--- a/backend/pkg/libarcane/docker_compat_test.go+++ b/backend/pkg/libarcane/docker_compat_test.go@@ -1,12 +1,21 @@package libarcaneimport (+ "net"+ "net/netip""testing"- "github.com/docker/docker/api/types/network"+ "github.com/moby/moby/api/types/network""github.com/stretchr/testify/require")+func mustHardwareAddr(t *testing.T, addr string) network.HardwareAddr {+ t.Helper()+ parsed, err := net.ParseMAC(addr)+ require.NoError(t, err)+ return network.HardwareAddr(parsed)+}+func TestIsDockerAPIVersionAtLeast(t *testing.T) {tests := []struct {name string@@ -41,13 +50,13 @@ func TestSupportsDockerCreatePerNetworkMACAddress(t *testing.T) {func TestSanitizeContainerCreateEndpointSettingsForDockerAPI(t *testing.T) {input := map[string]*network.EndpointSettings{"bridge": {- MacAddress: "02:42:ac:11:00:02",- IPAddress: "172.17.0.2",+ MacAddress: mustHardwareAddr(t, "02:42:ac:11:00:02"),+ IPAddress: netip.MustParseAddr("172.17.0.2"),Aliases: []string{"svc", "svc-1"},},"custom": {- MacAddress: "02:42:ac:11:00:03",- IPAddress: "10.0.0.10",+ MacAddress: mustHardwareAddr(t, "02:42:ac:11:00:03"),+ IPAddress: netip.MustParseAddr("10.0.0.10"),Aliases: []string{"custom-svc"},},}@@ -55,21 +64,21 @@ func TestSanitizeContainerCreateEndpointSettingsForDockerAPI(t *testing.T) {t.Run("strips mac for api below 1.44", func(t *testing.T) {out := SanitizeContainerCreateEndpointSettingsForDockerAPI(input, "1.43")require.Len(t, out, 2)- require.Empty(t, out["bridge"].MacAddress)- require.Empty(t, out["custom"].MacAddress)- require.Equal(t, "172.17.0.2", out["bridge"].IPAddress)+ require.Empty(t, out["bridge"].MacAddress.String())+ require.Empty(t, out["custom"].MacAddress.String())+ require.Equal(t, netip.MustParseAddr("172.17.0.2"), out["bridge"].IPAddress)require.Equal(t, []string{"svc", "svc-1"}, out["bridge"].Aliases)// Ensure original map entries are untouched- require.Equal(t, "02:42:ac:11:00:02", input["bridge"].MacAddress)- require.Equal(t, "02:42:ac:11:00:03", input["custom"].MacAddress)+ require.Equal(t, "02:42:ac:11:00:02", input["bridge"].MacAddress.String())+ require.Equal(t, "02:42:ac:11:00:03", input["custom"].MacAddress.String())})t.Run("preserves mac for api at or above 1.44", func(t *testing.T) {out := SanitizeContainerCreateEndpointSettingsForDockerAPI(input, "1.44")require.Len(t, out, 2)- require.Equal(t, "02:42:ac:11:00:02", out["bridge"].MacAddress)- require.Equal(t, "02:42:ac:11:00:03", out["custom"].MacAddress)+ require.Equal(t, "02:42:ac:11:00:02", out["bridge"].MacAddress.String())+ require.Equal(t, "02:42:ac:11:00:03", out["custom"].MacAddress.String())})t.Run("nil or empty input", func(t *testing.T) {diff --git a/backend/pkg/projects/cmds.go b/backend/pkg/projects/cmds.goindex c85a870ac..dad1bd482 100644--- a/backend/pkg/projects/cmds.go+++ b/backend/pkg/projects/cmds.go@@ -9,8 +9,8 @@ import ("github.com/compose-spec/compose-go/v2/types""github.com/docker/compose/v5/pkg/api"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/filters"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/client")// ProgressWriterKey can be set on a context to enable JSON-line progress updates.@@ -138,7 +138,7 @@ func emitDeployContainerUpdate(w io.Writer, lastSig map[string]string, cs api.Cophase := deployPhaseFromSummary(cs)status := strings.TrimSpace(cs.Status)- sig := strings.Join([]string{phase, cs.State, cs.Health, status}, "|")+ sig := strings.Join([]string{phase, string(cs.State), string(cs.Health), status}, "|")if lastSig[name] == sig {return}@@ -148,8 +148,8 @@ func emitDeployContainerUpdate(w io.Writer, lastSig map[string]string, cs api.Co"type": "deploy","phase": phase,"service": name,- "state": cs.State,- "health": cs.Health,+ "state": string(cs.State),+ "health": string(cs.Health),}if status != "" {payload["status"] = status@@ -158,8 +158,8 @@ func emitDeployContainerUpdate(w io.Writer, lastSig map[string]string, cs api.Co}func deployPhaseFromSummary(cs api.ContainerSummary) string {- state := strings.ToLower(strings.TrimSpace(cs.State))- health := strings.ToLower(strings.TrimSpace(cs.Health))+ state := strings.ToLower(strings.TrimSpace(string(cs.State)))+ health := strings.ToLower(strings.TrimSpace(string(cs.Health)))switch {case state == "running" && health == "healthy":@@ -211,11 +211,16 @@ func ListGlobalComposeContainers(ctx context.Context) ([]container.Summary, errodefer func() { _ = c.Close() }()cli := c.dockerCli.Client()- filter := filters.NewArgs()- filter.Add("label", "com.docker.compose.project")+ filter := make(client.Filters)+ filter = filter.Add("label", "com.docker.compose.project")- return cli.ContainerList(ctx, container.ListOptions{+ listResult, err := cli.ContainerList(ctx, client.ContainerListOptions{All: true,Filters: filter,})+ if err != nil {+ return nil, err+ }++ return listResult.Items, nil}diff --git a/backend/pkg/scheduler/auto_heal_job.go b/backend/pkg/scheduler/auto_heal_job.goindex db958f610..05231a469 100644--- a/backend/pkg/scheduler/auto_heal_job.go+++ b/backend/pkg/scheduler/auto_heal_job.go@@ -7,10 +7,11 @@ import ("sync""time"- "github.com/docker/docker/api/types/container""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/services""github.com/getarcaneapp/arcane/backend/pkg/libarcane"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/client""github.com/robfig/cron/v3")@@ -78,11 +79,12 @@ func (j *AutoHealJob) Run(ctx context.Context) {return}- containers, err := dockerClient.ContainerList(ctx, container.ListOptions{All: false})+ containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: false})if err != nil {slog.ErrorContext(ctx, "auto-heal failed to list containers", "error", err)return}+ containers := containerList.ItemsexcludedContainers := j.parseExcludedContainers(ctx)maxRestarts := j.settingsService.GetIntSetting(ctx, "autoHealMaxRestarts", 5)@@ -103,17 +105,18 @@ func (j *AutoHealJob) Run(ctx context.Context) {}// Inspect to get health status- inspect, err := dockerClient.ContainerInspect(ctx, c.ID)+ inspect, err := dockerClient.ContainerInspect(ctx, c.ID, client.ContainerInspectOptions{})if err != nil {slog.WarnContext(ctx, "auto-heal failed to inspect container", "container", containerName, "error", err)continue}+ containerInspect := inspect.Container// Skip if no healthcheck configured or not unhealthy- if inspect.State == nil || inspect.State.Health == nil {+ if containerInspect.State == nil || containerInspect.State.Health == nil {continue}- if inspect.State.Health.Status != "unhealthy" {+ if containerInspect.State.Health.Status != container.Unhealthy {continue}@@ -129,7 +132,7 @@ func (j *AutoHealJob) Run(ctx context.Context) {// Restart the containerslog.InfoContext(ctx, "auto-heal restarting unhealthy container", "container", containerName, "container_id", c.ID)- if err := dockerClient.ContainerRestart(ctx, c.ID, container.StopOptions{}); err != nil {+ if _, err := dockerClient.ContainerRestart(ctx, c.ID, client.ContainerRestartOptions{}); err != nil {slog.ErrorContext(ctx, "auto-heal failed to restart container", "container", containerName, "error", err)continue}diff --git a/backend/pkg/utils/stdcopy/stdcopy.go b/backend/pkg/utils/stdcopy/stdcopy.gonew file mode 100644index 000000000..51b4e3be1--- /dev/null+++ b/backend/pkg/utils/stdcopy/stdcopy.go@@ -0,0 +1,205 @@+// Package stdcopy is derived from Moby's stdcopy implementation.+//+// Source: https://github.com/moby/moby/blob/v28.5.2/pkg/stdcopy/stdcopy.go+// License: Apache License 2.0+// SPDX-License-Identifier: Apache-2.0+//+// Modified to fix lint errors+// This local copy is vendored to avoid pulling conflicting module variants+// during dependency resolution in this monorepo.+package stdcopy++import (+ "bytes"+ "encoding/binary"+ "errors"+ "fmt"+ "io"+ "math"+ "sync"+)++// StdType is the type of standard stream+// a writer can multiplex to.+type StdType byte++const (+ // Stdin represents standard input stream type.+ Stdin StdType = iota+ // Stdout represents standard output stream type.+ Stdout+ // Stderr represents standard error steam type.+ Stderr+ // Systemerr represents errors originating from the system that make it+ // into the multiplexed stream.+ Systemerr++ stdWriterPrefixLen = 8+ stdWriterFdIndex = 0+ stdWriterSizeIndex = 4++ startingBufLen = 32*1024 + stdWriterPrefixLen + 1+)++var bufPool = &sync.Pool{New: func() any { return bytes.NewBuffer(nil) }}++// stdWriter is wrapper of io.Writer with extra customized info.+type stdWriter struct {+ io.Writer+ prefix byte+}++// Write sends the buffer to the underneath writer.+// It inserts the prefix header before the buffer,+// so stdcopy.StdCopy knows where to multiplex the output.+// It makes stdWriter to implement io.Writer.+func (w *stdWriter) Write(p []byte) (int, error) {+ if w == nil || w.Writer == nil {+ return 0, errors.New("writer not instantiated")+ }+ if p == nil {+ return 0, nil+ }+ frameSize := uint64(len(p))+ if frameSize > math.MaxUint32 {+ return 0, fmt.Errorf("message too large for stdcopy frame: %d bytes", frameSize)+ }++ header := [stdWriterPrefixLen]byte{stdWriterFdIndex: w.prefix}+ binary.BigEndian.PutUint32(header[stdWriterSizeIndex:], uint32(frameSize))+ buf := bufPool.Get().(*bytes.Buffer)+ buf.Write(header[:])+ buf.Write(p)++ n, err := w.Writer.Write(buf.Bytes())+ n -= stdWriterPrefixLen+ if n < 0 {+ n = 0+ }++ buf.Reset()+ bufPool.Put(buf)+ return n, err+}++// NewStdWriter instantiates a new Writer.+// Everything written to it will be encapsulated using a custom format,+// and written to the underlying `w` stream.+// This allows multiple write streams (e.g. stdout and stderr) to be muxed into a single connection.+// `t` indicates the id of the stream to encapsulate.+// It can be stdcopy.Stdin, stdcopy.Stdout, stdcopy.Stderr.+func NewStdWriter(w io.Writer, t StdType) io.Writer {+ return &stdWriter{+ Writer: w,+ prefix: byte(t),+ }+}++// StdCopy is a modified version of io.Copy.+//+// StdCopy will demultiplex `src`, assuming that it contains two streams,+// previously multiplexed together using a StdWriter instance.+// As it reads from `src`, StdCopy will write to `dstout` and `dsterr`.+//+// StdCopy will read until it hits EOF on `src`. It will then return a nil error.+// In other words: if `err` is non nil, it indicates a real underlying error.+//+// `written` will hold the total number of bytes written to `dstout` and `dsterr`.+func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, _ error) {+ var (+ buf = make([]byte, startingBufLen)+ nr int+ )++ for {+ nextNr, err := readUntil(src, buf, nr, stdWriterPrefixLen)+ if err != nil {+ if errors.Is(err, io.EOF) {+ return written, nil+ }+ return 0, err+ }+ nr = nextNr++ stream := StdType(buf[stdWriterFdIndex])+ out, err := streamWriter(stream, dstout, dsterr)+ if err != nil {+ return 0, err+ }++ // Retrieve the size of the frame+ frameSize := int(binary.BigEndian.Uint32(buf[stdWriterSizeIndex : stdWriterSizeIndex+4]))++ // Check if the buffer is big enough to read the frame.+ // Extend it if necessary.+ required := frameSize + stdWriterPrefixLen+ if required > len(buf) {+ buf = append(buf, make([]byte, required-len(buf)+1)...)+ }++ nextNr, err = readUntil(src, buf, nr, required)+ if err != nil {+ if errors.Is(err, io.EOF) {+ return written, nil+ }+ return 0, err+ }+ nr = nextNr++ // we might have an error from the source mixed up in our multiplexed+ // stream. if we do, return it.+ payload := buf[stdWriterPrefixLen:required]+ if stream == Systemerr {+ return written, fmt.Errorf("error from daemon in stream: %s", string(payload))+ }++ // Write the retrieved frame (without header)+ nw, err := out.Write(payload)+ if err != nil {+ return 0, err+ }++ // If the frame has not been fully written: error+ if nw != frameSize {+ return 0, io.ErrShortWrite+ }+ written += int64(nw)++ // Move the rest of the buffer to the beginning+ copy(buf, buf[required:nr])+ // Move the index+ nr -= required+ }+}++func readUntil(src io.Reader, buf []byte, current, required int) (int, error) {+ n := current+ for n < required {+ nr, err := src.Read(buf[n:])+ n += nr+ if errors.Is(err, io.EOF) {+ if n < required {+ return n, io.EOF+ }+ return n, nil+ }+ if err != nil {+ return n, err+ }+ }++ return n, nil+}++func streamWriter(stream StdType, dstout, dsterr io.Writer) (io.Writer, error) {+ switch stream {+ case Stdin, Stdout:+ return dstout, nil+ case Stderr:+ return dsterr, nil+ case Systemerr:+ return nil, nil+ default:+ return nil, fmt.Errorf("unrecognized input header: %d", stream)+ }+}diff --git a/cli/go.mod b/cli/go.modindex e7a3d7062..e22cda955 100644--- a/cli/go.mod+++ b/cli/go.mod@@ -68,7 +68,7 @@ require (github.com/xhit/go-str2duration/v2 v2.1.0 // indirectgithub.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirectgo.yaml.in/yaml/v3 v3.0.4 // indirect- go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect+ go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirectgolang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirectgolang.org/x/sync v0.19.0 // indirectgolang.org/x/sys v0.41.0 // indirectdiff --git a/cli/go.sum b/cli/go.sumindex efa506fed..ea5b808f2 100644--- a/cli/go.sum+++ b/cli/go.sum@@ -147,8 +147,7 @@ go.withmatt.com/size v0.0.0-20250220224316-11aee5773e67 h1:nHPqmzoLZv+9OqER7S2oXgo.withmatt.com/size v0.0.0-20250220224316-11aee5773e67/go.mod h1:WFmSrzphcXaSV4LG3YfIw42bPHDK8A6WsAYZCxyys/c=go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=-go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=-go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=+go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU=golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=diff --git a/frontend/src/routes/(app)/dashboard/+page.svelte b/frontend/src/routes/(app)/dashboard/+page.svelteindex 66e08235f..fc1aee79f 100644--- a/frontend/src/routes/(app)/dashboard/+page.svelte+++ b/frontend/src/routes/(app)/dashboard/+page.svelte@@ -395,7 +395,9 @@</script><div class="flex min-h-full flex-col gap-4 pt-3 md:gap-5 md:pt-4">- <header class="border-border/70 bg-card rounded-xl border p-4 shadow-sm sm:p-5">+ <header+ class="border-border/70 bg-card/75 dark:border-surface/70 dark:bg-surface/25 rounded-xl border p-4 shadow-sm supports-[backdrop-filter]:backdrop-blur-sm sm:p-5"+ ><div class="relative flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between"><div class="space-y-1.5"><p class="text-muted-foreground text-[11px] font-semibold tracking-[0.14em] uppercase">{m.dashboard_title()}</p>diff --git a/go.work.sum b/go.work.sumindex e0a61f6ab..109ea0951 100644--- a/go.work.sum+++ b/go.work.sum@@ -1,13 +1,18 @@+buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1/go.mod h1:avRlCjnFzl98VPaeCtJ24RrV/wwHFzB8sWXhj26+n/U=+buf.build/go/protovalidate v0.12.0/go.mod h1:q3PFfbzI05LeqxSwq+begW2syjy2Z6hLxZSkP1OH/D0=cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c=cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI=cloud.google.com/go/auth v0.16.4 h1:fXOAIQmkApVvcIn7Pc2+5J8QTMVbUGLscnSVNl11su8=cloud.google.com/go/auth v0.16.4/go.mod h1:j10ncYwjX/g3cdX7GpEzsdM+d+ZNsXAbb6qXA7p1Y5M=cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=+cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=+cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo=cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=@@ -20,6 +25,8 @@ cloud.google.com/go/spanner v1.85.0 h1:VVO3yW+0+Yx9tg4SQaZvJHGAnU6qCnGXQ3NX4E3+scloud.google.com/go/spanner v1.85.0/go.mod h1:9zhmtOEoYV06nE4Orbin0dc/ugHzZW9yXuvaM61rpxs=cloud.google.com/go/storage v1.56.0 h1:iixmq2Fse2tqxMbWhLWC9HfBj1qdxqAmiK8/eqtsLxI=cloud.google.com/go/storage v1.56.0/go.mod h1:Tpuj6t4NweCLzlNbw9Z9iwxEkrSem20AetIeH/shgVU=+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o=@@ -28,8 +35,12 @@ github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkgithub.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2 h1:Hr5FTipp7SL07o2FvoVOX9HRiRH3CR3Mj8pxqCcdD5A=github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2/go.mod h1:QyVsSSN64v5TGltphKLQ2sQxe4OBQg0J1eKRcVBnfgE=+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 h1:JXg2dwJUmPB9JmtVmdEB16APJ7jurfbY5jnfXpJoRMc=+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0/go.mod h1:YD5h/ldMsG0XiIw7PdyNhLxaM317eFh5yNLccNfGdyw=github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0 h1:MhRfI58HblXzCtWEZCO0feHs8LweePB3s90r7WaR1KU=github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0/go.mod h1:okZ+ZURbArNdlJ+ptXoyHNuOETzOl1Oww19rm8I2WLA=+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0 h1:mlmW46Q0B79I+Aj4azKC6xDMFN9a9SyZWESlGWYXbFs=@@ -46,6 +57,8 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMgithub.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=+github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=+github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=github.com/ClickHouse/clickhouse-go v1.4.3 h1:iAFMa2UrQdR5bHJ2/yaSLffZkxpcOYQMCUuKeNXGdqc=@@ -67,6 +80,8 @@ github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ogithub.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=+github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM=+github.com/agnivade/levenshtein v1.2.1/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU=github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=@@ -79,6 +94,7 @@ github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwTogithub.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=+github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=github.com/apache/arrow/go/v10 v10.0.1 h1:n9dERvixoC/1JjDmBcs9FPaEryoANa2sCgVFo6ez9cI=github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY=@@ -93,42 +109,78 @@ github.com/aws/aws-sdk-go v1.49.6 h1:yNldzF5kzLBRvKlKz1S0bkvc2+04R1kt13KfBWQBfFAgithub.com/aws/aws-sdk-go v1.49.6/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=github.com/aws/aws-sdk-go-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J+Z8=github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg=+github.com/aws/aws-sdk-go-v2 v1.39.6 h1:2JrPCVgWJm7bm83BDwY5z8ietmeJUbh3O2ACnn+Xsqk=+github.com/aws/aws-sdk-go-v2 v1.39.6/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg=github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg=+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY=+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2/go.mod h1:IusfVNTmiSN3t4rhxWFaBAqn+mcNdwKtPcV16eYdgko=github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco=github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE=+github.com/aws/aws-sdk-go-v2/config v1.31.20 h1:/jWF4Wu90EhKCgjTdy1DGxcbcbNrjfBHvksEL79tfQc=+github.com/aws/aws-sdk-go-v2/config v1.31.20/go.mod h1:95Hh1Tc5VYKL9NJ7tAkDcqeKt+MCXQB1hQZaRdJIZE0=github.com/aws/aws-sdk-go-v2/credentials v1.18.7 h1:zqg4OMrKj+t5HlswDApgvAHjxKtlduKS7KicXB+7RLg=github.com/aws/aws-sdk-go-v2/credentials v1.18.7/go.mod h1:/4M5OidTskkgkv+nCIfC9/tbiQ/c8qTox9QcUDV0cgc=+github.com/aws/aws-sdk-go-v2/credentials v1.18.24 h1:iJ2FmPT35EaIB0+kMa6TnQ+PwG5A1prEdAw+PsMzfHg=+github.com/aws/aws-sdk-go-v2/credentials v1.18.24/go.mod h1:U91+DrfjAiXPDEGYhh/x29o4p0qHX5HDqG7y5VViv64=github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0=github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY=+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 h1:T1brd5dR3/fzNFAQch/iBKeX07/ffu/cLu+q+RuzEWk=+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13/go.mod h1:Peg/GBAQ6JDt+RoBf4meB1wylmAipb7Kg2ZFakZTlwk=github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 h1:zeN9UtUlA6FTx0vFSayxSX32HDw73Yb6Hh2izDSFxXY=github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10/go.mod h1:3HKuexPDcwLWPaqpW2UR/9n8N/u/3CKcGAzSs8p8u8g=github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg=github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao=+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 h1:a+8/MLcWlIxo1lF9xaGt3J/u3yOZx+CdSveSNwjhD40=+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13/go.mod h1:oGnKwIYZ4XttyU2JWxFrwvhF6YKiK/9/wmE3v3Iu9K8=github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw=github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA=+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 h1:HBSI2kDkMdWz4ZM7FjwE7e/pWDEZ+nR95x8Ztet1ooY=+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13/go.mod h1:YE94ZoDArI7awZqJzBAZ3PDD2zSfuP7w6P2knOzIn8M=github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQeLKY2A0KhDh47+wI=github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg=+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12 h1:itu4KHu8JK/N6NcLIISlf3LL1LccMqruLUXZ9y7yBZw=+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12/go.mod h1:i+6vTU3xziikTY3vcox23X8pPGW5X3wVgd1VZ7ha+x8=github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM=github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44=+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o=+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3/go.mod h1:IW1jwyrQgMdhisceG8fQLmQIydcT/jWY21rFhzgaKwo=github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 h1:Beh9oVgtQnBgR4sKKzkUBRQpf1GnL4wt0l4s8h2VCJ0=github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4/go.mod h1:b17At0o8inygF+c6FOD3rNyYZufPw62o9XJbSfQPgbo=+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3 h1:NEe7FaViguRQEm8zl8Ay/kC/QRsMtWUiCGZajQIsLdc=+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3/go.mod h1:JLuCKu5VfiLBBBl/5IzZILU7rxS0koQpHzMOCzycOJU=github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI=github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s=+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 h1:kDqdFvMY4AtKoACfzIGD8A0+hbT41KTKF//gq7jITfM=+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13/go.mod h1:lmKuogqSU3HzQCwZ9ZtcqOc5XGMqtDK7OIc2+DxiUEg=github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 h1:HVSeukL40rHclNcUqVcBwE1YoZhOkoLeBfhUqR3tjIU=github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4/go.mod h1:DnbBOv4FlIXHj2/xmrUQYtawRFC9L9ZmQPz+DBc6X5I=+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12 h1:R3uW0iKl8rgNEXNjVGliW/oMEh9fO/LlUEV8RvIFr1I=+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12/go.mod h1:XEttbEr5yqsw8ebi7vlDoGJJjMXRez4/s9pibpJyL5s=github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw=github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4=+github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1 h1:Dq82AV+Qxpno/fG162eAhnD8d48t9S+GZCfz7yv1VeA=+github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1/go.mod h1:MbKLznDKpf7PnSonNRUVYZzfP0CeLkRIUexeblgKcU4=github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0=github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8=+github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 h1:NjShtS1t8r5LUfFVtFeI8xLAHQNTa7UI0VawXlrBMFQ=+github.com/aws/aws-sdk-go-v2/service/sso v1.30.3/go.mod h1:fKvyjJcz63iL/ftA6RaM8sRCtN4r4zl4tjL3qw5ec7k=github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 h1:Bnr+fXrlrPEoR1MAFrHVsge3M/WoK4n23VNhRM7TPHI=github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM=+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 h1:gTsnx0xXNQ6SBbymoDvcoRHL+q4l/dAFsQuKfDWSaGc=+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7/go.mod h1:klO+ejMvYsB4QATfEOIXk8WAEwN4N0aBfJpvC+5SZBo=github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc=github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo=+github.com/aws/aws-sdk-go-v2/service/sts v1.40.2 h1:HK5ON3KmQV2HcAunnx4sKLB9aPf3gKGwVAf7xnx0QT0=+github.com/aws/aws-sdk-go-v2/service/sts v1.40.2/go.mod h1:E19xDjpzPZC7LS2knI9E6BaRFDK43Eul7vd6rSq2HWk=github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=+github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=+github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0=github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=github.com/bits-and-blooms/bitset v1.24.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=@@ -141,15 +193,22 @@ github.com/bwesterb/go-ristretto v1.2.3 h1:1w53tCkGhCQ5djbat3+MH0BAQ5Kfgbt56UZQ/github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI=github.com/checkpoint-restore/checkpointctl v1.4.0 h1:3kRns56TArwiyHOMakaumUgSZZlB1hZBkjVgR6IeZ3E=github.com/checkpoint-restore/checkpointctl v1.4.0/go.mod h1:ynQ52zQBazgcTZuxpwTFzRinIcAf0haDTC1X1LA/FKA=github.com/checkpoint-restore/go-criu/v7 v7.2.0 h1:qGiWA4App1gGlEfIJ68WR9jbezV9J7yZdjzglezcqKo=github.com/checkpoint-restore/go-criu/v7 v7.2.0/go.mod h1:u0LCWLg0w4yqqu14aXhiB4YD3a1qd8EcCEg7vda5dwo=+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=+github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=+github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok=github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE=+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=github.com/clipperhouse/displaywidth v0.4.1 h1:uVw9V8UDfnggg3K2U84VWY1YLQ/x2aKSCtkRyYozfoU=github.com/clipperhouse/displaywidth v0.4.1/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=github.com/clipperhouse/displaywidth v0.6.1/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=@@ -160,18 +219,25 @@ github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PYgithub.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f h1:Y8xYupdHxryycyPlc9Y+bSQAYZnetRJ70VMVKm5CKI0=github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f/go.mod h1:HlzOvOjVBOfTGSRXRyY0OiCS/3J1akRGQQpRO/7zyF4=github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 h1:6xNmx7iTtyBRev0+D/Tv1FZd4SCg8axKApyNyRsAt/w=github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5/go.mod h1:KdCmV+x/BuvyMxRnYBlmVaq4OLiKW6iRQfvC62cvdkI=github.com/cockroachdb/cockroach-go/v2 v2.1.1 h1:3XzfSMuUT0wBe1a3o5C0eOTcArhmmFAg2Jzh/7hhKqo=github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3Kb23bWV10IRV1TyeSpwM=+github.com/compose-spec/compose-go/v2 v2.9.1/go.mod h1:Oky9AZGTRB4E+0VbTPZTUu4Kp+oEMMuwZXZtPPVT1iE=github.com/containerd/accelerated-container-image v1.3.0 h1:sFbTgSuMboeKHa9f7MY11hWF1XxVWjFoiTsXYtOtvdU=github.com/containerd/accelerated-container-image v1.3.0/go.mod h1:EvKVWor6ZQNUyYp0MZm5hw4k21ropuz7EegM+m/Jb/Q=github.com/containerd/btrfs/v2 v2.0.0 h1:FN4wsx7KQrYoLXN7uLP0vBV4oVWHOIKDRQ1G2Z0oL5M=github.com/containerd/btrfs/v2 v2.0.0/go.mod h1:swkD/7j9HApWpzl8OHfrHNxppPd9l44DFZdF94BUj9k=+github.com/containerd/containerd v1.7.23 h1:H2CClyUkmpKAGlhQp95g2WXHfLYc7whAuvZGBNYOOwQ=+github.com/containerd/containerd/v2 v2.2.0-rc.0/go.mod h1:X7H17UATRidzfNzb5vS/l30qEJk0ktoTEU1thMh0Nbk=+github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.6 h1:gfW1JsN//B97zhsQ84Kkar7WJqod1fmWf8zKHmz+ieY=github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.6/go.mod h1:Mau9LZ7ZnyKCIgcNT7sMG5fjaZ9YCOHU5RuolUikhBQ=+github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.7 h1:pD+wZQE81lBgjiQRaDMJYd9k9k/Xc90eKNpZho1r2tI=+github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.7/go.mod h1:gzkTvoDZmX6hLuNn6qQ8s3wkTJ+Va9SbT76v07GzVK0=github.com/containerd/go-cni v1.1.13 h1:eFSGOKlhoYNxpJ51KRIMHZNlg5UgocXEIEBGkY7Hnis=github.com/containerd/go-cni v1.1.13/go.mod h1:nTieub0XDRmvCZ9VI/SBG6PyqT95N4FIhxsauF1vSBI=github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA=@@ -184,6 +250,7 @@ github.com/containerd/nri v0.11.0 h1:26mcQwNG58AZn0YkOrlJQ0yxQVmyZooflnVWJTqQrqQgithub.com/containerd/nri v0.11.0/go.mod h1:bjGTLdUA58WgghKHg8azFMGXr05n1wDHrt3NSVBHiGI=github.com/containerd/otelttrpc v0.1.0 h1:UOX68eVTE8H/T45JveIg+I22Ev2aFj4qPITCmXsskjw=github.com/containerd/otelttrpc v0.1.0/go.mod h1:XhoA2VvaGPW1clB2ULwrBZfXVuEWuyOd2NUD1IM0yTg=+github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=github.com/containerd/stargz-snapshotter v0.17.0/go.mod h1:ySEul1ck7jCE4jqsuFCo8FFLrHU20UWQeI9g7mdsanI=github.com/containerd/zfs/v2 v2.0.0-rc.0 h1:0dRlgpoaepW7HuovtcvYQMF7NlpceQVdn7+3Udeth4M=github.com/containerd/zfs/v2 v2.0.0-rc.0/go.mod h1:g36g/XCEGDRxUXIFdM3oWAEvmTvhfz/eKWElqg4Secw=@@ -203,8 +270,6 @@ github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zgithub.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=-github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 h1:uX1JmpONuD549D73r6cgnxyUu18Zb7yHAy5AYU0Pm4Q=-github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369 h1:XNT/Zf5l++1Pyg08/HV04ppB0gKxAqtZQBRYiYrUuYk=github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=github.com/danielgtaylor/mexpr v1.9.1 h1:nA9bsGRmNlJeVCPFgGf7WhrLuKag/+iWfOaJ03iKFPI=@@ -213,20 +278,32 @@ github.com/danielgtaylor/shorthand/v2 v2.2.0 h1:hVsemdRq6v3JocP6YRTfu9rOoghZI9PFgithub.com/danielgtaylor/shorthand/v2 v2.2.0/go.mod h1:t5QfaNf7DPru9ZLIIhPQSO7Gyvajm3euw7LxB/MTUqE=github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73 h1:OGNva6WhsKst5OZf7eZOklDztV3hwtTHovdrLHV+MsA=+github.com/digitorus/pkcs7 v0.0.0-20230713084857-e76b763bdc49/go.mod h1:SKVExuS+vpu2l9IoOc0RwqE7NYnb0JlcFHFnEJkVDzc=github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=+github.com/docker/cli v29.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=+github.com/docker/cli v29.1.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=github.com/docker/cli-docs-tool v0.10.0/go.mod h1:5EM5zPnT2E7yCLERZmrDA234Vwn09fzRHP4aX1qwp1U=+github.com/docker/cli-docs-tool v0.11.0 h1:7d8QARFb7QEobizqxmEM7fOteZEHwH/zWgHQtHZEcfE=+github.com/docker/cli-docs-tool v0.11.0/go.mod h1:ma8BKiisUo8D6W05XEYIh3oa1UbgrZhi1nowyKFJa8Q=github.com/docker/compose/v5 v5.0.0/go.mod h1:BurapGv8zmYnsbSmlpCz5EU2Pi3YFV/PjeUnoFpcw64=github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=github.com/dvsekhvalnov/jose2go v1.7.0 h1:bnQc8+GMnidJZA8zc6lLEAb4xNrIqHwO+9TzqvtQZPo=github.com/dvsekhvalnov/jose2go v1.7.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 h1:aaQcKT9WumO6JEJcRyTqFVq4XUZiUcKR2/GI31TOcz8=github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329 h1:K+fnvUM0VZ7ZFJf0n4L/BRlnsb9pL/GuDG6FqaH+PwM=github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329/go.mod h1:Alz8LEClvR7xKsrq3qzoc4N0guvVNSS8KmSChGYr9hs=github.com/envoyproxy/go-control-plane v0.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA=@@ -237,6 +314,7 @@ github.com/envoyproxy/go-control-plane/envoy v1.36.0 h1:yg/JjO5E7ubRyKX3m07GF3regithub.com/envoyproxy/go-control-plane/envoy v1.36.0/go.mod h1:ty89S1YCCVruQAm9OtKeEkQLTb+Lkz0k8v9W0Oxsv98=github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=github.com/envoyproxy/protoc-gen-validate v1.3.0 h1:TvGH1wof4H33rezVKWSpqKz5NXWg5VPuZ0uONDT6eb4=@@ -258,19 +336,31 @@ github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHgithub.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=github.com/go-co-op/gocron/v2 v2.18.2/go.mod h1:Zii6he+Zfgy5W9B+JKk/KwejFOW0kZTFvHtwIpR4aBI=+github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=+github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=+github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo=github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=+github.com/go-rod/rod v0.116.2 h1:A5t2Ky2A+5eD/ZJQr1EfsQSe5rms5Xof/qj296e+ZqA=+github.com/go-rod/rod v0.116.2/go.mod h1:H+CMO9SCNc2TJ2WfrG+pKhITz57uGNYU43qYHh438Mg=+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=github.com/goccy/go-yaml v1.19.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556 h1:N/MD/sr6o61X+iZBAT2qEUF023s4KbA8RWfKzl0L6MQ=github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=@@ -286,13 +376,28 @@ github.com/gofiber/fiber/v2 v2.52.11 h1:5f4yzKLcBcF8ha1GQTWB+mpblWz3Vz6nSAbTL31Hgithub.com/gofiber/fiber/v2 v2.52.11/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I=github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=+github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI=github.com/google/certtostore v1.0.6 h1:LlCIgyTvDxTlcncMPTSYZGo6lCsiHzO6Dy7ff6ltk/0=github.com/google/certtostore v1.0.6/go.mod h1:2N0ZPLkGvQWhYvXaiBGq02r71fnSLfq78VKIWQHr1wo=github.com/google/deck v0.0.0-20230104221208-105ad94aa8ae h1:Iy1Ad7L9qPtNAFJad+Ch2kwDXrcwu7QUBR0bfChjnEM=@@ -301,13 +406,18 @@ github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSgithub.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=-github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=-github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=github.com/google/go-dap v0.12.0 h1:rVcjv3SyMIrpaOoTAdFDyHs99CwVOItIJGKLQFQhNeM=github.com/google/go-dap v0.12.0/go.mod h1:tNjCASCm5cqePi/RVXXWEVqtnNLV1KTWtYOqu6rZNzc=+github.com/google/go-dap v0.12.1-0.20250904181021-d7a2259b058b h1:m+yLjBIoXaMKk6pwd1IJYYgM76+mwcy7J9+cuY7LqmQ=+github.com/google/go-dap v0.12.1-0.20250904181021-d7a2259b058b/go.mod h1:tNjCASCm5cqePi/RVXXWEVqtnNLV1KTWtYOqu6rZNzc=github.com/google/go-github/v39 v39.2.0 h1:rNNM311XtPOz5rDdsJXAp2o8F67X9FnROXTvto3aSnQ=github.com/google/go-github/v39 v39.2.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE=github.com/google/go-intervals v0.0.2 h1:FGrVEiUnTRKR8yE04qzXYaJMtnIYqobR5QbblK3ixcM=@@ -315,20 +425,32 @@ github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjgithub.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=+github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=+github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=+github.com/google/trillian v1.7.2 h1:EPBxc4YWY4Ak8tcuhyFleY+zYlbCDCa4Sn24e1Ka8Js=+github.com/google/trillian v1.7.2/go.mod h1:mfQJW4qRH6/ilABtPYNBerVJAJ/upxHLX81zxNQw05s=+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=+github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=+github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20=github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk=github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI=+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3/go.mod h1:NbCUVmiS4foBGBHOYlCT25+YmGpJ32dZPi75pGEUpj4=+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M=github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=+github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=+github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=github.com/hanwen/go-fuse/v2 v2.8.0 h1:wV8rG7rmCz8XHSOwBZhG5YcVqcYjkzivjmbaMafPlAs=github.com/hanwen/go-fuse/v2 v2.8.0/go.mod h1:yE6D2PqWwm3CbYRxFXV9xUd8Md5d6NG0WBs5spCswmI=github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=@@ -346,6 +468,8 @@ github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbgithub.com/hiddeco/sshsig v0.2.0 h1:gMWllgKCITXdydVkDL+Zro0PU96QI55LwUwebSwNTSw=github.com/hiddeco/sshsig v0.2.0/go.mod h1:nJc98aGgiH6Yql2doqH4CTBVHexQA40Q+hMMLHP4EqE=github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=+github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=+github.com/ianlancetaylor/demangle v0.0.0-20250417193237-f615e6bd150b/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=github.com/intel/goresctrl v0.10.0 h1:Q94PBhLtQM/aVxVTKzB1j/ooMuV+9XleTN1fq2OGsSo=github.com/intel/goresctrl v0.10.0/go.mod h1:1S8GDqL46GuKb525bxNhIEEkhf4rhVcbSf9DuKhp7mw=github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=@@ -362,6 +486,8 @@ github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=github.com/jackc/pgx/v4 v4.18.2 h1:xVpYkNR5pk5bMCZGfClbO962UIqVABcAGt7ha1s/FeU=github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=+github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b h1:ZGiXF8sz7PDk6RgkP+A/SFfUD0ZR/AgG6SpRNEDKZy8=+github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b/go.mod h1:hQmNrgofl+IY/8L+n20H6E6PWBBTokdsv+q49j0QhsU=github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=github.com/jordanlewis/gcassert v0.0.0-20250430164644-389ef753e22e h1:a+PGEeXb+exwBS3NboqXHyxarD9kaboBbrSp+7GuBuc=@@ -387,12 +513,17 @@ github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzgithub.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=+github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=+github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=+github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=github.com/knqyf263/go-plugin v0.9.0 h1:CQs2+lOPIlkZVtcb835ZYDEoyyWJWLbSTWeCs0EwTwI=github.com/knqyf263/go-plugin v0.9.0/go.mod h1:2z5lCO1/pez6qGo8CvCxSlBFSEat4MEp1DrnA+f7w8Q=+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=github.com/ktrysmt/go-bitbucket v0.6.4 h1:C8dUGp0qkwncKtAnozHCbbqhptefzEd1I0sfnuy9rYQ=github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=@@ -402,8 +533,26 @@ github.com/labstack/echo/v4 v4.15.0 h1:hoRTKWcnR5STXZFe9BmYun9AMTNeSbjHi2vtDuADJgithub.com/labstack/echo/v4 v4.15.0/go.mod h1:xmw1clThob0BSVRX1CRQkGQ/vjwcpOMjQZSZa9fKA/c=github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=+github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA=+github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw=+github.com/lestrrat-go/dsig v1.0.0 h1:OE09s2r9Z81kxzJYRn07TFM9XA4akrUdoMwr0L8xj38=+github.com/lestrrat-go/dsig v1.0.0/go.mod h1:dEgoOYYEJvW6XGbLasr8TFcAxoWrKlbQvmJgCR0qkDo=+github.com/lestrrat-go/dsig-secp256k1 v1.0.0 h1:JpDe4Aybfl0soBvoVwjqDbp+9S1Y2OM7gcrVVMFPOzY=+github.com/lestrrat-go/dsig-secp256k1 v1.0.0/go.mod h1:CxUgAhssb8FToqbL8NjSPoGQlnO4w3LG1P0qPWQm/NU=+github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=+github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=+github.com/lestrrat-go/httprc/v3 v3.0.1 h1:3n7Es68YYGZb2Jf+k//llA4FTZMl3yCwIjFIk4ubevI=+github.com/lestrrat-go/httprc/v3 v3.0.1/go.mod h1:2uAvmbXE4Xq8kAUjVrZOq1tZVYYYs5iP62Cmtru00xk=+github.com/lestrrat-go/jwx/v3 v3.0.11 h1:yEeUGNUuNjcez/Voxvr7XPTYNraSQTENJgtVTfwvG/w=+github.com/lestrrat-go/jwx/v3 v3.0.11/go.mod h1:XSOAh2SiXm0QgRe3DulLZLyt+wUuEdFo81zuKTLcvgQ=+github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=+github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=+github.com/lestrrat-go/option/v2 v2.0.0 h1:XxrcaJESE1fokHy3FpaQ/cXW8ZsIdWcdFzzLOcID3Ss=+github.com/lestrrat-go/option/v2 v2.0.0/go.mod h1:oSySsmzMoR0iRzCDCaUfsCzxQHUEuhOViQObyy7S6Vg=github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2TSgRbAhD7yjZzTQmcN25sDRPEeinR51yQ=github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk=+github.com/letsencrypt/boulder v0.20251110.0 h1:J8MnKICeilO91dyQ2n5eBbab24neHzUpYMUIOdOtbjc=+github.com/letsencrypt/boulder v0.20251110.0/go.mod h1:ogKCJQwll82m7OVHWyTuf8eeFCjuzdRQlgnZcCl0V+8=github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=@@ -413,6 +562,7 @@ github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWgithub.com/markbates/pkger v0.15.1 h1:3MPelV53RnGSW07izx5xGxl4e/sdRD6zqseIk0rMASY=github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=github.com/mattn/go-runewidth v0.0.17/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=@@ -423,21 +573,33 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fgithub.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=github.com/microsoft/go-mssqldb v1.0.0 h1:k2p2uuG8T5T/7Hp7/e3vMGTnnR0sU4h8d1CcC71iLHU=github.com/microsoft/go-mssqldb v1.0.0/go.mod h1:+4wZTUnz/SV6nffv+RRRB/ss8jPng5Sho2SmM1l2ts4=+github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=+github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=+github.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=github.com/mistifyio/go-zfs/v3 v3.1.0 h1:FZaylcg0hjUp27i23VcJJQiuBeAZjrC8lPqCGM1CopY=github.com/mistifyio/go-zfs/v3 v3.1.0/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=github.com/moby/buildkit v0.26.2/go.mod h1:ylDa7IqzVJgLdi/wO7H1qLREFQpmhFbw2fbn4yoTw40=+github.com/moby/buildkit v0.27.0/go.mod h1:4STUkNc5t1nf03HS+01UmI2X6FdfOI3XaKt9QNoTsms=+github.com/moby/moby/api v1.52.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=+github.com/moby/moby/client v0.2.1/go.mod h1:O+/tw5d4a1Ha/ZA/tPxIZJapJRUS6LNZ1wiVRxYHyUE=+github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=github.com/moby/policy-helpers v0.0.0-20251105011237-bcaa71c99f14 h1:JO22uXMy3CN7wh7A/wrtYQWV1WYQMg2gh6d8YO325k4=github.com/moby/policy-helpers v0.0.0-20251105011237-bcaa71c99f14/go.mod h1:HJfK0E8dR+Jpk5anJ3oADg2dRSom1gJK17sqEiiMS7w=+github.com/moby/policy-helpers v0.0.0-20251206004813-9fcc1a9ec5c9/go.mod h1:nJ1clNCIXZqUu3jxCkaUBpeR5bKyzzb7wmEG4xhecTI=+github.com/moby/policy-helpers v0.0.0-20260127165209-eeebf1a0ab2b h1:WcW9/84hduRbc//v0Q6qG1ZHGNv0uWPjA/7e4B/nTLI=+github.com/moby/policy-helpers v0.0.0-20260127165209-eeebf1a0ab2b/go.mod h1:nJ1clNCIXZqUu3jxCkaUBpeR5bKyzzb7wmEG4xhecTI=github.com/moby/profiles/seccomp v0.1.0 h1:kVf1lc5ytNB1XPxEdZUVF+oPpbBYJHR50eEvPt/9k8A=github.com/moby/profiles/seccomp v0.1.0/go.mod h1:Kqk57vxH6/wuOc5bmqRiSXJ6iEz8Pvo3LQRkv0ytFWs=github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=@@ -464,6 +626,9 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU=github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=+github.com/open-policy-agent/opa v1.10.1 h1:haIvxZSPky8HLjRrvQwWAjCPLg8JDFSZMbbG4yyUHgY=+github.com/open-policy-agent/opa v1.10.1/go.mod h1:7uPI3iRpOalJ0BhK6s1JALWPU9HvaV1XeBSSMZnr/PM=+github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 h1:2xZEHOdeQBV6PW8ZtimN863bIOl7OCW/X10K0cnxKeA=github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2/go.mod h1:MXdPzqAA8pHC58USHqNCSjyLnRQ6D+NjbpP+02Z1U/0=github.com/opencontainers/runtime-tools v0.9.1-0.20251114084447-edf4cb3d2116 h1:tAKu3NkKWZYpqBSOJKwTxT1wIGueiF7gcmcNgr5pNTY=@@ -481,25 +646,39 @@ github.com/pierrec/lz4/v4 v4.1.16/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFugithub.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=+github.com/planetscale/vtprotobuf v0.6.0/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=github.com/proglottis/gpgme v0.1.5 h1:KCGyOw8sQ+SI96j6G8D8YkOGn+1TwbQTT9/zQXoVlz0=github.com/proglottis/gpgme v0.1.5/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=+github.com/prometheus/otlptranslator v0.0.2 h1:+1CdeLVrRQ6Psmhnobldo0kTp96Rj80DRXRd5OSnMEQ=+github.com/prometheus/otlptranslator v0.0.2/go.mod h1:P8AwMgdD7XEr6QRUJ2QWLpiAZTgTE2UYgjlu3svompI=+github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=+github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg=+github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79 h1:V7x0hCAgL8lNGezuex1RW1sh7VXXCqfw8nXZti66iFg=github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79/go.mod h1:xF/KoXmrRyahPfo5L7Szb5cAAUl53dMWBh9cMruGEZg=github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=+github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU=github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=+github.com/sassoftware/relic v7.2.1+incompatible h1:Pwyh1F3I0r4clFJXkSI8bOyJINGqpgjJU3DYAZeI05A=+github.com/sassoftware/relic v7.2.1+incompatible/go.mod h1:CWfAxv73/iLZ17rbyhIEq3K9hs5w6FpNMdUT//qR+zk=github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=+github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=+github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b h1:h+3JX2VoWTFuyQEo87pStk/a99dzIO1mM9KxIyLPGTU=@@ -514,6 +693,7 @@ github.com/sigstore/protobuf-specs v0.4.1 h1:5SsMqZbdkcO/DNHudaxuCUEjj6x29tS2Xbygithub.com/sigstore/protobuf-specs v0.4.1/go.mod h1:+gXR+38nIa2oEupqDdzg4qSBT0Os+sP7oYv6alWewWc=github.com/sigstore/sigstore v1.9.5 h1:Wm1LT9yF4LhQdEMy5A2JeGRHTrAWGjT3ubE5JUSrGVU=github.com/sigstore/sigstore v1.9.5/go.mod h1:VtxgvGqCmEZN9X2zhFSOkfXxvKUjpy8RpUW39oCtoII=+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=github.com/smallstep/pkcs7 v0.1.1 h1:x+rPdt2W088V9Vkjho4KtoggyktZJlMduZAtRHm68LU=@@ -527,23 +707,33 @@ github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsgithub.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw=github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M=+github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=github.com/sylabs/sif/v2 v2.22.0 h1:Y+xXufp4RdgZe02SR3nWEg7S6q4tPWN237WHYzkDSKA=github.com/sylabs/sif/v2 v2.22.0/go.mod h1:W1XhWTmG1KcG7j5a3KSYdMcUIFvbs240w/MMVW627hs=github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=+github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=+github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=github.com/tchap/go-patricia/v2 v2.3.3 h1:xfNEsODumaEcCcY3gI0hYPZ/PcpVv5ju6RMAhgwZDDc=github.com/tchap/go-patricia/v2 v2.3.3/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=github.com/tetratelabs/wazero v1.10.1 h1:2DugeJf6VVk58KTPszlNfeeN8AhhpwcZqkJj2wwFuH8=github.com/tetratelabs/wazero v1.10.1/go.mod h1:DRm5twOQ5Gr1AoEdSi0CLjDQF1J9ZAuyqFIjl1KKfQU=+github.com/theupdateframework/go-tuf v0.7.0/go.mod h1:uEB7WSY+7ZIugK6R1hiBMBjQftaFzn7ZCDJcp1tCUug=+github.com/tink-crypto/tink-go/v2 v2.5.0 h1:B8KLF6AofxdBIE4UJIaFbmoj5/1ehEtt7/MmzfI4Zpw=+github.com/tink-crypto/tink-go/v2 v2.5.0/go.mod h1:2WbBA6pfNsAfBwDCggboaHeB2X29wkU8XHtGwh2YIk8=github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9 h1:GWuTlpuUQBaK6u0R3HwE+eWaQ2aXwHgo8CaXgqtDQZU=github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9/go.mod h1:cD0SB2270BYw6HYKriFn4H6NRLhGj6ytf48YTpsm8LY=+github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2 h1:5p6hffZeB25G4rhBc3HU6x1aIlyDELfib+/Omq+ZfQA=+github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2/go.mod h1:cD0SB2270BYw6HYKriFn4H6NRLhGj6ytf48YTpsm8LY=github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0=github.com/tonistiigi/go-archvariant v1.0.0/go.mod h1:TxFmO5VS6vMq2kvs3ht04iPXtu2rUT/erOnGFYfk5Ho=github.com/tonistiigi/jaeger-ui-rest v0.0.0-20250408171107-3dd17559e117 h1:XFwyh2JZwR5aiKLXHX2C1n0v5F11dCJpyGL1W/Cpl3U=@@ -562,10 +752,14 @@ github.com/valyala/fasthttp v1.62.0 h1:8dKRBX/y2rCzyc6903Zu1+3qN0H/d2MsxPPmVNamigithub.com/valyala/fasthttp v1.62.0/go.mod h1:FCINgr4GKdKqV8Q0xv8b+UxPV+H/O5nNFo3D+r54Htg=github.com/valyala/fasthttp v1.69.0 h1:fNLLESD2SooWeh2cidsuFtOcrEi4uB4m1mPrkJMZyVI=github.com/valyala/fasthttp v1.69.0/go.mod h1:4wA4PfAraPlAsJ5jMSqCE2ug5tqUPwKXxVj8oNECGcw=+github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=+github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=github.com/vbauerster/mpb/v8 v8.10.2 h1:2uBykSHAYHekE11YvJhKxYmLATKHAGorZwFlyNw4hHM=github.com/vbauerster/mpb/v8 v8.10.2/go.mod h1:+Ja4P92E3/CorSZgfDtK46D7AVbDqmBQRTmyTqPElo0=+github.com/vektah/gqlparser/v2 v2.5.30 h1:EqLwGAFLIzt1wpx1IPpY67DwUujF1OfzgEyDsLrN6kE=+github.com/vektah/gqlparser/v2 v2.5.30/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0=github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4=github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=@@ -578,12 +772,28 @@ github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=github.com/xyproto/randomstring v1.2.0 h1:y7PXAEBM3XlwJjPG2JQg4voxBYZ4+hPgRdGKCfU8wik=github.com/xyproto/randomstring v1.2.0/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=+github.com/yashtewari/glob-intersection v0.2.0 h1:8iuHdN88yYuCzCdjt0gDe+6bAhUwBeEWqThExu54RFg=+github.com/yashtewari/glob-intersection v0.2.0/go.mod h1:LK7pIC3piUjovexikBbJ26Yml7g8xa5bsjfx2v1fwok=github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=+github.com/ysmood/fetchup v0.2.3 h1:ulX+SonA0Vma5zUFXtv52Kzip/xe7aj4vqT5AJwQ+ZQ=+github.com/ysmood/fetchup v0.2.3/go.mod h1:xhibcRKziSvol0H1/pj33dnKrYyI2ebIvz5cOOkYGns=+github.com/ysmood/goob v0.4.0 h1:HsxXhyLBeGzWXnqVKtmT9qM7EuVs/XOgkX7T6r1o1AQ=+github.com/ysmood/goob v0.4.0/go.mod h1:u6yx7ZhS4Exf2MwciFr6nIM8knHQIE22lFpWHnfql18=+github.com/ysmood/got v0.40.0 h1:ZQk1B55zIvS7zflRrkGfPDrPG3d7+JOza1ZkNxcc74Q=+github.com/ysmood/got v0.40.0/go.mod h1:W7DdpuX6skL3NszLmAsC5hT7JAhuLZhByVzHTq874Qg=+github.com/ysmood/gson v0.7.3 h1:QFkWbTH8MxyUTKPkVWAENJhxqdBa4lYTQWqZCiLG6kE=+github.com/ysmood/gson v0.7.3/go.mod h1:3Kzs5zDl21g5F/BlLTNcuAGAYLKt2lV5G8D1zF3RNmg=+github.com/ysmood/leakless v0.9.0 h1:qxCG5VirSBvmi3uynXFkcnLMzkphdh3xx5FtrORwDCU=+github.com/ysmood/leakless v0.9.0/go.mod h1:R8iAXPRaG97QJwqxs74RdwzcRHT1SWCGTNqY8q0JvMQ=github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM=github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=@@ -599,55 +809,175 @@ go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=go.mongodb.org/mongo-driver v1.7.5 h1:ny3p0reEpgsR2cfA5cjgwFZg3Cv/ofFh/8jbhGtz9VI=go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs=go.opentelemetry.io/contrib/detectors/gcp v1.38.0/go.mod h1:SU+iU7nu5ud4oCb3LQOhIZ3nRLj6FNVrKgtflbaf2ts=go.opentelemetry.io/contrib/detectors/gcp v1.39.0 h1:kWRNZMsfBHZ+uHjiH4y7Etn2FK26LAGkNFw7RHv1DhE=go.opentelemetry.io/contrib/detectors/gcp v1.39.0/go.mod h1:t/OGqzHBa5v6RHZwrDBJ2OirWc+4q/w2fTbLZwAKjTk=+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=+go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=+go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=+go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=go.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI=+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0/go.mod h1:LjReUci/F4BUyv+y4dwnq3h/26iNOeC3wAIqgvTIZVo=+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0/go.mod h1:u5BF1xyjstDowA1R5QAO9JHzqK+ublenEW/dyqTjBVk=go.opentelemetry.io/otel/exporters/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpxjK16MRcZlpDYvbuO1FiA=go.opentelemetry.io/otel/exporters/prometheus v0.42.0/go.mod h1:f3bYiqNqhoPxkvI2LrXqQVC546K7BuRDL/kKuxkujhA=+go.opentelemetry.io/otel/exporters/prometheus v0.60.0 h1:cGtQxGvZbnrWdC2GyjZi0PDKVSLWP/Jocix3QWfXtbo=+go.opentelemetry.io/otel/exporters/prometheus v0.60.0/go.mod h1:hkd1EekxNo69PTV4OWFGZcKQiIqg0RfuWExcPKFvepk=go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 h1:UGZ1QwZWY67Z6BmckTU+9Rxn04m2bD3gD6Mk0OIOCPk=go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0/go.mod h1:fcwWuDuaObkkChiDlhEpSq9+X1C0omv+s5mBtToAQ64=+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/hPp3O7LCGLcHXFlvS2/FFOrwL+SE=+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE=+go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=+go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=+go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=+go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=+go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=+go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=+go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=+go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=+go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=+go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=+golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=+golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=+golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak=+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=+golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=+golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=+golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=+golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ=golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ=golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 h1:O1cMQHRfwNpDfDJerqRoE2oD+AFlyid87D40L/OkkJo=golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8=+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=+golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=+golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=@@ -656,12 +986,59 @@ golang.org/x/tools/godoc v0.1.0-deprecated h1:o+aZ1BOj6Hsx/GBdJO/s815sqftjSnrZZwgolang.org/x/tools/godoc v0.1.0-deprecated/go.mod h1:qM63CriJ961IHWmnWa9CjZnBndniPt4a3CK0PVB9bIg=golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=+golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=google.golang.org/api v0.247.0 h1:tSd/e0QrUlLsrwMKmkbQhYVa109qIintOls2Wh6bngc=google.golang.org/api v0.247.0/go.mod h1:r1qZOPmxXffXg6xS5uhx16Fa/UFY8QU/K4bfKrnvovM=+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=+google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9 h1:LvZVVaPE0JSqL+ZWb6ErZfnEOKIqqFWUJE2D0fObSmc=+google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a/go.mod h1:a77HrdMjoeKbnd2jmgcWdaS++ZLZAEq3orIOAEIKiVw=+google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:oDOGiMSXHL4sDTJvFvIB9nRQCGdLP1o/iVaqQK8zB+M=+google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=+google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.mod h1:NnuHhy+bxcg30o7FnVAZbXsPHUDQ9qKWAQKCD7VxFtk=+google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101/go.mod h1:E17fc4PDhkr22dE3RgnH2hEubUaky6ZwW4VhANxyspg=+google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=+google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=+google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=+google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc=+google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ=+google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=+google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=+google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=+google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=+google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=+google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=+google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=+google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A=google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA=+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=+google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=@@ -674,7 +1051,10 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepgopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=@@ -691,8 +1071,12 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=kernel.org/pub/linux/libs/security/libcap/cap v1.2.76 h1:mrdLPj8ujM6eIKGtd1PkkuCIodpFFDM42Cfm0YODkIM=kernel.org/pub/linux/libs/security/libcap/cap v1.2.76/go.mod h1:7V2BQeHnVAQwhCnCPJ977giCeGDiywVewWF+8vkpPlc=+kernel.org/pub/linux/libs/security/libcap/cap v1.2.77 h1:iQtQTjFUOcTT19fI8sTCzYXsjeVs56et3D8AbKS2Uks=+kernel.org/pub/linux/libs/security/libcap/cap v1.2.77/go.mod h1:oV+IO8kGh0B7TxErbydDe2+BRmi9g/W0CkpVV+QBTJU=kernel.org/pub/linux/libs/security/libcap/psx v1.2.76 h1:3DyzQ30OHt3wiOZVL1se2g1PAPJIU7+tMUyvfMUj1dY=kernel.org/pub/linux/libs/security/libcap/psx v1.2.76/go.mod h1:+l6Ee2F59XiJ2I6WR5ObpC1utCQJZ/VLsEbQCD8RG24=+kernel.org/pub/linux/libs/security/libcap/psx v1.2.77 h1:Z06sMOzc0GNCwp6efaVrIrz4ywGJ1v+DP0pjVkOfDuA=+kernel.org/pub/linux/libs/security/libcap/psx v1.2.77/go.mod h1:+l6Ee2F59XiJ2I6WR5ObpC1utCQJZ/VLsEbQCD8RG24=lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=modernc.org/b v1.0.0 h1:vpvqeyp17ddcQWF29Czawql4lDdABCDRbXRAS4+aF2o=diff --git a/types/container/container.go b/types/container/container.goindex 9e812a3f1..dd1c8fa4a 100644--- a/types/container/container.go+++ b/types/container/container.go@@ -5,10 +5,10 @@ import ("strconv""strings"- "github.com/docker/docker/api/types/container"- "github.com/docker/docker/api/types/network"containerregistry "github.com/getarcaneapp/arcane/types/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/moby/moby/api/types/container"+ "github.com/moby/moby/api/types/network")// RestartPolicyCreate represents restart policy options for container creation.@@ -735,7 +735,7 @@ func NewSummary(c container.Summary) Summary {ports := make([]Port, 0, len(c.Ports))for _, p := range c.Ports {ports = append(ports, Port{- IP: p.IP,+ IP: p.IP.String(),PrivatePort: int(p.PrivatePort),PublicPort: int(p.PublicPort),Type: p.Type,@@ -772,7 +772,7 @@ func NewSummary(c container.Summary) Summary {Created: c.Created,Ports: ports,Labels: c.Labels,- State: c.State,+ State: string(c.State),Status: c.Status,HostConfig: HostConfig{NetworkMode: c.HostConfig.NetworkMode,@@ -789,7 +789,7 @@ func NewDetails(c *container.InspectResponse) Details {ports := make([]Port, 0)if c.NetworkSettings != nil && c.NetworkSettings.Ports != nil {for p, bindings := range c.NetworkSettings.Ports {- privatePort, _ := strconv.Atoi(p.Port())+ privatePort := int(p.Num())typ := string(p.Proto())// When no host bindings exist, still include the private port@@ -803,7 +803,7 @@ func NewDetails(c *container.InspectResponse) Details {for _, b := range bindings {pub, _ := strconv.Atoi(b.HostPort)ports = append(ports, Port{- IP: b.HostIP,+ IP: b.HostIP.String(),PrivatePort: privatePort,PublicPort: pub,Type: typ,@@ -866,7 +866,7 @@ func NewDetails(c *container.InspectResponse) Details {state := State{}if c.State != nil {state = State{- Status: c.State.Status,+ Status: string(c.State.Status),Running: c.State.Running,ExitCode: c.State.ExitCode,StartedAt: c.State.StartedAt,@@ -902,20 +902,40 @@ func mapEndpointSettings(n *network.EndpointSettings) NetworkEndpoint {driverOpts = n.DriverOpts}+ gateway := ""+ if n.Gateway.IsValid() {+ gateway = n.Gateway.String()+ }++ ipAddress := ""+ if n.IPAddress.IsValid() {+ ipAddress = n.IPAddress.String()+ }++ ipv6Gateway := ""+ if n.IPv6Gateway.IsValid() {+ ipv6Gateway = n.IPv6Gateway.String()+ }++ globalIPv6Address := ""+ if n.GlobalIPv6Address.IsValid() {+ globalIPv6Address = n.GlobalIPv6Address.String()+ }+return NetworkEndpoint{IPAMConfig: n.IPAMConfig,Links: n.Links,Aliases: n.Aliases,- MacAddress: n.MacAddress,+ MacAddress: n.MacAddress.String(),DriverOpts: driverOpts,GwPriority: n.GwPriority,NetworkID: n.NetworkID,EndpointID: n.EndpointID,- Gateway: n.Gateway,- IPAddress: n.IPAddress,+ Gateway: gateway,+ IPAddress: ipAddress,IPPrefixLen: n.IPPrefixLen,- IPv6Gateway: n.IPv6Gateway,- GlobalIPv6Address: n.GlobalIPv6Address,+ IPv6Gateway: ipv6Gateway,+ GlobalIPv6Address: globalIPv6Address,GlobalIPv6PrefixLen: n.GlobalIPv6PrefixLen,DNSNames: n.DNSNames,}diff --git a/types/dockerinfo/docker_info.go b/types/dockerinfo/docker_info.goindex 5bccc7c5f..0996d6cd6 100644--- a/types/dockerinfo/docker_info.go+++ b/types/dockerinfo/docker_info.go@@ -1,6 +1,6 @@package dockerinfo-import "github.com/docker/docker/api/types/system"+import "github.com/moby/moby/api/types/system"type Info struct {// Success indicates if the Docker daemon information was successfully retrieved.diff --git a/types/go.mod b/types/go.modindex 0d98754b3..03788de1e 100644--- a/types/go.mod+++ b/types/go.mod@@ -4,26 +4,38 @@ go 1.26.0require (github.com/compose-spec/compose-go/v2 v2.10.1- github.com/docker/docker v28.5.2+incompatible+ github.com/moby/moby/api v1.53.0+ github.com/moby/moby/client v0.2.2)require (+ github.com/Microsoft/go-winio v0.6.2 // indirect+ github.com/cespare/xxhash/v2 v2.3.0 // indirect+ github.com/containerd/errdefs v1.0.0 // indirect+ github.com/containerd/errdefs/pkg v0.3.0 // indirectgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirectgithub.com/distribution/reference v0.6.0 // indirectgithub.com/docker/go-connections v0.6.0 // indirectgithub.com/docker/go-units v0.5.0 // indirect+ github.com/felixge/httpsnoop v1.0.4 // indirect+ github.com/go-logr/logr v1.4.3 // indirect+ github.com/go-logr/stdr v1.2.2 // indirectgithub.com/go-viper/mapstructure/v2 v2.5.0 // indirect- github.com/google/go-cmp v0.7.0 // indirectgithub.com/mattn/go-shellwords v1.0.12 // indirectgithub.com/moby/docker-image-spec v1.3.1 // indirectgithub.com/opencontainers/go-digest v1.0.0 // indirectgithub.com/opencontainers/image-spec v1.1.1 // indirectgithub.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirectgithub.com/sirupsen/logrus v1.9.4 // indirect- github.com/stretchr/testify v1.11.1 // indirectgithub.com/xhit/go-str2duration/v2 v2.1.0 // indirect- go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect+ go.opentelemetry.io/auto/sdk v1.2.1 // indirect+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect+ go.opentelemetry.io/otel v1.39.0 // indirect+ go.opentelemetry.io/otel/metric v1.39.0 // indirect+ go.opentelemetry.io/otel/sdk v1.39.0 // indirect+ go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect+ go.opentelemetry.io/otel/trace v1.39.0 // indirect+ go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirectgolang.org/x/sync v0.19.0 // indirectgolang.org/x/sys v0.41.0 // indirect- gotest.tools/v3 v3.5.2 // indirect)diff --git a/types/go.sum b/types/go.sumindex 5a36ac0d4..eef0b6a82 100644--- a/types/go.sum+++ b/types/go.sum@@ -1,23 +1,31 @@+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=github.com/compose-spec/compose-go/v2 v2.10.1 h1:mFbXobojGRFIVi1UknrvaDAZ+PkJfyjqkA1yseh+vAU=github.com/compose-spec/compose-go/v2 v2.10.1/go.mod h1:Ohac1SzhO/4fXXrzWIztIVB6ckmKBv1Nt5Z5mGVESUg=+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=-github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=-github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=+github.com/moby/moby/api v1.53.0 h1:PihqG1ncw4W+8mZs69jlwGXdaYBeb5brF6BL7mPIS/w=+github.com/moby/moby/client v0.2.2 h1:Pt4hRMCAIlyjL3cr8M5TrXCwKzguebPAc2do2ur7dEM=github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=@@ -30,8 +38,14 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKugithub.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=-go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=-go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=+go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=+go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=+go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=@@ -39,3 +53,4 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=+pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk=diff --git a/types/image/image.go b/types/image/image.goindex 69c0d8a43..4018ec1af 100644--- a/types/image/image.go+++ b/types/image/image.go@@ -5,9 +5,9 @@ import ("strings""time"- "github.com/docker/docker/api/types/image"containerregistry "github.com/getarcaneapp/arcane/types/containerregistry""github.com/getarcaneapp/arcane/types/vulnerability"+ "github.com/moby/moby/api/types/image")type UpdateInfo struct {diff --git a/types/network/network.go b/types/network/network.goindex 026767de1..ab33fbbcf 100644--- a/types/network/network.go+++ b/types/network/network.go@@ -1,9 +1,12 @@package networkimport (+ "net/netip"+ "strings""time"- "github.com/docker/docker/api/types/network"+ "github.com/moby/moby/api/types/network"+ "github.com/moby/moby/client")type Summary struct {@@ -258,40 +261,102 @@ type CreateOptions struct {}// ToDockerCreateOptions converts to Docker SDK CreateOptions.-func (o CreateOptions) ToDockerCreateOptions() network.CreateOptions {- var enableIPv6 *bool- if o.EnableIPv6 {- enableIPv6 = &o.EnableIPv6- }-- opts := network.CreateOptions{+func (o CreateOptions) ToDockerCreateOptions() client.NetworkCreateOptions {+ opts := client.NetworkCreateOptions{Driver: o.Driver,Internal: o.Internal,Attachable: o.Attachable,Ingress: o.Ingress,- EnableIPv6: enableIPv6,+ EnableIPv6: boolPtrIfTrue(o.EnableIPv6),Options: o.Options,Labels: o.Labels,}- // Convert IPAM if presentif o.IPAM != nil {- dockerIPAM := &network.IPAM{- Driver: o.IPAM.Driver,- Options: o.IPAM.Options,+ opts.IPAM = toDockerIPAM(o.IPAM)+ }++ return opts+}++func boolPtrIfTrue(v bool) *bool {+ if !v {+ return nil+ }++ return &v+}++func toDockerIPAM(src *IPAM) *network.IPAM {+ dockerIPAM := &network.IPAM{+ Driver: src.Driver,+ Options: src.Options,+ }++ for _, cfg := range src.Config {+ if dockerCfg, ok := toDockerIPAMConfig(cfg); ok {+ dockerIPAM.Config = append(dockerIPAM.Config, dockerCfg)}- for _, cfg := range o.IPAM.Config {- dockerIPAM.Config = append(dockerIPAM.Config, network.IPAMConfig{- Subnet: cfg.Subnet,- Gateway: cfg.Gateway,- IPRange: cfg.IPRange,- AuxAddress: cfg.AuxAddress,- })+ }++ return dockerIPAM+}++func toDockerIPAMConfig(cfg IPAMConfig) (network.IPAMConfig, bool) {+ dockerCfg := network.IPAMConfig{}+ hasAny := false++ if parsed, ok := parsePrefix(cfg.Subnet); ok {+ dockerCfg.Subnet = parsed+ hasAny = true+ }+ if parsed, ok := parseAddr(cfg.Gateway); ok {+ dockerCfg.Gateway = parsed+ hasAny = true+ }+ if parsed, ok := parsePrefix(cfg.IPRange); ok {+ dockerCfg.IPRange = parsed+ hasAny = true+ }+ if aux := parseAuxAddress(cfg.AuxAddress); len(aux) > 0 {+ dockerCfg.AuxAddress = aux+ hasAny = true+ }++ return dockerCfg, hasAny+}++func parsePrefix(raw string) (netip.Prefix, bool) {+ prefix, err := netip.ParsePrefix(strings.TrimSpace(raw))+ if err != nil {+ return netip.Prefix{}, false+ }++ return prefix, true+}++func parseAddr(raw string) (netip.Addr, bool) {+ addr, err := netip.ParseAddr(strings.TrimSpace(raw))+ if err != nil {+ return netip.Addr{}, false+ }++ return addr, true+}++func parseAuxAddress(auxAddress map[string]string) map[string]netip.Addr {+ if len(auxAddress) == 0 {+ return nil+ }++ aux := make(map[string]netip.Addr, len(auxAddress))+ for key, rawAddr := range auxAddress {+ if parsed, ok := parseAddr(rawAddr); ok {+ aux[key] = parsed}- opts.IPAM = dockerIPAM}- return opts+ return aux}type PruneReport struct {@@ -316,8 +381,8 @@ func NewSummary(s network.Summary) Summary {Created: s.Created,Options: s.Options,Labels: s.Labels,- // InUse is set to true if the network has any connected containers, false otherwise.- InUse: len(s.Containers) > 0,+ // InUse is computed by service-layer usage checks that include container attachments.+ InUse: false,// IsDefault is set to true if the network is one of the default Docker networks// (bridge, host, or none), false otherwise.IsDefault: s.Name == "bridge" || s.Name == "host" || s.Name == "none",diff --git a/types/volume/volume.go b/types/volume/volume.goindex df1bf3d76..08803a305 100644--- a/types/volume/volume.go+++ b/types/volume/volume.go@@ -1,6 +1,6 @@package volume-import "github.com/docker/docker/api/types/volume"+import "github.com/moby/moby/api/types/volume"// Volume represents a Docker volume.type Volume struct {