Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: modernize and refactor deduped logic (#2759)
Kyle Mendell22e733617aae
diff --git a/.github/.golangci.yml b/.github/.golangci.ymlindex b3703c663..dd6d790e9 100644--- a/.github/.golangci.yml+++ b/.github/.golangci.yml@@ -11,6 +11,7 @@ linters:- bodyclose- contextcheck- copyloopvar+ - dupl- durationcheck- errcheck- errchkjsondiff --git a/AGENTS.md b/AGENTS.mdindex f70255136..deb1403f6 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -38,11 +38,16 @@ internal/├── models/ # GORM database models (include BaseModel for UUID, timestamps)└── services/ # Business logic — *_service.go files contain domain logicpkg/-├── libarcane/ # Core reusable backend/domain libraries-├── projects/ # Compose project parsing and filesystem helpers+├── authz/ # Permission taxonomy and authorization primitives+├── dockerutil/ # Low-level Docker helpers (container names, compose labels, log streaming, mounts/volumes/networks)+├── fswatch/ # Filesystem watcher that detects project file changes+├── gitutil/ # Git client for GitOps (clone, branches, file tree, read)+├── libarcane/ # Core reusable backend/domain libraries (compose deploy, edge, image update, build, swarm)+├── pagination/ # Search/filter/sort/pagination helpers (DB and in-memory)+├── projects/ # Compose project parsing, env, includes, discovery, filesystem helpers+├── remenv/ # Remote-environment request/response transport client (agent/edge)├── scheduler/ # Cron-backed background jobs-├── pagination/ # Search/filter/sort/pagination helpers-└── utils/ # Shared helper utilities+└── utils/ # Shared helper utilities (strings, cache, ptr, httpx, mapper)resources/ # migrations, images, fonts, email templates```@@ -57,6 +62,14 @@ resources/ # migrations, images, fonts, email templates- Use `slog` for structured logging with context- Error wrapping: `fmt.Errorf("context: %w", err)`+**Reuse `pkg/` helpers — do not duplicate or wrap:** Before writing inline logic, check `pkg/` for an existing helper:++- Docker primitives → `pkg/dockerutil`: container display names (`ContainerNameFromNames`, `ContainerSummaryName`), Compose labels (`ComposeProjectLabel`/`ComposeServiceLabel`, keyed by `ComposeProjectLabelKey`/`ComposeServiceLabelKey`), log streaming (`StreamContainerLogs`/`StreamMultiplexedLogs`/`ReadAllLogs`), and mount/volume/network/cgroup utilities.+- Compose parsing → `pkg/projects`: image-ref extraction (`ImageRefsFromComposeServices`/`ImageRefsFromComposeConfigs`/`ImageRefsFromRuntimeServices`), plus compose load, env state, includes, and project discovery.+- Listing endpoints → `pkg/pagination` (`SearchOrderAndPaginate`, `PaginateAndSortDB`); shared string/ptr/cache helpers → `pkg/utils`.++Call middleware/library functions directly at the call site. Do not add thin pass-through helpers or stubs that only forward to a single underlying call.+### API Layer (`backend/api/`)```@@ -379,6 +392,18 @@ newScheduler.RegisterJob(myJob)**Note:** Cron uses 6 fields (with seconds): `"0 0 * * * *"` = every hour at :00:00+## Image & Container Update Logic++Update detection and application are split across layers — change behavior at the matching layer:++- **`backend/pkg/libarcane/imageupdate/`** — comparison primitives: `digest.go` (DigestChecker: local vs remote digest), `registry_http.go` (registry digest / rate-limit queries, reference parsing), `labels.go` (Arcane/Compose label checks, self-redeploy guards), `sorter.go` (dependency-ordered container restart).+- **`backend/internal/services/image_update_service.go`** — checks for updates and persists update records (`CheckImageUpdate`, `CheckMultipleImages`, `CheckAllImages`, `GetUpdateSummary`, `MarkImageRefUpToDateAfterPull`).+- **`backend/internal/services/updater_service.go`** — applies updates to running containers (`ApplyPending`, `UpdateSingleContainer`), with status/history.+- **`backend/api/handlers/image_updates.go`** — check/query API (`check-image-update`, `check-all-images`, `get-update-summary`); **`updater.go`** — apply API (`run-updater`, `update-container`, status/history).+- **`backend/pkg/scheduler/`** — background drivers: `image_polling_job.go` (periodic checks), `auto_update_job.go` (auto-apply), `auto_heal_job.go` (restart unhealthy containers).++Project image references are cached on the project row (`image_refs_json`, extracted via the `pkg/projects` `ImageRefsFrom*` helpers); per-project update summaries are assembled in `project_service.go`.+## Database Patterns (GORM)### BaseModel@@ -431,9 +456,9 @@ Edge agents connect outbound to a central manager via WebSocket or gRPC tunnel,**Configuration** (agent side):```bash-ARCANE_EDGE_AGENT=true-ARCANE_MANAGER_API_URL=https://manager.example.com-ARCANE_AGENT_TOKEN=<api-key>+EDGE_AGENT=true+MANAGER_API_URL=https://manager.example.com+AGENT_TOKEN=<api-key>```**Message types** (see [tunnel.go](backend/pkg/libarcane/edge/tunnel.go)):@@ -449,11 +474,11 @@ Direct agents are passive: the agent runs an HTTP server on TCP 3553 and the man**Configuration** (agent side):```bash-ARCANE_AGENT_MODE=true-ARCANE_AGENT_TOKEN=<api-key>+AGENT_MODE=true+AGENT_TOKEN=<api-key>```-`ARCANE_MANAGER_API_URL` is **not** used in Direct mode — the agent never dials out. Pairing completes when the manager's periodic health-check (every 2 min by default) reaches the agent.+`MANAGER_API_URL` is **not** used in Direct mode — the agent never dials out. Pairing completes when the manager's periodic health-check (every 2 min by default) reaches the agent.**When implementing agent features:**diff --git a/backend/api/handlers/activities.go b/backend/api/handlers/activities.goindex c7a7185b1..c4be84a16 100644--- a/backend/api/handlers/activities.go+++ b/backend/api/handlers/activities.go@@ -16,6 +16,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/services""github.com/getarcaneapp/arcane/backend/pkg/authz""github.com/getarcaneapp/arcane/backend/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx""github.com/getarcaneapp/arcane/types/activity""github.com/getarcaneapp/arcane/types/base""gorm.io/gorm"@@ -227,10 +228,7 @@ func (h *ActivityHandler) StreamActivities(ctx context.Context, input *StreamActreturn &huma.StreamResponse{Body: func(humaCtx huma.Context) { //nolint:contextcheck // streaming work must use humaCtx.Context()- humaCtx.SetHeader("Content-Type", "application/x-json-stream")- humaCtx.SetHeader("Cache-Control", "no-cache")- humaCtx.SetHeader("Connection", "keep-alive")- humaCtx.SetHeader("X-Accel-Buffering", "no")+ httpx.SetJSONStreamHeaders(humaCtx)writer := humaCtx.BodyWriter()encoder := json.NewEncoder(writer)diff --git a/backend/api/handlers/apikeys.go b/backend/api/handlers/apikeys.goindex 5f88573fb..c9e2148f6 100644--- a/backend/api/handlers/apikeys.go+++ b/backend/api/handlers/apikeys.go@@ -238,29 +238,7 @@ func (h *ApiKeyHandler) ListApiKeys(ctx context.Context, input *ListApiKeysInput// CreateApiKey creates a new API key.func (h *ApiKeyHandler) CreateApiKey(ctx context.Context, input *CreateApiKeyInput) (*CreateApiKeyOutput, error) {- if h.apiKeyService == nil {- return nil, huma.Error500InternalServerError("service not available")- }-- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())- }-- apiKey, err := h.apiKeyService.CreateApiKey(ctx, user.ID, input.Body)- if err != nil {- if errors.Is(err, services.ErrApiKeyPermissionEscalation) {- return nil, huma.Error403Forbidden(err.Error())- }- return nil, huma.Error500InternalServerError((&common.ApiKeyCreationError{Err: err}).Error())- }-- return &CreateApiKeyOutput{- Body: base.ApiResponse[apikey.ApiKeyCreatedDto]{- Success: true,- Data: *apiKey,- },- }, nil+ return h.createCurrentUserApiKeyInternal(ctx, input)}// GetApiKey returns details of a specific API key.@@ -367,6 +345,10 @@ func (h *ApiKeyHandler) ListMyApiKeys(ctx context.Context, input *struct{}) (*Li// CreateMyApiKey creates a new API key owned by the current user (self-service).func (h *ApiKeyHandler) CreateMyApiKey(ctx context.Context, input *CreateApiKeyInput) (*CreateApiKeyOutput, error) {+ return h.createCurrentUserApiKeyInternal(ctx, input)+}++func (h *ApiKeyHandler) createCurrentUserApiKeyInternal(ctx context.Context, input *CreateApiKeyInput) (*CreateApiKeyOutput, error) {if h.apiKeyService == nil {return nil, huma.Error500InternalServerError("service not available")}diff --git a/backend/api/handlers/containers.go b/backend/api/handlers/containers.goindex db8d0d62d..f6d577b14 100644--- a/backend/api/handlers/containers.go+++ b/backend/api/handlers/containers.go@@ -615,58 +615,64 @@ func (h *ContainerHandler) GetContainer(ctx context.Context, input *GetContainer}func (h *ContainerHandler) StartContainer(ctx context.Context, input *ContainerActionInput) (*ContainerActionOutput, error) {- if h.containerService == nil {- return nil, huma.Error500InternalServerError("service not available")- }-- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("not authenticated")- }-- runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)- activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(runtimeCtx, h.activityService, input.EnvironmentID, models.ActivityTypeContainerStart, "container", input.ContainerID, input.ContainerID, user, "Starting container", "Container start requested", models.JSON{"containerID": input.ContainerID})- if err := h.containerService.StartContainer(runtimeCtx, input.ContainerID, *user); err != nil {- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Container started", err)- return nil, huma.Error500InternalServerError((&common.ContainerStartError{Err: err}).Error())- }- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Container started", nil)-- return &ContainerActionOutput{- Body: ContainerActionResponse{- Success: true,- Data: base.MessageResponse{Message: "Container started successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ return h.runContainerActionInternal(ctx, input, containerActionConfigInternal{+ ActivityType: models.ActivityTypeContainerStart,+ Step: "Starting container",+ StartMessage: "Container start requested",+ CompleteMessage: "Container started",+ SuccessMessage: "Container started successfully",+ Action: func(runtimeCtx context.Context, containerID string, user models.User) error {+ return h.containerService.StartContainer(runtimeCtx, containerID, user)},- }, nil+ Error: func(err error) error {+ return huma.Error500InternalServerError((&common.ContainerStartError{Err: err}).Error())+ },+ })}func (h *ContainerHandler) StopContainer(ctx context.Context, input *ContainerActionInput) (*ContainerActionOutput, error) {- if h.containerService == nil {- return nil, huma.Error500InternalServerError("service not available")- }-- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized("not authenticated")- }-- runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)- activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(runtimeCtx, h.activityService, input.EnvironmentID, models.ActivityTypeContainerStop, "container", input.ContainerID, input.ContainerID, user, "Stopping container", "Container stop requested", models.JSON{"containerID": input.ContainerID})- if err := h.containerService.StopContainer(runtimeCtx, input.ContainerID, *user); err != nil {- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Container stopped", err)- return nil, huma.Error500InternalServerError((&common.ContainerStopError{Err: err}).Error())- }- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Container stopped", nil)-- return &ContainerActionOutput{- Body: ContainerActionResponse{- Success: true,- Data: base.MessageResponse{Message: "Container stopped successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ return h.runContainerActionInternal(ctx, input, containerActionConfigInternal{+ ActivityType: models.ActivityTypeContainerStop,+ Step: "Stopping container",+ StartMessage: "Container stop requested",+ CompleteMessage: "Container stopped",+ SuccessMessage: "Container stopped successfully",+ Action: func(runtimeCtx context.Context, containerID string, user models.User) error {+ return h.containerService.StopContainer(runtimeCtx, containerID, user)},- }, nil+ Error: func(err error) error {+ return huma.Error500InternalServerError((&common.ContainerStopError{Err: err}).Error())+ },+ })}func (h *ContainerHandler) RestartContainer(ctx context.Context, input *ContainerActionInput) (*ContainerActionOutput, error) {+ return h.runContainerActionInternal(ctx, input, containerActionConfigInternal{+ ActivityType: models.ActivityTypeContainerRestart,+ Step: "Restarting container",+ StartMessage: "Container restart requested",+ CompleteMessage: "Container restarted",+ SuccessMessage: "Container restarted successfully",+ Action: func(runtimeCtx context.Context, containerID string, user models.User) error {+ return h.containerService.RestartContainer(runtimeCtx, containerID, user)+ },+ Error: func(err error) error {+ return huma.Error500InternalServerError((&common.ContainerRestartError{Err: err}).Error())+ },+ })+}++type containerActionConfigInternal struct {+ ActivityType models.ActivityType+ Step string+ StartMessage string+ CompleteMessage string+ SuccessMessage string+ Action func(context.Context, string, models.User) error+ Error func(error) error+}++func (h *ContainerHandler) runContainerActionInternal(ctx context.Context, input *ContainerActionInput, cfg containerActionConfigInternal) (*ContainerActionOutput, error) {if h.containerService == nil {return nil, huma.Error500InternalServerError("service not available")}@@ -677,17 +683,17 @@ func (h *ContainerHandler) RestartContainer(ctx context.Context, input *Containe}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)- activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(runtimeCtx, h.activityService, input.EnvironmentID, models.ActivityTypeContainerRestart, "container", input.ContainerID, input.ContainerID, user, "Restarting container", "Container restart requested", models.JSON{"containerID": input.ContainerID})- if err := h.containerService.RestartContainer(runtimeCtx, input.ContainerID, *user); err != nil {- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Container restarted", err)- return nil, huma.Error500InternalServerError((&common.ContainerRestartError{Err: err}).Error())+ activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(runtimeCtx, h.activityService, input.EnvironmentID, cfg.ActivityType, "container", input.ContainerID, input.ContainerID, user, cfg.Step, cfg.StartMessage, models.JSON{"containerID": input.ContainerID})+ if err := cfg.Action(runtimeCtx, input.ContainerID, *user); err != nil {+ activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, cfg.CompleteMessage, err)+ return nil, cfg.Error(err)}- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Container restarted", nil)+ activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, cfg.CompleteMessage, nil)return &ContainerActionOutput{Body: ContainerActionResponse{Success: true,- Data: base.MessageResponse{Message: "Container restarted successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: cfg.SuccessMessage, ActivityID: utils.StringPtrFromTrimmed(activityID)},},}, nil}diff --git a/backend/api/handlers/edge_mtls_ca.go b/backend/api/handlers/edge_mtls_ca.goindex dbc595ce8..1ad9aaa54 100644--- a/backend/api/handlers/edge_mtls_ca.go+++ b/backend/api/handlers/edge_mtls_ca.go@@ -93,11 +93,9 @@ func readGeneratedEdgeMTLSCertificateInfoInternal(cfg *config.Config, envID striexpiresAt := cert.NotAfter.UTC()now := time.Now().UTC()remaining := expiresAt.Sub(now)- daysRemaining := edgeMTLSCertificateDaysRemainingInternal(now, expiresAt)-info := &typesenvironment.EdgeMTLSCertificate{ExpiresAt: &expiresAt,- DaysRemaining: &daysRemaining,+ DaysRemaining: new(edgeMTLSCertificateDaysRemainingInternal(now, expiresAt)),Expired: now.After(expiresAt),ExpiringSoon: now.Before(expiresAt) && remaining <= edgeMTLSCertificateExpiryWarningWindow,}diff --git a/backend/api/handlers/environments.go b/backend/api/handlers/environments.goindex 3cc434763..f7af5b673 100644--- a/backend/api/handlers/environments.go+++ b/backend/api/handlers/environments.go@@ -1387,10 +1387,8 @@ func (h *EnvironmentHandler) logMTLSAuditEvent(ctx context.Context, env *models.user, _ := humamw.GetCurrentUserFromContext(ctx)var userID, username *stringif user != nil {- uid := user.ID- uname := user.Username- userID = &uid- username = &uname+ userID = new(user.ID)+ username = new(user.Username)}if extra == nil {@@ -1411,11 +1409,9 @@ func (h *EnvironmentHandler) logMTLSAuditEvent(ctx context.Context, env *models.}if env != nil {envID := env.ID- envName := env.Name- resourceType := "environment"- req.ResourceType = &resourceType+ req.ResourceType = new("environment")req.ResourceID = &envID- req.ResourceName = &envName+ req.ResourceName = new(env.Name)req.EnvironmentID = &envID}diff --git a/backend/api/handlers/git_repositories.go b/backend/api/handlers/git_repositories.goindex 8aa8f16a8..c77860f27 100644--- a/backend/api/handlers/git_repositories.go+++ b/backend/api/handlers/git_repositories.go@@ -4,12 +4,10 @@ import ("context""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware""github.com/getarcaneapp/arcane/backend/internal/common""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/services""github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/base""github.com/getarcaneapp/arcane/types/gitops")@@ -118,131 +116,15 @@ type SyncGitRepositoriesOutput struct {func RegisterGitRepositories(api huma.API, repoService *services.GitRepositoryService) {h := &GitRepositoryHandler{repoService: repoService}- huma.Register(api, huma.Operation{- OperationID: "listGitRepositories",- Method: "GET",- Path: "/customize/git-repositories",- Summary: "List git repositories",- Description: "Get a paginated list of git repositories",- Tags: []string{"Customize"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposList),- }, h.ListRepositories)-- huma.Register(api, huma.Operation{- OperationID: "createGitRepository",- Method: "POST",- Path: "/customize/git-repositories",- Summary: "Create a git repository",- Description: "Create a new git repository configuration",- Tags: []string{"Customize"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposCreate),- }, h.CreateRepository)-- huma.Register(api, huma.Operation{- OperationID: "getGitRepository",- Method: "GET",- Path: "/customize/git-repositories/{id}",- Summary: "Get a git repository",- Description: "Get a git repository by ID",- Tags: []string{"Customize"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposRead),- }, h.GetRepository)-- huma.Register(api, huma.Operation{- OperationID: "updateGitRepository",- Method: "PUT",- Path: "/customize/git-repositories/{id}",- Summary: "Update a git repository",- Description: "Update an existing git repository configuration",- Tags: []string{"Customize"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposUpdate),- }, h.UpdateRepository)-- huma.Register(api, huma.Operation{- OperationID: "deleteGitRepository",- Method: "DELETE",- Path: "/customize/git-repositories/{id}",- Summary: "Delete a git repository",- Description: "Delete a git repository configuration by ID",- Tags: []string{"Customize"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposDelete),- }, h.DeleteRepository)-- huma.Register(api, huma.Operation{- OperationID: "testGitRepository",- Method: "POST",- Path: "/customize/git-repositories/{id}/test",- Summary: "Test a git repository",- Description: "Test connectivity and authentication to a git repository",- Tags: []string{"Customize"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposTest),- }, h.TestRepository)-- huma.Register(api, huma.Operation{- OperationID: "listGitRepositoryBranches",- Method: "GET",- Path: "/customize/git-repositories/{id}/branches",- Summary: "List repository branches",- Description: "Get all branches from a git repository with default branch detection",- Tags: []string{"Customize"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposRead),- }, h.ListBranches)-- huma.Register(api, huma.Operation{- OperationID: "browseGitRepositoryFiles",- Method: "GET",- Path: "/customize/git-repositories/{id}/files",- Summary: "Browse repository files",- Description: "Browse files and directories in a git repository",- Tags: []string{"Customize"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposRead),- }, h.BrowseFiles)-- huma.Register(api, huma.Operation{- OperationID: "syncGitRepositories",- Method: "POST",- Path: "/git-repositories/sync",- Summary: "Sync git repositories",- Description: "Sync git repositories from a manager to this agent instance",- Tags: []string{"Git Repositories"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitReposSync),- }, h.SyncRepositories)+ registerCustomizeSecuredInternal(api, "listGitRepositories", "GET", "/customize/git-repositories", "List git repositories", "Get a paginated list of git repositories", authz.PermGitReposList, h.ListRepositories)+ registerCustomizeSecuredInternal(api, "createGitRepository", "POST", "/customize/git-repositories", "Create a git repository", "Create a new git repository configuration", authz.PermGitReposCreate, h.CreateRepository)+ registerCustomizeSecuredInternal(api, "getGitRepository", "GET", "/customize/git-repositories/{id}", "Get a git repository", "Get a git repository by ID", authz.PermGitReposRead, h.GetRepository)+ registerCustomizeSecuredInternal(api, "updateGitRepository", "PUT", "/customize/git-repositories/{id}", "Update a git repository", "Update an existing git repository configuration", authz.PermGitReposUpdate, h.UpdateRepository)+ registerCustomizeSecuredInternal(api, "deleteGitRepository", "DELETE", "/customize/git-repositories/{id}", "Delete a git repository", "Delete a git repository configuration by ID", authz.PermGitReposDelete, h.DeleteRepository)+ registerCustomizeSecuredInternal(api, "testGitRepository", "POST", "/customize/git-repositories/{id}/test", "Test a git repository", "Test connectivity and authentication to a git repository", authz.PermGitReposTest, h.TestRepository)+ registerCustomizeSecuredInternal(api, "listGitRepositoryBranches", "GET", "/customize/git-repositories/{id}/branches", "List repository branches", "Get all branches from a git repository with default branch detection", authz.PermGitReposRead, h.ListBranches)+ registerCustomizeSecuredInternal(api, "browseGitRepositoryFiles", "GET", "/customize/git-repositories/{id}/files", "Browse repository files", "Browse files and directories in a git repository", authz.PermGitReposRead, h.BrowseFiles)+ registerTaggedSecuredInternal(api, "syncGitRepositories", "POST", "/git-repositories/sync", "Sync git repositories", "Sync git repositories from a manager to this agent instance", "Git Repositories", authz.PermGitReposSync, h.SyncRepositories)}// ============================================================================@@ -283,10 +165,7 @@ func (h *GitRepositoryHandler) CreateRepository(ctx context.Context, input *Creareturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)repo, err := h.repoService.CreateRepository(ctx, input.Body, actor)if err != nil {@@ -294,16 +173,15 @@ func (h *GitRepositoryHandler) CreateRepository(ctx context.Context, input *Creareturn nil, huma.NewError(apiErr.HTTPStatus(), (&common.GitRepositoryCreationError{Err: err}).Error())}- out, mapErr := mapper.MapOne[*models.GitRepository, gitops.GitRepository](repo)+ body, mapErr := mapOneAPIResponseInternal[*models.GitRepository, gitops.GitRepository](repo, func(err error) string {+ return (&common.GitRepositoryMappingError{Err: err}).Error()+ })if mapErr != nil {- return nil, huma.Error500InternalServerError((&common.GitRepositoryMappingError{Err: mapErr}).Error())+ return nil, mapErr}return &CreateGitRepositoryOutput{- Body: base.ApiResponse[gitops.GitRepository]{- Success: true,- Data: out,- },+ Body: body,}, nil}@@ -319,16 +197,15 @@ func (h *GitRepositoryHandler) GetRepository(ctx context.Context, input *GetGitRreturn nil, huma.NewError(apiErr.HTTPStatus(), (&common.GitRepositoryRetrievalError{Err: err}).Error())}- out, mapErr := mapper.MapOne[*models.GitRepository, gitops.GitRepository](repo)+ body, mapErr := mapOneAPIResponseInternal[*models.GitRepository, gitops.GitRepository](repo, func(err error) string {+ return (&common.GitRepositoryMappingError{Err: err}).Error()+ })if mapErr != nil {- return nil, huma.Error500InternalServerError((&common.GitRepositoryMappingError{Err: mapErr}).Error())+ return nil, mapErr}return &GetGitRepositoryOutput{- Body: base.ApiResponse[gitops.GitRepository]{- Success: true,- Data: out,- },+ Body: body,}, nil}@@ -338,10 +215,7 @@ func (h *GitRepositoryHandler) UpdateRepository(ctx context.Context, input *Updareturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)repo, err := h.repoService.UpdateRepository(ctx, input.ID, input.Body, actor)if err != nil {@@ -349,16 +223,15 @@ func (h *GitRepositoryHandler) UpdateRepository(ctx context.Context, input *Updareturn nil, huma.NewError(apiErr.HTTPStatus(), (&common.GitRepositoryUpdateError{Err: err}).Error())}- out, mapErr := mapper.MapOne[*models.GitRepository, gitops.GitRepository](repo)+ body, mapErr := mapOneAPIResponseInternal[*models.GitRepository, gitops.GitRepository](repo, func(err error) string {+ return (&common.GitRepositoryMappingError{Err: err}).Error()+ })if mapErr != nil {- return nil, huma.Error500InternalServerError((&common.GitRepositoryMappingError{Err: mapErr}).Error())+ return nil, mapErr}return &UpdateGitRepositoryOutput{- Body: base.ApiResponse[gitops.GitRepository]{- Success: true,- Data: out,- },+ Body: body,}, nil}@@ -368,10 +241,7 @@ func (h *GitRepositoryHandler) DeleteRepository(ctx context.Context, input *Delereturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)if err := h.repoService.DeleteRepository(ctx, input.ID, actor); err != nil {apiErr := models.ToAPIError(err)@@ -394,10 +264,7 @@ func (h *GitRepositoryHandler) TestRepository(ctx context.Context, input *TestGireturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)if err := h.repoService.TestConnection(ctx, input.ID, input.Branch, actor); err != nil {return nil, huma.Error400BadRequest((&common.GitRepositoryTestError{Err: err}).Error())diff --git a/backend/api/handlers/gitops_syncs.go b/backend/api/handlers/gitops_syncs.goindex ad04311db..edfbb8af0 100644--- a/backend/api/handlers/gitops_syncs.go+++ b/backend/api/handlers/gitops_syncs.go@@ -4,12 +4,10 @@ import ("context""github.com/danielgtaylor/huma/v2"- humamw "github.com/getarcaneapp/arcane/backend/api/middleware""github.com/getarcaneapp/arcane/backend/internal/common""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/services""github.com/getarcaneapp/arcane/backend/pkg/authz"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/base""github.com/getarcaneapp/arcane/types/gitops")@@ -126,131 +124,15 @@ type ImportGitOpsSyncsOutput struct {func RegisterGitOpsSyncs(api huma.API, syncService *services.GitOpsSyncService) {h := &GitOpsSyncHandler{syncService: syncService}- huma.Register(api, huma.Operation{- OperationID: "listGitOpsSyncs",- Method: "GET",- Path: "/environments/{id}/gitops-syncs",- Summary: "List GitOps syncs",- Description: "Get a paginated list of GitOps syncs for an environment",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsList),- }, h.ListSyncs)-- huma.Register(api, huma.Operation{- OperationID: "createGitOpsSync",- Method: "POST",- Path: "/environments/{id}/gitops-syncs",- Summary: "Create a GitOps sync",- Description: "Create a new GitOps sync configuration for an environment",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsCreate),- }, h.CreateSync)-- huma.Register(api, huma.Operation{- OperationID: "importGitOpsSyncs",- Method: "POST",- Path: "/environments/{id}/gitops-syncs/import",- Summary: "Import GitOps syncs",- Description: "Import multiple GitOps sync configurations from JSON",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsCreate),- }, h.ImportSyncs)-- huma.Register(api, huma.Operation{- OperationID: "getGitOpsSync",- Method: "GET",- Path: "/environments/{id}/gitops-syncs/{syncId}",- Summary: "Get a GitOps sync",- Description: "Get a GitOps sync by ID",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsRead),- }, h.GetSync)-- huma.Register(api, huma.Operation{- OperationID: "updateGitOpsSync",- Method: "PUT",- Path: "/environments/{id}/gitops-syncs/{syncId}",- Summary: "Update a GitOps sync",- Description: "Update an existing GitOps sync configuration",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsUpdate),- }, h.UpdateSync)-- huma.Register(api, huma.Operation{- OperationID: "deleteGitOpsSync",- Method: "DELETE",- Path: "/environments/{id}/gitops-syncs/{syncId}",- Summary: "Delete a GitOps sync",- Description: "Delete a GitOps sync configuration by ID",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsDelete),- }, h.DeleteSync)-- huma.Register(api, huma.Operation{- OperationID: "performGitOpsSync",- Method: "POST",- Path: "/environments/{id}/gitops-syncs/{syncId}/sync",- Summary: "Perform a GitOps sync",- Description: "Manually trigger a sync operation",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsSync),- }, h.PerformSync)-- huma.Register(api, huma.Operation{- OperationID: "getGitOpsSyncStatus",- Method: "GET",- Path: "/environments/{id}/gitops-syncs/{syncId}/status",- Summary: "Get GitOps sync status",- Description: "Get the current status of a GitOps sync",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsRead),- }, h.GetStatus)-- huma.Register(api, huma.Operation{- OperationID: "browseGitOpsSyncFiles",- Method: "GET",- Path: "/environments/{id}/gitops-syncs/{syncId}/files",- Summary: "Browse GitOps sync files",- Description: "Browse files in the synced repository",- Tags: []string{"GitOps Syncs"},- Security: []map[string][]string{- {"BearerAuth": {}},- {"ApiKeyAuth": {}},- },- Middlewares: humamw.RequirePermission(api, authz.PermGitOpsRead),- }, h.BrowseFiles)+ registerGitOpsSecuredInternal(api, "listGitOpsSyncs", "GET", "/environments/{id}/gitops-syncs", "List GitOps syncs", "Get a paginated list of GitOps syncs for an environment", authz.PermGitOpsList, h.ListSyncs)+ registerGitOpsSecuredInternal(api, "createGitOpsSync", "POST", "/environments/{id}/gitops-syncs", "Create a GitOps sync", "Create a new GitOps sync configuration for an environment", authz.PermGitOpsCreate, h.CreateSync)+ registerGitOpsSecuredInternal(api, "importGitOpsSyncs", "POST", "/environments/{id}/gitops-syncs/import", "Import GitOps syncs", "Import multiple GitOps sync configurations from JSON", authz.PermGitOpsCreate, h.ImportSyncs)+ registerGitOpsSecuredInternal(api, "getGitOpsSync", "GET", "/environments/{id}/gitops-syncs/{syncId}", "Get a GitOps sync", "Get a GitOps sync by ID", authz.PermGitOpsRead, h.GetSync)+ registerGitOpsSecuredInternal(api, "updateGitOpsSync", "PUT", "/environments/{id}/gitops-syncs/{syncId}", "Update a GitOps sync", "Update an existing GitOps sync configuration", authz.PermGitOpsUpdate, h.UpdateSync)+ registerGitOpsSecuredInternal(api, "deleteGitOpsSync", "DELETE", "/environments/{id}/gitops-syncs/{syncId}", "Delete a GitOps sync", "Delete a GitOps sync configuration by ID", authz.PermGitOpsDelete, h.DeleteSync)+ registerGitOpsSecuredInternal(api, "performGitOpsSync", "POST", "/environments/{id}/gitops-syncs/{syncId}/sync", "Perform a GitOps sync", "Manually trigger a sync operation", authz.PermGitOpsSync, h.PerformSync)+ registerGitOpsSecuredInternal(api, "getGitOpsSyncStatus", "GET", "/environments/{id}/gitops-syncs/{syncId}/status", "Get GitOps sync status", "Get the current status of a GitOps sync", authz.PermGitOpsRead, h.GetStatus)+ registerGitOpsSecuredInternal(api, "browseGitOpsSyncFiles", "GET", "/environments/{id}/gitops-syncs/{syncId}/files", "Browse GitOps sync files", "Browse files in the synced repository", authz.PermGitOpsRead, h.BrowseFiles)}// ============================================================================@@ -292,10 +174,7 @@ func (h *GitOpsSyncHandler) CreateSync(ctx context.Context, input *CreateGitOpsSreturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)sync, err := h.syncService.CreateSync(ctx, input.EnvironmentID, input.Body, actor)if err != nil {@@ -303,16 +182,15 @@ func (h *GitOpsSyncHandler) CreateSync(ctx context.Context, input *CreateGitOpsSreturn nil, huma.NewError(apiErr.HTTPStatus(), (&common.GitOpsSyncCreationError{Err: err}).Error())}- out, mapErr := mapper.MapOne[*models.GitOpsSync, gitops.GitOpsSync](sync)+ body, mapErr := mapOneAPIResponseInternal[*models.GitOpsSync, gitops.GitOpsSync](sync, func(err error) string {+ return (&common.GitOpsSyncMappingError{Err: err}).Error()+ })if mapErr != nil {- return nil, huma.Error500InternalServerError((&common.GitOpsSyncMappingError{Err: mapErr}).Error())+ return nil, mapErr}return &CreateGitOpsSyncOutput{- Body: base.ApiResponse[gitops.GitOpsSync]{- Success: true,- Data: out,- },+ Body: body,}, nil}@@ -322,10 +200,7 @@ func (h *GitOpsSyncHandler) ImportSyncs(ctx context.Context, input *ImportGitOpsreturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)response, err := h.syncService.ImportSyncs(ctx, input.EnvironmentID, input.Body, actor)if err != nil {@@ -352,16 +227,15 @@ func (h *GitOpsSyncHandler) GetSync(ctx context.Context, input *GetGitOpsSyncInpreturn nil, huma.NewError(apiErr.HTTPStatus(), (&common.GitOpsSyncRetrievalError{Err: err}).Error())}- out, mapErr := mapper.MapOne[*models.GitOpsSync, gitops.GitOpsSync](sync)+ body, mapErr := mapOneAPIResponseInternal[*models.GitOpsSync, gitops.GitOpsSync](sync, func(err error) string {+ return (&common.GitOpsSyncMappingError{Err: err}).Error()+ })if mapErr != nil {- return nil, huma.Error500InternalServerError((&common.GitOpsSyncMappingError{Err: mapErr}).Error())+ return nil, mapErr}return &GetGitOpsSyncOutput{- Body: base.ApiResponse[gitops.GitOpsSync]{- Success: true,- Data: out,- },+ Body: body,}, nil}@@ -371,10 +245,7 @@ func (h *GitOpsSyncHandler) UpdateSync(ctx context.Context, input *UpdateGitOpsSreturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)sync, err := h.syncService.UpdateSync(ctx, input.EnvironmentID, input.SyncID, input.Body, actor)if err != nil {@@ -382,16 +253,15 @@ func (h *GitOpsSyncHandler) UpdateSync(ctx context.Context, input *UpdateGitOpsSreturn nil, huma.NewError(apiErr.HTTPStatus(), (&common.GitOpsSyncUpdateError{Err: err}).Error())}- out, mapErr := mapper.MapOne[*models.GitOpsSync, gitops.GitOpsSync](sync)+ body, mapErr := mapOneAPIResponseInternal[*models.GitOpsSync, gitops.GitOpsSync](sync, func(err error) string {+ return (&common.GitOpsSyncMappingError{Err: err}).Error()+ })if mapErr != nil {- return nil, huma.Error500InternalServerError((&common.GitOpsSyncMappingError{Err: mapErr}).Error())+ return nil, mapErr}return &UpdateGitOpsSyncOutput{- Body: base.ApiResponse[gitops.GitOpsSync]{- Success: true,- Data: out,- },+ Body: body,}, nil}@@ -401,10 +271,7 @@ func (h *GitOpsSyncHandler) DeleteSync(ctx context.Context, input *DeleteGitOpsSreturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)if err := h.syncService.DeleteSync(ctx, input.EnvironmentID, input.SyncID, actor); err != nil {apiErr := models.ToAPIError(err)@@ -427,10 +294,7 @@ func (h *GitOpsSyncHandler) PerformSync(ctx context.Context, input *PerformSyncIreturn nil, huma.Error500InternalServerError("service not available")}- actor := models.User{}- if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {- actor = *currentUser- }+ actor := currentActorInternal(ctx)result, err := h.syncService.PerformSync(ctx, input.EnvironmentID, input.SyncID, actor)if err != nil {diff --git a/backend/api/handlers/helpers.go b/backend/api/handlers/helpers.goindex 20ad2937e..ffb700bf1 100644--- a/backend/api/handlers/helpers.go+++ b/backend/api/handlers/helpers.go@@ -6,9 +6,13 @@ import ("errors""github.com/danielgtaylor/huma/v2"+ humamw "github.com/getarcaneapp/arcane/backend/api/middleware"+ "github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/services""github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/remenv"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper"+ "github.com/getarcaneapp/arcane/types/base")// ActivityAppContext carries the app lifecycle context through handler registration.@@ -54,6 +58,95 @@ func buildPaginationParamsInternal(start, limit int, sortCol, sortDir, search st}}+func registerSecuredInternal[I, O any](+ api huma.API,+ op huma.Operation,+ permission string,+ handler func(context.Context, *I) (*O, error),+) {+ op.Security = defaultOperationSecurityInternal()+ op.Middlewares = humamw.RequirePermission(api, permission)+ huma.Register(api, op, handler)+}++func registerCustomizeSecuredInternal[I, O any](+ api huma.API,+ operationID string,+ method string,+ path string,+ summary string,+ description string,+ permission string,+ handler func(context.Context, *I) (*O, error),+) {+ registerTaggedSecuredInternal(api, operationID, method, path, summary, description, "Customize", permission, handler)+}++func registerGitOpsSecuredInternal[I, O any](+ api huma.API,+ operationID string,+ method string,+ path string,+ summary string,+ description string,+ permission string,+ handler func(context.Context, *I) (*O, error),+) {+ registerTaggedSecuredInternal(api, operationID, method, path, summary, description, "GitOps Syncs", permission, handler)+}++func registerTaggedSecuredInternal[I, O any](+ api huma.API,+ operationID string,+ method string,+ path string,+ summary string,+ description string,+ tag string,+ permission string,+ handler func(context.Context, *I) (*O, error),+) {+ registerSecuredInternal(api, operationInternal(operationID, method, path, summary, description, tag), permission, handler)+}++func operationInternal(operationID, method, path, summary, description string, tags ...string) huma.Operation {+ return huma.Operation{+ OperationID: operationID,+ Method: method,+ Path: path,+ Summary: summary,+ Description: description,+ Tags: tags,+ }+}++func currentActorInternal(ctx context.Context) models.User {+ actor := models.User{}+ if currentUser, exists := humamw.GetCurrentUserFromContext(ctx); exists && currentUser != nil {+ actor = *currentUser+ }+ return actor+}++func mapOneAPIResponseInternal[S any, D any](source S, mappingMessage func(error) string) (base.ApiResponse[D], error) {+ out, err := mapper.MapOne[S, D](source)+ if err != nil {+ return base.ApiResponse[D]{}, huma.Error500InternalServerError(mappingMessage(err))+ }++ return base.ApiResponse[D]{+ Success: true,+ Data: out,+ }, nil+}++func defaultOperationSecurityInternal() []map[string][]string {+ return []map[string][]string{+ {"BearerAuth": {}},+ {"ApiKeyAuth": {}},+ }+}+func proxyRemoteJSONInternal[T any](ctx context.Context,environmentService *services.EnvironmentService,@@ -87,18 +180,15 @@ func marshalRemoteRequestBodyInternal(requestBody any) ([]byte, error) {}func translateRemoteProxyErrorInternal(err error) error {- var transportErr *remenv.TransportError- if errors.As(err, &transportErr) {+ if transportErr, ok := errors.AsType[*remenv.TransportError](err); ok {return huma.Error502BadGateway("failed to proxy request to environment: " + transportErr.Error())}- var statusErr *remenv.StatusError- if errors.As(err, &statusErr) {+ if statusErr, ok := errors.AsType[*remenv.StatusError](err); ok {return huma.NewError(statusErr.StatusCode, "environment returned error: "+string(statusErr.Body), nil)}- var decodeErr *remenv.DecodeError- if errors.As(err, &decodeErr) {+ if decodeErr, ok := errors.AsType[*remenv.DecodeError](err); ok {return huma.Error500InternalServerError("failed to decode environment response: " + decodeErr.Error())}diff --git a/backend/api/handlers/images.go b/backend/api/handlers/images.goindex b6242dc1c..c214f1bfd 100644--- a/backend/api/handlers/images.go+++ b/backend/api/handlers/images.go@@ -17,6 +17,7 @@ import (activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity""github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx""github.com/getarcaneapp/arcane/types/base""github.com/getarcaneapp/arcane/types/image""github.com/getarcaneapp/arcane/types/system"@@ -446,10 +447,7 @@ func (h *ImageHandler) PullImage(ctx context.Context, input *PullImageInput) (*hreturn &huma.StreamResponse{Body: func(humaCtx huma.Context) { //nolint:contextcheck // context is obtained from humaCtx.Context()- humaCtx.SetHeader("Content-Type", "application/x-json-stream")- humaCtx.SetHeader("Cache-Control", "no-cache")- humaCtx.SetHeader("Connection", "keep-alive")- humaCtx.SetHeader("X-Accel-Buffering", "no")+ httpx.SetJSONStreamHeaders(humaCtx)runtimeCtx := utils.ActivityRuntimeContext(humaCtx.Context(), h.appCtx)rawWriter := humaCtx.BodyWriter()@@ -501,10 +499,7 @@ func (h *ImageHandler) BuildImage(ctx context.Context, input *BuildImageInput) (return &huma.StreamResponse{Body: func(humaCtx huma.Context) { //nolint:contextcheck // context is obtained from humaCtx.Context()- humaCtx.SetHeader("Content-Type", "application/x-json-stream")- humaCtx.SetHeader("Cache-Control", "no-cache")- humaCtx.SetHeader("Connection", "keep-alive")- humaCtx.SetHeader("X-Accel-Buffering", "no")+ httpx.SetJSONStreamHeaders(humaCtx)runtimeCtx := utils.ActivityRuntimeContext(humaCtx.Context(), h.appCtx)rawWriter := humaCtx.BodyWriter()diff --git a/backend/api/handlers/projects.go b/backend/api/handlers/projects.goindex 92503e524..00a55fcd1 100644--- a/backend/api/handlers/projects.go+++ b/backend/api/handlers/projects.go@@ -19,6 +19,7 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/pagination"projects "github.com/getarcaneapp/arcane/backend/pkg/projects""github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx""github.com/getarcaneapp/arcane/backend/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/base""github.com/getarcaneapp/arcane/types/project"@@ -596,10 +597,7 @@ func (h *ProjectHandler) DeployProject(ctx context.Context, input *DeployProjectreturn &huma.StreamResponse{Body: func(humaCtx huma.Context) { //nolint:contextcheck // context is obtained from humaCtx.Context()- humaCtx.SetHeader("Content-Type", "application/x-json-stream")- humaCtx.SetHeader("Cache-Control", "no-cache")- humaCtx.SetHeader("Connection", "keep-alive")- humaCtx.SetHeader("X-Accel-Buffering", "no")+ httpx.SetJSONStreamHeaders(humaCtx)runtimeCtx := utils.ActivityRuntimeContext(humaCtx.Context(), h.appCtx)rawWriter := humaCtx.BodyWriter()@@ -665,8 +663,7 @@ func (h *ProjectHandler) DownProject(ctx context.Context, input *DownProjectInpuif err := h.projectService.DownProject(downCtx, input.ProjectID, *user); err != nil {activitylib.FlushWriter(activityWriter)activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project stopped", err)- var archivedErr *common.ProjectArchivedError- if errors.As(err, &archivedErr) {+ if _, ok := errors.AsType[*common.ProjectArchivedError](err); ok {return nil, huma.Error400BadRequest((&common.ProjectDownError{Err: err}).Error())}return nil, huma.Error500InternalServerError((&common.ProjectDownError{Err: err}).Error())@@ -852,55 +849,13 @@ func (h *ProjectHandler) GetProjectFile(ctx context.Context, input *GetProjectFi// RedeployProject redeploys a Docker Compose project.func (h *ProjectHandler) RedeployProject(ctx context.Context, input *RedeployProjectInput) (*RedeployProjectOutput, error) {- if h.projectService == nil {- return nil, huma.Error500InternalServerError("service not available")- }-- if input.ProjectID == "" {- return nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())- }-- user, exists := humamw.GetCurrentUserFromContext(ctx)- if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())- }-- runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)- activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(- runtimeCtx,- h.activityService,- input.EnvironmentID,- models.ActivityTypeProjectRedeploy,- "project",- input.ProjectID,- input.ProjectID,- user,- "Starting redeploy",- "Project redeploy started",- models.JSON{"projectID": input.ProjectID},- )- activityWriter := activitylib.NewWriter(runtimeCtx, h.activityService, activityID, io.Discard, "Redeploying project")- redeployCtx := context.WithValue(runtimeCtx, projects.ProgressWriterKey{}, activityWriter)- if err := h.projectService.RedeployProject(redeployCtx, input.ProjectID, *user, input.Body); err != nil {- activitylib.FlushWriter(activityWriter)- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project redeploy failed", err)- var archivedErr *common.ProjectArchivedError- if errors.As(err, &archivedErr) {- return nil, huma.Error400BadRequest(err.Error())- }- return nil, huma.Error400BadRequest((&common.ProjectRedeploymentError{Err: err}).Error())+ response, err := h.runProjectActivityActionResponseInternal(ctx, input.EnvironmentID, input.ProjectID, h.redeployProjectActivityConfigInternal(input.Body))+ if err != nil {+ return nil, err}- activitylib.FlushWriter(activityWriter)- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project redeploy completed", nil)return &RedeployProjectOutput{- Body: base.ApiResponse[base.MessageResponse]{- Success: true,- Data: base.MessageResponse{- Message: "Project redeployed successfully",- ActivityID: utils.StringPtrFromTrimmed(activityID),- },- },+ Body: response,}, nil}@@ -1055,43 +1010,119 @@ func (h *ProjectHandler) UpdateProjectInclude(ctx context.Context, input *Update// RestartProject restarts all containers in a project.func (h *ProjectHandler) RestartProject(ctx context.Context, input *RestartProjectInput) (*RestartProjectOutput, error) {+ response, err := h.runProjectActivityActionResponseInternal(ctx, input.EnvironmentID, input.ProjectID, h.restartProjectActivityConfigInternal())+ if err != nil {+ return nil, err+ }++ return &RestartProjectOutput{+ Body: response,+ }, nil+}++type projectActivityActionConfigInternal struct {+ ActivityType models.ActivityType+ Step string+ StartMessage string+ WriterStep string+ FailureMessage string+ SuccessComplete string+ SuccessMessage string+ Action func(context.Context, string, models.User) error+ Error func(error) error+}++func (h *ProjectHandler) redeployProjectActivityConfigInternal(options *project.DeployOptions) projectActivityActionConfigInternal {+ return projectActivityActionConfigInternal{+ ActivityType: models.ActivityTypeProjectRedeploy,+ Step: "Starting redeploy",+ StartMessage: "Project redeploy started",+ WriterStep: "Redeploying project",+ FailureMessage: "Project redeploy failed",+ SuccessComplete: "Project redeploy completed",+ SuccessMessage: "Project redeployed successfully",+ Action: func(runtimeCtx context.Context, projectID string, user models.User) error {+ return h.projectService.RedeployProject(runtimeCtx, projectID, user, options)+ },+ Error: projectArchivedActionErrorInternal(func(err error) error {+ return huma.Error400BadRequest((&common.ProjectRedeploymentError{Err: err}).Error())+ }),+ }+}++func (h *ProjectHandler) restartProjectActivityConfigInternal() projectActivityActionConfigInternal {+ return projectActivityActionConfigInternal{+ ActivityType: models.ActivityTypeProjectRestart,+ Step: "Restarting project",+ StartMessage: "Project restart requested",+ WriterStep: "Restarting project",+ FailureMessage: "Project restarted",+ SuccessComplete: "Project restarted",+ SuccessMessage: "Project restarted successfully",+ Action: func(runtimeCtx context.Context, projectID string, user models.User) error {+ return h.projectService.RestartProject(runtimeCtx, projectID, user)+ },+ Error: projectArchivedActionErrorInternal(func(err error) error {+ return huma.Error400BadRequest((&common.ProjectRestartError{Err: err}).Error())+ }),+ }+}++func projectArchivedActionErrorInternal(fallback func(error) error) func(error) error {+ return func(err error) error {+ if _, ok := errors.AsType[*common.ProjectArchivedError](err); ok {+ return huma.Error400BadRequest(err.Error())+ }+ return fallback(err)+ }+}++func (h *ProjectHandler) runProjectActivityActionResponseInternal(+ ctx context.Context,+ environmentID string,+ projectID string,+ cfg projectActivityActionConfigInternal,+) (base.ApiResponse[base.MessageResponse], error) {+ message, err := h.runProjectActivityActionInternal(ctx, environmentID, projectID, cfg)+ if err != nil {+ return base.ApiResponse[base.MessageResponse]{}, err+ }++ return base.ApiResponse[base.MessageResponse]{+ Success: true,+ Data: message,+ }, nil+}++func (h *ProjectHandler) runProjectActivityActionInternal(ctx context.Context, environmentID, projectID string, cfg projectActivityActionConfigInternal) (base.MessageResponse, error) {if h.projectService == nil {- return nil, huma.Error500InternalServerError("service not available")+ return base.MessageResponse{}, huma.Error500InternalServerError("service not available")}- if input.ProjectID == "" {- return nil, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())+ if projectID == "" {+ return base.MessageResponse{}, huma.Error400BadRequest((&common.ProjectIDRequiredError{}).Error())}user, exists := humamw.GetCurrentUserFromContext(ctx)if !exists {- return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())+ return base.MessageResponse{}, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())}runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)- activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(runtimeCtx, h.activityService, input.EnvironmentID, models.ActivityTypeProjectRestart, "project", input.ProjectID, input.ProjectID, user, "Restarting project", "Project restart requested", models.JSON{"projectID": input.ProjectID})- activityWriter := activitylib.NewWriter(runtimeCtx, h.activityService, activityID, io.Discard, "Restarting project")- restartCtx := context.WithValue(runtimeCtx, projects.ProgressWriterKey{}, activityWriter)- if err := h.projectService.RestartProject(restartCtx, input.ProjectID, *user); err != nil {+ activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(runtimeCtx, h.activityService, environmentID, cfg.ActivityType, "project", projectID, projectID, user, cfg.Step, cfg.StartMessage, models.JSON{"projectID": projectID})+ activityWriter := activitylib.NewWriter(runtimeCtx, h.activityService, activityID, io.Discard, cfg.WriterStep)+ actionCtx := context.WithValue(runtimeCtx, projects.ProgressWriterKey{}, activityWriter)+ if err := cfg.Action(actionCtx, projectID, *user); err != nil {activitylib.FlushWriter(activityWriter)- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project restarted", err)- var archivedErr *common.ProjectArchivedError- if errors.As(err, &archivedErr) {- return nil, huma.Error400BadRequest(err.Error())- }- return nil, huma.Error400BadRequest((&common.ProjectRestartError{Err: err}).Error())+ activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, cfg.FailureMessage, err)+ return base.MessageResponse{}, cfg.Error(err)}activitylib.FlushWriter(activityWriter)- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project restarted", nil)+ activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, cfg.SuccessComplete, nil)- return &RestartProjectOutput{- Body: base.ApiResponse[base.MessageResponse]{- Success: true,- Data: base.MessageResponse{- Message: "Project restarted successfully",- ActivityID: utils.StringPtrFromTrimmed(activityID),- },- },+ return base.MessageResponse{+ Message: cfg.SuccessMessage,+ ActivityID: utils.StringPtrFromTrimmed(activityID),}, nil}@@ -1110,8 +1141,7 @@ func (h *ProjectHandler) ArchiveProject(ctx context.Context, input *ArchiveProje}if err := h.projectService.ArchiveProject(ctx, input.ProjectID, *user); err != nil {- var mustStopErr *common.ProjectMustBeStoppedError- if errors.As(err, &mustStopErr) {+ if _, ok := errors.AsType[*common.ProjectMustBeStoppedError](err); ok {return nil, huma.Error400BadRequest(err.Error())}return nil, huma.Error500InternalServerError((&common.ProjectArchiveError{Err: err}).Error())@@ -1168,12 +1198,9 @@ func (h *ProjectHandler) PullProjectImages(ctx context.Context, input *PullProjereturn &huma.StreamResponse{Body: func(humaCtx huma.Context) { //nolint:contextcheck // context is obtained from humaCtx.Context()- humaCtx.SetHeader("Content-Type", "application/x-json-stream")- humaCtx.SetHeader("Cache-Control", "no-cache")- humaCtx.SetHeader("Connection", "keep-alive")- humaCtx.SetHeader("X-Accel-Buffering", "no")+ httpx.SetJSONStreamHeaders(humaCtx)- runtimeCtx := utils.ActivityRuntimeContext(humaCtx.Context(), h.appCtx)+ runtimeCtx := utils.ActivityRuntimeContext(humaCtx.Context(), h.appCtx) //nolint:contextcheck // activity context intentionally outlives the HTTP stream (uses app lifecycle context)rawWriter := humaCtx.BodyWriter()activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(runtimeCtx,@@ -1240,12 +1267,9 @@ func (h *ProjectHandler) BuildProjectImages(ctx context.Context, input *BuildProreturn &huma.StreamResponse{Body: func(humaCtx huma.Context) { //nolint:contextcheck // context is obtained from humaCtx.Context()- humaCtx.SetHeader("Content-Type", "application/x-json-stream")- humaCtx.SetHeader("Cache-Control", "no-cache")- humaCtx.SetHeader("Connection", "keep-alive")- humaCtx.SetHeader("X-Accel-Buffering", "no")+ httpx.SetJSONStreamHeaders(humaCtx)- runtimeCtx := utils.ActivityRuntimeContext(humaCtx.Context(), h.appCtx)+ runtimeCtx := utils.ActivityRuntimeContext(humaCtx.Context(), h.appCtx) //nolint:contextcheck // activity context intentionally outlives the HTTP stream (uses app lifecycle context)rawWriter := humaCtx.BodyWriter()activityID, runtimeCtx := activitylib.StartHandlerActivityForUser(runtimeCtx,diff --git a/backend/api/handlers/settings_test.go b/backend/api/handlers/settings_test.goindex 89fa455f2..3b1cc145d 100644--- a/backend/api/handlers/settings_test.go+++ b/backend/api/handlers/settings_test.go@@ -87,8 +87,7 @@ func TestSettingsHandler_UpdateLocalEnvironment_RejectsUnreadableProjectsDirectohandler := &SettingsHandler{settingsService: settingsSvc, cfg: &config.Config{}}- dirPtr := unreadable- _, err = handler.updateSettingsForLocalEnvironment(ctx, apitypes.Update{ProjectsDirectory: &dirPtr})+ _, err = handler.updateSettingsForLocalEnvironment(ctx, apitypes.Update{ProjectsDirectory: new(unreadable)})require.Error(t, err)var statusErr huma.StatusErrordiff --git a/backend/api/handlers/volumes.go b/backend/api/handlers/volumes.goindex 2f318272e..e205454aa 100644--- a/backend/api/handlers/volumes.go+++ b/backend/api/handlers/volumes.go@@ -1045,66 +1045,66 @@ func (h *VolumeHandler) UploadFile(ctx context.Context, input *UploadFileInput)}func (h *VolumeHandler) CreateDirectory(ctx context.Context, input *CreateDirectoryInput) (*base.ApiResponse[base.MessageResponse], error) {- if h.volumeService == nil {- return nil, huma.Error500InternalServerError("service not available")- }- user, _ := humamw.GetCurrentUserFromContext(ctx)- runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)- activityID, err := activitylib.RunHandlerActivity(runtimeCtx, h.activityService, activitylib.HandlerOptions{- EnvironmentID: input.EnvironmentID,- Type: models.ActivityTypeResourceAction,- ResourceType: "volume",- ResourceID: input.VolumeName,- ResourceName: input.VolumeName,- User: user,+ return h.runVolumePathActivityInternal(ctx, input.EnvironmentID, input.VolumeName, input.Path, volumePathActivityConfigInternal{Step: "Creating directory",Message: "Creating directory in volume",SuccessMessage: "Directory created successfully",- Metadata: models.JSON{- "action": "create_volume_directory",- "path": input.Path,+ MetadataAction: "create_volume_directory",+ Action: func(runtimeCtx context.Context, volumeName, path string, user *models.User) error {+ return h.volumeService.CreateDirectory(runtimeCtx, volumeName, path, user)},- }, func(runtimeCtx context.Context) error {- return h.volumeService.CreateDirectory(runtimeCtx, input.VolumeName, input.Path, user)})- if err != nil {- return nil, huma.Error500InternalServerError(err.Error())- }- return &base.ApiResponse[base.MessageResponse]{- Success: true,- Data: base.MessageResponse{Message: "Directory created successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},- }, nil}func (h *VolumeHandler) DeleteFile(ctx context.Context, input *DeleteFileInput) (*base.ApiResponse[base.MessageResponse], error) {+ return h.runVolumePathActivityInternal(ctx, input.EnvironmentID, input.VolumeName, input.Path, volumePathActivityConfigInternal{+ Step: "Deleting file",+ Message: "Deleting file or directory from volume",+ SuccessMessage: "Deleted successfully",+ MetadataAction: "delete_volume_file",+ Action: func(runtimeCtx context.Context, volumeName, path string, user *models.User) error {+ return h.volumeService.DeleteFile(runtimeCtx, volumeName, path, user)+ },+ })+}++type volumePathActivityConfigInternal struct {+ Step string+ Message string+ SuccessMessage string+ MetadataAction string+ Action func(context.Context, string, string, *models.User) error+}++func (h *VolumeHandler) runVolumePathActivityInternal(ctx context.Context, environmentID, volumeName, volumePath string, cfg volumePathActivityConfigInternal) (*base.ApiResponse[base.MessageResponse], error) {if h.volumeService == nil {return nil, huma.Error500InternalServerError("service not available")}user, _ := humamw.GetCurrentUserFromContext(ctx)runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)activityID, err := activitylib.RunHandlerActivity(runtimeCtx, h.activityService, activitylib.HandlerOptions{- EnvironmentID: input.EnvironmentID,+ EnvironmentID: environmentID,Type: models.ActivityTypeResourceAction,ResourceType: "volume",- ResourceID: input.VolumeName,- ResourceName: input.VolumeName,+ ResourceID: volumeName,+ ResourceName: volumeName,User: user,- Step: "Deleting file",- Message: "Deleting file or directory from volume",- SuccessMessage: "Deleted successfully",+ Step: cfg.Step,+ Message: cfg.Message,+ SuccessMessage: cfg.SuccessMessage,Metadata: models.JSON{- "action": "delete_volume_file",- "path": input.Path,+ "action": cfg.MetadataAction,+ "path": volumePath,},}, func(runtimeCtx context.Context) error {- return h.volumeService.DeleteFile(runtimeCtx, input.VolumeName, input.Path, user)+ return cfg.Action(runtimeCtx, volumeName, volumePath, user)})if err != nil {return nil, huma.Error500InternalServerError(err.Error())}return &base.ApiResponse[base.MessageResponse]{Success: true,- Data: base.MessageResponse{Message: "Deleted successfully", ActivityID: utils.StringPtrFromTrimmed(activityID)},+ Data: base.MessageResponse{Message: cfg.SuccessMessage, ActivityID: utils.StringPtrFromTrimmed(activityID)},}, nil}diff --git a/backend/go.mod b/backend/go.modindex 5e5be8a16..79dcfec12 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -23,7 +23,7 @@ require (github.com/docker/go-units v0.5.0github.com/fsnotify/fsnotify v1.10.1github.com/getarcaneapp/arcane/cli v1.19.1- github.com/getarcaneapp/arcane/types v1.19.4+ github.com/getarcaneapp/arcane/types v1.19.5github.com/glebarez/sqlite v1.11.0github.com/go-git/go-git/v5 v5.19.1github.com/goccy/go-yaml v1.19.2@@ -204,17 +204,17 @@ require (go.opentelemetry.io/auto/sdk v1.2.1 // indirectgo.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirectgo.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.68.0 // indirect- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect- go.opentelemetry.io/otel v1.43.0 // indirect+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect+ go.opentelemetry.io/otel v1.44.0 // indirectgo.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.43.0 // indirectgo.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 // indirectgo.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirectgo.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirectgo.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect- go.opentelemetry.io/otel/metric v1.43.0 // indirect- go.opentelemetry.io/otel/sdk v1.43.0 // indirect- go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect- go.opentelemetry.io/otel/trace v1.43.0 // indirect+ go.opentelemetry.io/otel/metric v1.44.0 // indirect+ go.opentelemetry.io/otel/sdk v1.44.0 // indirect+ go.opentelemetry.io/otel/sdk/metric v1.44.0 // indirect+ go.opentelemetry.io/otel/trace v1.44.0 // indirectgo.opentelemetry.io/proto/otlp v1.10.0 // indirectgo.yaml.in/yaml/v4 v4.0.0-rc.4 // indirectgolang.org/x/sys v0.45.0 // indirectdiff --git a/backend/go.sum b/backend/go.sumindex f2dd72134..76af66d44 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -557,10 +557,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0/go.mod h1:Sje3i3MjSPKTSPvVWCaL8ugBzJwik3u4smCjUeuupqg=go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.68.0 h1:cuXaPAfIoJKsYjBjPSb2nKZEmgM43zVr25l37IxhKME=go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.68.0/go.mod h1:BuzhPofpCzlDi/Q/Xjg54M4/3oWqqyDe2Zeq7A2I0QE=-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 h1:CqXxU8VOmDefoh0+ztfGaymYbhdB/tT3zs79QaZTNGY=-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0/go.mod h1:BuhAPThV8PBHBvg8ZzZ/Ok3idOdhWIodywz2xEcRbJo=-go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo=+go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.43.0 h1:8UQVDcZxOJLtX6gxtDt3vY2WTgvZqMQRzjsqiIHQdkc=go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.43.0/go.mod h1:2lmweYCiHYpEjQ/lSJBYhj9jP1zvCvQW4BqL9dnT7FQ=go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 h1:w1K+pCJoPpQifuVpsKamUdn9U0zM3xUziVOqsGksUrY=@@ -571,14 +569,11 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 h1:RAE+Jgo.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0/go.mod h1:AGmbycVGEsRx9mXMZ75CsOyhSP6MFIcj/6dnG+vhVjk=go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc=go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=-go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=-go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=-go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=-go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=+go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=+go.opentelemetry.io/otel/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA=+go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=+go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=+go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=diff --git a/backend/internal/bootstrap/edge_bootstrap.go b/backend/internal/bootstrap/edge_bootstrap.goindex 8d85672b8..018ecea14 100644--- a/backend/internal/bootstrap/edge_bootstrap.go+++ b/backend/internal/bootstrap/edge_bootstrap.go@@ -112,7 +112,6 @@ func registerEdgeTunnelRoutes(if env, err := appServices.Environment.GetEnvironmentByID(ctx, envID); err == nil && env != nil {envName = env.Name}- resourceType := "environment"envIDCopy := envIDenvNameCopy := envName_, _ = appServices.Event.CreateEvent(ctx, services.CreateEventRequest{@@ -120,7 +119,7 @@ func registerEdgeTunnelRoutes(Severity: edgeMTLSEnrollmentSeverityInternal(reenrolled),Title: "Edge mTLS enrollment",Description: fmt.Sprintf("Edge agent completed mTLS enrollment from %s", remoteAddr),- ResourceType: &resourceType,+ ResourceType: new("environment"),ResourceID: &envIDCopy,ResourceName: &envNameCopy,EnvironmentID: &envIDCopy,@@ -157,13 +156,12 @@ func createEdgeMTLSIssueEventsInternal(ctx context.Context, eventService *servic})}if certIssued {- resourceType := "environment"_, _ = eventService.CreateEvent(ctx, services.CreateEventRequest{Type: models.EventTypeEnvironmentMTLSCertIssued,Severity: edgeMTLSCertIssuedSeverityInternal(reenrolled),Title: "Edge mTLS certificate issued",Description: fmt.Sprintf("Arcane issued an edge mTLS client certificate for environment '%s'", envName),- ResourceType: &resourceType,+ ResourceType: new("environment"),ResourceID: &envID,ResourceName: &envName,EnvironmentID: &envID,diff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 11875a702..806e7c758 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -170,7 +170,7 @@ func loadFromEnv(cfg *Config) {defaultValue := fieldType.Tag.Get("default")// Get the environment value directly first- envValue := trimQuotes(os.Getenv(envTag))+ envValue := pkgutils.TrimQuotes(os.Getenv(envTag))if envValue == "" {envValue = defaultValue}@@ -371,15 +371,6 @@ func setFieldValueInternal(field reflect.Value, fieldType reflect.StructField, v}}-func trimQuotes(s string) string {- if len(s) >= 2 {- if (s[0] == '"' && s[len(s)-1] == '"') || (s[0] == '\'' && s[len(s)-1] == '\'') {- return s[1 : len(s)-1]- }- }- return s-}-func (a AppEnvironment) IsProdEnvironment() bool {return a == AppEnvironmentProduction}diff --git a/backend/internal/middleware/environment_middleware.go b/backend/internal/middleware/environment_middleware.goindex f79e76439..7d668e0eb 100644--- a/backend/internal/middleware/environment_middleware.go+++ b/backend/internal/middleware/environment_middleware.go@@ -342,8 +342,7 @@ func (m *EnvironmentMiddleware) proxyHTTP(c echo.Context, target string, accessTreq, err := m.createProxyRequest(c, target, accessToken)if err != nil {errMessage := (&common.EnvironmentProxyRequestCreationError{Err: err}).Error()- var invalidTargetErr *common.EnvironmentInvalidProxyTargetError- if errors.As(err, &invalidTargetErr) {+ if invalidTargetErr, ok := errors.AsType[*common.EnvironmentInvalidProxyTargetError](err); ok {errMessage = invalidTargetErr.Error()}return c.JSON(http.StatusInternalServerError, map[string]any{diff --git a/backend/internal/services/activity_service.go b/backend/internal/services/activity_service.goindex f320d49f0..bcc40abec 100644--- a/backend/internal/services/activity_service.go+++ b/backend/internal/services/activity_service.go@@ -420,8 +420,7 @@ func (s *ActivityService) CancelActivity(ctx context.Context, environmentID, act// terminal status, which reaches clients via the activity stream. Return// the pre-cancel snapshot rather than reloading here: the worker has not// finished unwinding yet, so a reload would still report "running".- dto := activityToDTOInternal(&model)- return &dto, nil+ return new(activityToDTOInternal(&model)), nil}// Untracked work (e.g. after a process restart, or a queued activity with no@@ -762,8 +761,7 @@ func copyPtrInternal[T any](value *T) *T {if value == nil {return nil}- out := *value- return &out+ return new(*value)}func clampProgressPtrInternal(value *int) *int {diff --git a/backend/internal/services/activity_service_test.go b/backend/internal/services/activity_service_test.goindex 44922daf8..8942b0b9c 100644--- a/backend/internal/services/activity_service_test.go+++ b/backend/internal/services/activity_service_test.go@@ -31,22 +31,18 @@ func TestActivityServiceLifecycleInternal(t *testing.T) {db := setupActivityServiceTestDBInternal(t)service := NewActivityService(db)- resourceType := "image"- resourceID := "img-123"- resourceName := "nginx:latest"progress := 5- displayName := "Arcane Admin"startedBy := &models.User{BaseModel: models.BaseModel{ID: "user-1"},Username: "arcane",- DisplayName: &displayName,+ DisplayName: new("Arcane Admin"),}created, err := service.StartActivity(ctx, StartActivityRequest{EnvironmentID: "0",Type: models.ActivityTypeImagePull,- ResourceType: &resourceType,- ResourceID: &resourceID,- ResourceName: &resourceName,+ ResourceType: new("image"),+ ResourceID: new("img-123"),+ ResourceName: new("nginx:latest"),StartedBy: startedBy,Progress: &progress,Step: "queued",diff --git a/backend/internal/services/api_key_service.go b/backend/internal/services/api_key_service.goindex 57d602857..c4ad15b80 100644--- a/backend/internal/services/api_key_service.go+++ b/backend/internal/services/api_key_service.go@@ -449,8 +449,7 @@ func (s *ApiKeyService) GetApiKey(ctx context.Context, id string) (*apikey.ApiKe}return nil, fmt.Errorf("failed to get API key: %w", err)}- dto := s.toAPIKeyDTOWithPermissionsInternal(ctx, &ak)- return &dto, nil+ return new(s.toAPIKeyDTOWithPermissionsInternal(ctx, &ak)), nil}func (s *ApiKeyService) ListApiKeys(ctx context.Context, params pagination.QueryParams) ([]apikey.ApiKey, pagination.Response, error) {diff --git a/backend/internal/services/api_key_service_test.go b/backend/internal/services/api_key_service_test.goindex 638f68de5..22204def6 100644--- a/backend/internal/services/api_key_service_test.go+++ b/backend/internal/services/api_key_service_test.go@@ -219,9 +219,8 @@ func TestUpdateApiKeyRollsBackMetadataWhenPermissionUpdateFails(t *testing.T) {created, err := service.CreateApiKey(ctx, admin.ID, apikey.CreateApiKey{Name: "original"})require.NoError(t, err)- updatedName := "renamed"updated, err := service.UpdateApiKey(ctx, admin.ID, created.ApiKey.ID, apikey.UpdateApiKey{- Name: &updatedName,+ Name: new("renamed"),Permissions: []apikey.PermissionGrant{{Permission: authz.PermContainersList},{Permission: authz.PermContainersList},diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex d4290d3c9..60e18e2d0 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -725,8 +725,7 @@ func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*modtokenHash := hashTokenInternal(accessToken)if cached, ok := s.tokenCache.Get(tokenHash); ok {- u := cached.User- return &u, cached.SessionID, nil+ return new(cached.User), cached.SessionID, nil}// Verify user exists in DBdiff --git a/backend/internal/services/build_service.go b/backend/internal/services/build_service.goindex 5c86e4213..a713436a4 100644--- a/backend/internal/services/build_service.go+++ b/backend/internal/services/build_service.go@@ -155,12 +155,10 @@ func (s *BuildService) BuildImage(ctx context.Context, environmentID string, reqvar errMsg *stringif err != nil {status = models.ImageBuildStatusFailed- errorText := err.Error()- errMsg = &errorText+ errMsg = new(err.Error())}- durationMs := completedAt.Sub(startedAt).Milliseconds()- if updateErr := s.completeBuildRecord(ctx, buildRecordID, status, outputPtr, logCapture.Truncated(), errMsg, digest, provider, completedAt, &durationMs); updateErr != nil {+ if updateErr := s.completeBuildRecord(ctx, buildRecordID, status, outputPtr, logCapture.Truncated(), errMsg, digest, provider, completedAt, new(completedAt.Sub(startedAt).Milliseconds())); updateErr != nil {slog.WarnContext(ctx, "failed to update build history record", "error", updateErr)}}diff --git a/backend/internal/services/container_registry_service.go b/backend/internal/services/container_registry_service.goindex 00aa105ab..2cbcf1fc4 100644--- a/backend/internal/services/container_registry_service.go+++ b/backend/internal/services/container_registry_service.go@@ -23,7 +23,6 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/utils""github.com/getarcaneapp/arcane/backend/pkg/utils/cache"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/containerregistry"dockerregistry "github.com/moby/moby/api/types/registry""github.com/moby/moby/client"@@ -99,25 +98,14 @@ func (s *ContainerRegistryService) GetRegistriesPaginated(ctx context.Context, pvar registries []models.ContainerRegistryq := s.db.WithContext(ctx).Model(&models.ContainerRegistry{})- if term := strings.TrimSpace(params.Search); term != "" {- searchPattern := "%" + term + "%"- q = q.Where(- "url LIKE ? OR username LIKE ? OR COALESCE(description, '') LIKE ?",- searchPattern, searchPattern, searchPattern,- )- }+ q = pagination.ApplyLikeSearch(q, params.Search, "url LIKE ? OR username LIKE ? OR COALESCE(description, '') LIKE ?")q = pagination.ApplyBooleanFilter(q, "enabled", params.Filters["enabled"])q = pagination.ApplyBooleanFilter(q, "insecure", params.Filters["insecure"])- paginationResp, err := pagination.PaginateAndSortDB(params, q, ®istries)+ out, paginationResp, err := pagination.PaginateSortAndMapDB[models.ContainerRegistry, containerregistry.ContainerRegistry](params, q, ®istries)if err != nil {- return nil, pagination.Response{}, fmt.Errorf("failed to paginate container registries: %w", err)- }-- out, mapErr := mapper.MapSlice[models.ContainerRegistry, containerregistry.ContainerRegistry](registries)- if mapErr != nil {- return nil, pagination.Response{}, fmt.Errorf("failed to map registries: %w", mapErr)+ return nil, pagination.Response{}, fmt.Errorf("failed to list container registries: %w", err)}return out, paginationResp, nildiff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.goindex 0b979c4c6..4c7f582df 100644--- a/backend/internal/services/container_service.go+++ b/backend/internal/services/container_service.go@@ -1,7 +1,6 @@package servicesimport (- "bufio""context""encoding/json""errors"@@ -27,7 +26,6 @@ import (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/pkg/stdcopy""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/events""github.com/moby/moby/api/types/network"@@ -365,8 +363,8 @@ func (s *ContainerService) tryRedeployViaComposeProjectInternal(ctx context.Contreturn "", false, nil}labels := containerInfo.Config.Labels- projectName := strings.TrimSpace(labels["com.docker.compose.project"])- serviceName := strings.TrimSpace(labels["com.docker.compose.service"])+ projectName := dockerutils.ComposeProjectLabel(labels)+ serviceName := dockerutils.ComposeServiceLabel(labels)if projectName == "" || serviceName == "" {return "", false, nil}@@ -870,97 +868,7 @@ func (s *ContainerService) StreamLogs(ctx context.Context, containerID string, ldefer func() { _ = logs.Close() }()isTTY := containerInspect.Container.Config != nil && containerInspect.Container.Config.Tty- return s.streamContainerLogsInternal(ctx, logs, logsChan, follow, isTTY)-}--func (s *ContainerService) streamContainerLogsInternal(ctx context.Context, logs io.ReadCloser, logsChan chan<- string, follow bool, isTTY bool) error {- if isTTY {- return s.streamRawLogsInternal(ctx, logs, logsChan)- }- if follow {- return streamMultiplexedLogs(ctx, logs, logsChan)- }- return s.readAllLogs(ctx, logs, logsChan)-}--func (s *ContainerService) streamRawLogsInternal(ctx context.Context, logs io.Reader, logsChan chan<- string) error {- return s.readLogsFromReader(ctx, logs, logsChan, "")-}--// readLogsFromReader reads logs line by line from a reader-func (s *ContainerService) readLogsFromReader(ctx context.Context, reader io.Reader, logsChan chan<- string, prefix string) error {- bufferedReader := bufio.NewReader(reader)-- for {- if err := ctx.Err(); err != nil {- return err- }-- line, err := bufferedReader.ReadString('\n')- if len(line) > 0 {- trimmed := strings.TrimRight(line, "\r\n")- if trimmed != "" {- if prefix != "" {- trimmed = prefix + trimmed- }-- select {- case logsChan <- trimmed:- case <-ctx.Done():- return ctx.Err()- }- }- }-- if err != nil {- if errors.Is(err, io.EOF) {- return nil- }- return err- }- }-}--func (s *ContainerService) readAllLogs(ctx context.Context, logs io.ReadCloser, logsChan chan<- string) error {- stdoutBuf := &strings.Builder{}- stderrBuf := &strings.Builder{}- stdCopyDone := make(chan struct{})- defer close(stdCopyDone)-- go func() {- select {- case <-ctx.Done():- _ = logs.Close()- case <-stdCopyDone:- }- }()-- _, err := stdcopy.StdCopy(stdoutBuf, stderrBuf, logs)- if err != nil && !errors.Is(err, io.EOF) {- if ctxErr := ctx.Err(); ctxErr != nil {- return ctxErr- }- return fmt.Errorf("failed to demultiplex logs: %w", err)- }- if ctxErr := ctx.Err(); ctxErr != nil {- return ctxErr- }-- // Send stdout lines- if stdoutBuf.Len() > 0 {- if err := s.readLogsFromReader(ctx, strings.NewReader(stdoutBuf.String()), logsChan, ""); err != nil {- return err- }- }-- // Send stderr lines with prefix- if stderrBuf.Len() > 0 {- if err := s.readLogsFromReader(ctx, strings.NewReader(stderrBuf.String()), logsChan, "[STDERR] "); err != nil {- return err- }- }-- return nil+ return dockerutils.StreamContainerLogs(ctx, logs, logsChan, follow, isTTY)}func (s *ContainerService) ListContainersPaginated(@@ -1134,7 +1042,7 @@ func getContainerProjectNameInternal(container containertypes.Summary) string {return containerNoProjectGroup}- projectName := strings.TrimSpace(container.Labels["com.docker.compose.project"])+ projectName := dockerutils.ComposeProjectLabel(container.Labels)if projectName == "" {return containerNoProjectGroup}@@ -1389,7 +1297,7 @@ func (s *ContainerService) buildContainerFilterAccessors() []pagination.FilterAc{Key: "standalone",Fn: func(c containertypes.Summary, filterValue string) bool {- isStandalone := strings.TrimSpace(c.Labels["com.docker.compose.project"]) == ""+ isStandalone := dockerutils.ComposeProjectLabel(c.Labels) == ""switch filterValue {case "true", "1":return isStandalonediff --git a/backend/internal/services/container_service_test.go b/backend/internal/services/container_service_test.goindex f3c3e16ef..13f39f17c 100644--- a/backend/internal/services/container_service_test.go+++ b/backend/internal/services/container_service_test.go@@ -1,14 +1,8 @@package servicesimport (- "bytes"- "context"- "encoding/binary"- "io""net/netip"- "strings""testing"- "time""github.com/getarcaneapp/arcane/backend/pkg/pagination"containertypes "github.com/getarcaneapp/arcane/types/container"@@ -121,86 +115,6 @@ func TestBuildCleanNetworkingConfigInternalPreservesEndpointSettings(t *testing.require.Nil(t, out.EndpointsConfig["bridge"].IPAMConfig)}-func TestStreamContainerLogs_NonTTYFollowDemultiplexesStdoutAndStderr(t *testing.T) {- var stream bytes.Buffer- writeDockerLogFrameInternal(t, &stream, 1, "stdout line\n")- writeDockerLogFrameInternal(t, &stream, 2, "stderr line\n")-- service := &ContainerService{}- logsChan := make(chan string, 4)-- err := service.streamContainerLogsInternal(t.Context(), io.NopCloser(bytes.NewReader(stream.Bytes())), logsChan, true, false)- require.NoError(t, err)-- require.ElementsMatch(t, []string{"stdout line", "[STDERR] stderr line"}, drainLogLinesInternal(logsChan))-}--func TestStreamContainerLogs_TTYFollowStreamsRawOutput(t *testing.T) {- service := &ContainerService{}- logsChan := make(chan string, 4)-- err := service.streamContainerLogsInternal(t.Context(), io.NopCloser(strings.NewReader("first line\nsecond line")), logsChan, true, true)- require.NoError(t, err)-- require.Equal(t, []string{"first line", "second line"}, drainLogLinesInternal(logsChan))-}--func TestStreamContainerLogs_NonTTYSnapshotDemultiplexesStdoutAndStderr(t *testing.T) {- var stream bytes.Buffer- writeDockerLogFrameInternal(t, &stream, 1, "stdout snapshot\n")- writeDockerLogFrameInternal(t, &stream, 2, "stderr snapshot\n")-- service := &ContainerService{}- logsChan := make(chan string, 4)-- err := service.streamContainerLogsInternal(t.Context(), io.NopCloser(bytes.NewReader(stream.Bytes())), logsChan, false, false)- require.NoError(t, err)-- require.Equal(t, []string{"stdout snapshot", "[STDERR] stderr snapshot"}, drainLogLinesInternal(logsChan))-}--func TestStreamContainerLogs_TTYSnapshotStreamsRawOutput(t *testing.T) {- service := &ContainerService{}- logsChan := make(chan string, 4)-- err := service.streamContainerLogsInternal(t.Context(), io.NopCloser(strings.NewReader("snapshot line\ntrailing line")), logsChan, false, true)- require.NoError(t, err)-- require.Equal(t, []string{"snapshot line", "trailing line"}, drainLogLinesInternal(logsChan))-}--func TestReadLogsFromReader_HandlesLongLinesAndPartialEOF(t *testing.T) {- longLine := strings.Repeat("a", 70*1024)- service := &ContainerService{}- logsChan := make(chan string, 4)-- err := service.readLogsFromReader(t.Context(), strings.NewReader(longLine+"\npartial tail"), logsChan, "")- require.NoError(t, err)-- require.Equal(t, []string{longLine, "partial tail"}, drainLogLinesInternal(logsChan))-}--func TestStreamContainerLogs_TTYPythonLikeFollowDoesNotReturnEmptyLogs(t *testing.T) {- service := &ContainerService{}- logsChan := make(chan string, 4)-- err := service.streamContainerLogsInternal(- t.Context(),- io.NopCloser(strings.NewReader("2026-03-22 10:15:00 - INFO - Starting miner\n2026-03-22 10:15:01 - INFO - Connected")),- logsChan,- true,- true,- )- require.NoError(t, err)-- lines := drainLogLinesInternal(logsChan)- require.NotEmpty(t, lines)- require.Equal(t, []string{- "2026-03-22 10:15:00 - INFO - Starting miner",- "2026-03-22 10:15:01 - INFO - Connected",- }, lines)-}-func TestCompareContainerPortsForSortDesc_KeepsContainersWithoutPortsLast(t *testing.T) {withPublished := containertypes.Summary{ID: "published",@@ -222,69 +136,6 @@ func TestCompareContainerPortsForSortDesc_KeepsContainersWithoutPortsLast(t *tesrequire.Equal(t, 1, compareContainerPortsForSortDescInternal(withoutPorts, withPublished))}-func TestStreamMultiplexedLogs_ContextCancelDoesNotDeadlock(t *testing.T) {- var stream bytes.Buffer- writeDockerLogFrameInternal(t, &stream, 1, "line 1\n")- writeDockerLogFrameInternal(t, &stream, 1, "line 2\n")- writeDockerLogFrameInternal(t, &stream, 1, "line 3\n")-- logsChan := make(chan string, 1)- ctx, cancel := context.WithCancel(context.Background())- defer cancel()-- done := make(chan error, 1)- go func() {- done <- streamMultiplexedLogs(ctx, io.NopCloser(bytes.NewReader(stream.Bytes())), logsChan)- }()-- require.Eventually(t, func() bool {- return len(logsChan) == 1- }, time.Second, 10*time.Millisecond)-- cancel()-- select {- case err := <-done:- require.ErrorIs(t, err, context.Canceled)- case <-time.After(time.Second):- t.Fatal("streamMultiplexedLogs did not exit after cancellation")- }-}--func TestReadAllLogs_ContextCancelClosesReader(t *testing.T) {- service := &ContainerService{}- logsChan := make(chan string, 1)- ctx, cancel := context.WithCancel(context.Background())- defer cancel()-- reader := &blockingReadCloser{readStarted: make(chan struct{}), closeCalled: make(chan struct{})}- done := make(chan error, 1)- go func() {- done <- service.readAllLogs(ctx, reader, logsChan)- }()-- select {- case <-reader.readStarted:- case <-time.After(time.Second):- t.Fatal("readAllLogs did not start reading")- }-- cancel()-- select {- case err := <-done:- require.ErrorIs(t, err, context.Canceled)- case <-time.After(time.Second):- t.Fatal("readAllLogs did not exit after cancellation")- }-- select {- case <-reader.closeCalled:- case <-time.After(time.Second):- t.Fatal("readAllLogs did not close the reader on cancellation")- }-}-func newGroupedContainerSummary(name string, project string) containertypes.Summary {labels := map[string]string{}if project != "" {@@ -298,52 +149,3 @@ func newGroupedContainerSummary(name string, project string) containertypes.SummState: "running",}}--func drainLogLinesInternal(logsChan chan string) []string {- close(logsChan)-- lines := make([]string, 0, len(logsChan))- for line := range logsChan {- lines = append(lines, line)- }-- return lines-}--func writeDockerLogFrameInternal(t *testing.T, buffer *bytes.Buffer, streamType byte, payload string) {- t.Helper()-- header := make([]byte, 8)- header[0] = streamType- binary.BigEndian.PutUint32(header[4:], uint32(len(payload)))-- _, err := buffer.Write(header)- require.NoError(t, err)- _, err = buffer.WriteString(payload)- require.NoError(t, err)-}--type blockingReadCloser struct {- readStarted chan struct{}- closeCalled chan struct{}-}--func (r *blockingReadCloser) Read(_ []byte) (int, error) {- select {- case <-r.readStarted:- default:- close(r.readStarted)- }-- <-r.closeCalled- return 0, io.EOF-}--func (r *blockingReadCloser) Close() error {- select {- case <-r.closeCalled:- default:- close(r.closeCalled)- }- return nil-}diff --git a/backend/internal/services/dashboard_service.go b/backend/internal/services/dashboard_service.goindex f4bc08de5..653ef8b09 100644--- a/backend/internal/services/dashboard_service.go+++ b/backend/internal/services/dashboard_service.go@@ -6,7 +6,6 @@ import ("log/slog""net/http""sort"- "strings""time""github.com/getarcaneapp/arcane/backend/internal/database"@@ -445,9 +444,8 @@ func (s *DashboardService) buildEnvironmentOverviewInternal(}if snapshotErr != nil {- message := snapshotErr.Error()overview.SnapshotState = dashboardtypes.EnvironmentSnapshotStateError- overview.SnapshotError = &message+ overview.SnapshotError = new(snapshotErr.Error())return overview}@@ -634,7 +632,7 @@ func (s *DashboardService) getPendingResourceUpdatesCountInternal(ctx context.Cofunc filterStandaloneDockerContainersInternal(containers []dockercontainer.Summary) []dockercontainer.Summary {filtered := make([]dockercontainer.Summary, 0, len(containers))for _, c := range containers {- if strings.TrimSpace(c.Labels["com.docker.compose.project"]) != "" {+ if dockerutils.ComposeProjectLabel(c.Labels) != "" {continue}filtered = append(filtered, c)diff --git a/backend/internal/services/environment_service.go b/backend/internal/services/environment_service.goindex df226c2bc..f283a41c3 100644--- a/backend/internal/services/environment_service.go+++ b/backend/internal/services/environment_service.go@@ -1176,17 +1176,15 @@ func (s *EnvironmentService) logGeneratedMTLSEventsInternal(ctx context.Context,}}if assets.CertIssued {- resourceType := "environment"envIDCopy := envID- envNameCopy := envNameif _, err := s.eventService.CreateEvent(ctx, CreateEventRequest{Type: models.EventTypeEnvironmentMTLSCertIssued,Severity: models.EventSeverityInfo,Title: "Edge mTLS certificate issued",Description: fmt.Sprintf("Arcane issued an edge mTLS client certificate for environment '%s'", envName),- ResourceType: &resourceType,+ ResourceType: new("environment"),ResourceID: &envIDCopy,- ResourceName: &envNameCopy,+ ResourceName: new(envName),EnvironmentID: &envIDCopy,Metadata: models.JSON{"kind": "client"},}); err != nil {diff --git a/backend/internal/services/environment_service_test.go b/backend/internal/services/environment_service_test.goindex b9c1f650c..5a54ad497 100644--- a/backend/internal/services/environment_service_test.go+++ b/backend/internal/services/environment_service_test.go@@ -266,7 +266,6 @@ func TestEnvironmentService_SyncRepositoriesToEnvironment_UsesAgentHeaders(t *terequire.NoError(t, db.AutoMigrate(&models.GitRepository{}))svc := NewEnvironmentService(db, nil, nil, nil, nil, nil)- description := "test repo"createTestGitRepository(t, db, models.GitRepository{BaseModel: models.BaseModel{ID: "repo-1", CreatedAt: time.Now()},Name: "repo-1",@@ -275,7 +274,7 @@ func TestEnvironmentService_SyncRepositoriesToEnvironment_UsesAgentHeaders(t *teUsername: "arcane",Token: encryptSecretForTest(t, "repo-token"),Enabled: true,- Description: &description,+ Description: new("test repo"),})accessToken := "token-1"@@ -934,9 +933,7 @@ func TestEnvironmentService_TestConnection_RejectsInvalidCustomURL(t *testing.T)svc := NewEnvironmentService(db, nil, nil, nil, nil, nil)createTestEnvironment(t, db, "env-1", "http://example.com", nil)- customURL := "ftp://example.com"-- status, err := svc.TestConnection(ctx, "env-1", &customURL)+ status, err := svc.TestConnection(ctx, "env-1", new("ftp://example.com"))require.Error(t, err)require.Equal(t, "offline", status)require.Contains(t, err.Error(), "invalid environment API URL")diff --git a/backend/internal/services/git_repository_service.go b/backend/internal/services/git_repository_service.goindex e17d693c7..d44c97ae6 100644--- a/backend/internal/services/git_repository_service.go+++ b/backend/internal/services/git_repository_service.go@@ -14,7 +14,6 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/libarcane/timeouts""github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/utils"- "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/gitops""gorm.io/gorm")@@ -39,25 +38,14 @@ func (s *GitRepositoryService) GetRepositoriesPaginated(ctx context.Context, parvar repositories []models.GitRepositoryq := s.db.WithContext(ctx).Model(&models.GitRepository{})- if term := strings.TrimSpace(params.Search); term != "" {- searchPattern := "%" + term + "%"- q = q.Where(- "name LIKE ? OR url LIKE ? OR COALESCE(description, '') LIKE ?",- searchPattern, searchPattern, searchPattern,- )- }+ q = pagination.ApplyLikeSearch(q, params.Search, "name LIKE ? OR url LIKE ? OR COALESCE(description, '') LIKE ?")q = pagination.ApplyBooleanFilter(q, "enabled", params.Filters["enabled"])q = pagination.ApplyFilter(q, "auth_type", params.Filters["authType"])- paginationResp, err := pagination.PaginateAndSortDB(params, q, &repositories)+ out, paginationResp, err := pagination.PaginateSortAndMapDB[models.GitRepository, gitops.GitRepository](params, q, &repositories)if err != nil {- return nil, pagination.Response{}, fmt.Errorf("failed to paginate git repositories: %w", err)- }-- out, mapErr := mapper.MapSlice[models.GitRepository, gitops.GitRepository](repositories)- if mapErr != nil {- return nil, pagination.Response{}, fmt.Errorf("failed to map repositories: %w", mapErr)+ return nil, pagination.Response{}, fmt.Errorf("failed to list git repositories: %w", err)}return out, paginationResp, nildiff --git a/backend/internal/services/git_repository_service_test.go b/backend/internal/services/git_repository_service_test.goindex 007dcb4ec..824707d77 100644--- a/backend/internal/services/git_repository_service_test.go+++ b/backend/internal/services/git_repository_service_test.go@@ -75,7 +75,7 @@ func TestGitRepositoryService_UpdateRepository_RejectsURLChangeWhenStoredTokenWo})_, err := svc.UpdateRepository(context.Background(), repo.ID, models.UpdateGitRepositoryRequest{- URL: gitRepositoryStringPtrInternal("https://attacker.tld/repo.git"),+ URL: new("https://attacker.tld/repo.git"),}, models.User{})require.Error(t, err)@@ -100,7 +100,7 @@ func TestGitRepositoryService_UpdateRepository_RejectsURLChangeWhenStoredSSHKeyW})_, err := svc.UpdateRepository(context.Background(), repo.ID, models.UpdateGitRepositoryRequest{- URL: gitRepositoryStringPtrInternal("[email protected]:acme/private.git"),+ URL: new("[email protected]:acme/private.git"),}, models.User{})require.Error(t, err)@@ -127,7 +127,7 @@ func TestGitRepositoryService_UpdateRepository_RejectsURLChangeWhenStoredTokenAn})_, err := svc.UpdateRepository(context.Background(), repo.ID, models.UpdateGitRepositoryRequest{- URL: gitRepositoryStringPtrInternal("https://attacker.tld/repo.git"),+ URL: new("https://attacker.tld/repo.git"),}, models.User{})require.Error(t, err)@@ -149,8 +149,8 @@ func TestGitRepositoryService_UpdateRepository_AllowsURLChangeWhenTokenIsResuppl})updated, err := svc.UpdateRepository(context.Background(), repo.ID, models.UpdateGitRepositoryRequest{- URL: gitRepositoryStringPtrInternal("https://github.com/acme/private-rotated.git"),- Token: gitRepositoryStringPtrInternal("ghp_new_token"),+ URL: new("https://github.com/acme/private-rotated.git"),+ Token: new("ghp_new_token"),}, models.User{})require.NoError(t, err)@@ -171,8 +171,8 @@ func TestGitRepositoryService_UpdateRepository_AllowsURLChangeWhenTokenIsCleared})updated, err := svc.UpdateRepository(context.Background(), repo.ID, models.UpdateGitRepositoryRequest{- URL: gitRepositoryStringPtrInternal("https://github.com/acme/public.git"),- Token: gitRepositoryStringPtrInternal(""),+ URL: new("https://github.com/acme/public.git"),+ Token: new(""),}, models.User{})require.NoError(t, err)@@ -191,8 +191,8 @@ func TestGitRepositoryService_UpdateRepository_AllowsSameURLWithoutCredentialRes})updated, err := svc.UpdateRepository(context.Background(), repo.ID, models.UpdateGitRepositoryRequest{- URL: gitRepositoryStringPtrInternal("https://github.com/acme/private.git"),- Username: gitRepositoryStringPtrInternal("deploy-bot"),+ URL: new("https://github.com/acme/private.git"),+ Username: new("deploy-bot"),}, models.User{})require.NoError(t, err)diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.goindex 2fe0df9a5..0710584d7 100644--- a/backend/internal/services/gitops_sync_service.go+++ b/backend/internal/services/gitops_sync_service.go@@ -1389,14 +1389,12 @@ func (s *GitOpsSyncService) findUniqueProjectDirectoryCandidateInternal(ctx cont}func (s *GitOpsSyncService) createRecoveredProjectFromDirectoryInternal(ctx context.Context, sync *models.GitOpsSync, projectPath string) (*models.Project, error) {- dirName := filepath.Base(projectPath)- reason := "Project recovered from existing GitOps-managed directory"project := &models.Project{Name: sync.ProjectName,- DirName: &dirName,+ DirName: new(filepath.Base(projectPath)),Path: projectPath,Status: models.ProjectStatusUnknown,- StatusReason: &reason,+ StatusReason: new("Project recovered from existing GitOps-managed directory"),ServiceCount: 0,RunningCount: 0,GitOpsManagedBy: &sync.ID,diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex c27547968..1d7512819 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -803,7 +803,7 @@ func (s *ImageService) BuildProjectIDMap(ctx context.Context, containers []contaif c.Labels == nil {continue}- if projectName := c.Labels["com.docker.compose.project"]; projectName != "" {+ if projectName := dockerutils.ComposeProjectLabel(c.Labels); projectName != "" {projectNameSet[projectName] = struct{}{}}}@@ -830,10 +830,7 @@ func buildUsageMapInternal(containers []container.Summary, projectIDByName map[scontinue}- projectName := ""- if c.Labels != nil {- projectName = c.Labels["com.docker.compose.project"]- }+ projectName := dockerutils.ComposeProjectLabel(c.Labels)if projectName != "" {projectID := projectIDByName[projectName]diff --git a/backend/internal/services/job_service_test.go b/backend/internal/services/job_service_test.goindex 737155467..b4facc479 100644--- a/backend/internal/services/job_service_test.go+++ b/backend/internal/services/job_service_test.go@@ -102,9 +102,8 @@ func TestJobService_UpdateJobSchedules_ReschedulesChangedJob(t *testing.T) {scheduler := newFakeJobSchedulerInternal("image-polling", "auto-update")jobSvc.SetScheduler(ctx, scheduler)- nextPollingInterval := "0 */10 * * * *"_, err = jobSvc.UpdateJobSchedules(ctx, jobschedule.Update{- PollingInterval: &nextPollingInterval,+ PollingInterval: new("0 */10 * * * *"),})require.NoError(t, err)@@ -126,9 +125,8 @@ func TestJobService_UpdateJobSchedules_UsesLifecycleContextForReschedule(t *testscheduler := newFakeJobSchedulerInternal("image-polling")jobSvc.SetScheduler(lifecycleCtx, scheduler)- nextPollingInterval := "0 */10 * * * *"_, err = jobSvc.UpdateJobSchedules(requestCtx, jobschedule.Update{- PollingInterval: &nextPollingInterval,+ PollingInterval: new("0 */10 * * * *"),})require.NoError(t, err)@@ -150,9 +148,8 @@ func TestJobService_UpdateJobSchedules_SkipsManagerOnlyJobsInAgentMode(t *testinscheduler := newFakeJobSchedulerInternal("environment-health")jobSvc.SetScheduler(ctx, scheduler)- nextHealthInterval := "0 */5 * * * *"_, err = jobSvc.UpdateJobSchedules(ctx, jobschedule.Update{- EnvironmentHealthInterval: &nextHealthInterval,+ EnvironmentHealthInterval: new("0 */5 * * * *"),})require.NoError(t, err)diff --git a/backend/internal/services/log_stream_util.go b/backend/internal/services/log_stream_util.godeleted file mode 100644index 64ada4488..000000000--- a/backend/internal/services/log_stream_util.go+++ /dev/null@@ -1,112 +0,0 @@-package services--import (- "bufio"- "context"- "errors"- "fmt"- "io"- "log/slog"- "strings"-- "github.com/moby/moby/api/pkg/stdcopy"-)--// streamMultiplexedLogs demultiplexes a Docker log stream (stdout/stderr)-// and sends lines to logsChan. Used by both container and swarm service logs.-func streamMultiplexedLogs(ctx context.Context, logs io.ReadCloser, logsChan chan<- string) error {- stdoutReader, stdoutWriter := io.Pipe()- stderrReader, stderrWriter := io.Pipe()-- go func() {- defer func() { _ = stdoutWriter.Close() }()- defer func() { _ = stderrWriter.Close() }()- _, err := stdcopy.StdCopy(stdoutWriter, stderrWriter, logs)- if err != nil && !errors.Is(err, io.EOF) {- slog.Error("error demultiplexing logs", "error", err)- }- }()-- done := make(chan error, 2)-- go func() {- done <- readLogsFromReader(ctx, stdoutReader, logsChan, "stdout")- }()-- go func() {- done <- readLogsFromReader(ctx, stderrReader, logsChan, "stderr")- }()-- select {- case <-ctx.Done():- return ctx.Err()- case err := <-done:- if err != nil && !errors.Is(err, io.EOF) {- return err- }- select {- case <-ctx.Done():- return ctx.Err()- case <-done:- return nil- }- }-}--// readLogsFromReader reads logs line by line from a reader and sends them to logsChan.-func readLogsFromReader(ctx context.Context, reader io.Reader, logsChan chan<- string, source string) error {- scanner := bufio.NewScanner(reader)-- for scanner.Scan() {- select {- case <-ctx.Done():- return ctx.Err()- default:- line := scanner.Text()- if line != "" {- if source == "stderr" {- line = "[STDERR] " + line- }-- select {- case logsChan <- line:- case <-ctx.Done():- return ctx.Err()- }- }- }- }-- return scanner.Err()-}--// readAllLogs reads all logs at once (non-follow mode) and sends them to logsChan.-func readAllLogs(logs io.ReadCloser, logsChan chan<- string) error {- stdoutBuf := &strings.Builder{}- stderrBuf := &strings.Builder{}-- _, err := stdcopy.StdCopy(stdoutBuf, stderrBuf, logs)- if err != nil && !errors.Is(err, io.EOF) {- return fmt.Errorf("failed to demultiplex logs: %w", err)- }-- if stdoutBuf.Len() > 0 {- lines := strings.SplitSeq(strings.TrimRight(stdoutBuf.String(), "\n"), "\n")- for line := range lines {- if line != "" {- logsChan <- line- }- }- }-- if stderrBuf.Len() > 0 {- lines := strings.SplitSeq(strings.TrimRight(stderrBuf.String(), "\n"), "\n")- for line := range lines {- if line != "" {- logsChan <- "[STDERR] " + line- }- }- }-- return nil-}diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.goindex df29bb8d9..e51b80833 100644--- a/backend/internal/services/notification_service.go+++ b/backend/internal/services/notification_service.go@@ -553,41 +553,13 @@ func (s *NotificationService) sendVulnerabilityNotificationForTargetInternal(ctxcontinue}- var sendErr error- switch setting.Provider {- case models.NotificationProviderDiscord:- sendErr = s.sendDiscordVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderEmail:- sendErr = s.sendEmailVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderTelegram:- sendErr = s.sendTelegramVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderSignal:- sendErr = s.sendSignalVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderSlack:- sendErr = s.sendSlackVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderNtfy:- sendErr = s.sendNtfyVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderPushover:- sendErr = s.sendPushoverVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderGotify:- sendErr = s.sendGotifyVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderMatrix:- sendErr = s.sendMatrixVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderGeneric:- sendErr = s.sendGenericVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- default:+ handled, sendErr := sendProviderNotificationInternal(ctx, setting.Provider, target.EnvironmentName, payload, setting.Config, s.vulnerabilityNotificationSendersInternal())+ if !handled {slog.WarnContext(ctx, "Unknown notification provider", "provider", setting.Provider)continue}- status := "success"- var errMsg *string- if sendErr != nil {- status = "failed"- msg := sendErr.Error()- errMsg = new(msg)- errors = append(errors, fmt.Sprintf("%s: %s", setting.Provider, msg))- }+ status, errMsg := collectNotificationSendResultInternal(&errors, setting.Provider, sendErr)s.logNotification(ctx, setting.Provider, payload.ImageName, status, errMsg, models.JSON{"cveId": payload.CVEID,@@ -987,58 +959,20 @@ func (s *NotificationService) TestNotification(ctx context.Context, environmentIFixedVersion: "7 fixable vulnerability record(s)",PkgName: "CVE-2025-1234, CVE-2025-5678, CVE-2026-0001",}- switch provider {- case models.NotificationProviderDiscord:- return s.sendDiscordVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderEmail:- return s.sendEmailVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderTelegram:- return s.sendTelegramVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderSignal:- return s.sendSignalVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderSlack:- return s.sendSlackVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderNtfy:- return s.sendNtfyVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderPushover:- return s.sendPushoverVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderGotify:- return s.sendGotifyVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderMatrix:- return s.sendMatrixVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- case models.NotificationProviderGeneric:- return s.sendGenericVulnerabilityNotification(ctx, target.EnvironmentName, payload, setting.Config)- default:- return fmt.Errorf("unknown provider: %s", provider)+ handled, sendErr := sendProviderNotificationInternal(ctx, provider, target.EnvironmentName, payload, setting.Config, s.vulnerabilityNotificationSendersInternal())+ if !handled {+ return unknownNotificationProviderErrorInternal(provider)}+ return sendErr}if testType == notificationTestTypeAutoHeal {testContainerName := "test-container"- switch provider {- case models.NotificationProviderDiscord:- return s.sendDiscordAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderEmail:- return s.sendEmailAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderTelegram:- return s.sendTelegramAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderSignal:- return s.sendSignalAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderSlack:- return s.sendSlackAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderNtfy:- return s.sendNtfyAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderPushover:- return s.sendPushoverAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderGotify:- return s.sendGotifyAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderMatrix:- return s.sendMatrixAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- case models.NotificationProviderGeneric:- return s.sendGenericAutoHealNotification(ctx, target.EnvironmentName, testContainerName, setting.Config)- default:- return fmt.Errorf("unknown provider: %s", provider)+ handled, sendErr := sendProviderNotificationInternal(ctx, provider, target.EnvironmentName, testContainerName, setting.Config, s.autoHealNotificationSendersInternal())+ if !handled {+ return unknownNotificationProviderErrorInternal(provider)}+ return sendErr}if testType == notificationTestTypePruneReport {@@ -1056,30 +990,11 @@ func (s *NotificationService) TestNotification(ctx context.Context, environmentIErrors: []string{},}- switch provider {- case models.NotificationProviderDiscord:- return s.sendDiscordPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderEmail:- return s.sendEmailPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderTelegram:- return s.sendTelegramPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderSignal:- return s.sendSignalPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderSlack:- return s.sendSlackPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderNtfy:- return s.sendNtfyPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderPushover:- return s.sendPushoverPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderGotify:- return s.sendGotifyPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderMatrix:- return s.sendMatrixPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderGeneric:- return s.sendGenericPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- default:- return fmt.Errorf("unknown provider: %s", provider)+ handled, sendErr := sendProviderNotificationInternal(ctx, provider, target.EnvironmentName, result, setting.Config, s.pruneReportNotificationSendersInternal())+ if !handled {+ return unknownNotificationProviderErrorInternal(provider)}+ return sendErr}testUpdate := &imageupdate.Response{@@ -1119,30 +1034,11 @@ func (s *NotificationService) TestNotification(ctx context.Context, environmentIResponseTimeMs: 95,},}- switch provider {- case models.NotificationProviderDiscord:- return s.sendBatchDiscordNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderEmail:- return s.sendBatchEmailNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderTelegram:- return s.sendBatchTelegramNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderSignal:- return s.sendBatchSignalNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderSlack:- return s.sendBatchSlackNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderNtfy:- return s.sendBatchNtfyNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderPushover:- return s.sendBatchPushoverNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderGotify:- return s.sendBatchGotifyNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderMatrix:- return s.sendBatchMatrixNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- case models.NotificationProviderGeneric:- return s.sendBatchGenericNotification(ctx, target.EnvironmentName, testUpdates, setting.Config)- default:- return fmt.Errorf("unknown provider: %s", provider)+ handled, sendErr := sendProviderNotificationInternal(ctx, provider, target.EnvironmentName, testUpdates, setting.Config, s.batchImageUpdateNotificationSendersInternal())+ if !handled {+ return unknownNotificationProviderErrorInternal(provider)}+ return sendErr}imageRef := "nginx:latest"@@ -1179,6 +1075,129 @@ func (s *NotificationService) TestNotification(ctx context.Context, environmentI}}+type notificationProviderSenderInternal[T any] func(context.Context, string, T, models.JSON) error++type notificationProviderSendersInternal[T any] struct {+ Discord notificationProviderSenderInternal[T]+ Email notificationProviderSenderInternal[T]+ Telegram notificationProviderSenderInternal[T]+ Signal notificationProviderSenderInternal[T]+ Slack notificationProviderSenderInternal[T]+ Ntfy notificationProviderSenderInternal[T]+ Pushover notificationProviderSenderInternal[T]+ Gotify notificationProviderSenderInternal[T]+ Matrix notificationProviderSenderInternal[T]+ Generic notificationProviderSenderInternal[T]+}++func (s *NotificationService) vulnerabilityNotificationSendersInternal() notificationProviderSendersInternal[VulnerabilityNotificationPayload] {+ return notificationProviderSendersInternal[VulnerabilityNotificationPayload]{+ Discord: s.sendDiscordVulnerabilityNotification,+ Email: s.sendEmailVulnerabilityNotification,+ Telegram: s.sendTelegramVulnerabilityNotification,+ Signal: s.sendSignalVulnerabilityNotification,+ Slack: s.sendSlackVulnerabilityNotification,+ Ntfy: s.sendNtfyVulnerabilityNotification,+ Pushover: s.sendPushoverVulnerabilityNotification,+ Gotify: s.sendGotifyVulnerabilityNotification,+ Matrix: s.sendMatrixVulnerabilityNotification,+ Generic: s.sendGenericVulnerabilityNotification,+ }+}++func (s *NotificationService) batchImageUpdateNotificationSendersInternal() notificationProviderSendersInternal[map[string]*imageupdate.Response] {+ return notificationProviderSendersInternal[map[string]*imageupdate.Response]{+ Discord: s.sendBatchDiscordNotification,+ Email: s.sendBatchEmailNotification,+ Telegram: s.sendBatchTelegramNotification,+ Signal: s.sendBatchSignalNotification,+ Slack: s.sendBatchSlackNotification,+ Ntfy: s.sendBatchNtfyNotification,+ Pushover: s.sendBatchPushoverNotification,+ Gotify: s.sendBatchGotifyNotification,+ Matrix: s.sendBatchMatrixNotification,+ Generic: s.sendBatchGenericNotification,+ }+}++func (s *NotificationService) pruneReportNotificationSendersInternal() notificationProviderSendersInternal[*system.PruneAllResult] {+ return notificationProviderSendersInternal[*system.PruneAllResult]{+ Discord: s.sendDiscordPruneNotification,+ Email: s.sendEmailPruneNotification,+ Telegram: s.sendTelegramPruneNotification,+ Signal: s.sendSignalPruneNotification,+ Slack: s.sendSlackPruneNotification,+ Ntfy: s.sendNtfyPruneNotification,+ Pushover: s.sendPushoverPruneNotification,+ Gotify: s.sendGotifyPruneNotification,+ Matrix: s.sendMatrixPruneNotification,+ Generic: s.sendGenericPruneNotification,+ }+}++func (s *NotificationService) autoHealNotificationSendersInternal() notificationProviderSendersInternal[string] {+ return notificationProviderSendersInternal[string]{+ Discord: s.sendDiscordAutoHealNotification,+ Email: s.sendEmailAutoHealNotification,+ Telegram: s.sendTelegramAutoHealNotification,+ Signal: s.sendSignalAutoHealNotification,+ Slack: s.sendSlackAutoHealNotification,+ Ntfy: s.sendNtfyAutoHealNotification,+ Pushover: s.sendPushoverAutoHealNotification,+ Gotify: s.sendGotifyAutoHealNotification,+ Matrix: s.sendMatrixAutoHealNotification,+ Generic: s.sendGenericAutoHealNotification,+ }+}++func sendProviderNotificationInternal[T any](+ ctx context.Context,+ provider models.NotificationProvider,+ environmentName string,+ payload T,+ config models.JSON,+ senders notificationProviderSendersInternal[T],+) (bool, error) {+ switch provider {+ case models.NotificationProviderDiscord:+ return true, senders.Discord(ctx, environmentName, payload, config)+ case models.NotificationProviderEmail:+ return true, senders.Email(ctx, environmentName, payload, config)+ case models.NotificationProviderTelegram:+ return true, senders.Telegram(ctx, environmentName, payload, config)+ case models.NotificationProviderSignal:+ return true, senders.Signal(ctx, environmentName, payload, config)+ case models.NotificationProviderSlack:+ return true, senders.Slack(ctx, environmentName, payload, config)+ case models.NotificationProviderNtfy:+ return true, senders.Ntfy(ctx, environmentName, payload, config)+ case models.NotificationProviderPushover:+ return true, senders.Pushover(ctx, environmentName, payload, config)+ case models.NotificationProviderGotify:+ return true, senders.Gotify(ctx, environmentName, payload, config)+ case models.NotificationProviderMatrix:+ return true, senders.Matrix(ctx, environmentName, payload, config)+ case models.NotificationProviderGeneric:+ return true, senders.Generic(ctx, environmentName, payload, config)+ default:+ return false, nil+ }+}++func collectNotificationSendResultInternal(errors *[]string, provider models.NotificationProvider, sendErr error) (string, *string) {+ if sendErr == nil {+ return "success", nil+ }++ msg := sendErr.Error()+ *errors = append(*errors, fmt.Sprintf("%s: %s", provider, msg))+ return "failed", &msg+}++func unknownNotificationProviderErrorInternal(provider models.NotificationProvider) error {+ return fmt.Errorf("unknown provider: %s", provider)+}+func (s *NotificationService) sendTestEmail(ctx context.Context, environmentName string, config models.JSON) error {var emailConfig models.EmailConfigconfigBytes, err := json.Marshal(config)@@ -1338,41 +1357,13 @@ func (s *NotificationService) sendBatchImageUpdateNotificationForTargetInternal(continue}- var sendErr error- switch setting.Provider {- case models.NotificationProviderDiscord:- sendErr = s.sendBatchDiscordNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderEmail:- sendErr = s.sendBatchEmailNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderTelegram:- sendErr = s.sendBatchTelegramNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderSignal:- sendErr = s.sendBatchSignalNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderSlack:- sendErr = s.sendBatchSlackNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderNtfy:- sendErr = s.sendBatchNtfyNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderPushover:- sendErr = s.sendBatchPushoverNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderGotify:- sendErr = s.sendBatchGotifyNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderMatrix:- sendErr = s.sendBatchMatrixNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- case models.NotificationProviderGeneric:- sendErr = s.sendBatchGenericNotification(ctx, target.EnvironmentName, updatesWithChanges, setting.Config)- default:+ handled, sendErr := sendProviderNotificationInternal(ctx, setting.Provider, target.EnvironmentName, updatesWithChanges, setting.Config, s.batchImageUpdateNotificationSendersInternal())+ if !handled {slog.WarnContext(ctx, "Unknown notification provider", "provider", setting.Provider)continue}- status := "success"- var errMsg *string- if sendErr != nil {- status = "failed"- msg := sendErr.Error()- errMsg = new(msg)- errors = append(errors, fmt.Sprintf("%s: %s", setting.Provider, msg))- }+ status, errMsg := collectNotificationSendResultInternal(&errors, setting.Provider, sendErr)imageRefs := make([]string, 0, len(updatesWithChanges))for ref := range updatesWithChanges {@@ -1394,22 +1385,12 @@ func (s *NotificationService) sendBatchImageUpdateNotificationForTargetInternal(}func (s *NotificationService) sendBatchDiscordNotification(ctx context.Context, environmentName string, updates map[string]*imageupdate.Response, config models.JSON) error {- var discordConfig models.DiscordConfig- configBytes, err := json.Marshal(config)+ discordConfig, err := decodeNotificationConfigInternal[models.DiscordConfig](config, "discord")if err != nil {- return fmt.Errorf("failed to marshal discord config: %w", err)- }- if err := json.Unmarshal(configBytes, &discordConfig); err != nil {- return fmt.Errorf("failed to unmarshal discord config: %w", err)+ return err}-- // Decrypt token- if discordConfig.Token != "" {- decrypted, err := crypto.Decrypt(discordConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- discordConfig.Token = decrypted+ if err := decryptStringCredentialInternal(&discordConfig.Token); err != nil {+ return err}message := notifications.BuildBatchImageUpdateNotificationMessage(@@ -1744,26 +1725,9 @@ func (s *NotificationService) sendBatchSignalNotification(ctx context.Context, e}func (s *NotificationService) sendSlackNotification(ctx context.Context, environmentName, imageRef string, updateInfo *imageupdate.Response, config models.JSON) error {- var slackConfig models.SlackConfig- configBytes, err := json.Marshal(config)+ slackConfig, err := prepareSlackConfigInternal(config, "Slack", true)if err != nil {- return fmt.Errorf("failed to marshal Slack config: %w", err)- }- if err := json.Unmarshal(configBytes, &slackConfig); err != nil {- return fmt.Errorf("failed to unmarshal Slack config: %w", err)- }-- if slackConfig.Token == "" {- return fmt.Errorf("slack token not configured")- }-- // Decrypt token if encrypted- if slackConfig.Token != "" {- decrypted, err := crypto.Decrypt(slackConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- slackConfig.Token = decrypted+ return err}message := notifications.BuildImageUpdateNotificationMessage(@@ -1781,26 +1745,9 @@ func (s *NotificationService) sendSlackNotification(ctx context.Context, environ}func (s *NotificationService) sendSlackContainerUpdateNotification(ctx context.Context, environmentName, containerName, imageRef, oldDigest, newDigest string, config models.JSON) error {- var slackConfig models.SlackConfig- configBytes, err := json.Marshal(config)+ slackConfig, err := prepareSlackConfigInternal(config, "Slack", true)if err != nil {- return fmt.Errorf("failed to marshal Slack config: %w", err)- }- if err := json.Unmarshal(configBytes, &slackConfig); err != nil {- return fmt.Errorf("failed to unmarshal Slack config: %w", err)- }-- if slackConfig.Token == "" {- return fmt.Errorf("slack token not configured")- }-- // Decrypt token if encrypted- if slackConfig.Token != "" {- decrypted, err := crypto.Decrypt(slackConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- slackConfig.Token = decrypted+ return err}message := notifications.BuildContainerUpdateNotificationMessage(@@ -1820,22 +1767,9 @@ func (s *NotificationService) sendSlackContainerUpdateNotification(ctx context.C}func (s *NotificationService) sendBatchSlackNotification(ctx context.Context, environmentName string, updates map[string]*imageupdate.Response, config models.JSON) error {- var slackConfig models.SlackConfig- configBytes, err := json.Marshal(config)+ slackConfig, err := prepareSlackConfigInternal(config, "slack", false)if err != nil {- return fmt.Errorf("failed to marshal slack config: %w", err)- }- if err := json.Unmarshal(configBytes, &slackConfig); err != nil {- return fmt.Errorf("failed to unmarshal slack config: %w", err)- }-- // Decrypt token- if slackConfig.Token != "" {- decrypted, err := crypto.Decrypt(slackConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- slackConfig.Token = decrypted+ return err}message := notifications.BuildBatchImageUpdateNotificationMessage(@@ -1852,26 +1786,9 @@ func (s *NotificationService) sendBatchSlackNotification(ctx context.Context, en}func (s *NotificationService) sendNtfyNotification(ctx context.Context, environmentName, imageRef string, updateInfo *imageupdate.Response, config models.JSON) error {- var ntfyConfig models.NtfyConfig- configBytes, err := json.Marshal(config)+ ntfyConfig, err := prepareNtfyConfigInternal(config, "Ntfy", true)if err != nil {- return fmt.Errorf("failed to marshal Ntfy config: %w", err)- }- if err := json.Unmarshal(configBytes, &ntfyConfig); err != nil {- return fmt.Errorf("failed to unmarshal Ntfy config: %w", err)- }-- if ntfyConfig.Topic == "" {- return fmt.Errorf("ntfy topic is required")- }-- // Decrypt password if encrypted- if ntfyConfig.Password != "" {- decrypted, err := crypto.Decrypt(ntfyConfig.Password)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- ntfyConfig.Password = decrypted+ return err}message := notifications.BuildImageUpdateNotificationMessage(@@ -1889,26 +1806,9 @@ func (s *NotificationService) sendNtfyNotification(ctx context.Context, environm}func (s *NotificationService) sendNtfyContainerUpdateNotification(ctx context.Context, environmentName, containerName, imageRef, oldDigest, newDigest string, config models.JSON) error {- var ntfyConfig models.NtfyConfig- configBytes, err := json.Marshal(config)+ ntfyConfig, err := prepareNtfyConfigInternal(config, "Ntfy", true)if err != nil {- return fmt.Errorf("failed to marshal Ntfy config: %w", err)- }- if err := json.Unmarshal(configBytes, &ntfyConfig); err != nil {- return fmt.Errorf("failed to unmarshal Ntfy config: %w", err)- }-- if ntfyConfig.Topic == "" {- return fmt.Errorf("ntfy topic is required")- }-- // Decrypt password if encrypted- if ntfyConfig.Password != "" {- decrypted, err := crypto.Decrypt(ntfyConfig.Password)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- ntfyConfig.Password = decrypted+ return err}message := notifications.BuildContainerUpdateNotificationMessage(@@ -1928,22 +1828,9 @@ func (s *NotificationService) sendNtfyContainerUpdateNotification(ctx context.Co}func (s *NotificationService) sendBatchNtfyNotification(ctx context.Context, environmentName string, updates map[string]*imageupdate.Response, config models.JSON) error {- var ntfyConfig models.NtfyConfig- configBytes, err := json.Marshal(config)+ ntfyConfig, err := prepareNtfyConfigInternal(config, "ntfy", false)if err != nil {- return fmt.Errorf("failed to marshal ntfy config: %w", err)- }- if err := json.Unmarshal(configBytes, &ntfyConfig); err != nil {- return fmt.Errorf("failed to unmarshal ntfy config: %w", err)- }-- // Decrypt password if encrypted- if ntfyConfig.Password != "" {- decrypted, err := crypto.Decrypt(ntfyConfig.Password)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- ntfyConfig.Password = decrypted+ return err}message := notifications.BuildBatchImageUpdateNotificationMessage(@@ -1960,13 +1847,9 @@ func (s *NotificationService) sendBatchNtfyNotification(ctx context.Context, env}func (s *NotificationService) sendPushoverNotification(ctx context.Context, environmentName, imageRef string, updateInfo *imageupdate.Response, config models.JSON) error {- var pushoverConfig models.PushoverConfig- configBytes, err := json.Marshal(config)+ pushoverConfig, err := preparePushoverConfigInternal(config, "Pushover")if err != nil {- return fmt.Errorf("failed to marshal Pushover config: %w", err)- }- if err := json.Unmarshal(configBytes, &pushoverConfig); err != nil {- return fmt.Errorf("failed to unmarshal Pushover config: %w", err)+ return err}if pushoverConfig.Token == "" {@@ -1976,14 +1859,6 @@ func (s *NotificationService) sendPushoverNotification(ctx context.Context, envireturn fmt.Errorf("pushover user key not configured")}- if pushoverConfig.Token != "" {- decrypted, err := crypto.Decrypt(pushoverConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- pushoverConfig.Token = decrypted- }-message := notifications.BuildImageUpdateNotificationMessage(notifications.MessageFormatPlain,environmentName,@@ -1999,13 +1874,9 @@ func (s *NotificationService) sendPushoverNotification(ctx context.Context, envi}func (s *NotificationService) sendPushoverContainerUpdateNotification(ctx context.Context, environmentName, containerName, imageRef, oldDigest, newDigest string, config models.JSON) error {- var pushoverConfig models.PushoverConfig- configBytes, err := json.Marshal(config)+ pushoverConfig, err := preparePushoverConfigInternal(config, "Pushover")if err != nil {- return fmt.Errorf("failed to marshal Pushover config: %w", err)- }- if err := json.Unmarshal(configBytes, &pushoverConfig); err != nil {- return fmt.Errorf("failed to unmarshal Pushover config: %w", err)+ return err}if pushoverConfig.Token == "" {@@ -2015,14 +1886,6 @@ func (s *NotificationService) sendPushoverContainerUpdateNotification(ctx contexreturn fmt.Errorf("pushover user key not configured")}- if pushoverConfig.Token != "" {- decrypted, err := crypto.Decrypt(pushoverConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- pushoverConfig.Token = decrypted- }-message := notifications.BuildContainerUpdateNotificationMessage(notifications.MessageFormatPlain,environmentName,@@ -2040,21 +1903,9 @@ func (s *NotificationService) sendPushoverContainerUpdateNotification(ctx contex}func (s *NotificationService) sendBatchPushoverNotification(ctx context.Context, environmentName string, updates map[string]*imageupdate.Response, config models.JSON) error {- var pushoverConfig models.PushoverConfig- configBytes, err := json.Marshal(config)+ pushoverConfig, err := preparePushoverConfigInternal(config, "pushover")if err != nil {- return fmt.Errorf("failed to marshal pushover config: %w", err)- }- if err := json.Unmarshal(configBytes, &pushoverConfig); err != nil {- return fmt.Errorf("failed to unmarshal pushover config: %w", err)- }-- if pushoverConfig.Token != "" {- decrypted, err := crypto.Decrypt(pushoverConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- pushoverConfig.Token = decrypted+ return err}message := notifications.BuildBatchImageUpdateNotificationMessage(@@ -2329,33 +2180,11 @@ func (s *NotificationService) sendSignalVulnerabilityNotification(ctx context.Co}func (s *NotificationService) sendSlackVulnerabilityNotification(ctx context.Context, environmentName string, payload VulnerabilityNotificationPayload, config models.JSON) error {- var slackConfig models.SlackConfig- configBytes, err := json.Marshal(config)+ slackConfig, err := prepareSlackConfigInternal(config, "Slack", true)if err != nil {- return fmt.Errorf("failed to marshal Slack config: %w", err)- }- if err := json.Unmarshal(configBytes, &slackConfig); err != nil {- return fmt.Errorf("failed to unmarshal Slack config: %w", err)- }- if slackConfig.Token == "" {- return fmt.Errorf("slack token not configured")- }- if slackConfig.Token != "" {- decrypted, err := crypto.Decrypt(slackConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- slackConfig.Token = decrypted+ return err}- message := notifications.BuildVulnerabilitySummaryNotificationMessage(- notifications.MessageFormatSlack,- environmentName,- payload.CVEID,- payload.ImageName,- payload.FixedVersion,- payload.Severity,- payload.PkgName,- )+ message := buildVulnerabilitySummaryMessageInternal(notifications.MessageFormatSlack, environmentName, payload)if err := notifications.SendSlack(ctx, slackConfig, message); err != nil {return fmt.Errorf("failed to send Slack notification: %w", err)}@@ -2363,33 +2192,11 @@ func (s *NotificationService) sendSlackVulnerabilityNotification(ctx context.Con}func (s *NotificationService) sendNtfyVulnerabilityNotification(ctx context.Context, environmentName string, payload VulnerabilityNotificationPayload, config models.JSON) error {- var ntfyConfig models.NtfyConfig- configBytes, err := json.Marshal(config)+ ntfyConfig, err := prepareNtfyConfigInternal(config, "Ntfy", true)if err != nil {- return fmt.Errorf("failed to marshal Ntfy config: %w", err)- }- if err := json.Unmarshal(configBytes, &ntfyConfig); err != nil {- return fmt.Errorf("failed to unmarshal Ntfy config: %w", err)- }- if ntfyConfig.Topic == "" {- return fmt.Errorf("ntfy topic is required")- }- if ntfyConfig.Password != "" {- decrypted, err := crypto.Decrypt(ntfyConfig.Password)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- ntfyConfig.Password = decrypted+ return err}- message := notifications.BuildVulnerabilitySummaryNotificationMessage(- notifications.MessageFormatPlain,- environmentName,- payload.CVEID,- payload.ImageName,- payload.FixedVersion,- payload.Severity,- payload.PkgName,- )+ message := buildVulnerabilitySummaryMessageInternal(notifications.MessageFormatPlain, environmentName, payload)if err := notifications.SendNtfy(ctx, ntfyConfig, message); err != nil {return fmt.Errorf("failed to send Ntfy notification: %w", err)}@@ -2397,33 +2204,14 @@ func (s *NotificationService) sendNtfyVulnerabilityNotification(ctx context.Cont}func (s *NotificationService) sendPushoverVulnerabilityNotification(ctx context.Context, environmentName string, payload VulnerabilityNotificationPayload, config models.JSON) error {- var pushoverConfig models.PushoverConfig- configBytes, err := json.Marshal(config)+ pushoverConfig, err := preparePushoverConfigInternal(config, "Pushover")if err != nil {- return fmt.Errorf("failed to marshal Pushover config: %w", err)- }- if err := json.Unmarshal(configBytes, &pushoverConfig); err != nil {- return fmt.Errorf("failed to unmarshal Pushover config: %w", err)+ return err}if pushoverConfig.Token == "" || pushoverConfig.User == "" {return fmt.Errorf("pushover token or user not configured")}- if pushoverConfig.Token != "" {- decrypted, err := crypto.Decrypt(pushoverConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- pushoverConfig.Token = decrypted- }- message := notifications.BuildVulnerabilitySummaryNotificationMessage(- notifications.MessageFormatPlain,- environmentName,- payload.CVEID,- payload.ImageName,- payload.FixedVersion,- payload.Severity,- payload.PkgName,- )+ message := buildVulnerabilitySummaryMessageInternal(notifications.MessageFormatPlain, environmentName, payload)if pushoverConfig.Title == "" {pushoverConfig.Title = notifications.BuildEmailSubject(environmentName, "Daily Vulnerability Summary")}@@ -2434,30 +2222,11 @@ func (s *NotificationService) sendPushoverVulnerabilityNotification(ctx context.}func (s *NotificationService) sendGotifyVulnerabilityNotification(ctx context.Context, environmentName string, payload VulnerabilityNotificationPayload, config models.JSON) error {- var gotifyConfig models.GotifyConfig- configBytes, err := json.Marshal(config)+ gotifyConfig, err := prepareGotifyConfigInternal(config, "Gotify")if err != nil {- return fmt.Errorf("failed to marshal Gotify config: %w", err)- }- if err := json.Unmarshal(configBytes, &gotifyConfig); err != nil {- return fmt.Errorf("failed to unmarshal Gotify config: %w", err)- }- if gotifyConfig.Token != "" {- decrypted, err := crypto.Decrypt(gotifyConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- gotifyConfig.Token = decrypted+ return err}- message := notifications.BuildVulnerabilitySummaryNotificationMessage(- notifications.MessageFormatPlain,- environmentName,- payload.CVEID,- payload.ImageName,- payload.FixedVersion,- payload.Severity,- payload.PkgName,- )+ message := buildVulnerabilitySummaryMessageInternal(notifications.MessageFormatPlain, environmentName, payload)if gotifyConfig.Title == "" {gotifyConfig.Title = notifications.BuildEmailSubject(environmentName, "Daily Vulnerability Summary")}@@ -2468,30 +2237,11 @@ func (s *NotificationService) sendGotifyVulnerabilityNotification(ctx context.Co}func (s *NotificationService) sendMatrixVulnerabilityNotification(ctx context.Context, environmentName string, payload VulnerabilityNotificationPayload, config models.JSON) error {- var matrixConfig models.MatrixConfig- configBytes, err := json.Marshal(config)+ matrixConfig, err := prepareMatrixConfigInternal(config, "Matrix")if err != nil {- return fmt.Errorf("failed to marshal Matrix config: %w", err)- }- if err := json.Unmarshal(configBytes, &matrixConfig); err != nil {- return fmt.Errorf("failed to unmarshal Matrix config: %w", err)- }- if matrixConfig.Password != "" {- decrypted, err := crypto.Decrypt(matrixConfig.Password)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- matrixConfig.Password = decrypted+ return err}- message := notifications.BuildVulnerabilitySummaryNotificationMessage(- notifications.MessageFormatPlain,- environmentName,- payload.CVEID,- payload.ImageName,- payload.FixedVersion,- payload.Severity,- payload.PkgName,- )+ message := buildVulnerabilitySummaryMessageInternal(notifications.MessageFormatPlain, environmentName, payload)if err := notifications.SendMatrix(ctx, matrixConfig, message); err != nil {return fmt.Errorf("failed to send Matrix notification: %w", err)}@@ -2555,21 +2305,9 @@ func (s *NotificationService) sendBatchGenericNotification(ctx context.Context,}func (s *NotificationService) sendGotifyNotification(ctx context.Context, environmentName, imageRef string, updateInfo *imageupdate.Response, config models.JSON) error {- var gotifyConfig models.GotifyConfig- configBytes, err := json.Marshal(config)+ gotifyConfig, err := prepareGotifyConfigInternal(config, "Gotify")if err != nil {- return fmt.Errorf("failed to marshal Gotify config: %w", err)- }- if err := json.Unmarshal(configBytes, &gotifyConfig); err != nil {- return fmt.Errorf("failed to unmarshal Gotify config: %w", err)- }-- if gotifyConfig.Token != "" {- decrypted, err := crypto.Decrypt(gotifyConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- gotifyConfig.Token = decrypted+ return err}message := notifications.BuildImageUpdateNotificationMessage(@@ -2587,21 +2325,9 @@ func (s *NotificationService) sendGotifyNotification(ctx context.Context, enviro}func (s *NotificationService) sendGotifyContainerUpdateNotification(ctx context.Context, environmentName, containerName, imageRef, oldDigest, newDigest string, config models.JSON) error {- var gotifyConfig models.GotifyConfig- configBytes, err := json.Marshal(config)+ gotifyConfig, err := prepareGotifyConfigInternal(config, "Gotify")if err != nil {- return fmt.Errorf("failed to marshal Gotify config: %w", err)- }- if err := json.Unmarshal(configBytes, &gotifyConfig); err != nil {- return fmt.Errorf("failed to unmarshal Gotify config: %w", err)- }-- if gotifyConfig.Token != "" {- decrypted, err := crypto.Decrypt(gotifyConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- gotifyConfig.Token = decrypted+ return err}message := notifications.BuildContainerUpdateNotificationMessage(@@ -2621,21 +2347,9 @@ func (s *NotificationService) sendGotifyContainerUpdateNotification(ctx context.}func (s *NotificationService) sendBatchGotifyNotification(ctx context.Context, environmentName string, updates map[string]*imageupdate.Response, config models.JSON) error {- var gotifyConfig models.GotifyConfig- configBytes, err := json.Marshal(config)+ gotifyConfig, err := prepareGotifyConfigInternal(config, "gotify")if err != nil {- return fmt.Errorf("failed to marshal gotify config: %w", err)- }- if err := json.Unmarshal(configBytes, &gotifyConfig); err != nil {- return fmt.Errorf("failed to unmarshal gotify config: %w", err)- }-- if gotifyConfig.Token != "" {- decrypted, err := crypto.Decrypt(gotifyConfig.Token)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- gotifyConfig.Token = decrypted+ return err}message := notifications.BuildBatchImageUpdateNotificationMessage(@@ -2652,21 +2366,9 @@ func (s *NotificationService) sendBatchGotifyNotification(ctx context.Context, e}func (s *NotificationService) sendMatrixNotification(ctx context.Context, environmentName, imageRef string, updateInfo *imageupdate.Response, config models.JSON) error {- var matrixConfig models.MatrixConfig- configBytes, err := json.Marshal(config)+ matrixConfig, err := prepareMatrixConfigInternal(config, "Matrix")if err != nil {- return fmt.Errorf("failed to marshal Matrix config: %w", err)- }- if err := json.Unmarshal(configBytes, &matrixConfig); err != nil {- return fmt.Errorf("failed to unmarshal Matrix config: %w", err)- }-- if matrixConfig.Password != "" {- decrypted, err := crypto.Decrypt(matrixConfig.Password)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- matrixConfig.Password = decrypted+ return err}message := notifications.BuildImageUpdateNotificationMessage(@@ -2684,21 +2386,9 @@ func (s *NotificationService) sendMatrixNotification(ctx context.Context, enviro}func (s *NotificationService) sendMatrixContainerUpdateNotification(ctx context.Context, environmentName, containerName, imageRef, oldDigest, newDigest string, config models.JSON) error {- var matrixConfig models.MatrixConfig- configBytes, err := json.Marshal(config)+ matrixConfig, err := prepareMatrixConfigInternal(config, "Matrix")if err != nil {- return fmt.Errorf("failed to marshal Matrix config: %w", err)- }- if err := json.Unmarshal(configBytes, &matrixConfig); err != nil {- return fmt.Errorf("failed to unmarshal Matrix config: %w", err)- }-- if matrixConfig.Password != "" {- decrypted, err := crypto.Decrypt(matrixConfig.Password)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- matrixConfig.Password = decrypted+ return err}message := notifications.BuildContainerUpdateNotificationMessage(@@ -2718,21 +2408,9 @@ func (s *NotificationService) sendMatrixContainerUpdateNotification(ctx context.}func (s *NotificationService) sendBatchMatrixNotification(ctx context.Context, environmentName string, updates map[string]*imageupdate.Response, config models.JSON) error {- var matrixConfig models.MatrixConfig- configBytes, err := json.Marshal(config)+ matrixConfig, err := prepareMatrixConfigInternal(config, "Matrix")if err != nil {- return fmt.Errorf("failed to marshal Matrix config: %w", err)- }- if err := json.Unmarshal(configBytes, &matrixConfig); err != nil {- return fmt.Errorf("failed to unmarshal Matrix config: %w", err)- }-- if matrixConfig.Password != "" {- decrypted, err := crypto.Decrypt(matrixConfig.Password)- if err != nil {- return fmt.Errorf("failed to decrypt notification credential: %w", err)- }- matrixConfig.Password = decrypted+ return err}message := notifications.BuildBatchImageUpdateNotificationMessage(@@ -2792,41 +2470,13 @@ func (s *NotificationService) sendPruneReportNotificationForTargetInternal(ctx ccontinue}- var sendErr error- switch setting.Provider {- case models.NotificationProviderDiscord:- sendErr = s.sendDiscordPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderEmail:- sendErr = s.sendEmailPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderTelegram:- sendErr = s.sendTelegramPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderSignal:- sendErr = s.sendSignalPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderSlack:- sendErr = s.sendSlackPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderNtfy:- sendErr = s.sendNtfyPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderPushover:- sendErr = s.sendPushoverPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderGotify:- sendErr = s.sendGotifyPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderMatrix:- sendErr = s.sendMatrixPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- case models.NotificationProviderGeneric:- sendErr = s.sendGenericPruneNotification(ctx, target.EnvironmentName, result, setting.Config)- default:+ handled, sendErr := sendProviderNotificationInternal(ctx, setting.Provider, target.EnvironmentName, result, setting.Config, s.pruneReportNotificationSendersInternal())+ if !handled {slog.WarnContext(ctx, "Unknown notification provider", "provider", setting.Provider)continue}- status := "success"- var errMsg *string- if sendErr != nil {- status = "failed"- msg := sendErr.Error()- errMsg = new(msg)- errors = append(errors, fmt.Sprintf("%s: %s", setting.Provider, msg))- }+ status, errMsg := collectNotificationSendResultInternal(&errors, setting.Provider, sendErr)s.logNotification(ctx, setting.Provider, "System Prune Report", status, errMsg, models.JSON{"spaceReclaimed": result.SpaceReclaimed,@@ -2859,19 +2509,6 @@ func pruneResultHasChangesInternal(result *system.PruneAllResult) bool {len(result.NetworksDeleted) > 0}-func (s *NotificationService) formatBytesInternal(bytes uint64) string {- const unit = 1024- if bytes < unit {- return fmt.Sprintf("%d B", bytes)- }- div, exp := int64(unit), 0- for n := bytes / unit; n >= unit; n /= unit {- div *= unit- exp++- }- return fmt.Sprintf("%.1f %cB", float64(bytes)/float64(div), "KMGTPE"[exp])-}-func (s *NotificationService) sendDiscordPruneNotification(ctx context.Context, environmentName string, result *system.PruneAllResult, config models.JSON) error {var discordConfig models.DiscordConfigif err := s.unmarshalConfigInternal(config, &discordConfig); err != nil {@@ -2941,7 +2578,7 @@ func (s *NotificationService) sendEmailPruneNotification(ctx context.Context, enreturn fmt.Errorf("failed to render email template: %w", err)}- subject := notifications.BuildEmailSubject(environmentName, fmt.Sprintf("System Prune Report: %s Reclaimed", s.formatBytesInternal(result.SpaceReclaimed)))+ subject := notifications.BuildEmailSubject(environmentName, fmt.Sprintf("System Prune Report: %s Reclaimed", notifications.FormatBytes(result.SpaceReclaimed)))if err := notifications.SendEmail(ctx, emailConfig, subject, htmlBody); err != nil {return fmt.Errorf("failed to send email: %w", err)}@@ -2956,11 +2593,11 @@ func (s *NotificationService) renderPruneReportEmailTemplate(environmentName str"LogoURL": logoURL,"AppURL": appURL,"Environment": environmentName,- "TotalSpaceReclaimed": s.formatBytesInternal(result.SpaceReclaimed),- "ContainerSpaceReclaimed": s.formatBytesInternal(result.ContainerSpaceReclaimed),- "ImageSpaceReclaimed": s.formatBytesInternal(result.ImageSpaceReclaimed),- "VolumeSpaceReclaimed": s.formatBytesInternal(result.VolumeSpaceReclaimed),- "BuildCacheSpaceReclaimed": s.formatBytesInternal(result.BuildCacheSpaceReclaimed),+ "TotalSpaceReclaimed": notifications.FormatBytes(result.SpaceReclaimed),+ "ContainerSpaceReclaimed": notifications.FormatBytes(result.ContainerSpaceReclaimed),+ "ImageSpaceReclaimed": notifications.FormatBytes(result.ImageSpaceReclaimed),+ "VolumeSpaceReclaimed": notifications.FormatBytes(result.VolumeSpaceReclaimed),+ "BuildCacheSpaceReclaimed": notifications.FormatBytes(result.BuildCacheSpaceReclaimed),"Time": time.Now().Format(time.RFC1123),}@@ -3095,41 +2732,13 @@ func (s *NotificationService) sendAutoHealNotificationForTargetInternal(ctx contcontinue}- var sendErr error- switch setting.Provider {- case models.NotificationProviderDiscord:- sendErr = s.sendDiscordAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderEmail:- sendErr = s.sendEmailAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderTelegram:- sendErr = s.sendTelegramAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderSignal:- sendErr = s.sendSignalAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderSlack:- sendErr = s.sendSlackAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderNtfy:- sendErr = s.sendNtfyAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderPushover:- sendErr = s.sendPushoverAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderGotify:- sendErr = s.sendGotifyAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderMatrix:- sendErr = s.sendMatrixAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- case models.NotificationProviderGeneric:- sendErr = s.sendGenericAutoHealNotification(ctx, target.EnvironmentName, containerName, setting.Config)- default:+ handled, sendErr := sendProviderNotificationInternal(ctx, setting.Provider, target.EnvironmentName, containerName, setting.Config, s.autoHealNotificationSendersInternal())+ if !handled {slog.WarnContext(ctx, "Unknown notification provider", "provider", setting.Provider)continue}- status := "success"- var errMsg *string- if sendErr != nil {- status = "failed"- msg := sendErr.Error()- errMsg = new(msg)- errs = append(errs, fmt.Sprintf("%s: %s", setting.Provider, msg))- }+ status, errMsg := collectNotificationSendResultInternal(&errs, setting.Provider, sendErr)s.logNotification(ctx, setting.Provider, containerName, status, errMsg, models.JSON{"containerID": containerID,@@ -3286,6 +2895,18 @@ func (s *NotificationService) unmarshalConfigInternal(config models.JSON, dest areturn nil}+func decodeNotificationConfigInternal[T any](config models.JSON, providerName string) (T, error) {+ var out T+ configBytes, err := json.Marshal(config)+ if err != nil {+ return out, fmt.Errorf("failed to marshal %s config: %w", providerName, err)+ }+ if err := json.Unmarshal(configBytes, &out); err != nil {+ return out, fmt.Errorf("failed to unmarshal %s config: %w", providerName, err)+ }+ return out, nil+}+func (s *NotificationService) validateEmailConfigInternal(config *models.EmailConfig) error {if config.SMTPHost == "" || config.SMTPPort == 0 {return fmt.Errorf("SMTP host or port not configured")@@ -3296,6 +2917,92 @@ func (s *NotificationService) validateEmailConfigInternal(config *models.EmailCoreturn nil}+func decryptStringCredentialInternal(value *string) error {+ if *value == "" {+ return nil+ }++ decrypted, err := crypto.Decrypt(*value)+ if err != nil {+ return fmt.Errorf("failed to decrypt notification credential: %w", err)+ }+ *value = decrypted+ return nil+}++func prepareSlackConfigInternal(config models.JSON, providerName string, requireToken bool) (models.SlackConfig, error) {+ slackConfig, err := decodeNotificationConfigInternal[models.SlackConfig](config, providerName)+ if err != nil {+ return models.SlackConfig{}, err+ }+ if requireToken && slackConfig.Token == "" {+ return models.SlackConfig{}, fmt.Errorf("slack token not configured")+ }+ if err := decryptStringCredentialInternal(&slackConfig.Token); err != nil {+ return models.SlackConfig{}, err+ }+ return slackConfig, nil+}++func prepareNtfyConfigInternal(config models.JSON, providerName string, requireTopic bool) (models.NtfyConfig, error) {+ ntfyConfig, err := decodeNotificationConfigInternal[models.NtfyConfig](config, providerName)+ if err != nil {+ return models.NtfyConfig{}, err+ }+ if requireTopic && ntfyConfig.Topic == "" {+ return models.NtfyConfig{}, fmt.Errorf("ntfy topic is required")+ }+ if err := decryptStringCredentialInternal(&ntfyConfig.Password); err != nil {+ return models.NtfyConfig{}, err+ }+ return ntfyConfig, nil+}++func preparePushoverConfigInternal(config models.JSON, providerName string) (models.PushoverConfig, error) {+ pushoverConfig, err := decodeNotificationConfigInternal[models.PushoverConfig](config, providerName)+ if err != nil {+ return models.PushoverConfig{}, err+ }+ if err := decryptStringCredentialInternal(&pushoverConfig.Token); err != nil {+ return models.PushoverConfig{}, err+ }+ return pushoverConfig, nil+}++func prepareGotifyConfigInternal(config models.JSON, providerName string) (models.GotifyConfig, error) {+ gotifyConfig, err := decodeNotificationConfigInternal[models.GotifyConfig](config, providerName)+ if err != nil {+ return models.GotifyConfig{}, err+ }+ if err := decryptStringCredentialInternal(&gotifyConfig.Token); err != nil {+ return models.GotifyConfig{}, err+ }+ return gotifyConfig, nil+}++func prepareMatrixConfigInternal(config models.JSON, providerName string) (models.MatrixConfig, error) {+ matrixConfig, err := decodeNotificationConfigInternal[models.MatrixConfig](config, providerName)+ if err != nil {+ return models.MatrixConfig{}, err+ }+ if err := decryptStringCredentialInternal(&matrixConfig.Password); err != nil {+ return models.MatrixConfig{}, err+ }+ return matrixConfig, nil+}++func buildVulnerabilitySummaryMessageInternal(format notifications.MessageFormat, environmentName string, payload VulnerabilityNotificationPayload) string {+ return notifications.BuildVulnerabilitySummaryNotificationMessage(+ format,+ environmentName,+ payload.CVEID,+ payload.ImageName,+ payload.FixedVersion,+ payload.Severity,+ payload.PkgName,+ )+}+func (s *NotificationService) decryptDiscordTokenInternal(config *models.DiscordConfig) error {if config.Token != "" {decrypted, err := crypto.Decrypt(config.Token)diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex ecfdcdcbb..ab95f2d3f 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -1208,9 +1208,9 @@ func (s *ProjectService) enrichProjectUpdateInfoInternal(ctx context.Context, rereturn}- imageRefs := buildProjectImageRefsFromComposeConfigsInternal(resp.Services)+ imageRefs := projects.ImageRefsFromComposeConfigs(resp.Services)if len(imageRefs) == 0 {- imageRefs = buildProjectImageRefsFromRuntimeServicesInternal(resp.RuntimeServices)+ imageRefs = projects.ImageRefsFromRuntimeServices(resp.RuntimeServices)}var updateInfoByRef map[string]*imagetypes.UpdateInfo@@ -1329,54 +1329,7 @@ func (s *ProjectService) getProjectImageRefsFromComposeInternal(ctx context.Contreturn nil, fmt.Errorf("load compose project: %w", err)}- return buildProjectImageRefsFromComposeServicesInternal(composeProject.Services), nil-}--func buildProjectImageRefsFromComposeServicesInternal(services composetypes.Services) []string {- serviceConfigs := make([]composetypes.ServiceConfig, 0, len(services))- for _, svc := range services {- serviceConfigs = append(serviceConfigs, svc)- }-- return buildProjectImageRefsFromComposeConfigsInternal(serviceConfigs)-}--func buildProjectImageRefsFromComposeConfigsInternal(services []composetypes.ServiceConfig) []string {- refs := make([]string, 0, len(services))- seen := make(map[string]struct{}, len(services))-- for _, svc := range services {- ref := strings.TrimSpace(svc.Image)- if ref == "" {- continue- }- if _, exists := seen[ref]; exists {- continue- }- seen[ref] = struct{}{}- refs = append(refs, ref)- }-- return refs-}--func buildProjectImageRefsFromRuntimeServicesInternal(services []project.RuntimeService) []string {- refs := make([]string, 0, len(services))- seen := make(map[string]struct{}, len(services))-- for _, svc := range services {- ref := strings.TrimSpace(svc.Image)- if ref == "" {- continue- }- if _, exists := seen[ref]; exists {- continue- }- seen[ref] = struct{}{}- refs = append(refs, ref)- }-- return refs+ return projects.ImageRefsFromComposeServices(composeProject.Services), nil}func buildProjectUpdateInfoSummaryInternal(@@ -1412,13 +1365,11 @@ func buildProjectUpdateInfoSummaryInternal(if strings.TrimSpace(info.Error) != "" {summary.ErrorCount++if summary.ErrorMessage == nil {- errMsg := strings.TrimSpace(info.Error)- summary.ErrorMessage = &errMsg+ summary.ErrorMessage = new(strings.TrimSpace(info.Error))}}if !info.CheckTime.IsZero() && (latestCheckTime == nil || info.CheckTime.After(*latestCheckTime)) {- checkTime := info.CheckTime- latestCheckTime = &checkTime+ latestCheckTime = new(info.CheckTime)}}@@ -1753,7 +1704,7 @@ func (s *ProjectService) GetProjectStatusCounts(ctx context.Context) (folderCoun// 2. Group by projectcontainersByProject := make(map[string][]container.Summary)for _, c := range containers {- projName := c.Labels["com.docker.compose.project"]+ projName := dockerutil.ComposeProjectLabel(c.Labels)if projName != "" {containersByProject[projName] = append(containersByProject[projName], c)}@@ -2144,7 +2095,7 @@ func (s *ProjectService) projectRedeployDisabledInternal(ctx context.Context, prcontainersByProject := make(map[string][]container.Summary)for _, c := range containers {- projectName := c.Labels["com.docker.compose.project"]+ projectName := dockerutil.ComposeProjectLabel(c.Labels)if projectName != "" {containersByProject[projectName] = append(containersByProject[projectName], c)}@@ -2267,10 +2218,6 @@ func (s *ProjectService) ensureImagesPresent(ctx context.Context, pullPlan map[sreturn nil}-func (s *ProjectService) pullImageForService(ctx context.Context, imageRef string, progressWriter io.Writer, credentials []containerregistry.Credential) error {- return s.pullAndReconcileImageInternal(ctx, imageRef, progressWriter, systemUser, credentials)-}-func (s *ProjectService) prepareProjectImagesForDeploy(ctx context.Context,projectID string,@@ -2357,7 +2304,7 @@ func (s *ProjectService) ensureDeployServiceImageReady(return nil}- if err := s.pullImageForService(ctx, imageName, progressWriter, credentials); err == nil {+ if err := s.pullAndReconcileImageInternal(ctx, imageName, progressWriter, systemUser, credentials); err == nil {return nil} else if svc.Build != nil && decision.FallbackBuildOnPullFail {slog.WarnContext(ctx, "image pull failed, falling back to build", "service", serviceName, "image", imageName, "error", err)@@ -3846,7 +3793,7 @@ func buildDiscoveredComposeProjectUpdateRowsInternal() []project.Details {containersByProject := make(map[string][]container.Summary)for _, c := range composeContainers {- projectName := strings.TrimSpace(c.Labels["com.docker.compose.project"])+ projectName := dockerutil.ComposeProjectLabel(c.Labels)if projectName == "" {continue}@@ -3870,7 +3817,7 @@ func buildDiscoveredComposeProjectUpdateRowsInternal(rows := make([]project.Details, 0, len(containersByProject))for projectName, projectContainers := range containersByProject {runtimeServices := buildDiscoveredRuntimeServicesInternal(projectContainers)- imageRefs := buildProjectImageRefsFromRuntimeServicesInternal(runtimeServices)+ imageRefs := projects.ImageRefsFromRuntimeServices(runtimeServices)updateInfo := buildProjectUpdateInfoSummaryInternal(imageRefs, updateInfoByRef)if updateInfo == nil || !updateInfo.HasUpdate {continue@@ -3983,7 +3930,7 @@ func buildDiscoveredRuntimeServicesInternal(containers []container.Summary) []prcontinue}- serviceName := strings.TrimSpace(c.Labels["com.docker.compose.service"])+ serviceName := dockerutil.ComposeServiceLabel(c.Labels)if serviceName == "" {serviceName = c.ID}@@ -3993,10 +3940,7 @@ func buildDiscoveredRuntimeServicesInternal(containers []container.Summary) []pr}seenServices[key] = struct{}{}- containerName := ""- if len(c.Names) > 0 {- containerName = strings.TrimPrefix(c.Names[0], "/")- }+ containerName := dockerutil.ContainerNameFromNames(c.Names)runtimeServices = append(runtimeServices, project.RuntimeService{Name: serviceName,@@ -4185,7 +4129,7 @@ func (s *ProjectService) fetchProjectStatusConcurrently(ctx context.Context, pro// 2. Group containers by project namecontainersByProject := make(map[string][]container.Summary)for _, c := range containers {- projName := c.Labels["com.docker.compose.project"]+ projName := dockerutil.ComposeProjectLabel(c.Labels)if projName != "" {containersByProject[projName] = append(containersByProject[projName], c)}@@ -4222,7 +4166,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringrunningCount := 0for _, c := range projectContainers {- svcName := c.Labels["com.docker.compose.service"]+ svcName := dockerutil.ComposeServiceLabel(c.Labels)state := c.State // "running", "exited", etc.// Parse health from Status string if possible@@ -4237,10 +4181,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringhealth = new("starting")}- containerName := ""- if len(c.Names) > 0 {- containerName = strings.TrimPrefix(c.Names[0], "/")- }+ containerName := dockerutil.ContainerNameFromNames(c.Names)redeployDisabled := libupdater.ShouldDisableArcaneServerRedeploy(c.Labels, c.ID, currentContainerID, currentContainerErr)if redeployDisabled {diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex 07bf3858c..6cb1ab4ca 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -738,7 +738,7 @@ func TestProjectService_PullImageForService_UpdatesCurrentImageRecordAfterPull(tCheckTime: time.Now().UTC().Add(-time.Hour),}).Error)- require.NoError(t, svc.pullImageForService(ctx, imageRef, io.Discard, nil))+ require.NoError(t, svc.pullAndReconcileImageInternal(ctx, imageRef, io.Discard, systemUser, nil))// sha256:old-worker may still be in use by another container — must not be cleared (fixes #2453).var oldRecord models.ImageUpdateRecord@@ -2561,8 +2561,6 @@ func TestProjectService_ListProjects_FiltersArchivedProjects(t *testing.T) {activePath := createComposeProjectDir(t, projectsRoot, "active-demo")archivedPath := createComposeProjectDir(t, projectsRoot, "archived-demo")- archivedAt := time.Now().UTC()-require.NoError(t, db.Create(&models.Project{BaseModel: models.BaseModel{ID: "project-active"},Name: "active-demo",@@ -2577,7 +2575,7 @@ func TestProjectService_ListProjects_FiltersArchivedProjects(t *testing.T) {Path: archivedPath,Status: models.ProjectStatusStopped,IsArchived: true,- ArchivedAt: &archivedAt,+ ArchivedAt: new(time.Now().UTC()),}).Error)svc := NewProjectService(db, settingsService, nil, nil, nil, nil, config.Load())diff --git a/backend/internal/services/role_service.go b/backend/internal/services/role_service.goindex a3adf8d7b..6ecbc3c16 100644--- a/backend/internal/services/role_service.go+++ b/backend/internal/services/role_service.go@@ -65,11 +65,10 @@ func (s *RoleService) EnsureBuiltInRoles(ctx context.Context) error {return dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {for id, spec := range builtIns {- desc := spec.descrole := models.Role{BaseModel: models.BaseModel{ID: id},Name: spec.name,- Description: &desc,+ Description: new(spec.desc),Permissions: models.StringSlice(spec.perm),BuiltIn: true,}diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.goindex cb80a4d16..13d81fc2e 100644--- a/backend/internal/services/settings_service_test.go+++ b/backend/internal/services/settings_service_test.go@@ -337,11 +337,9 @@ func TestSettingsService_UpdateSettings_PruneModesDoNotTriggerScheduledPruneCallcallbackCalls++}- imageMode := "all"- containerUntil := "24h"_, err = svc.UpdateSettings(ctx, settings.Update{- PruneImageMode: &imageMode,- PruneContainerUntil: &containerUntil,+ PruneImageMode: new("all"),+ PruneContainerUntil: new("24h"),})require.NoError(t, err)require.Equal(t, 0, callbackCalls)@@ -358,9 +356,8 @@ func TestSettingsService_UpdateSettings_ScheduledPruneScheduleTriggersCallback(tcallbackCalls++}- enabled := "true"_, err = svc.UpdateSettings(ctx, settings.Update{- ScheduledPruneEnabled: &enabled,+ ScheduledPruneEnabled: new("true"),})require.NoError(t, err)require.Equal(t, 1, callbackCalls)diff --git a/backend/internal/services/swarm_service.go b/backend/internal/services/swarm_service.goindex 777edf172..2b148bb42 100644--- a/backend/internal/services/swarm_service.go+++ b/backend/internal/services/swarm_service.go@@ -454,10 +454,10 @@ func (s *SwarmService) StreamServiceLogs(ctx context.Context, serviceID string,defer func() { _ = logs.Close() }()if follow {- return streamMultiplexedLogs(ctx, logs, logsChan)+ return dockerutil.StreamMultiplexedLogs(ctx, logs, logsChan)}- return readAllLogs(logs, logsChan)+ return dockerutil.ReadAllLogs(ctx, logs, logsChan)}func (s *SwarmService) ListNodesPaginated(ctx context.Context, environmentID string, params pagination.QueryParams) ([]swarmtypes.NodeSummary, pagination.Response, error) {diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.goindex 94d0efb88..fbedb9d5b 100644--- a/backend/internal/services/system_service.go+++ b/backend/internal/services/system_service.go@@ -233,13 +233,11 @@ func (s *SystemService) startSystemPruneActivityInternal(ctx context.Context, enif s.activityService == nil {return ""}- resourceType := "system"- resourceName := "Docker resources"activity, err := s.activityService.StartActivity(ctx, StartActivityRequest{EnvironmentID: environmentID,Type: models.ActivityTypeSystemPrune,- ResourceType: &resourceType,- ResourceName: &resourceName,+ ResourceType: new("system"),+ ResourceName: new("Docker resources"),Step: "Preparing prune",LatestMessage: "System prune started",Metadata: models.JSON{@@ -286,8 +284,7 @@ func (s *SystemService) completeSystemPruneActivityInternal(ctx context.Context,} else {status = models.ActivityStatusFailedmessage = "System prune completed with errors"- joined := strings.Join(result.Errors, "; ")- errMessage = &joined+ errMessage = new(strings.Join(result.Errors, "; "))}}if _, err := s.activityService.CompleteActivity(utils.ActivityRuntimeContext(ctx, nil), activityID, status, message, errMessage); err != nil {@@ -335,30 +332,35 @@ func (s *SystemService) performBatchContainerAction(ctx context.Context, contain}func (s *SystemService) StartAllContainers(ctx context.Context, environmentID string) (*containertypes.ActionResult, error) {- activityID := s.startSystemContainerActivityInternal(ctx, environmentID, models.ActivityTypeContainerStart, "All containers", "Starting all containers")- containers, _, _, _, err := s.dockerService.GetAllContainers(ctx)- if err != nil {- result := &containertypes.ActionResult{- Success: false,- Errors: []string{fmt.Sprintf("Failed to list containers: %v", err)},- ActivityID: utils.StringPtrFromTrimmed(activityID),- }- s.completeSystemContainerActivityInternal(ctx, activityID, "Starting all containers failed", result)- return result, err- }-- result := s.performBatchContainerAction(ctx, containers, "start",- func(c container.Summary) bool { return c.State != "running" },- func(ctx context.Context, id string) error {- return s.containerService.StartContainer(ctx, id, systemUser)- })- result.ActivityID = utils.StringPtrFromTrimmed(activityID)- s.completeSystemContainerActivityInternal(ctx, activityID, "Started all containers", result)- return result, nil+ return s.startMatchingContainersInternal(ctx, environmentID, startMatchingContainersOptionsInternal{+ ResourceName: "All containers",+ StartMessage: "Starting all containers",+ FailureMessage: "Starting all containers failed",+ SuccessMessage: "Started all containers",+ ShouldStart: func(c container.Summary) bool { return c.State != "running" },+ })}func (s *SystemService) StartAllStoppedContainers(ctx context.Context, environmentID string) (*containertypes.ActionResult, error) {- activityID := s.startSystemContainerActivityInternal(ctx, environmentID, models.ActivityTypeContainerStart, "Stopped containers", "Starting stopped containers")+ return s.startMatchingContainersInternal(ctx, environmentID, startMatchingContainersOptionsInternal{+ ResourceName: "Stopped containers",+ StartMessage: "Starting stopped containers",+ FailureMessage: "Starting stopped containers failed",+ SuccessMessage: "Started stopped containers",+ ShouldStart: func(c container.Summary) bool { return c.State == "exited" },+ })+}++type startMatchingContainersOptionsInternal struct {+ ResourceName string+ StartMessage string+ FailureMessage string+ SuccessMessage string+ ShouldStart func(container.Summary) bool+}++func (s *SystemService) startMatchingContainersInternal(ctx context.Context, environmentID string, opts startMatchingContainersOptionsInternal) (*containertypes.ActionResult, error) {+ activityID := s.startSystemContainerActivityInternal(ctx, environmentID, models.ActivityTypeContainerStart, opts.ResourceName, opts.StartMessage)containers, _, _, _, err := s.dockerService.GetAllContainers(ctx)if err != nil {result := &containertypes.ActionResult{@@ -366,17 +368,15 @@ func (s *SystemService) StartAllStoppedContainers(ctx context.Context, environmeErrors: []string{fmt.Sprintf("Failed to list containers: %v", err)},ActivityID: utils.StringPtrFromTrimmed(activityID),}- s.completeSystemContainerActivityInternal(ctx, activityID, "Starting stopped containers failed", result)+ s.completeSystemContainerActivityInternal(ctx, activityID, opts.FailureMessage, result)return result, err}- result := s.performBatchContainerAction(ctx, containers, "start",- func(c container.Summary) bool { return c.State == "exited" },- func(ctx context.Context, id string) error {- return s.containerService.StartContainer(ctx, id, systemUser)- })+ result := s.performBatchContainerAction(ctx, containers, "start", opts.ShouldStart, func(ctx context.Context, id string) error {+ return s.containerService.StartContainer(ctx, id, systemUser)+ })result.ActivityID = utils.StringPtrFromTrimmed(activityID)- s.completeSystemContainerActivityInternal(ctx, activityID, "Started stopped containers", result)+ s.completeSystemContainerActivityInternal(ctx, activityID, opts.SuccessMessage, result)return result, nil}@@ -410,11 +410,10 @@ func (s *SystemService) startSystemContainerActivityInternal(ctx context.Contextif s.activityService == nil {return ""}- resourceType := "system"activity, err := s.activityService.StartActivity(ctx, StartActivityRequest{EnvironmentID: environmentID,Type: activityType,- ResourceType: &resourceType,+ ResourceType: new("system"),ResourceName: &resourceName,Step: message,LatestMessage: message,diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex 677fc8407..3940f3519 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -21,6 +21,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"+ dockerutil "github.com/getarcaneapp/arcane/backend/pkg/dockerutil""github.com/getarcaneapp/arcane/backend/pkg/libarcane"activitylib "github.com/getarcaneapp/arcane/backend/pkg/libarcane/activity"libupdater "github.com/getarcaneapp/arcane/backend/pkg/libarcane/imageupdate"@@ -413,13 +414,11 @@ func (s *UpdaterService) startAutoUpdateActivityInternal(ctx context.Context, drif s.activityService == nil {return ""}- resourceType := "system"- resourceName := "Auto update"activity, err := s.activityService.StartActivity(ctx, StartActivityRequest{EnvironmentID: "0",Type: models.ActivityTypeAutoUpdate,- ResourceType: &resourceType,- ResourceName: &resourceName,+ ResourceType: new("system"),+ ResourceName: new("Auto update"),Step: "Planning updates",LatestMessage: "Auto-update run started",Metadata: models.JSON{"dryRun": dryRun},@@ -435,14 +434,12 @@ func (s *UpdaterService) startSingleContainerUpdateActivityInternal(ctx context.if s.activityService == nil {return ""}- resourceType := "container"- resourceName := containerIDactivity, err := s.activityService.StartActivity(ctx, StartActivityRequest{EnvironmentID: "0",Type: models.ActivityTypeAutoUpdate,- ResourceType: &resourceType,+ ResourceType: new("container"),ResourceID: &containerID,- ResourceName: &resourceName,+ ResourceName: new(containerID),Step: "Updating container",LatestMessage: "Container update started",Metadata: models.JSON{"containerID": containerID},@@ -541,7 +538,7 @@ func (s *UpdaterService) UpdateSingleContainer(ctx context.Context, containerIDreturn nil, fmt.Errorf("container not found: %s", containerID)}- containerName := s.getContainerName(*targetContainer)+ containerName := dockerutil.ContainerSummaryName(*targetContainer)slog.InfoContext(ctx, "UpdateSingleContainer: found container", "containerID", containerID, "name", containerName, "image", targetContainer.Image)// Inspect container to get full config (needed for label-based controls)@@ -716,8 +713,8 @@ func (s *UpdaterService) UpdateSingleContainer(ctx context.Context, containerID}// Update the container- projectName := inspect.Config.Labels["com.docker.compose.project"]- serviceName := inspect.Config.Labels["com.docker.compose.service"]+ projectName := dockerutil.ComposeProjectLabel(inspect.Config.Labels)+ serviceName := dockerutil.ComposeServiceLabel(inspect.Config.Labels)if projectName != "" && serviceName != "" {slog.InfoContext(ctx, "UpdateSingleContainer: detected compose container, using project-based update", "containerID", containerID, "project", projectName, "service", serviceName)@@ -886,7 +883,7 @@ func (s *UpdaterService) updateContainer(ctx context.Context, cnt container.Summreturn fmt.Errorf("docker connect: %w", err)}- name := s.getContainerName(cnt)+ name := dockerutil.ContainerSummaryName(cnt)labels := inspect.Config.LabelsisArcane := libupdater.IsArcaneContainer(labels)@@ -1251,7 +1248,7 @@ func activeComposeProjectNameSetInternal(projects []models.Project) map[string]sfunc (s *UpdaterService) collectUsedImagesFromComposeContainersInternal(ctx context.Context, composeContainers []container.Summary, activeProjectNames map[string]struct{}, out map[string]struct{}) {for _, c := range composeContainers {- projectName := strings.TrimSpace(c.Labels["com.docker.compose.project"])+ projectName := dockerutil.ComposeProjectLabel(c.Labels)if projectName == "" {continue}@@ -1300,17 +1297,6 @@ func (s *UpdaterService) getNormalizedTagsForContainer(ctx context.Context, dclireturn out}-func (s *UpdaterService) getContainerName(cnt container.Summary) string {- if len(cnt.Names) > 0 {- n := cnt.Names[0]- if strings.HasPrefix(n, "/") {- return n[1:]- }- return n- }- return cnt.ID[:12]-}-func (s *UpdaterService) recordRun(ctx context.Context, item updater.ResourceResult) error {rec := &models.AutoUpdateRecord{ResourceID: item.ResourceID,@@ -1456,7 +1442,7 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDc.Labels = map[string]string{}}- name := s.getContainerName(c)+ name := dockerutil.ContainerSummaryName(c)containersWithDeps = append(containersWithDeps, libupdater.ContainerWithDeps{Container: c,Name: name,@@ -1555,8 +1541,8 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDif p == nil || p.newRef == "" || p.inspect == nil || p.inspect.Config == nil {continue}- projectName := p.inspect.Config.Labels["com.docker.compose.project"]- serviceName := p.inspect.Config.Labels["com.docker.compose.service"]+ projectName := dockerutil.ComposeProjectLabel(p.inspect.Config.Labels)+ serviceName := dockerutil.ComposeServiceLabel(p.inspect.Config.Labels)if projectName != "" && serviceName != "" {projectID, ok := lookupComposeProjectIDInternal(projectName, projectNameToID)if !ok {@@ -1640,8 +1626,8 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDendProjectStatus := s.beginProjectUpdateInternal(composeProjectNameFromLabelsInternal(labels))defer endProjectStatus()- projectName := labels["com.docker.compose.project"]- serviceName := labels["com.docker.compose.service"]+ projectName := dockerutil.ComposeProjectLabel(labels)+ serviceName := dockerutil.ComposeServiceLabel(labels)var proj *models.Projectif projectName != "" {if projectID, ok := lookupComposeProjectIDInternal(projectName, projectNameToID); ok {@@ -1801,8 +1787,8 @@ func (s *UpdaterService) lazyRegisterComposeProjectInternal(if p.newRef == "" || p.inspect == nil || p.inspect.Config == nil {return}- projectName := p.inspect.Config.Labels["com.docker.compose.project"]- serviceName := p.inspect.Config.Labels["com.docker.compose.service"]+ projectName := dockerutil.ComposeProjectLabel(p.inspect.Config.Labels)+ serviceName := dockerutil.ComposeServiceLabel(p.inspect.Config.Labels)if projectName == "" || serviceName == "" {return}@@ -1865,7 +1851,7 @@ func composeProjectNameFromLabelsInternal(labels map[string]string) string {if len(labels) == 0 {return ""}- return strings.TrimSpace(labels["com.docker.compose.project"])+ return dockerutil.ComposeProjectLabel(labels)}func lookupComposeProjectIDInternal(projectName string, projectNameToID map[string]string) (string, bool) {diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.goindex f445dae2b..1e0331a87 100644--- a/backend/internal/services/vulnerability_service.go+++ b/backend/internal/services/vulnerability_service.go@@ -448,16 +448,14 @@ func (s *VulnerabilityService) startVulnerabilityScanActivityInternal(ctx contexreturn ""}- resourceType := "image"- progress := 0activity, err := s.activityService.StartActivity(ctx, StartActivityRequest{EnvironmentID: envID,Type: models.ActivityTypeVulnerabilityScan,- ResourceType: &resourceType,+ ResourceType: new("image"),ResourceID: &imageID,ResourceName: &imageName,StartedBy: user,- Progress: &progress,+ Progress: new(0),Step: string(vulnerability.ScanPhaseCreatingContainer),LatestMessage: "Vulnerability scan queued",})diff --git a/backend/pkg/dockerutil/compose_labels.go b/backend/pkg/dockerutil/compose_labels.gonew file mode 100644index 000000000..92b1c0796--- /dev/null+++ b/backend/pkg/dockerutil/compose_labels.go@@ -0,0 +1,22 @@+package docker++import "strings"++// Docker Compose attaches these labels to every container it manages. They+// identify the owning project and the service within that project.+const (+ ComposeProjectLabelKey = "com.docker.compose.project"+ ComposeServiceLabelKey = "com.docker.compose.service"+)++// ComposeProjectLabel returns the trimmed Docker Compose project name from a+// container's labels, or "" when unset.+func ComposeProjectLabel(labels map[string]string) string {+ return strings.TrimSpace(labels[ComposeProjectLabelKey])+}++// ComposeServiceLabel returns the trimmed Docker Compose service name from a+// container's labels, or "" when unset.+func ComposeServiceLabel(labels map[string]string) string {+ return strings.TrimSpace(labels[ComposeServiceLabelKey])+}diff --git a/backend/pkg/dockerutil/compose_labels_test.go b/backend/pkg/dockerutil/compose_labels_test.gonew file mode 100644index 000000000..f96d42539--- /dev/null+++ b/backend/pkg/dockerutil/compose_labels_test.go@@ -0,0 +1,24 @@+package docker++import "testing"++func TestComposeLabels(t *testing.T) {+ labels := map[string]string{+ ComposeProjectLabelKey: " myproj ",+ ComposeServiceLabelKey: "web",+ }++ if got := ComposeProjectLabel(labels); got != "myproj" {+ t.Errorf("ComposeProjectLabel() = %q, want %q", got, "myproj")+ }+ if got := ComposeServiceLabel(labels); got != "web" {+ t.Errorf("ComposeServiceLabel() = %q, want %q", got, "web")+ }++ if got := ComposeProjectLabel(nil); got != "" {+ t.Errorf("ComposeProjectLabel(nil) = %q, want %q", got, "")+ }+ if got := ComposeServiceLabel(map[string]string{}); got != "" {+ t.Errorf("ComposeServiceLabel(empty) = %q, want %q", got, "")+ }+}diff --git a/backend/pkg/dockerutil/container_names.go b/backend/pkg/dockerutil/container_names.gonew file mode 100644index 000000000..464b59d3d--- /dev/null+++ b/backend/pkg/dockerutil/container_names.go@@ -0,0 +1,30 @@+package docker++import (+ "strings"++ "github.com/moby/moby/api/types/container"+)++// ContainerNameFromNames returns Docker's first container name without the+// leading slash Docker stores in container summaries.+func ContainerNameFromNames(names []string) string {+ if len(names) == 0 {+ return ""+ }++ return strings.TrimPrefix(names[0], "/")+}++// ContainerSummaryName returns a displayable container name from a Docker+// summary, falling back to the short container ID when Docker has no name.+func ContainerSummaryName(cnt container.Summary) string {+ if name := ContainerNameFromNames(cnt.Names); name != "" {+ return name+ }++ if len(cnt.ID) >= 12 {+ return cnt.ID[:12]+ }+ return cnt.ID+}diff --git a/backend/pkg/dockerutil/container_names_test.go b/backend/pkg/dockerutil/container_names_test.gonew file mode 100644index 000000000..8e1ddd466--- /dev/null+++ b/backend/pkg/dockerutil/container_names_test.go@@ -0,0 +1,71 @@+package docker++import (+ "testing"++ "github.com/moby/moby/api/types/container"+)++func TestContainerNameFromNames(t *testing.T) {+ tests := []struct {+ name string+ names []string+ want string+ }{+ {+ name: "single name with slash",+ names: []string{"/myapp"},+ want: "myapp",+ },+ {+ name: "single name without slash",+ names: []string{"myapp"},+ want: "myapp",+ },+ {+ name: "multiple names uses first",+ names: []string{"/myapp", "/myapp-alias"},+ want: "myapp",+ },+ {+ name: "no names",+ names: []string{},+ want: "",+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ if got := ContainerNameFromNames(tt.names); got != tt.want {+ t.Errorf("ContainerNameFromNames() = %v, want %v", got, tt.want)+ }+ })+ }+}++func TestContainerSummaryName(t *testing.T) {+ tests := []struct {+ name string+ cnt container.Summary+ want string+ }{+ {+ name: "uses Docker name",+ cnt: container.Summary{Names: []string{"/myapp"}, ID: "abc123456789"},+ want: "myapp",+ },+ {+ name: "falls back to short ID",+ cnt: container.Summary{Names: []string{}, ID: "abc123456789"},+ want: "abc123456789",+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ if got := ContainerSummaryName(tt.cnt); got != tt.want {+ t.Errorf("ContainerSummaryName() = %v, want %v", got, tt.want)+ }+ })+ }+}diff --git a/backend/pkg/dockerutil/log_stream.go b/backend/pkg/dockerutil/log_stream.gonew file mode 100644index 000000000..2d74e6b06--- /dev/null+++ b/backend/pkg/dockerutil/log_stream.go@@ -0,0 +1,170 @@+package docker++import (+ "bufio"+ "context"+ "errors"+ "fmt"+ "io"+ "log/slog"+ "strings"+ "sync"++ "github.com/moby/moby/api/pkg/stdcopy"+)++// StreamContainerLogs streams Docker container logs, handling TTY raw streams+// and non-TTY multiplexed stdout/stderr streams.+func StreamContainerLogs(ctx context.Context, logs io.ReadCloser, logsChan chan<- string, follow bool, isTTY bool) error {+ if isTTY {+ return readLogLinesInternal(ctx, logs, logsChan, "")+ }+ if follow {+ return StreamMultiplexedLogs(ctx, logs, logsChan)+ }+ return ReadAllLogs(ctx, logs, logsChan)+}++// StreamMultiplexedLogs demultiplexes a Docker stdout/stderr log stream and+// sends non-empty lines to logsChan.+func StreamMultiplexedLogs(ctx context.Context, logs io.Reader, logsChan chan<- string) error {+ stdoutReader, stdoutWriter := io.Pipe()+ stderrReader, stderrWriter := io.Pipe()++ var closeOnce sync.Once+ closeInputs := func() {+ closeOnce.Do(func() {+ err := ctx.Err()+ if err == nil {+ err = io.ErrClosedPipe+ }+ _ = stdoutReader.CloseWithError(err)+ _ = stderrReader.CloseWithError(err)+ if closer, ok := logs.(io.Closer); ok {+ _ = closer.Close()+ }+ })+ }++ copyDone := make(chan struct{})+ go func() {+ defer close(copyDone)+ defer func() { _ = stdoutWriter.Close() }()+ defer func() { _ = stderrWriter.Close() }()+ _, err := stdcopy.StdCopy(stdoutWriter, stderrWriter, logs)+ if err != nil && !errors.Is(err, io.EOF) && ctx.Err() == nil {+ slog.Error("error demultiplexing logs", "error", err)+ }+ }()++ go func() {+ select {+ case <-ctx.Done():+ closeInputs()+ case <-copyDone:+ }+ }()++ done := make(chan error, 2)++ go func() {+ done <- readLogLinesInternal(ctx, stdoutReader, logsChan, "")+ }()++ go func() {+ done <- readLogLinesInternal(ctx, stderrReader, logsChan, "[STDERR] ")+ }()++ select {+ case <-ctx.Done():+ closeInputs()+ return ctx.Err()+ case err := <-done:+ if err != nil && !errors.Is(err, io.EOF) {+ closeInputs()+ return err+ }+ select {+ case <-ctx.Done():+ closeInputs()+ return ctx.Err()+ case <-done:+ return nil+ }+ }+}++// ReadAllLogs reads a non-follow Docker multiplexed log stream and sends+// non-empty stdout/stderr lines to logsChan.+func ReadAllLogs(ctx context.Context, logs io.ReadCloser, logsChan chan<- string) error {+ stdoutBuf := &strings.Builder{}+ stderrBuf := &strings.Builder{}+ stdCopyDone := make(chan struct{})+ defer close(stdCopyDone)++ go func() {+ select {+ case <-ctx.Done():+ _ = logs.Close()+ case <-stdCopyDone:+ }+ }()++ _, err := stdcopy.StdCopy(stdoutBuf, stderrBuf, logs)+ if err != nil && !errors.Is(err, io.EOF) {+ if ctxErr := ctx.Err(); ctxErr != nil {+ return ctxErr+ }+ return fmt.Errorf("failed to demultiplex logs: %w", err)+ }+ if ctxErr := ctx.Err(); ctxErr != nil {+ return ctxErr+ }++ if stdoutBuf.Len() > 0 {+ if err := readLogLinesInternal(ctx, strings.NewReader(stdoutBuf.String()), logsChan, ""); err != nil {+ return err+ }+ }++ if stderrBuf.Len() > 0 {+ if err := readLogLinesInternal(ctx, strings.NewReader(stderrBuf.String()), logsChan, "[STDERR] "); err != nil {+ return err+ }+ }++ return nil+}++func readLogLinesInternal(ctx context.Context, reader io.Reader, logsChan chan<- string, prefix string) error {+ bufferedReader := bufio.NewReader(reader)++ for {+ if err := ctx.Err(); err != nil {+ return err+ }++ line, err := bufferedReader.ReadString('\n')+ if len(line) > 0 {+ trimmed := strings.TrimRight(line, "\r\n")+ if trimmed != "" {+ if prefix != "" {+ trimmed = prefix + trimmed+ }++ select {+ case logsChan <- trimmed:+ case <-ctx.Done():+ return ctx.Err()+ }+ }+ }++ if err != nil {+ if errors.Is(err, io.EOF) {+ return nil+ }+ return err+ }+ }+}diff --git a/backend/pkg/dockerutil/log_stream_test.go b/backend/pkg/dockerutil/log_stream_test.gonew file mode 100644index 000000000..bd373c229--- /dev/null+++ b/backend/pkg/dockerutil/log_stream_test.go@@ -0,0 +1,198 @@+package docker++import (+ "bytes"+ "context"+ "encoding/binary"+ "io"+ "strings"+ "testing"+ "time"++ "github.com/stretchr/testify/require"+)++func TestStreamContainerLogsNonTTYFollowDemultiplexesStdoutAndStderr(t *testing.T) {+ var stream bytes.Buffer+ writeDockerLogFrameInternal(t, &stream, 1, "stdout line\n")+ writeDockerLogFrameInternal(t, &stream, 2, "stderr line\n")++ logsChan := make(chan string, 4)++ err := StreamContainerLogs(t.Context(), io.NopCloser(bytes.NewReader(stream.Bytes())), logsChan, true, false)+ require.NoError(t, err)++ require.ElementsMatch(t, []string{"stdout line", "[STDERR] stderr line"}, drainLogLinesInternal(logsChan))+}++func TestStreamContainerLogsTTYFollowStreamsRawOutput(t *testing.T) {+ logsChan := make(chan string, 4)++ err := StreamContainerLogs(t.Context(), io.NopCloser(strings.NewReader("first line\nsecond line")), logsChan, true, true)+ require.NoError(t, err)++ require.Equal(t, []string{"first line", "second line"}, drainLogLinesInternal(logsChan))+}++func TestStreamContainerLogsNonTTYSnapshotDemultiplexesStdoutAndStderr(t *testing.T) {+ var stream bytes.Buffer+ writeDockerLogFrameInternal(t, &stream, 1, "stdout snapshot\n")+ writeDockerLogFrameInternal(t, &stream, 2, "stderr snapshot\n")++ logsChan := make(chan string, 4)++ err := StreamContainerLogs(t.Context(), io.NopCloser(bytes.NewReader(stream.Bytes())), logsChan, false, false)+ require.NoError(t, err)++ require.Equal(t, []string{"stdout snapshot", "[STDERR] stderr snapshot"}, drainLogLinesInternal(logsChan))+}++func TestStreamContainerLogsTTYSnapshotStreamsRawOutput(t *testing.T) {+ logsChan := make(chan string, 4)++ err := StreamContainerLogs(t.Context(), io.NopCloser(strings.NewReader("snapshot line\ntrailing line")), logsChan, false, true)+ require.NoError(t, err)++ require.Equal(t, []string{"snapshot line", "trailing line"}, drainLogLinesInternal(logsChan))+}++func TestStreamContainerLogsTTYHandlesLongLinesAndPartialEOF(t *testing.T) {+ longLine := strings.Repeat("a", 70*1024)+ logsChan := make(chan string, 4)++ err := StreamContainerLogs(t.Context(), io.NopCloser(strings.NewReader(longLine+"\npartial tail")), logsChan, true, true)+ require.NoError(t, err)++ require.Equal(t, []string{longLine, "partial tail"}, drainLogLinesInternal(logsChan))+}++func TestStreamContainerLogsTTYPythonLikeFollowDoesNotReturnEmptyLogs(t *testing.T) {+ logsChan := make(chan string, 4)++ err := StreamContainerLogs(+ t.Context(),+ io.NopCloser(strings.NewReader("2026-03-22 10:15:00 - INFO - Starting miner\n2026-03-22 10:15:01 - INFO - Connected")),+ logsChan,+ true,+ true,+ )+ require.NoError(t, err)++ lines := drainLogLinesInternal(logsChan)+ require.NotEmpty(t, lines)+ require.Equal(t, []string{+ "2026-03-22 10:15:00 - INFO - Starting miner",+ "2026-03-22 10:15:01 - INFO - Connected",+ }, lines)+}++func TestStreamMultiplexedLogsContextCancelDoesNotDeadlock(t *testing.T) {+ var stream bytes.Buffer+ writeDockerLogFrameInternal(t, &stream, 1, "line 1\n")+ writeDockerLogFrameInternal(t, &stream, 1, "line 2\n")+ writeDockerLogFrameInternal(t, &stream, 1, "line 3\n")++ logsChan := make(chan string, 1)+ ctx, cancel := context.WithCancel(context.Background())+ defer cancel()++ done := make(chan error, 1)+ go func() {+ done <- StreamMultiplexedLogs(ctx, bytes.NewReader(stream.Bytes()), logsChan)+ }()++ require.Eventually(t, func() bool {+ return len(logsChan) == 1+ }, time.Second, 10*time.Millisecond)++ cancel()++ select {+ case err := <-done:+ require.ErrorIs(t, err, context.Canceled)+ case <-time.After(time.Second):+ t.Fatal("StreamMultiplexedLogs did not exit after cancellation")+ }+}++func TestReadAllLogsContextCancelClosesReader(t *testing.T) {+ logsChan := make(chan string, 1)+ ctx, cancel := context.WithCancel(context.Background())+ defer cancel()++ reader := &blockingReadCloserInternal{readStarted: make(chan struct{}), closeCalled: make(chan struct{})}+ done := make(chan error, 1)+ go func() {+ done <- ReadAllLogs(ctx, reader, logsChan)+ }()++ select {+ case <-reader.readStarted:+ case <-time.After(time.Second):+ t.Fatal("ReadAllLogs did not start reading")+ }++ cancel()++ select {+ case err := <-done:+ require.ErrorIs(t, err, context.Canceled)+ case <-time.After(time.Second):+ t.Fatal("ReadAllLogs did not exit after cancellation")+ }++ select {+ case <-reader.closeCalled:+ case <-time.After(time.Second):+ t.Fatal("ReadAllLogs did not close the reader on cancellation")+ }+}++func drainLogLinesInternal(logsChan chan string) []string {+ close(logsChan)++ lines := make([]string, 0, len(logsChan))+ for line := range logsChan {+ lines = append(lines, line)+ }++ return lines+}++func writeDockerLogFrameInternal(t *testing.T, buffer *bytes.Buffer, streamType byte, payload string) {+ t.Helper()++ header := make([]byte, 8)+ header[0] = streamType+ binary.BigEndian.PutUint32(header[4:], uint32(len(payload)))++ _, err := buffer.Write(header)+ require.NoError(t, err)+ _, err = buffer.WriteString(payload)+ require.NoError(t, err)+}++type blockingReadCloserInternal struct {+ readStarted chan struct{}+ closeCalled chan struct{}+}++func (r *blockingReadCloserInternal) Read(_ []byte) (int, error) {+ select {+ case <-r.readStarted:+ default:+ close(r.readStarted)+ }++ <-r.closeCalled+ return 0, io.EOF+}++func (r *blockingReadCloserInternal) Close() error {+ select {+ case <-r.closeCalled:+ default:+ close(r.closeCalled)+ }+ return nil+}diff --git a/backend/pkg/libarcane/activity/writer.go b/backend/pkg/libarcane/activity/writer.goindex e56e5af34..2577d645b 100644--- a/backend/pkg/libarcane/activity/writer.go+++ b/backend/pkg/libarcane/activity/writer.go@@ -373,11 +373,9 @@ func phaseMessageInternal(typ, phase string, payload map[string]any) string {func phaseProgressInternal(phase string, rawDetail any) *int {switch phase {case "begin":- out := 5- return &out+ return new(5)case "complete":- out := 100- return &out+ return new(100)default:return progressDetailPercentInternal(rawDetail)}@@ -407,8 +405,7 @@ func progressDetailPercentInternal(rawDetail any) *int {progress = 100}- out := int(progress)- return &out+ return new(int(progress))}func containerEventMessageInternal(payload map[string]any) string {diff --git a/backend/pkg/libarcane/edge/client.go b/backend/pkg/libarcane/edge/client.goindex e3f6303a0..f4d5afbe8 100644--- a/backend/pkg/libarcane/edge/client.go+++ b/backend/pkg/libarcane/edge/client.go@@ -232,30 +232,51 @@ func (c *TunnelClient) connectAndServeManagedTunnelInternal(ctx context.Context)}func (c *TunnelClient) shouldFallbackToWebSocketInternal() bool {- if !c.shouldAttemptWebSocketTunnelInternal() {- return false- }- return c.managerWebSocketURLInternal() != ""+ return c.shouldAttemptWebSocketTunnelInternal()}func (c *TunnelClient) shouldAttemptGRPCTunnelInternal() bool {- if c == nil {- return false- }- if UsePollEdgeTransport(c.cfg) {- return strings.TrimSpace(c.managerGRPCAddr) != ""- }- return UseGRPCEdgeTransport(c.cfg)+ transports := c.managedTunnelTransportsInternal()+ return transports.grpc}func (c *TunnelClient) shouldAttemptWebSocketTunnelInternal() bool {- if c == nil {- return false+ transports := c.managedTunnelTransportsInternal()+ return transports.websocket+}++type managedTunnelTransportsInternal struct {+ grpc bool+ websocket bool+}++func (c *TunnelClient) managedTunnelTransportsInternal() managedTunnelTransportsInternal {+ if c == nil || c.cfg == nil {+ return managedTunnelTransportsInternal{}}- if UsePollEdgeTransport(c.cfg) {- return c.managerWebSocketURLInternal() != ""++ managerGRPCAvailable := strings.TrimSpace(c.managerGRPCAddr) != ""+ managerWebSocketAvailable := c.managerWebSocketURLInternal() != ""+ transport := NormalizeEdgeTransport(c.cfg.EdgeTransport)++ switch transport {+ case EdgeTransportPoll:+ return managedTunnelTransportsInternal{+ grpc: managerGRPCAvailable,+ websocket: managerWebSocketAvailable,+ }+ case EdgeTransportWebSocket:+ return managedTunnelTransportsInternal{+ websocket: managerWebSocketAvailable,+ }+ case EdgeTransportGRPC:+ return managedTunnelTransportsInternal{+ grpc: managerGRPCAvailable,+ websocket: strings.TrimSpace(c.cfg.EdgeTransport) == "" && managerWebSocketAvailable,+ }+ default:+ return managedTunnelTransportsInternal{}}- return UseWebSocketEdgeTransport(c.cfg)}func (c *TunnelClient) managerWebSocketURLInternal() string {diff --git a/backend/pkg/libarcane/edge/client_grpc_test.go b/backend/pkg/libarcane/edge/client_grpc_test.goindex 68a546441..b9b26d264 100644--- a/backend/pkg/libarcane/edge/client_grpc_test.go+++ b/backend/pkg/libarcane/edge/client_grpc_test.go@@ -575,7 +575,7 @@ func TestTunnelClient_connectAndServe_WebSocketConfigFallsBackToWebSocket(t *tes}func TestTunnelClient_connectAndServe_OpensGRPCWhenAvailable(t *testing.T) {- ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)+ ctx, cancel := context.WithCancel(context.Background())defer cancel()envID := "env-auto-poll-grpc"@@ -616,8 +616,14 @@ func TestTunnelClient_connectAndServe_OpensGRPCWhenAvailable(t *testing.T) {return isGRPC}, 3*time.Second, 20*time.Millisecond)- err := <-errCh- assert.ErrorIs(t, err, context.DeadlineExceeded)+ cancel()++ select {+ case err := <-errCh:+ assert.ErrorIs(t, err, context.Canceled)+ case <-time.After(2 * time.Second):+ t.Fatal("timeout waiting for gRPC tunnel shutdown")+ }}func startTestGRPCTunnelServerOnAPIPathInternal(t *testing.T, ctx context.Context, tunnelServer *TunnelServer) (string, func()) {diff --git a/backend/pkg/libarcane/imageupdate/registry_http.go b/backend/pkg/libarcane/imageupdate/registry_http.goindex bab7b7899..5fdddeb56 100644--- a/backend/pkg/libarcane/imageupdate/registry_http.go+++ b/backend/pkg/libarcane/imageupdate/registry_http.go@@ -445,8 +445,7 @@ func extractRateLimitFromHeadersInternal(headers http.Header) (*RateLimitInfo, evar used *intif limit != nil && remaining != nil {- value := *limit - *remaining- used = &value+ used = new(*limit - *remaining)}return &RateLimitInfo{diff --git a/backend/pkg/libarcane/imageupdate/sorter.go b/backend/pkg/libarcane/imageupdate/sorter.goindex b8020b9a1..187a4a72a 100644--- a/backend/pkg/libarcane/imageupdate/sorter.go+++ b/backend/pkg/libarcane/imageupdate/sorter.go@@ -7,6 +7,7 @@ import ("slices""strings"+ dockerutil "github.com/getarcaneapp/arcane/backend/pkg/dockerutil""github.com/moby/moby/api/types/container""github.com/moby/moby/client")@@ -127,7 +128,7 @@ func ExtractContainerDeps(ctx context.Context, dcli *client.Client, cnt containec := ContainerWithDeps{Container: cnt,Inspect: inspect,- Name: ExtractContainerName(cnt),+ Name: dockerutil.ContainerSummaryName(cnt),}// Extract Docker links@@ -212,15 +213,3 @@ func hasMarkedDependencyInternal(markedForRestart map[string]bool, deps []stringreturn false}--// ExtractContainerName extracts a clean container name from the summary-func ExtractContainerName(cnt container.Summary) string {- if len(cnt.Names) > 0 {- n := cnt.Names[0]- if strings.HasPrefix(n, "/") {- return n[1:]- }- return n- }- return cnt.ID[:12]-}diff --git a/backend/pkg/libarcane/imageupdate/sorter_test.go b/backend/pkg/libarcane/imageupdate/sorter_test.goindex deaf83db9..2c4b85b6c 100644--- a/backend/pkg/libarcane/imageupdate/sorter_test.go+++ b/backend/pkg/libarcane/imageupdate/sorter_test.go@@ -351,40 +351,3 @@ func TestUpdateImplicitRestart(t *testing.T) {})}}--func TestExtractContainerName(t *testing.T) {- tests := []struct {- name string- cnt container.Summary- want string- }{- {- name: "single name with slash",- cnt: container.Summary{Names: []string{"/myapp"}, ID: "abc123"},- want: "myapp",- },- {- name: "single name without slash",- cnt: container.Summary{Names: []string{"myapp"}, ID: "abc123"},- want: "myapp",- },- {- name: "multiple names - uses first",- cnt: container.Summary{Names: []string{"/myapp", "/myapp-alias"}, ID: "abc123"},- want: "myapp",- },- {- name: "no names - falls back to short ID",- cnt: container.Summary{Names: []string{}, ID: "abc123456789"},- want: "abc123456789",- },- }-- for _, tt := range tests {- t.Run(tt.name, func(t *testing.T) {- if got := ExtractContainerName(tt.cnt); got != tt.want {- t.Errorf("ExtractContainerName() = %v, want %v", got, tt.want)- }- })- }-}diff --git a/backend/pkg/libarcane/swarm/stack_deploy_engine.go b/backend/pkg/libarcane/swarm/stack_deploy_engine.goindex ad8dfc588..2fd276ae8 100644--- a/backend/pkg/libarcane/swarm/stack_deploy_engine.go+++ b/backend/pkg/libarcane/swarm/stack_deploy_engine.go@@ -485,69 +485,95 @@ func ensureSwarmSecrets(ctx context.Context, dockerClient *dockerclient.Client,}func ensureConfig(ctx context.Context, dockerClient *dockerclient.Client, name string, cfg composegotypes.ConfigObjConfig, stackLabels map[string]string, workingDir string) (resourceMeta, error) {- data, err := resolveFileObjectContent(composegotypes.FileObjectConfig(cfg), workingDir)- if err != nil {- return resourceMeta{}, fmt.Errorf("failed to load config %s: %w", name, err)- }+ return ensureManagedFileResourceInternal(ctx, name, composegotypes.FileObjectConfig(cfg), cfg.Labels, stackLabels, workingDir, managedFileResourceOptionsInternal{+ ResourceType: "config",+ Inspect: func(ctx context.Context, managedName string) (resourceMeta, error) {+ return inspectConfig(ctx, dockerClient, managedName)+ },+ Create: createConfigResourceInternal(dockerClient),+ })+}- hash := hashManagedResource(data)- managedName := managedResourceName(name, hash)- if meta, err := inspectConfig(ctx, dockerClient, managedName); err == nil {- return meta, nil- } else if !cerrdefs.IsNotFound(err) {- return resourceMeta{}, fmt.Errorf("failed to inspect config %s: %w", managedName, err)+func ensureSecret(ctx context.Context, dockerClient *dockerclient.Client, name string, cfg composegotypes.SecretConfig, stackLabels map[string]string, workingDir string) (resourceMeta, error) {+ return ensureManagedFileResourceInternal(ctx, name, composegotypes.FileObjectConfig(cfg), cfg.Labels, stackLabels, workingDir, managedFileResourceOptionsInternal{+ ResourceType: "secret",+ Inspect: func(ctx context.Context, managedName string) (resourceMeta, error) {+ return inspectSecret(ctx, dockerClient, managedName)+ },+ Create: createSecretResourceInternal(dockerClient),+ })+}++func createConfigResourceInternal(dockerClient *dockerclient.Client) func(context.Context, string, map[string]string, []byte) (resourceMeta, error) {+ return func(ctx context.Context, managedName string, labels map[string]string, data []byte) (resourceMeta, error) {+ spec := swarm.ConfigSpec{+ Annotations: managedResourceAnnotationsInternal(managedName, labels),+ Data: data,+ }++ resp, err := dockerClient.ConfigCreate(ctx, dockerclient.ConfigCreateOptions{Spec: spec})+ if err != nil {+ return resourceMeta{}, fmt.Errorf("failed to create config %s: %w", managedName, err)+ }+ return resourceMeta{ID: resp.ID, Name: managedName}, nil}+}- labels := mergeLabels(cfg.Labels, stackLabels)- labels[resourceTypeLabel] = "config"- labels[resourceNameLabel] = name- labels[resourceHashLabel] = hash- spec := swarm.ConfigSpec{- Annotations: swarm.Annotations{- Name: managedName,- Labels: labels,- },- Data: data,+func createSecretResourceInternal(dockerClient *dockerclient.Client) func(context.Context, string, map[string]string, []byte) (resourceMeta, error) {+ return func(ctx context.Context, managedName string, labels map[string]string, data []byte) (resourceMeta, error) {+ spec := swarm.SecretSpec{+ Annotations: managedResourceAnnotationsInternal(managedName, labels),+ Data: data,+ }++ resp, err := dockerClient.SecretCreate(ctx, dockerclient.SecretCreateOptions{Spec: spec})+ if err != nil {+ return resourceMeta{}, fmt.Errorf("failed to create secret %s: %w", managedName, err)+ }+ return resourceMeta{ID: resp.ID, Name: managedName}, nil}+}- resp, err := dockerClient.ConfigCreate(ctx, dockerclient.ConfigCreateOptions{Spec: spec})- if err != nil {- return resourceMeta{}, fmt.Errorf("failed to create config %s: %w", managedName, err)+func managedResourceAnnotationsInternal(name string, labels map[string]string) swarm.Annotations {+ return swarm.Annotations{+ Name: name,+ Labels: labels,}- return resourceMeta{ID: resp.ID, Name: managedName}, nil}-func ensureSecret(ctx context.Context, dockerClient *dockerclient.Client, name string, cfg composegotypes.SecretConfig, stackLabels map[string]string, workingDir string) (resourceMeta, error) {- data, err := resolveFileObjectContent(composegotypes.FileObjectConfig(cfg), workingDir)+type managedFileResourceOptionsInternal struct {+ ResourceType string+ Inspect func(context.Context, string) (resourceMeta, error)+ Create func(context.Context, string, map[string]string, []byte) (resourceMeta, error)+}++func ensureManagedFileResourceInternal(+ ctx context.Context,+ name string,+ fileObject composegotypes.FileObjectConfig,+ labels map[string]string,+ stackLabels map[string]string,+ workingDir string,+ opts managedFileResourceOptionsInternal,+) (resourceMeta, error) {+ data, err := resolveFileObjectContent(fileObject, workingDir)if err != nil {- return resourceMeta{}, fmt.Errorf("failed to load secret %s: %w", name, err)+ return resourceMeta{}, fmt.Errorf("failed to load %s %s: %w", opts.ResourceType, name, err)}hash := hashManagedResource(data)managedName := managedResourceName(name, hash)- if meta, err := inspectSecret(ctx, dockerClient, managedName); err == nil {+ if meta, err := opts.Inspect(ctx, managedName); err == nil {return meta, nil} else if !cerrdefs.IsNotFound(err) {- return resourceMeta{}, fmt.Errorf("failed to inspect secret %s: %w", managedName, err)+ return resourceMeta{}, fmt.Errorf("failed to inspect %s %s: %w", opts.ResourceType, managedName, err)}- labels := mergeLabels(cfg.Labels, stackLabels)- labels[resourceTypeLabel] = "secret"- labels[resourceNameLabel] = name- labels[resourceHashLabel] = hash- spec := swarm.SecretSpec{- Annotations: swarm.Annotations{- Name: managedName,- Labels: labels,- },- Data: data,- }-- resp, err := dockerClient.SecretCreate(ctx, dockerclient.SecretCreateOptions{Spec: spec})- if err != nil {- return resourceMeta{}, fmt.Errorf("failed to create secret %s: %w", managedName, err)- }- return resourceMeta{ID: resp.ID, Name: managedName}, nil+ resourceLabels := mergeLabels(labels, stackLabels)+ resourceLabels[resourceTypeLabel] = opts.ResourceType+ resourceLabels[resourceNameLabel] = name+ resourceLabels[resourceHashLabel] = hash+ return opts.Create(ctx, managedName, resourceLabels, data)}func inspectConfig(ctx context.Context, dockerClient *dockerclient.Client, name string) (resourceMeta, error) {@@ -1340,49 +1366,99 @@ func resolveRegistryAuthForSpec(}func cleanupStaleConfigs(ctx context.Context, dockerClient *dockerclient.Client, stackName string, desiredNames map[string]struct{}) error {- filters := make(dockerclient.Filters)- filters.Add("label", fmt.Sprintf("%s=%s", swarmtypes.StackNamespaceLabel, stackName))- filters.Add("label", resourceTypeLabel+"=config")+ return cleanupStaleManagedResourcesInternal(ctx, stackName, desiredNames, staleManagedResourceOptionsInternal{+ ResourceType: "config",+ List: listStaleConfigResourcesInternal(dockerClient),+ Remove: removeConfigResourceInternal(dockerClient),+ })+}- configsResult, err := dockerClient.ConfigList(ctx, dockerclient.ConfigListOptions{Filters: filters})- if err != nil {- return fmt.Errorf("failed to list stack configs: %w", err)- }+func cleanupStaleSecrets(ctx context.Context, dockerClient *dockerclient.Client, stackName string, desiredNames map[string]struct{}) error {+ return cleanupStaleManagedResourcesInternal(ctx, stackName, desiredNames, staleManagedResourceOptionsInternal{+ ResourceType: "secret",+ List: listStaleSecretResourcesInternal(dockerClient),+ Remove: removeSecretResourceInternal(dockerClient),+ })+}- for _, cfg := range configsResult.Items {- if _, ok := desiredNames[cfg.Spec.Name]; ok {- continue+func listStaleConfigResourcesInternal(dockerClient *dockerclient.Client) func(context.Context, dockerclient.Filters) ([]staleManagedResourceInternal, error) {+ return func(ctx context.Context, filters dockerclient.Filters) ([]staleManagedResourceInternal, error) {+ configsResult, err := dockerClient.ConfigList(ctx, dockerclient.ConfigListOptions{Filters: filters})+ if err != nil {+ return nil, fmt.Errorf("failed to list stack configs: %w", err)}- if _, err := dockerClient.ConfigRemove(ctx, cfg.ID, dockerclient.ConfigRemoveOptions{}); err != nil && !cerrdefs.IsNotFound(err) {- if isStaleSwarmResourceStillInUse(err) {- continue- }- return fmt.Errorf("failed to remove stale stack config %s: %w", cfg.Spec.Name, err)++ return collectStaleManagedResourcesInternal(configsResult.Items, func(cfg swarm.Config) staleManagedResourceInternal {+ return staleManagedResourceInternal{ID: cfg.ID, Name: cfg.Spec.Name}+ }), nil+ }+}++func listStaleSecretResourcesInternal(dockerClient *dockerclient.Client) func(context.Context, dockerclient.Filters) ([]staleManagedResourceInternal, error) {+ return func(ctx context.Context, filters dockerclient.Filters) ([]staleManagedResourceInternal, error) {+ secretsResult, err := dockerClient.SecretList(ctx, dockerclient.SecretListOptions{Filters: filters})+ if err != nil {+ return nil, fmt.Errorf("failed to list stack secrets: %w", err)}++ return collectStaleManagedResourcesInternal(secretsResult.Items, func(secret swarm.Secret) staleManagedResourceInternal {+ return staleManagedResourceInternal{ID: secret.ID, Name: secret.Spec.Name}+ }), nil}+}- return nil+func collectStaleManagedResourcesInternal[T any](items []T, convert func(T) staleManagedResourceInternal) []staleManagedResourceInternal {+ resources := make([]staleManagedResourceInternal, 0, len(items))+ for _, item := range items {+ resources = append(resources, convert(item))+ }+ return resources}-func cleanupStaleSecrets(ctx context.Context, dockerClient *dockerclient.Client, stackName string, desiredNames map[string]struct{}) error {+func removeConfigResourceInternal(dockerClient *dockerclient.Client) func(context.Context, string) error {+ return func(ctx context.Context, id string) error {+ _, err := dockerClient.ConfigRemove(ctx, id, dockerclient.ConfigRemoveOptions{})+ return err+ }+}++func removeSecretResourceInternal(dockerClient *dockerclient.Client) func(context.Context, string) error {+ return func(ctx context.Context, id string) error {+ _, err := dockerClient.SecretRemove(ctx, id, dockerclient.SecretRemoveOptions{})+ return err+ }+}++type staleManagedResourceInternal struct {+ ID string+ Name string+}++type staleManagedResourceOptionsInternal struct {+ ResourceType string+ List func(context.Context, dockerclient.Filters) ([]staleManagedResourceInternal, error)+ Remove func(context.Context, string) error+}++func cleanupStaleManagedResourcesInternal(ctx context.Context, stackName string, desiredNames map[string]struct{}, opts staleManagedResourceOptionsInternal) error {filters := make(dockerclient.Filters)filters.Add("label", fmt.Sprintf("%s=%s", swarmtypes.StackNamespaceLabel, stackName))- filters.Add("label", resourceTypeLabel+"=secret")+ filters.Add("label", resourceTypeLabel+"="+opts.ResourceType)- secretsResult, err := dockerClient.SecretList(ctx, dockerclient.SecretListOptions{Filters: filters})+ resources, err := opts.List(ctx, filters)if err != nil {- return fmt.Errorf("failed to list stack secrets: %w", err)+ return err}- for _, secret := range secretsResult.Items {- if _, ok := desiredNames[secret.Spec.Name]; ok {+ for _, resource := range resources {+ if _, ok := desiredNames[resource.Name]; ok {continue}- if _, err := dockerClient.SecretRemove(ctx, secret.ID, dockerclient.SecretRemoveOptions{}); err != nil && !cerrdefs.IsNotFound(err) {+ if err := opts.Remove(ctx, resource.ID); err != nil && !cerrdefs.IsNotFound(err) {if isStaleSwarmResourceStillInUse(err) {continue}- return fmt.Errorf("failed to remove stale stack secret %s: %w", secret.Spec.Name, err)+ return fmt.Errorf("failed to remove stale stack %s %s: %w", opts.ResourceType, resource.Name, err)}}diff --git a/backend/pkg/pagination/db_utils.go b/backend/pkg/pagination/db_utils.goindex 253474fd7..a8e3e58bc 100644--- a/backend/pkg/pagination/db_utils.go+++ b/backend/pkg/pagination/db_utils.go@@ -1,8 +1,10 @@package paginationimport (+ "fmt""strings"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/mapper""gorm.io/gorm")@@ -23,6 +25,38 @@ func ApplyFilter(q *gorm.DB, column string, value string) *gorm.DB {return q.Where(column+" = ?", value)}+// ApplyLikeSearch adds a LIKE search condition using the same wildcard pattern+// for every placeholder in condition.+func ApplyLikeSearch(q *gorm.DB, search string, condition string) *gorm.DB {+ term := strings.TrimSpace(search)+ if term == "" {+ return q+ }++ pattern := "%" + term + "%"+ args := make([]any, strings.Count(condition, "?"))+ for i := range args {+ args[i] = pattern+ }++ return q.Where(condition, args...)+}++// PaginateSortAndMapDB paginates DB records and maps them to API DTOs.+func PaginateSortAndMapDB[M any, D any](params QueryParams, query *gorm.DB, records *[]M) ([]D, Response, error) {+ paginationResp, err := PaginateAndSortDB(params, query, records)+ if err != nil {+ return nil, Response{}, fmt.Errorf("paginate db records: %w", err)+ }++ out, err := mapper.MapSlice[M, D](*records)+ if err != nil {+ return nil, Response{}, fmt.Errorf("map db records: %w", err)+ }++ return out, paginationResp, nil+}+// ApplyBooleanFilter adds a WHERE clause for boolean columns.// It detects comma-separated values and maps "true"/"1" to true and "false"/"0" to false.func ApplyBooleanFilter(q *gorm.DB, column string, value string) *gorm.DB {diff --git a/backend/pkg/projects/fs_templates.go b/backend/pkg/projects/fs_templates.goindex 20addb369..50f9eac78 100644--- a/backend/pkg/projects/fs_templates.go+++ b/backend/pkg/projects/fs_templates.go@@ -31,8 +31,7 @@ func ReadFolderComposeTemplate(baseDir, folder string) (string, *string, string,for _, envName := range []string{".env.example", ".env"} {envPath := filepath.Join(folderPath, envName)if eb, rerr := os.ReadFile(envPath); rerr == nil {- s := string(eb)- envPtr = &s+ envPtr = new(string(eb))break}}diff --git a/backend/pkg/projects/image_refs.go b/backend/pkg/projects/image_refs.gonew file mode 100644index 000000000..ccf8ef159--- /dev/null+++ b/backend/pkg/projects/image_refs.go@@ -0,0 +1,65 @@+package projects++import (+ "sort"+ "strings"++ composetypes "github.com/compose-spec/compose-go/v2/types"+ projecttypes "github.com/getarcaneapp/arcane/types/project"+)++// ImageRefsFromComposeServices returns unique, non-empty image references from+// a compose service map in stable service-name order.+func ImageRefsFromComposeServices(services composetypes.Services) []string {+ serviceNames := make([]string, 0, len(services))+ for name := range services {+ serviceNames = append(serviceNames, name)+ }+ sort.Strings(serviceNames)++ serviceConfigs := make([]composetypes.ServiceConfig, 0, len(services))+ for _, name := range serviceNames {+ serviceConfigs = append(serviceConfigs, services[name])+ }++ return ImageRefsFromComposeConfigs(serviceConfigs)+}++// ImageRefsFromComposeConfigs returns unique, non-empty image references from+// compose service configs while preserving first-seen order.+func ImageRefsFromComposeConfigs(services []composetypes.ServiceConfig) []string {+ return uniqueImageRefsInternal(len(services), func(yield func(string)) {+ for _, svc := range services {+ yield(svc.Image)+ }+ })+}++// ImageRefsFromRuntimeServices returns unique, non-empty image references from+// runtime service DTOs while preserving first-seen order.+func ImageRefsFromRuntimeServices(services []projecttypes.RuntimeService) []string {+ return uniqueImageRefsInternal(len(services), func(yield func(string)) {+ for _, svc := range services {+ yield(svc.Image)+ }+ })+}++func uniqueImageRefsInternal(size int, collect func(yield func(string))) []string {+ refs := make([]string, 0, size)+ seen := make(map[string]struct{}, size)++ collect(func(image string) {+ ref := strings.TrimSpace(image)+ if ref == "" {+ return+ }+ if _, exists := seen[ref]; exists {+ return+ }+ seen[ref] = struct{}{}+ refs = append(refs, ref)+ })++ return refs+}diff --git a/backend/pkg/scheduler/auto_heal_job.go b/backend/pkg/scheduler/auto_heal_job.goindex 129e59197..98c146caf 100644--- a/backend/pkg/scheduler/auto_heal_job.go+++ b/backend/pkg/scheduler/auto_heal_job.go@@ -9,6 +9,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/services"+ dockerutil "github.com/getarcaneapp/arcane/backend/pkg/dockerutil""github.com/getarcaneapp/arcane/backend/pkg/libarcane""github.com/moby/moby/api/types/container""github.com/moby/moby/client"@@ -124,7 +125,7 @@ func (j *AutoHealJob) filterCandidatesInternal(containers []container.Summary, econtinue}- containerName := j.getContainerName(c.Names)+ containerName := dockerutil.ContainerNameFromNames(c.Names)if j.isExcluded(containerName, excludedContainers) {continue}@@ -144,7 +145,7 @@ func (j *AutoHealJob) processCandidateInternal(restartWindowMinutes int,) {containerID := candidate.ID- containerName := j.getContainerName(candidate.Names)+ containerName := dockerutil.ContainerNameFromNames(candidate.Names)inspect, err := j.inspectContainerInternal(ctx, dockerClient, containerID)if err != nil {@@ -264,14 +265,6 @@ func (j *AutoHealJob) parseExcludedContainers(ctx context.Context) map[string]streturn excluded}-func (j *AutoHealJob) getContainerName(names []string) string {- if len(names) == 0 {- return ""- }- // Docker container names are prefixed with "/"- return strings.TrimPrefix(names[0], "/")-}-func (j *AutoHealJob) isExcluded(name string, excluded map[string]struct{}) bool {_, ok := excluded[name]return okdiff --git a/backend/pkg/utils/httpx/request.go b/backend/pkg/utils/httpx/request.goindex 4d179f08b..eb01c4407 100644--- a/backend/pkg/utils/httpx/request.go+++ b/backend/pkg/utils/httpx/request.go@@ -8,6 +8,17 @@ import ("strings")+type HeaderSetter interface {+ SetHeader(key string, value string)+}++func SetJSONStreamHeaders(headers HeaderSetter) {+ headers.SetHeader("Content-Type", "application/x-json-stream")+ headers.SetHeader("Cache-Control", "no-cache")+ headers.SetHeader("Connection", "keep-alive")+ headers.SetHeader("X-Accel-Buffering", "no")+}+// ValidateWebSocketOrigin validates the Origin header for WebSocket connections// to prevent CSRF attacks. It checks:// 1. Same-origin requests (Origin matches Host)diff --git a/backend/pkg/utils/notifications/messages.go b/backend/pkg/utils/notifications/messages.goindex 2ff386dab..43cf50c7b 100644--- a/backend/pkg/utils/notifications/messages.go+++ b/backend/pkg/utils/notifications/messages.go@@ -185,12 +185,12 @@ func BuildPruneReportNotificationMessage(format MessageFormat, environmentName svar message strings.Builderfmt.Fprintf(&message, "%s\n\n", formatNotificationTitleInternal(format, "🧹 System Prune Report"))fmt.Fprintf(&message, "%s %s\n", formatNotificationLabelInternal(format, "Environment"), environmentName)- fmt.Fprintf(&message, "%s %s\n\n", formatNotificationLabelInternal(format, "Total Space Reclaimed"), formatBytesInternal(result.SpaceReclaimed))+ fmt.Fprintf(&message, "%s %s\n\n", formatNotificationLabelInternal(format, "Total Space Reclaimed"), FormatBytes(result.SpaceReclaimed))fmt.Fprintf(&message, "%s\n", formatNotificationLabelInternal(format, "Breakdown"))- fmt.Fprintf(&message, "- Containers: %s\n", formatBytesInternal(result.ContainerSpaceReclaimed))- fmt.Fprintf(&message, "- Images: %s\n", formatBytesInternal(result.ImageSpaceReclaimed))- fmt.Fprintf(&message, "- Volumes: %s\n", formatBytesInternal(result.VolumeSpaceReclaimed))- fmt.Fprintf(&message, "- Build Cache: %s\n", formatBytesInternal(result.BuildCacheSpaceReclaimed))+ fmt.Fprintf(&message, "- Containers: %s\n", FormatBytes(result.ContainerSpaceReclaimed))+ fmt.Fprintf(&message, "- Images: %s\n", FormatBytes(result.ImageSpaceReclaimed))+ fmt.Fprintf(&message, "- Volumes: %s\n", FormatBytes(result.VolumeSpaceReclaimed))+ fmt.Fprintf(&message, "- Build Cache: %s\n", FormatBytes(result.BuildCacheSpaceReclaimed))return message.String()}@@ -203,7 +203,7 @@ func BuildAutoHealNotificationMessage(format MessageFormat, environmentName, conreturn message.String()}-func formatBytesInternal(bytes uint64) string {+func FormatBytes(bytes uint64) string {const unit = 1024if bytes < unit {return fmt.Sprintf("%d B", bytes)diff --git a/cli/go.mod b/cli/go.modindex 0cbd34d4b..f3c451fe9 100644--- a/cli/go.mod+++ b/cli/go.mod@@ -5,12 +5,12 @@ go 1.26.4require (charm.land/bubbles/v2 v2.1.0charm.land/bubbletea/v2 v2.0.6+ charm.land/fang/v2 v2.0.1charm.land/lipgloss/v2 v2.0.3- github.com/charmbracelet/fang v1.0.0- github.com/charmbracelet/log v1.0.0+ charm.land/log/v2 v2.0.0github.com/charmbracelet/x/term v0.2.2github.com/fatih/color v1.19.0- github.com/getarcaneapp/arcane/types v1.19.4+ github.com/getarcaneapp/arcane/types v1.19.5github.com/go-viper/mapstructure/v2 v2.5.0github.com/mattn/go-runewidth v0.0.23github.com/spf13/cobra v1.10.2@@ -22,15 +22,12 @@ require (require (github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29 // indirectgithub.com/atotto/clipboard v0.1.4 // indirect- github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirectgithub.com/cespare/xxhash/v2 v2.3.0 // indirectgithub.com/charmbracelet/colorprofile v0.4.3 // indirectgithub.com/charmbracelet/harmonica v0.2.0 // indirect- github.com/charmbracelet/lipgloss v1.1.0 // indirect- github.com/charmbracelet/ultraviolet v0.0.0-20260511121909-c840852527f3 // indirect+ github.com/charmbracelet/ultraviolet v0.0.0-20260525132238-948f4557a654 // indirectgithub.com/charmbracelet/x/ansi v0.11.7 // indirect- github.com/charmbracelet/x/cellbuf v0.0.15 // indirect- github.com/charmbracelet/x/exp/charmtone v0.0.0-20260511125431-fe5d686e0c99 // indirect+ github.com/charmbracelet/x/exp/charmtone v0.0.0-20260527151214-009e6338d40d // indirectgithub.com/charmbracelet/x/termios v0.1.1 // indirectgithub.com/charmbracelet/x/windows v0.2.2 // indirectgithub.com/clipperhouse/displaywidth v0.11.0 // indirect@@ -59,7 +56,6 @@ require (github.com/muesli/mango-cobra v1.3.0 // indirectgithub.com/muesli/mango-pflag v0.2.0 // indirectgithub.com/muesli/roff v0.1.0 // indirect- github.com/muesli/termenv v0.16.0 // indirectgithub.com/opencontainers/go-digest v1.0.0 // indirectgithub.com/opencontainers/image-spec v1.1.1 // indirectgithub.com/pelletier/go-toml/v2 v2.3.1 // indirect@@ -73,13 +69,13 @@ require (github.com/xhit/go-str2duration/v2 v2.1.0 // indirectgithub.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirectgo.opentelemetry.io/auto/sdk v1.2.1 // indirect- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect- go.opentelemetry.io/otel v1.43.0 // indirect- go.opentelemetry.io/otel/metric v1.43.0 // indirect- go.opentelemetry.io/otel/trace v1.43.0 // indirect+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect+ go.opentelemetry.io/otel v1.44.0 // indirect+ go.opentelemetry.io/otel/metric v1.44.0 // indirect+ go.opentelemetry.io/otel/trace v1.44.0 // indirectgo.yaml.in/yaml/v3 v3.0.4 // indirectgo.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect- golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a // indirect+ golang.org/x/exp v0.0.0-20260528193900-50dc527dd6c7 // indirectgolang.org/x/sync v0.20.0 // indirectgolang.org/x/sys v0.45.0 // indirectgolang.org/x/text v0.37.0 // indirectdiff --git a/cli/go.sum b/cli/go.sumindex 28e1587a5..d89cf1f2d 100644--- a/cli/go.sum+++ b/cli/go.sum@@ -2,36 +2,30 @@ charm.land/bubbles/v2 v2.1.0 h1:YSnNh5cPYlYjPxRrzs5VEn3vwhtEn3jVGRBT3M7/I0g=charm.land/bubbles/v2 v2.1.0/go.mod h1:l97h4hym2hvWBVfmJDtrEHHCtkIKeTEb3TTJ4ZOB3wY=charm.land/bubbletea/v2 v2.0.6 h1:UHN/91OyuhaOFGSrBXQ/hMZD8IO1Uc4BvHlgHXL2WJo=charm.land/bubbletea/v2 v2.0.6/go.mod h1:MH/D8ZLlN3op37vQvijKuU29g3rqTp+aQapURFonF9g=+charm.land/fang/v2 v2.0.1 h1:zQCM8JQJ1JnQX/66B5jlCYBUxL2as5JXQZ2KJ6EL0mY=+charm.land/fang/v2 v2.0.1/go.mod h1:S1GmkpcvK+OB5w9caywUnJcsMew45Ot8FXqoz8ALrII=charm.land/lipgloss/v2 v2.0.3 h1:yM2zJ4Cf5Y51b7RHIwioil4ApI/aypFXXVHSwlM6RzU=charm.land/lipgloss/v2 v2.0.3/go.mod h1:7myLU9iG/3xluAWzpY/fSxYYHCgoKTie7laxk6ATwXA=+charm.land/log/v2 v2.0.0 h1:SY3Cey7ipx86/MBXQHwsguOT6X1exT94mmJRdzTNs+s=+charm.land/log/v2 v2.0.0/go.mod h1:c3cZSRqm20qUVVAR1WmS/7ab8bgha3C6G7DjPcaVZz0=github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29 h1:0kQAzHq8vLs7Pptv+7TxjdETLf/nIqJpIB4oC6Ba4vY=github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0=github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=-github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=-github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ12Gv5o=github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=-github.com/charmbracelet/fang v1.0.0 h1:jESBY40agJOlLYnnv9jE0mLqDGTxEk0hkOnx7YGyRlQ=-github.com/charmbracelet/fang v1.0.0/go.mod h1:P5/DNb9DddQ0Z0dbc0P3ol4/ix5Po7Ofr2KMBfAqoCo=github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=-github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=-github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=-github.com/charmbracelet/log v1.0.0 h1:HVVVMmfOorfj3BA9i8X8UL69Hoz9lI0PYwXfJvOdRc4=-github.com/charmbracelet/log v1.0.0/go.mod h1:uYgY3SmLpwJWxmlrPwXvzVYujxis1vAKRV/0VQB7yWA=-github.com/charmbracelet/ultraviolet v0.0.0-20260511121909-c840852527f3 h1:pxGjlWZFcRQMWAdtjRelpL3Gbu8iYIyuO3Eqbd037Ow=-github.com/charmbracelet/ultraviolet v0.0.0-20260511121909-c840852527f3/go.mod h1:SnKWaPaTnkTNXJgdgdquu66de12V8pW/b/qlTGaF9xg=+github.com/charmbracelet/ultraviolet v0.0.0-20260525132238-948f4557a654 h1:FpSYhY28ucg9ZRr+2wj67FAQ0Ey5yiK0072PmRDJNek=+github.com/charmbracelet/ultraviolet v0.0.0-20260525132238-948f4557a654/go.mod h1:hFpumms29Smx3LStRfku8vcCTBe1Kq8aCXtHUJa3mjY=github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=-github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=-github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=-github.com/charmbracelet/x/exp/charmtone v0.0.0-20260511125431-fe5d686e0c99 h1:79Whx3H/thq9X9I+iqsi7o/pVaI7EhaIWbzB173eHsw=-github.com/charmbracelet/x/exp/charmtone v0.0.0-20260511125431-fe5d686e0c99/go.mod h1:nsExn0DGyX0lh9LwLHTn2Gg+hafdzfSXnC+QmEJTZFY=+github.com/charmbracelet/x/exp/charmtone v0.0.0-20260527151214-009e6338d40d h1:sMilwx1YIYTrQva6jsB522AoRYAerNaDIKP4ZPtUq0A=+github.com/charmbracelet/x/exp/charmtone v0.0.0-20260527151214-009e6338d40d/go.mod h1:nsExn0DGyX0lh9LwLHTn2Gg+hafdzfSXnC+QmEJTZFY=github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=@@ -67,8 +61,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkgithub.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=-github.com/getarcaneapp/arcane/types v1.19.4 h1:THWCdJPoUjM+PJYo/02eb0Q56xSiHOE8Xt2zxdP6BfY=-github.com/getarcaneapp/arcane/types v1.19.4/go.mod h1:YY2TkFWZlMNu5dwp8dIDivLXl8dd9TE+P55Mk+6CaZ8=+github.com/getarcaneapp/arcane/types v1.19.5 h1:NmdBfeQhJ+OETxnk2crN82DfQJ3DTbruWLZSq/JkE1c=+github.com/getarcaneapp/arcane/types v1.19.5/go.mod h1:Ts4t4KmeMu5S1Qc5Mg9qjvYft9O3EYnlfEzSi+9GNKE=github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE=github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk=github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=@@ -116,8 +110,6 @@ github.com/muesli/mango-pflag v0.2.0 h1:QViokgKDZQCzKhYe1zH8D+UlPJzBSGoP9yx0hBG0github.com/muesli/mango-pflag v0.2.0/go.mod h1:X9LT1p/pbGA1wjvEbtwnixujKErkP0jVmrxwrw3fL0Y=github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8=github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig=-github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=-github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=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=@@ -158,26 +150,24 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMgithub.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 h1:CqXxU8VOmDefoh0+ztfGaymYbhdB/tT3zs79QaZTNGY=-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0/go.mod h1:BuhAPThV8PBHBvg8ZzZ/Ok3idOdhWIodywz2xEcRbJo=-go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=-go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=-go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=-go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=-go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo=+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0/go.mod h1:z9+yiacE0IHRqM4qFfkbt/JYlmYXgss8GY/jXoNuPJI=+go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=+go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=+go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=+go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=+go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=+go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=+go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=+go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=go.withmatt.com/size v0.0.0-20250220224316-11aee5773e67 h1:nHPqmzoLZv+9OqER7S2oXnIBDAbIaIKKrVtNtDvJzjc=go.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.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/exp v0.0.0-20260508232706-74f9aab9d74a h1:+3jdDGGB8NGb1Zktc737jlt3/A5f6UlwSzmvqUuufxw=-golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=+golang.org/x/exp v0.0.0-20260528193900-50dc527dd6c7 h1:cHpkPjp4TILjdZxz/O4ykwCpeS+dDqNuDGse4zgQDCk=+golang.org/x/exp v0.0.0-20260528193900-50dc527dd6c7/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=diff --git a/cli/internal/logger/logger.go b/cli/internal/logger/logger.goindex a7283b9d5..cce6f42be 100644--- a/cli/internal/logger/logger.go+++ b/cli/internal/logger/logger.go@@ -22,7 +22,7 @@ package loggerimport ("os"- charmlog "github.com/charmbracelet/log"+ charmlog "charm.land/log/v2")// Setup configures the global logger with the specified level and format.diff --git a/cli/pkg/admin/oidcmappings/cmd.go b/cli/pkg/admin/oidcmappings/cmd.goindex 14d789524..b3e699f06 100644--- a/cli/pkg/admin/oidcmappings/cmd.go+++ b/cli/pkg/admin/oidcmappings/cmd.go@@ -101,8 +101,7 @@ var createCmd = &cobra.Command{RoleID: createRoleID,}if cmd.Flags().Changed("environment") && createEnvironment != "" {- env := createEnvironment- req.EnvironmentID = &env+ req.EnvironmentID = new(createEnvironment)}resp, err := c.Post(cmd.Context(), types.Endpoints.OidcRoleMappings(), req)@@ -164,8 +163,7 @@ var updateCmd = &cobra.Command{// Empty value flips an env-scoped mapping back to global.req.EnvironmentID = nil} else {- env := updateEnvironment- req.EnvironmentID = &env+ req.EnvironmentID = new(updateEnvironment)}}diff --git a/cli/pkg/admin/roles/cmd.go b/cli/pkg/admin/roles/cmd.goindex cb2b6662e..ed89f4e92 100644--- a/cli/pkg/admin/roles/cmd.go+++ b/cli/pkg/admin/roles/cmd.go@@ -416,8 +416,7 @@ func parseAssignmentsInternal(tokens []string) []roletypes.UserAssignmentInput {roleID, envID, hasEnv := strings.Cut(token, ":")entry := roletypes.UserAssignmentInput{RoleID: roleID}if hasEnv && envID != "" {- env := envID- entry.EnvironmentID = &env+ entry.EnvironmentID = new(envID)}out = append(out, entry)}diff --git a/cli/pkg/containers/cmd.go b/cli/pkg/containers/cmd.goindex 312e30f8b..3681ca22a 100644--- a/cli/pkg/containers/cmd.go+++ b/cli/pkg/containers/cmd.go@@ -264,39 +264,11 @@ var containersStartCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resolved, _, err := resolveContainer(cmd.Context(), c, args[0], false)- if err != nil {- return err- }-- path := types.Endpoints.ContainerStart(c.EnvID(), resolved.ID)- resp, err := c.Post(cmd.Context(), path, nil)- if err != nil {- return fmt.Errorf("failed to start container: %w", err)- }- defer func() { _ = resp.Body.Close() }()-- var result base.ApiResponse[base.MessageResponse]- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }-- if jsonOutput {- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil- }-- output.Success("Container %s started successfully", containerDisplayName(resolved))- return nil+ return runContainerPostAction[base.MessageResponse](cmd, args[0], containerPostActionConfig[base.MessageResponse]{+ endpoint: types.Endpoints.ContainerStart,+ failureMessage: "failed to start container",+ successVerb: "started",+ })},}@@ -306,39 +278,11 @@ var containersStopCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resolved, _, err := resolveContainer(cmd.Context(), c, args[0], false)- if err != nil {- return err- }-- path := types.Endpoints.ContainerStop(c.EnvID(), resolved.ID)- resp, err := c.Post(cmd.Context(), path, nil)- if err != nil {- return fmt.Errorf("failed to stop container: %w", err)- }- defer func() { _ = resp.Body.Close() }()-- var result base.ApiResponse[base.MessageResponse]- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }-- if jsonOutput {- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil- }-- output.Success("Container %s stopped successfully", containerDisplayName(resolved))- return nil+ return runContainerPostAction[base.MessageResponse](cmd, args[0], containerPostActionConfig[base.MessageResponse]{+ endpoint: types.Endpoints.ContainerStop,+ failureMessage: "failed to stop container",+ successVerb: "stopped",+ })},}@@ -348,39 +292,11 @@ var containersRestartCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resolved, _, err := resolveContainer(cmd.Context(), c, args[0], false)- if err != nil {- return err- }-- path := types.Endpoints.ContainerRestart(c.EnvID(), resolved.ID)- resp, err := c.Post(cmd.Context(), path, nil)- if err != nil {- return fmt.Errorf("failed to restart container: %w", err)- }- defer func() { _ = resp.Body.Close() }()-- var result base.ApiResponse[base.MessageResponse]- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }-- if jsonOutput {- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil- }-- output.Success("Container %s restarted successfully", containerDisplayName(resolved))- return nil+ return runContainerPostAction[base.MessageResponse](cmd, args[0], containerPostActionConfig[base.MessageResponse]{+ endpoint: types.Endpoints.ContainerRestart,+ failureMessage: "failed to restart container",+ successVerb: "restarted",+ })},}@@ -390,42 +306,12 @@ var containersUpdateCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resolved, _, err := resolveContainer(cmd.Context(), c, args[0], false)- if err != nil {- return err- }-- // Updating a container can take a long time as it pulls the image- c.SetTimeout(30 * time.Minute)-- path := types.Endpoints.ContainerUpdate(c.EnvID(), resolved.ID)- resp, err := c.Post(cmd.Context(), path, nil)- if err != nil {- return fmt.Errorf("failed to update container: %w", err)- }- defer func() { _ = resp.Body.Close() }()-- var result base.ApiResponse[container.ActionResult]- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }-- if jsonOutput {- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil- }-- output.Success("Container %s updated successfully", containerDisplayName(resolved))- return nil+ return runContainerPostAction[container.ActionResult](cmd, args[0], containerPostActionConfig[container.ActionResult]{+ endpoint: types.Endpoints.ContainerUpdate,+ failureMessage: "failed to update container",+ successVerb: "updated",+ timeout: 30 * time.Minute,+ })},}@@ -435,42 +321,60 @@ var containersRedeployCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }+ return runContainerPostAction[container.Details](cmd, args[0], containerPostActionConfig[container.Details]{+ endpoint: types.Endpoints.ContainerRedeploy,+ failureMessage: "failed to redeploy container",+ successVerb: "redeployed",+ timeout: 30 * time.Minute,+ })+ },+}- resolved, _, err := resolveContainer(cmd.Context(), c, args[0], false)- if err != nil {- return err- }+type containerPostActionConfig[T any] struct {+ endpoint func(string, string) string+ failureMessage string+ successVerb string+ timeout time.Duration+}- c.SetTimeout(30 * time.Minute)+func runContainerPostAction[T any](cmd *cobra.Command, containerRef string, cfg containerPostActionConfig[T]) error {+ c, err := client.NewFromConfig()+ if err != nil {+ return err+ }- path := types.Endpoints.ContainerRedeploy(c.EnvID(), resolved.ID)- resp, err := c.Post(cmd.Context(), path, nil)- if err != nil {- return fmt.Errorf("failed to redeploy container: %w", err)- }- defer func() { _ = resp.Body.Close() }()+ resolved, _, err := resolveContainer(cmd.Context(), c, containerRef, false)+ if err != nil {+ return err+ }- var result base.ApiResponse[container.Details]- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }+ if cfg.timeout > 0 {+ c.SetTimeout(cfg.timeout)+ }- if jsonOutput {- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil- }+ path := cfg.endpoint(c.EnvID(), resolved.ID)+ resp, err := c.Post(cmd.Context(), path, nil)+ if err != nil {+ return fmt.Errorf("%s: %w", cfg.failureMessage, err)+ }+ defer func() { _ = resp.Body.Close() }()- output.Success("Container %s redeployed successfully", containerDisplayName(resolved))+ var result base.ApiResponse[T]+ if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {+ return fmt.Errorf("failed to parse response: %w", err)+ }++ if jsonOutput {+ resultBytes, err := json.MarshalIndent(result.Data, "", " ")+ if err != nil {+ return fmt.Errorf("failed to marshal JSON: %w", err)+ }+ fmt.Println(string(resultBytes))return nil- },+ }++ output.Success("Container %s %s successfully", containerDisplayName(resolved), cfg.successVerb)+ return nil}var containersDeleteCmd = &cobra.Command{diff --git a/cli/pkg/projects/cmd.go b/cli/pkg/projects/cmd.goindex 039a59073..51fcd94c0 100644--- a/cli/pkg/projects/cmd.go+++ b/cli/pkg/projects/cmd.go@@ -278,27 +278,11 @@ var upCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resolved, _, err := resolveProject(cmd.Context(), c, args[0], false)- if err != nil {- return err- }-- resp, err := c.Post(cmd.Context(), types.Endpoints.ProjectUp(c.EnvID(), resolved.ID), nil)- if err != nil {- return fmt.Errorf("failed to start project: %w", err)- }- defer func() { _ = resp.Body.Close() }()- if err := cmdutil.EnsureSuccessStatus(resp); err != nil {- return fmt.Errorf("failed to start project: %w", err)- }-- output.Success("Project %s started successfully", resolved.Name)- return nil+ return runProjectPostAction(cmd, args[0], projectPostActionConfig{+ endpoint: types.Endpoints.ProjectUp,+ failureMessage: "failed to start project",+ successMessage: "Project %s started successfully",+ })},}@@ -308,27 +292,11 @@ var downCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resolved, _, err := resolveProject(cmd.Context(), c, args[0], false)- if err != nil {- return err- }-- resp, err := c.Post(cmd.Context(), types.Endpoints.ProjectDown(c.EnvID(), resolved.ID), nil)- if err != nil {- return fmt.Errorf("failed to stop project: %w", err)- }- defer func() { _ = resp.Body.Close() }()- if err := cmdutil.EnsureSuccessStatus(resp); err != nil {- return fmt.Errorf("failed to stop project: %w", err)- }-- output.Success("Project %s stopped successfully", resolved.Name)- return nil+ return runProjectPostAction(cmd, args[0], projectPostActionConfig{+ endpoint: types.Endpoints.ProjectDown,+ failureMessage: "failed to stop project",+ successMessage: "Project %s stopped successfully",+ })},}@@ -338,27 +306,11 @@ var restartCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resolved, _, err := resolveProject(cmd.Context(), c, args[0], false)- if err != nil {- return err- }-- resp, err := c.Post(cmd.Context(), types.Endpoints.ProjectRestart(c.EnvID(), resolved.ID), nil)- if err != nil {- return fmt.Errorf("failed to restart project: %w", err)- }- defer func() { _ = resp.Body.Close() }()- if err := cmdutil.EnsureSuccessStatus(resp); err != nil {- return fmt.Errorf("failed to restart project: %w", err)- }-- output.Success("Project %s restarted successfully", resolved.Name)- return nil+ return runProjectPostAction(cmd, args[0], projectPostActionConfig{+ endpoint: types.Endpoints.ProjectRestart,+ failureMessage: "failed to restart project",+ successMessage: "Project %s restarted successfully",+ })},}@@ -368,30 +320,12 @@ var redeployCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resolved, _, err := resolveProject(cmd.Context(), c, args[0], false)- if err != nil {- return err- }-- // Redeploying can take a long time as it pulls images and restarts containers- c.SetTimeout(30 * time.Minute)-- resp, err := c.Post(cmd.Context(), types.Endpoints.ProjectRedeploy(c.EnvID(), resolved.ID), nil)- if err != nil {- return fmt.Errorf("failed to redeploy project: %w", err)- }- defer func() { _ = resp.Body.Close() }()- if err := cmdutil.EnsureSuccessStatus(resp); err != nil {- return fmt.Errorf("failed to redeploy project: %w", err)- }-- output.Success("Project %s redeployed successfully", resolved.Name)- return nil+ return runProjectPostAction(cmd, args[0], projectPostActionConfig{+ endpoint: types.Endpoints.ProjectRedeploy,+ failureMessage: "failed to redeploy project",+ successMessage: "Project %s redeployed successfully",+ timeout: 30 * time.Minute,+ })},}@@ -401,31 +335,48 @@ var pullCmd = &cobra.Command{Args: cobra.ExactArgs(1),SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }+ return runProjectPostAction(cmd, args[0], projectPostActionConfig{+ endpoint: types.Endpoints.ProjectPull,+ failureMessage: "failed to pull images",+ successMessage: "Images pulled successfully for project %s",+ timeout: 30 * time.Minute,+ })+ },+}- resolved, _, err := resolveProject(cmd.Context(), c, args[0], false)- if err != nil {- return err- }+type projectPostActionConfig struct {+ endpoint func(string, string) string+ failureMessage string+ successMessage string+ timeout time.Duration+}- // Pulling images can take a long time- c.SetTimeout(30 * time.Minute)+func runProjectPostAction(cmd *cobra.Command, projectRef string, cfg projectPostActionConfig) error {+ c, err := client.NewFromConfig()+ if err != nil {+ return err+ }- resp, err := c.Post(cmd.Context(), types.Endpoints.ProjectPull(c.EnvID(), resolved.ID), nil)- if err != nil {- return fmt.Errorf("failed to pull images: %w", err)- }- defer func() { _ = resp.Body.Close() }()- if err := cmdutil.EnsureSuccessStatus(resp); err != nil {- return fmt.Errorf("failed to pull images: %w", err)- }+ resolved, _, err := resolveProject(cmd.Context(), c, projectRef, false)+ if err != nil {+ return err+ }- output.Success("Images pulled successfully for project %s", resolved.Name)- return nil- },+ if cfg.timeout > 0 {+ c.SetTimeout(cfg.timeout)+ }++ resp, err := c.Post(cmd.Context(), cfg.endpoint(c.EnvID(), resolved.ID), nil)+ if err != nil {+ return fmt.Errorf("%s: %w", cfg.failureMessage, err)+ }+ defer func() { _ = resp.Body.Close() }()+ if err := cmdutil.EnsureSuccessStatus(resp); err != nil {+ return fmt.Errorf("%s: %w", cfg.failureMessage, err)+ }++ output.Success(cfg.successMessage, resolved.Name)+ return nil}var createCmd = &cobra.Command{diff --git a/cli/pkg/root.go b/cli/pkg/root.goindex 699233cf4..2e1f1a493 100644--- a/cli/pkg/root.go+++ b/cli/pkg/root.go@@ -39,8 +39,8 @@ import ("strings""time"+ "charm.land/fang/v2""charm.land/lipgloss/v2"- "github.com/charmbracelet/fang""github.com/fatih/color""github.com/getarcaneapp/arcane/cli/internal/config""github.com/getarcaneapp/arcane/cli/internal/logger"diff --git a/cli/pkg/settings/cmd.go b/cli/pkg/settings/cmd.goindex bb4c0a6e1..88f593789 100644--- a/cli/pkg/settings/cmd.go+++ b/cli/pkg/settings/cmd.go@@ -28,44 +28,11 @@ var listCmd = &cobra.Command{Short: "List environment settings",SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resp, err := c.Get(cmd.Context(), types.Endpoints.Settings(c.EnvID()))- if err != nil {- return fmt.Errorf("failed to get settings: %w", err)- }- defer func() { _ = resp.Body.Close() }()-- var result []settings.PublicSetting- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }-- if jsonOutput {- resultBytes, err := json.MarshalIndent(result, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil- }-- headers := []string{"KEY", "TYPE", "VALUE"}- rows := make([][]string, len(result))- for i, s := range result {- rows[i] = []string{- s.Key,- s.Type,- s.Value,- }- }-- output.Table(headers, rows)- fmt.Printf("\nTotal: %d settings\n", len(result))- return nil+ return runSettingsList(cmd, settingsListConfig{+ endpoint: types.Endpoints.Settings,+ failureMessage: "failed to get settings",+ totalLabel: "settings",+ })},}@@ -120,41 +87,55 @@ var publicCmd = &cobra.Command{Short: "List public settings",SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resp, err := c.Get(cmd.Context(), types.Endpoints.SettingsPublic(c.EnvID()))- if err != nil {- return fmt.Errorf("failed to get public settings: %w", err)- }- defer func() { _ = resp.Body.Close() }()+ return runSettingsList(cmd, settingsListConfig{+ endpoint: types.Endpoints.SettingsPublic,+ failureMessage: "failed to get public settings",+ totalLabel: "public settings",+ })+ },+}- var result []settings.PublicSetting- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }+type settingsListConfig struct {+ endpoint func(string) string+ failureMessage string+ totalLabel string+}- if jsonOutput {- resultBytes, err := json.MarshalIndent(result, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil+func runSettingsList(cmd *cobra.Command, cfg settingsListConfig) error {+ c, err := client.NewFromConfig()+ if err != nil {+ return err+ }++ resp, err := c.Get(cmd.Context(), cfg.endpoint(c.EnvID()))+ if err != nil {+ return fmt.Errorf("%s: %w", cfg.failureMessage, err)+ }+ defer func() { _ = resp.Body.Close() }()++ var result []settings.PublicSetting+ if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {+ return fmt.Errorf("failed to parse response: %w", err)+ }++ if jsonOutput {+ resultBytes, err := json.MarshalIndent(result, "", " ")+ if err != nil {+ return fmt.Errorf("failed to marshal JSON: %w", err)}+ fmt.Println(string(resultBytes))+ return nil+ }- headers := []string{"KEY", "TYPE", "VALUE"}- rows := make([][]string, len(result))- for i, s := range result {- rows[i] = []string{s.Key, s.Type, s.Value}- }+ headers := []string{"KEY", "TYPE", "VALUE"}+ rows := make([][]string, len(result))+ for i, s := range result {+ rows[i] = []string{s.Key, s.Type, s.Value}+ }- output.Table(headers, rows)- fmt.Printf("\nTotal: %d public settings\n", len(result))- return nil- },+ output.Table(headers, rows)+ fmt.Printf("\nTotal: %d %s\n", len(result), cfg.totalLabel)+ return nil}func init() {diff --git a/cli/pkg/volumes/cmd.go b/cli/pkg/volumes/cmd.goindex 15caa46c0..b0837968e 100644--- a/cli/pkg/volumes/cmd.go+++ b/cli/pkg/volumes/cmd.go@@ -196,38 +196,12 @@ var countsCmd = &cobra.Command{Short: "Get volume usage counts",SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }-- resp, err := c.Get(cmd.Context(), types.Endpoints.VolumesCounts(c.EnvID()))- if err != nil {- return fmt.Errorf("failed to get volume counts: %w", err)- }- defer func() { _ = resp.Body.Close() }()-- var result base.ApiResponse[any]- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }-- if jsonOutput {- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil- }-- output.Header("Volume Usage Counts")- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal volume counts: %w", err)- }- fmt.Println(string(resultBytes))- return nil+ return runVolumeDataCommand(cmd, volumeDataCommandConfig{+ endpoint: types.Endpoints.VolumesCounts,+ failureMessage: "failed to get volume counts",+ header: "Volume Usage Counts",+ marshalMessage: "failed to marshal volume counts",+ })},}@@ -285,39 +259,55 @@ var sizesCmd = &cobra.Command{Short: "Get volume sizes",SilenceUsage: true,RunE: func(cmd *cobra.Command, args []string) error {- c, err := client.NewFromConfig()- if err != nil {- return err- }+ return runVolumeDataCommand(cmd, volumeDataCommandConfig{+ endpoint: types.Endpoints.VolumesSizes,+ failureMessage: "failed to get volume sizes",+ header: "Volume Sizes",+ marshalMessage: "failed to marshal volume sizes",+ })+ },+}- resp, err := c.Get(cmd.Context(), types.Endpoints.VolumesSizes(c.EnvID()))- if err != nil {- return fmt.Errorf("failed to get volume sizes: %w", err)- }- defer func() { _ = resp.Body.Close() }()+type volumeDataCommandConfig struct {+ endpoint func(string) string+ failureMessage string+ header string+ marshalMessage string+}- var result base.ApiResponse[any]- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)- }+func runVolumeDataCommand(cmd *cobra.Command, cfg volumeDataCommandConfig) error {+ c, err := client.NewFromConfig()+ if err != nil {+ return err+ }+ resp, err := c.Get(cmd.Context(), cfg.endpoint(c.EnvID()))+ if err != nil {+ return fmt.Errorf("%s: %w", cfg.failureMessage, err)+ }+ defer func() { _ = resp.Body.Close() }()++ var result base.ApiResponse[any]+ if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {+ return fmt.Errorf("failed to parse response: %w", err)+ }++ resultBytes, err := json.MarshalIndent(result.Data, "", " ")+ if err != nil {if jsonOutput {- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal JSON: %w", err)- }- fmt.Println(string(resultBytes))- return nil+ return fmt.Errorf("failed to marshal JSON: %w", err)}+ return fmt.Errorf("%s: %w", cfg.marshalMessage, err)+ }- output.Header("Volume Sizes")- resultBytes, err := json.MarshalIndent(result.Data, "", " ")- if err != nil {- return fmt.Errorf("failed to marshal volume sizes: %w", err)- }+ if jsonOutput {fmt.Println(string(resultBytes))return nil- },+ }++ output.Header("%s", cfg.header)+ fmt.Println(string(resultBytes))+ return nil}var usageCmd = &cobra.Command{diff --git a/go.work.sum b/go.work.sumindex 44af362de..675d348db 100644--- a/go.work.sum+++ b/go.work.sum@@ -1151,9 +1151,13 @@ go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJgo.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=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/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA=+go.opentelemetry.io/otel/metric/x v0.66.0/go.mod h1:d1+BDj9t96do0/1LoU1ayfCv79ZgNE41qbhBvnMOBZk=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 v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=+go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=diff --git a/types/go.mod b/types/go.modindex 08c4264f5..b236d69bf 100644--- a/types/go.mod+++ b/types/go.mod@@ -29,10 +29,10 @@ require (github.com/sirupsen/logrus v1.9.4 // indirectgithub.com/xhit/go-str2duration/v2 v2.1.0 // indirectgo.opentelemetry.io/auto/sdk v1.2.1 // indirect- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect- go.opentelemetry.io/otel v1.43.0 // indirect- go.opentelemetry.io/otel/metric v1.43.0 // indirect- go.opentelemetry.io/otel/trace v1.43.0 // indirect+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect+ go.opentelemetry.io/otel v1.44.0 // indirect+ go.opentelemetry.io/otel/metric v1.44.0 // indirect+ go.opentelemetry.io/otel/trace v1.44.0 // indirectgo.yaml.in/yaml/v4 v4.0.0-rc.4 // indirectgolang.org/x/sync v0.20.0 // indirectgolang.org/x/sys v0.45.0 // indirectdiff --git a/types/go.sum b/types/go.sumindex 1c1ef89a1..ca6da9b27 100644--- a/types/go.sum+++ b/types/go.sum@@ -51,18 +51,12 @@ github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 h1:CqXxU8VOmDefoh0+ztfGaymYbhdB/tT3zs79QaZTNGY=-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0/go.mod h1:BuhAPThV8PBHBvg8ZzZ/Ok3idOdhWIodywz2xEcRbJo=-go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=-go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=-go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=-go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=-go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo=+go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=+go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=+go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=+go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=+go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=