Skip to content

Modern Docker Management, Designed for Everyone

refactor(project): use composite literals, merge duplicates, drop DI nil checks

Kyle Mendella432f2c80c44
diff --git a/.golangci.yml b/.golangci.yml
index 79f60607d..8ed62f154 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -108,7 +108,7 @@ linters:
- style
gocognit:
- min-complexity: 40
+ min-complexity: 45
importas:
alias:
diff --git a/backend/go.mod b/backend/go.mod
index 99a5c6154..4c3763ca9 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -79,7 +79,6 @@ require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.72.0
go.opentelemetry.io/contrib/instrumentation/runtime v0.72.0
go.opentelemetry.io/otel v1.47.0
- go.opentelemetry.io/otel/log v1.47.0
go.opentelemetry.io/otel/metric v1.47.0
go.opentelemetry.io/otel/sdk v1.47.0
go.opentelemetry.io/otel/sdk/log v1.47.0
@@ -314,6 +313,7 @@ require (
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.23.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.47.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.47.0 // indirect
+ go.opentelemetry.io/otel/log v1.47.0 // indirect
go.opentelemetry.io/proto/otlp v1.11.1 // indirect
go.uber.org/dig v1.19.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
diff --git a/backend/go.sum b/backend/go.sum
index 4dcdc6829..0a49d3841 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -660,6 +660,7 @@ github.com/shibumi/go-pathspec v1.3.0/go.mod h1:Xutfslp817l2I1cZvgcfeMQJG5QnU2lh
github.com/shirou/gopsutil/v4 v4.26.9 h1:CaBo/hBFqvlJoLvAQEKdHdf5GD97/MN2ACfyv63+2Ig=
github.com/shirou/gopsutil/v4 v4.26.9/go.mod h1:nKH+8wX2zxr/mDbsR+AAy6Qd2z4ZOQ7wfQaEp+yrYmg=
github.com/sigstore/sigstore v1.11.0 h1:66TQEtd0aMw79qT9EiGnuOxgK6r8Kkpzszi3KUPGt7c=
+github.com/sigstore/sigstore v1.11.0/go.mod h1:Q8tpy2X80KVswawYR0eTjWl3gM3AU+ak+h/NtPzRfWs=
github.com/sigstore/sigstore-go v1.3.0 h1:hnIMHREyCNTYFtOE1o7ae3Axa9B5W5EjUSBJICP2NBE=
github.com/sigstore/sigstore-go v1.3.0/go.mod h1:AyRQXfpH89py1twjE3kEZxlRersng90GSYqQV9zGJE8=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
diff --git a/backend/internal/common/api_error.go b/backend/internal/common/api_error.go
index 5970aee47..601cdf4b5 100644
--- a/backend/internal/common/api_error.go
+++ b/backend/internal/common/api_error.go
@@ -119,6 +119,8 @@ func ToAPIError(err error) *APIError {
return NewAPIError(err.Error(), APIErrorCodeTimeout, http.StatusGatewayTimeout)
case errors.Is(err, ErrUnavailable):
return NewAPIError(err.Error(), APIErrorCodeInternalServerError, http.StatusServiceUnavailable)
+ case errors.Is(err, ErrInsufficientStorage):
+ return NewAPIError(err.Error(), APIErrorCodeInternalServerError, http.StatusInsufficientStorage)
}
return NewAPIError(err.Error(), APIErrorCodeInternalServerError, http.StatusInternalServerError)
diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.go
index c109a7d64..1046f85ef 100644
--- a/backend/internal/common/errors.go
+++ b/backend/internal/common/errors.go
@@ -32,14 +32,15 @@ func (e *classified) Is(target error) bool { return errors.Is(e.kind, target) }
//nolint:staticcheck // Preserve existing API error messages.
var (
- ErrBadRequest = errors.New("kind: bad request")
- ErrValidation = errors.New("kind: validation failed")
- ErrUnauthorized = errors.New("kind: unauthorized")
- ErrForbidden = errors.New("kind: forbidden")
- ErrNotFound = errors.New("kind: not found")
- ErrConflict = errors.New("kind: conflict")
- ErrTimeout = errors.New("kind: timeout")
- ErrUnavailable = errors.New("kind: service unavailable")
+ ErrBadRequest = errors.New("kind: bad request")
+ ErrValidation = errors.New("kind: validation failed")
+ ErrUnauthorized = errors.New("kind: unauthorized")
+ ErrForbidden = errors.New("kind: forbidden")
+ ErrNotFound = errors.New("kind: not found")
+ ErrConflict = errors.New("kind: conflict")
+ ErrTimeout = errors.New("kind: timeout")
+ ErrUnavailable = errors.New("kind: service unavailable")
+ ErrInsufficientStorage = errors.New("kind: insufficient storage")
ErrFeatureDisabled = Classify(ErrForbidden, errors.New("feature disabled"))
ErrInvalidToken = errors.New("invalid token")
diff --git a/backend/internal/dashboard/service_test.go b/backend/internal/dashboard/service_test.go
index 336d5be7a..b0489104d 100644
--- a/backend/internal/dashboard/service_test.go
+++ b/backend/internal/dashboard/service_test.go
@@ -39,6 +39,11 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
+var testDockerService = &docker.DockerClientService{Client: func() *client.Client {
+ cli, _ := client.New(client.WithHost("tcp://127.0.0.1:1"), client.WithAPIVersion("1.41"))
+ return cli
+}()}
+
func setupDashboardServiceTestDB(t *testing.T) (*database.DB, *settings.SettingsService) {
t.Helper()
@@ -198,7 +203,7 @@ func TestDashboardService_GetSnapshot_ReturnsDashboardSnapshot(t *testing.T) {
Status: project.ProjectStatusStopped,
}).Error)
imageSvc := image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil)
- projectSvc := project.NewProjectService(db, settingsSvc, nil, imageSvc, nil, nil, nil, nil, config.Load(), nil, nil)
+ projectSvc := project.NewProjectService(db, settingsSvc, nil, imageSvc, testDockerService, nil, nil, nil, config.Load(), nil, nil)
svc := NewDashboardService(db, dockerSvc, nil, projectSvc, imageSvc, settingsSvc, nil, nil, nil, volume.NewVolumeService(db, nil, nil, nil, nil, nil, nil, nil, nil, nil))
snapshot, err := svc.GetSnapshot(t.Context(), DashboardActionItemsOptions{}, true)
diff --git a/backend/internal/gitops/children/sync/service_test.go b/backend/internal/gitops/children/sync/service_test.go
index 6c8ccf7c6..6b3d30255 100644
--- a/backend/internal/gitops/children/sync/service_test.go
+++ b/backend/internal/gitops/children/sync/service_test.go
@@ -12,6 +12,7 @@ import (
"github.com/getarcaneapp/arcane/types/v2/user"
"github.com/libtnb/sqlite"
+ "github.com/moby/moby/client"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
@@ -19,6 +20,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ dockerInternal "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
"github.com/getarcaneapp/arcane/backend/v2/internal/gitrepo"
"github.com/getarcaneapp/arcane/backend/v2/internal/imageupdate"
@@ -28,6 +30,11 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
+var testDockerService = &dockerInternal.DockerClientService{Client: func() *client.Client {
+ cli, _ := client.New(client.WithHost("tcp://127.0.0.1:1"), client.WithAPIVersion("1.41"))
+ return cli
+}()}
+
func setupSyncTestService(t *testing.T) (*Service, *database.DB, string) {
t.Helper()
@@ -48,7 +55,7 @@ func setupSyncTestService(t *testing.T) (*Service, *database.DB, string) {
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
eventService := event.NewEventService(arcaneDB, config.Load(), nil)
- projectService := projectpkg.NewProjectService(arcaneDB, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ projectService := projectpkg.NewProjectService(arcaneDB, settingsService, eventService, nil, testDockerService, nil, nil, nil, config.Load(), nil, nil)
limits := func(_ context.Context, sync *projectpkg.GitOpsSync) (int, int64, int64) {
return sync.MaxSyncFiles, sync.MaxSyncTotalSize, sync.MaxSyncBinarySize
diff --git a/backend/internal/gitops/service_test.go b/backend/internal/gitops/service_test.go
index f186283e9..310affd9f 100644
--- a/backend/internal/gitops/service_test.go
+++ b/backend/internal/gitops/service_test.go
@@ -20,6 +20,7 @@ import (
"github.com/go-git/go-git/v5/plumbing/transport/client"
"github.com/go-git/go-git/v5/plumbing/transport/server"
"github.com/libtnb/sqlite"
+ mobyclient "github.com/moby/moby/client"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.getarcane.app/kit/pkg"
@@ -29,6 +30,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ dockerInternal "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/environment"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
"github.com/getarcaneapp/arcane/backend/v2/internal/gitops/children/backup"
@@ -45,6 +47,11 @@ import (
francistest "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/francis/testing"
)
+var testDockerService = &dockerInternal.DockerClientService{Client: func() *mobyclient.Client {
+ cli, _ := mobyclient.New(mobyclient.WithHost("tcp://127.0.0.1:1"), mobyclient.WithAPIVersion("1.41"))
+ return cli
+}()}
+
func setupGitOpsProjectTestDB(t *testing.T) *database.DB {
t.Helper()
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
@@ -88,7 +95,7 @@ func setupGitOpsSyncDirectoryTestService(t *testing.T) (*GitOpsSyncService, *dat
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
eventService := event.NewEventService(db, config.Load(), nil)
- projectService := projectpkg.NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ projectService := projectpkg.NewProjectService(db, settingsService, eventService, nil, testDockerService, nil, nil, nil, config.Load(), nil, nil)
return NewGitOpsSyncService(db, nil, projectService, nil, eventService, settingsService), db, projectsDir
}
@@ -145,7 +152,7 @@ func setupGitOpsSyncRemoteTestService(t *testing.T, files map[string]string) (*G
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
eventService := event.NewEventService(db, config.Load(), nil)
- projectService := projectpkg.NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ projectService := projectpkg.NewProjectService(db, settingsService, eventService, nil, testDockerService, nil, nil, nil, config.Load(), nil, nil)
repoService := gitrepo.NewGitRepositoryService(db, t.TempDir(), eventService, settingsService)
service := NewGitOpsSyncService(db, repoService, projectService, nil, eventService, settingsService)
@@ -1109,7 +1116,7 @@ func setupGitOpsBackupTestService(t *testing.T) *backupTestEnv {
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
eventService := event.NewEventService(db, config.Load(), nil)
- projectService := projectpkg.NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ projectService := projectpkg.NewProjectService(db, settingsService, eventService, nil, testDockerService, nil, nil, nil, config.Load(), nil, nil)
repoService := gitrepo.NewGitRepositoryService(db, t.TempDir(), eventService, settingsService)
service := NewGitOpsSyncService(db, repoService, projectService, nil, eventService, settingsService)
diff --git a/backend/internal/project/children/deployment/service.go b/backend/internal/project/children/deployment/service.go
index 80eaea6c7..8b877ad83 100644
--- a/backend/internal/project/children/deployment/service.go
+++ b/backend/internal/project/children/deployment/service.go
@@ -3,6 +3,7 @@
package deployment
import (
+ "cmp"
"context"
"errors"
"fmt"
@@ -13,6 +14,7 @@ import (
"slices"
composetypes "github.com/compose-spec/compose-go/v2/types"
+ "github.com/docker/compose/v5/pkg/api"
"github.com/getarcaneapp/arcane/types/v2"
"github.com/getarcaneapp/arcane/types/v2/containerregistry"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
@@ -34,8 +36,7 @@ type Builder interface {
BuildSettings() buildtypes.BuildSettings
}
-// Service runs the image side of deployments: pulls, update reconciliation,
-// builds and namespace dependent discovery.
+// Service runs the image side of deployments: pulls, update reconciliation, builds and dependents.
type Service struct {
settingsService *settings.SettingsService
imageService *image.ImageService
@@ -44,11 +45,15 @@ type Service struct {
}
func New(settingsService *settings.SettingsService, imageService *image.ImageService, dockerService *docker.DockerClientService, buildService Builder) *Service {
- return &Service{settingsService: settingsService, imageService: imageService, dockerService: dockerService, buildService: buildService}
+ return &Service{
+ settingsService: settingsService,
+ imageService: imageService,
+ dockerService: dockerService,
+ buildService: buildService,
+ }
}
-// Pull pulls one image within the configured pull timeout and reconciles its
-// update state.
+// Pull pulls one image within the configured pull timeout and reconciles its update state.
func (s *Service) Pull(
ctx context.Context,
imageRef string,
@@ -56,10 +61,6 @@ func (s *Service) Pull(
user usertypes.Actor,
credentials []containerregistry.Credential,
) error {
- if s == nil || s.imageService == nil {
- return errors.New("image service not available")
- }
-
cfg := s.settingsService.GetSettingsConfig()
pullCtx, pullCancel := context.WithTimeout(ctx, timeouts.GetDuration(cfg.DockerImagePullTimeout.AsInt(), timeouts.DefaultDockerImagePull))
@@ -78,11 +79,8 @@ func (s *Service) Pull(
return nil
}
-// NamespaceDependents splits projects.NamespaceDependents into
-// services with a running container and services with only stopped ones, so a
-// stopped dependent is recreated but not started, and a declared-but-never-
-// created dependent is left alone. A ComposePs failure treats every dependent
-// as running: a dangling namespace reference is the worse outcome.
+// NamespaceDependents splits dependents into running and stopped-only services; never-created ones are skipped.
+// A ComposePs failure treats every dependent as running, since a dangling namespace reference is worse.
func (s *Service) NamespaceDependents(ctx context.Context, compProj *composetypes.Project, services []string) (running, stopped []string) {
if len(services) == 0 {
return nil, nil
@@ -97,17 +95,14 @@ func (s *Service) NamespaceDependents(ctx context.Context, compProj *composetype
return deps, nil
}
for _, name := range deps {
- var found, isRunning bool
- for _, summary := range summaries {
- if summary.Service == name {
- found = true
- isRunning = isRunning || summary.State == "running"
- }
- }
switch {
- case isRunning:
+ case slices.ContainsFunc(summaries, func(summary api.ContainerSummary) bool {
+ return summary.Service == name && summary.State == "running"
+ }):
running = append(running, name)
- case found:
+ case slices.ContainsFunc(summaries, func(summary api.ContainerSummary) bool {
+ return summary.Service == name
+ }):
stopped = append(stopped, name)
}
}
@@ -116,35 +111,22 @@ func (s *Service) NamespaceDependents(ctx context.Context, compProj *composetype
// ImageOperations wires image pulls, existence checks and builds for Compose.
func (s *Service) ImageOperations(user *usertypes.Actor, credentials []containerregistry.Credential) projecttypes.ComposeImageOperations {
- operations := projecttypes.ComposeImageOperations{
+ return projecttypes.ComposeImageOperations{
+ Exists: s.imageService.ImageExistsLocally,
+ LastTagged: s.imageService.ImageLastTagTime,
Pull: func(ctx context.Context, image string, progress io.Writer) error {
- actor := usertypes.SystemUser
- if user != nil {
- actor = *user
- }
- return s.Pull(ctx, image, progress, actor, credentials)
+ return s.Pull(ctx, image, progress, *cmp.Or(user, &usertypes.SystemUser), credentials)
},
- }
- if s.imageService != nil {
- operations.Exists = s.imageService.ImageExistsLocally
- operations.LastTagged = s.imageService.ImageLastTagTime
- }
- if s.buildService != nil {
- operations.BuildProvider = s.buildService.BuildSettings().BuildProvider
- operations.Build = func(ctx context.Context, request buildtypes.BuildRequest, progress io.Writer, service string) error {
+ Build: func(ctx context.Context, request buildtypes.BuildRequest, progress io.Writer, service string) error {
_, err := s.buildService.BuildImage(ctx, types.LocalDockerEnvironmentID, request, progress, service, user)
return err
- }
+ },
+ BuildProvider: s.buildService.BuildSettings().BuildProvider,
}
- return operations
}
-// PrepareProjectBindDirectories creates missing bind-mount sources inside
-// projectPath as Arcane's runtime user before deploys; Docker would create them as root (#4132).
-//
-// Only sources with Compose's automatic host path creation are considered.
-// Existing paths, sources escaping the project lexically or through a symlink
-// (#4195), and sources Arcane cannot inspect are left to Docker.
+// PrepareProjectBindDirectories creates missing auto-created bind sources as Arcane's user, not root (#4132).
+// Existing, escaping (#4195) and uninspectable sources are left to Docker.
func PrepareProjectBindDirectories(projectPath string) projects.PrepareProjectFunc {
return func(ctx context.Context, project *composetypes.Project) error {
for _, serviceName := range slices.Sorted(maps.Keys(project.Services)) {
diff --git a/backend/internal/project/children/details/service.go b/backend/internal/project/children/details/service.go
index a599989b7..5c0cac4c6 100644
--- a/backend/internal/project/children/details/service.go
+++ b/backend/internal/project/children/details/service.go
@@ -20,7 +20,6 @@ import (
imagetypes "github.com/getarcaneapp/arcane/types/v2/image"
"github.com/getarcaneapp/arcane/types/v2/project"
"github.com/moby/moby/api/types/container"
- "github.com/moby/moby/client"
"go.getarcane.app/docker"
"go.getarcane.app/kit/pkg"
"go.getarcane.app/sys/cgroup"
@@ -46,22 +45,21 @@ type Service struct {
}
func New(db *database.DB, dockerService *dockerInternal.DockerClientService, imageService *image.ImageService, settingsService *settings.SettingsService) *Service {
- return &Service{db: db, dockerService: dockerService, imageService: imageService, settingsService: settingsService}
+ return &Service{
+ db: db,
+ dockerService: dockerService,
+ imageService: imageService,
+ settingsService: settingsService,
+ }
}
-// ComposeContainers routes the global compose-container
-// list through the shared Docker client singleton when one is wired, avoiding
-// a fresh docker CLI per call.
+// ComposeContainers lists global compose containers through the shared Docker client, avoiding a fresh docker CLI per call.
func (s *Service) ComposeContainers(ctx context.Context) ([]container.Summary, error) {
- var dockerClient client.APIClient
- if s.dockerService != nil {
- cli, err := s.dockerService.GetClient(ctx)
- if err != nil {
- return nil, err
- }
- dockerClient = cli
+ cli, err := s.dockerService.GetClient(ctx)
+ if err != nil {
+ return nil, err
}
- return projects.ListGlobalComposeContainers(ctx, dockerClient, s.dockerService.DockerHost())
+ return projects.ListGlobalComposeContainers(ctx, cli, s.dockerService.DockerHost())
}
// ComposeServices reports every Compose service with its container state,
@@ -83,17 +81,14 @@ func (s *Service) ComposeServices(
slog.ErrorContext(ctx, "compose ps error", "projectName", composeProject.Name, "error", err)
return nil, fmt.Errorf("failed to get compose services status: %w", err)
}
- // Compose ps omits image IDs, so one container list supplies them; a listing
- // failure only leaves image-level checks unmatched.
+ // Compose ps omits image IDs; a listing failure only leaves image-level checks unmatched.
imageIDs := make(map[string]string)
- if s.dockerService != nil {
- if summaries, listErr := s.ComposeContainers(ctx); listErr != nil {
- slog.WarnContext(ctx, "failed to list containers for project image identity", "projectName", composeProject.Name, "error", listErr)
- } else {
- for _, c := range summaries {
- if docker.ComposeProjectLabel(c.Labels) == composeProject.Name && c.ImageID != "" {
- imageIDs[c.ID] = c.ImageID
- }
+ if summaries, listErr := s.ComposeContainers(ctx); listErr != nil {
+ slog.WarnContext(ctx, "failed to list containers for project image identity", "projectName", composeProject.Name, "error", listErr)
+ } else {
+ for _, c := range summaries {
+ if docker.ComposeProjectLabel(c.Labels) == composeProject.Name && c.ImageID != "" {
+ imageIDs[c.ID] = c.ImageID
}
}
}
@@ -101,40 +96,28 @@ func (s *Service) ComposeServices(
have := map[string]bool{}
var services []project.RuntimeService
-
- // Create a map for quick lookup of service config
- serviceConfigs := make(map[string]types.ServiceConfig)
- for _, svc := range composeProject.Services {
- serviceConfigs[svc.Name] = svc
- }
-
for _, c := range containers {
- var health *string
- if c.Health != "" {
- health = new(string(c.Health))
- }
-
- var svcConfig *types.ServiceConfig
- if cfg, ok := serviceConfigs[c.Service]; ok {
- svcConfig = &cfg
- }
-
resolvedIcon := iconcatalog.Resolve(catalog, cmp.Or(
projects.FindArcaneIconSet(c.Labels),
meta.ServiceIconSets[c.Service],
meta.ProjectIcon,
))
services = append(services, project.RuntimeService{
- Name: c.Service,
- Image: c.Image,
- Status: string(c.State),
- ContainerID: c.ID,
- ContainerName: c.Name,
- Ports: projects.FormatPorts(c.Publishers),
- Health: health,
- IconLightURL: resolvedIcon.IconLightURL,
- IconDarkURL: resolvedIcon.IconDarkURL,
- ServiceConfig: svcConfig,
+ Name: c.Service,
+ Image: c.Image,
+ Status: string(c.State),
+ ContainerID: c.ID,
+ ContainerName: c.Name,
+ Ports: projects.FormatPorts(c.Publishers),
+ Health: kit.Ternary(c.Health != "", new(string(c.Health)), nil),
+ IconLightURL: resolvedIcon.IconLightURL,
+ IconDarkURL: resolvedIcon.IconDarkURL,
+ ServiceConfig: func() *types.ServiceConfig {
+ if cfg, ok := composeProject.Services[c.Service]; ok {
+ return &cfg
+ }
+ return nil
+ }(),
ContainerLabels: c.Labels,
RedeployDisabled: labels.ShouldDisableArcaneServerRedeploy(c.Labels, c.ID, currentContainerID, currentContainerErr),
ImageID: imageIDs[c.ID],
@@ -173,35 +156,34 @@ func (s *Service) IncludeFiles(ctx context.Context, composeFile string) []projec
// Load environment variables so that include paths with ${VAR} references are expanded
cfg := s.settingsService.GetSettingsOrDefaults(ctx)
projectsDirectory, _ := projects.GetProjectsDirectory(ctx, strings.TrimSpace(cfg.ProjectsDirectory.Value))
- envLoader := projects.NewEnvLoader(projectsDirectory, filepath.Dir(composeFile), kit.ParseOrDefault(cfg.AutoInjectEnv.Value, false, strconv.ParseBool))
- envMap, _, _ := envLoader.LoadEnvironment(ctx)
+ envMap, _, _ := projects.NewEnvLoader(projectsDirectory, filepath.Dir(composeFile), kit.ParseOrDefault(cfg.AutoInjectEnv.Value, false, strconv.ParseBool)).LoadEnvironment(ctx)
includes, parseErr := projects.ParseIncludes(composeFile, envMap, false)
- if parseErr == nil {
- var includeFiles []project.IncludeFile
- for _, inc := range includes {
- includeFiles = append(includeFiles, project.IncludeFile{
- Path: inc.Path,
- RelativePath: inc.RelativePath,
- })
- }
- return includeFiles
+ if parseErr != nil {
+ slog.WarnContext(ctx, "Failed to parse includes", "error", parseErr, "path", composeFile)
+ return nil
}
- slog.WarnContext(ctx, "Failed to parse includes", "error", parseErr, "path", composeFile)
- return nil
+ var includeFiles []project.IncludeFile
+ for _, inc := range includes {
+ includeFiles = append(includeFiles, project.IncludeFile{
+ Path: inc.Path,
+ RelativePath: inc.RelativePath,
+ })
+ }
+ return includeFiles
}
// ContainerUpdateInfo returns update checks scoped to the projects' running containers.
-func (s *Service) ContainerUpdateInfo(ctx context.Context, details []project.Details) map[string]*imagetypes.UpdateInfo {
- if s == nil || s.imageService == nil {
- return nil
- }
+func (s *Service) ContainerUpdateInfo(ctx context.Context, services []project.RuntimeService) map[string]*imagetypes.UpdateInfo {
var containers []container.Summary
- for _, detail := range details {
- for _, service := range detail.RuntimeServices {
- if service.ContainerID != "" {
- containers = append(containers, container.Summary{ID: service.ContainerID, Image: service.Image, ImageID: service.ImageID, Labels: service.ContainerLabels})
- }
+ for _, service := range services {
+ if service.ContainerID != "" {
+ containers = append(containers, container.Summary{
+ ID: service.ContainerID,
+ Image: service.Image,
+ ImageID: service.ImageID,
+ Labels: service.ContainerLabels,
+ })
}
}
scoped, err := s.imageService.GetUpdateInfoByContainers(ctx, containers)
@@ -214,7 +196,7 @@ func (s *Service) ContainerUpdateInfo(ctx context.Context, details []project.Det
// ServiceUpdateRecords loads per-service update checks for the projects.
func (s *Service) ServiceUpdateRecords(ctx context.Context, projectIDs []string) []imageupdate.ImageUpdateRecord {
- if s == nil || s.db == nil || len(projectIDs) == 0 {
+ if len(projectIDs) == 0 {
return nil
}
var records []imageupdate.ImageUpdateRecord
@@ -234,10 +216,8 @@ func Logs(ctx context.Context, projectName string, logsChan chan<- string, follo
// Reader goroutine: forward lines to channel
go func() {
- // Closing the read half unblocks any pending pw.Write in ComposeLogs.
- // Without it, an abandoned tail (ctx cancel, or a >1MiB line tripping
- // bufio.ErrTooLong) wedges the writer goroutine forever and this
- // function never collects its second done value.
+ // Closing the read half unblocks a pending pw.Write in ComposeLogs after an abandoned tail
+ // (ctx cancel or bufio.ErrTooLong); otherwise the writer goroutine wedges forever.
defer func() { _ = pr.CloseWithError(io.ErrClosedPipe) }()
sc := bufio.NewScanner(pr)
@@ -261,10 +241,7 @@ func Logs(ctx context.Context, projectName string, logsChan chan<- string, follo
}()
// Wait for both goroutines to finish to avoid sending on a closed channel
- err1 := <-done
- err2 := <-done
-
- for _, e := range []error{err1, err2} {
+ for _, e := range []error{<-done, <-done} {
if e != nil && !errors.Is(e, io.EOF) && !errors.Is(e, context.Canceled) {
return e
}
@@ -275,8 +252,7 @@ func Logs(ctx context.Context, projectName string, logsChan chan<- string, follo
func MergeProjectContainerUpdateInfo(base map[string]*imagetypes.UpdateInfo, services []project.RuntimeService, scoped map[string]*imagetypes.UpdateInfo) map[string]*imagetypes.UpdateInfo {
result := make(map[string]*imagetypes.UpdateInfo, len(base))
maps.Copy(result, base)
- // Shared image results are dropped for references used only by services
- // that opted out of update checks.
+ // Shared image results are dropped for references used only by services that opted out of update checks.
monitored := make(map[string]bool)
for _, service := range services {
imageRef := strings.TrimSpace(service.Image)
@@ -300,28 +276,40 @@ func MergeProjectContainerUpdateInfo(base map[string]*imagetypes.UpdateInfo, ser
if imageRef == "" {
continue
}
- merged := *info
- if seen[imageRef] {
- previous := result[imageRef]
- merged.HasUpdate = merged.HasUpdate || previous.HasUpdate
- if previous.CheckTime.After(merged.CheckTime) {
- merged.CheckTime = previous.CheckTime
- }
- if previous.LatestVersion != merged.LatestVersion || previous.LatestDigest != merged.LatestDigest || previous.UpdateType != merged.UpdateType {
- merged.LatestVersion, merged.LatestDigest, merged.UpdateType = "", "", ""
- }
- if merged.Error == "" {
- merged.Error = previous.Error
- }
+ previous := kit.Ternary(seen[imageRef], result[imageRef], info)
+ result[imageRef] = &imagetypes.UpdateInfo{ //exhaustruct:enforce
+ CheckTime: kit.Ternary(previous.CheckTime.After(info.CheckTime), previous.CheckTime, info.CheckTime),
+ UpdateType: kit.Ternary(
+ previous.LatestVersion != info.LatestVersion || previous.LatestDigest != info.LatestDigest || previous.UpdateType != info.UpdateType,
+ "",
+ info.UpdateType,
+ ),
+ CurrentVersion: info.CurrentVersion,
+ LatestVersion: kit.Ternary(
+ previous.LatestVersion != info.LatestVersion || previous.LatestDigest != info.LatestDigest || previous.UpdateType != info.UpdateType,
+ "",
+ info.LatestVersion,
+ ),
+ CurrentDigest: info.CurrentDigest,
+ LatestDigest: kit.Ternary(
+ previous.LatestVersion != info.LatestVersion || previous.LatestDigest != info.LatestDigest || previous.UpdateType != info.UpdateType,
+ "",
+ info.LatestDigest,
+ ),
+ Error: cmp.Or(info.Error, previous.Error),
+ AuthMethod: info.AuthMethod,
+ AuthUsername: info.AuthUsername,
+ AuthRegistry: info.AuthRegistry,
+ ResponseTimeMs: info.ResponseTimeMs,
+ HasUpdate: info.HasUpdate || previous.HasUpdate,
+ UsedCredential: info.UsedCredential,
}
- result[imageRef] = &merged
seen[imageRef] = true
}
return result
}
-// ConfiguredRuntimeServiceUpdateInfo binds runtime checks to the current Compose
-// source, since container labels may predate an operator edit.
+// ConfiguredRuntimeServiceUpdateInfo binds runtime checks to the current Compose source, since labels may predate an edit.
func ConfiguredRuntimeServiceUpdateInfo(services []types.ServiceConfig, runtime []project.RuntimeService, scoped map[string]*imagetypes.UpdateInfo) map[string]*imagetypes.UpdateInfo {
configs := make(map[string]types.ServiceConfig, len(services))
for _, service := range services {
@@ -329,19 +317,18 @@ func ConfiguredRuntimeServiceUpdateInfo(services []types.ServiceConfig, runtime
}
grouped := make(map[string][]project.RuntimeService)
for _, service := range runtime {
- name := service.Name
- if name == "" {
- name = docker.ComposeServiceLabel(service.ContainerLabels)
- }
- config, ok := configs[name]
+ config, ok := configs[cmp.Or(service.Name, docker.ComposeServiceLabel(service.ContainerLabels))]
if !ok || scoped[service.ContainerID] == nil {
continue
}
if imageref.UpdatePolicyKey(config.Image, config.Labels) != imageref.UpdatePolicyKey(service.Image, service.ContainerLabels) {
continue
}
- service.Image = config.Image
- grouped[name] = append(grouped[name], service)
+ grouped[config.Name] = append(grouped[config.Name], project.RuntimeService{
+ ContainerLabels: service.ContainerLabels,
+ Image: config.Image,
+ ContainerID: service.ContainerID,
+ })
}
result := make(map[string]*imagetypes.UpdateInfo, len(grouped))
for name, replicas := range grouped {
@@ -350,7 +337,8 @@ func ConfiguredRuntimeServiceUpdateInfo(services []types.ServiceConfig, runtime
return result
}
-func ExcludeHiddenRuntimeServices(details []project.Details) (map[string]map[string]bool, map[string]map[string]bool) {
+func ExcludeHiddenRuntimeServices(details []project.Details) ([][]project.RuntimeService, map[string]map[string]bool, map[string]map[string]bool) {
+ visibleByIndex := make([][]project.RuntimeService, len(details))
hiddenServicesByProjectID := make(map[string]map[string]bool)
hiddenRefsByProjectID := make(map[string]map[string]bool)
for i := range details {
@@ -358,8 +346,7 @@ func ExcludeHiddenRuntimeServices(details []project.Details) (map[string]map[str
hiddenRefs := make(map[string]bool)
visibleServices := make([]project.RuntimeService, 0, len(details[i].RuntimeServices))
for _, service := range details[i].RuntimeServices {
- hidden, _ := kit.ParseBool(service.ContainerLabels[libarcane.HiddenResourceLabel])
- if hidden {
+ if hidden, _ := kit.ParseBool(service.ContainerLabels[libarcane.HiddenResourceLabel]); hidden {
hiddenServices[service.Name] = true
hiddenRefs[service.Image] = true
continue
@@ -372,45 +359,36 @@ func ExcludeHiddenRuntimeServices(details []project.Details) (map[string]map[str
}
hiddenServicesByProjectID[details[i].ID] = hiddenServices
hiddenRefsByProjectID[details[i].ID] = hiddenRefs
- details[i].RuntimeServices = visibleServices
+ visibleByIndex[i] = visibleServices
}
- return hiddenServicesByProjectID, hiddenRefsByProjectID
+ return visibleByIndex, hiddenServicesByProjectID, hiddenRefsByProjectID
}
-// ResolveDetailsOverride returns the override file name and content, hidden when
-// a COMPOSE_FILE selection omits it since deploy would ignore edits to it.
+// ResolveDetailsOverride returns the override file name and content, hidden when a COMPOSE_FILE selection omits it.
func ResolveDetailsOverride(projectPath, overrideContent string, composeSelection []string) (fileName, content string) {
overridePath := projects.DetectComposeOverrideFile(projectPath)
if len(composeSelection) > 0 {
if overridePath == "" {
return "", ""
}
- // Selection entries are absolute and cleaned; compare full paths so a
- // same-named file in a subdirectory is not the project-root override.
+ // Selection entries are absolute; full paths keep a same-named subdirectory file from matching.
absOverride, err := filepath.Abs(filepath.Clean(overridePath))
if err != nil || !slices.Contains(composeSelection, absOverride) {
return "", ""
}
}
- if overridePath != "" {
- fileName = filepath.Base(overridePath)
- }
- return fileName, overrideContent
+ return kit.Ternary(overridePath != "", filepath.Base(overridePath), ""), overrideContent
}
-// ComposeSelectionRelativePaths returns a multi-file COMPOSE_FILE selection as
-// ordered project-relative paths; nil for single or empty selections.
+// ComposeSelectionRelativePaths returns a multi-file COMPOSE_FILE selection as ordered project-relative paths.
func ComposeSelectionRelativePaths(projectPath string, selection []string) []string {
if len(selection) <= 1 {
return nil
}
rels := make([]string, 0, len(selection))
for _, f := range selection {
- if rel, err := filepath.Rel(projectPath, f); err == nil {
- rels = append(rels, rel)
- } else {
- rels = append(rels, filepath.Base(f))
- }
+ rel, err := filepath.Rel(projectPath, f)
+ rels = append(rels, kit.Ternary(err == nil, rel, filepath.Base(f)))
}
return rels
}
diff --git a/backend/internal/project/children/lifecycle/helpers_unix.go b/backend/internal/project/children/lifecycle/helpers_unix.go
index ec15dc0d9..6738f2731 100644
--- a/backend/internal/project/children/lifecycle/helpers_unix.go
+++ b/backend/internal/project/children/lifecycle/helpers_unix.go
@@ -8,82 +8,70 @@ import (
"path/filepath"
"strings"
"syscall"
+
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
func describeLifecyclePathAccess(projectPath, resolvedScriptPath string) string {
- var lines []string
-
- lines = append(lines,
- fmt.Sprintf(
- "Arcane process identity: uid=%d gid=%d.",
- os.Geteuid(),
- os.Getegid(),
- ),
+ lines := []string{
+ fmt.Sprintf("Arcane process identity: uid=%d gid=%d.", os.Geteuid(), os.Getegid()),
"Path inspection:",
- )
+ }
- // Walk from the project root down to the script; fall back to the two
- // endpoints when the script resolves outside the project.
- paths := []string{projectPath, resolvedScriptPath}
+ // Walk from the project root down to the script; fall back to the endpoints when it resolves outside the project.
absProject, projectErr := filepath.Abs(projectPath)
absScript, scriptErr := filepath.Abs(resolvedScriptPath)
relative, relErr := filepath.Rel(absProject, absScript)
- switch {
- case projectErr != nil:
- case scriptErr != nil:
- paths = []string{absProject, resolvedScriptPath}
- case relErr != nil || relative == ".." || strings.HasPrefix(relative, ".."+string(filepath.Separator)):
- paths = []string{absProject, absScript}
- default:
- paths = []string{absProject}
- current := absProject
+ for _, candidate := range func() []string {
+ switch {
+ case projectErr != nil:
+ return []string{projectPath, resolvedScriptPath}
+ case scriptErr != nil:
+ return []string{absProject, resolvedScriptPath}
+ case relErr != nil || !projects.IsSafeSubdirectory(absProject, absScript):
+ return []string{absProject, absScript}
+ }
+ paths := []string{absProject}
for component := range strings.SplitSeq(relative, string(filepath.Separator)) {
- if component == "" || component == "." {
- continue
+ if component != "" && component != "." {
+ paths = append(paths, filepath.Join(paths[len(paths)-1], component))
}
- current = filepath.Join(current, component)
- paths = append(paths, current)
}
- }
-
- for _, candidate := range paths {
- // os.* rather than acfs: diagnostics walk arbitrary ancestor directories
- // of a user-configured path, so no confinement root exists for them.
+ return paths
+ }() {
+ // os.* rather than acfs: diagnostics walk arbitrary ancestors of a user-configured path with no confinement root.
info, err := os.Lstat(candidate)
if err != nil {
lines = append(lines, fmt.Sprintf(" %q: %v", candidate, err))
break
}
-
- owner := "uid=unknown gid=unknown"
- if stat, ok := info.Sys().(*syscall.Stat_t); ok {
- owner = fmt.Sprintf("uid=%d gid=%d", stat.Uid, stat.Gid)
- }
-
- fileType := "other"
- switch {
- case info.Mode()&os.ModeSymlink != 0:
- fileType = "symlink"
- case info.IsDir():
- fileType = "directory"
- case info.Mode().IsRegular():
- fileType = "regular"
- }
-
lines = append(lines, fmt.Sprintf(
" %q: mode=%s permissions=%04o %s type=%s",
candidate,
info.Mode(),
info.Mode().Perm(),
- owner,
- fileType,
+ func() string {
+ if stat, ok := info.Sys().(*syscall.Stat_t); ok {
+ return fmt.Sprintf("uid=%d gid=%d", stat.Uid, stat.Gid)
+ }
+ return "uid=unknown gid=unknown"
+ }(),
+ func() string {
+ switch {
+ case info.Mode()&os.ModeSymlink != 0:
+ return "symlink"
+ case info.IsDir():
+ return "directory"
+ case info.Mode().IsRegular():
+ return "regular"
+ }
+ return "other"
+ }(),
))
}
- lines = append(lines,
+ return strings.Join(append(lines,
"Ensure the Arcane process can traverse every parent directory and inspect the script.",
"A script mode of 0755 is not sufficient when a parent directory lacks execute permission or ownership, ACLs, or mount permissions block access.",
- )
-
- return strings.Join(lines, " ")
+ ), " ")
}
diff --git a/backend/internal/project/children/lifecycle/service.go b/backend/internal/project/children/lifecycle/service.go
index f9f1ac7f4..41031e4d7 100644
--- a/backend/internal/project/children/lifecycle/service.go
+++ b/backend/internal/project/children/lifecycle/service.go
@@ -26,6 +26,7 @@ import (
"github.com/moby/moby/client"
"go.getarcane.app/acfs"
"go.getarcane.app/docker"
+ "go.getarcane.app/kit/pkg"
"go.getarcane.app/kit/pkg/capture"
dockerInternal "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
@@ -61,11 +62,14 @@ const (
var lifecycleEnvKeyRegex = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`)
func New(settingsService *settings.SettingsService, dockerService *dockerInternal.DockerClientService, imageService *image.ImageService) *Service {
- return &Service{settingsService: settingsService, dockerService: dockerService, imageService: imageService}
+ return &Service{
+ settingsService: settingsService,
+ dockerService: dockerService,
+ imageService: imageService,
+ }
}
-// markTruncated returns the captured output with a marker when the cap was hit,
-// matching what the GitOps UI shows.
+// markTruncated returns the captured output with a marker when the cap was hit, matching the GitOps UI.
func markTruncated(c *capture.Capture) string {
out := c.String()
if c.Truncated() {
@@ -74,8 +78,7 @@ func markTruncated(c *capture.Capture) string {
return out
}
-// drainLifecycleLogs waits a bounded time for the log copy to finish, then
-// force-closes the stream for Docker variants that don't EOF on exit.
+// drainLifecycleLogs waits a bounded time for the log copy, then force-closes streams that don't EOF on exit.
func drainLifecycleLogs(ctx context.Context, logsCancel context.CancelFunc, logs io.ReadCloser, logDone <-chan error) {
timer := time.NewTimer(lifecycleStreamDrainTimeout)
defer timer.Stop()
@@ -103,8 +106,8 @@ func CombineLifecycleOutput(stdout, stderr string) string {
}
}
-// ParseKeyValueEnv parses stdout as strict KEY=VALUE lines, skipping blanks and
-// '#' comments; anything else fails the deploy rather than polluting the env.
+// ParseKeyValueEnv parses stdout as strict KEY=VALUE lines, skipping blanks and '#' comments.
+// Anything else fails the deploy rather than polluting the env.
func ParseKeyValueEnv(stdout string) (map[string]string, error) {
env := map[string]string{}
scanner := bufio.NewScanner(strings.NewReader(stdout))
@@ -118,12 +121,10 @@ func ParseKeyValueEnv(stdout string) (map[string]string, error) {
if trimmed == "" || strings.HasPrefix(trimmed, "#") {
continue
}
- idx := strings.IndexByte(line, '=')
- if idx <= 0 {
+ key, value, found := strings.Cut(line, "=")
+ if !found || key == "" {
return nil, fmt.Errorf("line %d: expected KEY=VALUE, got %q", lineNum, line)
}
- key := line[:idx]
- value := line[idx+1:]
if !lifecycleEnvKeyRegex.MatchString(key) {
return nil, fmt.Errorf("line %d: invalid env key %q", lineNum, key)
}
@@ -153,12 +154,8 @@ func (s *Service) RunScript(
return "", "", 0, fmt.Errorf("failed to connect to Docker: %w", dErr)
}
- // Pull a missing runner image through the image service so registry
- // credentials and the dockerImagePullTimeout setting apply.
+ // Pull a missing runner image through the image service so credentials and the pull timeout apply.
if _, inspectErr := dockerClient.ImageInspect(ctx, runnerImage); inspectErr != nil {
- if s.imageService == nil {
- return "", "", 0, fmt.Errorf("failed to ensure runner image %s: image service is unavailable", runnerImage)
- }
pullCtx, pullCancel := context.WithTimeout(ctx, timeouts.GetDuration(s.settingsService.GetSettingsConfig().DockerImagePullTimeout.AsInt(), timeouts.DefaultDockerImagePull))
pullErr := s.imageService.PullImage(pullCtx, runnerImage, io.Discard, actor, nil)
pullTimedOut := errors.Is(pullCtx.Err(), context.DeadlineExceeded)
@@ -171,82 +168,78 @@ func (s *Service) RunScript(
}
}
- // MountForSubpath mounts a volume-backed /app/data via VolumeOptions.Subpath
- // (translated host binds fail on e.g. WSL2); on the host, bind projectPath as-is.
- var workspaceMount *mount.Mount
- if inspect, inspectErr := libarcane.InspectCurrentArcaneContainer(ctx, dockerClient); inspectErr != nil {
+ // MountForSubpath mounts a volume-backed /app/data via VolumeOptions.Subpath (host binds fail on e.g. WSL2).
+ // On the host, or when the mount cannot be derived, projectPath is bound as-is.
+ inspect, inspectErr := libarcane.InspectCurrentArcaneContainer(ctx, dockerClient)
+ if inspectErr != nil {
slog.WarnContext(ctx, "failed to derive workspace mount; falling back to bind on project path", "projectPath", projectPath, "error", inspectErr)
- } else {
- workspaceMount = docker.MountForSubpath(inspect.Mounts, projectPath, lifecycleWorkspaceMount)
- }
- if workspaceMount == nil {
- workspaceMount = &mount.Mount{Type: mount.TypeBind, Source: projectPath, Target: lifecycleWorkspaceMount}
}
// The workspace is read-write so scripts can write artifacts the deploy consumes.
- mounts := make([]mount.Mount, 0, 1+len(extraMounts))
- mounts = append(mounts, *workspaceMount)
+ mounts := []mount.Mount{*cmp.Or(
+ docker.MountForSubpath(kit.FromPtr(inspect).Mounts, projectPath, lifecycleWorkspaceMount),
+ &mount.Mount{Type: mount.TypeBind, Source: projectPath, Target: lifecycleWorkspaceMount},
+ )}
for _, m := range extraMounts {
- mounts = append(mounts, mount.Mount{Type: mount.TypeBind, Source: m.Source, Target: m.Target, ReadOnly: m.Readonly})
+ mounts = append(mounts, mount.Mount{
+ Type: mount.TypeBind,
+ Source: m.Source,
+ Target: m.Target,
+ ReadOnly: m.Readonly,
+ })
}
var env []string
for k, v := range hookEnv {
env = append(env, k+"="+v)
}
- // Cmd is the executable script alone so its shebang picks the interpreter;
- // Entrypoint is cleared so images like getsops/sops don't treat it as an argument.
- config := &container.Config{
- Image: runnerImage,
- Entrypoint: []string{},
- Cmd: []string{filepath.ToSlash(filepath.Join(lifecycleWorkspaceMount, scriptPath))},
- WorkingDir: lifecycleWorkspaceMount,
- Env: env,
- AttachStdout: true,
- AttachStderr: true,
- Tty: false,
- Labels: map[string]string{
- libarcane.InternalResourceLabel: "true",
- },
- }
- // no-new-privileges and CapDrop ALL take setuid and default root
- // capabilities away from the script and anything it spawns.
- hostConfig := &container.HostConfig{
- Mounts: mounts,
- NetworkMode: container.NetworkMode(cmp.Or(strings.TrimSpace(networkMode), "none")),
- SecurityOpt: []string{"no-new-privileges:true"},
- CapDrop: []string{"ALL"},
- AutoRemove: false,
- }
-
- apiTimeoutSec := s.settingsService.GetSettingsConfig().DockerAPITimeout.AsInt()
- createCtx, createCancel := context.WithTimeout(ctx, timeouts.GetDuration(apiTimeoutSec, timeouts.DefaultDockerAPI))
+ createCtx, createCancel := context.WithTimeout(ctx, timeouts.GetDuration(s.settingsService.GetSettingsConfig().DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI))
defer createCancel()
resp, err := dockerClient.ContainerCreate(createCtx, client.ContainerCreateOptions{
- Config: config,
- HostConfig: hostConfig,
+ // Cmd is the script alone so its shebang picks the interpreter; Entrypoint is cleared for images like getsops/sops.
+ Config: &container.Config{
+ Image: runnerImage,
+ Entrypoint: []string{},
+ Cmd: []string{filepath.ToSlash(filepath.Join(lifecycleWorkspaceMount, scriptPath))},
+ WorkingDir: lifecycleWorkspaceMount,
+ Env: env,
+ AttachStdout: true,
+ AttachStderr: true,
+ Labels: map[string]string{
+ libarcane.InternalResourceLabel: "true",
+ },
+ },
+ // no-new-privileges and CapDrop ALL strip setuid and root capabilities from the script and its children.
+ HostConfig: &container.HostConfig{
+ Mounts: mounts,
+ NetworkMode: container.NetworkMode(cmp.Or(strings.TrimSpace(networkMode), "none")),
+ SecurityOpt: []string{"no-new-privileges:true"},
+ CapDrop: []string{"ALL"},
+ },
})
if err != nil {
return "", "", 0, fmt.Errorf("create lifecycle container: %w", err)
}
- containerID := resp.ID
defer func() {
// Cleanup outlives cancellation so a cancelled run never leaks its container.
- cleanupCtx, cleanupCancel := context.WithTimeout(context.WithoutCancel(ctx), timeouts.GetDuration(apiTimeoutSec, timeouts.DefaultDockerAPI))
+ cleanupCtx, cleanupCancel := context.WithTimeout(
+ context.WithoutCancel(ctx),
+ timeouts.GetDuration(s.settingsService.GetSettingsConfig().DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI),
+ )
defer cleanupCancel()
- if _, removeErr := dockerClient.ContainerRemove(cleanupCtx, containerID, client.ContainerRemoveOptions{Force: true}); removeErr != nil && !errdefs.IsNotFound(removeErr) {
- slog.WarnContext(cleanupCtx, "failed to remove lifecycle container", "containerId", containerID, "error", removeErr)
+ if _, removeErr := dockerClient.ContainerRemove(cleanupCtx, resp.ID, client.ContainerRemoveOptions{Force: true}); removeErr != nil && !errdefs.IsNotFound(removeErr) {
+ slog.WarnContext(cleanupCtx, "failed to remove lifecycle container", "containerId", resp.ID, "error", removeErr)
}
}()
- startCtx, startCancel := context.WithTimeout(ctx, timeouts.GetDuration(apiTimeoutSec, timeouts.DefaultDockerAPI))
+ startCtx, startCancel := context.WithTimeout(ctx, timeouts.GetDuration(s.settingsService.GetSettingsConfig().DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI))
defer startCancel()
- if _, containerStartErr := dockerClient.ContainerStart(startCtx, containerID, client.ContainerStartOptions{}); containerStartErr != nil {
+ if _, containerStartErr := dockerClient.ContainerStart(startCtx, resp.ID, client.ContainerStartOptions{}); containerStartErr != nil {
return "", "", 0, fmt.Errorf("start lifecycle container: %w", containerStartErr)
}
logsCtx, logsCancel := context.WithCancel(ctx)
defer logsCancel()
- logs, err := dockerClient.ContainerLogs(logsCtx, containerID, client.ContainerLogsOptions{
+ logs, err := dockerClient.ContainerLogs(logsCtx, resp.ID, client.ContainerLogsOptions{
ShowStdout: true,
ShowStderr: true,
Follow: true,
@@ -265,14 +258,14 @@ func (s *Service) RunScript(
waitCtx, waitCancel := context.WithTimeout(ctx, timeout)
defer waitCancel()
- waitResp := dockerClient.ContainerWait(waitCtx, containerID, client.ContainerWaitOptions{
+ waitResp := dockerClient.ContainerWait(waitCtx, resp.ID, client.ContainerWaitOptions{
Condition: container.WaitConditionNotRunning,
})
select {
case result := <-waitResp.Result:
exitCode = result.StatusCode
- if result.Error != nil && result.Error.Message != "" {
+ if kit.FromPtr(result.Error).Message != "" {
drainLifecycleLogs(ctx, logsCancel, logs, logDone)
return markTruncated(stdoutBuf), markTruncated(stderrBuf), exitCode, fmt.Errorf("lifecycle container reported error: %s", result.Error.Message)
}
@@ -295,15 +288,12 @@ func (s *Service) RunScript(
return markTruncated(stdoutBuf), markTruncated(stderrBuf), exitCode, nil
}
-// ValidateScriptPath rejects paths that escape the project directory
-// or refer to symlinks/binaries. Reuses the same safety helper that gates
-// the existing project include-file editor.
+// ValidateScriptPath rejects paths that escape the project directory or refer to symlinks or directories.
func ValidateScriptPath(ctx context.Context, projectPath, scriptPath string) error {
if scriptPath == "" {
return errors.New("script path is empty")
}
- // scriptPath is a POSIX repo path, not a host path; use path.IsAbs so the
- // check behaves the same on Windows-based contributor machines.
+ // scriptPath is a POSIX repo path; path.IsAbs behaves the same on Windows.
if path.IsAbs(filepath.ToSlash(scriptPath)) {
return fmt.Errorf("script path %q must be relative to the project directory", scriptPath)
}
@@ -323,10 +313,7 @@ func ValidateScriptPath(ctx context.Context, projectPath, scriptPath string) err
entry, err := acfs.Stat(ctx, absProject, "/"+filepath.ToSlash(scriptPath), false)
if err != nil {
if errors.Is(err, os.ErrPermission) {
- // The stat runs as Arcane's own uid, but the script executes in the
- // runner container as that image's user — which may well be able to
- // read a path Arcane cannot traverse (#3373). Proceed and let the
- // container run surface any real problem.
+ // The runner image's user may read a path Arcane's uid cannot traverse (#3373); let the run surface real problems.
slog.WarnContext(ctx, "cannot inspect pre-deploy script as the Arcane user; proceeding, the runner container may still be able to read it",
"scriptPath", scriptPath,
"detail", describeLifecyclePathAccess(projectPath, absScript),
diff --git a/backend/internal/project/children/lifecycle/service_test.go b/backend/internal/project/children/lifecycle/service_test.go
index b79ba2676..6d282ee4c 100644
--- a/backend/internal/project/children/lifecycle/service_test.go
+++ b/backend/internal/project/children/lifecycle/service_test.go
@@ -9,17 +9,6 @@ import (
"github.com/stretchr/testify/require"
)
-func writeLifecycleProjectDirWithScript(t *testing.T, scriptRel, scriptBody string) string {
- t.Helper()
- dir := t.TempDir()
- if scriptRel != "" {
- full := filepath.Join(dir, scriptRel)
- require.NoError(t, os.MkdirAll(filepath.Dir(full), 0o755))
- require.NoError(t, os.WriteFile(full, []byte(scriptBody), 0o644))
- }
- return dir
-}
-
func TestParseKeyValueEnv_HappyPath(t *testing.T) {
stdout := "FOO=bar\n# comment line\n\nBAZ_2=hello world\n"
got, err := ParseKeyValueEnv(stdout)
@@ -50,7 +39,9 @@ func TestParseKeyValueEnv_AllowsEqualsInValue(t *testing.T) {
}
func TestValidateScriptPath_HappyPath(t *testing.T) {
- dir := writeLifecycleProjectDirWithScript(t, "scripts/pre-deploy.sh", "#!/bin/sh\necho hi\n")
+ dir := t.TempDir()
+ require.NoError(t, os.MkdirAll(filepath.Join(dir, "scripts"), 0o755))
+ require.NoError(t, os.WriteFile(filepath.Join(dir, "scripts", "pre-deploy.sh"), []byte("#!/bin/sh\necho hi\n"), 0o644))
err := ValidateScriptPath(t.Context(), dir, "scripts/pre-deploy.sh")
require.NoError(t, err)
}
@@ -77,13 +68,14 @@ func TestValidateScriptPath_PermissionDeniedProceeds(t *testing.T) {
if os.Geteuid() == 0 {
t.Skip("running as root; directory permissions are not enforced")
}
- dir := writeLifecycleProjectDirWithScript(t, "scripts/pre-deploy.sh", "#!/bin/sh\necho hi\n")
+ dir := t.TempDir()
scripts := filepath.Join(dir, "scripts")
+ require.NoError(t, os.MkdirAll(scripts, 0o755))
+ require.NoError(t, os.WriteFile(filepath.Join(scripts, "pre-deploy.sh"), []byte("#!/bin/sh\necho hi\n"), 0o644))
require.NoError(t, os.Chmod(scripts, 0o000))
t.Cleanup(func() { require.NoError(t, os.Chmod(scripts, 0o755)) })
- // The runner container may still be able to read the script even though
- // Arcane's uid cannot (#3373), so the stat failure must not block the run.
+ // The runner container may read the script even though Arcane's uid cannot (#3373).
err := ValidateScriptPath(t.Context(), dir, "scripts/pre-deploy.sh")
require.NoError(t, err)
}
@@ -114,10 +106,10 @@ func TestCombineLifecycleOutput(t *testing.T) {
cases := []struct {
stdout, stderr, want string
}{
- {"", "", ""},
- {"hello", "", "hello"},
- {"", "boom", "--- stderr ---\nboom"},
- {"hello\n", "boom\n", "hello\n--- stderr ---\nboom"},
+ {stdout: "", stderr: "", want: ""},
+ {stdout: "hello", stderr: "", want: "hello"},
+ {stdout: "", stderr: "boom", want: "--- stderr ---\nboom"},
+ {stdout: "hello\n", stderr: "boom\n", want: "hello\n--- stderr ---\nboom"},
}
for _, c := range cases {
got := CombineLifecycleOutput(c.stdout, c.stderr)
diff --git a/backend/internal/project/children/listing/service.go b/backend/internal/project/children/listing/service.go
index 2b06231b3..c79f8e7c5 100644
--- a/backend/internal/project/children/listing/service.go
+++ b/backend/internal/project/children/listing/service.go
@@ -7,8 +7,8 @@ import (
"context"
"log/slog"
"maps"
- "os"
"path/filepath"
+ "slices"
"strings"
"time"
@@ -19,7 +19,6 @@ import (
"github.com/samber/mo"
"go.getarcane.app/docker"
"go.getarcane.app/kit/pkg"
- "go.getarcane.app/kit/pkg/mapping"
"go.getarcane.app/sys/cgroup"
"go.getarcane.app/updater/labels"
"gorm.io/gorm"
@@ -43,11 +42,14 @@ func New(
imageService *image.ImageService,
summarizeRuns func(imageRefs []string, services []project.RuntimeService, scoped map[string]*imagetypes.UpdateInfo) *project.UpdateInfo,
) *Service {
- return &Service{containers: containers, imageService: imageService, summarizeRuns: summarizeRuns}
+ return &Service{
+ containers: containers,
+ imageService: imageService,
+ summarizeRuns: summarizeRuns,
+ }
}
-// Snapshot is the compose container listing shared by
-// every row of one list request, grouped once by compose project name.
+// Snapshot is the compose container listing shared by every row of one list request, grouped by project.
type Snapshot struct {
Containers []container.Summary
byProject map[string][]container.Summary
@@ -72,17 +74,14 @@ func (s *Service) Snapshot(ctx context.Context) Snapshot {
}
}
-// Containers returns the snapshot's compose containers and listing error.
-
-// ProjectContainers matches project names first, then the working
-// directory if it identifies exactly one Compose project group.
+// ProjectContainers matches project names first, then the working directory if it identifies one Compose project.
func ProjectContainers(p project.Record, containersByProject map[string][]container.Summary) []container.Summary {
normName := projects.NormalizeProjectName(p.Name)
if c := containersByProject[normName]; len(c) > 0 {
return c
}
- if p.ComposeProjectName != nil && *p.ComposeProjectName != normName {
- if c := containersByProject[*p.ComposeProjectName]; len(c) > 0 {
+ if kit.FromPtr(p.ComposeProjectName) != normName {
+ if c := containersByProject[kit.FromPtr(p.ComposeProjectName)]; len(c) > 0 {
return c
}
}
@@ -109,28 +108,25 @@ func ProjectContainers(p project.Record, containersByProject map[string][]contai
// RuntimeServiceFromContainer derives service state from a labeled container.
func RuntimeServiceFromContainer(catalog string, c container.Summary, meta projects.ArcaneComposeMetadata, currentContainerID string, currentContainerErr error) project.RuntimeService {
- svcName := docker.ComposeServiceLabel(c.Labels)
-
- var health *string
- statusLower := strings.ToLower(c.Status)
- switch {
- case strings.Contains(statusLower, "(healthy)"):
- health = new("healthy")
- case strings.Contains(statusLower, "(unhealthy)"):
- health = new("unhealthy")
- case strings.Contains(statusLower, "(starting)"):
- health = new("starting")
- }
-
- resolvedIcon := iconcatalog.Resolve(catalog, cmp.Or(projects.FindArcaneIconSet(c.Labels), meta.ServiceIconSets[svcName], meta.ProjectIcon))
+ resolvedIcon := iconcatalog.Resolve(catalog, cmp.Or(projects.FindArcaneIconSet(c.Labels), meta.ServiceIconSets[docker.ComposeServiceLabel(c.Labels)], meta.ProjectIcon))
return project.RuntimeService{
- Name: svcName,
- Image: c.Image,
- Status: string(c.State),
- ContainerID: c.ID,
- ContainerName: docker.ContainerNameFromNames(c.Names),
- Ports: projects.FormatDockerPorts(c.Ports),
- Health: health,
+ Name: docker.ComposeServiceLabel(c.Labels),
+ Image: c.Image,
+ Status: string(c.State),
+ ContainerID: c.ID,
+ ContainerName: docker.ContainerNameFromNames(c.Names),
+ Ports: projects.FormatDockerPorts(c.Ports),
+ Health: func() *string {
+ switch status := strings.ToLower(c.Status); {
+ case strings.Contains(status, "(healthy)"):
+ return new("healthy")
+ case strings.Contains(status, "(unhealthy)"):
+ return new("unhealthy")
+ case strings.Contains(status, "(starting)"):
+ return new("starting")
+ }
+ return nil
+ }(),
IconLightURL: resolvedIcon.IconLightURL,
IconDarkURL: resolvedIcon.IconDarkURL,
ContainerLabels: c.Labels,
@@ -182,122 +178,97 @@ func ProjectStatus(services []project.RuntimeService) string {
// StatusCounts totals archived, running and stopped projects from live
// containers, falling back to stored status when Docker is unavailable.
func (s *Service) StatusCounts(ctx context.Context, records []project.Record) project.StatusCounts {
- counts := project.StatusCounts{TotalProjects: len(records)}
- active := make([]project.Record, 0, len(records))
- for _, p := range records {
- if p.IsArchived {
- counts.ArchivedProjects++
- continue
- }
- active = append(active, p)
- }
-
containers, err := s.containers(ctx)
if err != nil {
slog.ErrorContext(ctx, "Failed to list global compose containers for counts", "error", err)
}
containersByProject := GroupComposeContainersByProject(containers)
- for _, p := range active {
- status := p.Status
- if err == nil {
- projectContainers := ProjectContainers(p, containersByProject)
- services := make([]project.RuntimeService, 0, len(projectContainers))
- for _, c := range projectContainers {
+ var archived, running, stopped int
+ for _, p := range records {
+ if p.IsArchived {
+ archived++
+ continue
+ }
+ switch func() string {
+ if err != nil {
+ return p.Status
+ }
+ var services []project.RuntimeService
+ for _, c := range ProjectContainers(p, containersByProject) {
services = append(services, project.RuntimeService{Status: string(c.State)})
}
- status = kit.Ternary(len(services) > 0, ProjectStatus(services), project.StatusStopped)
- }
- switch status {
+ return kit.Ternary(len(services) > 0, ProjectStatus(services), project.StatusStopped)
+ }() {
case project.StatusRunning, project.StatusPartiallyRunning, project.StatusDeploying, project.StatusRestarting:
- counts.RunningProjects++
+ running++
case project.StatusStopped, project.StatusStopping:
- counts.StoppedProjects++
+ stopped++
}
}
- return counts
+ return project.StatusCounts{
+ TotalProjects: len(records),
+ RunningProjects: running,
+ StoppedProjects: stopped,
+ ArchivedProjects: archived,
+ }
}
// RelativePath returns projectPath relative to projectsDir, or "" outside it.
func RelativePath(projectsDir, projectPath string) string {
- if strings.TrimSpace(projectsDir) == "" {
+ if strings.TrimSpace(projectsDir) == "" || !projects.IsSafeSubdirectory(projectsDir, projectPath) || filepath.Clean(projectPath) == filepath.Clean(projectsDir) {
return ""
}
-
relativePath, err := filepath.Rel(projectsDir, filepath.Clean(projectPath))
- if err != nil {
- return ""
- }
- if relativePath == "." {
- return ""
- }
- if relativePath == ".." || strings.HasPrefix(relativePath, ".."+string(os.PathSeparator)) {
- return ""
- }
-
- return filepath.ToSlash(relativePath)
+ return kit.Ternary(err == nil, filepath.ToSlash(relativePath), "")
}
// row builds the fields list filters, search and sort read from database
// columns and the container snapshot; compose metadata is left for ApplyPresentation.
-func row(projectsDir, catalog string, p project.Record, snapshot Snapshot) project.Details {
- var resp project.Details
- _ = mapping.MapStruct(p, &resp)
-
- resp.CreatedAt = p.CreatedAt.Format(time.RFC3339)
- resp.UpdatedAt = p.UpdatedAt.Format(time.RFC3339)
- resp.IsArchived = p.IsArchived
- resp.ArchivedAt = p.ArchivedAt
- resp.DirName = mo.PointerToOption(p.DirName).OrEmpty()
- resp.RelativePath = RelativePath(projectsDir, p.Path)
- resp.GitOpsManagedBy = p.GitOpsManagedBy
- resp.HasBuildDirective = p.BuildImageRefsJSON != nil && len(projects.ParseImageRefsJSON(*p.BuildImageRefsJSON)) > 0
- // Use DB service count as the source of truth for "Total Services"
- // since we are not parsing the YAML here.
- resp.ServiceCount = p.ServiceCount
- if snapshot.Err != nil {
- resp.Status = project.StatusUnknown
- return resp
- }
-
- projectContainers := ProjectContainers(p, snapshot.byProject)
- services := make([]project.RuntimeService, 0, len(projectContainers))
- for _, c := range projectContainers {
- service := RuntimeServiceFromContainer(catalog, c, projects.ArcaneComposeMetadata{}, snapshot.currentContainerID, snapshot.currentContainerErr)
- if service.RedeployDisabled {
- resp.RedeployDisabled = true
- }
- services = append(services, service)
+func row(projectsDir, catalog string, p project.Record, snapshot Snapshot, tags []project.Tag) project.Details {
+ var services []project.RuntimeService
+ for _, c := range ProjectContainers(p, snapshot.byProject) {
+ services = append(services, RuntimeServiceFromContainer(catalog, c, projects.ArcaneComposeMetadata{}, snapshot.currentContainerID, snapshot.currentContainerErr))
}
_, runningCount := ServiceCounts(services)
- resp.RuntimeServices = services
- resp.RunningCount = runningCount
- // Newly discovered projects have no persisted count yet. Infer it from the
- // live containers; the parent persists the inferred value so
- // SQL sorting and pagination on service_count see it on later requests.
- if resp.ServiceCount == 0 && len(services) > 0 {
- resp.ServiceCount = len(services)
- }
-
- // Status uses the live services, not the possibly stale stored ServiceCount.
- switch {
- case runningCount > 0 && runningCount >= len(services):
- resp.Status = project.StatusRunning
- case runningCount > 0:
- resp.Status = project.StatusPartiallyRunning
- default:
- resp.Status = project.StatusStopped
+ return project.Details{
+ Tags: tags,
+ StatusReason: p.StatusReason,
+ GitOpsManagedBy: p.GitOpsManagedBy,
+ ArchivedAt: p.ArchivedAt,
+ // Status uses the live services, not the possibly stale stored ServiceCount.
+ Status: func() string {
+ switch {
+ case snapshot.Err != nil:
+ return project.StatusUnknown
+ case len(services) == 0:
+ return project.StatusStopped
+ }
+ return ProjectStatus(services)
+ }(),
+ DirName: mo.PointerToOption(p.DirName).OrEmpty(),
+ Name: p.Name,
+ RelativePath: RelativePath(projectsDir, p.Path),
+ ID: p.ID,
+ Path: p.Path,
+ UpdatedAt: p.UpdatedAt.Format(time.RFC3339),
+ CreatedAt: p.CreatedAt.Format(time.RFC3339),
+ RuntimeServices: services,
+ RunningCount: kit.Ternary(snapshot.Err != nil, p.RunningCount, runningCount),
+ // Newly discovered projects have no persisted count yet; infer it from live containers so the parent can persist it.
+ ServiceCount: cmp.Or(p.ServiceCount, len(services)),
+ IsArchived: p.IsArchived,
+ HasBuildDirective: len(projects.ParseImageRefsJSON(kit.FromPtr(p.BuildImageRefsJSON))) > 0,
+ RedeployDisabled: slices.ContainsFunc(services, func(service project.RuntimeService) bool { return service.RedeployDisabled }),
}
-
- return resp
}
// Rows builds list rows and reports service counts inferred from live
// containers for projects whose stored count is still zero.
-func Rows(projectsDir, catalog string, records []project.Record, snapshot Snapshot) ([]project.Details, map[string]int) {
+func Rows(projectsDir, catalog string, records []project.Record, snapshot Snapshot, tagsByProject map[string][]project.Tag) ([]project.Details, map[string]int) {
rows := make([]project.Details, len(records))
inferredCounts := make(map[string]int)
for i, p := range records {
- rows[i] = row(projectsDir, catalog, p, snapshot)
+ rows[i] = row(projectsDir, catalog, p, snapshot, tagsByProject[p.ID])
if p.ServiceCount == 0 && rows[i].ServiceCount > 0 {
inferredCounts[p.ID] = rows[i].ServiceCount
}
@@ -305,22 +276,72 @@ func Rows(projectsDir, catalog string, records []project.Record, snapshot Snapsh
return rows, inferredCounts
}
-// ApplyPresentation fills the fields filtering and sorting never read:
-// project and service icons, custom URLs, and the env access probe. records,
-// details and metas must align by index.
-func ApplyPresentation(ctx context.Context, projectsDir, catalog string, records []project.Record, details []project.Details, metas []projects.ArcaneComposeMetadata) {
- for i := range records {
- resp := &details[i]
+// ApplyPresentation returns details with the fields filtering and sorting never
+// read: project and service icons, custom URLs, and the env access probe.
+// records, details and metas must align by index.
+func ApplyPresentation(ctx context.Context, projectsDir, catalog string, records []project.Record, details []project.Details, metas []projects.ArcaneComposeMetadata) []project.Details {
+ out := make([]project.Details, 0, len(details))
+ for i, d := range details {
icon := iconcatalog.Resolve(catalog, metas[i].ProjectIcon)
- resp.IconLightURL, resp.IconDarkURL = icon.IconLightURL, icon.IconDarkURL
- resp.URLs = metas[i].ProjectURLS
- resp.ConfigurationError = projects.CheckProjectEnvAccess(ctx, projectsDir, records[i].Path)
- for k := range resp.RuntimeServices {
- service := &resp.RuntimeServices[k]
+ services := make([]project.RuntimeService, 0, len(d.RuntimeServices))
+ for _, service := range d.RuntimeServices {
localIcon := iconcatalog.Resolve(catalog, cmp.Or(projects.FindArcaneIconSet(service.ContainerLabels), metas[i].ServiceIconSets[service.Name], metas[i].ProjectIcon))
- service.IconLightURL, service.IconDarkURL = localIcon.IconLightURL, localIcon.IconDarkURL
+ services = append(services, project.RuntimeService{ //exhaustruct:enforce
+ ContainerLabels: service.ContainerLabels,
+ ImageID: service.ImageID,
+ Name: service.Name,
+ Image: service.Image,
+ Status: service.Status,
+ ContainerID: service.ContainerID,
+ ContainerName: service.ContainerName,
+ Ports: service.Ports,
+ Health: service.Health,
+ IconLightURL: localIcon.IconLightURL,
+ IconDarkURL: localIcon.IconDarkURL,
+ ServiceConfig: service.ServiceConfig,
+ RedeployDisabled: service.RedeployDisabled,
+ })
}
+ out = append(out, project.Details{ //exhaustruct:enforce
+ EnvironmentTag: d.EnvironmentTag,
+ Tags: d.Tags,
+ StatusReason: d.StatusReason,
+ ActivityID: d.ActivityID,
+ LastSyncCommit: d.LastSyncCommit,
+ GitOpsManagedBy: d.GitOpsManagedBy,
+ UpdateInfo: d.UpdateInfo,
+ ArchivedAt: d.ArchivedAt,
+ Status: d.Status,
+ DirName: d.DirName,
+ ComposeContent: d.ComposeContent,
+ ComposeFileName: d.ComposeFileName,
+ ComposeFiles: d.ComposeFiles,
+ EnvContent: d.EnvContent,
+ OverrideContent: d.OverrideContent,
+ OverrideFileName: d.OverrideFileName,
+ Name: d.Name,
+ GitRepositoryURL: d.GitRepositoryURL,
+ IconLightURL: icon.IconLightURL,
+ RelativePath: d.RelativePath,
+ ID: d.ID,
+ IconDarkURL: icon.IconDarkURL,
+ Path: d.Path,
+ UpdatedAt: d.UpdatedAt,
+ CreatedAt: d.CreatedAt,
+ RuntimeServices: services,
+ Services: d.Services,
+ URLs: metas[i].ProjectURLS,
+ IncludeFiles: d.IncludeFiles,
+ RunningCount: d.RunningCount,
+ ServiceCount: d.ServiceCount,
+ IsDiscovered: d.IsDiscovered,
+ IsArchived: d.IsArchived,
+ HasBuildDirective: d.HasBuildDirective,
+ RedeployDisabled: d.RedeployDisabled,
+ ConfigurationError: projects.CheckProjectEnvAccess(ctx, projectsDir, records[i].Path),
+ })
}
+ return out
}
// KnownComposeProjectNames collects every name a tracked project uses.
@@ -352,8 +373,7 @@ func (s *Service) CountDiscoveredUpdates(ctx context.Context, allContainers []co
return len(s.DiscoveredUpdateRows(ctx, composeContainers, known, catalog))
}
-// DiscoveredUpdateRows builds rows for running compose projects Arcane does
-// not track that have a pending image update.
+// DiscoveredUpdateRows builds rows for untracked running compose projects that have a pending image update.
func (s *Service) DiscoveredUpdateRows(
ctx context.Context,
composeContainers []container.Summary,
@@ -385,14 +405,14 @@ func (s *Service) DiscoveredUpdateRows(
return nil
}
- var scoped map[string]*imagetypes.UpdateInfo
- if s.imageService != nil {
- var err error
- if scoped, err = s.imageService.GetUpdateInfoByContainers(ctx, composeContainers); err != nil {
+ scoped := func() map[string]*imagetypes.UpdateInfo {
+ info, err := s.imageService.GetUpdateInfoByContainers(ctx, composeContainers)
+ if err != nil {
slog.WarnContext(ctx, "failed to fetch discovered project tag updates", "error", err)
- scoped = nil
+ return nil
}
- }
+ return info
+ }()
rows := make([]project.Details, 0, len(containersByProject))
for projectName, projectContainers := range containersByProject {
// One runtime service per distinct service name and image.
@@ -420,43 +440,32 @@ func (s *Service) DiscoveredUpdateRows(
IconDarkURL: resolvedIcon.IconDarkURL,
})
}
- imageRefs := projects.ImageRefsFromRuntimeServices(runtimeServices)
checkServices := make([]project.RuntimeService, 0, len(projectContainers))
for _, c := range projectContainers {
- checkServices = append(checkServices, project.RuntimeService{Name: docker.ComposeServiceLabel(c.Labels), ContainerID: c.ID, Image: c.Image, ImageID: c.ImageID, ContainerLabels: c.Labels})
+ checkServices = append(checkServices, project.RuntimeService{
+ ContainerLabels: c.Labels,
+ ImageID: c.ImageID,
+ Name: docker.ComposeServiceLabel(c.Labels),
+ Image: c.Image,
+ ContainerID: c.ID,
+ })
}
- updateInfo := s.summarizeRuns(imageRefs, checkServices, scoped)
- if updateInfo == nil || !updateInfo.HasUpdate {
+ updateInfo := s.summarizeRuns(projects.ImageRefsFromRuntimeServices(runtimeServices), checkServices, scoped)
+ if !kit.FromPtr(updateInfo).HasUpdate {
continue
}
serviceCount, runningCount := ServiceCounts(runtimeServices)
- // Unlike tracked rows, a discovered project without services is unknown.
- status := project.StatusStopped
- switch {
- case serviceCount == 0:
- status = project.StatusUnknown
- case runningCount >= serviceCount:
- status = project.StatusRunning
- case runningCount > 0:
- status = project.StatusPartiallyRunning
- }
-
- lastCheckedAt := ""
- if updateInfo.LastCheckedAt != nil {
- lastCheckedAt = updateInfo.LastCheckedAt.Format(time.RFC3339)
- }
-
rows = append(rows, project.Details{
- ID: "compose:" + projectName,
- Name: projectName,
- Path: "",
- Status: status,
+ ID: "compose:" + projectName,
+ Name: projectName,
+ // Unlike tracked rows, a discovered project without services is unknown.
+ Status: ProjectStatus(runtimeServices),
ServiceCount: serviceCount,
RunningCount: runningCount,
IsDiscovered: true,
- CreatedAt: lastCheckedAt,
- UpdatedAt: lastCheckedAt,
+ CreatedAt: kit.Ternary(updateInfo.LastCheckedAt != nil, kit.FromPtr(updateInfo.LastCheckedAt).Format(time.RFC3339), ""),
+ UpdatedAt: kit.Ternary(updateInfo.LastCheckedAt != nil, kit.FromPtr(updateInfo.LastCheckedAt).Format(time.RFC3339), ""),
RuntimeServices: runtimeServices,
UpdateInfo: updateInfo,
})
@@ -534,11 +543,7 @@ func PaginationConfig() pagination.Config[project.Details] {
{
Key: "updates",
Fn: func(p project.Details, filterValue string) bool {
- status := "unknown"
- if p.UpdateInfo != nil && strings.TrimSpace(p.UpdateInfo.Status) != "" {
- status = p.UpdateInfo.Status
- }
- return strings.EqualFold(strings.TrimSpace(status), strings.TrimSpace(filterValue))
+ return strings.EqualFold(cmp.Or(strings.TrimSpace(kit.FromPtr(p.UpdateInfo).Status), "unknown"), strings.TrimSpace(filterValue))
},
},
{
@@ -556,16 +561,10 @@ func PaginationConfig() pagination.Config[project.Details] {
NoSplit: true,
Fn: func(p project.Details, filterValue string) bool {
key, value, hasValue := strings.Cut(filterValue, "=")
- key = strings.TrimSpace(key)
- if key == "" {
- return true
- }
- for _, service := range p.RuntimeServices {
- if actual, ok := service.ContainerLabels[key]; ok && (!hasValue || actual == value) {
- return true
- }
- }
- return false
+ return strings.TrimSpace(key) == "" || slices.ContainsFunc(p.RuntimeServices, func(service project.RuntimeService) bool {
+ actual, ok := service.ContainerLabels[strings.TrimSpace(key)]
+ return ok && (!hasValue || actual == value)
+ })
},
},
},
@@ -575,12 +574,20 @@ func PaginationConfig() pagination.Config[project.Details] {
// Page searches, orders and paginates rows by their derived fields and returns
// the page indexes of tracked rows still needing enrichment.
func Page(items []project.Details, params pagination.QueryParams, tracked func(id string) bool) (pagination.FilterResult[project.Details], []int) {
- // Tags are filtered in the database query.
- if _, exists := params.Filters["tags"]; exists {
- params.Filters = maps.Clone(params.Filters)
- delete(params.Filters, "tags")
- }
- result := PaginationConfig().SearchOrderAndPaginate(items, params)
+ result := PaginationConfig().SearchOrderAndPaginate(items, pagination.QueryParams{
+ SearchQuery: params.SearchQuery,
+ SortParams: params.SortParams,
+ Params: params.Params,
+ // Tags are filtered in the database query.
+ Filters: func() map[string]string {
+ if _, exists := params.Filters["tags"]; !exists {
+ return params.Filters
+ }
+ filters := maps.Clone(params.Filters)
+ delete(filters, "tags")
+ return filters
+ }(),
+ })
pageIndexes := make([]int, 0, len(result.Items))
for i, item := range result.Items {
if tracked(item.ID) {
diff --git a/backend/internal/project/children/listing/service_test.go b/backend/internal/project/children/listing/service_test.go
index 5f0dd967c..7ed75a3e0 100644
--- a/backend/internal/project/children/listing/service_test.go
+++ b/backend/internal/project/children/listing/service_test.go
@@ -178,7 +178,7 @@ func TestMapProjectToDto_SetsRedeployDisabledFromRuntimeServices(t *testing.T) {
},
},
},
- }, currentContainerID: tt.currentContainerID, currentContainerErr: tt.currentErr})
+ }, currentContainerID: tt.currentContainerID, currentContainerErr: tt.currentErr}, nil)
require.Equal(t, tt.wantProject, details.RedeployDisabled)
require.Len(t, details.RuntimeServices, 1)
@@ -205,7 +205,7 @@ func TestProjectListRow_SeedsHasBuildDirectiveFromPersistedRefs(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
p := project.Record{ID: tt.name, Name: tt.name, Path: t.TempDir(), UpdatedAt: &now, BuildImageRefsJSON: tt.buildImageRefsJSON}
- assert.Equal(t, tt.want, row(projectsDirectory, iconcatalog.DefaultCatalog, p, Snapshot{}).HasBuildDirective)
+ assert.Equal(t, tt.want, row(projectsDirectory, iconcatalog.DefaultCatalog, p, Snapshot{}, nil).HasBuildDirective)
})
}
}
diff --git a/backend/internal/project/children/sync/service.go b/backend/internal/project/children/sync/service.go
index 6365c9e85..398f74c55 100644
--- a/backend/internal/project/children/sync/service.go
+++ b/backend/internal/project/children/sync/service.go
@@ -1,8 +1,10 @@
-// Package sync manages the project env files a git sync writes: the git
-// source, the Arcane override and the merged effective .env.
+// Package sync manages the project env files a git sync writes (the git
+// source, the Arcane override and the merged effective .env) and persists
+// submitted project file updates.
package sync
import (
+ "cmp"
"context"
"errors"
"fmt"
@@ -23,13 +25,12 @@ func PersistEffectiveEnvContent(ctx context.Context, projectPath, projectsDirect
return fmt.Errorf("read project env state: %w", err)
}
- // WriteManagedEnvFile skips unreadable paths so git sync keeps working; an
- // explicit env save would then be dropped without any feedback.
- targets := []string{projects.EffectiveEnvFileName}
- if state.HasGitSource {
- targets = append(targets, projects.OverrideEnvFileName)
- }
- for _, name := range targets {
+ // WriteManagedEnvFile skips unreadable paths for git sync; an explicit env save would be dropped silently.
+ for _, name := range kit.Ternary(
+ state.HasGitSource,
+ []string{projects.EffectiveEnvFileName, projects.OverrideEnvFileName},
+ []string{projects.EffectiveEnvFileName},
+ ) {
if info, statErr := os.Stat(filepath.Join(projectPath, name)); statErr == nil && info.IsDir() {
return fmt.Errorf("cannot save environment: %s is a directory", name)
}
@@ -89,9 +90,9 @@ func ResolveStoredEffectiveEnvContent(state projects.ProjectEnvState) (string, e
return state.DirectContent, nil
}
-// EffectiveEnvContentForUpdate returns the env content a project update keeps
+// effectiveEnvContentForUpdate returns the env content a project update keeps
// when the caller supplied none.
-func EffectiveEnvContentForUpdate(projectPath string, envContent *string) (*string, error) {
+func effectiveEnvContentForUpdate(projectPath string, envContent *string) (*string, error) {
if envContent != nil {
return envContent, nil
}
@@ -104,8 +105,8 @@ func EffectiveEnvContentForUpdate(projectPath string, envContent *string) (*stri
return update.EffectiveContent, nil
}
-// EnsureEffectiveEnvFile rebuilds .env from the managed env sources.
-func EnsureEffectiveEnvFile(ctx context.Context, projectPath, projectsDirectory string) error {
+// ensureEffectiveEnvFile rebuilds .env from the managed env sources.
+func ensureEffectiveEnvFile(ctx context.Context, projectPath, projectsDirectory string) error {
state, err := projects.ReadProjectEnvState(projectPath)
if err != nil {
return fmt.Errorf("read project env state: %w", err)
@@ -133,6 +134,60 @@ func EnsureEffectiveEnvFile(ctx context.Context, projectPath, projectsDirectory
return projects.WriteManagedEnvFile(ctx, projectsDirectory, projectPath, projects.EffectiveEnvFileName, state.EffectiveUnreadable, effectiveContent)
}
+// PersistUpdatedProjectFiles validates and writes submitted compose, override,
+// and env content. An override-only save validates the on-disk base merged with
+// the requested override, so a base only valid with its override still passes
+// and a delete that would break the base fails before touching disk.
+func PersistUpdatedProjectFiles(ctx context.Context, projectPath, projectName, projectsDirectory string, composeContent, envContent, overrideContent *string) error {
+ if composeContent == nil && overrideContent == nil {
+ if envContent != nil {
+ return PersistEffectiveEnvContent(ctx, projectPath, projectsDirectory, *envContent)
+ }
+ return nil
+ }
+
+ baseContent, _, err := kit.Ternary(composeContent != nil, func() (string, string, error) {
+ return *composeContent, "", nil
+ }, func() (string, string, error) {
+ return projects.ReadProjectFiles(ctx, projectPath, "")
+ })()
+ if err != nil {
+ return fmt.Errorf("failed to read project files: %w", err)
+ }
+ effectiveEnvContent, err := effectiveEnvContentForUpdate(projectPath, envContent)
+ if err != nil {
+ return fmt.Errorf("invalid compose file: %w", err)
+ }
+ valOverride, valOverrideName := projects.ResolveEffectiveOverrideForValidation(projectPath, overrideContent)
+ if validateErr := projects.ValidateComposeContentForUpdate(
+ ctx, projectsDirectory, projectPath, projectName, baseContent, effectiveEnvContent, valOverride, valOverrideName, false,
+ ); validateErr != nil {
+ return fmt.Errorf("invalid compose file: %w", validateErr)
+ }
+
+ // The env is persisted first so WriteComposeFile targets the COMPOSE_FILE
+ // base the updated .env selects. A non-nil composeContent is an explicit
+ // submission and is always written.
+ if envContent != nil {
+ if persistErr := PersistEffectiveEnvContent(ctx, projectPath, projectsDirectory, *envContent); persistErr != nil {
+ return fmt.Errorf("failed to save project files: %w", persistErr)
+ }
+ } else if composeContent != nil {
+ if ensureErr := ensureEffectiveEnvFile(ctx, projectPath, projectsDirectory); ensureErr != nil {
+ return fmt.Errorf("failed to save project files: %w", ensureErr)
+ }
+ }
+ if composeContent != nil {
+ if writeErr := projects.WriteComposeFile(ctx, projectsDirectory, projectPath, *composeContent); writeErr != nil {
+ return fmt.Errorf("failed to save project files: %w", writeErr)
+ }
+ }
+ if overrideErr := projects.ApplyOverrideFileChange(ctx, projectsDirectory, projectPath, overrideContent); overrideErr != nil {
+ return fmt.Errorf("failed to save project files: %w", overrideErr)
+ }
+ return nil
+}
+
// PrepareGitSyncEnvUpdate resolves the env merge for incoming git env content.
func PrepareGitSyncEnvUpdate(projectPath string, gitEnvContent *string) (GitSyncEnvUpdate, error) {
state, err := projects.ReadProjectEnvState(projectPath)
@@ -140,53 +195,57 @@ func PrepareGitSyncEnvUpdate(projectPath string, gitEnvContent *string) (GitSync
return GitSyncEnvUpdate{}, fmt.Errorf("read project env state: %w", err)
}
- update := GitSyncEnvUpdate{
- State: state,
- gitEnvContent: gitEnvContent,
- }
-
if gitEnvContent == nil {
effectiveContent, resolveStoredEffectiveEnvContentErr := ResolveStoredEffectiveEnvContent(state)
if resolveStoredEffectiveEnvContentErr != nil {
return GitSyncEnvUpdate{}, resolveStoredEffectiveEnvContentErr
}
- if effectiveContent == "" && !state.HasEffective && !state.HasGitSource && !state.HasOverride {
- return update, nil
- }
- update.EffectiveContent = &effectiveContent
- return update, nil
- }
-
- switch {
- case state.HasGitSource:
- update.overrideContent, err = projects.BuildOverrideEnvContent(state.GitContent, state.OverrideContent)
- case state.HasOverride:
- storedContent, resolveErr := ResolveStoredEffectiveEnvContent(state)
- if resolveErr != nil {
- return GitSyncEnvUpdate{}, resolveErr
+ return GitSyncEnvUpdate{
+ State: state,
+ EffectiveContent: kit.Ternary(effectiveContent == "" && !state.HasEffective && !state.HasGitSource && !state.HasOverride, nil, &effectiveContent),
+ }, nil
+ }
+
+ overrideContent, err := func() (string, error) {
+ switch {
+ case state.HasGitSource:
+ content, buildErr := projects.BuildOverrideEnvContent(state.GitContent, state.OverrideContent)
+ return content, kit.Ternary(buildErr == nil, nil, fmt.Errorf("build override env content: %w", buildErr))
+ case state.HasOverride:
+ storedContent, resolveErr := ResolveStoredEffectiveEnvContent(state)
+ if resolveErr != nil {
+ return "", resolveErr
+ }
+ content, buildErr := projects.BuildOverrideEnvContent(*gitEnvContent, storedContent)
+ return content, kit.Ternary(buildErr == nil, nil, fmt.Errorf("build override env content: %w", buildErr))
+ case strings.TrimSpace(state.DirectContent) != "":
+ content, buildErr := projects.BuildAdditiveOverrideEnvContent(*gitEnvContent, state.DirectContent)
+ return content, kit.Ternary(buildErr == nil, nil, fmt.Errorf("build override env content: %w", buildErr))
}
- update.overrideContent, err = projects.BuildOverrideEnvContent(*gitEnvContent, storedContent)
- case strings.TrimSpace(state.DirectContent) != "":
- update.overrideContent, err = projects.BuildAdditiveOverrideEnvContent(*gitEnvContent, state.DirectContent)
- }
+ return "", nil
+ }()
if err != nil {
- return GitSyncEnvUpdate{}, fmt.Errorf("build override env content: %w", err)
+ return GitSyncEnvUpdate{}, err
}
- effectiveContent, err := projects.BuildEffectiveEnvContent(*gitEnvContent, update.overrideContent)
+ effectiveContent, err := projects.BuildEffectiveEnvContent(*gitEnvContent, overrideContent)
if err != nil {
return GitSyncEnvUpdate{}, fmt.Errorf("build effective env content: %w", err)
}
- update.EffectiveContent = &effectiveContent
-
- return update, nil
+ return GitSyncEnvUpdate{
+ State: state,
+ gitEnvContent: gitEnvContent,
+ overrideContent: overrideContent,
+ EffectiveContent: &effectiveContent,
+ }, nil
}
// GitSyncEnvUpdate is the resolved three-file env change for one git sync.
type GitSyncEnvUpdate struct {
- State projects.ProjectEnvState
- gitEnvContent *string
- overrideContent string
+ State projects.ProjectEnvState
+ gitEnvContent *string
+ overrideContent string
+ // EffectiveContent is the merged .env content, or nil when none is kept.
EffectiveContent *string
}
@@ -226,10 +285,6 @@ func PersistGitSyncEnvFiles(ctx context.Context, projectPath, projectsDirectory
return projects.WriteManagedEnvFile(ctx, projectsDirectory, projectPath, projects.OverrideEnvFileName, update.State.OverrideUnreadable, update.overrideContent)
}
-// EffectiveContent is the merged .env content, or nil when none is kept.
-
-// HadGitSource reports whether the project tracked a git env source before.
-
// ApplyGitSyncEnv applies the managed three-file environment merge and returns
// the effective content before and after the update.
func ApplyGitSyncEnv(ctx context.Context, projectPath, projectsDirectory string, gitEnvContent *string) (before, after string, err error) {
@@ -243,9 +298,8 @@ func ApplyGitSyncEnv(ctx context.Context, projectPath, projectsDirectory string,
return update.State.DirectContent, kit.FromPtr(update.EffectiveContent), nil
}
-// LoadComposeMetadata returns a discovered project's service count plus
-// compose-go's effective project name. Results are cached by dirPath until a
-// compose, include or env file changes.
+// LoadComposeMetadata returns a discovered project's service count and effective project name.
+// Results are cached by dirPath until a compose, include or env file changes.
func LoadComposeMetadata(
ctx context.Context,
cache project.ComposeCache[project.ComposeIdentity],
@@ -254,13 +308,9 @@ func LoadComposeMetadata(
pathMapper *projects.PathMapper,
) (project.ComposeIdentity, error) {
normName := projects.NormalizeProjectName(dirName)
- meta := project.ComposeIdentity{
- ResolvedProjectName: normName,
- }
-
composeFile, err := projects.DetectComposeFile(ctx, projectsDirectory, dirPath)
if err != nil {
- return meta, err
+ return project.ComposeIdentity{ResolvedProjectName: normName}, err
}
fingerprint := fmt.Sprintf("%q|%q|%q|%t|%#v", composeFile, normName, projectsDirectory, autoInjectEnv, pathMapper)
if cached, ok := cache.Get(dirPath, fingerprint); ok {
@@ -270,25 +320,20 @@ func LoadComposeMetadata(
// Load unnamed first so COMPOSE_PROJECT_NAME from .env wins; fall back to
// the normalized directory name when that fails.
dependencies := project.ComposeDependencies{}
- proj, err := projects.LoadComposeProject(ctx, composeFile, "", projectsDirectory, autoInjectEnv, pathMapper, nil, nil, false, &dependencies, nil, nil)
- if err != nil {
+ proj, loadErr := projects.LoadComposeProject(ctx, composeFile, "", projectsDirectory, autoInjectEnv, pathMapper, nil, nil, false, &dependencies, nil, nil)
+ if loadErr != nil {
dependencies = project.ComposeDependencies{}
proj, err = projects.LoadComposeProject(ctx, composeFile, normName, projectsDirectory, autoInjectEnv, pathMapper, nil, nil, false, &dependencies, nil, nil)
if err != nil {
- return meta, err
+ return project.ComposeIdentity{ResolvedProjectName: normName}, err
}
- } else if proj.Name != "" && proj.Name != normName {
- meta.ExplicitProjectName = true
}
-
- meta.ServiceCount = len(proj.Services)
- if proj.Name != "" {
- meta.ResolvedProjectName = proj.Name
- }
-
- // Keep a COMPOSE_PROJECT_NAME override so containers match.
- if proj.Name != "" && proj.Name != normName {
- meta.ComposeProjectName = new(proj.Name)
+ meta := project.ComposeIdentity{
+ ServiceCount: len(proj.Services),
+ ResolvedProjectName: cmp.Or(proj.Name, normName),
+ // Keep a COMPOSE_PROJECT_NAME override so containers match.
+ ComposeProjectName: kit.Ternary(proj.Name != "" && proj.Name != normName, new(proj.Name), nil),
+ ExplicitProjectName: loadErr == nil && proj.Name != "" && proj.Name != normName,
}
if composeFiles, envFiles, ok := projects.ComposeCacheDependencies(ctx, proj, dependencies, composeFile, projectsDirectory, autoInjectEnv); ok {
diff --git a/backend/internal/project/children/tags/service.go b/backend/internal/project/children/tags/service.go
index f873e4665..24d004b80 100644
--- a/backend/internal/project/children/tags/service.go
+++ b/backend/internal/project/children/tags/service.go
@@ -3,13 +3,14 @@
package tags
import (
+ "cmp"
"errors"
"fmt"
- "sort"
+ "slices"
"strings"
"github.com/getarcaneapp/arcane/types/v2/project"
- "go.getarcane.app/kit/pkg"
+ kit "go.getarcane.app/kit/pkg"
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
@@ -82,8 +83,12 @@ func ApplyUpdate(store Store, projectID, name string, color project.TagColor, at
if err != nil {
return fmt.Errorf("resolve project tag color: %w", err)
}
- resolvedColor := kit.Ternary(found, storedColor, color)
- if attachErr := store.InsertIgnoringConflict(project.TagAssignment{ProjectID: projectID, Name: name, Source: project.TagSourceUI, Color: resolvedColor}); attachErr != nil {
+ if attachErr := store.InsertIgnoringConflict(project.TagAssignment{
+ ProjectID: projectID,
+ Name: name,
+ Source: project.TagSourceUI,
+ Color: kit.Ternary(found, storedColor, color),
+ }); attachErr != nil {
return fmt.Errorf("attach UI project tag: %w", attachErr)
}
return nil
@@ -99,7 +104,12 @@ func ReplaceCompose(store Store, projectID string, normalized []project.TagOptio
}
rows := make([]project.TagAssignment, 0, len(normalized))
for _, tag := range normalized {
- rows = append(rows, project.TagAssignment{ProjectID: projectID, Name: tag.Name, Source: project.TagSourceCompose, Color: tag.Color})
+ rows = append(rows, project.TagAssignment{
+ ProjectID: projectID,
+ Name: tag.Name,
+ Source: project.TagSourceCompose,
+ Color: tag.Color,
+ })
}
if err := store.Insert(rows); err != nil {
return fmt.Errorf("replace Compose project tags: %w", err)
@@ -123,7 +133,12 @@ func AttachInitial(store Store, projectID string, uiTags []string, colors map[st
return err
}
}
- rows = append(rows, project.TagAssignment{ProjectID: projectID, Name: tag, Source: project.TagSourceUI, Color: color})
+ rows = append(rows, project.TagAssignment{
+ ProjectID: projectID,
+ Name: tag,
+ Source: project.TagSourceUI,
+ Color: color,
+ })
}
if err := store.Insert(rows); err != nil {
return fmt.Errorf("attach initial project tags: %w", err)
@@ -138,16 +153,26 @@ func Group(rows []project.TagAssignment) map[string][]project.Tag {
for _, row := range rows {
tags := result[row.ProjectID]
if len(tags) == 0 || tags[len(tags)-1].Name != row.Name {
- tags = append(tags, project.Tag{Name: row.Name, Color: row.Color})
+ result[row.ProjectID] = append(tags, project.Tag{
+ Name: row.Name,
+ Color: row.Color,
+ Sources: []project.TagSource{row.Source},
+ })
+ continue
+ }
+ tags[len(tags)-1] = project.Tag{ //exhaustruct:enforce
+ Name: tags[len(tags)-1].Name,
+ Color: tags[len(tags)-1].Color,
+ Sources: append(tags[len(tags)-1].Sources, row.Source),
}
- tags[len(tags)-1].Sources = append(tags[len(tags)-1].Sources, row.Source)
- result[row.ProjectID] = tags
}
for projectID := range result {
- sort.SliceStable(result[projectID], func(i, j int) bool { return result[projectID][i].Name < result[projectID][j].Name })
+ slices.SortStableFunc(result[projectID], func(a, b project.Tag) int {
+ return strings.Compare(a.Name, b.Name)
+ })
for index := range result[projectID] {
- sort.SliceStable(result[projectID][index].Sources, func(i, j int) bool {
- return result[projectID][index].Sources[i] == project.TagSourceUI && result[projectID][index].Sources[j] != project.TagSourceUI
+ slices.SortStableFunc(result[projectID][index].Sources, func(a, b project.TagSource) int {
+ return cmp.Compare(kit.Ternary(a == project.TagSourceUI, 0, 1), kit.Ternary(b == project.TagSourceUI, 0, 1))
})
}
}
diff --git a/backend/internal/project/children/update/service.go b/backend/internal/project/children/update/service.go
index 2634e1871..c8bda4e06 100644
--- a/backend/internal/project/children/update/service.go
+++ b/backend/internal/project/children/update/service.go
@@ -22,7 +22,9 @@ import (
"github.com/getarcaneapp/arcane/types/v2/project"
"github.com/getarcaneapp/arcane/types/v2/volume"
"github.com/moby/moby/client"
+ "github.com/samber/mo"
"go.getarcane.app/acfs"
+ "go.getarcane.app/kit/pkg"
"go.getarcane.app/updater"
"go.getarcane.app/updater/pkg/utils/tagpolicy"
"go.getarcane.app/updater/refs"
@@ -36,9 +38,8 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
-// Service edits project Compose sources for image updates and persists
-// rename journals in the KV store. Project rows stay with the parent, which
-// supplies their state through callbacks.
+// Service edits Compose sources for image updates and persists rename journals in the KV store.
+// Project rows stay with the parent, which supplies their state through callbacks.
type Service struct {
kv *kv.KVService
dockerService *docker.DockerClientService
@@ -84,10 +85,6 @@ func (s *Service) SyncState(ctx context.Context) SyncState {
SkipDiscoveredPaths: make(map[string]struct{}),
ProtectSeenPaths: make(map[string]struct{}),
}
- if s == nil || s.kv == nil {
- return state
- }
-
entries, err := s.kv.ListByPrefix(ctx, project.RenameJournalKeyPrefix)
if err != nil {
slog.WarnContext(ctx, "failed to list project rename journals during filesystem sync", "error", err)
@@ -117,11 +114,7 @@ func (s *Service) SyncState(ctx context.Context) SyncState {
// Prepare builds the journal for renaming a project, or nil when the name
// does not change.
func (s *Service) Prepare(projectID, oldName, oldPath string, oldDirName, name *string, projectsDirectory string, migration volume.Migration) *project.RenameJournal {
- if s == nil || s.kv == nil || name == nil {
- return nil
- }
-
- newName := strings.TrimSpace(*name)
+ newName := strings.TrimSpace(kit.FromPtr(name))
if newName == "" || oldName == newName {
return nil
}
@@ -131,33 +124,41 @@ func (s *Service) Prepare(projectID, oldName, oldPath string, oldDirName, name *
return nil
}
- journal := &project.RenameJournal{
+ return &project.RenameJournal{
ProjectID: projectID,
OldName: oldName,
NewName: newName,
OldPath: filepath.Clean(oldPath),
NewPath: filepath.Clean(filepath.Join(projectsDirectory, newDirName)),
+ OldDirName: mo.PointerToOption(oldDirName).ToPointer(),
NewDirName: newDirName,
Phase: project.RenameJournalPhaseStarted,
+ Volumes: func() []volume.JournalVolume {
+ if source, ok := migration.(volume.JournalSource); ok {
+ return source.JournalVolumes()
+ }
+ return nil
+ }(),
}
- if oldDirName != nil {
- journal.OldDirName = new(*oldDirName)
- }
-
- if source, ok := migration.(volume.JournalSource); ok {
- journal.Volumes = source.JournalVolumes()
- }
-
- return journal
}
// WriteJournal stores the journal at the given phase.
func (s *Service) WriteJournal(ctx context.Context, journal *project.RenameJournal, phase string) error {
- if s == nil || s.kv == nil || journal == nil {
+ if journal == nil {
return nil
}
- journal.Phase = phase
- journal.UpdatedAt = time.Now().UTC()
+ *journal = project.RenameJournal{ //exhaustruct:enforce
+ ProjectID: journal.ProjectID,
+ OldName: journal.OldName,
+ NewName: journal.NewName,
+ OldPath: journal.OldPath,
+ NewPath: journal.NewPath,
+ OldDirName: journal.OldDirName,
+ NewDirName: journal.NewDirName,
+ Phase: phase,
+ Volumes: journal.Volumes,
+ UpdatedAt: time.Now().UTC(),
+ }
payload, err := json.Marshal(journal)
if err != nil {
@@ -170,39 +171,8 @@ func (s *Service) WriteJournal(ctx context.Context, journal *project.RenameJourn
return nil
}
-func (s *Service) clearJournal(ctx context.Context, projectID string) error {
- if s == nil || s.kv == nil || strings.TrimSpace(projectID) == "" {
- return nil
- }
- return s.kv.Delete(ctx, project.RenameJournalKeyPrefix+projectID)
-}
-
-func (s *Service) writeRollbackCleanup(ctx context.Context, journal *project.RenameJournal) error {
- if s == nil || s.kv == nil || journal == nil || strings.TrimSpace(journal.ProjectID) == "" || len(journal.Volumes) == 0 {
- return nil
- }
-
- cleanup := project.RenameRollbackCleanup{
- ProjectID: journal.ProjectID,
- OldName: journal.OldName,
- OldPath: filepath.Clean(journal.OldPath),
- NewName: journal.NewName,
- NewPath: filepath.Clean(journal.NewPath),
- Volumes: journal.Volumes,
- UpdatedAt: time.Now().UTC(),
- }
- payload, err := json.Marshal(cleanup)
- if err != nil {
- return fmt.Errorf("marshal project rename rollback cleanup: %w", err)
- }
- if setErr := s.kv.Set(ctx, project.RenameRollbackCleanupKeyPrefix+journal.ProjectID, string(payload)); setErr != nil {
- return fmt.Errorf("write project rename rollback cleanup: %w", setErr)
- }
- return nil
-}
-
func (s *Service) clearRollbackCleanup(ctx context.Context, projectID string) error {
- if s == nil || s.kv == nil || strings.TrimSpace(projectID) == "" {
+ if strings.TrimSpace(projectID) == "" {
return nil
}
return s.kv.Delete(ctx, project.RenameRollbackCleanupKeyPrefix+projectID)
@@ -210,10 +180,6 @@ func (s *Service) clearRollbackCleanup(ctx context.Context, projectID string) er
// RecoverAll replays every pending rename journal and rollback cleanup.
func (s *Service) RecoverAll(ctx context.Context) error {
- if s == nil || s.kv == nil {
- return nil
- }
-
entries, err := s.kv.ListByPrefix(ctx, project.RenameJournalKeyPrefix)
if err != nil {
return err
@@ -226,7 +192,20 @@ func (s *Service) RecoverAll(ctx context.Context) error {
recoverErr = errors.Join(recoverErr, fmt.Errorf("decode project rename journal %s: %w", entry.Key, unmarshalErr))
continue
}
- if journalErr := s.recoverJournal(ctx, &journal); journalErr != nil {
+ if strings.TrimSpace(journal.ProjectID) == "" {
+ continue
+ }
+ name, path, found, stateErr := s.projectState(ctx, journal.ProjectID)
+ if stateErr != nil {
+ recoverErr = errors.Join(recoverErr, fmt.Errorf("recover project rename journal %s: load project for rename recovery: %w", entry.Key, stateErr))
+ continue
+ }
+ if journalErr := projects.RecoverRenameJournal(
+ ctx,
+ &journal,
+ found && (name == journal.NewName || filepath.Clean(path) == filepath.Clean(journal.NewPath)),
+ s.Operations(),
+ ); journalErr != nil {
recoverErr = errors.Join(recoverErr, fmt.Errorf("recover project rename journal %s: %w", entry.Key, journalErr))
}
}
@@ -241,7 +220,27 @@ func (s *Service) RecoverAll(ctx context.Context) error {
recoverErr = errors.Join(recoverErr, fmt.Errorf("decode project rename rollback cleanup %s: %w", entry.Key, unmarshalErr))
continue
}
- if cleanupErr := s.recoverRollbackCleanup(ctx, &cleanup); cleanupErr != nil {
+ if cleanupErr := func() error {
+ if strings.TrimSpace(cleanup.ProjectID) == "" {
+ return nil
+ }
+ if len(cleanup.Volumes) == 0 {
+ return s.clearRollbackCleanup(ctx, cleanup.ProjectID)
+ }
+ name, path, found, stateErr := s.projectState(ctx, cleanup.ProjectID)
+ if stateErr != nil {
+ return fmt.Errorf("load project for rename rollback cleanup: %w", stateErr)
+ }
+ if !found {
+ slog.WarnContext(ctx, "clearing project rename rollback cleanup because project no longer exists", "projectId", cleanup.ProjectID)
+ return s.clearRollbackCleanup(ctx, cleanup.ProjectID)
+ }
+ if name != cleanup.OldName || filepath.Clean(path) != filepath.Clean(cleanup.OldPath) {
+ slog.WarnContext(ctx, "clearing project rename rollback cleanup because project state changed", "projectId", cleanup.ProjectID, "projectName", name, "projectPath", path)
+ return s.clearRollbackCleanup(ctx, cleanup.ProjectID)
+ }
+ return projects.CleanupRenameRollbackTargets(ctx, &cleanup, s.Operations())
+ }(); cleanupErr != nil {
recoverErr = errors.Join(recoverErr, fmt.Errorf("recover project rename rollback cleanup %s: %w", entry.Key, cleanupErr))
}
}
@@ -250,7 +249,7 @@ func (s *Service) RecoverAll(ctx context.Context) error {
// RecoverProject replays one project's pending rename journal.
func (s *Service) RecoverProject(ctx context.Context, projectID string) error {
- if s == nil || s.kv == nil || strings.TrimSpace(projectID) == "" {
+ if strings.TrimSpace(projectID) == "" {
return nil
}
@@ -263,73 +262,95 @@ func (s *Service) RecoverProject(ctx context.Context, projectID string) error {
if unmarshalErr := json.Unmarshal([]byte(raw), &journal); unmarshalErr != nil {
return fmt.Errorf("decode project rename journal: %w", unmarshalErr)
}
- return s.recoverJournal(ctx, &journal)
-}
-
-func (s *Service) recoverJournal(ctx context.Context, journal *project.RenameJournal) error {
- if s == nil || journal == nil || strings.TrimSpace(journal.ProjectID) == "" {
+ if strings.TrimSpace(journal.ProjectID) == "" {
return nil
}
-
name, path, found, stateErr := s.projectState(ctx, journal.ProjectID)
if stateErr != nil {
return fmt.Errorf("load project for rename recovery: %w", stateErr)
}
-
- projectCommitted := found && (name == journal.NewName || filepath.Clean(path) == filepath.Clean(journal.NewPath))
- return projects.RecoverRenameJournal(ctx, journal, projectCommitted, s.Operations())
+ return projects.RecoverRenameJournal(ctx, &journal, found && (name == journal.NewName || filepath.Clean(path) == filepath.Clean(journal.NewPath)), s.Operations())
}
-func (s *Service) recoverRollbackCleanup(ctx context.Context, cleanup *project.RenameRollbackCleanup) error {
- if s == nil || cleanup == nil || strings.TrimSpace(cleanup.ProjectID) == "" {
- return nil
- }
- if len(cleanup.Volumes) == 0 {
- return s.clearRollbackCleanup(ctx, cleanup.ProjectID)
- }
-
- name, path, found, stateErr := s.projectState(ctx, cleanup.ProjectID)
- if stateErr != nil {
- return fmt.Errorf("load project for rename rollback cleanup: %w", stateErr)
- }
- if !found {
- slog.WarnContext(ctx, "clearing project rename rollback cleanup because project no longer exists", "projectId", cleanup.ProjectID)
- return s.clearRollbackCleanup(ctx, cleanup.ProjectID)
- }
-
- if name != cleanup.OldName || filepath.Clean(path) != filepath.Clean(cleanup.OldPath) {
- slog.WarnContext(ctx, "clearing project rename rollback cleanup because project state changed", "projectId", cleanup.ProjectID, "projectName", name, "projectPath", path)
- return s.clearRollbackCleanup(ctx, cleanup.ProjectID)
- }
-
- return projects.CleanupRenameRollbackTargets(ctx, cleanup, s.Operations())
-}
-
-func (s *Service) dockerClient(ctx context.Context, dockerRequired bool) (*client.Client, error) {
- if !dockerRequired {
- return nil, nil
+// RollbackFailedUpdate rolls a directory rename back, restores the pre-update files,
+// and replays an active rename journal.
+func (s *Service) RollbackFailedUpdate(
+ ctx context.Context,
+ projectID, projectsDirectory, originalPath, currentPath string,
+ backup *projects.ProjectUpdateBackup,
+ journalActive bool,
+ err error,
+) error {
+ // The rollback runs detached so a cancelled update cannot leave the directory renamed. Paths sharing a parent
+ // stay confined; an imported project elsewhere crosses roots and cannot be confined.
+ renameErr := func() error {
+ switch {
+ case currentPath == originalPath:
+ return nil
+ case filepath.Dir(originalPath) == filepath.Dir(currentPath):
+ return acfs.Rename(context.WithoutCancel(ctx), filepath.Dir(originalPath), "/"+filepath.Base(currentPath), "/"+filepath.Base(originalPath))
+ }
+ return os.Rename(currentPath, originalPath)
+ }()
+ if renameErr != nil {
+ slog.WarnContext(ctx, "failed to rollback project directory rename", "from", currentPath, "to", originalPath, "error", renameErr)
}
- if s.dockerService == nil {
- return nil, errors.New("docker service unavailable")
+ if backup != nil {
+ if restoreErr := projects.RestoreProjectDirectoryBackup(ctx, projectsDirectory, kit.Ternary(renameErr == nil, originalPath, currentPath), backup); restoreErr != nil {
+ err = errors.Join(err, fmt.Errorf("failed to restore project files after update failure: %w", restoreErr))
+ }
}
-
- dockerClient, err := s.dockerService.GetClient(ctx)
- if err != nil {
- return nil, fmt.Errorf("failed to connect to Docker: %w", err)
+ if journalActive {
+ if recoverErr := s.RecoverProject(ctx, projectID); recoverErr != nil {
+ err = errors.Join(err, fmt.Errorf("project rename recovery failed: %w", recoverErr))
+ }
}
-
- return dockerClient, nil
+ return err
}
// Operations exposes journal persistence to the shared rename engine.
func (s *Service) Operations() project.RenameRecoveryOperations {
return project.RenameRecoveryOperations{
- Docker: s.dockerClient,
- WriteJournal: s.WriteJournal,
- ClearJournal: s.clearJournal,
+ Docker: func(ctx context.Context, dockerRequired bool) (*client.Client, error) {
+ if !dockerRequired {
+ return nil, nil
+ }
+ dockerClient, err := s.dockerService.GetClient(ctx)
+ if err != nil {
+ return nil, fmt.Errorf("failed to connect to Docker: %w", err)
+ }
+ return dockerClient, nil
+ },
+ WriteJournal: s.WriteJournal,
+ ClearJournal: func(ctx context.Context, projectID string) error {
+ if strings.TrimSpace(projectID) == "" {
+ return nil
+ }
+ return s.kv.Delete(ctx, project.RenameJournalKeyPrefix+projectID)
+ },
ClearRollbackCleanup: s.clearRollbackCleanup,
- WriteRollbackCleanup: s.writeRollbackCleanup,
- RestoreState: s.restoreState,
+ WriteRollbackCleanup: func(ctx context.Context, journal *project.RenameJournal) error {
+ if strings.TrimSpace(kit.FromPtr(journal).ProjectID) == "" || len(journal.Volumes) == 0 {
+ return nil
+ }
+ payload, err := json.Marshal(project.RenameRollbackCleanup{
+ ProjectID: journal.ProjectID,
+ OldName: journal.OldName,
+ OldPath: filepath.Clean(journal.OldPath),
+ NewName: journal.NewName,
+ NewPath: filepath.Clean(journal.NewPath),
+ Volumes: journal.Volumes,
+ UpdatedAt: time.Now().UTC(),
+ })
+ if err != nil {
+ return fmt.Errorf("marshal project rename rollback cleanup: %w", err)
+ }
+ if setErr := s.kv.Set(ctx, project.RenameRollbackCleanupKeyPrefix+journal.ProjectID, string(payload)); setErr != nil {
+ return fmt.Errorf("write project rename rollback cleanup: %w", setErr)
+ }
+ return nil
+ },
+ RestoreState: s.restoreState,
}
}
@@ -355,7 +376,7 @@ func PersistProjectServiceImages(ctx context.Context, projectPath, logical strin
}
func composeImageField(node *yaml.Node, key string) *yaml.Node {
- if node == nil || node.Kind != yaml.MappingNode {
+ if kit.FromPtr(node).Kind != yaml.MappingNode {
return nil
}
for i := 0; i+1 < len(node.Content); i += 2 {
@@ -405,7 +426,7 @@ func PrepareProjectServiceImages(source []byte, effective *types.Project, change
return nil, nil, errors.New("tag updates do not rewrite Compose includes; update their source manually")
}
servicesNode := composeImageField(document.Content[0], "services")
- if servicesNode == nil || servicesNode.Kind != yaml.MappingNode {
+ if kit.FromPtr(servicesNode).Kind != yaml.MappingNode {
return nil, nil, errors.New("Compose source has no services mapping") //nolint:staticcheck // Preserve the existing error message.
}
serviceNames := make([]string, 0, len(changes))
@@ -428,7 +449,7 @@ func PrepareProjectServiceImages(source []byte, effective *types.Project, change
return nil, nil, fmt.Errorf("tag updates do not rewrite extended service %s; update its source manually", name)
}
imageNode := composeImageField(serviceNode, "image")
- if imageNode == nil || imageNode.Kind != yaml.ScalarNode || imageNode.Tag != "!!str" {
+ if kit.FromPtr(imageNode).Kind != yaml.ScalarNode || imageNode.Tag != "!!str" {
return nil, nil, fmt.Errorf("service %s requires an explicit image scalar in the authoritative Compose file", name)
}
if !strings.Contains(imageNode.Value, "$") && refs.NormalizeImageUpdateRef(imageNode.Value) != expected && refs.NormalizeImageUpdateRef(imageNode.Value) != target {
@@ -455,15 +476,15 @@ func PrepareProjectServiceImages(source []byte, effective *types.Project, change
// and renders the target in the scalar's original style.
func composeImageSourceEdit(source []byte, node *yaml.Node, target string) (composeImageEdit, error) {
const lineBreaks = "\r\n\u0085\u2028\u2029"
- edit := composeImageEdit{start: len(source) - len(bytes.TrimPrefix(source, []byte("\xEF\xBB\xBF")))}
+ start := len(source) - len(bytes.TrimPrefix(source, []byte("\xEF\xBB\xBF")))
for line, column := 1, 1; line < node.Line || (line == node.Line && column < node.Column); column++ {
- if edit.start >= len(source) {
- return edit, errors.New("image scalar position is outside the Compose source")
+ if start >= len(source) {
+ return composeImageEdit{}, errors.New("image scalar position is outside the Compose source")
}
- r, size := utf8.DecodeRune(source[edit.start:])
- edit.start += size
- if r == '\r' && bytes.HasPrefix(source[edit.start:], []byte("\n")) {
- edit.start++
+ r, size := utf8.DecodeRune(source[start:])
+ start += size
+ if r == '\r' && bytes.HasPrefix(source[start:], []byte("\n")) {
+ start++
}
if strings.ContainsRune(lineBreaks, r) {
line, column = line+1, 0
@@ -471,31 +492,31 @@ func composeImageSourceEdit(source []byte, node *yaml.Node, target string) (comp
}
// The shortest same-line span that decodes to the parsed value is the scalar's source text, including tags and escapes.
found := false
- for edit.end = edit.start; !found && edit.end < len(source); {
- r, size := utf8.DecodeRune(source[edit.end:])
+ end := start
+ for !found && end < len(source) {
+ r, size := utf8.DecodeRune(source[end:])
if strings.ContainsRune(lineBreaks, r) {
break
}
- edit.end += size
+ end += size
var decoded string
- found = yaml.Unmarshal(source[edit.start:edit.end], &decoded) == nil && decoded == node.Value
+ found = yaml.Unmarshal(source[start:end], &decoded) == nil && decoded == node.Value
}
if !found {
- return edit, errors.New("tag updates require a single-line image scalar")
+ return composeImageEdit{}, errors.New("tag updates require a single-line image scalar")
}
text, err := yaml.Marshal(&yaml.Node{Kind: yaml.ScalarNode, Tag: "!!str", Style: node.Style, Value: target})
- edit.text = bytes.TrimSuffix(text, []byte("\n"))
- if err != nil || bytes.ContainsAny(edit.text, "\r\n") {
- return edit, fmt.Errorf("image %s cannot be written as a single-line scalar", target)
+ if err != nil || bytes.ContainsAny(bytes.TrimSuffix(text, []byte("\n")), "\r\n") {
+ return composeImageEdit{}, fmt.Errorf("image %s cannot be written as a single-line scalar", target)
}
- return edit, nil
+ return composeImageEdit{start: start, end: end, text: bytes.TrimSuffix(text, []byte("\n"))}, nil
}
// EnsureProjectEnvReadable rejects operator-driven file writes into a project
// whose .env exists but cannot be read by the runtime user.
func EnsureProjectEnvReadable(ctx context.Context, projectsDirectory, projectPath string) error {
cfgErr := projects.CheckProjectEnvAccess(ctx, projectsDirectory, projectPath)
- if cfgErr == nil || !cfgErr.BlocksOperations {
+ if !kit.FromPtr(cfgErr).BlocksOperations {
return nil
}
return common.Classify(
@@ -516,38 +537,33 @@ func (s *Service) ImageChanges(ctx context.Context, effective *types.Project, gi
changes := make(map[string]updatertypes.ServiceImageChange)
for _, key := range effective.ServiceNames() {
service := effective.Services[key]
- name := service.Name
configuredPolicy := policy.TagPolicy(service.Labels)
if service.Build != nil && (configuredPolicy.Strategy == "" || configuredPolicy.Strategy == "auto") && configuredPolicy.Constraint == "" && configuredPolicy.TagPattern == "" {
continue
}
- immutable := refs.IsDigestPinnedReference(service.Image) || refs.IsImageIDLikeReference(service.Image)
- if configuredPolicy.Strategy == "tag" && immutable {
- return nil, fmt.Errorf("service %s has an immutable image reference", name)
+ if configuredPolicy.Strategy == "tag" && (refs.IsDigestPinnedReference(service.Image) || refs.IsImageIDLikeReference(service.Image)) {
+ return nil, fmt.Errorf("service %s has an immutable image reference", service.Name)
}
tagPolicy, err := tagpolicy.Resolve(service.Image, configuredPolicy)
if err != nil {
- return nil, fmt.Errorf("resolve service %s update policy: %w", name, err)
+ return nil, fmt.Errorf("resolve service %s update policy: %w", service.Name, err)
}
if tagPolicy.Strategy == "digest" {
continue
}
switch {
case policy.IsUpdateDisabled(service.Labels):
- return nil, fmt.Errorf("updates are disabled for service %s", name)
+ return nil, fmt.Errorf("updates are disabled for service %s", service.Name)
case service.Build != nil:
- return nil, fmt.Errorf("tag discovery is unsupported for locally built service %s", name)
+ return nil, fmt.Errorf("tag discovery is unsupported for locally built service %s", service.Name)
case gitOpsManaged:
return nil, errors.New("tag updates cannot edit a GitOps-managed project; update image tags in the source repository")
- case immutable:
- return nil, fmt.Errorf("service %s has an immutable image reference", name)
+ case refs.IsDigestPinnedReference(service.Image) || refs.IsImageIDLikeReference(service.Image):
+ return nil, fmt.Errorf("service %s has an immutable image reference", service.Name)
}
parsed, err := refs.NormalizeReference(service.Image)
if err != nil {
- return nil, fmt.Errorf("parse service %s image: %w", name, err)
- }
- if s.registryService == nil {
- return nil, errors.New("registry service unavailable for tag updates")
+ return nil, fmt.Errorf("parse service %s image: %w", service.Name, err)
}
credentials, err := s.credentials(ctx)
if err != nil {
@@ -555,14 +571,17 @@ func (s *Service) ImageChanges(ctx context.Context, effective *types.Project, gi
}
tags, err := s.registryService.ListImageTags(ctx, service.Image, credentials)
if err != nil {
- return nil, fmt.Errorf("list service %s image tags: %w", name, err)
+ return nil, fmt.Errorf("list service %s image tags: %w", service.Name, err)
}
selected, err := tagpolicy.Select(parsed.Tag, tags, tagPolicy)
if err != nil {
- return nil, fmt.Errorf("select service %s image tag: %w", name, err)
+ return nil, fmt.Errorf("select service %s image tag: %w", service.Name, err)
}
if selected != parsed.Tag {
- changes[key] = updatertypes.ServiceImageChange{ExpectedRef: service.Image, TargetRef: parsed.RegistryHost + "/" + parsed.Repository + ":" + selected}
+ changes[key] = updatertypes.ServiceImageChange{
+ ExpectedRef: service.Image,
+ TargetRef: parsed.RegistryHost + "/" + parsed.Repository + ":" + selected,
+ }
}
}
return changes, nil
diff --git a/backend/internal/project/children/workspace/service.go b/backend/internal/project/children/workspace/service.go
index 69bc3fc74..a37633ab6 100644
--- a/backend/internal/project/children/workspace/service.go
+++ b/backend/internal/project/children/workspace/service.go
@@ -52,11 +52,26 @@ func (s *Service) Read(ctx context.Context, projectPath, composeFileName string,
}
for i := range files {
if _, ok := owned[files[i].RelativePath]; ok {
- files[i].Editable = false
- files[i].ReadOnlyReason = workspacetypes.FileReadOnlyGitOpsManaged
+ files[i] = workspacetypes.FileEntry{ //exhaustruct:enforce
+ ModTime: files[i].ModTime,
+ Name: files[i].Name,
+ Path: files[i].Path,
+ RelativePath: files[i].RelativePath,
+ Mode: files[i].Mode,
+ LinkTarget: files[i].LinkTarget,
+ Size: files[i].Size,
+ IsDirectory: files[i].IsDirectory,
+ IsSymlink: files[i].IsSymlink,
+ Editable: false,
+ ReadOnlyReason: workspacetypes.FileReadOnlyGitOpsManaged,
+ }
}
}
- return &workspacetypes.Workspace{Files: files, FileTreeRevision: revision, FileTreeTruncated: truncated}, nil
+ return &workspacetypes.Workspace{
+ Files: files,
+ FileTreeRevision: revision,
+ FileTreeTruncated: truncated,
+ }, nil
}
// File returns one workspace file's content and whether it may be edited.
@@ -65,29 +80,31 @@ func (s *Service) File(ctx context.Context, projectPath, composeFileName, relati
if err != nil {
return nil, err
}
- response := &workspacetypes.FileContent{
- Path: fullPath,
- RelativePath: rel,
- Name: entry.Name,
- Size: entry.Size,
+ response := func(readOnlyReason, mimeType, content string) *workspacetypes.FileContent {
+ return &workspacetypes.FileContent{
+ Path: fullPath,
+ RelativePath: rel,
+ Name: entry.Name,
+ Content: content,
+ MimeType: mimeType,
+ Size: entry.Size,
+ Editable: readOnlyReason == "",
+ ReadOnlyReason: readOnlyReason,
+ }
}
if entry.IsDirectory {
return nil, common.Classify(common.ErrProjectWorkspaceBadRequest, errors.New("workspace path is a directory"))
}
if entry.IsSymlink {
- response.ReadOnlyReason = workspacetypes.FileReadOnlySymlink
- return response, nil
+ return response(workspacetypes.FileReadOnlySymlink, "", ""), nil
}
if !acfsutils.IsRegular(entry) {
- response.ReadOnlyReason = workspacetypes.FileReadOnlySpecial
- return response, nil
+ return response(workspacetypes.FileReadOnlySpecial, "", ""), nil
}
- maxBytes := workspacepkg.MaxFileSizeBytes(s.config.ProjectWorkspaceMaxFileSizeMB)
- if entry.Size > maxBytes {
- response.ReadOnlyReason = workspacetypes.FileReadOnlyTooLarge
- return response, nil
+ if entry.Size > workspacepkg.MaxFileSizeBytes(s.config.ProjectWorkspaceMaxFileSizeMB) {
+ return response(workspacetypes.FileReadOnlyTooLarge, "", ""), nil
}
- reader, _, err := acfs.OpenRead(ctx, projectPath, "/"+rel, maxBytes)
+ reader, _, err := acfs.OpenRead(ctx, projectPath, "/"+rel, workspacepkg.MaxFileSizeBytes(s.config.ProjectWorkspaceMaxFileSizeMB))
if err != nil {
return nil, classifyACFSError(err, "read project workspace file")
}
@@ -96,20 +113,14 @@ func (s *Service) File(ctx context.Context, projectPath, composeFileName, relati
if err != nil {
return nil, fmt.Errorf("read project workspace file: %w", err)
}
- response.MimeType = http.DetectContentType(content)
if !workspacepkg.IsTextContent(content) {
- response.ReadOnlyReason = workspacetypes.FileReadOnlyBinary
- return response, nil
+ return response(workspacetypes.FileReadOnlyBinary, http.DetectContentType(content), ""), nil
}
- response.Content = string(content)
if _, ok := owned[rel]; ok {
- // Sync-owned files stay viewable but read-only: git is their
- // source of truth (#3634).
- response.ReadOnlyReason = workspacetypes.FileReadOnlyGitOpsManaged
- return response, nil
+ // Sync-owned files stay viewable but read-only: git is their source of truth (#3634).
+ return response(workspacetypes.FileReadOnlyGitOpsManaged, http.DetectContentType(content), string(content)), nil
}
- response.Editable = true
- return response, nil
+ return response("", http.DetectContentType(content), string(content)), nil
}
// Download opens one workspace file for streaming.
@@ -136,25 +147,24 @@ func (s *Service) Apply(
manifest project.WorkspaceUpdateManifest,
uploads map[int][]byte,
) error {
- scope := projects.ProjectUpdateBackupScope{}
+ var paths []string
for _, change := range manifest.FileChanges {
- scope.Paths = append(scope.Paths, ChangeTargetPaths(change)...)
+ paths = append(paths, ChangeTargetPaths(change)...)
}
- backup, cleanup, err := projects.BackupProjectDirectory(ctx, projectsDirectory, projectPath, ".project-update-backup-*", scope)
+ backup, cleanup, err := projects.BackupProjectDirectory(ctx, projectsDirectory, projectPath, ".project-update-backup-*", projects.ProjectUpdateBackupScope{Paths: paths})
if err != nil {
return err
}
defer cleanup()
- opts := projects.ProjectWorkspaceApplyOptions{
+ if applyErr := projects.ApplyProjectWorkspaceChanges(ctx, projectPath, manifest.FileChanges, uploads, projects.ProjectWorkspaceApplyOptions{
ExpectedRevision: strings.TrimSpace(manifest.FileTreeRevision),
MaxDepth: s.config.ProjectWorkspaceMaxDepth,
MaxEntries: s.config.ProjectWorkspaceMaxEntries,
MaxFileSizeBytes: workspacepkg.MaxFileSizeBytes(s.config.ProjectWorkspaceMaxFileSizeMB),
SkipDirectories: s.config.ProjectScanSkipDirs,
ComposeFileName: composeFileName,
- }
- if applyErr := projects.ApplyProjectWorkspaceChanges(ctx, projectPath, manifest.FileChanges, uploads, opts); applyErr != nil {
+ }); applyErr != nil {
if restoreErr := projects.RestoreProjectUpdateBackup(ctx, projectPath, backup); restoreErr != nil {
return errors.Join(WrapProjectWorkspaceError(applyErr), fmt.Errorf("rollback project workspace: %w", restoreErr))
}
@@ -164,8 +174,7 @@ func (s *Service) Apply(
}
// OwnedPaths returns the workspace paths a GitOps sync writes on every sync.
-// It fails closed: an incomplete ownership set would expose synced files as
-// editable, and the next sync would silently overwrite the edits.
+// It fails closed: an incomplete set would expose synced files the next sync silently overwrites.
func OwnedPaths(syncedFiles *string, composePath string) (map[string]struct{}, error) {
owned := make(map[string]struct{})
add := func(p string) {
@@ -173,7 +182,7 @@ func OwnedPaths(syncedFiles *string, composePath string) (map[string]struct{}, e
owned[rel] = struct{}{}
}
}
- if syncedFiles != nil && *syncedFiles != "" {
+ if kit.FromPtr(syncedFiles) != "" {
var files []string
if unmarshalErr := json.Unmarshal([]byte(*syncedFiles), &files); unmarshalErr != nil {
return nil, fmt.Errorf("parse gitops synced files for workspace: %w", unmarshalErr)
@@ -262,8 +271,8 @@ func ValidateWorkspaceChangesAgainstGitOps(changes []project.WorkspaceFileChange
return nil
}
-// ChangeTargetPaths lists every normalized path a change can create, overwrite or
-// delete; backup scope and GitOps ownership share it so they cannot diverge.
+// ChangeTargetPaths lists every normalized path a change can create, overwrite or delete.
+// Backup scope and GitOps ownership share it so they cannot diverge.
func ChangeTargetPaths(change project.WorkspaceFileChange) []string {
rel, err := kit.NormalizeRelativePath(change.RelativePath)
if err != nil {
diff --git a/backend/internal/project/handler.go b/backend/internal/project/handler.go
index 956e8ed33..4c8bef8c3 100644
--- a/backend/internal/project/handler.go
+++ b/backend/internal/project/handler.go
@@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"io"
- "log/slog"
"mime/multipart"
"net/http"
"strings"
@@ -16,11 +15,10 @@ import (
"github.com/getarcaneapp/arcane/types/v2/base"
"github.com/getarcaneapp/arcane/types/v2/project"
usertypes "github.com/getarcaneapp/arcane/types/v2/user"
- "github.com/getarcaneapp/arcane/types/v2/volume"
workspacetypes "github.com/getarcaneapp/arcane/types/v2/workspace"
"github.com/samber/mo"
"go.getarcane.app/docker/types"
- "go.getarcane.app/kit/pkg/mapping"
+ kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
@@ -182,14 +180,10 @@ func (h *ProjectHandler) ListProjects(ctx context.Context, input *ListProjectsIn
return nil, huma.Error500InternalServerError("Failed to list projects: " + err.Error())
}
- if projects == nil {
- projects = []project.Details{}
- }
-
return &handlerutil.Page[project.Details]{
Body: base.Paginated[project.Details]{
Success: true,
- Data: projects,
+ Data: kit.Ternary(projects == nil, []project.Details{}, projects),
Pagination: handlerutil.PaginationResponse(paginationResp),
},
}, nil
@@ -230,10 +224,7 @@ func (h *ProjectHandler) ListProjectTags(ctx context.Context, _ *ListProjectTags
if err != nil {
return nil, huma.Error500InternalServerError("Failed to list project tags: " + err.Error())
}
- if options == nil {
- options = []project.TagOption{}
- }
- return &handlerutil.Out[[]project.TagOption]{Body: base.ApiResponse[[]project.TagOption]{Success: true, Data: options}}, nil
+ return &handlerutil.Out[[]project.TagOption]{Body: base.ApiResponse[[]project.TagOption]{Success: true, Data: kit.Ternary(options == nil, []project.TagOption{}, options)}}, nil
}
// ListProjectReferences returns the ID and name of every project in an environment.
@@ -328,10 +319,6 @@ func (h *ProjectHandler) streamProjectOperation(environmentID, projectID string,
runtimeCtx := utils.ActivityRuntimeContext(humaCtx.Context(), h.appCtx)
rawWriter := humaCtx.BodyWriter()
- metadata := cfg.Metadata
- if metadata == nil {
- metadata = database.JSON{"projectID": projectID}
- }
activityID, runtimeCtx := activitylib.StartHandlerActivity(
runtimeCtx,
h.activityService,
@@ -343,7 +330,7 @@ func (h *ProjectHandler) streamProjectOperation(environmentID, projectID string,
user,
cfg.Step,
cfg.StartMessage,
- metadata,
+ kit.Ternary(cfg.Metadata == nil, database.JSON{"projectID": projectID}, cfg.Metadata),
true,
)
activitylib.WriteStartedLine(rawWriter, activityID)
@@ -398,73 +385,24 @@ func (h *ProjectHandler) DeployProject(ctx context.Context, input *DeployProject
// DownProject brings down a Docker Compose project.
func (h *ProjectHandler) DownProject(ctx context.Context, input *DownProjectInput) (*handlerutil.Out[base.MessageResponse], error) {
- user, err := handlerutil.RequireUser(ctx)
- if err != nil {
- return nil, err
- }
-
- runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)
- activityID, runtimeCtx := activitylib.StartHandlerActivity(
- runtimeCtx,
- h.activityService,
- input.EnvironmentID,
- activitytypes.TypeProjectDown,
- "project",
- input.ProjectID,
- h.projectActivityName(
- runtimeCtx,
- input.ProjectID,
- ),
- user,
- "Stopping project",
- "Project stop requested",
- database.JSON{
- "projectID": input.ProjectID,
+ return h.runProjectActivityAction(ctx, input.EnvironmentID, input.ProjectID, projectActivityActionConfig{
+ ActivityType: activitytypes.TypeProjectDown,
+ Step: "Stopping project",
+ StartMessage: "Project stop requested",
+ WriterStep: "Stopping project",
+ FailureMessage: "Project stopped",
+ SuccessComplete: "Project stopped",
+ SuccessMessage: "Project brought down successfully",
+ Action: func(runtimeCtx context.Context, projectID string, user usertypes.Actor) error {
+ return h.projectService.DownProject(runtimeCtx, projectID, user)
},
- false,
- )
- activityWriter := activitylib.NewWriter(runtimeCtx, h.activityService, activityID, io.Discard, "Stopping project")
- downCtx := context.WithValue(runtimeCtx, types.ProgressWriterKey{}, activityWriter)
- if downProjectErr := h.projectService.DownProject(downCtx, input.ProjectID, *user); downProjectErr != nil {
- activitylib.FlushWriter(activityWriter)
- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project stopped", downProjectErr)
- if errors.Is(downProjectErr, common.ErrProjectArchived) || errors.Is(downProjectErr, common.ErrProjectEnvUnreadable) {
- return nil, huma.Error400BadRequest(downProjectErr.Error())
- }
- return nil, huma.Error500InternalServerError("Failed to bring down project: " + downProjectErr.Error())
- }
- activitylib.FlushWriter(activityWriter)
- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project stopped", nil)
-
- return handlerutil.MessageOutput("Project brought down successfully", activityID), nil
-}
-
-func projectUpdateHTTPError(err error) error {
- if conflictErr, ok := errors.AsType[*volume.ProjectVolumeRenameConflictError](err); ok {
- return huma.Error409Conflict(conflictErr.Error())
- }
- if inUseErr, ok := errors.AsType[*volume.ProjectVolumeRenameInUseError](err); ok {
- return huma.Error409Conflict(inUseErr.Error())
- }
- if spaceErr, ok := errors.AsType[*volume.ProjectVolumeRenameInsufficientSpaceError](err); ok {
- return huma.NewError(http.StatusInsufficientStorage, spaceErr.Error())
- }
- return projectWorkspaceRequestHTTPError(err)
-}
-
-// projectWorkspaceRequestHTTPError maps workspace validation errors that
-// can also surface during atomic project creation or configuration updates.
-func projectWorkspaceRequestHTTPError(err error) error {
- if errors.Is(err, common.ErrProjectWorkspaceConflict) {
- return huma.Error409Conflict(err.Error())
- }
- if errors.Is(err, common.ErrProjectWorkspaceForbidden) {
- return huma.Error403Forbidden(err.Error())
- }
- if errors.Is(err, common.ErrProjectWorkspaceBadRequest) {
- return huma.Error400BadRequest(err.Error())
- }
- return nil
+ Error: func(err error) error {
+ if errors.Is(err, common.ErrProjectArchived) || errors.Is(err, common.ErrProjectEnvUnreadable) {
+ return huma.Error400BadRequest(err.Error())
+ }
+ return huma.Error500InternalServerError("Failed to bring down project: " + err.Error())
+ },
+ })
}
// CreateProject creates a new Docker Compose project.
@@ -477,11 +415,7 @@ func (h *ProjectHandler) CreateProject(ctx context.Context, input *CreateProject
if err != nil {
return nil, err
}
- maxFileSizeMB := workspace.DefaultMaxFileSizeMB
- if h.projectService != nil && h.projectService.config != nil {
- maxFileSizeMB = h.projectService.config.ProjectWorkspaceMaxFileSizeMB
- }
- uploads, err := handlerutil.ReadWorkspaceUploads(input.RawBody, workspace.MaxFileSizeBytes(maxFileSizeMB))
+ uploads, err := handlerutil.ReadWorkspaceUploads(input.RawBody, workspace.MaxFileSizeBytes(h.projectService.config.ProjectWorkspaceMaxFileSizeMB))
if err != nil {
return nil, err
}
@@ -519,27 +453,13 @@ func (h *ProjectHandler) CreateProject(ctx context.Context, input *CreateProject
return createErr
})
if err != nil {
- if httpErr := projectWorkspaceRequestHTTPError(err); httpErr != nil {
- return nil, httpErr
+ if apiErr := common.ToAPIError(err); apiErr.HTTPStatus() != http.StatusInternalServerError {
+ return nil, huma.NewError(apiErr.HTTPStatus(), apiErr.Message)
}
return nil, huma.Error500InternalServerError("Failed to create project: " + err.Error())
}
- var response project.CreateReponse
- if mapStructErr := mapping.MapStruct(proj, &response); mapStructErr != nil {
- return nil, huma.Error500InternalServerError("failed to map response")
- }
- response.Status = string(proj.Status)
- response.StatusReason = proj.StatusReason
- response.CreatedAt = proj.CreatedAt.Format(time.RFC3339)
- response.UpdatedAt = proj.UpdatedAt.Format(time.RFC3339)
- response.DirName = mo.PointerToOption(proj.DirName).OrEmpty()
- response.RelativePath = h.projectService.GetProjectRelativePath(ctx, proj.Path)
- response.GitOpsManagedBy = proj.GitOpsManagedBy
- response.IsArchived = proj.IsArchived
- response.ArchivedAt = proj.ArchivedAt
- response.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()
- response.Tags, err = h.projectService.GetProjectTags(ctx, proj.ID)
+ projectTags, err := h.projectService.GetProjectTags(ctx, proj.ID)
if err != nil {
return nil, huma.Error500InternalServerError("Failed to load project tags: " + err.Error())
}
@@ -547,28 +467,31 @@ func (h *ProjectHandler) CreateProject(ctx context.Context, input *CreateProject
return &handlerutil.Out[project.CreateReponse]{
Body: base.ApiResponse[project.CreateReponse]{
Success: true,
- Data: response,
+ Data: project.CreateReponse{
+ ID: proj.ID,
+ Name: proj.Name,
+ DirName: kit.FromPtr(proj.DirName),
+ RelativePath: h.projectService.GetProjectRelativePath(ctx, proj.Path),
+ Path: proj.Path,
+ Status: string(proj.Status),
+ StatusReason: proj.StatusReason,
+ ServiceCount: proj.ServiceCount,
+ RunningCount: proj.RunningCount,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ IsArchived: proj.IsArchived,
+ ArchivedAt: proj.ArchivedAt,
+ CreatedAt: proj.CreatedAt.Format(time.RFC3339),
+ UpdatedAt: proj.UpdatedAt.Format(time.RFC3339),
+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),
+ Tags: projectTags,
+ },
},
}, nil
}
// GetProject returns a project by ID.
func (h *ProjectHandler) GetProject(ctx context.Context, input *GetProjectInput) (*handlerutil.Out[project.Details], error) {
- if input.ProjectID == "" {
- return nil, huma.Error400BadRequest("Project ID is required")
- }
-
- details, err := h.projectService.GetProjectDetails(ctx, input.ProjectID, project.DetailsOptions{})
- if err != nil {
- return nil, huma.Error404NotFound("Failed to get project details: " + err.Error())
- }
-
- return &handlerutil.Out[project.Details]{
- Body: base.ApiResponse[project.Details]{
- Success: true,
- Data: details,
- },
- }, nil
+ return h.getProjectDetailsWithOptions(ctx, input, project.DetailsOptions{})
}
func (h *ProjectHandler) getProjectDetailsWithOptions(ctx context.Context, input *GetProjectInput, opts project.DetailsOptions) (*handlerutil.Out[project.Details], error) {
@@ -640,60 +563,26 @@ func (h *ProjectHandler) RedeployProject(ctx context.Context, input *RedeployPro
// DestroyProject destroys a Docker Compose project.
func (h *ProjectHandler) DestroyProject(ctx context.Context, input *DestroyProjectInput) (*handlerutil.Out[base.MessageResponse], error) {
- user, err := handlerutil.RequireUser(ctx)
- if err != nil {
- return nil, err
- }
-
- removeFiles := true
- removeVolumes := false
- if input.Body != nil {
- if input.Body.RemoveFiles != nil {
- removeFiles = *input.Body.RemoveFiles
- }
- removeVolumes = input.Body.RemoveVolumes
- slog.DebugContext(ctx, "DestroyProject handler received body",
- "removeFiles", removeFiles,
- "removeVolumes", removeVolumes,
- "projectId", input.ProjectID)
- } else {
- slog.DebugContext(ctx, "DestroyProject handler received nil body",
- "projectId", input.ProjectID)
- }
-
- runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)
- activityID, runtimeCtx := activitylib.StartHandlerActivity(
- runtimeCtx,
- h.activityService,
- input.EnvironmentID,
- activitytypes.TypeProjectDestroy,
- "project",
- input.ProjectID,
- h.projectActivityName(
- runtimeCtx,
- input.ProjectID,
- ),
- user,
- "Destroying project",
- "Project destroy requested",
- database.JSON{
+ return h.runProjectActivityAction(ctx, input.EnvironmentID, input.ProjectID, projectActivityActionConfig{
+ ActivityType: activitytypes.TypeProjectDestroy,
+ Step: "Destroying project",
+ StartMessage: "Project destroy requested",
+ WriterStep: "Destroying project",
+ FailureMessage: "Project destroyed",
+ SuccessComplete: "Project destroyed",
+ SuccessMessage: "Project destroyed successfully",
+ Metadata: database.JSON{
"projectID": input.ProjectID,
- "removeFiles": removeFiles,
- "removeVolumes": removeVolumes,
+ "removeFiles": mo.PointerToOption(kit.FromPtr(input.Body).RemoveFiles).OrElse(true),
+ "removeVolumes": kit.FromPtr(input.Body).RemoveVolumes,
},
- false,
- )
- activityWriter := activitylib.NewWriter(runtimeCtx, h.activityService, activityID, io.Discard, "Destroying project")
- destroyCtx := context.WithValue(runtimeCtx, types.ProgressWriterKey{}, activityWriter)
- if destroyProjectErr := h.projectService.DestroyProject(destroyCtx, input.ProjectID, removeFiles, removeVolumes, *user); destroyProjectErr != nil {
- activitylib.FlushWriter(activityWriter)
- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project destroyed", destroyProjectErr)
- return nil, huma.Error500InternalServerError("Failed to destroy project: " + destroyProjectErr.Error())
- }
- activitylib.FlushWriter(activityWriter)
- activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, "Project destroyed", nil)
-
- return handlerutil.MessageOutput("Project destroyed successfully", activityID), nil
+ Action: func(runtimeCtx context.Context, projectID string, user usertypes.Actor) error {
+ return h.projectService.DestroyProject(runtimeCtx, projectID, mo.PointerToOption(kit.FromPtr(input.Body).RemoveFiles).OrElse(true), kit.FromPtr(input.Body).RemoveVolumes, user)
+ },
+ Error: func(err error) error {
+ return huma.Error500InternalServerError("Failed to destroy project: " + err.Error())
+ },
+ })
}
// UpdateProject updates a Docker Compose project.
@@ -724,8 +613,8 @@ func (h *ProjectHandler) UpdateProject(ctx context.Context, input *UpdateProject
return updateErr
})
if err != nil {
- if httpErr := projectUpdateHTTPError(err); httpErr != nil {
- return nil, httpErr
+ if apiErr := common.ToAPIError(err); apiErr.HTTPStatus() != http.StatusInternalServerError {
+ return nil, huma.NewError(apiErr.HTTPStatus(), apiErr.Message)
}
return nil, huma.Error400BadRequest("Failed to update project: " + err.Error())
}
@@ -741,63 +630,76 @@ func (h *ProjectHandler) UpdateProject(ctx context.Context, input *UpdateProject
if err != nil {
return nil, huma.Error500InternalServerError("Failed to get project details: " + err.Error())
}
- details.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()
-
return &handlerutil.Out[project.Details]{
Body: base.ApiResponse[project.Details]{
Success: true,
- Data: details,
+ Data: project.Details{ //exhaustruct:enforce
+ EnvironmentTag: details.EnvironmentTag,
+ Tags: details.Tags,
+ StatusReason: details.StatusReason,
+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),
+ LastSyncCommit: details.LastSyncCommit,
+ GitOpsManagedBy: details.GitOpsManagedBy,
+ UpdateInfo: details.UpdateInfo,
+ ArchivedAt: details.ArchivedAt,
+ Status: details.Status,
+ DirName: details.DirName,
+ ComposeContent: details.ComposeContent,
+ ComposeFileName: details.ComposeFileName,
+ ComposeFiles: details.ComposeFiles,
+ EnvContent: details.EnvContent,
+ OverrideContent: details.OverrideContent,
+ OverrideFileName: details.OverrideFileName,
+ Name: details.Name,
+ GitRepositoryURL: details.GitRepositoryURL,
+ IconLightURL: details.IconLightURL,
+ RelativePath: details.RelativePath,
+ ID: details.ID,
+ IconDarkURL: details.IconDarkURL,
+ Path: details.Path,
+ UpdatedAt: details.UpdatedAt,
+ CreatedAt: details.CreatedAt,
+ RuntimeServices: details.RuntimeServices,
+ Services: details.Services,
+ URLs: details.URLs,
+ IncludeFiles: details.IncludeFiles,
+ RunningCount: details.RunningCount,
+ ServiceCount: details.ServiceCount,
+ IsDiscovered: details.IsDiscovered,
+ IsArchived: details.IsArchived,
+ HasBuildDirective: details.HasBuildDirective,
+ RedeployDisabled: details.RedeployDisabled,
+ ConfigurationError: details.ConfigurationError,
+ },
},
}, nil
}
-// RestartProject restarts the given services in a project (all services when none
-// are specified).
+// RestartProject restarts the given services in a project (all services when none are specified).
func (h *ProjectHandler) RestartProject(ctx context.Context, input *RestartProjectInput) (*handlerutil.Out[base.MessageResponse], error) {
- response, err := h.runProjectActivityActionResponse(ctx, input.EnvironmentID, input.ProjectID, h.restartProjectActivityConfig(input.Services))
- if err != nil {
- return nil, err
- }
-
- return &handlerutil.Out[base.MessageResponse]{
- Body: response,
- }, nil
+ return h.runProjectActivityAction(ctx, input.EnvironmentID, input.ProjectID, projectActivityActionConfig{
+ ActivityType: activitytypes.TypeProjectRestart,
+ 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 usertypes.Actor) error {
+ return h.projectService.RestartProject(runtimeCtx, projectID, input.Services, user)
+ },
+ Error: func(err error) error {
+ if errors.Is(err, common.ErrProjectArchived) {
+ return huma.Error400BadRequest(err.Error())
+ }
+ return huma.Error400BadRequest("Failed to restart project: " + err.Error())
+ },
+ })
}
// UpdateProjectServices pulls the latest images for the given services and recreates them.
func (h *ProjectHandler) UpdateProjectServices(ctx context.Context, input *UpdateProjectServicesInput) (*handlerutil.Out[base.MessageResponse], error) {
- var serviceNames []string
- if input.Body != nil {
- serviceNames = input.Body.Services
- }
-
- response, err := h.runProjectActivityActionResponse(ctx, input.EnvironmentID, input.ProjectID, h.updateProjectServicesActivityConfig(serviceNames))
- if err != nil {
- return nil, err
- }
-
- return &handlerutil.Out[base.MessageResponse]{
- Body: response,
- }, nil
-}
-
-type projectActivityActionConfig struct {
- ActivityType activitytypes.Type
- Step string
- StartMessage string
- WriterStep string
- FailureMessage string
- SuccessComplete string
- SuccessMessage string
- // Queue routes the activity through the per-environment concurrency
- // limiter; set for long-running deploy-like actions, not quick restarts.
- Queue bool
- Action func(context.Context, string, usertypes.Actor) error
- Error func(error) error
-}
-
-func (h *ProjectHandler) updateProjectServicesActivityConfig(services []string) projectActivityActionConfig {
- return projectActivityActionConfig{
+ return h.runProjectActivityAction(ctx, input.EnvironmentID, input.ProjectID, projectActivityActionConfig{
ActivityType: activitytypes.TypeAutoUpdate,
Step: "Updating project services",
StartMessage: "Project services update requested",
@@ -807,121 +709,70 @@ func (h *ProjectHandler) updateProjectServicesActivityConfig(services []string)
SuccessMessage: "Project services updated successfully",
Queue: true,
Action: func(runtimeCtx context.Context, projectID string, user usertypes.Actor) error {
- return h.projectService.UpdateProjectServices(runtimeCtx, projectID, services, user, true)
+ return h.projectService.UpdateProjectServices(runtimeCtx, projectID, kit.FromPtr(input.Body).Services, user, true)
},
- Error: projectArchivedActionError(func(err error) error {
+ Error: func(err error) error {
+ if errors.Is(err, common.ErrProjectArchived) {
+ return huma.Error400BadRequest(err.Error())
+ }
return huma.Error400BadRequest("Failed to update project: " + err.Error())
- }),
- }
-}
-
-func (h *ProjectHandler) restartProjectActivityConfig(services []string) projectActivityActionConfig {
- return projectActivityActionConfig{
- ActivityType: activitytypes.TypeProjectRestart,
- 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 usertypes.Actor) error {
- return h.projectService.RestartProject(runtimeCtx, projectID, services, user)
},
- Error: projectArchivedActionError(func(err error) error {
- return huma.Error400BadRequest("Failed to restart project: " + err.Error())
- }),
- }
-}
-
-func projectArchivedActionError(fallback func(error) error) func(error) error {
- return func(err error) error {
- if errors.Is(err, common.ErrProjectArchived) {
- return huma.Error400BadRequest(err.Error())
- }
- return fallback(err)
- }
+ })
}
-func (h *ProjectHandler) runProjectActivityActionResponse(
- ctx context.Context,
- environmentID string,
- projectID string,
- cfg projectActivityActionConfig,
-) (base.ApiResponse[base.MessageResponse], error) {
- message, err := h.runProjectActivityAction(ctx, environmentID, projectID, cfg)
- if err != nil {
- return base.ApiResponse[base.MessageResponse]{}, err
- }
-
- return base.ApiResponse[base.MessageResponse]{
- Success: true,
- Data: message,
- }, nil
+type projectActivityActionConfig struct {
+ ActivityType activitytypes.Type
+ Step string
+ StartMessage string
+ WriterStep string
+ FailureMessage string
+ SuccessComplete string
+ SuccessMessage string
+ // Queue routes the activity through the per-environment concurrency
+ // limiter; set for long-running deploy-like actions, not quick restarts.
+ Queue bool
+ Metadata database.JSON
+ Action func(context.Context, string, usertypes.Actor) error
+ Error func(error) error
}
-func (h *ProjectHandler) runProjectActivityAction(ctx context.Context, environmentID, projectID string, cfg projectActivityActionConfig) (base.MessageResponse, error) {
+func (h *ProjectHandler) runProjectActivityAction(ctx context.Context, environmentID, projectID string, cfg projectActivityActionConfig) (*handlerutil.Out[base.MessageResponse], error) {
if projectID == "" {
- return base.MessageResponse{}, huma.Error400BadRequest("Project ID is required")
+ return nil, huma.Error400BadRequest("Project ID is required")
}
user, err := handlerutil.RequireUser(ctx)
if err != nil {
- return base.MessageResponse{}, err
+ return nil, err
}
runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)
- projectName := h.projectActivityName(runtimeCtx, projectID)
- var activityID string
+ activityID, runtimeCtx := activitylib.StartHandlerActivity(
+ runtimeCtx,
+ h.activityService,
+ environmentID,
+ cfg.ActivityType,
+ "project",
+ projectID,
+ h.projectActivityName(runtimeCtx, projectID),
+ user,
+ cfg.Step,
+ cfg.StartMessage,
+ kit.Ternary(cfg.Metadata == nil, database.JSON{"projectID": projectID}, cfg.Metadata),
+ cfg.Queue,
+ )
if cfg.Queue {
- activityID, runtimeCtx = activitylib.StartHandlerActivity(
- runtimeCtx,
- h.activityService,
- environmentID,
- cfg.ActivityType,
- "project",
- projectID,
- projectName,
- user,
- cfg.Step,
- cfg.StartMessage,
- database.JSON{
- "projectID": projectID,
- },
- true,
- )
activitylib.AwaitHandlerActivitySlot(runtimeCtx, h.activityService, activityID, environmentID)
- } else {
- activityID, runtimeCtx = activitylib.StartHandlerActivity(
- runtimeCtx,
- h.activityService,
- environmentID,
- cfg.ActivityType,
- "project",
- projectID,
- projectName,
- user,
- cfg.Step,
- cfg.StartMessage,
- database.JSON{
- "projectID": projectID,
- },
- false,
- )
}
activityWriter := activitylib.NewWriter(runtimeCtx, h.activityService, activityID, io.Discard, cfg.WriterStep)
- actionCtx := context.WithValue(runtimeCtx, types.ProgressWriterKey{}, activityWriter)
- if actionErr := cfg.Action(actionCtx, projectID, *user); actionErr != nil {
+ if actionErr := cfg.Action(context.WithValue(runtimeCtx, types.ProgressWriterKey{}, activityWriter), projectID, *user); actionErr != nil {
activitylib.FlushWriter(activityWriter)
activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, cfg.FailureMessage, actionErr)
- return base.MessageResponse{}, cfg.Error(actionErr)
+ return nil, cfg.Error(actionErr)
}
activitylib.FlushWriter(activityWriter)
activitylib.CompleteHandlerActivity(runtimeCtx, h.activityService, activityID, cfg.SuccessComplete, nil)
-
- return base.MessageResponse{
- Message: cfg.SuccessMessage,
- ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),
- }, nil
+ return handlerutil.MessageOutput(cfg.SuccessMessage, activityID), nil
}
func (h *ProjectHandler) ArchiveProject(ctx context.Context, input *ArchiveProjectInput) (*handlerutil.Out[base.MessageResponse], error) {
@@ -997,12 +848,11 @@ func (h *ProjectHandler) BuildProjectImages(ctx context.Context, input *BuildPro
return nil, err
}
- options := project.BuildOptions{}
- if input.Body != nil {
- options.Services = input.Body.Services
- options.Provider = input.Body.Provider
- options.Push = input.Body.Push
- options.Load = input.Body.Load
+ options := project.BuildOptions{
+ Services: kit.FromPtr(input.Body).Services,
+ Provider: kit.FromPtr(input.Body).Provider,
+ Push: kit.FromPtr(input.Body).Push,
+ Load: kit.FromPtr(input.Body).Load,
}
//nolint:contextcheck // the stream body runs on humaCtx.Context(), not the handler ctx
@@ -1037,27 +887,13 @@ type UpdateProjectWorkspaceInput struct {
RawBody multipart.Form `contentType:"multipart/form-data"`
}
-func projectWorkspaceHTTPError(err error) error {
- switch {
- case errors.Is(err, common.ErrProjectWorkspaceConflict):
- return huma.Error409Conflict(err.Error())
- case errors.Is(err, common.ErrProjectArchived):
- return huma.Error409Conflict(err.Error())
- case errors.Is(err, common.ErrProjectWorkspaceForbidden):
- return huma.Error403Forbidden(err.Error())
- case errors.Is(err, common.ErrProjectWorkspaceNotFound), errors.Is(err, common.ErrProjectNotFound):
- return huma.Error404NotFound(err.Error())
- case errors.Is(err, common.ErrProjectWorkspaceBadRequest), errors.Is(err, common.ErrProjectEnvUnreadable):
- return huma.Error400BadRequest(err.Error())
- default:
- return huma.Error500InternalServerError("internal error")
- }
-}
-
func (h *ProjectHandler) GetProjectWorkspace(ctx context.Context, input *GetProjectWorkspaceInput) (*handlerutil.Out[workspacetypes.Workspace], error) {
result, err := h.projectService.GetProjectWorkspace(ctx, input.ProjectID)
if err != nil {
- return nil, projectWorkspaceHTTPError(err)
+ if apiErr := common.ToAPIError(err); apiErr.HTTPStatus() != http.StatusInternalServerError {
+ return nil, huma.NewError(apiErr.HTTPStatus(), apiErr.Message)
+ }
+ return nil, huma.Error500InternalServerError("internal error")
}
return &handlerutil.Out[workspacetypes.Workspace]{Body: base.ApiResponse[workspacetypes.Workspace]{Success: true, Data: *result}}, nil
}
@@ -1065,7 +901,10 @@ func (h *ProjectHandler) GetProjectWorkspace(ctx context.Context, input *GetProj
func (h *ProjectHandler) GetProjectWorkspaceFile(ctx context.Context, input *GetProjectWorkspaceFileInput) (*handlerutil.Out[workspacetypes.FileContent], error) {
result, err := h.projectService.GetProjectWorkspaceFile(ctx, input.ProjectID, input.RelativePath)
if err != nil {
- return nil, projectWorkspaceHTTPError(err)
+ if apiErr := common.ToAPIError(err); apiErr.HTTPStatus() != http.StatusInternalServerError {
+ return nil, huma.NewError(apiErr.HTTPStatus(), apiErr.Message)
+ }
+ return nil, huma.Error500InternalServerError("internal error")
}
return &handlerutil.Out[workspacetypes.FileContent]{Body: base.ApiResponse[workspacetypes.FileContent]{Success: true, Data: *result}}, nil
}
@@ -1073,7 +912,10 @@ func (h *ProjectHandler) GetProjectWorkspaceFile(ctx context.Context, input *Get
func (h *ProjectHandler) DownloadProjectWorkspaceFile(ctx context.Context, input *GetProjectWorkspaceFileInput) (*huma.StreamResponse, error) {
reader, size, name, err := h.projectService.DownloadProjectWorkspaceFile(ctx, input.ProjectID, input.RelativePath)
if err != nil {
- return nil, projectWorkspaceHTTPError(err)
+ if apiErr := common.ToAPIError(err); apiErr.HTTPStatus() != http.StatusInternalServerError {
+ return nil, huma.NewError(apiErr.HTTPStatus(), apiErr.Message)
+ }
+ return nil, huma.Error500InternalServerError("internal error")
}
return handlerutil.DownloadResponse(reader, size, name), nil
}
@@ -1083,11 +925,7 @@ func (h *ProjectHandler) UpdateProjectWorkspace(ctx context.Context, input *Upda
if err != nil {
return nil, err
}
- maxFileSizeMB := workspace.DefaultMaxFileSizeMB
- if h.projectService != nil && h.projectService.config != nil {
- maxFileSizeMB = h.projectService.config.ProjectWorkspaceMaxFileSizeMB
- }
- uploads, err := handlerutil.ReadWorkspaceUploads(input.RawBody, workspace.MaxFileSizeBytes(maxFileSizeMB))
+ uploads, err := handlerutil.ReadWorkspaceUploads(input.RawBody, workspace.MaxFileSizeBytes(h.projectService.config.ProjectWorkspaceMaxFileSizeMB))
if err != nil {
return nil, err
}
@@ -1110,8 +948,15 @@ func (h *ProjectHandler) UpdateProjectWorkspace(ctx context.Context, input *Upda
return updateErr
})
if err != nil {
- return nil, projectWorkspaceHTTPError(err)
- }
- result.ActivityID = mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer()
- return &handlerutil.Out[workspacetypes.Workspace]{Body: base.ApiResponse[workspacetypes.Workspace]{Success: true, Data: *result}}, nil
+ if apiErr := common.ToAPIError(err); apiErr.HTTPStatus() != http.StatusInternalServerError {
+ return nil, huma.NewError(apiErr.HTTPStatus(), apiErr.Message)
+ }
+ return nil, huma.Error500InternalServerError("internal error")
+ }
+ return &handlerutil.Out[workspacetypes.Workspace]{Body: base.ApiResponse[workspacetypes.Workspace]{Success: true, Data: workspacetypes.Workspace{
+ Files: result.Files,
+ FileTreeRevision: result.FileTreeRevision,
+ FileTreeTruncated: result.FileTreeTruncated,
+ ActivityID: mo.EmptyableToOption(strings.TrimSpace(activityID)).ToPointer(),
+ }}}, nil
}
diff --git a/backend/internal/project/helpers.go b/backend/internal/project/helpers.go
index 19d8ee043..f65c1a1a6 100644
--- a/backend/internal/project/helpers.go
+++ b/backend/internal/project/helpers.go
@@ -5,9 +5,6 @@ import (
"errors"
"fmt"
"io"
- "log/slog"
- "os"
- "path/filepath"
"strings"
"sync"
@@ -15,13 +12,12 @@ import (
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
usertypes "github.com/getarcaneapp/arcane/types/v2/user"
"github.com/samber/mo"
- "go.getarcane.app/acfs"
"go.getarcane.app/builds/types"
+ kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
"gorm.io/gorm/clause"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
- "github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
)
type builder interface {
@@ -34,7 +30,7 @@ type builder interface {
type projectMetadataEnv struct {
projectsDirectory string
autoInjectEnv bool
- // settings is the snapshot shared by compose loads; nil resolves lazily.
+ // settings is the snapshot shared by compose loads.
settings *settings.Settings
// gitOpsComposePaths maps preloaded GitOps sync IDs to their configured
// compose paths. Sync IDs that were preloaded but have no row map to "",
@@ -50,10 +46,7 @@ type projectMetadataEnv struct {
}
func gitOpsSyncID(proj *Project) string {
- if proj == nil || proj.GitOpsManagedBy == nil {
- return ""
- }
- return strings.TrimSpace(*proj.GitOpsManagedBy)
+ return strings.TrimSpace(kit.FromPtr(proj.GitOpsManagedBy))
}
// composeFile memoizes successful compose file resolutions for the request.
@@ -74,9 +67,6 @@ func (env *projectMetadataEnv) composeFile(projectID string, resolve func() (str
return "", err
}
env.composeFilesMu.Lock()
- if env.composeFiles == nil {
- env.composeFiles = make(map[string]string)
- }
env.composeFiles[projectID] = path
env.composeFilesMu.Unlock()
return path, nil
@@ -156,63 +146,6 @@ func deleteProjectWithTags(tx *gorm.DB, projectID string) error {
return nil
}
-// resolveAuthoritativeProjectName enforces that a top-level `name:` in
-// the compose file is authoritative over the submitted project name. For
-// name-only renames, it checks the compose file on disk so the lock can't be
-// bypassed via the API.
-func resolveAuthoritativeProjectName(ctx context.Context, proj *Project, name, composeContent *string) *string {
- if composeContent != nil {
- if yamlName := projects.ComposeContentProjectName(*composeContent); yamlName != "" {
- return &yamlName
- }
- return name
- }
- if name != nil {
- if onDiskCompose, _, readErr := projects.ReadProjectFiles(ctx, proj.Path, ""); readErr == nil {
- if yamlName := projects.ComposeContentProjectName(onDiskCompose); yamlName != "" {
- return &yamlName
- }
- }
- }
- return name
-}
-
-func withProjectRenameRollback(ctx context.Context, proj *Project, projectStateCommitted *bool, run func() error) error {
- originalPath := proj.Path
- originalDirName := proj.DirName
-
- if err := run(); err != nil {
- if projectStateCommitted != nil && *projectStateCommitted {
- return err
- }
- if proj.Path != originalPath {
- // The rollback has to run even when the caller's context is already
- // cancelled, or a cancelled update leaves the directory renamed
- // with the database still pointing at the original path.
- rollbackCtx := context.WithoutCancel(ctx)
-
- // Both paths share a parent whenever the rename stayed inside the
- // projects directory; an imported project can sit elsewhere, in
- // which case the move crosses roots and cannot be confined.
- var renameErr error
- if parent := filepath.Dir(originalPath); parent == filepath.Dir(proj.Path) {
- renameErr = acfs.Rename(rollbackCtx, parent, "/"+filepath.Base(proj.Path), "/"+filepath.Base(originalPath))
- } else {
- renameErr = os.Rename(proj.Path, originalPath)
- }
- if renameErr != nil {
- slog.WarnContext(ctx, "failed to rollback project directory rename", "from", proj.Path, "to", originalPath, "error", renameErr)
- return err
- }
- proj.Path = originalPath
- proj.DirName = originalDirName
- }
- return err
- }
-
- return nil
-}
-
// projectRecord exposes a stored project's state to child features.
func projectRecord(p Project) projecttypes.Record {
return projecttypes.Record{
diff --git a/backend/internal/project/model.go b/backend/internal/project/model.go
index d32f286f9..c14feefbb 100644
--- a/backend/internal/project/model.go
+++ b/backend/internal/project/model.go
@@ -8,6 +8,7 @@ import (
"github.com/getarcaneapp/arcane/types/v2/gitops"
projecttypes "github.com/getarcaneapp/arcane/types/v2/project"
+ kit "go.getarcane.app/kit/pkg"
"gorm.io/gorm"
"gorm.io/gorm/clause"
@@ -130,10 +131,7 @@ func (s GitOpsSync) BackupState() string {
if s.Mode != gitops.SyncModeBackup {
return ""
}
- status := ""
- if s.LastSyncStatus != nil {
- status = *s.LastSyncStatus
- }
+ status := kit.FromPtr(s.LastSyncStatus)
switch {
case status == "running":
return gitops.BackupStateBackingUp
@@ -158,7 +156,7 @@ func (GitOpsSync) TableName() string {
// SyncedFileList decodes the tracked synced-file paths.
func (s GitOpsSync) SyncedFileList() []string {
- if s.SyncedFiles == nil || *s.SyncedFiles == "" {
+ if kit.FromPtr(s.SyncedFiles) == "" {
return nil
}
var files []string
@@ -170,7 +168,7 @@ func (s GitOpsSync) SyncedFileList() []string {
// BackupSnapshot decodes the file hashes recorded by the last backup push.
func (s GitOpsSync) BackupSnapshot() map[string]string {
- if s.LastBackupSnapshot == nil || *s.LastBackupSnapshot == "" {
+ if kit.FromPtr(s.LastBackupSnapshot) == "" {
return nil
}
var hashes map[string]string
diff --git a/backend/internal/project/module.go b/backend/internal/project/module.go
index b077e53b2..d0749cc09 100644
--- a/backend/internal/project/module.go
+++ b/backend/internal/project/module.go
@@ -44,7 +44,42 @@ func RegisterProjects(api huma.API, projectService *ProjectService, activityServ
activityService: activityService,
appCtx: appCtx.Context(),
}
- registerProjectWorkspaceRoutesInternal(api, h)
+ middleware.RegisterWithPermission(api, huma.Operation{
+ OperationID: "get-project-workspace",
+ Method: http.MethodGet,
+ Path: "/environments/{id}/projects/{projectId}/workspace",
+ Summary: "Get project workspace",
+ Tags: []string{"Project Workspace"},
+ Security: handlerutil.DefaultOperationSecurity(),
+ }, authz.PermProjectsRead, h.GetProjectWorkspace)
+
+ middleware.RegisterWithPermission(api, huma.Operation{
+ OperationID: "get-project-workspace-file",
+ Method: http.MethodGet,
+ Path: "/environments/{id}/projects/{projectId}/workspace/file",
+ Summary: "Get project workspace file",
+ Tags: []string{"Project Workspace"},
+ Security: handlerutil.DefaultOperationSecurity(),
+ }, authz.PermProjectsRead, h.GetProjectWorkspaceFile)
+
+ middleware.RegisterWithPermission(api, huma.Operation{
+ OperationID: "download-project-workspace-file",
+ Method: http.MethodGet,
+ Path: "/environments/{id}/projects/{projectId}/workspace/file/download",
+ Summary: "Download project workspace file",
+ Tags: []string{"Project Workspace"},
+ Security: handlerutil.DefaultOperationSecurity(),
+ }, authz.PermProjectsRead, h.DownloadProjectWorkspaceFile)
+
+ middleware.RegisterWithPermission(api, huma.Operation{
+ OperationID: "update-project-workspace",
+ Method: http.MethodPut,
+ Path: "/environments/{id}/projects/{projectId}/workspace",
+ Summary: "Update project workspace",
+ Tags: []string{"Project Workspace"},
+ Security: handlerutil.DefaultOperationSecurity(),
+ RequestBody: handlerutil.WorkspaceMultipartRequestBody("JSON encoded project workspace manifest"),
+ }, authz.PermProjectsUpdate, h.UpdateProjectWorkspace)
middleware.RegisterWithPermission(api, huma.Operation{
OperationID: "list-projects",
@@ -274,38 +309,3 @@ func RegisterProjects(api huma.API, projectService *ProjectService, activityServ
Security: handlerutil.DefaultOperationSecurity(),
}, authz.PermProjectsDeploy, h.BuildProjectImages)
}
-
-func registerProjectWorkspaceRoutesInternal(api huma.API, h *ProjectHandler) {
- basePath := "/environments/{id}/projects/{projectId}/workspace"
- tag := "Project Workspace"
- handlerutil.RegisterSecured(api, handlerutil.Operation("get-project-workspace", http.MethodGet, basePath, "Get project workspace", "", tag), authz.PermProjectsRead, h.GetProjectWorkspace)
- handlerutil.RegisterSecured(
- api,
- handlerutil.Operation(
- "get-project-workspace-file",
- http.MethodGet,
- basePath+"/file",
- "Get project workspace file",
- "",
- tag,
- ),
- authz.PermProjectsRead,
- h.GetProjectWorkspaceFile,
- )
- handlerutil.RegisterSecured(
- api,
- handlerutil.Operation(
- "download-project-workspace-file",
- http.MethodGet,
- basePath+"/file/download",
- "Download project workspace file",
- "",
- tag,
- ),
- authz.PermProjectsRead,
- h.DownloadProjectWorkspaceFile,
- )
- updateOperation := handlerutil.Operation("update-project-workspace", http.MethodPut, basePath, "Update project workspace", "", tag)
- updateOperation.RequestBody = handlerutil.WorkspaceMultipartRequestBody("JSON encoded project workspace manifest")
- handlerutil.RegisterSecured(api, updateOperation, authz.PermProjectsUpdate, h.UpdateProjectWorkspace)
-}
diff --git a/backend/internal/project/service.go b/backend/internal/project/service.go
index 65a1f8f4a..433d44b6e 100644
--- a/backend/internal/project/service.go
+++ b/backend/internal/project/service.go
@@ -36,7 +36,6 @@ import (
"go.getarcane.app/docker"
dockertypes "go.getarcane.app/docker/types"
kit "go.getarcane.app/kit/pkg"
- "go.getarcane.app/kit/pkg/mapping"
"go.getarcane.app/sys/cgroup"
"go.getarcane.app/updater"
"go.getarcane.app/updater/labels"
@@ -134,50 +133,91 @@ func (s *ProjectService) EnsureGitOpsProjectLinked(ctx context.Context, gitOpsSy
if gitOpsSync == nil || project == nil {
return nil
}
- if project.GitOpsManagedBy != nil && *project.GitOpsManagedBy != "" && *project.GitOpsManagedBy != gitOpsSync.ID {
+ if kit.FromPtr(project.GitOpsManagedBy) != "" && kit.FromPtr(project.GitOpsManagedBy) != gitOpsSync.ID {
return fmt.Errorf("project %s is already managed by a different GitOps sync", project.ID)
}
- cacheBinding := func() {
- s.composeNames.put(projects.NormalizeProjectName(project.Name), project.ID)
- }
- if gitOpsSync.ProjectID != nil && *gitOpsSync.ProjectID == project.ID && project.GitOpsManagedBy != nil && *project.GitOpsManagedBy == gitOpsSync.ID {
- cacheBinding()
- return nil
- }
-
- updatesSync := map[string]any{}
- updatesProject := map[string]any{}
- if gitOpsSync.ProjectID == nil || *gitOpsSync.ProjectID != project.ID {
- updatesSync["project_id"] = project.ID
- }
- if project.GitOpsManagedBy == nil || *project.GitOpsManagedBy != gitOpsSync.ID {
- updatesProject["gitops_managed_by"] = gitOpsSync.ID
- }
- if len(updatesSync) == 0 && len(updatesProject) == 0 {
- cacheBinding()
- return nil
- }
-
- if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
- if len(updatesSync) > 0 {
- if err := tx.Model(&GitOpsSync{}).Where("id = ?", gitOpsSync.ID).Updates(updatesSync).Error; err != nil {
- return fmt.Errorf("failed to relink GitOps sync %s: %w", gitOpsSync.ID, err)
+ if kit.FromPtr(gitOpsSync.ProjectID) != project.ID || kit.FromPtr(project.GitOpsManagedBy) != gitOpsSync.ID {
+ if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+ if kit.FromPtr(gitOpsSync.ProjectID) != project.ID {
+ if err := tx.Model(&GitOpsSync{}).Where("id = ?", gitOpsSync.ID).Update("project_id", project.ID).Error; err != nil {
+ return fmt.Errorf("failed to relink GitOps sync %s: %w", gitOpsSync.ID, err)
+ }
}
- }
- if len(updatesProject) > 0 {
- if err := tx.Model(&Project{}).Where("id = ?", project.ID).Updates(updatesProject).Error; err != nil {
- return fmt.Errorf("failed to relink project %s to GitOps sync %s: %w", project.ID, gitOpsSync.ID, err)
+ if kit.FromPtr(project.GitOpsManagedBy) != gitOpsSync.ID {
+ if err := tx.Model(&Project{}).Where("id = ?", project.ID).Update("gitops_managed_by", gitOpsSync.ID).Error; err != nil {
+ return fmt.Errorf("failed to relink project %s to GitOps sync %s: %w", project.ID, gitOpsSync.ID, err)
+ }
}
- }
- return nil
- }); err != nil {
- return err
+ return nil
+ }); err != nil {
+ return err
+ }
+ }
+
+ *gitOpsSync = GitOpsSync{ //exhaustruct:enforce
+ BaseModel: gitOpsSync.BaseModel,
+ Environment: gitOpsSync.Environment,
+ Repository: gitOpsSync.Repository,
+ ProjectID: &project.ID,
+ Project: gitOpsSync.Project,
+ SyncedFiles: gitOpsSync.SyncedFiles,
+ LastSyncAt: gitOpsSync.LastSyncAt,
+ LastSyncStatus: gitOpsSync.LastSyncStatus,
+ LastSyncError: gitOpsSync.LastSyncError,
+ LastSyncCommit: gitOpsSync.LastSyncCommit,
+ PreDeployScriptPath: gitOpsSync.PreDeployScriptPath,
+ PreDeployRunnerImage: gitOpsSync.PreDeployRunnerImage,
+ PreDeployEnv: gitOpsSync.PreDeployEnv,
+ PreDeployExtraMounts: gitOpsSync.PreDeployExtraMounts,
+ PreDeployLastRunAt: gitOpsSync.PreDeployLastRunAt,
+ PreDeployLastRunStatus: gitOpsSync.PreDeployLastRunStatus,
+ PreDeployLastRunOutput: gitOpsSync.PreDeployLastRunOutput,
+ Name: gitOpsSync.Name,
+ EnvironmentID: gitOpsSync.EnvironmentID,
+ RepositoryID: gitOpsSync.RepositoryID,
+ Branch: gitOpsSync.Branch,
+ ComposePath: gitOpsSync.ComposePath,
+ TargetType: gitOpsSync.TargetType,
+ ProjectName: gitOpsSync.ProjectName,
+ PreDeployNetworkMode: gitOpsSync.PreDeployNetworkMode,
+ SyncInterval: gitOpsSync.SyncInterval,
+ MaxSyncFiles: gitOpsSync.MaxSyncFiles,
+ MaxSyncTotalSize: gitOpsSync.MaxSyncTotalSize,
+ MaxSyncBinarySize: gitOpsSync.MaxSyncBinarySize,
+ PreDeployTimeoutSec: gitOpsSync.PreDeployTimeoutSec,
+ AutoSync: gitOpsSync.AutoSync,
+ SyncDirectory: gitOpsSync.SyncDirectory,
+ PullImageAfterSync: gitOpsSync.PullImageAfterSync,
+ RedeployAfterSync: gitOpsSync.RedeployAfterSync,
+ Mode: gitOpsSync.Mode,
+ BackupDirectory: gitOpsSync.BackupDirectory,
+ BackupPaths: gitOpsSync.BackupPaths,
+ BackupOnSave: gitOpsSync.BackupOnSave,
+ BackupPending: gitOpsSync.BackupPending,
+ BackupPendingSince: gitOpsSync.BackupPendingSince,
+ BackupConflict: gitOpsSync.BackupConflict,
+ BackupFailureReason: gitOpsSync.BackupFailureReason,
+ LastBackupAt: gitOpsSync.LastBackupAt,
+ LastBackupSnapshot: gitOpsSync.LastBackupSnapshot,
+ }
+ *project = Project{ //exhaustruct:enforce
+ BaseModel: project.BaseModel,
+ Name: project.Name,
+ DirName: project.DirName,
+ Path: project.Path,
+ Status: project.Status,
+ StatusReason: project.StatusReason,
+ ServiceCount: project.ServiceCount,
+ RunningCount: project.RunningCount,
+ GitOpsManagedBy: &gitOpsSync.ID,
+ ComposeProjectName: project.ComposeProjectName,
+ ImageRefsJSON: project.ImageRefsJSON,
+ BuildImageRefsJSON: project.BuildImageRefsJSON,
+ IsArchived: project.IsArchived,
+ ArchivedAt: project.ArchivedAt,
}
-
- gitOpsSync.ProjectID = &project.ID
- project.GitOpsManagedBy = &gitOpsSync.ID
- cacheBinding()
+ s.composeNames.put(projects.NormalizeProjectName(project.Name), project.ID)
return nil
}
@@ -188,14 +228,13 @@ func (s *ProjectService) ValidateComposeDirectory(ctx context.Context, projectNa
if err != nil {
return 0, err
}
- pathMapper := s.projectPathMapper(ctx)
composeProject, err := projects.LoadComposeProject(
ctx,
filepath.Join(projectPath, composeFileName),
projects.NormalizeProjectName(projectName),
projectsDirectory,
s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false),
- pathMapper,
+ s.projectPathMapper(ctx),
nil,
nil,
true, nil, nil, nil,
@@ -227,21 +266,18 @@ func (s *ProjectService) CreateGitOpsManagedProject(ctx context.Context, gitOpsS
return err
}
- gitOpsSync.ProjectID = &project.ID
- project.GitOpsManagedBy = &gitOpsSync.ID
- s.composeNames.put(projects.NormalizeProjectName(project.Name), project.ID)
+ if err := s.EnsureGitOpsProjectLinked(ctx, gitOpsSync, project); err != nil {
+ return err
+ }
if err := s.reconcileComposeTagsForProject(ctx, project); err != nil {
slog.WarnContext(ctx, "failed to reconcile Compose project tags during GitOps project creation", "projectId", project.ID, "error", err)
}
- logEvent := true
- if len(logEventOptions) > 0 {
- logEvent = logEventOptions[0]
- }
- if logEvent && s.eventService != nil {
- metadata := database.JSON{"action": "create", "projectID": project.ID, "projectName": project.Name, "path": project.Path}
- if err := s.eventService.LogProjectEvent(ctx, event.EventTypeProjectCreate, project.ID, project.Name, actor.ID, actor.Username, "0", metadata); err != nil {
- slog.ErrorContext(ctx, "could not log project creation", "error", err)
- }
+ if len(logEventOptions) == 0 || logEventOptions[0] {
+ s.logProjectEvent(
+ ctx, event.EventTypeProjectCreate, project.ID, project.Name, actor,
+ database.JSON{"action": "create", "projectID": project.ID, "projectName": project.Name, "path": project.Path},
+ "could not log project creation",
+ )
}
return nil
}
@@ -254,10 +290,11 @@ func (s *ProjectService) newProjectMetadataEnv(ctx context.Context, projectsList
slog.WarnContext(ctx, "failed to resolve projects directory for compose selection", "error", err)
}
env := &projectMetadataEnv{
- projectsDirectory: projectsDirectory,
- autoInjectEnv: s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false),
- settings: s.settingsService.GetSettingsOrDefaults(ctx),
- composeFiles: make(map[string]string, len(projectsList)),
+ projectsDirectory: projectsDirectory,
+ autoInjectEnv: s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false),
+ settings: s.settingsService.GetSettingsOrDefaults(ctx),
+ gitOpsComposePaths: make(map[string]string),
+ composeFiles: make(map[string]string, len(projectsList)),
}
s.preloadGitOpsComposePaths(ctx, env, projectsList)
return env
@@ -278,14 +315,10 @@ func (s *ProjectService) preloadGitOpsComposePaths(ctx context.Context, env *pro
}
var syncRecords []GitOpsSync
if err := s.db.WithContext(ctx).Select("id", "compose_path").Where("id IN ?", syncIDs).Find(&syncRecords).Error; err != nil {
- // Leave these IDs unloaded so each project falls back to its own lookup
- // and surfaces the failure the same way it did before batching.
+ // Unloaded IDs fall back to a per-project lookup that surfaces the failure.
slog.WarnContext(ctx, "failed to batch resolve GitOps compose paths", "error", err)
return
}
- if env.gitOpsComposePaths == nil {
- env.gitOpsComposePaths = make(map[string]string, len(syncIDs))
- }
for _, id := range syncIDs {
env.gitOpsComposePaths[id] = ""
}
@@ -307,66 +340,63 @@ func NewProjectService(
kvService *kv.KVService,
registryCredentialsProvider func(context.Context) ([]containerregistry.Credential, error),
) *ProjectService {
- s := &ProjectService{
- RegistryCredentialsProvider: registryCredentialsProvider,
- composeCoordinator: projects.NewCoordinator(projecttypes.ComposeCommands{Stop: composeStopProjectServices, Up: composeUpProjectServices, Create: projects.ComposeCreate}),
- db: db,
- settingsService: settingsService,
- eventService: eventService,
- imageService: imageService,
- dockerService: dockerService,
- lifecycleService: lifecycleService,
+ var s *ProjectService
+ s = &ProjectService{
+ composeCoordinator: projects.NewCoordinator(projecttypes.ComposeCommands{Stop: composeStopProjectServices, Up: composeUpProjectServices, Create: projects.ComposeCreate}),
+ db: db,
+ settingsService: settingsService,
+ eventService: eventService,
+ imageService: imageService,
+ dockerService: dockerService,
+ lifecycleService: lifecycleService,
+ workspace: workspace.New(cfg),
+ details: projectdetails.New(db, dockerService, imageService, settingsService),
+ listing: listing.New(
+ func(ctx context.Context) ([]container.Summary, error) { return s.details.ComposeContainers(ctx) },
+ imageService,
+ func(imageRefs []string, services []projecttypes.RuntimeService, scoped map[string]*imagetypes.UpdateInfo) *projecttypes.UpdateInfo {
+ return buildUpdateInfoSummary(imageRefs, projectdetails.MergeProjectContainerUpdateInfo(nil, services, scoped), nil)
+ },
+ ),
+ deployment: deployment.New(settingsService, imageService, dockerService, buildService),
+ // Rename recovery compares the stored name and path against its journal and rolls the row back.
+ updates: update.New(
+ kvService,
+ dockerService,
+ containerRegistryService,
+ func(ctx context.Context) ([]containerregistry.Credential, error) {
+ return s.ResolveRegistryCredentials(ctx)
+ },
+ func(ctx context.Context, projectID string) (string, string, bool, error) {
+ proj, found, err := s.FindProjectByID(ctx, projectID)
+ if err != nil || !found {
+ return "", "", found, err
+ }
+ return proj.Name, proj.Path, true, nil
+ },
+ func(ctx context.Context, journal *projecttypes.RenameJournal) error {
+ return db.WithContext(ctx).Model(&Project{}).Where("id = ?", journal.ProjectID).Updates(map[string]any{
+ "name": journal.OldName, "path": journal.OldPath, "dir_name": journal.OldDirName,
+ }).Error
+ },
+ ),
containerRegistryService: containerRegistryService,
config: cfg,
+ RegistryCredentialsProvider: registryCredentialsProvider,
parsedCompose: projects.NewParsedComposeCache(),
metaCache: projects.NewComposeCache[projects.ArcaneComposeMetadata](1024, nil),
composeIdentities: projects.NewComposeCache[projecttypes.ComposeIdentity](2048, nil),
FilesChanged: concurrency.NewSignal[string](),
}
- s.initChildren(kvService, buildService)
return s
}
-// initChildren builds the feature services from the parent's
-// dependencies and callbacks.
-func (s *ProjectService) initChildren(kvService *kv.KVService, buildService builder) {
- s.workspace = workspace.New(s.config)
- s.details = projectdetails.New(s.db, s.dockerService, s.imageService, s.settingsService)
- s.listing = listing.New(
- s.details.ComposeContainers,
- s.imageService,
- func(imageRefs []string, services []projecttypes.RuntimeService, scoped map[string]*imagetypes.UpdateInfo) *projecttypes.UpdateInfo {
- return buildUpdateInfoSummary(imageRefs, projectdetails.MergeProjectContainerUpdateInfo(nil, services, scoped))
- },
- )
- s.deployment = deployment.New(s.settingsService, s.imageService, s.dockerService, buildService)
- // Rename recovery compares the stored name and path against its journal and
- // rolls the row back to its pre-rename identity.
- renameState := func(ctx context.Context, projectID string) (string, string, bool, error) {
- proj, found, err := s.FindProjectByID(ctx, projectID)
- if err != nil || !found {
- return "", "", found, err
- }
- return proj.Name, proj.Path, true, nil
- }
- restoreRenamed := func(ctx context.Context, journal *projecttypes.RenameJournal) error {
- return s.db.WithContext(ctx).Model(&Project{}).Where("id = ?", journal.ProjectID).Updates(map[string]any{
- "name": journal.OldName, "path": journal.OldPath, "dir_name": journal.OldDirName,
- }).Error
- }
- s.updates = update.New(kvService, s.dockerService, s.containerRegistryService, s.ResolveRegistryCredentials, renameState, restoreRenamed)
-}
-
// RecoverProjectRenameJournals replays renames interrupted by a restart.
func (s *ProjectService) RecoverProjectRenameJournals(ctx context.Context) error {
return s.updates.RecoverAll(ctx)
}
func (s *ProjectService) ResolveRegistryCredentials(ctx context.Context) ([]containerregistry.Credential, error) {
- if s == nil || s.RegistryCredentialsProvider == nil {
- return nil, nil
- }
-
credentials, err := s.RegistryCredentialsProvider(ctx)
if err != nil {
return nil, fmt.Errorf("get enabled registry credentials: %w", err)
@@ -389,16 +419,13 @@ func (s *ProjectService) getMutableProject(ctx context.Context, projectID string
if err != nil {
return nil, err
}
- if proj != nil && proj.IsArchived {
+ if proj.IsArchived {
return nil, common.Classify(common.ErrProjectArchived, errors.New("project is archived and must be unarchived before this action"))
}
return proj, nil
}
func (s *ProjectService) logProjectEvent(ctx context.Context, eventType event.EventType, projectID, projectName string, user usertypes.Actor, metadata database.JSON, action string) {
- if s.eventService == nil {
- return
- }
if logErr := s.eventService.LogProjectEvent(ctx, eventType, projectID, projectName, user.ID, user.Username, "0", metadata); logErr != nil {
slog.ErrorContext(ctx, "could not log project event", "action", action, "error", logErr)
}
@@ -443,8 +470,8 @@ func (s *ProjectService) GetProjectByComposeName(ctx context.Context, name strin
if name == "" {
return nil, errors.New("project name is empty")
}
- normalized := projects.NormalizeProjectName(name)
+ normalized := projects.NormalizeProjectName(name)
var proj Project
err := s.db.WithContext(ctx).Where("name = ? OR name = ?", name, normalized).First(&proj).Error
if err == nil {
@@ -455,30 +482,34 @@ func (s *ProjectService) GetProjectByComposeName(ctx context.Context, name strin
return nil, fmt.Errorf("failed to get project by name: %w", err)
}
- if cachedProject, found, cacheErr := s.lookupProjectByCachedComposeName(ctx, normalized); cacheErr != nil {
- return nil, cacheErr
- } else if found {
- return cachedProject, nil
- }
-
- var projectModels []Project
- if listErr := s.db.WithContext(ctx).Select("id", "name").Find(&projectModels).Error; listErr != nil {
- return nil, fmt.Errorf("failed to list projects by compose name: %w", listErr)
- }
- byName := make(map[string]string, len(projectModels))
- for _, projectModel := range projectModels {
- if normalizedName := projects.NormalizeProjectName(projectModel.Name); normalizedName != "" {
- if _, exists := byName[normalizedName]; !exists {
+ for attempt := range 2 {
+ if projectID, ok := s.composeNames.projectID(normalized).Get(); ok {
+ var projectModel Project
+ switch lookupErr := s.db.WithContext(ctx).Where("id = ?", projectID).First(&projectModel).Error; {
+ case errors.Is(lookupErr, gorm.ErrRecordNotFound), lookupErr == nil && projects.NormalizeProjectName(projectModel.Name) != normalized:
+ s.composeNames.invalidate(normalized)
+ case errors.Is(lookupErr, context.Canceled), errors.Is(lookupErr, context.DeadlineExceeded):
+ return nil, fmt.Errorf("request canceled or timed out: %w", lookupErr)
+ case lookupErr != nil:
+ return nil, fmt.Errorf("failed to get project by cached compose name: %w", lookupErr)
+ default:
+ return &projectModel, nil
+ }
+ }
+ if attempt > 0 {
+ break
+ }
+ var projectModels []Project
+ if listErr := s.db.WithContext(ctx).Select("id", "name").Find(&projectModels).Error; listErr != nil {
+ return nil, fmt.Errorf("failed to list projects by compose name: %w", listErr)
+ }
+ byName := make(map[string]string, len(projectModels))
+ for _, projectModel := range projectModels {
+ if normalizedName := projects.NormalizeProjectName(projectModel.Name); normalizedName != "" && byName[normalizedName] == "" {
byName[normalizedName] = projectModel.ID
}
}
- }
- s.composeNames.replace(byName)
-
- if cachedProject, found, cacheErr := s.lookupProjectByCachedComposeName(ctx, normalized); cacheErr != nil {
- return nil, cacheErr
- } else if found {
- return cachedProject, nil
+ s.composeNames.replace(byName)
}
return nil, common.Classify(common.ErrNotFound, fmt.Errorf("project not found: %s", name))
@@ -502,9 +533,8 @@ func (s *ProjectService) ComposeServiceImage(ctx context.Context, composeName, s
return proj.ID, service.Image, nil
}
-// EnsureProjectPathUnderRoot validates that the project's path is a safe subdirectory of the configured projects root.
-// If not, it normalizes the path to `<projectsRoot>/<dirName or sanitized project name>`. When persist=true, it saves
-// the updated project path to the database.
+// EnsureProjectPathUnderRoot normalizes a path outside the projects root to `<projectsRoot>/<dirName or sanitized name>`.
+// When persist=true, it saves the updated project path to the database.
func (s *ProjectService) EnsureProjectPathUnderRoot(ctx context.Context, proj *Project, persist bool) error {
projectsDirectory, err := s.GetProjectsDirectory(ctx)
if err != nil {
@@ -512,26 +542,29 @@ func (s *ProjectService) EnsureProjectPathUnderRoot(ctx context.Context, proj *P
}
rootAbs, _ := filepath.Abs(projectsDirectory)
- rootAbs = filepath.Clean(rootAbs)
-
- projPathAbs := proj.Path
- if abs, aerr := filepath.Abs(proj.Path); aerr == nil {
- projPathAbs = filepath.Clean(abs)
- }
-
- if projects.IsSafeSubdirectory(rootAbs, projPathAbs) {
+ projPathAbs, absErr := filepath.Abs(proj.Path)
+ if projects.IsSafeSubdirectory(rootAbs, kit.Ternary(absErr == nil, projPathAbs, proj.Path)) {
return nil
}
- // Attempt to repair using known directory name or sanitized project name
- dirName := mo.PointerToOption(proj.DirName).OrEmpty()
- if strings.TrimSpace(dirName) == "" {
- dirName = projects.SanitizeProjectName(proj.Name)
- }
- candidate := filepath.Join(projectsDirectory, dirName)
-
+ candidate := filepath.Join(projectsDirectory, kit.Ternary(strings.TrimSpace(kit.FromPtr(proj.DirName)) == "", projects.SanitizeProjectName(proj.Name), kit.FromPtr(proj.DirName)))
slog.WarnContext(ctx, "Normalizing project path to projects root", "projectId", proj.ID, "oldPath", proj.Path, "newPath", candidate, "root", projectsDirectory)
- proj.Path = filepath.Clean(candidate)
+ *proj = Project{ //exhaustruct:enforce
+ BaseModel: proj.BaseModel,
+ Name: proj.Name,
+ DirName: proj.DirName,
+ Path: candidate,
+ Status: proj.Status,
+ StatusReason: proj.StatusReason,
+ ServiceCount: proj.ServiceCount,
+ RunningCount: proj.RunningCount,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ ComposeProjectName: proj.ComposeProjectName,
+ ImageRefsJSON: proj.ImageRefsJSON,
+ BuildImageRefsJSON: proj.BuildImageRefsJSON,
+ IsArchived: proj.IsArchived,
+ ArchivedAt: proj.ArchivedAt,
+ }
if persist {
if saveErr := s.db.WithContext(ctx).Save(proj).Error; saveErr != nil {
@@ -542,56 +575,24 @@ func (s *ProjectService) EnsureProjectPathUnderRoot(ctx context.Context, proj *P
}
func (s *ProjectService) projectPathMapper(ctx context.Context) *projects.PathMapper {
- var dockerClient *client.Client
- if s.dockerService != nil {
- dockerClient, _ = s.dockerService.GetClient(ctx)
- }
return projects.NewPathMapperForConfiguredDirectory(
ctx,
s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects"),
"/app/data/projects",
- dockerClient,
+ func() *client.Client {
+ dockerClient, _ := s.dockerService.GetClient(ctx)
+ return dockerClient
+ }(),
)
}
func (s *ProjectService) invalidateProjectCaches(projectID string) {
- if s.parsedCompose != nil {
- s.parsedCompose.Invalidate(projectID)
- }
- if s.metaCache != nil {
- s.metaCache.Invalidate(projectID)
- }
-}
-
-func (s *ProjectService) lookupProjectByCachedComposeName(ctx context.Context, normalizedName string) (*Project, bool, error) {
- projectID, ok := s.composeNames.projectID(normalizedName).Get()
- if !ok {
- return nil, false, nil
- }
-
- var projectModel Project
- if err := s.db.WithContext(ctx).Where("id = ?", projectID).First(&projectModel).Error; err != nil {
- if errors.Is(err, gorm.ErrRecordNotFound) {
- s.composeNames.invalidate(normalizedName)
- return nil, false, nil
- }
- if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
- return nil, false, fmt.Errorf("request canceled or timed out: %w", err)
- }
- return nil, false, fmt.Errorf("failed to get project by cached compose name: %w", err)
- }
- if projects.NormalizeProjectName(projectModel.Name) != normalizedName {
- s.composeNames.invalidate(normalizedName)
- return nil, false, nil
- }
-
- return &projectModel, true, nil
+ s.parsedCompose.Invalidate(projectID)
+ s.metaCache.Invalidate(projectID)
}
-// ResolveProjectComposeFile returns the base compose file for a project. The
-// precedence mirrors `docker compose`: COMPOSE_FILE in the merged environment
-// (.env.global first, the project's .env on top) wins, then a GitOps sync's
-// configured compose path, then standard detection.
+// ResolveProjectComposeFile returns the base compose file for a project, mirroring `docker compose`: COMPOSE_FILE
+// in the merged environment wins, then a GitOps sync's configured compose path, then standard detection.
func (s *ProjectService) ResolveProjectComposeFile(ctx context.Context, proj *Project) (string, error) {
return s.resolveProjectComposeFile(ctx, proj, nil)
}
@@ -603,53 +604,48 @@ func (s *ProjectService) resolveProjectComposeFile(ctx context.Context, proj *Pr
return "", errors.New("project is nil")
}
return env.composeFile(proj.ID, func() (string, error) {
- projectsDirectory := ""
- switch {
- case env != nil:
- projectsDirectory = env.projectsDirectory
- case s.settingsService != nil:
- var dirErr error
- projectsDirectory, dirErr = s.GetProjectsDirectory(ctx)
+ projectsDirectory, preloadedComposePaths := func() (string, map[string]string) {
+ if env != nil {
+ return env.projectsDirectory, env.gitOpsComposePaths
+ }
+ dir, dirErr := s.GetProjectsDirectory(ctx)
if dirErr != nil {
- // The .env.global layer is skipped for an empty projects directory;
- // keep resolution working but surface the misconfiguration.
+ // The .env.global layer is skipped for an empty projects directory; surface the misconfiguration.
slog.WarnContext(ctx, "failed to resolve projects directory for compose selection", "projectId", proj.ID, "error", dirErr)
}
- }
+ return dir, nil
+ }()
if files, selErr := projects.ComposeFileEnvSelection(ctx, projectsDirectory, proj.Path); selErr != nil {
return "", selErr
} else if len(files) > 0 {
return files[0], nil
}
- // A GitOps sync's configured compose path comes from the preloaded request
- // map when available; a sync without a row resolves like a missing one.
- composePath := ""
- if syncID := gitOpsSyncID(proj); syncID != "" {
- preloaded := false
- if env != nil {
- composePath, preloaded = env.gitOpsComposePaths[syncID]
+ // A GitOps sync's compose path comes from the preloaded request map when available; a missing row resolves to "".
+ composePath, err := func() (string, error) {
+ if gitOpsSyncID(proj) == "" {
+ return "", nil
}
- if !preloaded {
- var syncRecord GitOpsSync
- if err := s.db.WithContext(ctx).Select("compose_path").Where("id = ?", syncID).First(&syncRecord).Error; err == nil {
- composePath = syncRecord.ComposePath
- } else if !errors.Is(err, gorm.ErrRecordNotFound) {
- return "", fmt.Errorf("failed to resolve GitOps compose path for project %s: %w", proj.ID, err)
- }
+ if preloaded, ok := preloadedComposePaths[gitOpsSyncID(proj)]; ok {
+ return preloaded, nil
+ }
+ var syncRecord GitOpsSync
+ if err := s.db.WithContext(ctx).Select("compose_path").Where("id = ?", gitOpsSyncID(proj)).First(&syncRecord).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return "", fmt.Errorf("failed to resolve GitOps compose path for project %s: %w", proj.ID, err)
}
+ return syncRecord.ComposePath, nil
+ }()
+ if err != nil {
+ return "", err
}
if composeFileName := strings.TrimSpace(filepath.Base(composePath)); composeFileName != "" && composeFileName != "." {
- candidate := filepath.Join(proj.Path, composeFileName)
- // os.Stat rather than acfs: proj.Path may be an imported project
- // outside the projects directory, and the compose file may be a
- // symlink resolving outside it.
- info, statErr := os.Stat(candidate)
+ // os.Stat rather than acfs: an imported project or a symlinked compose file may resolve outside the projects directory.
+ info, statErr := os.Stat(filepath.Join(proj.Path, composeFileName))
if statErr == nil && !info.IsDir() {
- return candidate, nil
+ return filepath.Join(proj.Path, composeFileName), nil
}
if statErr != nil && !os.IsNotExist(statErr) {
- return "", fmt.Errorf("failed to inspect GitOps compose file %s: %w", candidate, statErr)
+ return "", fmt.Errorf("failed to inspect GitOps compose file %s: %w", filepath.Join(proj.Path, composeFileName), statErr)
}
}
@@ -664,9 +660,8 @@ func (s *ProjectService) resolveProjectComposeFile(ctx context.Context, proj *Pr
})
}
-// loadComposeProjectForProject loads the executable compose model for
-// proj. prepare is optional and runs before host path translation; deployment
-// paths use it to create missing bind directories, read paths pass nil.
+// loadComposeProjectForProject loads the executable compose model for proj. prepare is optional and runs before
+// host path translation; deployment paths use it to create missing bind directories, read paths pass nil.
func (s *ProjectService) loadComposeProjectForProject(ctx context.Context, proj *Project, prepare projects.PrepareProjectFunc, services ...string) (*types.Project, string, error) {
composeFileFullPath, err := s.ResolveProjectComposeFile(ctx, proj)
if err != nil {
@@ -677,18 +672,19 @@ func (s *ProjectService) loadComposeProjectForProject(ctx context.Context, proj
projectsDirectory, dirErr := projects.GetProjectsDirectory(ctx, cfg.ProjectsDirectory.Value)
if dirErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", dirErr)
- projectsDirectory = "/app/data/projects"
}
-
- pathMapper := s.projectPathMapper(ctx)
-
- autoInjectEnv := kit.ParseOrDefault(cfg.AutoInjectEnv.Value, false, strconv.ParseBool)
- projectName := projects.NormalizeProjectName(proj.Name)
- composeProject, loadErr := projects.LoadComposeProject(ctx, composeFileFullPath, projectName, projectsDirectory, autoInjectEnv, pathMapper, nil, nil, false, nil, services, prepare)
+ composeProject, loadErr := projects.LoadComposeProject(
+ ctx,
+ composeFileFullPath,
+ projects.NormalizeProjectName(proj.Name),
+ kit.Ternary(dirErr == nil, projectsDirectory, "/app/data/projects"),
+ kit.ParseOrDefault(cfg.AutoInjectEnv.Value, false, strconv.ParseBool),
+ s.projectPathMapper(ctx),
+ nil, nil, false, nil, services, prepare,
+ )
if loadErr != nil {
return nil, "", loadErr
}
-
return composeProject, composeFileFullPath, nil
}
@@ -696,39 +692,43 @@ func (s *ProjectService) getCachedComposeProject(ctx context.Context, proj *Proj
if proj == nil {
return nil, errors.New("project is nil")
}
- var cfg *settings.Settings
- if env != nil {
- cfg = env.settings
- }
- if cfg == nil {
- cfg = s.settingsService.GetSettingsOrDefaults(ctx)
- }
+ cfg := func() *settings.Settings {
+ if env == nil {
+ return s.settingsService.GetSettingsOrDefaults(ctx)
+ }
+ return env.settings
+ }()
composePath, err := s.resolveProjectComposeFile(ctx, proj, env)
if err != nil {
return nil, err
}
- autoInjectEnv := kit.ParseOrDefault(cfg.AutoInjectEnv.Value, false, strconv.ParseBool)
projectsDirectory, dirErr := projects.GetProjectsDirectory(ctx, cfg.ProjectsDirectory.Value)
if dirErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", dirErr)
- projectsDirectory = "/app/data/projects"
}
- return projects.LoadCachedComposeProject(ctx, s.parsedCompose, proj.ID, proj.Path, composePath, projects.NormalizeProjectName(proj.Name), projectsDirectory, autoInjectEnv, s.projectPathMapper(ctx))
+ return projects.LoadCachedComposeProject(
+ ctx,
+ s.parsedCompose,
+ proj.ID,
+ proj.Path,
+ composePath,
+ projects.NormalizeProjectName(proj.Name),
+ kit.Ternary(dirErr == nil, projectsDirectory, "/app/data/projects"),
+ kit.ParseOrDefault(cfg.AutoInjectEnv.Value, false, strconv.ParseBool),
+ s.projectPathMapper(ctx),
+ )
}
func (s *ProjectService) refreshComposeProjectName(ctx context.Context, proj *Project) {
- if proj == nil {
- return
- }
-
- cfg := s.settingsService.GetSettingsOrDefaults(ctx)
- projectsDirectory, err := projects.GetProjectsDirectory(ctx, cfg.ProjectsDirectory.Value)
- var meta projecttypes.ComposeIdentity
- if err == nil {
- dirName := cmp.Or(mo.PointerToOption(proj.DirName).OrEmpty(), proj.Name)
+ meta, err := func() (projecttypes.ComposeIdentity, error) {
+ cfg := s.settingsService.GetSettingsOrDefaults(ctx)
+ projectsDirectory, dirErr := projects.GetProjectsDirectory(ctx, cfg.ProjectsDirectory.Value)
+ if dirErr != nil {
+ return projecttypes.ComposeIdentity{}, dirErr
+ }
autoInjectEnv := kit.ParseOrDefault(cfg.AutoInjectEnv.Value, false, strconv.ParseBool)
- meta, err = projectsync.LoadComposeMetadata(ctx, s.composeIdentities, proj.Path, dirName, projectsDirectory, autoInjectEnv, s.projectPathMapper(ctx))
- }
+ return projectsync.LoadComposeMetadata(ctx, s.composeIdentities, proj.Path, cmp.Or(kit.FromPtr(proj.DirName), proj.Name), projectsDirectory, autoInjectEnv, s.projectPathMapper(ctx))
+ }()
if err != nil {
if errors.Is(err, common.ErrProjectEnvUnreadable) {
slog.DebugContext(ctx, "skipped compose project name refresh; project env is unreadable", "projectId", proj.ID, "path", proj.Path, "error", err)
@@ -738,32 +738,38 @@ func (s *ProjectService) refreshComposeProjectName(ctx context.Context, proj *Pr
return
}
- updates := map[string]any{}
- shouldUpdateName := meta.ExplicitProjectName || projects.NormalizeProjectName(proj.Name) != proj.Name
- if shouldUpdateName && meta.ResolvedProjectName != "" && proj.Name != meta.ResolvedProjectName {
- updates["name"] = meta.ResolvedProjectName
- }
- if mo.PointerToOption(proj.ComposeProjectName) != mo.PointerToOption(meta.ComposeProjectName) {
- updates["compose_project_name"] = meta.ComposeProjectName
- }
- if len(updates) == 0 {
+ name := kit.Ternary(
+ (meta.ExplicitProjectName || projects.NormalizeProjectName(proj.Name) != proj.Name) && meta.ResolvedProjectName != "",
+ meta.ResolvedProjectName,
+ proj.Name,
+ )
+ if name == proj.Name && mo.PointerToOption(proj.ComposeProjectName) == mo.PointerToOption(meta.ComposeProjectName) {
return
}
-
- updates["updated_at"] = time.Now()
- if persistComposeNameErr := s.db.WithContext(ctx).
- Model(&Project{}).
- Where("id = ?", proj.ID).
- Updates(updates).Error; persistComposeNameErr != nil {
+ if persistComposeNameErr := s.db.WithContext(ctx).Model(&Project{}).Where("id = ?", proj.ID).Updates(map[string]any{
+ "name": name,
+ "compose_project_name": meta.ComposeProjectName,
+ "updated_at": time.Now(),
+ }).Error; persistComposeNameErr != nil {
slog.WarnContext(ctx, "failed to persist refreshed compose project name", "projectId", proj.ID, "error", persistComposeNameErr)
return
}
- if name, ok := updates["name"].(string); ok {
- proj.Name = name
- }
- if _, ok := updates["compose_project_name"]; ok {
- proj.ComposeProjectName = meta.ComposeProjectName
+ *proj = Project{ //exhaustruct:enforce
+ BaseModel: proj.BaseModel,
+ Name: name,
+ DirName: proj.DirName,
+ Path: proj.Path,
+ Status: proj.Status,
+ StatusReason: proj.StatusReason,
+ ServiceCount: proj.ServiceCount,
+ RunningCount: proj.RunningCount,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ ComposeProjectName: meta.ComposeProjectName,
+ ImageRefsJSON: proj.ImageRefsJSON,
+ BuildImageRefsJSON: proj.BuildImageRefsJSON,
+ IsArchived: proj.IsArchived,
+ ArchivedAt: proj.ArchivedAt,
}
}
@@ -809,12 +815,12 @@ func (s *LifecycleService) runPreDeploy(ctx context.Context, project *Project, a
case err != nil:
return fmt.Errorf("failed to load gitops sync for lifecycle hook: %w", err)
}
- if syncRecord.PreDeployScriptPath == nil || strings.TrimSpace(*syncRecord.PreDeployScriptPath) == "" {
+ if strings.TrimSpace(kit.FromPtr(syncRecord.PreDeployScriptPath)) == "" {
return nil
}
runnerImage := cmp.Or(
- strings.TrimSpace(mo.PointerToOption(syncRecord.PreDeployRunnerImage).OrEmpty()),
+ strings.TrimSpace(kit.FromPtr(syncRecord.PreDeployRunnerImage)),
strings.TrimSpace(s.settingsService.GetStringSetting(ctx, "lifecycleDefaultRunnerImage", "alpine:latest")),
)
if runnerImage == "" {
@@ -835,11 +841,12 @@ func (s *LifecycleService) runPreDeploy(ctx context.Context, project *Project, a
return fmt.Errorf("invalid lifecycle extra mounts config: %w", err)
}
- timeoutSec := kit.Ternary(syncRecord.PreDeployTimeoutSec > 0, syncRecord.PreDeployTimeoutSec, lifecycletype.DefaultTimeoutSec)
- if maxTimeoutSec := s.settingsService.GetIntSetting(ctx, "lifecycleMaxTimeoutSec", lifecycletype.DefaultMaxTimeoutSec); maxTimeoutSec > 0 {
- timeoutSec = min(timeoutSec, maxTimeoutSec)
- }
- timeout := time.Duration(timeoutSec) * time.Second
+ maxTimeoutSec := s.settingsService.GetIntSetting(ctx, "lifecycleMaxTimeoutSec", lifecycletype.DefaultMaxTimeoutSec)
+ timeout := time.Duration(kit.Ternary(
+ maxTimeoutSec > 0,
+ min(kit.Ternary(syncRecord.PreDeployTimeoutSec > 0, syncRecord.PreDeployTimeoutSec, lifecycletype.DefaultTimeoutSec), maxTimeoutSec),
+ kit.Ternary(syncRecord.PreDeployTimeoutSec > 0, syncRecord.PreDeployTimeoutSec, lifecycletype.DefaultTimeoutSec),
+ )) * time.Second
slog.InfoContext(ctx, "running pre-deploy lifecycle hook",
"projectId", project.ID,
"syncId", syncRecord.ID,
@@ -851,16 +858,18 @@ func (s *LifecycleService) runPreDeploy(ctx context.Context, project *Project, a
start := time.Now()
stdoutContent, stderrContent, exitCode, runErr := s.hooks.RunScript(ctx, runnerImage, project.Path, scriptPath, hookEnv, extraMounts, syncRecord.PreDeployNetworkMode, timeout, actor)
durationMs := time.Since(start).Milliseconds()
- status := lifecycle.LifecycleStatusSuccess
- switch {
- case errors.Is(runErr, context.DeadlineExceeded):
- status = lifecycle.LifecycleStatusTimeout
- case runErr != nil || exitCode != 0:
- status = lifecycle.LifecycleStatusFailed
- }
+ status := func() string {
+ switch {
+ case errors.Is(runErr, context.DeadlineExceeded):
+ return lifecycle.LifecycleStatusTimeout
+ case runErr != nil || exitCode != 0:
+ return lifecycle.LifecycleStatusFailed
+ default:
+ return lifecycle.LifecycleStatusSuccess
+ }
+ }()
- // Each stream is already bounded with a truncation marker; cutting the
- // combined output again could split a UTF-8 codepoint.
+ // Each stream is already bounded; cutting the combined output again could split a UTF-8 codepoint.
if persistErr := s.db.WithContext(context.WithoutCancel(ctx)).Model(&GitOpsSync{}).Where("id = ?", syncRecord.ID).Updates(map[string]any{
"pre_deploy_last_run_at": start,
"pre_deploy_last_run_status": status,
@@ -869,22 +878,19 @@ func (s *LifecycleService) runPreDeploy(ctx context.Context, project *Project, a
slog.WarnContext(ctx, "failed to persist lifecycle last-run state", "syncId", syncRecord.ID, "error", persistErr)
}
- scriptPathValue := mo.PointerToOption(syncRecord.PreDeployScriptPath).OrEmpty()
- severity := event.EventSeveritySuccess
- title := "Pre-deploy lifecycle hook succeeded: " + project.Name
- description := fmt.Sprintf("Script %s exited with code %d in %dms", scriptPathValue, exitCode, durationMs)
- if status != lifecycle.LifecycleStatusSuccess {
- severity = event.EventSeverityWarning
- title = fmt.Sprintf("Pre-deploy lifecycle hook %s: %s", status, project.Name)
- if runErr != nil {
- description = runErr.Error()
- }
- }
if _, eventErr := s.eventService.CreateEvent(ctx, event.CreateEventRequest{
- Type: event.EventTypeLifecycleExecute,
- Severity: severity,
- Title: title,
- Description: description,
+ Type: event.EventTypeLifecycleExecute,
+ Severity: kit.Ternary(status == lifecycle.LifecycleStatusSuccess, event.EventSeveritySuccess, event.EventSeverityWarning),
+ Title: kit.Ternary(
+ status == lifecycle.LifecycleStatusSuccess,
+ "Pre-deploy lifecycle hook succeeded: "+project.Name,
+ fmt.Sprintf("Pre-deploy lifecycle hook %s: %s", status, project.Name),
+ ),
+ Description: kit.Ternary(
+ status != lifecycle.LifecycleStatusSuccess && runErr != nil,
+ fmt.Sprint(runErr),
+ fmt.Sprintf("Script %s exited with code %d in %dms", *syncRecord.PreDeployScriptPath, exitCode, durationMs),
+ ),
ResourceType: new("project"),
ResourceID: new(project.ID),
ResourceName: new(project.Name),
@@ -892,7 +898,7 @@ func (s *LifecycleService) runPreDeploy(ctx context.Context, project *Project, a
UserID: new(actor.ID),
Username: new(actor.Username),
Metadata: database.JSON{
- "scriptPath": scriptPathValue,
+ "scriptPath": *syncRecord.PreDeployScriptPath,
"runnerImage": runnerImage,
"exitCode": exitCode,
"durationMs": durationMs,
@@ -917,7 +923,7 @@ func (s *LifecycleService) runPreDeploy(ctx context.Context, project *Project, a
// and "#"-prefixed lines ignored, keys must match POSIX identifier syntax.
// Reuses the strict parser also used for stdout-capture.
func ParseEnvText(raw *string) (map[string]string, error) {
- if raw == nil || strings.TrimSpace(*raw) == "" {
+ if strings.TrimSpace(kit.FromPtr(raw)) == "" {
return map[string]string{}, nil
}
env, err := lifecycle.ParseKeyValueEnv(*raw)
@@ -932,7 +938,7 @@ func ParseEnvText(raw *string) (map[string]string, error) {
// "#"-prefixed lines are ignored. Both source and target must be absolute
// paths; mode defaults to read-write.
func ParseExtraMountsText(raw *string) ([]lifecycletype.ExtraMount, error) {
- if raw == nil || strings.TrimSpace(*raw) == "" {
+ if strings.TrimSpace(kit.FromPtr(raw)) == "" {
return nil, nil
}
@@ -953,17 +959,10 @@ func ParseExtraMountsText(raw *string) ([]lifecycletype.ExtraMount, error) {
return nil, fmt.Errorf("line %d: expected src:tgt[:ro|:rw], got %q", lineNum, line)
}
- mount := lifecycletype.ExtraMount{Source: parts[0], Target: parts[1]}
- if len(parts) == 3 {
- switch parts[2] {
- case "ro":
- mount.Readonly = true
- case "rw":
- mount.Readonly = false
- default:
- return nil, fmt.Errorf("line %d: invalid mode %q (expected \"ro\" or \"rw\")", lineNum, parts[2])
- }
+ if len(parts) == 3 && parts[2] != "ro" && parts[2] != "rw" {
+ return nil, fmt.Errorf("line %d: invalid mode %q (expected \"ro\" or \"rw\")", lineNum, parts[2])
}
+ mount := lifecycletype.ExtraMount{Source: parts[0], Target: parts[1], Readonly: len(parts) == 3 && parts[2] == "ro"}
// Mount sources/targets are interpreted by the Docker daemon as POSIX
// host/container paths, so use path.IsAbs to avoid host-OS quirks
@@ -1118,16 +1117,18 @@ func (s *ProjectService) ArchiveProject(ctx context.Context, projectID string, u
}
}
- now := time.Now()
if archiveProjectErr := s.db.WithContext(ctx).Model(&Project{}).Where("id = ?", projectID).Updates(map[string]any{
"is_archived": true,
- "archived_at": now,
+ "archived_at": time.Now(),
}).Error; archiveProjectErr != nil {
return fmt.Errorf("failed to archive project: %w", archiveProjectErr)
}
- metadata := database.JSON{"action": "archived", "projectID": projectID, "projectName": proj.Name}
- s.logProjectEvent(ctx, event.EventTypeProjectUpdate, projectID, proj.Name, user, metadata, "could not log project archive action")
+ s.logProjectEvent(
+ ctx, event.EventTypeProjectUpdate, projectID, proj.Name, user,
+ database.JSON{"action": "archived", "projectID": projectID, "projectName": proj.Name},
+ "could not log project archive action",
+ )
return nil
}
@@ -1148,8 +1149,11 @@ func (s *ProjectService) UnarchiveProject(ctx context.Context, projectID string,
return fmt.Errorf("failed to unarchive project: %w", unarchiveProjectErr)
}
- metadata := database.JSON{"action": "unarchived", "projectID": projectID, "projectName": proj.Name}
- s.logProjectEvent(ctx, event.EventTypeProjectUpdate, projectID, proj.Name, user, metadata, "could not log project unarchive action")
+ s.logProjectEvent(
+ ctx, event.EventTypeProjectUpdate, projectID, proj.Name, user,
+ database.JSON{"action": "unarchived", "projectID": projectID, "projectName": proj.Name},
+ "could not log project unarchive action",
+ )
return nil
}
@@ -1189,9 +1193,6 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
AuthConfigs: authConfigs,
Progress: progressWriter,
PreDeploy: func(ctx context.Context) error {
- if s.lifecycleService == nil {
- return nil
- }
return s.lifecycleService.runPreDeploy(ctx, projectFromDb, user)
},
Load: func(ctx context.Context) (*types.Project, error) {
@@ -1204,9 +1205,14 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
ResolveImages: func(ctx context.Context) (projecttypes.ComposeImageOperations, error) {
credentials, resolveRegistryCredentialsErr := s.ResolveRegistryCredentials(ctx)
operations := s.deployment.ImageOperations(&user, credentials)
- // Deployment pulls are recorded as system actions; builds retain the requesting actor.
- operations.Pull = s.deployment.ImageOperations(nil, credentials).Pull
- return operations, resolveRegistryCredentialsErr
+ return projecttypes.ComposeImageOperations{
+ Exists: operations.Exists,
+ LastTagged: operations.LastTagged,
+ // Deployment pulls are recorded as system actions; builds retain the requesting actor.
+ Pull: s.deployment.ImageOperations(nil, credentials).Pull,
+ Build: operations.Build,
+ BuildProvider: operations.BuildProvider,
+ }, resolveRegistryCredentialsErr
},
Recover: func(ctx context.Context) {
services, servicesErr := s.projectServices(ctx, projectID)
@@ -1234,8 +1240,11 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
return err
}
- metadata := database.JSON{"action": "deploy", "projectID": projectID, "projectName": projectModel.Name}
- s.logProjectEvent(ctx, event.EventTypeProjectDeploy, projectID, projectModel.Name, user, metadata, "could not log project deployment action")
+ s.logProjectEvent(
+ ctx, event.EventTypeProjectDeploy, projectID, projectModel.Name, user,
+ database.JSON{"action": "deploy", "projectID": projectID, "projectName": projectModel.Name},
+ "could not log project deployment action",
+ )
err = s.updateProjectStatusAndCounts(ctx, projectID, ProjectStatusRunning)
if err != nil {
@@ -1267,12 +1276,11 @@ func (s *ProjectService) DownProject(ctx context.Context, projectID string, user
return fmt.Errorf("failed to bring down project: %w", composeDownErr)
}
- metadata := database.JSON{
+ s.logProjectEvent(ctx, event.EventTypeProjectStop, projectID, projectFromDb.Name, user, database.JSON{
"action": "down",
"projectID": projectID,
"projectName": projectFromDb.Name,
- }
- s.logProjectEvent(ctx, event.EventTypeProjectStop, projectID, projectFromDb.Name, user, metadata, "could not log project down action")
+ }, "could not log project down action")
return s.updateProjectStatusAndCounts(ctx, projectID, ProjectStatusStopped)
}
@@ -1298,16 +1306,9 @@ func (s *ProjectService) CreateProject(
if err != nil {
return nil, fmt.Errorf("invalid project tag colors: %w", err)
}
- allowNameSuffix := true
- if len(allowNameSuffixOptions) > 0 {
- allowNameSuffix = allowNameSuffixOptions[0]
- }
- // A top-level `name:` in the compose file is authoritative over the
- // submitted project name.
- if yamlName := projects.ComposeContentProjectName(composeContent); yamlName != "" {
- name = yamlName
- }
- sanitized := projects.SanitizeProjectName(name)
+ allowNameSuffix := len(allowNameSuffixOptions) == 0 || allowNameSuffixOptions[0]
+ // A top-level `name:` in the compose file is authoritative over the submitted project name.
+ name = cmp.Or(projects.ComposeContentProjectName(composeContent), name)
projectsDirectory, err := s.GetProjectsDirectory(ctx)
if err != nil {
@@ -1319,20 +1320,19 @@ func (s *ProjectService) CreateProject(
s.syncMu.Lock()
defer s.syncMu.Unlock()
- basePath := filepath.Join(projectsDirectory, sanitized)
- var projectPath, folderName string
- var reused bool
- if allowNameSuffix {
+ basePath := filepath.Join(projectsDirectory, projects.SanitizeProjectName(name))
+ projectPath, folderName, reused, err := kit.Ternary(allowNameSuffix, func() (string, string, bool, error) {
// Projects at or nested beneath an existing directory claim it.
- projectPath, folderName, reused, err = projects.CreateUniqueDir(ctx, projectsDirectory, basePath, name, utils.DirPerm, func(dir string) (bool, error) {
+ return projects.CreateUniqueDir(ctx, projectsDirectory, basePath, name, utils.DirPerm, func(dir string) (bool, error) {
nestedPattern := strings.NewReplacer(`\`, `\\`, `%`, `\%`, `_`, `\_`).Replace(dir+string(filepath.Separator)) + "%"
var claims int64
countErr := s.db.WithContext(ctx).Model(&Project{}).Where("path = ? OR path LIKE ? ESCAPE '\\'", dir, nestedPattern).Count(&claims).Error
return claims > 0, countErr
})
- } else {
- projectPath, folderName, err = projects.CreateExactDir(ctx, projectsDirectory, basePath, name, utils.DirPerm)
- }
+ }, func() (string, string, bool, error) {
+ exactPath, exactFolder, exactErr := projects.CreateExactDir(ctx, projectsDirectory, basePath, name, utils.DirPerm)
+ return exactPath, exactFolder, false, exactErr
+ })()
if err != nil {
return nil, fmt.Errorf("failed to create project directory: %w", err)
}
@@ -1353,12 +1353,12 @@ func (s *ProjectService) CreateProject(
for _, change := range manifest.FileChanges {
targets = append(targets, workspace.ChangeTargetPaths(change)...)
}
- scope := projects.ProjectUpdateBackupScope{}
+ var absentPaths []string
for _, target := range targets {
entry, statErr := acfs.Stat(ctx, projectPath, "/"+target, false)
switch {
case errors.Is(statErr, os.ErrNotExist):
- scope.Paths = append(scope.Paths, target)
+ absentPaths = append(absentPaths, target)
case statErr != nil:
return nil, workspace.WrapProjectWorkspaceError(statErr)
case target != projects.EffectiveEnvFileName || entry.IsDirectory:
@@ -1372,7 +1372,9 @@ func (s *ProjectService) CreateProject(
return nil, common.Classify(common.ErrProjectWorkspaceConflict, fmt.Errorf(".env already exists in %q with different content; clear the environment content to keep it", folderName))
}
}
- backup, cleanupBackup, backupProjectDirectoryErr := projects.BackupProjectDirectory(ctx, projectsDirectory, projectPath, ".project-update-backup-*", scope)
+ backup, cleanupBackup, backupProjectDirectoryErr := projects.BackupProjectDirectory(
+ ctx, projectsDirectory, projectPath, ".project-update-backup-*", projects.ProjectUpdateBackupScope{Paths: absentPaths},
+ )
if backupProjectDirectoryErr != nil {
return nil, backupProjectDirectoryErr
}
@@ -1388,15 +1390,6 @@ func (s *ProjectService) CreateProject(
return cause
}
- proj := &Project{
- Name: name,
- DirName: &folderName,
- Path: projectPath,
- Status: ProjectStatusStopped,
- ServiceCount: 0,
- RunningCount: 0,
- }
-
if applyProjectWorkspaceChangesErr := projects.ApplyProjectWorkspaceChanges(ctx, projectPath, manifest.FileChanges, uploads, projects.ProjectWorkspaceApplyOptions{
MaxDepth: s.config.ProjectWorkspaceMaxDepth,
MaxEntries: s.config.ProjectWorkspaceMaxEntries,
@@ -1435,13 +1428,19 @@ func (s *ProjectService) CreateProject(
)
if err != nil {
slog.WarnContext(ctx, "failed to read Compose project tags during creation", "projectName", name, "error", err)
- composeMeta = projects.ArcaneComposeMetadata{}
}
// Compose owns the tags it declares, so they are not attached as UI tags.
normalizedUITags = slices.DeleteFunc(normalizedUITags, func(tag string) bool {
- return slices.ContainsFunc(composeMeta.ProjectTags, func(composeTag projecttypes.TagOption) bool { return composeTag.Name == tag })
+ return slices.ContainsFunc(kit.Ternary(err == nil, composeMeta.ProjectTags, nil), func(composeTag projecttypes.TagOption) bool { return composeTag.Name == tag })
})
+ proj := &Project{
+ Name: name,
+ DirName: &folderName,
+ Path: projectPath,
+ Status: ProjectStatusStopped,
+ }
+
if transactionErr := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
if createProjectErr := tx.Create(proj).Error; createProjectErr != nil {
return createProjectErr
@@ -1452,18 +1451,21 @@ func (s *ProjectService) CreateProject(
}
s.refreshComposeProjectName(ctx, proj)
s.refreshProjectImageRefs(ctx, proj)
- if reconcileComposeProjectTagsErr := s.reconcileComposeProjectTags(ctx, proj.ID, composeMeta.ProjectTags); reconcileComposeProjectTagsErr != nil {
+ if reconcileComposeProjectTagsErr := s.reconcileComposeProjectTags(ctx, proj.ID, kit.Ternary(err == nil, composeMeta.ProjectTags, nil)); reconcileComposeProjectTagsErr != nil {
databaseCleanupErr := s.db.WithContext(context.WithoutCancel(ctx)).Transaction(func(tx *gorm.DB) error {
return deleteProjectWithTags(tx, proj.ID)
})
- if databaseCleanupErr != nil {
- databaseCleanupErr = fmt.Errorf("rollback project database state after tag reconciliation failure: %w", databaseCleanupErr)
- }
- return nil, rollback(errors.Join(fmt.Errorf("reconcile Compose project tags: %w", reconcileComposeProjectTagsErr), databaseCleanupErr))
+ return nil, rollback(errors.Join(
+ fmt.Errorf("reconcile Compose project tags: %w", reconcileComposeProjectTagsErr),
+ kit.Ternary(databaseCleanupErr == nil, nil, fmt.Errorf("rollback project database state after tag reconciliation failure: %w", databaseCleanupErr)),
+ ))
}
- metadata := database.JSON{"action": "create", "projectID": proj.ID, "projectName": proj.Name, "path": projectPath, "reusedDirectory": reused}
- s.logProjectEvent(ctx, event.EventTypeProjectCreate, proj.ID, proj.Name, user, metadata, "could not log project creation")
+ s.logProjectEvent(
+ ctx, event.EventTypeProjectCreate, proj.ID, proj.Name, user,
+ database.JSON{"action": "create", "projectID": proj.ID, "projectName": proj.Name, "path": projectPath, "reusedDirectory": reused},
+ "could not log project creation",
+ )
return proj, nil
}
@@ -1532,8 +1534,13 @@ func (s *ProjectService) DestroyProject(ctx context.Context, projectID string, r
}
s.invalidateProjectCaches(projectID)
- metadata := database.JSON{"action": "destroy", "projectID": projectID, "projectName": proj.Name, "removeFiles": removeFiles, "removeVolumes": removeVolumes}
- s.logProjectEvent(ctx, event.EventTypeProjectDelete, projectID, proj.Name, user, metadata, "could not log project destroy action")
+ s.logProjectEvent(ctx, event.EventTypeProjectDelete, projectID, proj.Name, user, database.JSON{
+ "action": "destroy",
+ "projectID": projectID,
+ "projectName": proj.Name,
+ "removeFiles": removeFiles,
+ "removeVolumes": removeVolumes,
+ }, "could not log project destroy action")
return nil
}
@@ -1563,15 +1570,11 @@ func (s *ProjectService) RedeployProject(ctx context.Context, projectID string,
}
progressWriter, _ := ctx.Value(dockertypes.ProgressWriterKey{}).(io.Writer)
- if progressWriter == nil {
- progressWriter = io.Discard
- }
-
credentials, cerr := s.ResolveRegistryCredentials(ctx)
if cerr != nil {
slog.WarnContext(ctx, "failed to resolve registry credentials for redeploy pull", "error", cerr)
}
- if pullProjectImagesErr := s.PullProjectImages(ctx, projectID, progressWriter, user, credentials); pullProjectImagesErr != nil {
+ if pullProjectImagesErr := s.PullProjectImages(ctx, projectID, kit.Ternary(progressWriter == nil, io.Discard, progressWriter), user, credentials); pullProjectImagesErr != nil {
slog.WarnContext(ctx, "failed to pull project images", "error", pullProjectImagesErr)
}
@@ -1674,16 +1677,12 @@ func (s *ProjectService) updateProjectStatusAndCounts(ctx context.Context, proje
}
func (s *ProjectService) updateProjectStatus(ctx context.Context, id string, status ProjectStatus) error {
- now := time.Now()
- res := s.db.WithContext(ctx).Model(&Project{}).Where("id = ?", id).Updates(map[string]any{
+ if err := s.db.WithContext(ctx).Model(&Project{}).Where("id = ?", id).Updates(map[string]any{
"status": status,
- "updated_at": now,
- })
-
- if res.Error != nil {
- return fmt.Errorf("failed to update project status: %w", res.Error)
+ "updated_at": time.Now(),
+ }).Error; err != nil {
+ return fmt.Errorf("failed to update project status: %w", err)
}
-
return nil
}
@@ -1724,136 +1723,146 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID string
}
projectsDir, projectsDirErr := s.GetProjectsDirectory(ctx)
if projectsDirErr != nil {
- // Relative paths and the .env.global selection layer degrade without a
- // projects directory; keep the details response intact but log it.
+ // Relative paths and the .env.global selection layer degrade without a projects directory.
slog.WarnContext(ctx, "failed to resolve projects directory for project details", "projectId", projectID, "error", projectsDirErr)
}
-
- var resp projecttypes.Details
- if mapStructErr := mapping.MapStruct(proj, &resp); mapStructErr != nil {
- return projecttypes.Details{}, fmt.Errorf("failed to map project: %w", mapStructErr)
- }
-
- resp.CreatedAt = proj.CreatedAt.Format(time.RFC3339)
- resp.UpdatedAt = proj.UpdatedAt.Format(time.RFC3339)
- resp.IsArchived = proj.IsArchived
- resp.ArchivedAt = proj.ArchivedAt
- resp.HasBuildDirective = proj.BuildImageRefsJSON != nil && len(projects.ParseImageRefsJSON(*proj.BuildImageRefsJSON)) > 0
- resp.DirName = mo.PointerToOption(proj.DirName).OrEmpty()
- resp.RelativePath = listing.RelativePath(projectsDir, proj.Path)
- resp.GitOpsManagedBy = proj.GitOpsManagedBy
- meta := s.ProjectMetadata(ctx, *proj, nil)
- icon := iconcatalog.Resolve(IconCatalogForContext(ctx), meta.ProjectIcon)
- resp.IconLightURL, resp.IconDarkURL = icon.IconLightURL, icon.IconDarkURL
- resp.URLs = meta.ProjectURLS
- resp.Tags, err = s.GetProjectTags(ctx, projectID)
+ projectTags, err := s.GetProjectTags(ctx, projectID)
if err != nil {
return projecttypes.Details{}, err
}
- // Default counts/status from DB (will be overridden if runtime check succeeds)
- resp.ServiceCount = proj.ServiceCount
- resp.RunningCount = proj.RunningCount
- resp.Status = string(proj.Status)
-
- // COMPOSE_FILE selects the deployed file set (no auto-overrides). A broken
- // selection is logged but keeps the details response intact.
+ // COMPOSE_FILE selects the deployed file set (no auto-overrides); a broken selection is logged only.
composeSelection, selErr := projects.ComposeFileEnvSelection(ctx, projectsDir, proj.Path)
if selErr != nil {
- selLogLevel := kit.Ternary(errors.Is(selErr, common.ErrProjectEnvUnreadable), slog.LevelDebug, slog.LevelWarn)
- slog.Log(ctx, selLogLevel, "failed to resolve COMPOSE_FILE selection for project details", "projectId", proj.ID, "path", proj.Path, "error", selErr)
- composeSelection = nil
+ slog.Log(ctx, kit.Ternary(errors.Is(selErr, common.ErrProjectEnvUnreadable), slog.LevelDebug, slog.LevelWarn),
+ "failed to resolve COMPOSE_FILE selection for project details", "projectId", proj.ID, "path", proj.Path, "error", selErr)
}
- resp.ComposeFiles = projectdetails.ComposeSelectionRelativePaths(proj.Path, composeSelection)
- resp.ConfigurationError = projects.CheckProjectEnvAccess(ctx, projectsDir, proj.Path)
-
- if opts.IncludeComposeContent {
- composeContent, _, overrideContent, contentErr := s.projectContent(ctx, proj.ID)
- if contentErr != nil {
- return projecttypes.Details{}, fmt.Errorf("failed to read project compose content: %w", contentErr)
- }
- resp.ComposeContent = composeContent
- resp.OverrideFileName, resp.OverrideContent = projectdetails.ResolveDetailsOverride(proj.Path, overrideContent, composeSelection)
+ composeContent, _, overrideContent, err := kit.Ternary(opts.IncludeComposeContent, s.projectContent, func(context.Context, string) (string, string, string, error) {
+ return "", "", "", nil
+ })(ctx, proj.ID)
+ if err != nil {
+ return projecttypes.Details{}, fmt.Errorf("failed to read project compose content: %w", err)
}
- if opts.IncludeEnvState {
- envState, readProjectEnvStateErr := projects.ReadProjectEnvState(proj.Path)
- if readProjectEnvStateErr != nil {
- return projecttypes.Details{}, fmt.Errorf("failed to read project env state: %w", readProjectEnvStateErr)
+ overrideFileName, overrideContent := func() (string, string) {
+ if !opts.IncludeComposeContent {
+ return "", ""
}
- effectiveEnvContent, readProjectEnvStateErr := projectsync.ResolveStoredEffectiveEnvContent(envState)
- if readProjectEnvStateErr != nil {
- return projecttypes.Details{}, readProjectEnvStateErr
+ return projectdetails.ResolveDetailsOverride(proj.Path, overrideContent, kit.Ternary(selErr == nil, composeSelection, nil))
+ }()
+ envContent, err := func() (string, error) {
+ if !opts.IncludeEnvState {
+ return "", nil
}
- resp.EnvContent = effectiveEnvContent
- }
-
- s.enrichComposeDetails(ctx, proj, opts, &resp)
- if syncID := gitOpsSyncID(proj); syncID != "" {
- var syncRecord GitOpsSync
- if syncErr := s.db.WithContext(ctx).Preload("Repository").Where("id = ?", syncID).First(&syncRecord).Error; syncErr == nil {
- resp.LastSyncCommit = syncRecord.LastSyncCommit
- if syncRecord.Repository != nil {
- resp.GitRepositoryURL = syncRecord.Repository.URL
- }
+ envState, readErr := projects.ReadProjectEnvState(proj.Path)
+ if readErr != nil {
+ return "", fmt.Errorf("failed to read project env state: %w", readErr)
}
+ return projectsync.ResolveStoredEffectiveEnvContent(envState)
+ }()
+ if err != nil {
+ return projecttypes.Details{}, err
}
- // Refresh runtime status/counts even when callers do not request the full
- // runtime service array. DB values are only a fallback when Docker lookup
- // or compose loading fails.
- services, serr := s.projectServices(ctx, projectID)
- if serr == nil && services != nil {
- resp.ServiceCount = len(services)
- _, runningCount := listing.ServiceCounts(services)
- resp.RunningCount = runningCount
- resp.Status = listing.ProjectStatus(services)
-
- if opts.IncludeRuntimeServices || opts.IncludeUpdateInfo {
- resp.RuntimeServices = services
- resp.RedeployDisabled = slices.ContainsFunc(services, func(svc projecttypes.RuntimeService) bool { return svc.RedeployDisabled })
+ composeFile, composeErr := s.ResolveProjectComposeFile(ctx, proj)
+ if errors.Is(composeErr, common.ErrProjectEnvUnreadable) {
+ // The env is unreadable, so only the compose file's identity is known; interpolation-backed enrichment is skipped.
+ projectsDirectory, dirErr := s.GetProjectsDirectory(ctx)
+ if dirErr != nil {
+ slog.DebugContext(ctx, "failed to resolve projects directory for compose identification", "projectId", proj.ID, "error", dirErr)
}
- }
-
- if opts.IncludeUpdateInfo {
- s.enrichProjectUpdateInfo(ctx, &resp)
- }
- if !opts.IncludeRuntimeServices {
- resp.RuntimeServices = nil
- }
- if !opts.IncludeServiceConfigs {
- resp.Services = nil
- }
-
- return resp, nil
-}
-
-func (s *ProjectService) enrichProjectUpdateInfo(ctx context.Context, resp *projecttypes.Details) {
- if resp == nil {
- return
- }
-
- imageRefs := projects.ImageRefsFromComposeConfigs(resp.Services)
- if len(imageRefs) == 0 {
- imageRefs = projects.ImageRefsFromRuntimeServices(resp.RuntimeServices)
- }
-
- var updateInfoByRef map[string]*imagetypes.UpdateInfo
- if len(imageRefs) > 0 && s.imageService != nil {
- lookupResult, err := s.imageService.GetUpdateInfoByImageRefs(ctx, imageRefs)
- if err != nil {
- slog.WarnContext(ctx, "failed to fetch project update info", "projectId", resp.ID, "projectName", resp.Name, "error", err)
- } else {
- updateInfoByRef = lookupResult
+ identified, detectErr := projects.DetectComposeFile(ctx, projectsDirectory, proj.Path)
+ if detectErr != nil && (!errors.Is(detectErr, common.ErrProjectEnvUnreadable) || identified == "") {
+ slog.WarnContext(ctx, "failed to identify project compose file", "projectId", proj.ID, "error", detectErr)
}
+ composeFile = kit.Ternary(detectErr != nil && (!errors.Is(detectErr, common.ErrProjectEnvUnreadable) || identified == ""), "", identified)
}
+ composeServices := func() []types.ServiceConfig {
+ if composeErr != nil || (!opts.IncludeServiceConfigs && !opts.IncludeUpdateInfo) {
+ return nil
+ }
+ composeProj, loadErr := s.getCachedComposeProject(ctx, proj, nil)
+ if loadErr != nil {
+ slog.WarnContext(ctx, "failed to load compose service configs", "path", composeFile, "error", loadErr)
+ return nil
+ }
+ return slices.Collect(maps.Values(composeProj.Services))
+ }()
- scoped := s.details.ContainerUpdateInfo(ctx, []projecttypes.Details{*resp})
- if len(resp.Services) > 0 {
- records := s.details.ServiceUpdateRecords(ctx, []string{resp.ID})
- resp.UpdateInfo = BuildConfiguredUpdateInfo(resp.ID, resp.Services, updateInfoByRef, records, projectdetails.ConfiguredRuntimeServiceUpdateInfo(resp.Services, resp.RuntimeServices, scoped))
- return
+ var syncRecord GitOpsSync
+ if gitOpsSyncID(proj) != "" {
+ _ = s.db.WithContext(ctx).Preload("Repository").Where("id = ?", gitOpsSyncID(proj)).First(&syncRecord).Error
}
- resp.UpdateInfo = buildUpdateInfoSummary(imageRefs, projectdetails.MergeProjectContainerUpdateInfo(updateInfoByRef, resp.RuntimeServices, scoped))
+
+ // Runtime status/counts refresh even without the full runtime service array; DB values are only a fallback.
+ services, serr := s.projectServices(ctx, projectID)
+ _, runningCount := listing.ServiceCounts(services)
+ runtimeServices := kit.Ternary(serr == nil && services != nil && (opts.IncludeRuntimeServices || opts.IncludeUpdateInfo), services, nil)
+ meta := s.ProjectMetadata(ctx, *proj, nil)
+ icon := iconcatalog.Resolve(IconCatalogForContext(ctx), meta.ProjectIcon)
+ return projecttypes.Details{
+ Tags: projectTags,
+ StatusReason: proj.StatusReason,
+ LastSyncCommit: syncRecord.LastSyncCommit,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ UpdateInfo: func() *projecttypes.UpdateInfo {
+ if !opts.IncludeUpdateInfo {
+ return nil
+ }
+ imageRefs := projects.ImageRefsFromComposeConfigs(composeServices)
+ if len(imageRefs) == 0 {
+ imageRefs = projects.ImageRefsFromRuntimeServices(runtimeServices)
+ }
+ updateInfoByRef, updateInfoErr := s.imageService.GetUpdateInfoByImageRefs(ctx, imageRefs)
+ if updateInfoErr != nil {
+ slog.WarnContext(ctx, "failed to fetch project update info", "projectId", proj.ID, "projectName", proj.Name, "error", updateInfoErr)
+ }
+ scoped := s.details.ContainerUpdateInfo(ctx, runtimeServices)
+ if len(composeServices) > 0 {
+ return BuildConfiguredUpdateInfo(
+ proj.ID,
+ composeServices,
+ updateInfoByRef,
+ s.details.ServiceUpdateRecords(ctx, []string{proj.ID}),
+ projectdetails.ConfiguredRuntimeServiceUpdateInfo(composeServices, runtimeServices, scoped),
+ )
+ }
+ return buildUpdateInfoSummary(imageRefs, projectdetails.MergeProjectContainerUpdateInfo(updateInfoByRef, runtimeServices, scoped), nil)
+ }(),
+ ArchivedAt: proj.ArchivedAt,
+ Status: kit.Ternary(serr == nil && services != nil, listing.ProjectStatus(services), string(proj.Status)),
+ DirName: kit.FromPtr(proj.DirName),
+ ComposeContent: composeContent,
+ ComposeFileName: kit.Ternary(composeFile != "", filepath.Base(composeFile), ""),
+ ComposeFiles: projectdetails.ComposeSelectionRelativePaths(proj.Path, kit.Ternary(selErr == nil, composeSelection, nil)),
+ EnvContent: envContent,
+ OverrideContent: overrideContent,
+ OverrideFileName: overrideFileName,
+ Name: proj.Name,
+ GitRepositoryURL: kit.FromPtr(syncRecord.Repository).URL,
+ IconLightURL: icon.IconLightURL,
+ RelativePath: listing.RelativePath(projectsDir, proj.Path),
+ ID: proj.ID,
+ IconDarkURL: icon.IconDarkURL,
+ Path: proj.Path,
+ UpdatedAt: proj.UpdatedAt.Format(time.RFC3339),
+ CreatedAt: proj.CreatedAt.Format(time.RFC3339),
+ RuntimeServices: kit.Ternary(opts.IncludeRuntimeServices, runtimeServices, nil),
+ Services: kit.Ternary(opts.IncludeServiceConfigs, composeServices, nil),
+ URLs: meta.ProjectURLS,
+ IncludeFiles: func() []projecttypes.IncludeFile {
+ if composeErr != nil || !opts.IncludeIncludeFiles {
+ return nil
+ }
+ return s.details.IncludeFiles(ctx, composeFile)
+ }(),
+ RunningCount: kit.Ternary(serr == nil && services != nil, runningCount, proj.RunningCount),
+ ServiceCount: kit.Ternary(serr == nil && services != nil, len(services), proj.ServiceCount),
+ IsArchived: proj.IsArchived,
+ HasBuildDirective: len(projects.ParseImageRefsJSON(kit.FromPtr(proj.BuildImageRefsJSON))) > 0 ||
+ slices.ContainsFunc(composeServices, func(svc types.ServiceConfig) bool { return svc.Build != nil }),
+ RedeployDisabled: slices.ContainsFunc(runtimeServices, func(svc projecttypes.RuntimeService) bool { return svc.RedeployDisabled }),
+ ConfigurationError: projects.CheckProjectEnvAccess(ctx, projectsDir, proj.Path),
+ }, nil
}
func (s *ProjectService) enrichProjectsWithUpdateInfo(
@@ -1862,18 +1871,24 @@ func (s *ProjectService) enrichProjectsWithUpdateInfo(
details []projecttypes.Details,
includeHidden bool,
env *projectMetadataEnv,
-) {
+) []projecttypes.Details {
if len(projectsList) == 0 || len(details) == 0 {
- return
+ return details
}
if env == nil {
env = s.newProjectMetadataEnv(ctx, projectsList)
}
- var hiddenServicesByProjectID, hiddenRefsByProjectID map[string]map[string]bool
- if !includeHidden {
- hiddenServicesByProjectID, hiddenRefsByProjectID = projectdetails.ExcludeHiddenRuntimeServices(details)
- }
+ runtimeByIndex, hiddenServicesByProjectID, hiddenRefsByProjectID := func() ([][]projecttypes.RuntimeService, map[string]map[string]bool, map[string]map[string]bool) {
+ if includeHidden {
+ runtime := make([][]projecttypes.RuntimeService, len(details))
+ for i, d := range details {
+ runtime[i] = d.RuntimeServices
+ }
+ return runtime, nil, nil
+ }
+ return projectdetails.ExcludeHiddenRuntimeServices(details)
+ }()
// Bounded fan-out over compose loads; a cancelled request leaves the
// remaining projects without configured services.
@@ -1912,44 +1927,74 @@ func (s *ProjectService) enrichProjectsWithUpdateInfo(
projectIDs[i] = proj.ID
imageRefsByProjectID[proj.ID], servicesByProjectID[proj.ID] = refsByIndex[i], servicesByIndex[i]
}
- allImageRefs := slices.Concat(refsByIndex...)
- var updateInfoByRef map[string]*imagetypes.UpdateInfo
- if len(allImageRefs) > 0 && s.imageService != nil {
- lookupResult, err := s.imageService.GetUpdateInfoByImageRefs(ctx, allImageRefs)
- if err != nil {
- slog.WarnContext(ctx, "failed to fetch project list update info", "error", err)
- } else {
- updateInfoByRef = lookupResult
- }
+ updateInfoByRef, err := s.imageService.GetUpdateInfoByImageRefs(ctx, slices.Concat(refsByIndex...))
+ if err != nil {
+ slog.WarnContext(ctx, "failed to fetch project list update info", "error", err)
}
recordsByProjectID := make(map[string][]imageupdate.ImageUpdateRecord)
for _, record := range s.details.ServiceUpdateRecords(ctx, projectIDs) {
recordsByProjectID[record.ProjectID] = append(recordsByProjectID[record.ProjectID], record)
}
- scoped := s.details.ContainerUpdateInfo(ctx, details)
- for i := range details {
- if services := servicesByProjectID[details[i].ID]; services != nil {
- details[i].UpdateInfo = BuildConfiguredUpdateInfo(
- details[i].ID,
- services,
- updateInfoByRef,
- recordsByProjectID[details[i].ID],
- projectdetails.ConfiguredRuntimeServiceUpdateInfo(
- services,
- details[i].RuntimeServices,
- scoped,
- ),
- )
- continue
- }
- refs := imageRefsByProjectID[details[i].ID]
- if len(refs) == 0 {
- refs = projects.ImageRefsFromRuntimeServices(details[i].RuntimeServices)
- }
- details[i].UpdateInfo = buildUpdateInfoSummary(refs, projectdetails.MergeProjectContainerUpdateInfo(updateInfoByRef, details[i].RuntimeServices, scoped))
+ scoped := s.details.ContainerUpdateInfo(ctx, slices.Concat(runtimeByIndex...))
+ out := make([]projecttypes.Details, 0, len(details))
+ for i, d := range details {
+ out = append(out, projecttypes.Details{ //exhaustruct:enforce
+ EnvironmentTag: d.EnvironmentTag,
+ Tags: d.Tags,
+ StatusReason: d.StatusReason,
+ ActivityID: d.ActivityID,
+ LastSyncCommit: d.LastSyncCommit,
+ GitOpsManagedBy: d.GitOpsManagedBy,
+ UpdateInfo: func() *projecttypes.UpdateInfo {
+ if services := servicesByProjectID[d.ID]; services != nil {
+ return BuildConfiguredUpdateInfo(
+ d.ID,
+ services,
+ updateInfoByRef,
+ recordsByProjectID[d.ID],
+ projectdetails.ConfiguredRuntimeServiceUpdateInfo(services, runtimeByIndex[i], scoped),
+ )
+ }
+ refs := imageRefsByProjectID[d.ID]
+ if len(refs) == 0 {
+ refs = projects.ImageRefsFromRuntimeServices(runtimeByIndex[i])
+ }
+ return buildUpdateInfoSummary(refs, projectdetails.MergeProjectContainerUpdateInfo(updateInfoByRef, runtimeByIndex[i], scoped), nil)
+ }(),
+ ArchivedAt: d.ArchivedAt,
+ Status: d.Status,
+ DirName: d.DirName,
+ ComposeContent: d.ComposeContent,
+ ComposeFileName: d.ComposeFileName,
+ ComposeFiles: d.ComposeFiles,
+ EnvContent: d.EnvContent,
+ OverrideContent: d.OverrideContent,
+ OverrideFileName: d.OverrideFileName,
+ Name: d.Name,
+ GitRepositoryURL: d.GitRepositoryURL,
+ IconLightURL: d.IconLightURL,
+ RelativePath: d.RelativePath,
+ ID: d.ID,
+ IconDarkURL: d.IconDarkURL,
+ Path: d.Path,
+ UpdatedAt: d.UpdatedAt,
+ CreatedAt: d.CreatedAt,
+ RuntimeServices: runtimeByIndex[i],
+ Services: d.Services,
+ URLs: d.URLs,
+ IncludeFiles: d.IncludeFiles,
+ RunningCount: d.RunningCount,
+ ServiceCount: d.ServiceCount,
+ IsDiscovered: d.IsDiscovered,
+ IsArchived: d.IsArchived,
+ HasBuildDirective: d.HasBuildDirective,
+ RedeployDisabled: d.RedeployDisabled,
+ ConfigurationError: d.ConfigurationError,
+ })
}
+ return out
}
// BuildConfiguredUpdateInfo matches checks to current services and aggregates their results.
@@ -1975,26 +2020,26 @@ func BuildConfiguredUpdateInfo(
if imageRef == "" {
continue
}
- var info *imagetypes.UpdateInfo
record := checks[service.Name]
policy, policyErr := tagpolicy.Resolve(imageRef, updater.DefaultLabelPolicy().TagPolicy(service.Labels))
- if record != nil && record.PolicyKey == imageref.UpdatePolicyKey(imageRef, service.Labels) {
- info = record.UpdateInfo()
- } else if policyErr == nil && policy.Strategy == "digest" && !imageref.IsUpdateCheckDisabled(service.Labels) {
- info = byRef[imageRef]
- }
+ info := func() *imagetypes.UpdateInfo {
+ switch {
+ case record != nil && record.PolicyKey == imageref.UpdatePolicyKey(imageRef, service.Labels):
+ return record.UpdateInfo()
+ case policyErr == nil && policy.Strategy == "digest" && !imageref.IsUpdateCheckDisabled(service.Labels):
+ return byRef[imageRef]
+ default:
+ return nil
+ }
+ }()
if len(runtimeUpdates) > 0 && runtimeUpdates[0][service.Name] != nil {
// A newer clean runtime check clears a stale update preview (#4306);
// digest checks must match the configured reference to count.
runtime := runtimeUpdates[0][service.Name]
- attributed := policyErr == nil && policy.Strategy != "digest"
- if stored := byRef[imageRef]; policyErr == nil && !attributed && stored != nil && !stored.HasUpdate && stored.Error == "" && stored.CheckTime.Equal(runtime.CheckTime) {
- attributed = stored.CurrentDigest == runtime.CurrentDigest && stored.LatestDigest == runtime.LatestDigest
- }
- if attributed && info != nil && info.HasUpdate && !runtime.HasUpdate && runtime.Error == "" && !runtime.CheckTime.Before(info.CheckTime) {
- info = nil
- }
+ stored := byRef[imageRef]
+ attributed := policyErr == nil && (policy.Strategy != "digest" || (stored != nil && !stored.HasUpdate && stored.Error == "" &&
+ stored.CheckTime.Equal(runtime.CheckTime) && stored.CurrentDigest == runtime.CurrentDigest && stored.LatestDigest == runtime.LatestDigest))
info = projectdetails.MergeProjectContainerUpdateInfo(
nil,
[]projecttypes.RuntimeService{
@@ -2008,8 +2053,8 @@ func BuildConfiguredUpdateInfo(
},
},
map[string]*imagetypes.UpdateInfo{
- "preview": info,
- "runtime": runtimeUpdates[0][service.Name],
+ "preview": kit.Ternary(attributed && info != nil && info.HasUpdate && !runtime.HasUpdate && runtime.Error == "" && !runtime.CheckTime.Before(info.CheckTime), nil, info),
+ "runtime": runtime,
},
)[imageRef]
}
@@ -2026,134 +2071,79 @@ func BuildConfiguredUpdateInfo(
delete(merged, imageRef)
}
}
- summary := buildUpdateInfoSummary(projects.ImageRefsFromComposeConfigs(services), merged)
- summary.ServiceUpdates = serviceUpdates
- return summary
+ return buildUpdateInfoSummary(projects.ImageRefsFromComposeConfigs(services), merged, serviceUpdates)
}
// buildUpdateInfoSummary aggregates image checks into a project update summary.
func buildUpdateInfoSummary(
imageRefs []string,
updateInfoByRef map[string]*imagetypes.UpdateInfo,
+ serviceUpdates map[string]projecttypes.ServiceUpdateInfo,
) *projecttypes.UpdateInfo {
- imageCount := len(imageRefs)
- summary := &projecttypes.UpdateInfo{
- Status: "unknown",
- HasUpdate: false,
- ImageCount: imageCount,
- ImageRefs: append([]string(nil), imageRefs...),
- }
-
- if imageCount == 0 {
- return summary
- }
-
+ checkedByRef := make(map[string]imagetypes.UpdateInfo)
+ var updatedRefs, notPulledRefs []string
+ var errorMessages []string
var latestCheckTime *time.Time
-
for _, imageRef := range imageRefs {
info := updateInfoByRef[imageRef]
if info == nil {
continue
}
-
- summary.CheckedImageCount++
- if summary.UpdateInfoByRef == nil {
- summary.UpdateInfoByRef = make(map[string]imagetypes.UpdateInfo)
- }
- summary.UpdateInfoByRef[imageRef] = *info
+ checkedByRef[imageRef] = *info
if info.HasUpdate {
- summary.HasUpdate = true
- summary.ImagesWithUpdates++
- summary.UpdatedImageRefs = append(summary.UpdatedImageRefs, imageRef)
+ updatedRefs = append(updatedRefs, imageRef)
}
if info.UpdateType == imageupdate.UpdateTypeNotPulled {
- summary.ImagesNotPulled++
- summary.NotPulledImageRefs = append(summary.NotPulledImageRefs, imageRef)
+ notPulledRefs = append(notPulledRefs, imageRef)
}
if strings.TrimSpace(info.Error) != "" {
- summary.ErrorCount++
- if summary.ErrorMessage == nil {
- summary.ErrorMessage = new(strings.TrimSpace(info.Error))
- }
+ errorMessages = append(errorMessages, strings.TrimSpace(info.Error))
}
if !info.CheckTime.IsZero() && (latestCheckTime == nil || info.CheckTime.After(*latestCheckTime)) {
latestCheckTime = new(info.CheckTime)
}
}
- summary.LastCheckedAt = latestCheckTime
-
- switch {
- case summary.ImagesWithUpdates > 0:
- summary.Status = "has_update"
- case summary.ErrorCount > 0:
- summary.Status = "error"
- case summary.ImagesNotPulled > 0:
- summary.Status = "not_pulled"
- case summary.CheckedImageCount == imageCount:
- summary.Status = "up_to_date"
- default:
- summary.Status = "unknown"
+ return &projecttypes.UpdateInfo{
+ ServiceUpdates: serviceUpdates,
+ Status: func() string {
+ switch {
+ case len(imageRefs) == 0:
+ return "unknown"
+ case len(updatedRefs) > 0:
+ return "has_update"
+ case len(errorMessages) > 0:
+ return "error"
+ case len(notPulledRefs) > 0:
+ return "not_pulled"
+ case len(checkedByRef) == len(imageRefs):
+ return "up_to_date"
+ default:
+ return "unknown"
+ }
+ }(),
+ HasUpdate: len(updatedRefs) > 0,
+ ImageCount: len(imageRefs),
+ CheckedImageCount: len(checkedByRef),
+ ImagesWithUpdates: len(updatedRefs),
+ ImagesNotPulled: len(notPulledRefs),
+ ErrorCount: len(errorMessages),
+ ErrorMessage: func() *string {
+ if len(errorMessages) == 0 {
+ return nil
+ }
+ return new(errorMessages[0])
+ }(),
+ ImageRefs: append([]string(nil), imageRefs...),
+ UpdatedImageRefs: updatedRefs,
+ NotPulledImageRefs: notPulledRefs,
+ UpdateInfoByRef: kit.Ternary(len(checkedByRef) > 0, checkedByRef, nil),
+ LastCheckedAt: latestCheckTime,
}
-
- return summary
}
-func (s *ProjectService) enrichComposeDetails(ctx context.Context, proj *Project, opts projecttypes.DetailsOptions, resp *projecttypes.Details) {
- composeFile, err := s.ResolveProjectComposeFile(ctx, proj)
- if err != nil {
- if !errors.Is(err, common.ErrProjectEnvUnreadable) {
- return
- }
- // The env is unreadable, so only the compose file's identity is known:
- // name it for the UI and skip every enrichment that needs interpolation.
- projectsDirectory, dirErr := s.GetProjectsDirectory(ctx)
- if dirErr != nil {
- slog.DebugContext(ctx, "failed to resolve projects directory for compose identification", "projectId", proj.ID, "error", dirErr)
- }
- identified, detectErr := projects.DetectComposeFile(ctx, projectsDirectory, proj.Path)
- if detectErr != nil && (!errors.Is(detectErr, common.ErrProjectEnvUnreadable) || identified == "") {
- slog.WarnContext(ctx, "failed to identify project compose file", "projectId", proj.ID, "error", detectErr)
- return
- }
- if identified != "" {
- resp.ComposeFileName = filepath.Base(identified)
- }
- return
- }
- resp.ComposeFileName = filepath.Base(composeFile)
- if opts.IncludeIncludeFiles {
- resp.IncludeFiles = s.details.IncludeFiles(ctx, composeFile)
- }
- if !opts.IncludeServiceConfigs && !opts.IncludeUpdateInfo {
- return
- }
-
- composeProj, loadErr := s.getCachedComposeProject(ctx, proj, nil)
- if loadErr != nil {
- slog.WarnContext(ctx, "failed to load compose service configs", "path", composeFile, "error", loadErr)
- return
- }
-
- if composeProj == nil {
- return
- }
-
- // Convert map to slice
- svcList := make([]types.ServiceConfig, 0, len(composeProj.Services))
- hasBuildDirective := false
- for _, svc := range composeProj.Services {
- svcList = append(svcList, svc)
- if svc.Build != nil {
- hasBuildDirective = true
- }
- }
- resp.Services = svcList
- resp.HasBuildDirective = resp.HasBuildDirective || hasBuildDirective
-}
-
-func (s *ProjectService) CountServicesFromCompose(ctx context.Context, p Project) (int, error) {
- proj, _, err := s.loadComposeProjectForProject(ctx, &p, nil)
+func (s *ProjectService) CountServicesFromCompose(ctx context.Context, p Project) (int, error) {
+ proj, _, err := s.loadComposeProjectForProject(ctx, &p, nil)
if err != nil {
return 0, err
}
@@ -2170,9 +2160,7 @@ func (s *ProjectService) ListAllProjects(ctx context.Context) ([]Project, error)
}
func (s *ProjectService) ListProjects(ctx context.Context, params pagination.QueryParams) ([]projecttypes.Details, pagination.Response, error) {
- statusFilter := strings.TrimSpace(params.Filters["status"])
updatesFilter := strings.TrimSpace(params.Filters["updates"])
- labelFilter := strings.TrimSpace(params.Filters["label"])
query := s.db.WithContext(ctx).Model(&Project{})
if archivedFilter := strings.TrimSpace(params.Filters["archived"]); !strings.EqualFold(archivedFilter, "all") {
archived, _ := kit.ParseBool(archivedFilter)
@@ -2188,63 +2176,31 @@ func (s *ProjectService) ListProjects(ctx context.Context, params pagination.Que
)
}
- if statusFilter == "" && updatesFilter == "" && labelFilter == "" && !strings.EqualFold(strings.TrimSpace(params.Sort), "status") {
- query = pagination.ApplyFilter(query, "status", params.Filters["status"])
- var projectsArray []Project
- paginationResp, err := pagination.PaginateAndSortDB(params, query, &projectsArray)
- if err != nil {
- return nil, pagination.Response{}, fmt.Errorf("failed to paginate projects: %w", err)
- }
- slog.DebugContext(ctx, "Retrieved projects from database", "count", len(projectsArray))
-
- // The paginated page gets live status from one Docker snapshot plus the
- // compose-backed presentation fields, sharing one metadata env.
- env := s.newProjectMetadataEnv(ctx, projectsArray)
- result := s.projectListRows(ctx, env.projectsDirectory, projectsArray, s.listing.Snapshot(ctx))
- metas := make([]projects.ArcaneComposeMetadata, len(projectsArray))
- var metaGroup errgroup.Group
- metaGroup.SetLimit(maxConcurrentComposeReads)
- for i := range projectsArray {
- metaGroup.Go(func() (workerErr error) {
- defer utils.RecoverToError(&workerErr, "project metadata worker", "projectID", projectsArray[i].ID)
- metas[i] = s.ProjectMetadata(ctx, projectsArray[i], env)
- return nil
- })
- }
- if metaErr := metaGroup.Wait(); metaErr != nil {
- slog.WarnContext(ctx, "project metadata resolution failed", "error", metaErr)
- }
- listing.ApplyPresentation(ctx, env.projectsDirectory, IconCatalogForContext(ctx), projectRecords(projectsArray), result, metas)
- pageIDs := make([]string, len(projectsArray))
- for i, proj := range projectsArray {
- pageIDs[i] = proj.ID
- }
- var tagRows []projecttypes.TagAssignment
- if tagsErr := s.db.WithContext(ctx).Model(&ProjectTag{}).Where("project_id IN ?", pageIDs).Order("project_id, name, source, color").Find(&tagRows).Error; tagsErr != nil {
- return nil, pagination.Response{}, fmt.Errorf("load project tags: %w", tagsErr)
- }
- tagsByProject := tags.Group(tagRows)
- for i := range result {
- result[i].Tags = tagsByProject[result[i].ID]
- }
- s.enrichProjectsWithUpdateInfo(ctx, projectsArray, result, true, env)
- slog.DebugContext(ctx, "Completed ListProjects request", "resultCount", len(result))
- return result, paginationResp, nil
- }
-
- // Derived filters and status sorting read the container snapshot, so every
- // candidate gets a lean row and the compose-backed presentation fields are
- // resolved for the page alone.
- if params.Limit != -1 {
+ // Derived filters and status sorting read the container snapshot, so they page in memory over every candidate;
+ // otherwise the database pages and only the page gets live status and compose-backed presentation fields.
+ paginateInDB := strings.TrimSpace(params.Filters["status"]) == "" && updatesFilter == "" && strings.TrimSpace(params.Filters["label"]) == "" &&
+ !strings.EqualFold(strings.TrimSpace(params.Sort), "status")
+ if !paginateInDB && params.Limit != -1 {
params.Limit = kit.Ternary(params.Limit <= 0, 20, min(params.Limit, 100))
}
var projectsArray []Project
- if err := query.Find(&projectsArray).Error; err != nil {
- return nil, pagination.Response{}, fmt.Errorf("failed to list projects: %w", err)
+ paginationResp, err := func() (pagination.Response, error) {
+ if !paginateInDB {
+ if findErr := query.Find(&projectsArray).Error; findErr != nil {
+ return pagination.Response{}, fmt.Errorf("failed to list projects: %w", findErr)
+ }
+ return pagination.Response{}, nil
+ }
+ resp, paginateErr := pagination.PaginateAndSortDB(params, pagination.ApplyFilter(query, "status", params.Filters["status"]), &projectsArray)
+ if paginateErr != nil {
+ return pagination.Response{}, fmt.Errorf("failed to paginate projects: %w", paginateErr)
+ }
+ return resp, nil
+ }()
+ if err != nil {
+ return nil, pagination.Response{}, err
}
- env := s.newProjectMetadataEnv(ctx, nil)
- snapshot := s.listing.Snapshot(ctx)
- items := s.projectListRows(ctx, env.projectsDirectory, projectsArray, snapshot)
+
byID := make(map[string]Project, len(projectsArray))
for _, proj := range projectsArray {
byID[proj.ID] = proj
@@ -2253,13 +2209,29 @@ func (s *ProjectService) ListProjects(ctx context.Context, params pagination.Que
if tagsErr := s.db.WithContext(ctx).Model(&ProjectTag{}).Where("project_id IN ?", slices.Collect(maps.Keys(byID))).Order("project_id, name, source, color").Find(&tagRows).Error; tagsErr != nil {
return nil, pagination.Response{}, fmt.Errorf("load project tags: %w", tagsErr)
}
- tagsByProject := tags.Group(tagRows)
- for i := range items {
- items[i].Tags = tagsByProject[items[i].ID]
+ env := s.newProjectMetadataEnv(ctx, nil)
+ snapshot := s.listing.Snapshot(ctx)
+ // Live-inferred service counts are persisted over stored zeros, since SQL sorts and paginates on service_count.
+ items, inferredCounts := listing.Rows(env.projectsDirectory, IconCatalogForContext(ctx), projectRecords(projectsArray), snapshot, tags.Group(tagRows))
+ for chunk := range slices.Chunk(slices.Collect(maps.Keys(inferredCounts)), inferredServiceCountBatchSize) {
+ var caseExpr strings.Builder
+ args := make([]any, 0, 2*len(chunk))
+ caseExpr.WriteString("CASE id")
+ for _, id := range chunk {
+ caseExpr.WriteString(" WHEN ? THEN ?")
+ args = append(args, id, inferredCounts[id])
+ }
+ caseExpr.WriteString(" ELSE service_count END")
+ if updateErr := s.db.WithContext(ctx).Model(&Project{}).
+ Where("id IN ? AND service_count = 0", chunk).
+ Update("service_count", gorm.Expr(caseExpr.String(), args...)).Error; updateErr != nil {
+ slog.WarnContext(ctx, "failed to persist inferred project service counts", "count", len(chunk), "error", updateErr)
+ break
+ }
}
if updatesFilter != "" {
s.preloadGitOpsComposePaths(ctx, env, projectsArray)
- s.enrichProjectsWithUpdateInfo(ctx, projectsArray, items, true, env)
+ items = s.enrichProjectsWithUpdateInfo(ctx, projectsArray, items, true, env)
// Untracked compose projects only join an unfiltered-by-tag has_update view.
if strings.EqualFold(updatesFilter, "has_update") && strings.TrimSpace(params.Filters["tags"]) == "" {
if snapshot.Err != nil {
@@ -2271,16 +2243,24 @@ func (s *ProjectService) ListProjects(ctx context.Context, params pagination.Que
slog.WarnContext(ctx, "failed to load known project names for compose update discovery", "error", knownErr)
knownProjects = projectsArray
}
- known := listing.KnownComposeProjectNames(projectRecords(knownProjects))
- items = append(items, s.listing.DiscoveredUpdateRows(ctx, snapshot.Containers, known, IconCatalogForContext(ctx))...)
+ items = append(items, s.listing.DiscoveredUpdateRows(ctx, snapshot.Containers, listing.KnownComposeProjectNames(projectRecords(knownProjects)), IconCatalogForContext(ctx))...)
}
}
}
- result, pageIndexes := listing.Page(items, params, func(id string) bool {
- _, tracked := byID[id]
- return tracked
- })
+ result, pageIndexes := func() (pagination.FilterResult[projecttypes.Details], []int) {
+ if paginateInDB {
+ indexes := make([]int, len(items))
+ for i := range items {
+ indexes[i] = i
+ }
+ return pagination.FilterResult[projecttypes.Details]{Items: items}, indexes
+ }
+ return listing.Page(items, params, func(id string) bool {
+ _, tracked := byID[id]
+ return tracked
+ })
+ }()
pageProjects := make([]Project, 0, len(pageIndexes))
pageDetails := make([]projecttypes.Details, 0, len(pageIndexes))
for _, i := range pageIndexes {
@@ -2289,7 +2269,7 @@ func (s *ProjectService) ListProjects(ctx context.Context, params pagination.Que
}
if updatesFilter == "" {
s.preloadGitOpsComposePaths(ctx, env, pageProjects)
- s.enrichProjectsWithUpdateInfo(ctx, pageProjects, pageDetails, true, env)
+ pageDetails = s.enrichProjectsWithUpdateInfo(ctx, pageProjects, pageDetails, true, env)
}
metas := make([]projects.ArcaneComposeMetadata, len(pageProjects))
var metaGroup errgroup.Group
@@ -2304,27 +2284,22 @@ func (s *ProjectService) ListProjects(ctx context.Context, params pagination.Que
if metaErr := metaGroup.Wait(); metaErr != nil {
slog.WarnContext(ctx, "project metadata resolution failed", "error", metaErr)
}
- listing.ApplyPresentation(ctx, env.projectsDirectory, IconCatalogForContext(ctx), projectRecords(pageProjects), pageDetails, metas)
- for k, i := range pageIndexes {
- result.Items[i] = pageDetails[k]
+ for k, d := range listing.ApplyPresentation(ctx, env.projectsDirectory, IconCatalogForContext(ctx), projectRecords(pageProjects), pageDetails, metas) {
+ result.Items[pageIndexes[k]] = d
}
- return result.Items, pagination.BuildResponse(result.TotalCount, result.TotalAvailable, params), nil
+ return result.Items, kit.Ternary(paginateInDB, paginationResp, pagination.BuildResponse(result.TotalCount, result.TotalAvailable, params)), nil
}
// CountProjectsWithPendingUpdates counts active projects and untracked compose
// projects with a pending update, without the full list pipeline. A nil
// allContainers is fetched here.
func (s *ProjectService) CountProjectsWithPendingUpdates(ctx context.Context, allContainers []container.Summary) (int, error) {
- if s.db == nil {
- return 0, nil
- }
-
if allContainers == nil {
- var err error
- allContainers, err = s.details.ComposeContainers(ctx)
+ listed, err := s.details.ComposeContainers(ctx)
if err != nil {
return 0, fmt.Errorf("failed to list containers for project update count: %w", err)
}
+ allContainers = listed
}
// One full scan: archived projects are excluded from the update count but
@@ -2343,30 +2318,24 @@ func (s *ProjectService) CountProjectsWithPendingUpdates(ctx context.Context, al
}
// Runtime container IDs keep tag-policy updates scoped to their project.
- details := make([]projecttypes.Details, len(activeProjects))
+ details := make([]projecttypes.Details, 0, len(activeProjects))
containersByProject := listing.GroupComposeContainersByProject(allContainers)
- for i, proj := range activeProjects {
- details[i].ID = proj.ID
+ for _, proj := range activeProjects {
+ var runtimeServices []projecttypes.RuntimeService
for _, c := range listing.ProjectContainers(projectRecord(proj), containersByProject) {
- details[i].RuntimeServices = append(
- details[i].RuntimeServices,
- projecttypes.RuntimeService{
- Name: docker.ComposeServiceLabel(
- c.Labels,
- ),
- ContainerID: c.ID,
- Image: c.Image,
- ImageID: c.ImageID,
- ContainerLabels: c.Labels,
- },
- )
+ runtimeServices = append(runtimeServices, projecttypes.RuntimeService{
+ Name: docker.ComposeServiceLabel(c.Labels),
+ ContainerID: c.ID,
+ Image: c.Image,
+ ImageID: c.ImageID,
+ ContainerLabels: c.Labels,
+ })
}
+ details = append(details, projecttypes.Details{ID: proj.ID, RuntimeServices: runtimeServices})
}
- s.enrichProjectsWithUpdateInfo(ctx, activeProjects, details, false, nil)
-
count := 0
- for i := range details {
- if details[i].UpdateInfo != nil && details[i].UpdateInfo.HasUpdate {
+ for _, d := range s.enrichProjectsWithUpdateInfo(ctx, activeProjects, details, false, nil) {
+ if kit.FromPtr(d.UpdateInfo).HasUpdate {
count++
}
}
@@ -2398,10 +2367,8 @@ func (s *ProjectService) ProjectMetadata(ctx context.Context, p Project, env *pr
}
fingerprint := fmt.Sprintf("%q|%q|%t", composeFile, env.projectsDirectory, env.autoInjectEnv)
- if s.metaCache != nil && p.ID != "" {
- if cached, ok := s.metaCache.Get(p.ID, fingerprint); ok {
- return cached
- }
+ if cached, ok := s.metaCache.Get(p.ID, fingerprint); ok && p.ID != "" {
+ return cached
}
meta, err := projects.ParseArcaneComposeMetadata(ctx, composeFile, env.projectsDirectory, env.autoInjectEnv)
@@ -2410,7 +2377,7 @@ func (s *ProjectService) ProjectMetadata(ctx context.Context, p Project, env *pr
return empty
}
- if s.metaCache == nil || p.ID == "" {
+ if p.ID == "" {
return meta
}
if setErr := s.metaCache.Set(p.ID, fingerprint, p.Path, env.projectsDirectory, composeFile, meta.ComposeFiles, meta.EnvFiles, meta); setErr != nil {
@@ -2425,48 +2392,69 @@ func (s *ProjectService) ProjectMetadata(ctx context.Context, p Project, env *pr
// is populated from the X-Arcane-Icon-Catalog header the manager forwards.
// Background jobs have no user attached and fall back to the default catalog.
func IconCatalogForContext(ctx context.Context) string {
- if u, ok := userctx.CurrentUserFromContext(ctx); ok && u != nil && u.Preferences.IconCatalog != nil && *u.Preferences.IconCatalog != "" {
- return *u.Preferences.IconCatalog
- }
- return iconcatalog.DefaultCatalog
+ u, _ := userctx.CurrentUserFromContext(ctx)
+ return cmp.Or(kit.FromPtr(kit.FromPtr(u).Preferences.IconCatalog), iconcatalog.DefaultCatalog)
}
func (s *ProjectService) refreshProjectImageRefs(ctx context.Context, proj *Project) {
- if proj == nil || proj.ID == "" {
+ if proj.ID == "" {
return
}
s.invalidateProjectCaches(proj.ID)
composeProject, err := s.getCachedComposeProject(ctx, proj, nil)
if err != nil {
- if dbErr := s.db.WithContext(ctx).
- Model(&Project{}).
- Where("id = ?", proj.ID).
- Update("image_refs_json", "").Error; dbErr != nil {
+ if dbErr := s.db.WithContext(ctx).Model(&Project{}).Where("id = ?", proj.ID).Update("image_refs_json", "").Error; dbErr != nil {
slog.WarnContext(ctx, "failed to clear stale project image refs", "projectId", proj.ID, "error", dbErr)
}
- proj.ImageRefsJSON = ""
+ *proj = Project{ //exhaustruct:enforce
+ BaseModel: proj.BaseModel,
+ Name: proj.Name,
+ DirName: proj.DirName,
+ Path: proj.Path,
+ Status: proj.Status,
+ StatusReason: proj.StatusReason,
+ ServiceCount: proj.ServiceCount,
+ RunningCount: proj.RunningCount,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ ComposeProjectName: proj.ComposeProjectName,
+ ImageRefsJSON: "",
+ BuildImageRefsJSON: proj.BuildImageRefsJSON,
+ IsArchived: proj.IsArchived,
+ ArchivedAt: proj.ArchivedAt,
+ }
slog.WarnContext(ctx, "failed to refresh project image refs", "projectId", proj.ID, "projectName", proj.Name, "error", fmt.Errorf("load compose project: %w", err))
return
}
imageRefsJSON := projects.MarshalImageRefsJSON(projects.ImageRefsFromComposeServices(composeProject.Services))
buildImageRefsJSON := cmp.Or(projects.MarshalImageRefsJSON(projects.BuildImageRefsFromComposeProject(composeProject)), "[]")
- if persistImageRefsErr := s.db.WithContext(ctx).
- Model(&Project{}).
- Where("id = ?", proj.ID).
- Updates(map[string]any{
- "image_refs_json": imageRefsJSON,
- "build_image_refs_json": buildImageRefsJSON,
- }).Error; persistImageRefsErr != nil {
+ if persistImageRefsErr := s.db.WithContext(ctx).Model(&Project{}).Where("id = ?", proj.ID).Updates(map[string]any{
+ "image_refs_json": imageRefsJSON,
+ "build_image_refs_json": buildImageRefsJSON,
+ }).Error; persistImageRefsErr != nil {
slog.WarnContext(ctx, "failed to persist project image refs", "projectId", proj.ID, "error", persistImageRefsErr)
return
}
- proj.ImageRefsJSON = imageRefsJSON
- proj.BuildImageRefsJSON = new(buildImageRefsJSON)
+ *proj = Project{ //exhaustruct:enforce
+ BaseModel: proj.BaseModel,
+ Name: proj.Name,
+ DirName: proj.DirName,
+ Path: proj.Path,
+ Status: proj.Status,
+ StatusReason: proj.StatusReason,
+ ServiceCount: proj.ServiceCount,
+ RunningCount: proj.RunningCount,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ ComposeProjectName: proj.ComposeProjectName,
+ ImageRefsJSON: imageRefsJSON,
+ BuildImageRefsJSON: new(buildImageRefsJSON),
+ IsArchived: proj.IsArchived,
+ ArchivedAt: proj.ArchivedAt,
+ }
}
func (s *ProjectService) HandleProjectFilesChanged(ctx context.Context, paths []string) {
- if len(paths) == 0 || s.db == nil {
+ if len(paths) == 0 {
return
}
@@ -2476,11 +2464,7 @@ func (s *ProjectService) HandleProjectFilesChanged(ctx context.Context, paths []
return
}
for i := range projectsList {
- projectPath := filepath.Clean(projectsList[i].Path)
- if !slices.ContainsFunc(paths, func(changedPath string) bool {
- changedPath = filepath.Clean(changedPath)
- return changedPath == projectPath || strings.HasPrefix(changedPath, projectPath+string(os.PathSeparator))
- }) {
+ if !slices.ContainsFunc(paths, func(changedPath string) bool { return projects.IsSafeSubdirectory(projectsList[i].Path, changedPath) }) {
continue
}
s.refreshProjectImageRefs(ctx, &projectsList[i])
@@ -2491,10 +2475,6 @@ func (s *ProjectService) HandleProjectFilesChanged(ctx context.Context, paths []
}
func (s *ProjectService) BackfillProjectImageRefs(ctx context.Context) (int, error) {
- if s.db == nil {
- return 0, nil
- }
-
var projectsList []Project
if err := s.db.WithContext(ctx).
Where("build_image_refs_json IS NULL").
@@ -2568,7 +2548,7 @@ func (s *ProjectService) SyncProjectsFromFileSystem(ctx context.Context) error {
// Rows imported from Arcane's own scratch dirs (project-update preview/backup,
// GitOps stage/backup) or from filesystem snapshot/trash dirs are never real
// projects. The decision is name-based, so it bypasses the mass-wipe guard.
- if projects.IsInternalScratchDirName(p.Name) || projects.IsInternalScratchDirName(filepath.Base(p.Path)) || (p.DirName != nil && projects.IsInternalScratchDirName(*p.DirName)) {
+ if projects.IsInternalScratchDirName(p.Name) || projects.IsInternalScratchDirName(filepath.Base(p.Path)) || projects.IsInternalScratchDirName(kit.FromPtr(p.DirName)) {
deletions = append(deletions, projectCleanupDecision{project: p, reason: "removed internal Arcane scratch record (project-update/gitops temp dir)"})
continue
}
@@ -2577,8 +2557,30 @@ func (s *ProjectService) SyncProjectsFromFileSystem(ctx context.Context) error {
continue
}
candidates++
- if decision, remove := s.evaluateProjectCleanup(ctx, p, followProjectSymlinks, projectsDir, s.config.ProjectScanMaxDepth).Get(); remove {
- pendingDeletions = append(pendingDeletions, decision)
+ // Projects beyond a lowered scan depth are no longer discovered; root-level and outside paths use the disk checks.
+ if rel := listing.RelativePath(projectsDir, p.Path); s.config.ProjectScanMaxDepth > 0 && rel != "" && strings.Count(rel, "/") >= s.config.ProjectScanMaxDepth {
+ pendingDeletions = append(pendingDeletions, projectCleanupDecision{project: p, reason: "removed project: directory is beyond the configured scan depth"})
+ continue
+ }
+ validDir, statErr := projects.IsProjectDirectoryPath(p.Path, followProjectSymlinks)
+ switch {
+ case os.IsNotExist(statErr):
+ pendingDeletions = append(pendingDeletions, projectCleanupDecision{project: p, reason: "removed project: directory no longer exists"})
+ continue
+ case statErr != nil:
+ slog.WarnContext(ctx, "stat error during cleanup; keeping DB record", "path", p.Path, "error", statErr)
+ continue
+ case !validDir:
+ pendingDeletions = append(pendingDeletions, projectCleanupDecision{project: p, reason: "removed project: path is no longer a valid project directory"})
+ continue
+ }
+ // Only a directory with no compose file is pruned; an ambiguous, unreadable, or unparsable one is kept.
+ _, resolveErr := s.ResolveProjectComposeFile(ctx, &p)
+ switch {
+ case errors.Is(resolveErr, common.ErrComposeFileNotFound):
+ pendingDeletions = append(pendingDeletions, projectCleanupDecision{project: p, reason: "removed orphaned project: directory present but contains no compose file"})
+ case resolveErr != nil:
+ slog.WarnContext(ctx, "project directory present but compose file unresolved during cleanup; keeping DB record", "projectId", p.ID, "path", p.Path, "error", resolveErr)
}
}
// Pruning more than one project and over half the candidates usually means an
@@ -2610,136 +2612,85 @@ func (s *ProjectService) SyncProjectsFromFileSystem(ctx context.Context) error {
func (s *ProjectService) upsertProjectForDir(ctx context.Context, dirName, dirPath string) error {
var existing Project
- err := s.db.WithContext(ctx).
- Where("path = ?", dirPath).
- First(&existing).Error
+ err := s.db.WithContext(ctx).Where("path = ?", dirPath).First(&existing).Error
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return fmt.Errorf("query existing project for %q failed: %w", dirPath, err)
+ }
cfg := s.settingsService.GetSettingsOrDefaults(ctx)
- composeMetadata := projecttypes.ComposeIdentity{ResolvedProjectName: projects.NormalizeProjectName(dirName)}
- projectsDirectory, serviceCountErr := projects.GetProjectsDirectory(ctx, cfg.ProjectsDirectory.Value)
- if serviceCountErr == nil {
+ composeMetadata, serviceCountErr := func() (projecttypes.ComposeIdentity, error) {
+ projectsDirectory, dirErr := projects.GetProjectsDirectory(ctx, cfg.ProjectsDirectory.Value)
+ if dirErr != nil {
+ return projecttypes.ComposeIdentity{ResolvedProjectName: projects.NormalizeProjectName(dirName)}, dirErr
+ }
autoInjectEnv := kit.ParseOrDefault(cfg.AutoInjectEnv.Value, false, strconv.ParseBool)
- composeMetadata, serviceCountErr = projectsync.LoadComposeMetadata(ctx, s.composeIdentities, dirPath, dirName, projectsDirectory, autoInjectEnv, s.projectPathMapper(ctx))
- }
- serviceCountLogLevel := kit.Ternary(errors.Is(serviceCountErr, common.ErrProjectEnvUnreadable), slog.LevelDebug, slog.LevelWarn)
+ return projectsync.LoadComposeMetadata(ctx, s.composeIdentities, dirPath, dirName, projectsDirectory, autoInjectEnv, s.projectPathMapper(ctx))
+ }()
if errors.Is(err, gorm.ErrRecordNotFound) {
- // Create a minimal project entry
- reason := "Project discovered from filesystem, status pending Docker service query"
- proj := &Project{
+ existing = Project{
Name: composeMetadata.ResolvedProjectName,
DirName: new(dirName),
Path: dirPath,
Status: ProjectStatusUnknown,
- StatusReason: new(reason),
+ StatusReason: new("Project discovered from filesystem, status pending Docker service query"),
ServiceCount: composeMetadata.ServiceCount,
- RunningCount: 0,
ComposeProjectName: composeMetadata.ComposeProjectName,
}
- slog.InfoContext(ctx, "Discovered new project with unknown status",
- "project", dirName,
- "path", dirPath,
- "reason", reason)
+ slog.InfoContext(ctx, "Discovered new project with unknown status", "project", dirName, "path", dirPath, "reason", *existing.StatusReason)
if serviceCountErr != nil {
- slog.Log(ctx, serviceCountLogLevel, "failed to read compose service count during project discovery", "project", dirName, "path", dirPath, "error", serviceCountErr)
+ slog.Log(ctx, kit.Ternary(errors.Is(serviceCountErr, common.ErrProjectEnvUnreadable), slog.LevelDebug, slog.LevelWarn),
+ "failed to read compose service count during project discovery", "project", dirName, "path", dirPath, "error", serviceCountErr)
}
- if cerr := s.db.WithContext(ctx).Create(proj).Error; cerr != nil {
+ if cerr := s.db.WithContext(ctx).Create(&existing).Error; cerr != nil {
return fmt.Errorf("create project for %q failed: %w", dirPath, cerr)
}
- if composeName := composeMetadata.ResolvedProjectName; strings.TrimSpace(composeName) != "" {
- var duplicates int64
- if countErr := s.db.WithContext(ctx).Model(&Project{}).Where("name = ? AND path <> ? AND id <> ?", composeName, dirPath, proj.ID).Count(&duplicates).Error; countErr != nil {
- slog.WarnContext(ctx, "failed to check duplicate compose project names during project sync", "composeProjectName", composeName, "path", dirPath, "error", countErr)
- } else if duplicates > 0 {
- slog.WarnContext(ctx, "multiple project directories resolve to the same compose project name", "composeProjectName", composeName, "path", dirPath, "duplicates", duplicates)
- }
+ } else {
+ updates := map[string]any{}
+ if existing.Path != dirPath {
+ updates["path"] = dirPath
}
- return s.reconcileComposeTagsForProject(ctx, proj)
- }
- if err != nil {
- return fmt.Errorf("query existing project for %q failed: %w", dirPath, err)
- }
-
- updates := map[string]any{}
- if existing.Path != dirPath {
- updates["path"] = dirPath
- }
- if existing.DirName == nil || *existing.DirName != dirName {
- updates["dir_name"] = dirName
- }
- if serviceCountErr == nil && existing.ServiceCount != composeMetadata.ServiceCount {
- updates["service_count"] = composeMetadata.ServiceCount
- } else if serviceCountErr != nil {
- slog.Log(ctx, serviceCountLogLevel, "failed to refresh compose service count during project sync", "projectId", existing.ID, "path", dirPath, "error", serviceCountErr)
- }
- if serviceCountErr == nil && mo.PointerToOption(existing.ComposeProjectName) != mo.PointerToOption(composeMetadata.ComposeProjectName) {
- updates["compose_project_name"] = composeMetadata.ComposeProjectName
- }
- if serviceCountErr == nil {
- if composeMetadata.ExplicitProjectName {
- if existing.Name != composeMetadata.ResolvedProjectName {
+ if mo.PointerToOption(existing.DirName) != mo.Some(dirName) {
+ updates["dir_name"] = dirName
+ }
+ if serviceCountErr != nil {
+ slog.Log(ctx, kit.Ternary(errors.Is(serviceCountErr, common.ErrProjectEnvUnreadable), slog.LevelDebug, slog.LevelWarn),
+ "failed to refresh compose service count during project sync", "projectId", existing.ID, "path", dirPath, "error", serviceCountErr)
+ } else {
+ if existing.ServiceCount != composeMetadata.ServiceCount {
+ updates["service_count"] = composeMetadata.ServiceCount
+ }
+ if mo.PointerToOption(existing.ComposeProjectName) != mo.PointerToOption(composeMetadata.ComposeProjectName) {
+ updates["compose_project_name"] = composeMetadata.ComposeProjectName
+ }
+ if composeMetadata.ExplicitProjectName && existing.Name != composeMetadata.ResolvedProjectName {
updates["name"] = composeMetadata.ResolvedProjectName
+ } else if !composeMetadata.ExplicitProjectName && projects.NormalizeProjectName(existing.Name) != existing.Name {
+ updates["name"] = projects.NormalizeProjectName(existing.Name)
}
- } else if normalizedExistingName := projects.NormalizeProjectName(existing.Name); normalizedExistingName != existing.Name {
- updates["name"] = normalizedExistingName
}
- }
- if len(updates) == 0 {
- return s.reconcileComposeTagsForProject(ctx, &existing)
+ if len(updates) == 0 {
+ return s.reconcileComposeTagsForProject(ctx, &existing)
+ }
+ updates["updated_at"] = time.Now()
+ if uerr := s.db.WithContext(ctx).Model(&Project{}).Where("id = ?", existing.ID).Updates(updates).Error; uerr != nil {
+ return fmt.Errorf("update project %s failed: %w", existing.ID, uerr)
+ }
}
- updates["updated_at"] = time.Now()
- if uerr := s.db.WithContext(ctx).
- Model(&Project{}).
- Where("id = ?", existing.ID).
- Updates(updates).Error; uerr != nil {
- return fmt.Errorf("update project %s failed: %w", existing.ID, uerr)
- }
- if composeName := composeMetadata.ResolvedProjectName; serviceCountErr == nil && strings.TrimSpace(composeName) != "" {
+ if serviceCountErr == nil && strings.TrimSpace(composeMetadata.ResolvedProjectName) != "" {
var duplicates int64
- if countErr := s.db.WithContext(ctx).Model(&Project{}).Where("name = ? AND path <> ? AND id <> ?", composeName, dirPath, existing.ID).Count(&duplicates).Error; countErr != nil {
- slog.WarnContext(ctx, "failed to check duplicate compose project names during project sync", "composeProjectName", composeName, "path", dirPath, "error", countErr)
+ if countErr := s.db.WithContext(ctx).Model(&Project{}).
+ Where("name = ? AND path <> ? AND id <> ?", composeMetadata.ResolvedProjectName, dirPath, existing.ID).
+ Count(&duplicates).Error; countErr != nil {
+ slog.WarnContext(ctx, "failed to check duplicate compose project names during project sync", "composeProjectName", composeMetadata.ResolvedProjectName, "path", dirPath, "error", countErr)
} else if duplicates > 0 {
- slog.WarnContext(ctx, "multiple project directories resolve to the same compose project name", "composeProjectName", composeName, "path", dirPath, "duplicates", duplicates)
+ slog.WarnContext(ctx, "multiple project directories resolve to the same compose project name", "composeProjectName", composeMetadata.ResolvedProjectName, "path", dirPath, "duplicates", duplicates)
}
}
return s.reconcileComposeTagsForProject(ctx, &existing)
}
-// evaluateProjectCleanup decides whether a project missing from the current
-// filesystem pass should be pruned. It only reads; the caller defers deletion
-// so the mass-wipe guard can veto the whole pass.
-func (s *ProjectService) evaluateProjectCleanup(ctx context.Context, p Project, followProjectSymlinks bool, projectsDir string, maxDepth int) mo.Option[projectCleanupDecision] {
- // Projects still on disk but beyond a lowered scan depth are no longer
- // discovered; root-level and outside paths fall through to the disk checks.
- if rel := listing.RelativePath(projectsDir, p.Path); maxDepth > 0 && rel != "" && strings.Count(rel, "/") >= maxDepth {
- return mo.Some(projectCleanupDecision{project: p, reason: "removed project: directory is beyond the configured scan depth"})
- }
-
- validDir, err := projects.IsProjectDirectoryPath(p.Path, followProjectSymlinks)
- switch {
- case os.IsNotExist(err):
- return mo.Some(projectCleanupDecision{project: p, reason: "removed project: directory no longer exists"})
- case err != nil:
- slog.WarnContext(ctx, "stat error during cleanup; keeping DB record", "path", p.Path, "error", err)
- return mo.None[projectCleanupDecision]()
- case !validDir:
- return mo.Some(projectCleanupDecision{project: p, reason: "removed project: path is no longer a valid project directory"})
- }
-
- // Only a directory with no compose file is pruned. An ambiguous match, an
- // unreadable directory, or a parse error keeps a possibly deployable project.
- _, err = s.ResolveProjectComposeFile(ctx, &p)
- switch {
- case err == nil:
- return mo.None[projectCleanupDecision]()
- case !errors.Is(err, common.ErrComposeFileNotFound):
- slog.WarnContext(ctx, "project directory present but compose file unresolved during cleanup; keeping DB record", "projectId", p.ID, "path", p.Path, "error", err)
- return mo.None[projectCleanupDecision]()
- }
- return mo.Some(projectCleanupDecision{project: p, reason: "removed orphaned project: directory present but contains no compose file"})
-}
-
// ApplyGitSyncEnvToDirectory applies the same managed three-file environment
// merge used by single-file project syncs and returns the effective content
// before and after the update.
@@ -2770,38 +2721,51 @@ func (s *ProjectService) reconcileComposeTagsForProject(ctx context.Context, pro
}
func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, name, composeContent, envContent, overrideContent *string, user usertypes.Actor) (*Project, error) {
- proj, projectsDirectory, err := s.getProjectForUpdate(ctx, projectID)
+ recoverErr := s.updates.RecoverProject(ctx, projectID)
+ proj, err := s.getMutableProject(ctx, projectID)
if err != nil {
return nil, err
}
+ projectsDirectory, err := s.GetProjectsDirectory(ctx)
+ if err != nil {
+ return nil, fmt.Errorf("failed to get projects directory: %w", err)
+ }
+ if ensureErr := s.EnsureProjectPathUnderRoot(ctx, proj, false); ensureErr != nil {
+ return nil, ensureErr
+ }
- name = resolveAuthoritativeProjectName(ctx, &proj, name, composeContent)
- newName := strings.TrimSpace(mo.PointerToOption(name).OrEmpty())
- if recoverErr := s.updates.RecoverProject(ctx, projectID); recoverErr != nil {
+ // A top-level `name:` in the compose file is authoritative; name-only renames check the on-disk compose so the API cannot bypass it.
+ name = func() *string {
+ switch {
+ case composeContent != nil:
+ yamlName := projects.ComposeContentProjectName(*composeContent)
+ return kit.Ternary(yamlName != "", &yamlName, name)
+ case name == nil:
+ return nil
+ }
+ onDiskCompose, _, readErr := projects.ReadProjectFiles(ctx, proj.Path, "")
+ if readErr != nil {
+ return name
+ }
+ yamlName := projects.ComposeContentProjectName(onDiskCompose)
+ return kit.Ternary(yamlName != "", &yamlName, name)
+ }()
+ newName := strings.TrimSpace(kit.FromPtr(name))
+ if recoverErr != nil {
if newName != "" && proj.Name != newName {
return nil, recoverErr
}
slog.WarnContext(ctx, "project rename journal recovery failed before non-rename update; continuing", "projectId", projectID, "error", recoverErr)
- } else {
- proj, projectsDirectory, recoverErr = s.getProjectForUpdate(ctx, projectID)
- if recoverErr != nil {
- return nil, recoverErr
- }
- name = resolveAuthoritativeProjectName(ctx, &proj, name, composeContent)
- newName = strings.TrimSpace(mo.PointerToOption(name).OrEmpty())
- }
- renameRequested := newName != "" && proj.Name != newName
-
- if proj.IsArchived {
- return nil, common.Classify(common.ErrProjectArchived, errors.New("project is archived and must be unarchived before this action"))
}
if ensureProjectEnvReadableErr := update.EnsureProjectEnvReadable(ctx, projectsDirectory, proj.Path); ensureProjectEnvReadableErr != nil {
return nil, ensureProjectEnvReadableErr
}
// A rename requires the stored and the live status to both be stopped.
- var volumeMigration volume.Migration
- if renameRequested {
+ volumeMigration, err := func() (volume.Migration, error) {
+ if newName == "" || proj.Name == newName {
+ return nil, nil
+ }
if proj.Status != ProjectStatusStopped && proj.Status != ProjectStatusUnknown {
return nil, fmt.Errorf("project must be stopped before renaming (current status: %s)", proj.Status)
}
@@ -2813,47 +2777,61 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na
if status := ProjectStatus(listing.ProjectStatus(services)); status != ProjectStatusStopped {
return nil, fmt.Errorf("project must be stopped before renaming (current status: %s)", status)
}
- proj.Status, proj.StatusReason = ProjectStatusStopped, nil
- proj.ServiceCount, proj.RunningCount = listing.ServiceCounts(services)
-
- if volumeMigration, err = s.prepareProjectRenameVolumeMigration(ctx, &proj, newName, projectsDirectory, composeContent, envContent, overrideContent); err != nil {
- return nil, err
- }
+ serviceCount, runningCount := listing.ServiceCounts(services)
+ *proj = Project{ //exhaustruct:enforce
+ BaseModel: proj.BaseModel,
+ Name: proj.Name,
+ DirName: proj.DirName,
+ Path: proj.Path,
+ Status: ProjectStatusStopped,
+ StatusReason: nil,
+ ServiceCount: serviceCount,
+ RunningCount: runningCount,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ ComposeProjectName: proj.ComposeProjectName,
+ ImageRefsJSON: proj.ImageRefsJSON,
+ BuildImageRefsJSON: proj.BuildImageRefsJSON,
+ IsArchived: proj.IsArchived,
+ ArchivedAt: proj.ArchivedAt,
+ }
+ return s.prepareProjectRenameVolumeMigration(ctx, proj, newName, projectsDirectory, composeContent, envContent, overrideContent)
+ }()
+ if err != nil {
+ return nil, err
}
renameJournal := s.updates.Prepare(proj.ID, proj.Name, proj.Path, proj.DirName, name, projectsDirectory, volumeMigration)
-
- contentChanged := composeContent != nil || envContent != nil || overrideContent != nil
- var backup *projects.ProjectUpdateBackup
- if contentChanged {
- var cleanupBackup func()
- backup, cleanupBackup, err = projects.BackupProjectDirectory(ctx, projectsDirectory, proj.Path, ".project-update-backup-*", projects.ProjectUpdateBackupScope{TopLevelFiles: true})
- if err != nil {
- return nil, err
+ backup, cleanupBackup, err := func() (*projects.ProjectUpdateBackup, func(), error) {
+ if composeContent == nil && envContent == nil && overrideContent == nil {
+ return nil, func() {}, nil
}
- defer cleanupBackup()
+ return projects.BackupProjectDirectory(ctx, projectsDirectory, proj.Path, ".project-update-backup-*", projects.ProjectUpdateBackupScope{TopLevelFiles: true})
+ }()
+ if err != nil {
+ return nil, err
}
+ defer cleanupBackup()
- journalActive := renameJournal != nil
- if journalActive {
+ if renameJournal != nil {
if writeProjectRenameJournalErr := s.updates.WriteJournal(ctx, renameJournal, projecttypes.RenameJournalPhaseStarted); writeProjectRenameJournalErr != nil {
return nil, writeProjectRenameJournalErr
}
}
- projectStateCommitted := false
- if updateErr := withProjectRenameRollback(ctx, &proj, &projectStateCommitted, func() error {
- return s.applyProjectUpdate(
- ctx, &proj, renameRequested, newName, projectsDirectory,
- composeContent, envContent, overrideContent,
- volumeMigration, renameJournal, &journalActive, &projectStateCommitted,
- )
- }); updateErr != nil {
- return nil, s.handleProjectUpdateFailure(ctx, projectID, projectsDirectory, &proj, backup, &journalActive, projectStateCommitted, updateErr)
+ original := *proj
+ if updateErr := s.applyProjectUpdate(ctx, proj, newName, projectsDirectory, composeContent, envContent, overrideContent, volumeMigration, renameJournal); updateErr != nil {
+ return nil, s.updates.RollbackFailedUpdate(ctx, projectID, projectsDirectory, original.Path, proj.Path, backup, renameJournal != nil, updateErr)
}
if composeContent != nil || overrideContent != nil {
- s.refreshProjectAfterContentUpdate(ctx, &proj)
+ s.refreshComposeProjectName(ctx, proj)
+ s.refreshProjectImageRefs(ctx, proj)
+ if reconcileErr := s.reconcileComposeTagsForProject(ctx, proj); reconcileErr != nil {
+ slog.WarnContext(ctx, "failed to reconcile Compose project tags after project content update", "projectId", proj.ID, "error", reconcileErr)
+ }
+ if countsErr := s.updateProjectStatusAndCounts(ctx, proj.ID, proj.Status); countsErr != nil {
+ slog.WarnContext(ctx, "failed to update service counts after project content update", "projectId", proj.ID, "error", countsErr)
+ }
}
metadata := database.JSON{"action": "update", "projectID": proj.ID, "projectName": proj.Name}
if composeContent != nil {
@@ -2866,12 +2844,12 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na
metadata["overrideUpdated"] = true
}
s.logProjectEvent(ctx, event.EventTypeProjectUpdate, proj.ID, proj.Name, user, metadata, "could not log project update action")
- if contentChanged {
+ if composeContent != nil || envContent != nil || overrideContent != nil {
s.FilesChanged.Publish(proj.ID)
}
slog.InfoContext(ctx, "project updated", "projectId", proj.ID, "name", proj.Name)
- return &proj, nil
+ return proj, nil
}
// applyProjectUpdate renames, persists files, migrates volumes, and
@@ -2879,28 +2857,62 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na
func (s *ProjectService) applyProjectUpdate(
ctx context.Context,
proj *Project,
- renameRequested bool,
newName, projectsDirectory string,
composeContent, envContent, overrideContent *string,
volumeMigration volume.Migration,
renameJournal *projecttypes.RenameJournal,
- journalActive, projectStateCommitted *bool,
) (err error) {
volumeMigrationApplied := false
defer func() {
- if err != nil && volumeMigrationApplied && !*projectStateCommitted {
+ if err != nil && volumeMigrationApplied {
if rollbackErr := volumeMigration.Rollback(ctx); rollbackErr != nil {
err = errors.Join(err, fmt.Errorf("failed to rollback project volume rename: %w", rollbackErr))
}
}
}()
- if renameRequested {
- if renameErr := s.applyProjectRename(ctx, proj, newName, projectsDirectory); renameErr != nil {
- return renameErr
+ // A rename moves a stopped project's directory to its sanitized new name under the projects directory.
+ if newName != "" && proj.Name != newName {
+ newDirName := projects.SanitizeProjectName(newName)
+ targetPath := filepath.Clean(filepath.Join(projectsDirectory, newDirName))
+ if filepath.Clean(proj.Path) != targetPath {
+ targetLogical, logicalErr := acfs.LogicalPath(projectsDirectory, targetPath)
+ if logicalErr != nil {
+ return fmt.Errorf("failed to resolve project directory rename target: %w", logicalErr)
+ }
+ // An imported project outside the projects directory crosses roots, so it cannot be a confined rename;
+ // that move checks cancellation itself, as acfs.Rename would.
+ if renameErr := func() error {
+ currentLogical, currentErr := acfs.LogicalPath(projectsDirectory, filepath.Clean(proj.Path))
+ if currentErr == nil {
+ return acfs.Rename(ctx, projectsDirectory, currentLogical, targetLogical)
+ }
+ if cancellationErr := ctx.Err(); cancellationErr != nil {
+ return cancellationErr
+ }
+ return os.Rename(filepath.Clean(proj.Path), targetPath)
+ }(); renameErr != nil {
+ return fmt.Errorf("failed to rename project directory: %w", renameErr)
+ }
}
- }
- if persistFilesErr := s.persistUpdatedProjectFiles(ctx, proj, projectsDirectory, composeContent, envContent, overrideContent); persistFilesErr != nil {
+ *proj = Project{ //exhaustruct:enforce
+ BaseModel: proj.BaseModel,
+ Name: newName,
+ DirName: &newDirName,
+ Path: kit.Ternary(filepath.Clean(proj.Path) != targetPath, targetPath, proj.Path),
+ Status: proj.Status,
+ StatusReason: proj.StatusReason,
+ ServiceCount: proj.ServiceCount,
+ RunningCount: proj.RunningCount,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ ComposeProjectName: proj.ComposeProjectName,
+ ImageRefsJSON: proj.ImageRefsJSON,
+ BuildImageRefsJSON: proj.BuildImageRefsJSON,
+ IsArchived: proj.IsArchived,
+ ArchivedAt: proj.ArchivedAt,
+ }
+ }
+ if persistFilesErr := projectsync.PersistUpdatedProjectFiles(ctx, proj.Path, proj.Name, projectsDirectory, composeContent, envContent, overrideContent); persistFilesErr != nil {
return persistFilesErr
}
if migrationErr := projects.ApplyRenameVolumeMigration(ctx, s.updates.Operations(), volumeMigration, renameJournal, &volumeMigrationApplied); migrationErr != nil {
@@ -2909,54 +2921,10 @@ func (s *ProjectService) applyProjectUpdate(
if saveErr := s.db.WithContext(ctx).Save(proj).Error; saveErr != nil {
return fmt.Errorf("failed to update project: %w", saveErr)
}
- *projectStateCommitted = true
- projects.FinalizeRenameAfterCommit(ctx, s.updates.Operations(), proj.ID, volumeMigration, renameJournal, journalActive)
+ projects.FinalizeRenameAfterCommit(ctx, s.updates.Operations(), proj.ID, volumeMigration, renameJournal, new(renameJournal != nil))
return nil
}
-// handleProjectUpdateFailure restores the pre-update files and replays
-// an active rename journal unless the project row was already committed.
-func (s *ProjectService) handleProjectUpdateFailure(
- ctx context.Context,
- projectID, projectsDirectory string,
- proj *Project,
- backup *projects.ProjectUpdateBackup,
- journalActive *bool,
- projectStateCommitted bool,
- err error,
-) error {
- if projectStateCommitted {
- return err
- }
-
- if backup != nil {
- if restoreErr := projects.RestoreProjectDirectoryBackup(ctx, projectsDirectory, proj.Path, backup); restoreErr != nil {
- err = errors.Join(err, fmt.Errorf("failed to restore project files after update failure: %w", restoreErr))
- }
- }
- if *journalActive {
- if recoverErr := s.updates.RecoverProject(ctx, projectID); recoverErr != nil {
- err = errors.Join(err, fmt.Errorf("project rename recovery failed: %w", recoverErr))
- } else {
- *journalActive = false
- }
- }
- return err
-}
-
-// refreshProjectAfterContentUpdate re-derives the compose name, image
-// refs, Compose tags, and service counts after a compose or override write.
-func (s *ProjectService) refreshProjectAfterContentUpdate(ctx context.Context, proj *Project) {
- s.refreshComposeProjectName(ctx, proj)
- s.refreshProjectImageRefs(ctx, proj)
- if err := s.reconcileComposeTagsForProject(ctx, proj); err != nil {
- slog.WarnContext(ctx, "failed to reconcile Compose project tags after project content update", "projectId", proj.ID, "error", err)
- }
- if err := s.updateProjectStatusAndCounts(ctx, proj.ID, proj.Status); err != nil {
- slog.WarnContext(ctx, "failed to update service counts after project content update", "projectId", proj.ID, "error", err)
- }
-}
-
func (s *ProjectService) ApplyGitSyncProjectFiles(
ctx context.Context,
projectID, composeContent string,
@@ -2964,12 +2932,16 @@ func (s *ProjectService) ApplyGitSyncProjectFiles(
gitOverrideFileName string,
user usertypes.Actor,
) (*Project, bool, error) {
- proj, projectsDirectory, err := s.getProjectForUpdate(ctx, projectID)
+ proj, err := s.getMutableProject(ctx, projectID)
if err != nil {
return nil, false, err
}
- if proj.IsArchived {
- return nil, false, common.Classify(common.ErrProjectArchived, errors.New("project is archived and must be unarchived before this action"))
+ projectsDirectory, err := s.GetProjectsDirectory(ctx)
+ if err != nil {
+ return nil, false, fmt.Errorf("failed to get projects directory: %w", err)
+ }
+ if ensureErr := s.EnsureProjectPathUnderRoot(ctx, proj, false); ensureErr != nil {
+ return nil, false, ensureErr
}
beforeCompose, beforeEnv, beforeOverride, beforeErr := s.projectContent(ctx, proj.ID)
@@ -2998,85 +2970,87 @@ func (s *ProjectService) ApplyGitSyncProjectFiles(
}
defer cleanupBackup()
- // The env is persisted first so WriteComposeFile targets the COMPOSE_FILE base
- // the updated .env selects. A failure before the row save restores the backup,
- // so new env values never pair with an old or partial compose file set.
- var applyErr error
- if envErr := projectsync.PersistGitSyncEnvFiles(ctx, proj.Path, projectsDirectory, envUpdate); envErr != nil {
- applyErr = fmt.Errorf("failed to sync git env files: %w", envErr)
- } else if composeErr := projects.WriteComposeFile(ctx, projectsDirectory, proj.Path, composeContent); composeErr != nil {
- applyErr = fmt.Errorf("failed to save compose file: %w", composeErr)
- } else if overrideErr := projects.WriteComposeOverrideFile(ctx, projectsDirectory, proj.Path, gitOverrideContent, gitOverrideFileName); overrideErr != nil {
- applyErr = fmt.Errorf("failed to sync git override file: %w", overrideErr)
- } else if saveErr := s.db.WithContext(ctx).Save(&proj).Error; saveErr != nil {
- applyErr = fmt.Errorf("failed to update project: %w", saveErr)
- }
- if applyErr != nil {
- journalActive := false
- return nil, false, s.handleProjectUpdateFailure(ctx, projectID, projectsDirectory, &proj, backup, &journalActive, false, applyErr)
+ // The env is persisted first so WriteComposeFile targets the COMPOSE_FILE base the updated .env selects.
+ // A failure before the row save restores the backup, so new env values never pair with an old compose file set.
+ if applyErr := func() error {
+ if envErr := projectsync.PersistGitSyncEnvFiles(ctx, proj.Path, projectsDirectory, envUpdate); envErr != nil {
+ return fmt.Errorf("failed to sync git env files: %w", envErr)
+ }
+ if composeErr := projects.WriteComposeFile(ctx, projectsDirectory, proj.Path, composeContent); composeErr != nil {
+ return fmt.Errorf("failed to save compose file: %w", composeErr)
+ }
+ if overrideErr := projects.WriteComposeOverrideFile(ctx, projectsDirectory, proj.Path, gitOverrideContent, gitOverrideFileName); overrideErr != nil {
+ return fmt.Errorf("failed to sync git override file: %w", overrideErr)
+ }
+ if saveErr := s.db.WithContext(ctx).Save(proj).Error; saveErr != nil {
+ return fmt.Errorf("failed to update project: %w", saveErr)
+ }
+ return nil
+ }(); applyErr != nil {
+ if restoreErr := projects.RestoreProjectDirectoryBackup(ctx, projectsDirectory, proj.Path, backup); restoreErr != nil {
+ return nil, false, errors.Join(applyErr, fmt.Errorf("failed to restore project files after update failure: %w", restoreErr))
+ }
+ return nil, false, applyErr
}
- s.refreshProjectAfterContentUpdate(ctx, &proj)
+ s.refreshComposeProjectName(ctx, proj)
+ s.refreshProjectImageRefs(ctx, proj)
+ if reconcileErr := s.reconcileComposeTagsForProject(ctx, proj); reconcileErr != nil {
+ slog.WarnContext(ctx, "failed to reconcile Compose project tags after project content update", "projectId", proj.ID, "error", reconcileErr)
+ }
+ if countsErr := s.updateProjectStatusAndCounts(ctx, proj.ID, proj.Status); countsErr != nil {
+ slog.WarnContext(ctx, "failed to update service counts after project content update", "projectId", proj.ID, "error", countsErr)
+ }
// Unreadable content on either side always compares as changed.
afterCompose, afterEnv, afterOverride, afterErr := s.projectContent(ctx, proj.ID)
- unreadable := beforeErr != nil || afterErr != nil
- if unreadable {
+ if beforeErr != nil || afterErr != nil {
slog.WarnContext(ctx, "failed to read project content for git sync change detection; treating as changed", "projectId", proj.ID, "error", errors.Join(beforeErr, afterErr))
}
- composeChanged := unreadable || beforeCompose != afterCompose
- envChanged := unreadable || projects.EnvContentChanged(beforeEnv, afterEnv)
- overrideChanged := unreadable || beforeOverride != afterOverride
- contentChanged := composeChanged || envChanged || overrideChanged
- envSourceRemoved := gitEnvContent == nil && envUpdate.State.HasGitSource
- if contentChanged || envSourceRemoved {
+ contentChanged := beforeErr != nil || afterErr != nil || beforeCompose != afterCompose || projects.EnvContentChanged(beforeEnv, afterEnv) || beforeOverride != afterOverride
+ if contentChanged || (gitEnvContent == nil && envUpdate.State.HasGitSource) {
metadata := database.JSON{
"action": "git_sync_update",
"projectID": proj.ID,
"projectName": proj.Name,
- "composeUpdated": composeChanged,
- "envUpdated": envChanged,
- "overrideUpdated": overrideChanged,
+ "composeUpdated": beforeErr != nil || afterErr != nil || beforeCompose != afterCompose,
+ "envUpdated": beforeErr != nil || afterErr != nil || projects.EnvContentChanged(beforeEnv, afterEnv),
+ "overrideUpdated": beforeErr != nil || afterErr != nil || beforeOverride != afterOverride,
}
- if envSourceRemoved {
+ if gitEnvContent == nil && envUpdate.State.HasGitSource {
metadata["envSourceRemoved"] = true
}
s.logProjectEvent(ctx, event.EventTypeProjectUpdate, proj.ID, proj.Name, user, metadata, "could not log git sync project update action")
}
- return &proj, contentChanged, nil
+ return proj, contentChanged, nil
}
-func (s *ProjectService) getProjectForUpdate(ctx context.Context, projectID string) (Project, string, error) {
- var proj Project
- if err := s.db.WithContext(ctx).First(&proj, "id = ?", projectID).Error; err != nil {
- if errors.Is(err, gorm.ErrRecordNotFound) {
- return Project{}, "", errors.New("project not found")
- }
- return Project{}, "", fmt.Errorf("failed to get project: %w", err)
- }
-
- projectsDirectory, err := s.GetProjectsDirectory(ctx)
- if err != nil {
- return Project{}, "", fmt.Errorf("failed to get projects directory: %w", err)
- }
-
- if ensureProjectPathUnderRootErr := s.EnsureProjectPathUnderRoot(ctx, &proj, false); ensureProjectPathUnderRootErr != nil {
- return Project{}, "", ensureProjectPathUnderRootErr
- }
-
- return proj, projectsDirectory, nil
-}
-
-// prepareProjectRenameVolumeMigration plans the volume rename for a
-// stopped project. Content changes are applied to a scratch preview first so
-// the plan reflects the updated compose files.
+// prepareProjectRenameVolumeMigration rejects an unusable rename target, then plans the volume rename for a stopped
+// project. Content changes are applied to a scratch preview first so the plan reflects the updated compose files.
func (s *ProjectService) prepareProjectRenameVolumeMigration(
ctx context.Context,
proj *Project,
newName, projectsDirectory string,
composeContent, envContent, overrideContent *string,
) (volume.Migration, error) {
+ newDirName := projects.SanitizeProjectName(newName)
+ if newDirName == "" || strings.Trim(newDirName, "_") == "" {
+ return nil, errors.New("invalid project name: results in empty directory name")
+ }
+ if targetPath := filepath.Clean(filepath.Join(projectsDirectory, newDirName)); filepath.Clean(proj.Path) != targetPath {
+ targetLogical, logicalErr := acfs.LogicalPath(projectsDirectory, targetPath)
+ if logicalErr != nil {
+ return nil, fmt.Errorf("failed to resolve project directory rename target: %w", logicalErr)
+ }
+ exists, existsErr := acfs.Exists(ctx, projectsDirectory, targetLogical)
+ if existsErr != nil {
+ return nil, fmt.Errorf("failed to check project directory rename target: %w", existsErr)
+ }
+ if exists {
+ return nil, fmt.Errorf("project directory already exists: %s", targetPath)
+ }
+ }
target := proj
if composeContent != nil || envContent != nil || overrideContent != nil {
previewLogical, err := acfs.MkdirTemp(ctx, projectsDirectory, "/", ".project-update-preview-*")
@@ -3096,16 +3070,30 @@ func (s *ProjectService) prepareProjectRenameVolumeMigration(
if _, copyDirErr := acfs.CopyDir(ctx, proj.Path, previewPath, acfstypes.CopyOptions{}); copyDirErr != nil {
return nil, fmt.Errorf("failed to prepare project update preview: %w", copyDirErr)
}
- previewProject := *proj
- previewProject.Path = previewPath
- if persistErr := s.persistUpdatedProjectFiles(ctx, &previewProject, projectsDirectory, composeContent, envContent, overrideContent); persistErr != nil {
+ previewProject := Project{ //exhaustruct:enforce
+ BaseModel: proj.BaseModel,
+ Name: proj.Name,
+ DirName: proj.DirName,
+ Path: previewPath,
+ Status: proj.Status,
+ StatusReason: proj.StatusReason,
+ ServiceCount: proj.ServiceCount,
+ RunningCount: proj.RunningCount,
+ GitOpsManagedBy: proj.GitOpsManagedBy,
+ ComposeProjectName: proj.ComposeProjectName,
+ ImageRefsJSON: proj.ImageRefsJSON,
+ BuildImageRefsJSON: proj.BuildImageRefsJSON,
+ IsArchived: proj.IsArchived,
+ ArchivedAt: proj.ArchivedAt,
+ }
+ if persistErr := projectsync.PersistUpdatedProjectFiles(ctx, previewProject.Path, previewProject.Name, projectsDirectory, composeContent, envContent, overrideContent); persistErr != nil {
return nil, fmt.Errorf("failed to prepare project update preview: %w", persistErr)
}
target = &previewProject
}
oldComposeName, newComposeName := projects.NormalizeProjectName(target.Name), projects.NormalizeProjectName(newName)
- if s.dockerService == nil || target.Status != ProjectStatusStopped || oldComposeName == "" || newComposeName == "" || oldComposeName == newComposeName {
+ if target.Status != ProjectStatusStopped || oldComposeName == "" || newComposeName == "" || oldComposeName == newComposeName {
return nil, nil
}
@@ -3122,117 +3110,7 @@ func (s *ProjectService) prepareProjectRenameVolumeMigration(
return nil, fmt.Errorf("failed to connect to Docker for volume rename: %w", err)
}
- toolsRegistry := ""
- if s.settingsService != nil {
- toolsRegistry = s.settingsService.GetSettingsConfig().ToolsImageRegistry.Value
- }
-
- return projects.PlanVolumeMigration(ctx, dockerClient, composeProject, oldComposeName, newComposeName, volumehelper.ToolsImage(toolsRegistry))
-}
-
-// persistUpdatedProjectFiles validates and writes submitted compose, override,
-// and env content. An override-only save validates the on-disk base merged with
-// the requested override, so a base only valid with its override still passes
-// and a delete that would break the base fails before touching disk.
-func (s *ProjectService) persistUpdatedProjectFiles(ctx context.Context, proj *Project, projectsDirectory string, composeContent, envContent, overrideContent *string) error {
- if composeContent == nil && overrideContent == nil {
- if envContent != nil {
- return projectsync.PersistEffectiveEnvContent(ctx, proj.Path, projectsDirectory, *envContent)
- }
- return nil
- }
-
- var baseContent string
- if composeContent != nil {
- baseContent = *composeContent
- } else {
- var err error
- if baseContent, _, err = projects.ReadProjectFiles(ctx, proj.Path, ""); err != nil {
- return fmt.Errorf("failed to read project files: %w", err)
- }
- }
- effectiveEnvContent, err := projectsync.EffectiveEnvContentForUpdate(proj.Path, envContent)
- if err != nil {
- return fmt.Errorf("invalid compose file: %w", err)
- }
- valOverride, valOverrideName := projects.ResolveEffectiveOverrideForValidation(proj.Path, overrideContent)
- if validateErr := projects.ValidateComposeContentForUpdate(ctx, projectsDirectory, proj.Path, proj.Name, baseContent, effectiveEnvContent, valOverride, valOverrideName, false); validateErr != nil {
- return fmt.Errorf("invalid compose file: %w", validateErr)
- }
-
- // The env is persisted first so WriteComposeFile targets the COMPOSE_FILE
- // base the updated .env selects. A non-nil composeContent is an explicit
- // submission and is always written.
- if envContent != nil {
- if persistErr := projectsync.PersistEffectiveEnvContent(ctx, proj.Path, projectsDirectory, *envContent); persistErr != nil {
- return fmt.Errorf("failed to save project files: %w", persistErr)
- }
- } else if composeContent != nil {
- if ensureErr := projectsync.EnsureEffectiveEnvFile(ctx, proj.Path, projectsDirectory); ensureErr != nil {
- return fmt.Errorf("failed to save project files: %w", ensureErr)
- }
- }
- if composeContent != nil {
- if writeErr := projects.WriteComposeFile(ctx, projectsDirectory, proj.Path, *composeContent); writeErr != nil {
- return fmt.Errorf("failed to save project files: %w", writeErr)
- }
- }
- if overrideErr := projects.ApplyOverrideFileChange(ctx, projectsDirectory, proj.Path, overrideContent); overrideErr != nil {
- return fmt.Errorf("failed to save project files: %w", overrideErr)
- }
- return nil
-}
-
-// applyProjectRename moves a stopped project's directory to its sanitized new
-// name under the projects directory and updates the row fields.
-func (s *ProjectService) applyProjectRename(ctx context.Context, proj *Project, newName, projectsDirectory string) error {
- if proj.Status != ProjectStatusStopped {
- return fmt.Errorf("project must be stopped before renaming (current status: %s)", proj.Status)
- }
-
- newDirName := projects.SanitizeProjectName(newName)
- if newDirName == "" || strings.Trim(newDirName, "_") == "" {
- return errors.New("invalid project name: results in empty directory name")
- }
-
- currentPath := filepath.Clean(proj.Path)
- targetPath := filepath.Clean(filepath.Join(projectsDirectory, newDirName))
- if currentPath != targetPath {
- targetLogical, err := acfs.LogicalPath(projectsDirectory, targetPath)
- if err != nil {
- return fmt.Errorf("failed to resolve project directory rename target: %w", err)
- }
- exists, err := acfs.Exists(ctx, projectsDirectory, targetLogical)
- if err != nil {
- return fmt.Errorf("failed to check project directory rename target: %w", err)
- }
- if exists {
- return fmt.Errorf("project directory already exists: %s", targetPath)
- }
-
- // An imported project can live outside the projects directory, in which
- // case the move crosses roots and cannot be a confined rename.
- currentLogical, currentErr := acfs.LogicalPath(projectsDirectory, currentPath)
- if currentErr != nil {
- // The cross-root move cannot go through acfs, so the cancellation
- // check acfs.Rename performs happens here instead.
- if cancellationErr := ctx.Err(); cancellationErr != nil {
- return cancellationErr
- }
- err = os.Rename(currentPath, targetPath)
- } else {
- err = acfs.Rename(ctx, projectsDirectory, currentLogical, targetLogical)
- }
- if err != nil {
- return fmt.Errorf("failed to rename project directory: %w", err)
- }
-
- proj.Path = targetPath
- }
-
- proj.DirName = &newDirName
- proj.Name = newName
- return nil
+ return projects.PlanVolumeMigration(ctx, dockerClient, composeProject, oldComposeName, newComposeName, volumehelper.ToolsImage(s.settingsService.GetSettingsConfig().ToolsImageRegistry.Value))
}
// UpdateProjectServiceImages persists selected service image tags before recreating them.
@@ -3281,10 +3159,7 @@ func (s *ProjectService) GetProjectWorkspace(ctx context.Context, projectID stri
return nil, ensureProjectPathUnderRootErr
}
ownedPaths, ownedErr := s.gitOpsOwnedWorkspacePaths(ctx, proj)
- if ownedErr != nil {
- ownedPaths = nil
- }
- return s.workspace.Read(ctx, proj.Path, s.workspaceComposeFileName(ctx, proj), ownedPaths)
+ return s.workspace.Read(ctx, proj.Path, s.workspaceComposeFileName(ctx, proj), kit.Ternary(ownedErr == nil, ownedPaths, nil))
}
func (s *ProjectService) GetProjectWorkspaceFile(ctx context.Context, projectID, relativePath string) (*workspacetypes.FileContent, error) {
@@ -3293,10 +3168,7 @@ func (s *ProjectService) GetProjectWorkspaceFile(ctx context.Context, projectID,
return nil, err
}
ownedPaths, ownedErr := s.gitOpsOwnedWorkspacePaths(ctx, proj)
- if ownedErr != nil {
- ownedPaths = nil
- }
- return s.workspace.File(ctx, proj.Path, s.workspaceComposeFileName(ctx, proj), relativePath, ownedPaths)
+ return s.workspace.File(ctx, proj.Path, s.workspaceComposeFileName(ctx, proj), relativePath, kit.Ternary(ownedErr == nil, ownedPaths, nil))
}
func (s *ProjectService) DownloadProjectWorkspaceFile(ctx context.Context, projectID, relativePath string) (io.ReadCloser, int64, string, error) {
@@ -3447,8 +3319,11 @@ func (s *ProjectService) AggregateProjects(ctx context.Context, params paginatio
}
byID := func(a, b projecttypes.Details) int { return strings.Compare(a.ID, b.ID) }
listConfig := listing.PaginationConfig()
- listConfig.SortBindings = append([]pagination.SortBinding[projecttypes.Details]{{Key: "id", Fn: byID, DescFn: byID}}, listConfig.SortBindings...)
- items, resp := pagination.MergeEnvironmentPages(listConfig, pages, params)
+ items, resp := pagination.MergeEnvironmentPages(pagination.Config[projecttypes.Details]{
+ SearchAccessors: listConfig.SearchAccessors,
+ SortBindings: append([]pagination.SortBinding[projecttypes.Details]{{Key: "id", Fn: byID, DescFn: byID}}, listConfig.SortBindings...),
+ FilterAccessors: listConfig.FilterAccessors,
+ }, pages, params)
return base.Paginated[projecttypes.Details]{
Success: true,
Data: items,
@@ -3462,14 +3337,23 @@ func (s *ProjectService) AggregateProjectCounts(ctx context.Context) (base.ApiRe
if err != nil {
return base.ApiResponse[projecttypes.StatusCounts]{}, fmt.Errorf("collect environment project counts: %w", err)
}
- var counts projecttypes.StatusCounts
+ var running, stopped, total, archived int
for _, result := range collection.Results {
- counts.RunningProjects += result.Value.Data.RunningProjects
- counts.StoppedProjects += result.Value.Data.StoppedProjects
- counts.TotalProjects += result.Value.Data.TotalProjects
- counts.ArchivedProjects += result.Value.Data.ArchivedProjects
- }
- return base.ApiResponse[projecttypes.StatusCounts]{Success: true, Data: counts, FailedEnvironments: collection.Failures}, nil
+ running += result.Value.Data.RunningProjects
+ stopped += result.Value.Data.StoppedProjects
+ total += result.Value.Data.TotalProjects
+ archived += result.Value.Data.ArchivedProjects
+ }
+ return base.ApiResponse[projecttypes.StatusCounts]{
+ Success: true,
+ Data: projecttypes.StatusCounts{
+ RunningProjects: running,
+ StoppedProjects: stopped,
+ TotalProjects: total,
+ ArchivedProjects: archived,
+ },
+ FailedEnvironments: collection.Failures,
+ }, nil
}
func (s *ProjectService) AggregateProjectTags(ctx context.Context) (base.ApiResponse[[]projecttypes.TagOption], error) {
@@ -3489,30 +3373,6 @@ func (s *ProjectService) AggregateProjectTags(ctx context.Context) (base.ApiResp
return base.ApiResponse[[]projecttypes.TagOption]{Success: true, Data: options, FailedEnvironments: collection.Failures}, nil
}
-// projectListRows builds list rows and persists live-inferred service counts
-// over stored zeros, since SQL sorts and paginates on service_count.
-func (s *ProjectService) projectListRows(ctx context.Context, projectsDir string, projectsList []Project, snapshot listing.Snapshot) []projecttypes.Details {
- rows, inferredCounts := listing.Rows(projectsDir, IconCatalogForContext(ctx), projectRecords(projectsList), snapshot)
- ids := slices.Collect(maps.Keys(inferredCounts))
- for chunk := range slices.Chunk(ids, inferredServiceCountBatchSize) {
- var caseExpr strings.Builder
- args := make([]any, 0, 2*len(chunk))
- caseExpr.WriteString("CASE id")
- for _, id := range chunk {
- caseExpr.WriteString(" WHEN ? THEN ?")
- args = append(args, id, inferredCounts[id])
- }
- caseExpr.WriteString(" ELSE service_count END")
- if err := s.db.WithContext(ctx).Model(&Project{}).
- Where("id IN ? AND service_count = 0", chunk).
- Update("service_count", gorm.Expr(caseExpr.String(), args...)).Error; err != nil {
- slog.WarnContext(ctx, "failed to persist inferred project service counts", "count", len(chunk), "error", err)
- break
- }
- }
- return rows
-}
-
// GetProjectTags returns the effective UI and Compose tag associations for a project.
func (s *ProjectService) GetProjectTags(ctx context.Context, projectID string) ([]projecttypes.Tag, error) {
var rows []projecttypes.TagAssignment
diff --git a/backend/internal/project/service_test.go b/backend/internal/project/service_test.go
index d0d378f72..6c5bf898a 100644
--- a/backend/internal/project/service_test.go
+++ b/backend/internal/project/service_test.go
@@ -45,6 +45,7 @@ import (
"github.com/stretchr/testify/require"
"go.getarcane.app/acfs"
buildtypes "go.getarcane.app/builds/types"
+ kit "go.getarcane.app/kit/pkg"
"go.getarcane.app/updater/labels"
updatertypes "go.getarcane.app/updater/types"
"gorm.io/gorm"
@@ -75,6 +76,13 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/imageref"
)
+var testRegistryCredentials = func(context.Context) ([]containerregistry.Credential, error) { return nil, nil }
+
+var testDockerService = &docker.DockerClientService{Client: func() *client.Client {
+ cli, _ := client.New(client.WithHost("tcp://127.0.0.1:1"), client.WithAPIVersion("1.41"))
+ return cli
+}()}
+
type testBuildBuilder struct {
err error
}
@@ -96,13 +104,12 @@ func setupProjectTestDB(t *testing.T) *database.DB {
t.Helper()
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
require.NoError(t, err)
- require.NoError(t, db.AutoMigrate(&Project{}, &ProjectTag{}, &GitOpsSync{}, &settings.SettingVariable{}, &imageupdate.ImageUpdateRecord{}, &event.Event{}))
+ require.NoError(t, db.AutoMigrate(&Project{}, &ProjectTag{}, &GitOpsSync{}, &settings.SettingVariable{}, &imageupdate.ImageUpdateRecord{}, &event.Event{}, &kv.KVEntry{}))
return &database.DB{DB: db}
}
func TestUpdateProjectWorkspaceRejectsInvalidManifestBeforeProjectLookup(t *testing.T) {
- service := &ProjectService{}
- service.initChildren(nil, nil)
+ service := NewProjectService(nil, nil, nil, nil, testDockerService, testBuildBuilder{}, nil, nil, nil, nil, testRegistryCredentials)
_, err := service.UpdateProjectWorkspace(t.Context(), "missing", projecttypes.WorkspaceUpdateManifest{}, nil, usertypes.Actor{})
require.ErrorIs(t, err, common.ErrProjectWorkspaceBadRequest)
@@ -234,7 +241,19 @@ func TestProjectService_RefreshProjectImageRefs_PersistsBuildMetadata(t *testing
}
require.NoError(t, db.Create(proj).Error)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
svc.refreshProjectImageRefs(ctx, proj)
var saved Project
@@ -271,7 +290,19 @@ func TestProjectService_BackfillProjectImageRefs_RetriesOnlyMissingMetadata(t *t
require.NoError(t, db.Create(invalid).Error)
require.NoError(t, db.Create(regular).Error)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
count, err := svc.BackfillProjectImageRefs(ctx)
require.NoError(t, err)
require.Equal(t, 3, count)
@@ -315,7 +346,19 @@ func setupProjectDestroyTestService(t *testing.T) (*ProjectService, *database.DB
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
eventService := event.NewEventService(db, config.Load(), nil)
- return NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil), db, projectsDir
+ return NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ ), db, projectsDir
}
func TestProjectService_DestroyProject_RemovesFilesWhenRequested(t *testing.T) {
@@ -380,7 +423,19 @@ func TestProjectService_GetProjectFromDatabaseByID(t *testing.T) {
// Setup dependencies
settingsService, _ := newSettingsServiceForTest(t, ctx, db)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
// Create test project
proj := &Project{
@@ -404,7 +459,19 @@ func TestProjectService_GetProjectFromDatabaseByID(t *testing.T) {
func TestProjectService_UpdateProjectStatus(t *testing.T) {
db := setupProjectTestDB(t)
ctx := t.Context()
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
proj := &Project{
ID: "p1",
@@ -430,7 +497,19 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {
t.Run("exact match", func(t *testing.T) {
db := setupProjectTestDB(t)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
proj := &Project{
ID: "p1",
@@ -446,7 +525,19 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {
t.Run("normalized fallback", func(t *testing.T) {
db := setupProjectTestDB(t)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
proj := &Project{
ID: "p1",
@@ -462,7 +553,19 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {
t.Run("display name in db, normalized compose label input", func(t *testing.T) {
db := setupProjectTestDB(t)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
display := &Project{
ID: "p2",
@@ -478,7 +581,19 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {
t.Run("invalidates stale normalized cache entries after deletion", func(t *testing.T) {
db := setupProjectTestDB(t)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
original := &Project{
ID: "p3",
@@ -515,7 +630,19 @@ func TestProjectService_GetProjectByComposeName(t *testing.T) {
t.Run("invalidates stale normalized cache entries after rename", func(t *testing.T) {
db := setupProjectTestDB(t)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
original := &Project{
ID: "p5",
@@ -575,7 +702,19 @@ func TestProjectService_PullProjectImages_UpdatesCurrentImageRecordAfterPull(t *
eventService := event.NewEventService(db, nil, nil)
imageUpdateService := imageupdate.NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)
imageService := image.NewImageService(db, dockerService, nil, imageUpdateService, nil, eventService, nil, nil)
- svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
projectPath := createComposeProjectDir(t, projectsDir, "compose-pull")
composeContent := fmt.Sprintf("services:\n app:\n image: %s\n builder:\n build: .\n", imageRef)
@@ -671,7 +810,19 @@ func TestProjectService_EnsureImagesPresent_UpdatesCurrentImageRecordAfterPull(t
eventService := event.NewEventService(db, nil, nil)
imageUpdateService := imageupdate.NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)
imageService := image.NewImageService(db, dockerService, nil, imageUpdateService, nil, eventService, nil, nil)
- svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, db.Create(&imageupdate.ImageUpdateRecord{
ID: "sha256:old-api",
@@ -739,7 +890,19 @@ func TestProjectService_PullImageForService_UpdatesCurrentImageRecordAfterPull(t
eventService := event.NewEventService(db, nil, nil)
imageUpdateService := imageupdate.NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)
imageService := image.NewImageService(db, dockerService, nil, imageUpdateService, nil, eventService, nil, nil)
- svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, db.Create(&imageupdate.ImageUpdateRecord{
ID: "sha256:old-worker",
@@ -802,7 +965,19 @@ func TestProjectService_ComposePullSelectedServices_ReconcilesOnlyOnSuccess(t *t
eventService := event.NewEventService(db, nil, nil)
imageUpdateService := imageupdate.NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)
imageService := image.NewImageService(db, dockerService, nil, imageUpdateService, nil, eventService, nil, nil)
- svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
projectDef := &types.Project{
Name: "compose-selected",
@@ -906,7 +1081,19 @@ func TestProjectService_ComposePullSelectedServices_LeavesRecordsWhenPullFails(t
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, failingServer)}
imageUpdateService := imageupdate.NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)
imageService := image.NewImageService(db, dockerService, nil, imageUpdateService, nil, event.NewEventService(db, nil, nil), nil, nil)
- svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
projectDef := &types.Project{
Name: "compose-selected",
@@ -1008,7 +1195,19 @@ func TestProjectService_UpdateProjectServicesHardFailsWhenPullFails(t *testing.T
return errors.New("compose up should not run")
}
- svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
err = svc.UpdateProjectServices(ctx, projectRecord.ID, []string{"app"}, usertypes.SystemUser, true)
require.Error(t, err)
require.ErrorContains(t, err, "pull updated service images")
@@ -1127,7 +1326,7 @@ func TestProjectService_UpdateProjectServicesForcesRecreate(t *testing.T) {
return errors.New("compose up failed after assertion")
}
- svc := NewProjectService(db, settingsService, eventService, imageService, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(db, settingsService, eventService, imageService, dockerService, testBuildBuilder{}, nil, nil, config.Load(), kv.NewKVService(db), testRegistryCredentials)
err = svc.UpdateProjectServices(ctx, projectRecord.ID, []string{"app"}, usertypes.SystemUser, true)
require.Error(t, err)
assert.True(t, eventService.ShouldSuppressDaemonEvent("container", "replacement", "app", "compose-update-force"), "failed updates retain correlation through rollback grace")
@@ -1206,7 +1405,19 @@ func TestProjectService_UpdateProject_RenameFailsWhenVolumeMigrationPreparationF
t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURL(t, dockerServer.URL))
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, dockerServer)}
- svc := NewProjectService(db, settingsService, eventService, nil, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
originalDirName := "Foo"
originalPath := createComposeProjectDir(t, projectsDir, originalDirName)
@@ -1260,7 +1471,19 @@ func TestProjectService_ApplyProjectUpdateWithRenameJournal_AppliesVolumeMigrati
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
migration := &fakeProjectVolumeRenameMigration{}
@@ -1277,15 +1500,12 @@ func TestProjectService_ApplyProjectUpdateWithRenameJournal_AppliesVolumeMigrati
require.NoError(t, db.Create(project).Error)
projectForUpdate := *project
- journalActive := false
- projectStateCommitted := false
- err = svc.applyProjectUpdate(ctx, &projectForUpdate, true, "bar", projectsDir, nil, nil, nil, migration, nil, &journalActive, &projectStateCommitted)
+ err = svc.applyProjectUpdate(ctx, &projectForUpdate, "bar", projectsDir, nil, nil, nil, migration, nil)
require.NoError(t, err)
assert.True(t, migration.applyCalled)
assert.True(t, migration.commitCalled)
assert.False(t, migration.rollbackCalled)
- assert.True(t, projectStateCommitted)
assert.Equal(t, "bar", projectForUpdate.Name)
assert.DirExists(t, filepath.Join(projectsDir, "bar"))
assert.NoDirExists(t, originalPath)
@@ -1335,7 +1555,19 @@ func TestProjectService_PrepareProjectRenameVolumeMigrationForUpdate_UsesCompose
t.Cleanup(dockerServer.Close)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, dockerServer)}
- svc := NewProjectService(db, settingsService, nil, nil, dockerService, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
projectPath := filepath.Join(projectsDir, "nginx")
require.NoError(t, os.MkdirAll(projectPath, 0o755))
@@ -1426,12 +1658,24 @@ func TestProjectService_ApplyProjectUpdateWithRenameJournal_RollsBackVolumeMigra
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
migration := &fakeProjectVolumeRenameMigration{}
require.NoError(t, db.Callback().Update().Before("gorm:update").Register("arcane_test_project_save_failure", func(tx *gorm.DB) {
- if tx.Statement != nil && tx.Statement.Schema != nil && tx.Statement.Schema.Name == "Project" {
+ if tx.Statement.Schema != nil && tx.Statement.Schema.Name == "Project" {
_ = tx.AddError(errors.New("forced project save failure"))
}
}))
@@ -1449,19 +1693,12 @@ func TestProjectService_ApplyProjectUpdateWithRenameJournal_RollsBackVolumeMigra
require.NoError(t, db.Create(project).Error)
projectForUpdate := *project
- journalActive := false
- projectStateCommitted := false
- err = withProjectRenameRollback(ctx, &projectForUpdate, &projectStateCommitted, func() error {
- return svc.applyProjectUpdate(ctx, &projectForUpdate, true, "bar", projectsDir, nil, nil, nil, migration, nil, &journalActive, &projectStateCommitted)
- })
+ err = svc.applyProjectUpdate(ctx, &projectForUpdate, "bar", projectsDir, nil, nil, nil, migration, nil)
require.Error(t, err)
assert.Contains(t, err.Error(), "forced project save failure")
assert.True(t, migration.applyCalled)
assert.False(t, migration.commitCalled)
assert.True(t, migration.rollbackCalled)
- assert.False(t, projectStateCommitted)
- assert.DirExists(t, originalPath)
- assert.NoDirExists(t, filepath.Join(projectsDir, "bar"))
}
func TestProjectService_ApplyProjectUpdateWithRenameJournal_SucceedsCommittedRenameWhenSourceCleanupFails(t *testing.T) {
@@ -1475,7 +1712,19 @@ func TestProjectService_ApplyProjectUpdateWithRenameJournal_SucceedsCommittedRen
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
migration := &fakeProjectVolumeRenameMigration{
commitErr: errors.New("source cleanup failed"),
@@ -1494,16 +1743,11 @@ func TestProjectService_ApplyProjectUpdateWithRenameJournal_SucceedsCommittedRen
require.NoError(t, db.Create(project).Error)
projectForUpdate := *project
- journalActive := false
- projectStateCommitted := false
- err = withProjectRenameRollback(ctx, &projectForUpdate, &projectStateCommitted, func() error {
- return svc.applyProjectUpdate(ctx, &projectForUpdate, true, "bar", projectsDir, nil, nil, nil, migration, nil, &journalActive, &projectStateCommitted)
- })
+ err = svc.applyProjectUpdate(ctx, &projectForUpdate, "bar", projectsDir, nil, nil, nil, migration, nil)
require.NoError(t, err)
require.True(t, migration.applyCalled)
require.True(t, migration.commitCalled)
require.False(t, migration.rollbackCalled)
- require.True(t, projectStateCommitted)
require.NoDirExists(t, originalPath)
require.DirExists(t, filepath.Join(projectsDir, "bar"))
@@ -1527,7 +1771,19 @@ func TestProjectService_UpdateProject_ClearsJournalForNonRenameWhenRecoveryDocke
eventService := event.NewEventService(db, nil, nil)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
oldDir := "nginx"
projectPath := createComposeProjectDir(t, projectsDir, oldDir)
@@ -1593,8 +1849,19 @@ func TestProjectService_UpdateProject_AllowsRenameAfterJournalRecoveryWithoutDoc
eventService := event.NewEventService(db, nil, nil)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
- configureProjectRuntimeDocker(t, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, configureProjectRuntimeDocker(t, nil))},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
oldDir := "nginx"
projectPath := createComposeProjectDir(t, projectsDir, oldDir)
@@ -1655,8 +1922,19 @@ func TestProjectService_UpdateProject_RenamesDirectoryWhenNameChanges(t *testing
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
- configureProjectRuntimeDocker(t, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, configureProjectRuntimeDocker(t, nil))},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
originalDirName := "Foo"
originalPath := createComposeProjectDir(t, projectsDir, originalDirName)
@@ -1704,8 +1982,19 @@ func TestProjectService_UpdateProject_RenameFailsWhenTargetDirectoryExists(t *te
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
- configureProjectRuntimeDocker(t, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, configureProjectRuntimeDocker(t, nil))},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
originalDirName := "Foo"
originalPath := createComposeProjectDir(t, projectsDir, originalDirName)
@@ -1751,7 +2040,19 @@ func TestProjectService_UpdateProject_RenameFailsWhenProjectRunning(t *testing.T
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
originalDirName := "Foo"
originalPath := filepath.Join(projectsDir, originalDirName)
@@ -1796,8 +2097,7 @@ func TestProjectService_UpdateProject_RenameRejectsStaleStoppedWhenRuntimeIsRunn
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
- configureProjectRuntimeDocker(t, []container.Summary{
+ server := configureProjectRuntimeDocker(t, []container.Summary{
{
ID: "app-container",
Names: []string{"/foo-app-1"},
@@ -1812,6 +2112,19 @@ func TestProjectService_UpdateProject_RenameRejectsStaleStoppedWhenRuntimeIsRunn
},
},
})
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, server)},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
originalDirName := "Foo"
originalPath := createComposeProjectDir(t, projectsDir, originalDirName)
@@ -1854,9 +2167,20 @@ func TestProjectService_UpdateProject_RenameResolvesUnknownStoppedStatusBeforeVo
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
-
server := newProjectRuntimeDockerServer(t, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, server)},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURL(t, server.URL))
originalDirName := "Foo"
@@ -1912,8 +2236,6 @@ func TestProjectService_UpdateProject_RenameRejectsUnknownWhenRuntimeIsRunning(t
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
-
server := newProjectRuntimeDockerServer(t, []container.Summary{
{
ID: "app-container",
@@ -1930,6 +2252,19 @@ func TestProjectService_UpdateProject_RenameRejectsUnknownWhenRuntimeIsRunning(t
},
})
t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURL(t, server.URL))
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, server)},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
originalDirName := "Foo"
originalPath := createComposeProjectDir(t, projectsDir, originalDirName)
@@ -1975,7 +2310,19 @@ func TestProjectService_UpdateProject_ValidatesComposeUsingExistingProjectName(t
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "demo"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2018,7 +2365,19 @@ func TestProjectService_UpdateProject_AllowsMissingEnvFileDuringComposeValidatio
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "env-required"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2063,7 +2422,19 @@ func TestProjectService_UpdateProject_EnvRetargetWritesExplicitIdenticalComposeT
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "retarget-explicit"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2117,7 +2488,19 @@ func TestProjectService_UpdateProject_EnvRetargetWithoutComposePayloadPreservesN
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "retarget-omit"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2169,7 +2552,19 @@ func TestProjectService_UpdateProject_EnvRetargetWritesEditedComposeToSelectedBa
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "retarget-edit"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2216,7 +2611,19 @@ func TestProjectService_UpdateProject_AllowsMissingLocalIncludeDuringComposeVali
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "include-new"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2266,7 +2673,19 @@ func TestProjectService_CreateProject_AllowsExternalInclude(t *testing.T) {
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, os.WriteFile(filepath.Join(projectsDir, "shared.yaml"), []byte("services: {}\n"), 0o644))
compose := `include:
@@ -2297,7 +2716,19 @@ func TestProjectService_UpdateProject_AllowsExternalInclude(t *testing.T) {
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "external-include"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2340,7 +2771,19 @@ func TestProjectService_CreateProject_CommitsWorkspaceAndConfigurationTogether(t
settingsService, err := newSettingsServiceForTest(t, ctx, db)
require.NoError(t, err)
- svc := NewProjectService(db, settingsService, event.NewEventService(db, nil, nil), nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
uploadIndex := 0
manifest := projecttypes.CreateProjectWorkspaceManifest{FileChanges: []projecttypes.WorkspaceFileChange{{
Operation: projecttypes.FileOpCreateFile, RelativePath: "config/app.txt", UploadIndex: &uploadIndex,
@@ -2375,7 +2818,19 @@ func TestProjectService_CreateProject_RollsBackInvalidWorkspaceManifest(t *testi
settingsService, err := newSettingsServiceForTest(t, ctx, db)
require.NoError(t, err)
- svc := NewProjectService(db, settingsService, event.NewEventService(db, nil, nil), nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
manifest := projecttypes.CreateProjectWorkspaceManifest{FileChanges: []projecttypes.WorkspaceFileChange{{
Operation: projecttypes.FileOpDelete, RelativePath: "missing.txt",
}}}
@@ -2411,7 +2866,19 @@ func TestProjectService_UpdateProject_UsesExistingEnvFileDuringComposeValidation
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "env-existing"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2461,7 +2928,19 @@ func newProjectServiceForOverrideTest(t *testing.T, dirName string) (*ProjectSer
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
projectPath := filepath.Join(projectsDir, dirName)
require.NoError(t, os.MkdirAll(projectPath, 0o755))
@@ -2572,7 +3051,19 @@ func TestProjectService_UpdateProject_UsesProvidedEnvContentDuringComposeValidat
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "env-updated"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2619,7 +3110,19 @@ func TestProjectService_UpdateProject_ReturnsEnvParseErrorDuringComposeValidatio
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "env-invalid"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2664,7 +3167,19 @@ func TestProjectService_UpdateProject_UsesGlobalEnvDuringComposeValidation(t *te
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "global-env-update"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2713,7 +3228,19 @@ func TestProjectService_UpdateProject_DoesNotResolveHostEnvThroughGlobalEnvDurin
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "host-env-guard"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2757,7 +3284,19 @@ func TestProjectService_UpdateProject_DerivesProjectOverrideEnvWhenGitSourceExis
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "override-edit"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2804,7 +3343,19 @@ func TestProjectService_UpdateProject_UnchangedGitEnvLeavesFilesUntouched(t *tes
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "unchanged-git-env"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2901,7 +3452,19 @@ func TestProjectService_UpdateProject_DeletingGitBackedKeyFallsBackToGit(t *test
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "override-delete"
projectPath := filepath.Join(projectsDir, dirName)
@@ -2951,7 +3514,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_MigratesDirectEnvIntoProjectOve
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-migrate"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3002,7 +3577,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_PreservesGitEnvSyntax(t *testin
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-env-syntax"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3064,7 +3651,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_NormalizesStaleCopiedGitOverrid
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-normalize"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3112,7 +3711,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_RemovesLegacyDeletedGitMasks(t
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-delete-mask"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3161,7 +3772,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_RemovesGitEnvSource(t *testing.
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-remove"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3205,7 +3828,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_WritesAndRemovesComposeOverride
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-override"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3256,7 +3891,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_UsesGlobalEnvDuringComposeValid
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-global-env"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3307,7 +3954,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_TolerantOfUndefinedComposeVar(t
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-undefined-var"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3355,7 +4014,19 @@ func TestProjectService_GetProjectDetails_ReturnsEffectiveEnvContent(t *testing.
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "details-override"
projectPath := filepath.Join(projectsDir, dirName)
@@ -3459,7 +4130,7 @@ func TestBuildProjectUpdateInfoSummary(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- summary := buildUpdateInfoSummary(tt.imageRefs, tt.updates)
+ summary := buildUpdateInfoSummary(tt.imageRefs, tt.updates, nil)
require.NotNil(t, summary)
assert.Equal(t, tt.wantStatus, summary.Status)
assert.Equal(t, tt.wantCount, summary.ImageCount)
@@ -3495,7 +4166,19 @@ func TestProjectService_GetProjectDetails_IncludesUpdateInfo(t *testing.T) {
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
imageService := image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil)
- svc := NewProjectService(db, settingsService, nil, imageService, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
projectPath := createComposeProjectDir(t, projectsDir, "updates-demo")
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n app:\n image: nginx:latest\n"), 0o644))
@@ -3581,7 +4264,6 @@ func TestProjectService_GetProjectDetails_RefreshesRuntimeStatusWithoutRuntimeSe
},
},
})
- t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURL(t, server.URL))
projectRecord := &Project{
ID: "proj-runtime-refresh",
@@ -3594,7 +4276,20 @@ func TestProjectService_GetProjectDetails_RefreshesRuntimeStatusWithoutRuntimeSe
}
require.NoError(t, db.Create(projectRecord).Error)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURL(t, server.URL))
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, server)},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
details, err := svc.GetProjectDetails(ctx, projectRecord.ID, projecttypes.DetailsOptions{})
require.NoError(t, err)
@@ -3633,7 +4328,6 @@ func TestProjectService_GetProjectDetails_PopulatesRuntimeServicesFromComposePs(
},
},
})
- t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURL(t, server.URL))
projectRecord := &Project{
ID: "proj-runtime-services",
@@ -3646,7 +4340,20 @@ func TestProjectService_GetProjectDetails_PopulatesRuntimeServicesFromComposePs(
}
require.NoError(t, db.Create(projectRecord).Error)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURL(t, server.URL))
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, server)},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
details, err := svc.GetProjectDetails(ctx, projectRecord.ID, projecttypes.DetailsOptions{IncludeRuntimeServices: true})
require.NoError(t, err)
@@ -3702,7 +4409,19 @@ func TestProjectService_ListProjects_FiltersByUpdateStatus(t *testing.T) {
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
imageService := image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil)
- svc := NewProjectService(db, settingsService, nil, imageService, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
updatedPath := createComposeProjectDir(t, projectsDir, "updated-demo")
require.NoError(t, os.WriteFile(filepath.Join(updatedPath, "compose.yaml"), []byte("services:\n app:\n image: nginx:latest\n"), 0o644))
@@ -3928,8 +4647,10 @@ func TestBuildDiscoveredComposeProjectUpdateRows_FallsBackToImageID(t *testing.T
assert.Equal(t, []string{"nginx:latest"}, rows[0].UpdateInfo.UpdatedImageRefs)
// The tracked-project path resolves the same record through the runtime image ID.
- service := &ProjectService{imageService: imageService}
- service.initChildren(nil, nil)
+ settingsService, settingsErr := newSettingsServiceForTest(t, ctx, db)
+ require.NoError(t, settingsErr)
+ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", t.TempDir()))
+ service := NewProjectService(db, settingsService, nil, imageService, testDockerService, testBuildBuilder{}, nil, nil, nil, nil, testRegistryCredentials)
detail := projecttypes.Details{
ID: "tracked",
RuntimeServices: []projecttypes.RuntimeService{
@@ -3942,12 +4663,12 @@ func TestBuildDiscoveredComposeProjectUpdateRows_FallsBackToImageID(t *testing.T
},
},
}
- service.enrichProjectUpdateInfo(ctx, &detail)
- require.True(t, detail.UpdateInfo.HasUpdate)
- assert.Equal(t, []string{"nginx:latest"}, detail.UpdateInfo.UpdatedImageRefs)
+ info := service.enrichProjectsWithUpdateInfo(ctx, []Project{{ID: "tracked"}}, []projecttypes.Details{detail}, true, nil)[0].UpdateInfo
+ require.True(t, info.HasUpdate)
+ assert.Equal(t, []string{"nginx:latest"}, info.UpdatedImageRefs)
detail.RuntimeServices[0].ImageID = ""
- service.enrichProjectUpdateInfo(ctx, &detail)
- require.False(t, detail.UpdateInfo.HasUpdate, "a missing runtime image ID inherits nothing")
+ info = service.enrichProjectsWithUpdateInfo(ctx, []Project{{ID: "tracked"}}, []projecttypes.Details{detail}, true, nil)[0].UpdateInfo
+ require.False(t, info.HasUpdate, "a missing runtime image ID inherits nothing")
}
func TestProjectService_ListProjects_FiltersArchivedProjects(t *testing.T) {
@@ -3978,7 +4699,19 @@ func TestProjectService_ListProjects_FiltersArchivedProjects(t *testing.T) {
ArchivedAt: new(time.Now().UTC()),
}).Error)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
items, page, err := svc.ListProjects(ctx, pagination.QueryParams{
Limit: -1,
@@ -4030,7 +4763,7 @@ func TestProjectService_ArchiveProject_RequiresStoppedProject(t *testing.T) {
Status: ProjectStatusStopped,
}).Error)
- configureProjectRuntimeDocker(t, []container.Summary{
+ server := configureProjectRuntimeDocker(t, []container.Summary{
{
ID: "app-container",
Names: []string{"/running-demo-app-1"},
@@ -4045,8 +4778,19 @@ func TestProjectService_ArchiveProject_RequiresStoppedProject(t *testing.T) {
},
},
})
-
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, server)},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
err = svc.ArchiveProject(ctx, "project-running", usertypes.Actor{ID: "user-1", Username: "tester"})
require.Error(t, err)
require.ErrorIs(t, err, common.ErrProjectMustBeStopped)
@@ -4075,9 +4819,19 @@ func TestProjectService_ArchiveProject_TogglesArchiveFlag(t *testing.T) {
Status: ProjectStatusStopped,
}).Error)
- configureProjectRuntimeDocker(t, nil)
-
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, configureProjectRuntimeDocker(t, nil))},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
user := usertypes.Actor{ID: "user-1", Username: "tester"}
require.NoError(t, svc.ArchiveProject(ctx, "project-stopped", user))
@@ -4123,7 +4877,19 @@ func TestProjectService_ArchiveProject_LiveVerificationErrorPolicy(t *testing.T)
t.Setenv("DOCKER_HOST", "tcp://127.0.0.1:1")
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
user := usertypes.Actor{ID: "user-1", Username: "tester"}
err = svc.ArchiveProject(ctx, "project-unreachable", user)
@@ -4138,18 +4904,18 @@ func TestProjectService_ArchiveProject_LiveVerificationErrorPolicy(t *testing.T)
assert.True(t, archived.IsArchived)
}
-func TestProjectService_ProjectListRows_PersistsInferredServiceCount(t *testing.T) {
+func TestProjectService_ListProjects_PersistsInferredServiceCount(t *testing.T) {
db := setupProjectTestDB(t)
+ settingsService, err := newSettingsServiceForTest(t, t.Context(), db)
+ require.NoError(t, err)
projectsDir := t.TempDir()
+ require.NoError(t, settingsService.SetStringSetting(t.Context(), "projectsDirectory", projectsDir))
projectPath := filepath.Join(projectsDir, "inferred")
require.NoError(t, os.MkdirAll(projectPath, 0o755))
inferred := Project{ID: "inferred", Name: "inferred", Path: projectPath, ServiceCount: 0}
known := Project{ID: "known", Name: "known", Path: filepath.Join(projectsDir, "known"), ServiceCount: 4}
require.NoError(t, db.Create(&inferred).Error)
require.NoError(t, db.Create(&known).Error)
- service := &ProjectService{db: db}
- service.initChildren(nil, nil)
-
containers := []container.Summary{
{ID: "c1", State: "running", Names: []string{"/inferred-web"}, Labels: map[string]string{
api.ProjectLabel: "inferred", api.ServiceLabel: "web", api.WorkingDirLabel: projectPath,
@@ -4161,10 +4927,22 @@ func TestProjectService_ProjectListRows_PersistsInferredServiceCount(t *testing.
api.ProjectLabel: "known", api.ServiceLabel: "web", api.WorkingDirLabel: known.Path,
}},
}
- service.listing = listing.New(func(context.Context) ([]container.Summary, error) { return containers, nil }, nil, nil)
- snapshot := service.listing.Snapshot(t.Context())
+ service := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, configureProjectRuntimeDocker(t, containers))},
+ testBuildBuilder{},
+ nil,
+ nil,
+ nil,
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
- rows := service.projectListRows(t.Context(), projectsDir, []Project{inferred, known}, snapshot)
+ rows, _, err := service.ListProjects(t.Context(), pagination.QueryParams{Limit: -1, Sort: "name", Order: pagination.SortAsc})
+ require.NoError(t, err)
require.Len(t, rows, 2)
require.Equal(t, 2, rows[0].ServiceCount)
require.Equal(t, 4, rows[1].ServiceCount)
@@ -4201,8 +4979,19 @@ func TestProjectService_ListProjects_WithDerivedStatusFilter_AllowsAllPageSizeSe
}).Error)
}
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
- configureProjectRuntimeDocker(t, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, configureProjectRuntimeDocker(t, nil))},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
items, page, err := svc.ListProjects(ctx, pagination.QueryParams{
Filters: map[string]string{
@@ -4241,7 +5030,19 @@ func TestProjectService_DeployProject_StopsOnBuildPreparationError(t *testing.T)
require.NoError(t, db.Create(proj).Error)
buildSvc := testBuildBuilder{err: errors.New("boom build")}
- svc := NewProjectService(db, settingsService, nil, nil, nil, buildSvc, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ buildSvc,
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
err = svc.DeployProject(ctx, "p1", usertypes.Actor{ID: "u1", Username: "tester"}, nil)
require.Error(t, err)
@@ -4278,7 +5079,19 @@ func TestProjectService_DeployProject_BuildsGeneratedImageWithoutPull(t *testing
require.NoError(t, db.Create(proj).Error)
buildSvc := testBuildBuilder{err: errors.New("boom build")}
- svc := NewProjectService(db, settingsService, nil, nil, nil, buildSvc, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ buildSvc,
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
err = svc.DeployProject(ctx, proj.ID, usertypes.Actor{ID: "u1", Username: "tester"}, nil)
require.Error(t, err)
@@ -4304,7 +5117,19 @@ func TestProjectService_SyncProjectsFromFileSystem_IgnoresSymlinkedProjectDirsWh
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
require.NoError(t, settingsService.SetStringSetting(ctx, "followProjectSymlinks", "false"))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4330,7 +5155,19 @@ func TestProjectService_SyncProjectsFromFileSystem_DetectsSymlinkedProjectDirsWh
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
require.NoError(t, settingsService.SetStringSetting(ctx, "followProjectSymlinks", "true"))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4353,7 +5190,19 @@ func TestProjectService_SyncProjectsFromFileSystem_DiscoversNestedProjectsAndRel
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, page, err := svc.ListProjects(ctx, pagination.QueryParams{
@@ -4387,7 +5236,19 @@ func TestProjectService_SyncProjectsFromFileSystem_RespectsConfiguredScanMaxDept
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
t.Setenv("PROJECT_SCAN_MAX_DEPTH", "1")
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4434,7 +5295,19 @@ services:
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, page, err := svc.ListProjects(ctx, pagination.QueryParams{
@@ -4460,7 +5333,19 @@ func TestProjectService_SyncProjectsFromFileSystem_RemovesDeletedNestedProject(t
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4500,7 +5385,19 @@ func TestProjectService_SyncProjectsFromFileSystem_PrunesLeakedScratchRow(t *tes
Path: scratchPath,
}).Error)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4536,7 +5433,19 @@ func TestProjectService_SyncProjectsFromFileSystem_PreservesProjectsWhenDirector
}).Error)
}
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4556,7 +5465,19 @@ func TestProjectService_SyncProjectsFromFileSystem_PreservesProjectWithAmbiguous
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4595,7 +5516,19 @@ func TestProjectService_SyncProjectsFromFileSystem_RemovesProjectsBeyondReducedS
// Initial sync at the default scan depth discovers both the top-level and
// the nested project, persisting them to the database.
- defaultSvc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ defaultSvc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, defaultSvc.SyncProjectsFromFileSystem(ctx))
items, err := defaultSvc.ListAllProjects(ctx)
@@ -4605,7 +5538,19 @@ func TestProjectService_SyncProjectsFromFileSystem_RemovesProjectsBeyondReducedS
// Lowering the scan depth must prune the nested project from the database on
// the next sync, even though its compose file still exists on disk.
t.Setenv("PROJECT_SCAN_MAX_DEPTH", "1")
- depthLimitedSvc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ depthLimitedSvc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, depthLimitedSvc.SyncProjectsFromFileSystem(ctx))
items, err = depthLimitedSvc.ListAllProjects(ctx)
@@ -4638,7 +5583,19 @@ func TestProjectService_SyncProjectsFromFileSystem_PreservesDBRecordsWhenDirecto
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
before, err := svc.ListAllProjects(ctx)
@@ -4703,7 +5660,19 @@ func TestProjectService_SyncProjectsFromFileSystem_DiscoversReadableProjectsDesp
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx), "sync must succeed despite the unreadable nested directory")
after, err := svc.ListAllProjects(ctx)
@@ -4739,7 +5708,19 @@ func TestProjectService_SyncProjectsFromFileSystem_AllowsDuplicateLeafDirectorie
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
var items []Project
@@ -4770,7 +5751,19 @@ func TestProjectService_SyncProjectsFromFileSystem_DetectsNestedSymlinkedProject
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
require.NoError(t, settingsService.SetStringSetting(ctx, "followProjectSymlinks", "true"))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, page, err := svc.ListProjects(ctx, pagination.QueryParams{
@@ -4801,7 +5794,19 @@ func TestProjectService_SyncProjectsFromFileSystem_RemovesSymlinkedProjectsWhenD
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
require.NoError(t, settingsService.SetStringSetting(ctx, "followProjectSymlinks", "true"))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4831,7 +5836,19 @@ func TestProjectService_SyncProjectsFromFileSystem_RefreshesServiceCountOnCompos
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
var project Project
@@ -4863,7 +5880,19 @@ services:
image: nginx:alpine
`), 0o644))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
var project Project
@@ -4896,7 +5925,19 @@ func TestProjectService_SyncProjectsFromFileSystem_PreservesValidCustomNameWitho
}
require.NoError(t, db.Create(project).Error)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
var fromDB Project
@@ -4946,7 +5987,19 @@ func TestProjectService_SyncProjectsFromFileSystem_PreservesGitOpsProjectWithCus
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))
items, err := svc.ListAllProjects(ctx)
@@ -4996,7 +6049,19 @@ func TestProjectService_GetProjectDetails_UsesGitOpsCustomComposeFilename(t *tes
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
composeFromContent, envFromContent, _, err := svc.projectContent(ctx, syncProjectID)
require.NoError(t, err)
@@ -5028,7 +6093,19 @@ func TestProjectService_UpdateProject_WritesThroughSymlinkedProjectPath(t *testi
require.NoError(t, settingsService.SetStringSetting(ctx, "followProjectSymlinks", "true"))
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
project := &Project{
ID: "proj-symlink-update",
@@ -5083,7 +6160,19 @@ func TestProjectService_UpdateProject_WritesThroughExternalEnvSymlink(t *testing
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "demo"
project := &Project{
ID: "proj-external-env-symlink-update",
@@ -5142,7 +6231,19 @@ func TestProjectService_UpdateProject_RestoresExternalEnvSymlinkTargetWhenProjec
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "demo"
project := &Project{
ID: "proj-external-env-symlink-rollback",
@@ -5154,7 +6255,7 @@ func TestProjectService_UpdateProject_RestoresExternalEnvSymlinkTargetWhenProjec
require.NoError(t, db.Create(project).Error)
require.NoError(t, db.Callback().Update().Before("gorm:update").Register("arcane_test_external_env_project_save_failure", func(tx *gorm.DB) {
- if tx.Statement != nil && tx.Statement.Schema != nil && tx.Statement.Schema.Name == "Project" {
+ if tx.Statement.Schema != nil && tx.Statement.Schema.Name == "Project" {
_ = tx.AddError(errors.New("forced project save failure"))
}
}))
@@ -5193,11 +6294,12 @@ func createComposeProjectDir(t *testing.T, root, name string) string {
return projectPath
}
-func configureProjectRuntimeDocker(t *testing.T, containers []container.Summary) {
+func configureProjectRuntimeDocker(t *testing.T, containers []container.Summary) *httptest.Server {
t.Helper()
server := newProjectRuntimeDockerServer(t, containers)
t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURL(t, server.URL))
+ return server
}
func projectUpdatePreviewDirs(t *testing.T, projectsDir string) []string {
@@ -5265,12 +6367,12 @@ func TestResolveRemoveOrphans(t *testing.T) {
options *projecttypes.DeployOptions
want bool
}{
- {"non-gitops, nil options", false, nil, false},
- {"non-gitops, flag false", false, &projecttypes.DeployOptions{RemoveOrphans: false}, false},
- {"non-gitops, flag true opts in", false, &projecttypes.DeployOptions{RemoveOrphans: true}, true},
- {"gitops, nil options stays true", true, nil, true},
- {"gitops, flag false stays true", true, &projecttypes.DeployOptions{RemoveOrphans: false}, true},
- {"gitops, flag true stays true", true, &projecttypes.DeployOptions{RemoveOrphans: true}, true},
+ {name: "non-gitops, nil options", gitOpsManaged: false, options: nil, want: false},
+ {name: "non-gitops, flag false", gitOpsManaged: false, options: &projecttypes.DeployOptions{RemoveOrphans: false}, want: false},
+ {name: "non-gitops, flag true opts in", gitOpsManaged: false, options: &projecttypes.DeployOptions{RemoveOrphans: true}, want: true},
+ {name: "gitops, nil options stays true", gitOpsManaged: true, options: nil, want: true},
+ {name: "gitops, flag false stays true", gitOpsManaged: true, options: &projecttypes.DeployOptions{RemoveOrphans: false}, want: true},
+ {name: "gitops, flag true stays true", gitOpsManaged: true, options: &projecttypes.DeployOptions{RemoveOrphans: true}, want: true},
}
for _, tt := range tests {
@@ -5303,7 +6405,19 @@ func TestProjectService_RecoverProjectRenameJournals_RollsBackUncommittedDirecto
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5357,7 +6471,19 @@ func TestProjectService_RecoverProjectRenameJournals_StartedPhaseSkipsVolumeRoll
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5420,7 +6546,19 @@ func TestProjectService_RecoverProjectRenameJournals_RelocatesTargetWhenBothPath
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5456,7 +6594,7 @@ func TestProjectService_RecoverProjectRenameJournals_RelocatesTargetWhenBothPath
require.Equal(t, oldDir, *fromDB.DirName)
newName := "web"
- require.NoError(t, svc.applyProjectRename(t.Context(), &fromDB, newName, projectsDir))
+ require.NoError(t, svc.applyProjectUpdate(t.Context(), &fromDB, newName, projectsDir, nil, nil, nil, nil, nil))
require.Equal(t, "web", fromDB.Name)
require.Equal(t, newPath, fromDB.Path)
require.DirExists(t, newPath)
@@ -5483,7 +6621,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsStartedJournalWhenDir
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5548,7 +6698,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsPreservedTargetJourna
t.Cleanup(server.Close)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, &docker.DockerClientService{Client: newTestDockerClient(t, server)}, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, server)},
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5601,7 +6763,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsCommittedJournal(t *t
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5641,7 +6815,19 @@ func TestProjectService_FinalizeProjectRenameAfterCommit_ClearsJournalAfterSourc
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := &projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5682,7 +6868,19 @@ func TestProjectService_FinalizeProjectRenameAfterCommit_KeepsJournalWhenSourceC
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := &projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5767,7 +6965,19 @@ func TestProjectService_RecoverProjectRenameJournals_KeepsJournalWhenDirectoryRo
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5861,7 +7071,19 @@ func TestProjectService_RecoverProjectRenameJournals_CompletesCommittedVolumeJou
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -5934,7 +7156,19 @@ func TestProjectService_RecoverProjectRenameJournals_RollsBackCommittedJournalWh
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6044,7 +7278,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsJournalAfterDBRestore
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6121,7 +7367,19 @@ func TestProjectService_RecoverProjectRenameJournals_KeepsRollbackCleanupWhenDoc
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
cleanup := projecttypes.RenameRollbackCleanup{
ProjectID: project.ID,
OldName: "nginx",
@@ -6142,7 +7400,7 @@ func TestProjectService_RecoverProjectRenameJournals_KeepsRollbackCleanupWhenDoc
err = svc.RecoverProjectRenameJournals(ctx)
require.Error(t, err)
- require.ErrorContains(t, err, "docker service unavailable")
+ require.ErrorContains(t, err, "inspect source cleanup volume nginx_data")
_, ok, err := kvService.Get(ctx, projecttypes.RenameRollbackCleanupKeyPrefix+project.ID)
require.NoError(t, err)
@@ -6184,7 +7442,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsCommittedJournalWhenS
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6270,7 +7540,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsCommittedJournalAndCl
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6353,7 +7635,19 @@ func TestProjectService_RecoverProjectRenameJournals_MarksSourceCleanupPendingWh
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6438,7 +7732,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsSourceCleanupPendingJ
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6537,7 +7843,19 @@ func TestProjectService_RecoverProjectRenameJournals_RollsBackSourceCleanupPendi
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6627,7 +7945,19 @@ func TestProjectService_RecoverProjectRenameJournals_KeepsSourceCleanupPendingJo
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6693,7 +8023,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsStartedJournalWhenDir
require.NoError(t, db.Create(project).Error)
kvService := kv.NewKVService(db)
- svc := NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6763,7 +8105,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsMissingPathJournalWhe
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6837,7 +8191,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsJournalWhenRollbackSo
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -6916,7 +8282,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsJournalWhenRollbackTa
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -7001,7 +8379,19 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsJournalWhenTargetPres
kvService := kv.NewKVService(db)
dockerService := &docker.DockerClientService{Client: newTestDockerClient(t, server)}
- svc := NewProjectService(db, nil, nil, nil, dockerService, nil, nil, nil, config.Load(), kvService, nil)
+ svc := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ dockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kvService,
+ testRegistryCredentials,
+ )
journal := projecttypes.RenameJournal{
ProjectID: project.ID,
OldName: "nginx",
@@ -7038,8 +8428,7 @@ func TestProjectPathMapperUsesCurrentSettings(t *testing.T) {
db := setupProjectTestDB(t)
settingsService, err := newSettingsServiceForTest(t, t.Context(), db)
require.NoError(t, err)
- service := &ProjectService{settingsService: settingsService}
- service.initChildren(nil, nil)
+ service := NewProjectService(nil, settingsService, nil, nil, testDockerService, testBuildBuilder{}, nil, nil, nil, nil, testRegistryCredentials)
containerDir := t.TempDir()
for _, hostDir := range []string{t.TempDir(), t.TempDir()} {
require.NoError(t, settingsService.SetStringSetting(t.Context(), "projectsDirectory", containerDir+":"+hostDir))
@@ -7109,15 +8498,15 @@ func TestPrepareProjectServiceImages(t *testing.T) {
func TestPrepareProjectServiceImagesRejectsUnsupportedSource(t *testing.T) {
for _, tt := range []struct{ name, source, expected string }{
- {"stale effective image", "services:\n web:\n image: app:1.2.0\n", "app:1.1.0"},
- {"stale source image", "services:\n web:\n image: app:1.1.0\n", "app:1.2.0"},
- {"included source", "include: other.yaml\nservices:\n web:\n image: app:1.2.0\n", "app:1.2.0"},
- {"extended service", "services:\n web:\n image: app:1.2.0\n extends: base\n", "app:1.2.0"},
- {"image alias", "x-image: &image app:1.2.0\nservices:\n web:\n image: *image\n", "app:1.2.0"},
- {"missing image", "services:\n web:\n build: .\n", "app:1.2.0"},
- {"multiple documents", "services:\n web:\n image: app:1.2.0\n---\nservices: {}\n", "app:1.2.0"},
- {"literal block image", "services:\n web:\n image: |\n app:1.2.0\n", "app:1.2.0"},
- {"multi-line plain image", "services:\n web:\n image: app:${VERSION}\n tail\n", "app:1.2.0"},
+ {name: "stale effective image", source: "services:\n web:\n image: app:1.2.0\n", expected: "app:1.1.0"},
+ {name: "stale source image", source: "services:\n web:\n image: app:1.1.0\n", expected: "app:1.2.0"},
+ {name: "included source", source: "include: other.yaml\nservices:\n web:\n image: app:1.2.0\n", expected: "app:1.2.0"},
+ {name: "extended service", source: "services:\n web:\n image: app:1.2.0\n extends: base\n", expected: "app:1.2.0"},
+ {name: "image alias", source: "x-image: &image app:1.2.0\nservices:\n web:\n image: *image\n", expected: "app:1.2.0"},
+ {name: "missing image", source: "services:\n web:\n build: .\n", expected: "app:1.2.0"},
+ {name: "multiple documents", source: "services:\n web:\n image: app:1.2.0\n---\nservices: {}\n", expected: "app:1.2.0"},
+ {name: "literal block image", source: "services:\n web:\n image: |\n app:1.2.0\n", expected: "app:1.2.0"},
+ {name: "multi-line plain image", source: "services:\n web:\n image: app:${VERSION}\n tail\n", expected: "app:1.2.0"},
} {
t.Run(tt.name, func(t *testing.T) {
effective := &types.Project{Services: types.Services{"web": {Image: "app:1.2.0"}}}
@@ -7166,15 +8555,27 @@ func TestUpdateProjectServiceImagesRejectsManagedOrArchived(t *testing.T) {
for _, name := range []string{"archived", "gitops"} {
t.Run(name, func(t *testing.T) {
db := setupProjectTestDB(t)
- proj := Project{ID: "image-update", Name: "image-update", Path: t.TempDir()}
- if name == "archived" {
- proj.IsArchived = true
- } else {
- proj.GitOpsManagedBy = new("sync")
+ proj := Project{
+ ID: "image-update",
+ Name: "image-update",
+ Path: t.TempDir(),
+ GitOpsManagedBy: kit.Ternary(name == "archived", nil, new("sync")),
+ IsArchived: name == "archived",
}
require.NoError(t, db.Create(&proj).Error)
- service := &ProjectService{db: db}
- service.initChildren(nil, nil)
+ service := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ nil,
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
err := service.UpdateProjectServiceImages(t.Context(), proj.ID, map[string]updatertypes.ServiceImageChange{"web": {ExpectedRef: "app:1.0.0", TargetRef: "app:1.1.0"}}, usertypes.Actor{})
require.Error(t, err)
if name == "archived" {
@@ -7186,17 +8587,6 @@ func TestUpdateProjectServiceImagesRejectsManagedOrArchived(t *testing.T) {
}
}
-type serviceImageCoordinator struct {
- projecttypes.ComposeCoordinator
- requests []projecttypes.ComposeServiceUpdate
- err error
-}
-
-func (c *serviceImageCoordinator) UpdateServices(_ context.Context, request projecttypes.ComposeServiceUpdate) error {
- c.requests = append(c.requests, request)
- return c.err
-}
-
func TestUpdateProjectServiceImagesPersistsBeforeDeploymentAndRetries(t *testing.T) {
ctx := t.Context()
db := setupProjectTestDB(t)
@@ -7213,9 +8603,34 @@ func TestUpdateProjectServiceImagesPersistsBeforeDeploymentAndRetries(t *testing
proj := &Project{ID: "image-tags", Name: "image-tags", Path: projectPath, Status: ProjectStatusRunning}
require.NoError(t, db.Create(proj).Error)
deploymentError := errors.New("deployment failed after source persistence")
- coordinator := &serviceImageCoordinator{err: deploymentError}
- service := &ProjectService{db: db, settingsService: settingsService, eventService: event.NewEventService(db, nil, nil), composeCoordinator: coordinator}
- service.initChildren(nil, nil)
+ originalComposeStop := composeStopProjectServices
+ originalComposeUp := composeUpProjectServices
+ t.Cleanup(func() {
+ composeStopProjectServices = originalComposeStop
+ composeUpProjectServices = originalComposeUp
+ })
+ var deployed []*types.Project
+ var scopes [][]string
+ composeStopProjectServices = func(context.Context, *types.Project, []string) error { return nil }
+ composeUpProjectServices = func(_ context.Context, selected *types.Project, services []string, _, _, _ bool, _ map[string]dockerregistry.AuthConfig, _ time.Duration) error {
+ deployed = append(deployed, selected)
+ scopes = append(scopes, services)
+ return deploymentError
+ }
+ pullDocker := &docker.DockerClientService{Client: newTestDockerClient(t, newImagePullServerWithObserver(t, nil, nil))}
+ service := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, pullDocker, nil, imageupdate.NewImageUpdateService(db, nil, nil, pullDocker, nil, nil, nil), nil, event.NewEventService(db, nil, nil), nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ nil,
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
changes := map[string]updatertypes.ServiceImageChange{"app": {ExpectedRef: "app:1.2.0", TargetRef: "app:1.3.0"}}
for range 2 {
updateProjectServiceImagesErr := service.UpdateProjectServiceImages(ctx, proj.ID, changes, usertypes.SystemUser)
@@ -7227,10 +8642,9 @@ func TestUpdateProjectServiceImagesPersistsBeforeDeploymentAndRetries(t *testing
require.NoError(t, statComposeErr)
require.Equal(t, os.FileMode(0o600), mode.Mode().Perm())
}
- require.Len(t, coordinator.requests, 2)
- for _, request := range coordinator.requests {
- require.Equal(t, []string{"app"}, request.Services)
- require.Equal(t, "app:1.3.0", request.Project.Services["app"].Image)
+ require.Equal(t, [][]string{{"app"}, {"app"}}, scopes)
+ for _, selected := range deployed {
+ require.Equal(t, "app:1.3.0", selected.Services["app"].Image)
}
env, err := os.ReadFile(filepath.Join(projectPath, ".env"))
require.NoError(t, err)
@@ -7252,8 +8666,19 @@ func TestUpdateProjectServiceImagesRejectsOverrideBeforeWriting(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.override.yaml"), override, 0o600))
proj := &Project{ID: "image-overrides", Name: "image-overrides", Path: projectPath}
require.NoError(t, db.Create(proj).Error)
- service := &ProjectService{db: db, settingsService: settingsService}
- service.initChildren(nil, nil)
+ service := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ nil,
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
err = service.UpdateProjectServiceImages(ctx, proj.ID, map[string]updatertypes.ServiceImageChange{"app": {ExpectedRef: "app:1.2.0", TargetRef: "app:1.3.0"}}, usertypes.SystemUser)
require.ErrorContains(t, err, "overrides")
content, err := os.ReadFile(filepath.Join(projectPath, "compose.yaml"))
@@ -7317,18 +8742,32 @@ func TestDiscoveredProjectTagUpdatesRemainScoped(t *testing.T) {
require.Equal(t, "first-project", rows[0].Name)
require.True(t, rows[0].UpdateInfo.HasUpdate)
require.Equal(t, target, rows[0].UpdateInfo.UpdateInfoByRef["example:3.1.0"].LatestVersion)
- service := &ProjectService{imageService: image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil)}
- service.initChildren(nil, nil)
+ settingsService, err := newSettingsServiceForTest(t, t.Context(), db)
+ require.NoError(t, err)
+ require.NoError(t, settingsService.SetStringSetting(t.Context(), "projectsDirectory", t.TempDir()))
+ service := NewProjectService(
+ db,
+ settingsService,
+ nil,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ nil,
+ nil,
+ testRegistryCredentials,
+ )
detail := projecttypes.Details{ID: "tracked", RuntimeServices: []projecttypes.RuntimeService{{ContainerID: "first", Image: "example:3.1.0", ContainerLabels: tagLabels}}}
- service.enrichProjectUpdateInfo(t.Context(), &detail)
- require.True(t, detail.UpdateInfo.HasUpdate)
- require.Equal(t, target, detail.UpdateInfo.UpdateInfoByRef["example:3.1.0"].LatestVersion)
+ info := service.enrichProjectsWithUpdateInfo(t.Context(), []Project{{ID: "tracked"}}, []projecttypes.Details{detail}, true, nil)[0].UpdateInfo
+ require.True(t, info.HasUpdate)
+ require.Equal(t, target, info.UpdateInfoByRef["example:3.1.0"].LatestVersion)
delete(containers[1].Labels, labels.LabelUpdateStrategy)
rows = discoveryListingForTest(imageSvc).DiscoveredUpdateRows(t.Context(), containers, nil, "")
require.Empty(t, rows, "removing the strategy label falls back to digest checks")
detail.RuntimeServices[0].ContainerLabels = containers[1].Labels
- service.enrichProjectUpdateInfo(t.Context(), &detail)
- require.False(t, detail.UpdateInfo.HasUpdate, "an undeclared strategy no longer inherits a tag record")
+ info = service.enrichProjectsWithUpdateInfo(t.Context(), []Project{{ID: "tracked"}}, []projecttypes.Details{detail}, true, nil)[0].UpdateInfo
+ require.False(t, info.HasUpdate, "an undeclared strategy no longer inherits a tag record")
// Turning off automatic installation keeps the check current (#3532).
containers[1].Labels = map[string]string{labels.LabelUpdateStrategy: "tag", labels.LabelUpdater: "off", "com.docker.compose.project": "first-project", "com.docker.compose.service": "web"}
rows = discoveryListingForTest(imageSvc).DiscoveredUpdateRows(t.Context(), containers, nil, "")
@@ -7356,8 +8795,8 @@ func TestDiscoveredProjectTagUpdatesRemainScoped(t *testing.T) {
rows = discoveryListingForTest(imageSvc).DiscoveredUpdateRows(t.Context(), containers, nil, "")
require.Empty(t, rows, "stale records must not mark discovered projects updated")
detail.RuntimeServices[0].ContainerLabels = current
- service.enrichProjectUpdateInfo(t.Context(), &detail)
- require.False(t, detail.UpdateInfo.HasUpdate, "runtime fallback must not apply a stale policy")
+ info = service.enrichProjectsWithUpdateInfo(t.Context(), []Project{{ID: "tracked"}}, []projecttypes.Details{detail}, true, nil)[0].UpdateInfo
+ require.False(t, info.HasUpdate, "runtime fallback must not apply a stale policy")
}
}
@@ -7429,8 +8868,19 @@ func TestCountProjectsWithPendingTagUpdatesUsesRuntimeContainers(t *testing.T) {
},
).Error,
)
- service := &ProjectService{db: db, settingsService: settingsService, imageService: image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil)}
- service.initChildren(nil, nil)
+ service := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ nil,
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
containers := []container.Summary{
{
ID: "first-container",
@@ -7539,19 +8989,43 @@ func TestProjectServiceManualUpdateDiscoversTags(t *testing.T) {
proj := &Project{ID: "manual-tag", Name: "manual-tag", Path: path, Status: ProjectStatusRunning}
require.NoError(t, db.Create(proj).Error)
deploymentError := errors.New("deployment reached")
- coordinator := &serviceImageCoordinator{err: deploymentError}
+ originalComposeStop := composeStopProjectServices
+ originalComposeUp := composeUpProjectServices
+ t.Cleanup(func() {
+ composeStopProjectServices = originalComposeStop
+ composeUpProjectServices = originalComposeUp
+ })
+ var deployed []*types.Project
+ var scopes [][]string
+ composeStopProjectServices = func(context.Context, *types.Project, []string) error { return nil }
+ composeUpProjectServices = func(_ context.Context, selected *types.Project, services []string, _, _, _ bool, _ map[string]dockerregistry.AuthConfig, _ time.Duration) error {
+ deployed = append(deployed, selected)
+ scopes = append(scopes, services)
+ return deploymentError
+ }
+ pullDocker := &docker.DockerClientService{Client: newTestDockerClient(t, newImagePullServerWithObserver(t, nil, nil))}
transport := &serviceTagTransport{tags: tt.tags}
registryService := registry.NewContainerRegistryService(db, nil, nil, nil, &http.Client{Transport: transport})
- service := &ProjectService{db: db, settingsService: settingsService, eventService: event.NewEventService(db, nil, nil), composeCoordinator: coordinator, containerRegistryService: registryService}
- service.initChildren(nil, nil)
+ service := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, pullDocker, nil, imageupdate.NewImageUpdateService(db, nil, nil, pullDocker, nil, nil, nil), nil, event.NewEventService(db, nil, nil), nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ registryService,
+ nil,
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
err = service.UpdateProjectServices(ctx, proj.ID, []string{"app", "selected-digest"}, usertypes.SystemUser, !tt.skipDiscovery)
require.ErrorIs(t, err, deploymentError)
require.Equal(t, tt.wantCalls, transport.calls)
- require.Len(t, coordinator.requests, 1)
- request := coordinator.requests[0]
- require.ElementsMatch(t, []string{"app", "selected-digest"}, request.Project.ServiceNames())
- require.Equal(t, tt.wantRef, request.Project.Services["app"].Image)
- require.Equal(t, "busybox:latest", request.Project.Services["selected-digest"].Image)
+ require.Len(t, deployed, 1)
+ require.ElementsMatch(t, []string{"app", "selected-digest"}, deployed[0].ServiceNames())
+ require.Equal(t, tt.wantRef, deployed[0].Services["app"].Image)
+ require.Equal(t, "busybox:latest", deployed[0].Services["selected-digest"].Image)
content, err := os.ReadFile(filepath.Join(path, "compose.yaml"))
require.NoError(t, err)
if tt.wantChanged {
@@ -7576,8 +9050,7 @@ func TestProjectServiceManualUpdateRejectsUnsafeTagPolicies(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
serviceConfig := types.ServiceConfig{Image: "app:1.2.0", Labels: types.Labels{labels.LabelUpdateStrategy: "tag"}}
tt.change(&serviceConfig)
- service := &ProjectService{}
- service.initChildren(nil, nil)
+ service := NewProjectService(nil, nil, nil, nil, testDockerService, testBuildBuilder{}, nil, nil, nil, nil, testRegistryCredentials)
changes, err := service.updates.ImageChanges(t.Context(), &types.Project{Services: types.Services{"app": serviceConfig}}, false)
require.Error(t, err)
require.NotContains(t, err.Error(), "registry service unavailable")
@@ -7585,8 +9058,7 @@ func TestProjectServiceManualUpdateRejectsUnsafeTagPolicies(t *testing.T) {
})
}
local := types.ServiceConfig{Name: "app", Image: "app:1.2.0", Build: &types.BuildConfig{Context: "."}}
- emptyService := &ProjectService{}
- emptyService.initChildren(nil, nil)
+ emptyService := NewProjectService(nil, nil, nil, nil, testDockerService, testBuildBuilder{}, nil, nil, nil, nil, testRegistryCredentials)
changes, err := emptyService.updates.ImageChanges(t.Context(), &types.Project{Services: types.Services{"app": local}}, false)
require.NoError(t, err)
require.Empty(t, changes, "automatic inference must preserve local-build handling")
@@ -7647,13 +9119,25 @@ func TestStoppedProjectTagPolicyNeverInheritsSharedDigestCheck(t *testing.T) {
require.NoError(t, db.Create(projectRecord).Error)
require.NoError(t, db.Create(&imageupdate.ImageUpdateRecord{ID: "shared-digest", Repository: "docker.io/library/nginx", Tag: "3.1.0", UpdateType: "digest", CheckTime: time.Now()}).Error)
imageService := image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil)
- service := NewProjectService(db, settingsService, nil, imageService, nil, nil, nil, nil, config.Load(), nil, nil)
+ service := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ imageService,
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
detail, err := service.GetProjectDetails(t.Context(), projectRecord.ID, projecttypes.AllDetails())
require.NoError(t, err)
require.Equal(t, "unknown", detail.UpdateInfo.Status)
require.Nil(t, detail.UpdateInfo.ServiceUpdates["app"].UpdateInfo)
list := []projecttypes.Details{{ID: projectRecord.ID}}
- service.enrichProjectsWithUpdateInfo(t.Context(), []Project{*projectRecord}, list, true, nil)
+ list = service.enrichProjectsWithUpdateInfo(t.Context(), []Project{*projectRecord}, list, true, nil)
require.Equal(t, "unknown", list[0].UpdateInfo.Status)
require.Nil(t, list[0].UpdateInfo.ServiceUpdates["app"].UpdateInfo)
target := "3.2.0"
@@ -7680,7 +9164,7 @@ func TestStoppedProjectTagPolicyNeverInheritsSharedDigestCheck(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "has_update", detail.UpdateInfo.Status)
require.Equal(t, target, detail.UpdateInfo.ServiceUpdates["app"].UpdateInfo.LatestVersion)
- service.enrichProjectsWithUpdateInfo(t.Context(), []Project{*projectRecord}, list, true, nil)
+ list = service.enrichProjectsWithUpdateInfo(t.Context(), []Project{*projectRecord}, list, true, nil)
require.Equal(t, "has_update", list[0].UpdateInfo.Status)
count, err := service.CountProjectsWithPendingUpdates(t.Context(), []container.Summary{})
require.NoError(t, err)
@@ -7707,10 +9191,8 @@ func TestConfiguredProjectUsesScheduledRuntimeChecks(t *testing.T) {
require.NoError(t, err)
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", directory))
path := createComposeProjectDir(t, directory, "scheduled-project")
- sourceLabels := types.Labels{labels.LabelUpdateStrategy: "auto"}
source := "services:\n web:\n image: " + tt.sourceRef + "\n labels:\n com.getarcaneapp.arcane.updater.strategy: auto\n"
if tt.sourceConstraint != "" {
- sourceLabels[labels.LabelUpdateConstraint] = tt.sourceConstraint
source += " com.getarcaneapp.arcane.updater.constraint: " + tt.sourceConstraint + "\n"
}
require.NoError(t, os.WriteFile(filepath.Join(path, "compose.yaml"), []byte(source), 0o600))
@@ -7722,7 +9204,7 @@ func TestConfiguredProjectUsesScheduledRuntimeChecks(t *testing.T) {
db.Create(
&imageupdate.ImageUpdateRecord{
ID: "container::scheduled",
- ContainerID: "scheduled",
+ ContainerID: "scheduled-container",
ImageID: "shared",
PolicyKey: imageref.UpdatePolicyKey(
"example:3.1.0",
@@ -7739,23 +9221,42 @@ func TestConfiguredProjectUsesScheduledRuntimeChecks(t *testing.T) {
},
).Error,
)
- runtimeLabels := map[string]string{"com.docker.compose.project": "scheduled-project", "com.docker.compose.service": "web", labels.LabelUpdateStrategy: "auto"}
+ runtimeLabels := map[string]string{
+ "com.docker.compose.project": "scheduled-project",
+ "com.docker.compose.service": "web",
+ api.WorkingDirLabel: path,
+ labels.LabelUpdateStrategy: "auto",
+ }
runtimeLabels[labels.LabelUpdateConstraint] = cmp.Or(tt.runtimeConstraint, runtimeLabels[labels.LabelUpdateConstraint])
- runtimeServices := []projecttypes.RuntimeService{{Name: "web", ContainerID: "scheduled", Image: "example:3.1.0", ContainerLabels: runtimeLabels}}
- service := &ProjectService{db: db, settingsService: settingsService, imageService: image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil)}
- service.initChildren(nil, nil)
- detail := projecttypes.Details{ID: proj.ID, Services: []types.ServiceConfig{{Name: "web", Image: tt.sourceRef, Labels: sourceLabels}}, RuntimeServices: runtimeServices}
- service.enrichProjectUpdateInfo(ctx, &detail)
- require.Equal(t, tt.wantUpdate, detail.UpdateInfo.HasUpdate)
+ runtimeServices := []projecttypes.RuntimeService{{Name: "web", ContainerID: "scheduled-container", Image: "example:3.1.0", ContainerLabels: runtimeLabels}}
+ service := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ &docker.DockerClientService{Client: newTestDockerClient(t, configureProjectRuntimeDocker(t, []container.Summary{
+ {ID: "scheduled-container", Names: []string{"/scheduled-project-web-1"}, Image: "example:3.1.0", State: container.StateRunning, Labels: runtimeLabels},
+ }))},
+ testBuildBuilder{},
+ nil,
+ nil,
+ nil,
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
+ detail, err := service.GetProjectDetails(ctx, proj.ID, projecttypes.AllDetails())
+ require.NoError(t, err)
+ info := detail.UpdateInfo
+ require.Equal(t, tt.wantUpdate, info.HasUpdate)
list := []projecttypes.Details{{ID: proj.ID, RuntimeServices: runtimeServices}}
- service.enrichProjectsWithUpdateInfo(ctx, []Project{proj}, list, true, nil)
+ list = service.enrichProjectsWithUpdateInfo(ctx, []Project{proj}, list, true, nil)
require.Equal(t, tt.wantUpdate, list[0].UpdateInfo.HasUpdate)
- for _, info := range []*projecttypes.UpdateInfo{detail.UpdateInfo, list[0].UpdateInfo} {
+ for _, summary := range []*projecttypes.UpdateInfo{info, list[0].UpdateInfo} {
if tt.wantUpdate {
- require.Equal(t, target, info.ServiceUpdates["web"].UpdateInfo.LatestVersion)
+ require.Equal(t, target, summary.ServiceUpdates["web"].UpdateInfo.LatestVersion)
} else {
- require.Nil(t, info.ServiceUpdates["web"].UpdateInfo)
- require.Equal(t, "unknown", info.Status)
+ require.Nil(t, summary.ServiceUpdates["web"].UpdateInfo)
+ require.Equal(t, "unknown", summary.Status)
}
}
})
@@ -7846,8 +9347,7 @@ func TestPrepareProjectBindDirectories(t *testing.T) {
existingDir := filepath.Join(projectPath, "data")
require.NoError(t, os.Mkdir(existingDir, 0o700))
- noCreate := bind(filepath.Join(projectPath, "manual"))
- noCreate.Bind.CreateHostPath = false
+ noCreate := types.ServiceVolumeConfig{Type: types.VolumeTypeBind, Source: filepath.Join(projectPath, "manual"), Target: "/t", Bind: &types.ServiceVolumeBind{CreateHostPath: false}}
project := newProject(
bind(filepath.Join(projectPath, "caddy", "conf")),
types.ServiceVolumeConfig{Type: types.VolumeTypeBind, Source: filepath.Join(projectPath, "plain"), Target: "/p"},
@@ -7940,7 +9440,19 @@ func TestProjectService_ApplyGitSyncProjectFiles_TolerantOfPermissionLockedEnv(t
require.NoError(t, err)
eventService := event.NewEventService(db, nil, nil)
- svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ eventService,
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
dirName := "git-sync-locked-env"
projectPath := filepath.Join(projectsDir, dirName)
@@ -8076,7 +9588,19 @@ func newEnvDirectoryProject(t *testing.T, id string) (*ProjectService, *Project,
require.NoError(t, err)
require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
- svc := NewProjectService(db, settingsService, event.NewEventService(db, nil, nil), nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
projectPath := createComposeProjectDir(t, projectsDir, id)
envDir := filepath.Join(projectPath, ".env")
@@ -8203,7 +9727,7 @@ func TestComposeFile(t *testing.T) {
}{
{
name: "caches success",
- env: &projectMetadataEnv{},
+ env: &projectMetadataEnv{composeFiles: map[string]string{}},
projectID: "p1",
results: []error{nil},
calls: []call{
@@ -8213,7 +9737,7 @@ func TestComposeFile(t *testing.T) {
},
{
name: "retries after failure then caches success",
- env: &projectMetadataEnv{},
+ env: &projectMetadataEnv{composeFiles: map[string]string{}},
projectID: "p1",
results: []error{transient, nil},
calls: []call{
@@ -8224,7 +9748,7 @@ func TestComposeFile(t *testing.T) {
},
{
name: "repeated failures are never memoized",
- env: &projectMetadataEnv{},
+ env: &projectMetadataEnv{composeFiles: map[string]string{}},
projectID: "p1",
results: []error{transient},
calls: []call{
@@ -8244,7 +9768,7 @@ func TestComposeFile(t *testing.T) {
},
{
name: "empty project ID resolves every call",
- env: &projectMetadataEnv{},
+ env: &projectMetadataEnv{composeFiles: map[string]string{}},
projectID: "",
results: []error{nil},
calls: []call{
@@ -8286,8 +9810,19 @@ func TestComposeFile(t *testing.T) {
func TestProjectTags_ReconcilePreservesUIAndComposeOwnershipIsReadOnly(t *testing.T) {
db := setupProjectTestDB(t)
- service := &ProjectService{db: db}
- service.initChildren(nil, nil)
+ service := NewProjectService(
+ db,
+ nil,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ nil,
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
ctx := t.Context()
projectModel := Project{
ID: "project-tags",
@@ -8349,7 +9884,19 @@ func TestProjectTags_FilterUsesExactORNames(t *testing.T) {
settingsService, err := newSettingsServiceForTest(t, ctx, db)
require.NoError(t, err)
- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load(), nil, nil)
+ svc := NewProjectService(
+ db,
+ settingsService,
+ event.NewEventService(db, nil, nil),
+ image.NewImageService(db, nil, nil, nil, nil, nil, nil, nil),
+ testDockerService,
+ testBuildBuilder{},
+ nil,
+ nil,
+ config.Load(),
+ kv.NewKVService(db),
+ testRegistryCredentials,
+ )
items, _, err := svc.ListProjects(ctx, pagination.QueryParams{Search: "MAINT", Limit: -1})
require.NoError(t, err)
require.Len(t, items, 1)
@@ -8460,12 +10007,6 @@ func TestParseLifecycleExtraMountsText_RejectsInvalidMode(t *testing.T) {
require.Error(t, err)
}
-func TestRunPreDeploy_NilProject(t *testing.T) {
- db := setupLifecycleTestDB(t)
- svc, _ := newLifecycleTestService(t, db)
- require.NoError(t, svc.runPreDeploy(t.Context(), nil, usertypes.Actor{}))
-}
-
func TestRunPreDeploy_ProjectNotGitOpsManaged(t *testing.T) {
db := setupLifecycleTestDB(t)
svc, settingsService := newLifecycleTestService(t, db)
@@ -8479,9 +10020,12 @@ func TestRunPreDeploy_ProjectNotGitOpsManaged(t *testing.T) {
require.NoError(t, svc.runPreDeploy(t.Context(), project, usertypes.Actor{}))
// A stale marker without a sync row is treated as unmanaged.
- project.ID = "nonexistent"
- project.GitOpsManagedBy = new("missing-sync")
- require.NoError(t, svc.runPreDeploy(t.Context(), project, usertypes.Actor{}))
+ require.NoError(t, svc.runPreDeploy(t.Context(), &Project{
+ ID: "nonexistent",
+ Name: "demo",
+ Path: project.Path,
+ GitOpsManagedBy: new("missing-sync"),
+ }, usertypes.Actor{}))
}
func TestRunPreDeploy_KillSwitchAndLastRunState(t *testing.T) {
@@ -8536,16 +10080,17 @@ func TestRunPreDeploy_KillSwitchAndLastRunState(t *testing.T) {
syncID := "sync-1"
project := &Project{
+ ID: "proj-1",
Name: "demo",
Path: writeLifecycleProjectDirWithScript(t, "pre-deploy.sh", "echo hi\n"),
GitOpsManagedBy: &syncID,
}
- project.ID = "proj-1"
require.NoError(t, db.Create(project).Error)
scriptPath := "pre-deploy.sh"
runnerImage := "alpine:latest"
gitOpsSync := &GitOpsSync{
+ ID: syncID,
Name: "demo-sync",
EnvironmentID: "0",
RepositoryID: "repo-1",
@@ -8557,7 +10102,6 @@ func TestRunPreDeploy_KillSwitchAndLastRunState(t *testing.T) {
PreDeployScriptPath: &scriptPath,
PreDeployRunnerImage: &runnerImage,
}
- gitOpsSync.ID = syncID
require.NoError(t, db.Create(gitOpsSync).Error)
loadSync := func() GitOpsSync {
@@ -8598,14 +10142,15 @@ func TestRunPreDeploy_NoScriptConfigured(t *testing.T) {
syncID := "sync-1"
project := &Project{
+ ID: "proj-1",
Name: "demo",
Path: t.TempDir(),
GitOpsManagedBy: &syncID,
}
- project.ID = "proj-1"
require.NoError(t, db.Create(project).Error)
gitOpsSync := &GitOpsSync{
+ ID: syncID,
Name: "demo-sync",
EnvironmentID: "0",
RepositoryID: "repo-1",
@@ -8615,7 +10160,6 @@ func TestRunPreDeploy_NoScriptConfigured(t *testing.T) {
ProjectName: "demo",
ProjectID: &project.ID,
}
- gitOpsSync.ID = syncID
require.NoError(t, db.Create(gitOpsSync).Error)
require.NoError(t, svc.runPreDeploy(t.Context(), project, usertypes.Actor{}))
@@ -8630,15 +10174,16 @@ func TestRunPreDeploy_MissingRunnerImage(t *testing.T) {
syncID := "sync-1"
projectDir := writeLifecycleProjectDirWithScript(t, "pre-deploy.sh", "echo hi\n")
project := &Project{
+ ID: "proj-1",
Name: "demo",
Path: projectDir,
GitOpsManagedBy: &syncID,
}
- project.ID = "proj-1"
require.NoError(t, db.Create(project).Error)
scriptPath := "pre-deploy.sh"
gitOpsSync := &GitOpsSync{
+ ID: syncID,
Name: "demo-sync",
EnvironmentID: "0",
RepositoryID: "repo-1",
@@ -8649,7 +10194,6 @@ func TestRunPreDeploy_MissingRunnerImage(t *testing.T) {
ProjectID: &project.ID,
PreDeployScriptPath: &scriptPath,
}
- gitOpsSync.ID = syncID
require.NoError(t, db.Create(gitOpsSync).Error)
err := svc.runPreDeploy(t.Context(), project, usertypes.Actor{})
@@ -8664,16 +10208,17 @@ func TestRunPreDeploy_PathTraversalRejected(t *testing.T) {
syncID := "sync-1"
project := &Project{
+ ID: "proj-1",
Name: "demo",
Path: t.TempDir(),
GitOpsManagedBy: &syncID,
}
- project.ID = "proj-1"
require.NoError(t, db.Create(project).Error)
scriptPath := "../etc/passwd"
runnerImage := "alpine:latest"
gitOpsSync := &GitOpsSync{
+ ID: syncID,
Name: "demo-sync",
EnvironmentID: "0",
RepositoryID: "repo-1",
@@ -8685,7 +10230,6 @@ func TestRunPreDeploy_PathTraversalRejected(t *testing.T) {
PreDeployScriptPath: &scriptPath,
PreDeployRunnerImage: &runnerImage,
}
- gitOpsSync.ID = syncID
require.NoError(t, db.Create(gitOpsSync).Error)
err := svc.runPreDeploy(t.Context(), project, usertypes.Actor{})
@@ -8694,8 +10238,7 @@ func TestRunPreDeploy_PathTraversalRejected(t *testing.T) {
}
func discoveryListingForTest(imageService *image.ImageService) *listing.Service {
- service := &ProjectService{imageService: imageService}
- service.initChildren(nil, nil)
+ service := NewProjectService(nil, nil, nil, imageService, testDockerService, testBuildBuilder{}, nil, nil, nil, nil, testRegistryCredentials)
return service.listing
}
diff --git a/backend/internal/system/children/upgrade/service_test.go b/backend/internal/system/children/upgrade/service_test.go
index 9c2350cd5..33d0af10e 100644
--- a/backend/internal/system/children/upgrade/service_test.go
+++ b/backend/internal/system/children/upgrade/service_test.go
@@ -13,11 +13,13 @@ import (
versiontypes "github.com/getarcaneapp/arcane/types/v2/version"
"github.com/libtnb/sqlite"
"github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/client"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
"github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
+ dockerInternal "github.com/getarcaneapp/arcane/backend/v2/internal/docker"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
"github.com/getarcaneapp/arcane/backend/v2/internal/project"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
@@ -26,6 +28,11 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/flow/flowtest"
)
+var testDockerService = &dockerInternal.DockerClientService{Client: func() *client.Client {
+ cli, _ := client.New(client.WithHost("tcp://127.0.0.1:1"), client.WithAPIVersion("1.41"))
+ return cli
+}()}
+
// TestService_UpgradeFlag tests the upgrading flag behavior
func TestService_UpgradeFlag(t *testing.T) {
s := NewService(nil, nil, nil, nil, nil, nil, nil)
@@ -337,7 +344,7 @@ func TestResolveSelfUpgradeTargetImage(t *testing.T) {
}
require.NoError(t, db.Create(&project.Project{ID: "project-arcane", Name: "arcane", Path: projectPath}).Error)
}
- svc := NewService(db, nil, nil, nil, nil, project.NewProjectService(db, settingsSvc, nil, nil, nil, nil, nil, nil, nil, nil, nil), nil)
+ svc := NewService(db, nil, nil, nil, nil, project.NewProjectService(db, settingsSvc, nil, nil, testDockerService, nil, nil, nil, nil, nil, nil), nil)
current := container.InspectResponse{Config: &container.Config{
Image: tt.runtime,
Labels: map[string]string{"com.docker.compose.project": "arcane", "com.docker.compose.service": "server"},
diff --git a/backend/internal/updater/service_test.go b/backend/internal/updater/service_test.go
index 51c11f429..5bacdfe4d 100644
--- a/backend/internal/updater/service_test.go
+++ b/backend/internal/updater/service_test.go
@@ -62,6 +62,11 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"
)
+var testDockerService = &docker.DockerClientService{Client: func() *client.Client {
+ cli, _ := client.New(client.WithHost("tcp://127.0.0.1:1"), client.WithAPIVersion("1.41"))
+ return cli
+}()}
+
type fakeDockerClientProvider struct {
client any
}
@@ -507,7 +512,7 @@ func TestUpdaterService_PullImageAdapter(t *testing.T) {
registrySvc := registry.NewContainerRegistryService(db, nil, kv.NewKVService(db), nil)
imageSvc := image.NewImageService(db, dockerSvc, registrySvc, nil, nil, event.NewEventService(db, nil, nil), nil, nil)
envSvc := environment.NewEnvironmentService(db, nil, nil, nil, nil, nil)
- projectSvc := project.NewProjectService(db, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
+ projectSvc := project.NewProjectService(db, nil, nil, nil, testDockerService, nil, nil, nil, nil, nil, nil)
projectSvc.RegistryCredentialsProvider = envSvc.GetEnabledRegistryCredentials
svc, svcErr := NewUpdaterService(db, nil, dockerSvc, projectSvc, nil, nil, nil, imageSvc, nil, nil, nil, nil, nil, nil, nil)
require.NoError(t, svcErr)
diff --git a/backend/pkg/libarcane/volumes/volume_rename.go b/backend/pkg/libarcane/volumes/volume_rename.go
index 4ab679274..92494f164 100644
--- a/backend/pkg/libarcane/volumes/volume_rename.go
+++ b/backend/pkg/libarcane/volumes/volume_rename.go
@@ -18,6 +18,7 @@ import (
"go.getarcane.app/docker"
kit "go.getarcane.app/kit/pkg"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/volumehelper"
)
@@ -270,7 +271,7 @@ func EnsureRenameTargetAbsent(ctx context.Context, dockerClient *client.Client,
}
return fmt.Errorf("inspect target volume %s: %w", newName, err)
}
- return &volumetypes.ProjectVolumeRenameConflictError{VolumeName: newName}
+ return common.Classify(common.ErrConflict, &volumetypes.ProjectVolumeRenameConflictError{VolumeName: newName})
}
func EnsureRenameSourceDetached(ctx context.Context, dockerClient *client.Client, oldName string) error {
@@ -279,7 +280,7 @@ func EnsureRenameSourceDetached(ctx context.Context, dockerClient *client.Client
return fmt.Errorf("inspect containers using source volume %s: %w", oldName, err)
}
if len(containerIDs) > 0 {
- return &volumetypes.ProjectVolumeRenameInUseError{VolumeName: oldName, ContainerIDs: containerIDs}
+ return common.Classify(common.ErrConflict, &volumetypes.ProjectVolumeRenameInUseError{VolumeName: oldName, ContainerIDs: containerIDs})
}
return nil
}
@@ -375,11 +376,11 @@ func copyProjectVolumeDataInternal(ctx context.Context, dockerClient *client.Cli
})
if err != nil {
if isProjectVolumeCopyNoSpaceErrorInternal(err) {
- return &volumetypes.ProjectVolumeRenameInsufficientSpaceError{
+ return common.Classify(common.ErrInsufficientStorage, &volumetypes.ProjectVolumeRenameInsufficientSpaceError{
SourceVolume: sourceVolume,
TargetVolume: targetVolume,
Detail: err.Error(),
- }
+ })
}
return fmt.Errorf("write target volume archive: %w", err)
}
diff --git a/backend/pkg/projects/fs_util.go b/backend/pkg/projects/fs_util.go
index b6f0e18b5..8dbd38fee 100644
--- a/backend/pkg/projects/fs_util.go
+++ b/backend/pkg/projects/fs_util.go
@@ -419,25 +419,15 @@ func SanitizeProjectName(name string) string {
}, name)
}
-// IsSafeSubdirectory returns true if subdir is a subdirectory of baseDir (absolute, normalized)
+// IsSafeSubdirectory reports whether subdir is baseDir or lies beneath it, comparing absolute paths.
func IsSafeSubdirectory(baseDir, subdir string) bool {
absBase, err1 := filepath.Abs(baseDir)
absSubdir, err2 := filepath.Abs(subdir)
if err1 != nil || err2 != nil {
return false
}
-
- // Ensure both paths end consistently for comparison
- absBase = filepath.Clean(absBase)
- absSubdir = filepath.Clean(absSubdir)
-
rel, err := filepath.Rel(absBase, absSubdir)
- if err != nil {
- return false
- }
-
- // The path must not escape the base directory
- return !strings.HasPrefix(rel, "..") && !filepath.IsAbs(rel)
+ return err == nil && filepath.IsLocal(rel)
}
// ResolvePathWithinDir resolves path and rejects paths that escape baseDir.
diff --git a/go.work.sum b/go.work.sum
index 5a31c2f7c..9327d7f9f 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -451,6 +451,7 @@ github.com/ClickHouse/clickhouse-go/v2 v2.47.0 h1:ZDAzrnKSOPTIsm4tdUNfrii2yc8dk4
github.com/ClickHouse/clickhouse-go/v2 v2.47.0/go.mod h1:sPj7C7UYQ2MWHcfX+4eGN6nwnCqwUKfgO6PcwKpd6K8=
github.com/ClickHouse/clickhouse-go/v2 v2.48.0 h1:auzd4VkapQYhQF8F2Gog7s3x78Bi1JZmByxGbrw3C+4=
github.com/ClickHouse/clickhouse-go/v2 v2.48.0/go.mod h1:lBjUCPRG6RpRQdMbkXq+JV8rY0/O5lw+Z7jShgReFjM=
+github.com/ClickHouse/clickhouse-go/v2 v2.49.0 h1:HgiLTraLGgMe8kYivQ6RzMHDUkU/uFUpsWEAuhVk34Q=
github.com/ClickHouse/clickhouse-go/v2 v2.49.0/go.mod h1:o8dSgGJGxY7CeWFNiKusF9a5RnLpgzuo7OaNyH0NQPE=
github.com/CycloneDX/cyclonedx-go v0.9.3 h1:Pyk/lwavPz7AaZNvugKFkdWOm93MzaIyWmBwmBo3aUI=
github.com/CycloneDX/cyclonedx-go v0.9.3/go.mod h1:vcK6pKgO1WanCdd61qx4bFnSsDJQ6SbM2ZuMIgq86Jg=
@@ -559,6 +560,7 @@ github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVK
github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
+github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e h1:4dAU9FXIyQktpoUAgOJK3OTFc/xug0PCXYCqU0FgDKI=
github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=
github.com/alexflint/go-filemutex v1.3.0/go.mod h1:U0+VA/i30mGBlLCrFPGtTe9y6wGQfNAWPBTekHQ+c8A=
@@ -579,6 +581,7 @@ github.com/andybalholm/brotli v1.2.2 h1:HzTuoo2ErYQqf5qvcJInB8uvqSVxRttzkFexPWtn
github.com/andybalholm/brotli v1.2.2/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
github.com/andybalholm/brotli v1.2.3 h1:8H1qwOkl2LPfjf3YezB90JnCliZb6SInJ/OJkEbA5NQ=
github.com/andybalholm/brotli v1.2.3/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
+github.com/andybalholm/brotli v1.2.6 h1:ftYnfj6usCp+UGV5kSJ3+chpMQgU+gJf/AxsUQ52REI=
github.com/andybalholm/brotli v1.2.6/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -1096,6 +1099,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3
github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/creachadair/msync v0.8.1 h1:QRd8si3qZ2Q4TaDL7tS/MG/lFE3YND7U7J9fy42eAFM=
github.com/creachadair/msync v0.8.1/go.mod h1:dt0bscS09J8Ie3AdccK9JpCb7LfStaDGlAmDLukOlY4=
+github.com/creachadair/msync v0.10.1 h1:14jT5Ujob64Zp2D3ZcUidayDMoXikhmYN8xBxEuPKPk=
github.com/creachadair/msync v0.10.1/go.mod h1:dFf4Z0cxE2nibFmAdq5OqTuGn++GgEqA9JuKH+7ceSA=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/cyphar/filepath-securejoin v0.5.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
@@ -1118,6 +1122,7 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa h1:h8TfIT1xc8FWbwwpmHn1J5i43Y0uZP97GqasGCzSRJk=
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa/go.mod h1:Nx87SkVqTKd8UtT+xu7sM/l+LgXs6c0aHrlKusR+2EQ=
+github.com/dblohm7/wingoes v0.0.0-20260526185140-fb298caac7ca h1:h1Awca4lQOspNR/2eeo04Ricn5NixDX9mb17WSAgLhQ=
github.com/dblohm7/wingoes v0.0.0-20260526185140-fb298caac7ca/go.mod h1:2TGl1jRJrRpbzykmg7asHm3h08TqutUgQqY5v9k/g3c=
github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
github.com/decred/dcrd/crypto/blake256 v1.1.0 h1:zPMNGQCm0g4QTY27fOCorQW7EryeQ/U0x++OzVrdms8=
@@ -1273,6 +1278,7 @@ github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9
github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
github.com/gaissmai/bart v0.26.1 h1:+w4rnLGNlA2GDVn382Tfe3jOsK5vOr5n4KmigJ9lbTo=
github.com/gaissmai/bart v0.26.1/go.mod h1:GREWQfTLRWz/c5FTOsIw+KkscuFkIV5t8Rp7Nd1Td5c=
+github.com/gaissmai/bart v0.29.0 h1:wO6HGE8g9YE0Wm0bCpYxwRzfQ4+fbJKOhL64e5ACGCI=
github.com/gaissmai/bart v0.29.0/go.mod h1:GREWQfTLRWz/c5FTOsIw+KkscuFkIV5t8Rp7Nd1Td5c=
github.com/getarcaneapp/arcane/types v0.0.0-20251219045603-8a9960a2bf04/go.mod h1:7Wj+0JnpYq4RQS+otyM6e4zkyJKDC01wxkWPyFCHwZA=
github.com/getarcaneapp/updater v0.3.5/go.mod h1:2ENitZR/lA5MuBn60OZYR5wvU3ZCE+pAgfrebfOlRDA=
@@ -1318,6 +1324,7 @@ github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9
github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
github.com/go-json-experiment/json v0.0.0-20260214004413-d219187c3433 h1:vymEbVwYFP/L05h5TKQxvkXoKxNvTpjxYKdF1Nlwuao=
github.com/go-json-experiment/json v0.0.0-20260214004413-d219187c3433/go.mod h1:tphK2c80bpPhMOI4v6bIc2xWywPfbqi1Z06+RcrMkDg=
+github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3 h1:UADEEmDKgfXbtnGJZ97beY5XLo9ZechG1nlU4KnRrkE=
github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3/go.mod h1:tphK2c80bpPhMOI4v6bIc2xWywPfbqi1Z06+RcrMkDg=
github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -1376,6 +1383,7 @@ github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1
github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw=
github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
+github.com/go-sql-driver/mysql v1.10.1 h1:arlSnNLq6a5yxGxV7qg9lF4j0C+KwD6NbQyKr9QL6ME=
github.com/go-sql-driver/mysql v1.10.1/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -1745,6 +1753,7 @@ github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2E
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/jsimonetti/rtnetlink v1.4.1 h1:JfD4jthWBqZMEffc5RjgmlzpYttAVw1sdnmiNaPO3hE=
github.com/jsimonetti/rtnetlink v1.4.1/go.mod h1:xJjT7t59UIZ62GLZbv6PLLo8VFrostJMPBAheR6OM8w=
+github.com/jsimonetti/rtnetlink v1.4.2 h1:Df9w9TZ3npHTyDn0Ev9e1uzmN2odmXd0QX+J5GTEn90=
github.com/jsimonetti/rtnetlink v1.4.2/go.mod h1:92s6LJdE+1iOrw+F2/RO7LYI2Qd8pPpFNNUYW06gcoM=
github.com/jsimonetti/rtnetlink/v2 v2.0.1 h1:xda7qaHDSVOsADNouv7ukSuicKZO7GgVUCXxpaIEIlM=
github.com/jsimonetti/rtnetlink/v2 v2.0.1/go.mod h1:7MoNYNbb3UaDHtF8udiJo/RH6VsTKP1pqKLUTVCvToE=
@@ -1873,6 +1882,7 @@ github.com/letsencrypt/boulder v0.20251110.0 h1:J8MnKICeilO91dyQ2n5eBbab24neHzUp
github.com/letsencrypt/boulder v0.20251110.0/go.mod h1:ogKCJQwll82m7OVHWyTuf8eeFCjuzdRQlgnZcCl0V+8=
github.com/letsencrypt/boulder v0.20260223.0 h1:xdS2OnJNUasR6TgVIOpqqcvdkOu47+PQQMBk9ThuWBw=
github.com/letsencrypt/boulder v0.20260223.0/go.mod h1:r3aTSA7UZ7dbDfiGK+HLHJz0bWNbHk6YSPiXgzl23sA=
+github.com/letsencrypt/boulder v0.20260309.0 h1:kZynrxK3QfqLGx6hhoz+Rfs3hgltJs1p9Mp+4+VwnY0=
github.com/letsencrypt/boulder v0.20260309.0/go.mod h1:yG8lj8pNPZ8taq3oNdTpfBS+eC74IaEuiewqzVpXiWE=
github.com/letsencrypt/challtestsrv v1.4.2 h1:0ON3ldMhZyWlfVNYYpFuWRTmZNnyfiL9Hh5YzC3JVwU=
github.com/letsencrypt/challtestsrv v1.4.2/go.mod h1:GhqMqcSoeGpYd5zX5TgwA6er/1MbWzx/o7yuuVya+Wk=
@@ -1962,6 +1972,7 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 h1:A1Cq6Ysb0GM0tpKMbdCXCIfBclan4oHk1Jb+Hrejirg=
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42/go.mod h1:BB4YCPDOzfy7FniQ/lxuYQ3dgmM2cZumHbK8RpTjN2o=
+github.com/mdlayher/netlink v1.11.2 h1:HKh2jqe+omdSWcQ88nrT7INE61B0NXfiSPFdgL4YbNI=
github.com/mdlayher/netlink v1.11.2/go.mod h1:uT2Yc/QLaZubzDpZIBi9d4GoeLwtp3x1AMeqSRrK2sA=
github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY=
github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4=
@@ -1970,6 +1981,7 @@ github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos
github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
github.com/mdlayher/socket v0.6.0 h1:ScZPaAGyO1icQnbFrhPM8mnXyMu9qukC1K4ZoM2IQKU=
github.com/mdlayher/socket v0.6.0/go.mod h1:q7vozUAnxSqnjHc12Fik5yUKIzfZ8ITCfMkhOtE9z18=
+github.com/mdlayher/socket v0.7.0 h1:qVREPVwtUMg17pwvveQxpurq0PVisMxi3FGgpsorMYQ=
github.com/mdlayher/socket v0.7.0/go.mod h1:f7iKql2EK/rfsWYDKofKjk2Ig7I+6HQWdMIdn1tO4A4=
github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=
github.com/mdlayher/vsock v1.2.1/go.mod h1:NRfCibel++DgeMD8z/hP+PPTjlNJsdPOmxcnENvE+SE=
@@ -1987,6 +1999,7 @@ github.com/microsoft/go-mssqldb v1.10.0 h1:pHEt+Qz6YFPWqREq10mqSE524QQo+/QremwTC
github.com/microsoft/go-mssqldb v1.10.0/go.mod h1:mnG7lGa9iYJbzJqGCXyuQCegStKMr3kogDLD6+bmggg=
github.com/microsoft/go-mssqldb v1.11.0 h1:YbDqolEjGH9hBfvKzONTf5/dbl9RKXmizMJE93lVxNs=
github.com/microsoft/go-mssqldb v1.11.0/go.mod h1:goQLDOPlMN/l1REhnNPElMoY/yX+fUWn1+7UoFJPH9Y=
+github.com/microsoft/go-mssqldb v1.11.2 h1:FCgeBIK8um2+X4tbun6Q71N1KsfyCDPKY41e1yGVjSE=
github.com/microsoft/go-mssqldb v1.11.2/go.mod h1:CYgwG5AMXFojbjTg+GNP5G/y6uz1BhTyZaPqQWzkGnQ=
github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
@@ -2113,6 +2126,7 @@ github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
github.com/oapi-codegen/runtime v1.6.0 h1:7Xx+GlueD6nRuyKoCPzL434Jfi3BetbiJOrzCHp/VPU=
github.com/oapi-codegen/runtime v1.6.0/go.mod h1:GwV7hC2hviaMzj+ITfHVRESK5J2W/GefVwIND/bMGvU=
+github.com/oapi-codegen/runtime v1.7.0 h1:t7358VYPvNbWJ9gdAkIK/smVeHpBf6yp8VTsaZsb/7k=
github.com/oapi-codegen/runtime v1.7.0/go.mod h1:GwV7hC2hviaMzj+ITfHVRESK5J2W/GefVwIND/bMGvU=
github.com/oasdiff/yaml v0.1.1 h1:6nHx+pn9gBRM6YpBlFZFQGCCd1nuvqOBtTD3KKTgGxY=
github.com/oasdiff/yaml v0.1.1/go.mod h1:EYJNoyktvWMJ0Hmhx+6qTaqMOsalUaRGT8Sj1hNcegU=
@@ -2215,9 +2229,11 @@ github.com/pierrec/lz4/v4 v4.1.27 h1:+PhzhWDrjRj89TH2sw43nE3+4+W8lSxIuQadEHZyjUk
github.com/pierrec/lz4/v4 v4.1.27/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
github.com/pierrec/lz4/v4 v4.1.29 h1:CDQY6qZOLI4DW0Nx6R1vRrifrCeQHnNXkMb0hZWXFjg=
github.com/pierrec/lz4/v4 v4.1.29/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
+github.com/pierrec/lz4/v4 v4.1.33 h1:GjG1TJ1V4IzKP8L96muuuDNpTwd7D+l2ccXrjAbe014=
github.com/pierrec/lz4/v4 v4.1.33/go.mod h1:7SE9MC2STkNtL4PIwGhjmyVwvILaGI9/COYQNBhKM/c=
github.com/pires/go-proxyproto v0.8.1 h1:9KEixbdJfhrbtjpz/ZwCdWDD2Xem0NZ38qMYaASJgp0=
github.com/pires/go-proxyproto v0.8.1/go.mod h1:ZKAAyp3cgy5Y5Mo4n9AlScrkCZwUy0g3Jf+slqQVcuU=
+github.com/pires/go-proxyproto v0.15.0 h1:dTshmNbFm/D+0+sbrxUuddPOZ5Y0B7c5NhtsBkm6LqI=
github.com/pires/go-proxyproto v0.15.0/go.mod h1:OXsCrKwrK2tXS9YrI5tkHx5xaQlO8FH3lFW76orFh24=
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
@@ -2322,6 +2338,7 @@ github.com/safchain/ethtool v0.3.0 h1:gimQJpsI6sc1yIqP/y8GYgiXn/NjgvpM0RNoWLVVmP
github.com/safchain/ethtool v0.3.0/go.mod h1:SA9BwrgyAqNo7M+uaL6IYbxpm5wk3L7Mm6ocLW+CJUs=
github.com/safchain/ethtool v0.6.2 h1:O3ZPFAKEUEfbtE6J/feEe2Ft7dIJ2Sy8t4SdMRiIMHY=
github.com/safchain/ethtool v0.6.2/go.mod h1:VS7cn+bP3Px3rIq55xImBiZGHVLNyBh5dqG6dDQy8+I=
+github.com/safchain/ethtool v0.7.0 h1:rlJzfDetsVvT61uz8x1YIcFn12akMfuPulHtZjtb7Is=
github.com/safchain/ethtool v0.7.0/go.mod h1:MenQKEjXdfkjD3mp2QdCk8B/hwvkrlOTm/FD4gTpFxQ=
github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=
github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
@@ -2363,6 +2380,7 @@ github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXY
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
+github.com/shopspring/decimal v1.5.0 h1:HxSWk31RmJv0EyY4oLiGQB9u7WPludUwPBdvQZnYFPc=
github.com/shopspring/decimal v1.5.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/sigstore/cosign/v2 v2.6.2 h1:mi6EAUJoPZ+yuyooU7m06a1DZWJouwYgh9a67L9tm2M=
github.com/sigstore/cosign/v2 v2.6.2/go.mod h1:g+P/LgYyJkC85WGGDho7yySl3C6xTJzzpLm21ZV+E6s=
@@ -2445,14 +2463,17 @@ github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 h1:Gzfnfk2TWrk8
github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55/go.mod h1:4k4QO+dQ3R5FofL+SanAUZe+/QfeK0+OIuwDIRu2vSg=
github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd h1:Rf9uhF1+VJ7ZHqxrG8pJ6YacmHvVCmByDmGbAWCc/gA=
github.com/tailscale/hujson v0.0.0-20260302212456-ecc657c15afd/go.mod h1:EbW0wDK/qEUYI0A5bqq0C2kF8JTQwWONmGDBbzsxxHo=
+github.com/tailscale/hujson v0.0.0-20260727124030-b80ff77dac4f h1:9hiVElpCmKzsBKQHkBqZ8LGzt82iLfM8egxr4sew+Ys=
github.com/tailscale/hujson v0.0.0-20260727124030-b80ff77dac4f/go.mod h1:8/zr1Tv0+cKpVtGCEB/7YfRXr2TszsMxMXLaT8YuBgU=
github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc h1:24heQPtnFR+yfntqhI3oAu9i27nEojcQ4NuBQOo5ZFA=
github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc/go.mod h1:f93CXfllFsO9ZQVq+Zocb1Gp4G5Fz0b0rXHLOzt/Djc=
github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976 h1:UBPHPtv8+nEAy2PD8RyAhOYvau1ek0HDJqLS/Pysi14=
github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976/go.mod h1:agQPE6y6ldqCOui2gkIh7ZMztTkIQKH049tv8siLuNQ=
+github.com/tailscale/web-client-prebuilt v0.0.0-20260917222731-e0ed2d0d0fea h1:ah5jt6ZnxMvNclt6kBBoLcMpLLjMA44PTsnov2y7gpU=
github.com/tailscale/web-client-prebuilt v0.0.0-20260917222731-e0ed2d0d0fea/go.mod h1:agQPE6y6ldqCOui2gkIh7ZMztTkIQKH049tv8siLuNQ=
github.com/tailscale/wireguard-go v0.0.0-20260715223240-2e01ba5b00f0 h1:CnIEL2n7Xql6Ux1k+Vu5S5ubDHCT/kxFgkKCY8FjefU=
github.com/tailscale/wireguard-go v0.0.0-20260715223240-2e01ba5b00f0/go.mod h1:6SerzcvHWQchKO2BfNdmquA77CHSECZuFl+D9fp4RnI=
+github.com/tailscale/wireguard-go v0.0.0-20260928213032-417aef361226 h1:v3Lpj2iHPWQDqeCwemQPz4fWweIEMLqBkwJqCjRyJQc=
github.com/tailscale/wireguard-go v0.0.0-20260928213032-417aef361226/go.mod h1:rUelGmuK4UnSJYM5gl5Mknp6YbwwcL8+VAPMhNYe+jg=
github.com/tchap/go-patricia/v2 v2.3.2/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
github.com/tchap/go-patricia/v2 v2.3.3 h1:xfNEsODumaEcCcY3gI0hYPZ/PcpVv5ju6RMAhgwZDDc=
@@ -2475,6 +2496,7 @@ github.com/tink-crypto/tink-go/v2 v2.5.0 h1:B8KLF6AofxdBIE4UJIaFbmoj5/1ehEtt7/Mm
github.com/tink-crypto/tink-go/v2 v2.5.0/go.mod h1:2WbBA6pfNsAfBwDCggboaHeB2X29wkU8XHtGwh2YIk8=
github.com/tink-crypto/tink-go/v2 v2.6.0 h1:+KHNBHhWH33Vn+igZWcsgdEPUxKwBMEe0QC60t388v4=
github.com/tink-crypto/tink-go/v2 v2.6.0/go.mod h1:2WbBA6pfNsAfBwDCggboaHeB2X29wkU8XHtGwh2YIk8=
+github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
@@ -2564,6 +2586,7 @@ github.com/vektah/gqlparser/v2 v2.5.33/go.mod h1:c1I28gSOVNzlfc4WuDlqU7voQnsqI6O
github.com/vektah/gqlparser/v2 v2.5.36/go.mod h1:cAJ9qwVgPaUkWv6Gn8vn0mqOE0Ui5Pn56wNy5396XWo=
github.com/vektra/mockery/v3 v3.7.1 h1:4jZJCTzf5CEXSXHOtgIu3TuHYUuDKwcc/0vurjQEpjk=
github.com/vektra/mockery/v3 v3.7.1/go.mod h1:fbChccNiUvQaUVaCHS6/7OL5/D65KljJVk31LuPPUjY=
+github.com/vektra/mockery/v3 v3.8.0 h1:Tklqcx844iV8GtYziqJXam1a8RdcKip4UErMa66Nxps=
github.com/vektra/mockery/v3 v3.8.0/go.mod h1:K+L72OoFVizA9eWtO4L+kU65oylgreiJEJ57Gu8g9Ew=
github.com/veraison/go-cose v1.1.0 h1:AalPS4VGiKavpAzIlBjrn7bhqXiXi4jbMYY/2+UC+4o=
github.com/veraison/go-cose v1.1.0/go.mod h1:7ziE85vSq4ScFTg6wyoMXjucIGOf4JkFEZi/an96Ct4=
@@ -2613,6 +2636,7 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
github.com/xyproto/randomstring v1.2.0 h1:y7PXAEBM3XlwJjPG2JQg4voxBYZ4+hPgRdGKCfU8wik=
github.com/xyproto/randomstring v1.2.0/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
+github.com/yandex-cloud/go-genproto v0.126.0 h1:zj9uX2IT0bbbHnqmK2xzxsddsZVtq6EZoeAxhZcdQs8=
github.com/yandex-cloud/go-genproto v0.126.0/go.mod h1:0LDD/IZLIUIV4iPH+YcF+jysO3jkSvADFGm4dCAuwQo=
github.com/yashtewari/glob-intersection v0.2.0 h1:8iuHdN88yYuCzCdjt0gDe+6bAhUwBeEWqThExu54RFg=
github.com/yashtewari/glob-intersection v0.2.0/go.mod h1:LK7pIC3piUjovexikBbJ26Yml7g8xa5bsjfx2v1fwok=
@@ -2622,6 +2646,7 @@ github.com/ydb-platform/ydb-go-genproto v0.0.0-20260428144813-1c07baab7f7b h1:xe
github.com/ydb-platform/ydb-go-genproto v0.0.0-20260428144813-1c07baab7f7b/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
github.com/ydb-platform/ydb-go-genproto v0.0.0-20260810123728-f0c151ab31b9 h1:WcjfLaNwBZzyl0a/2Ms+tucKRZvulR1HMXM9V7evjLc=
github.com/ydb-platform/ydb-go-genproto v0.0.0-20260810123728-f0c151ab31b9/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
+github.com/ydb-platform/ydb-go-sdk-auth-environ v0.5.3 h1:A48PcmIETWwbEMIGwndv52uME6J1eJ28MBgF7HVR74o=
github.com/ydb-platform/ydb-go-sdk-auth-environ v0.5.3/go.mod h1:oRGF+67GWLbtNzqGygsPIUsjXmsRXD1KS5m3o5ppm2k=
github.com/ydb-platform/ydb-go-sdk/v3 v3.135.0 h1:8c/M2B5W5xJd968DCedPv7DvQHuKzzhGGsO6J9x2+5U=
github.com/ydb-platform/ydb-go-sdk/v3 v3.135.0/go.mod h1:VYUUkRJkKuQPkIpgtZJj6+58Fa2g8ccAqdmaaK6HP5k=
@@ -2631,13 +2656,17 @@ github.com/ydb-platform/ydb-go-sdk/v3 v3.144.6 h1:XWx3dStuZHEvEHAFzvNIbFYJUw7Eay
github.com/ydb-platform/ydb-go-sdk/v3 v3.144.6/go.mod h1:b9NEO6mgaiqsnOMkS003uS82XsKh6GL+ZTFfPqXWz+c=
github.com/ydb-platform/ydb-go-sdk/v3 v3.151.1 h1:T+fB2ZDHpYIGC7DWjK+rzZHLoexBF0zG/n3Q9DGNskY=
github.com/ydb-platform/ydb-go-sdk/v3 v3.151.1/go.mod h1:dJXJ1u00IqO8Vsph8fWmYj8b1E7jyphnvJPqA69emBY=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.155.1 h1:ZMByYe53zZ9R1o23fxJsbNhjzKFQkzpXm6uGj8gWHXQ=
github.com/ydb-platform/ydb-go-sdk/v3 v3.155.1/go.mod h1:dJXJ1u00IqO8Vsph8fWmYj8b1E7jyphnvJPqA69emBY=
+github.com/ydb-platform/ydb-go-yc v0.12.5 h1:qYIeU1N6a92FaDA0+/vR55l5IzRF50MeLZwUWwvy2xQ=
github.com/ydb-platform/ydb-go-yc v0.12.5/go.mod h1:DlSltVQKEdXJotaAYwoHzMGDF9EJw5S3hg3LXe/5yYw=
+github.com/ydb-platform/ydb-go-yc-metadata v0.6.2 h1:CZFawwHjLcjsxcl/g0dGIXbI2r41okPGLCydF4qTHcc=
github.com/ydb-platform/ydb-go-yc-metadata v0.6.2/go.mod h1:mU1NRwVEHF+WyO1q6etWycy17N/S5288uUbsMvvk9ps=
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
github.com/ysmood/fetchup v0.2.3 h1:ulX+SonA0Vma5zUFXtv52Kzip/xe7aj4vqT5AJwQ+ZQ=
github.com/ysmood/fetchup v0.2.3/go.mod h1:xhibcRKziSvol0H1/pj33dnKrYyI2ebIvz5cOOkYGns=
+github.com/ysmood/fetchup v0.3.0 h1:UhYz9xnLEVn2ukSuK3KCgcznWpHMdrmbsPpllcylyu8=
github.com/ysmood/fetchup v0.3.0/go.mod h1:hbysoq65PXL0NQeNzUczNYIKpwpkwFL4LXMDEvIQq9A=
github.com/ysmood/goob v0.4.0 h1:HsxXhyLBeGzWXnqVKtmT9qM7EuVs/XOgkX7T6r1o1AQ=
github.com/ysmood/goob v0.4.0/go.mod h1:u6yx7ZhS4Exf2MwciFr6nIM8knHQIE22lFpWHnfql18=
@@ -2645,6 +2674,7 @@ github.com/ysmood/gop v0.2.0 h1:+tFrG0TWPxT6p9ZaZs+VY+opCvHU8/3Fk6BaNv6kqKg=
github.com/ysmood/gop v0.2.0/go.mod h1:rr5z2z27oGEbyB787hpEcx4ab8cCiPnKxn0SUHt6xzk=
github.com/ysmood/got v0.40.0 h1:ZQk1B55zIvS7zflRrkGfPDrPG3d7+JOza1ZkNxcc74Q=
github.com/ysmood/got v0.40.0/go.mod h1:W7DdpuX6skL3NszLmAsC5hT7JAhuLZhByVzHTq874Qg=
+github.com/ysmood/got v0.42.0 h1:CMRoknemO2nkZBpZmRgsWs79UoQz5eDfWmKIAGGFm94=
github.com/ysmood/got v0.42.0/go.mod h1:uFF8sPWgVvWIGrjASUgtH0AbnU7ipaXGVaFtWdl3yP0=
github.com/ysmood/gotrace v0.6.0 h1:SyI1d4jclswLhg7SWTL6os3L1WOKeNn/ZtzVQF8QmdY=
github.com/ysmood/gotrace v0.6.0/go.mod h1:TzhIG7nHDry5//eYZDYcTzuJLYQIkykJzCRIo4/dzQM=
@@ -2928,6 +2958,7 @@ go4.org/mem v0.0.0-20240501181205-ae6ca9944745 h1:Tl++JLUCe4sxGu8cTpDzRLd3tN7US4
go4.org/mem v0.0.0-20240501181205-ae6ca9944745/go.mod h1:reUoABIJ9ikfM5sgtSF3Wushcza7+WeD01VB9Lirh3g=
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
+go4.org/netipx v0.0.0-20260823151212-3075585bcbeb h1:XBM4hvfwGAttkkiTIFfeigdfcL1xIfdKXqFdgiHGtDs=
go4.org/netipx v0.0.0-20260823151212-3075585bcbeb/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
gocloud.dev v0.45.0 h1:WknIK8IbRdmynDvara3Q7G6wQhmEiOGwpgJufbM39sY=
gocloud.dev v0.45.0/go.mod h1:0kXKmkCLG6d31N7NyLZWzt7jDSQura9zD/mWgiB6THI=
@@ -2969,6 +3000,7 @@ golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCR
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak=
golang.org/x/exp v0.0.0-20260603202125-055de637280b/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
+golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 h1:1P7xPZEwZMoBoz0Yze5Nx2/4pxj6nw9ZqHWXqP0iRgQ=
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
@@ -3154,6 +3186,7 @@ golang.org/x/telemetry v0.0.0-20260908163034-4bcc4b2ee518 h1:F5BWKvW126NXR74uxkx
golang.org/x/telemetry v0.0.0-20260908163034-4bcc4b2ee518/go.mod h1:i+ivNqjDnTF3WTElsdk5g9V5DTSBYgdNo7xTU9SDwYA=
golang.org/x/telemetry v0.0.0-20260924152758-ed294f943157 h1:DftxASHKl6JolFPqoN+2WrFO53JvkHwRXvFqf8gsivA=
golang.org/x/telemetry v0.0.0-20260924152758-ed294f943157/go.mod h1:i+ivNqjDnTF3WTElsdk5g9V5DTSBYgdNo7xTU9SDwYA=
+golang.org/x/telemetry v0.0.0-20261009151841-97e8ea77aa2a h1:wnveMBKHwx8/nIb8WYT5P9vtefdXOvIWxzycCkc5n6Q=
golang.org/x/telemetry v0.0.0-20261009151841-97e8ea77aa2a/go.mod h1:i+ivNqjDnTF3WTElsdk5g9V5DTSBYgdNo7xTU9SDwYA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -3249,6 +3282,7 @@ golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeu
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
golang.zx2c4.com/wireguard/windows v0.5.3 h1:On6j2Rpn3OEMXqBq00QEDC7bWSZrPIHKIus8eIuExIE=
golang.zx2c4.com/wireguard/windows v0.5.3/go.mod h1:9TEe8TJmtwyQebdFwAkEWOPr3prrtqm+REGFifP60hI=
+golang.zx2c4.com/wireguard/windows v1.0.1 h1:eOxiDVbywPC+ZQqvdCK7x+ZwWXKbYv50TtH8ysFIbw8=
golang.zx2c4.com/wireguard/windows v1.0.1/go.mod h1:+fbT3FFdX4zzYDLwJh5+HPEcNN/3HyNdzhNSVsQM+zs=
gonum.org/v1/plot v0.15.2 h1:Tlfh/jBk2tqjLZ4/P8ZIwGrLEWQSPDLRm/SNWKNXiGI=
gonum.org/v1/plot v0.15.2/go.mod h1:DX+x+DWso3LTha+AdkJEv5Txvi+Tql3KAGkehP0/Ubg=
@@ -3418,6 +3452,7 @@ gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
gvisor.dev/gvisor v0.0.0-20260224225140-573d5e7127a8 h1:Zy8IV/+FMLxy6j6p87vk/vQGKcdnbprwjTxc8UiUtsA=
gvisor.dev/gvisor v0.0.0-20260224225140-573d5e7127a8/go.mod h1:QkHjoMIBaYtpVufgwv3keYAbln78mBoCuShZrPrer1Q=
+gvisor.dev/gvisor v0.0.0-20260915211658-a6f909f08a72 h1:EytKYr5WrVs+Aah/0xDO8ZAZZzS/iTEVC8ln4ipDbL0=
gvisor.dev/gvisor v0.0.0-20260915211658-a6f909f08a72/go.mod h1:8aLQqUBHDH8fY5y60lzmwDpMMbQCcT3EBfoSwhfaGCY=
helm.sh/helm/v3 v3.19.2 h1:psQjaM8aIWrSVEly6PgYtLu/y6MRSmok4ERiGhZmtUY=
helm.sh/helm/v3 v3.19.2/go.mod h1:gX10tB5ErM+8fr7bglUUS/UfTOO8UUTYWIBH1IYNnpE=
@@ -3425,6 +3460,7 @@ helm.sh/helm/v4 v4.2.0 h1:J+0TmTtPK2NuS6z9Z2WOcIX0nGGJylokEZLt0fi0X4U=
helm.sh/helm/v4 v4.2.0/go.mod h1:sDQRGAct/I/ogTvOX8QqE/8bBWuLH4BHbB3QFL5G3do=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
+honnef.co/go/tools v0.8.1 h1:+JKf3xJ1ni4CwrhVg4/pqsfPGP6vNAXcKbMXJodYx3w=
honnef.co/go/tools v0.8.1/go.mod h1:XA+OnlRA9EDh/ukGvXMNSZNKGwFQJ+5dER0ioUkOxks=
howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM=
howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
@@ -3624,4 +3660,5 @@ tags.cncf.io/container-device-interface/specs-go v1.1.1 h1:3xjaytilFeCBVFJsJTaT9
tags.cncf.io/container-device-interface/specs-go v1.1.1/go.mod h1:BhJIkjjPh4qpys+qm4DAYtUyryaTDg9zris+AczXyws=
tailscale.com v1.102.4 h1:FcAkb7MgfFFUIUASg18Mv5cAiraxb+eMgOQaOKqKyPo=
tailscale.com v1.102.4/go.mod h1:47bv91Xbg4K1p5wti7F1dmKvUVWV5BXF78d9EWJ+d6c=
+tailscale.com v1.104.1 h1:9GNOm9Izqll9RH5jA5NWcLiCzXi/WtqY4EHQY2Dy2zk=
tailscale.com v1.104.1/go.mod h1:Cb1XjScRgSOeRD7NW6uCEznme782WiOU9IxqyTWoRf0=
diff --git a/tests/setup/projects/test-project-static/.env b/tests/setup/projects/test-project-static/.env
old mode 100644
new mode 100755
diff --git a/tests/setup/projects/test-project-static/compose.yaml b/tests/setup/projects/test-project-static/compose.yaml
old mode 100644
new mode 100755