Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: fix project update order and authentication (#2794)
Kyle Mendell793ae890216e
diff --git a/backend/internal/di/providers.go b/backend/internal/di/providers.goindex 817da2950..bd29a10c8 100644--- a/backend/internal/di/providers.go+++ b/backend/internal/di/providers.go@@ -114,6 +114,11 @@ func provideContainerRegistryServiceInternal(db *database.DB, docker *services.D}, kv)}+func provideProjectServiceInternal(db *database.DB, settings *services.SettingsService, event *services.EventService, image *services.ImageService, docker *services.DockerClientService, build *services.BuildService, environment *services.EnvironmentService, cfg *config.Config) *services.ProjectService {+ return services.NewProjectService(db, settings, event, image, docker, build, cfg).+ WithRegistryCredentialsProvider(environment.GetEnabledRegistryCredentials)+}+// provideUpdaterServiceInternal passes *SystemUpgradeService for the unexported// selfUpgradeService parameter so wire never sees the unexported type.func provideUpdaterServiceInternal(db *database.DB, settings *services.SettingsService, docker *services.DockerClientService, project *services.ProjectService, imageUpdate *services.ImageUpdateService, registry *services.ContainerRegistryService, event *services.EventService, image *services.ImageService, notification *services.NotificationService, systemUpgrade *services.SystemUpgradeService, activity *services.ActivityService) *services.UpdaterService {diff --git a/backend/internal/di/wire.go b/backend/internal/di/wire.goindex dfc8398d5..0182f3fde 100644--- a/backend/internal/di/wire.go+++ b/backend/internal/di/wire.go@@ -45,7 +45,7 @@ var ServiceSet = wire.NewSet(services.NewImageService,services.NewBuildService,services.NewBuildWorkspaceService,- services.NewProjectService,+ provideProjectServiceInternal,services.NewContainerService,services.NewDashboardService,services.NewNetworkService,diff --git a/backend/internal/di/wire_gen.go b/backend/internal/di/wire_gen.goindex 75f5f6e73..23676af2c 100644--- a/backend/internal/di/wire_gen.go+++ b/backend/internal/di/wire_gen.go@@ -43,7 +43,7 @@ func InitializeServices(ctx context.Context, db *database.DB, cfg *config.ConfigimageService := services.NewImageService(db, dockerClientService, containerRegistryService, imageUpdateService, vulnerabilityService, eventService)gitRepositoryService := provideGitRepositoryServiceInternal(db, cfg, eventService, settingsService)buildService := services.NewBuildService(db, settingsService, dockerClientService, containerRegistryService, gitRepositoryService, eventService)- projectService := services.NewProjectService(db, settingsService, eventService, imageService, dockerClientService, buildService, cfg)+ projectService := provideProjectServiceInternal(db, settingsService, eventService, imageService, dockerClientService, buildService, environmentService, cfg)jobService := services.NewJobService(db, settingsService, cfg)settingsSearchService := services.NewSettingsSearchService()customizeSearchService := services.NewCustomizeSearchService()@@ -166,7 +166,7 @@ func InitializeJobs(ctx context.Context, cfg *config.Config, svcs *Services) *Jo// no longer maintained by hand. wire.Struct assembles the aggregate Services.var ServiceSet = wire.NewSet(- provideResourcesFSInternal, services.NewEventService, services.NewActivityService, services.NewSettingsService, services.NewKVService, services.NewJobService, services.NewSettingsSearchService, services.NewCustomizeSearchService, services.NewApplicationImagesService, services.NewDockerClientService, services.NewRoleService, services.NewSessionService, services.NewEnvironmentService, services.NewNotificationService, services.NewVulnerabilityService, services.NewImageUpdateService, services.NewImageService, services.NewBuildService, services.NewBuildWorkspaceService, services.NewProjectService, services.NewContainerService, services.NewDashboardService, services.NewNetworkService, services.NewPortService, services.NewSwarmService, services.NewTemplateService, services.NewOidcService, services.NewSystemService, services.NewSystemUpgradeService, services.NewDiagnosticsService, services.NewGitOpsSyncService, services.NewWebhookService, provideVersionServiceInternal,+ provideResourcesFSInternal, services.NewEventService, services.NewActivityService, services.NewSettingsService, services.NewKVService, services.NewJobService, services.NewSettingsSearchService, services.NewCustomizeSearchService, services.NewApplicationImagesService, services.NewDockerClientService, services.NewRoleService, services.NewSessionService, services.NewEnvironmentService, services.NewNotificationService, services.NewVulnerabilityService, services.NewImageUpdateService, services.NewImageService, services.NewBuildService, services.NewBuildWorkspaceService, provideProjectServiceInternal, services.NewContainerService, services.NewDashboardService, services.NewNetworkService, services.NewPortService, services.NewSwarmService, services.NewTemplateService, services.NewOidcService, services.NewSystemService, services.NewSystemUpgradeService, services.NewDiagnosticsService, services.NewGitOpsSyncService, services.NewWebhookService, provideVersionServiceInternal,provideGitRepositoryServiceInternal,provideVolumeServiceInternal,provideAuthServiceInternal,diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 20de3d662..3d57e327d 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -42,19 +42,22 @@ import ()type ProjectService struct {- db *database.DB- settingsService *SettingsService- eventService *EventService- imageService *ImageService- dockerService *DockerClientService- buildService *BuildService- config *config.Config+ db *database.DB+ settingsService *SettingsService+ eventService *EventService+ imageService *ImageService+ dockerService *DockerClientService+ buildService *BuildService+ config *config.Config+ registryCredentialsProvider registryCredentialsProviderInternalcomposeNameCacheMu sync.RWMutexcomposeNameToProjID map[string]stringcomposeCache *cache.KeyedCache[string, composeCacheEntry]}+type registryCredentialsProviderInternal func(context.Context) ([]containerregistry.Credential, error)+type composeCacheEntry struct {composePath stringcomposeMtime time.Time@@ -75,6 +78,27 @@ func NewProjectService(db *database.DB, settingsService *SettingsService, eventS}}+func (s *ProjectService) WithRegistryCredentialsProvider(provider func(context.Context) ([]containerregistry.Credential, error)) *ProjectService {+ if s == nil {+ return nil+ }+ s.registryCredentialsProvider = provider+ return s+}++func (s *ProjectService) resolveRegistryCredentialsInternal(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)+ }++ return credentials, nil+}+func (s *ProjectService) getPathMapper(ctx context.Context) *projects.PathMapper {configuredPath := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")@@ -203,7 +227,6 @@ const ()var (- composePullProjectServicesInternal = projects.ComposePullcomposeStopProjectServicesInternal = projects.ComposeStopcomposeUpProjectServicesInternal = projects.ComposeUp)@@ -686,17 +709,29 @@ func (s *ProjectService) reconcilePulledImageRefsInternal(ctx context.Context, i}}-func (s *ProjectService) composePullSelectedServicesInternal(ctx context.Context, compProj *composetypes.Project, servicesToUpdate []string) error {+func (s *ProjectService) composePullSelectedServicesInternal(+ ctx context.Context,+ compProj *composetypes.Project,+ servicesToUpdate []string,+ user models.User,+ credentials []containerregistry.Credential,+) error {if compProj == nil {return nil}- imageRefsToReconcile := buildSelectedProjectImageRefsInternal(compProj, servicesToUpdate)- if err := composePullProjectServicesInternal(ctx, compProj, servicesToUpdate); err != nil {- return err+ imageRefsToPull := buildSelectedProjectImageRefsInternal(compProj, servicesToUpdate)+ if len(imageRefsToPull) == 0 {+ return nil+ }++ progressWriter, _ := ctx.Value(projects.ProgressWriterKey{}).(io.Writer)+ for _, imageRef := range imageRefsToPull {+ if err := s.pullAndReconcileImageInternal(ctx, imageRef, progressWriter, user, credentials); err != nil {+ return err+ }}- s.reconcilePulledImageRefsInternal(ctx, imageRefsToReconcile)return nil}@@ -707,6 +742,10 @@ func (s *ProjectService) pullAndReconcileImageInternal(user models.User,credentials []containerregistry.Credential,) error {+ if s == nil || s.imageService == nil {+ return errors.New("image service not available")+ }+settings := s.settingsService.GetSettingsConfig()pullCtx, pullCancel := timeouts.WithTimeout(ctx, settings.DockerImagePullTimeout.AsInt(), timeouts.DefaultDockerImagePull)@@ -761,9 +800,17 @@ func (s *ProjectService) UpdateProjectServices(ctx context.Context, projectID streturn err}+ credentials, err := s.resolveRegistryCredentialsInternal(ctx)+ if err != nil {+ if statusErr := s.updateProjectStatusInternal(ctx, projectID, previousStatus); statusErr != nil {+ slog.ErrorContext(ctx, "UpdateProjectServices: failed to restore project status after credential lookup failure", "projectID", projectID, "error", statusErr)+ }+ return fmt.Errorf("resolve registry credentials: %w", err)+ }+// 3. Pull images for specific serviceswriteProjectProgressInternal(ctx, "Pulling updated service images", 20, "pull")- if err := s.composePullSelectedServicesInternal(ctx, compProj, servicesToUpdate); err != nil {+ if err := s.composePullSelectedServicesInternal(ctx, compProj, servicesToUpdate, user, credentials); err != nil {if statusErr := s.updateProjectStatusInternal(ctx, projectID, previousStatus); statusErr != nil {slog.ErrorContext(ctx, "UpdateProjectServices: failed to restore project status after compose pull failure", "projectID", projectID, "error", statusErr)}diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex ea5ff2267..9a6bac937 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -25,6 +25,7 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/projects"buildtypes "github.com/getarcaneapp/arcane/types/builds"+ "github.com/getarcaneapp/arcane/types/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/image"projecttypes "github.com/getarcaneapp/arcane/types/project"libupdater "github.com/getarcaneapp/updater/pkg/labels"@@ -73,6 +74,10 @@ func setupProjectTestDB(t *testing.T) *database.DB {}func newProjectImagePullServer(t *testing.T, inspectByRef map[string]dockertypesimage.InspectResponse) *httptest.Server {+ return newProjectImagePullServerWithObserverInternal(t, inspectByRef, nil)+}++func newProjectImagePullServerWithObserverInternal(t *testing.T, inspectByRef map[string]dockertypesimage.InspectResponse, onPull func(fullRef string, authHeader string)) *httptest.Server {t.Helper()server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {@@ -87,6 +92,9 @@ func newProjectImagePullServer(t *testing.T, inspectByRef map[string]dockertypesfullRef += ":" + tag}}+ if onPull != nil {+ onPull(fullRef, strings.TrimSpace(r.Header.Get("X-Registry-Auth")))+ }w.Header().Set("Content-Type", "application/json")_, _ = io.WriteString(w, fmt.Sprintf(`{"status":"Pulled","id":%q}`+"\n", fullRef))@@ -758,17 +766,31 @@ func TestProjectService_ComposePullSelectedServicesInternal_ReconcilesOnlyOnSuccsettingsService, err := NewSettingsService(ctx, db)require.NoError(t, err)- imageRef := "registry.example.com/team/app:9.9.9"- repository := "registry.example.com/team/app"- imageID := "sha256:team-app-compose"- imageDigest := digest.FromString("team-app-compose-digest").String()-- server := newProjectImagePullServer(t, map[string]dockertypesimage.InspectResponse{- imageRef: {- ID: imageID,- RepoTags: []string{imageRef},- RepoDigests: []string{repository + "@" + imageDigest},+ privateImageRef := "registry.example.com/team/app:9.9.9"+ privateRepository := "registry.example.com/team/app"+ privateImageID := "sha256:team-app-compose"+ privateImageDigest := digest.FromString("team-app-compose-digest").String()+ publicImageRef := "docker.io/library/nginx:1.27"+ publicRepository := "docker.io/library/nginx"+ publicImageID := "sha256:nginx-compose"+ publicImageDigest := digest.FromString("nginx-compose-digest").String()++ pullsByRef := map[string]int{}+ authHeadersByRef := map[string]string{}+ server := newProjectImagePullServerWithObserverInternal(t, map[string]dockertypesimage.InspectResponse{+ privateImageRef: {+ ID: privateImageID,+ RepoTags: []string{privateImageRef},+ RepoDigests: []string{privateRepository + "@" + privateImageDigest},+ },+ publicImageRef: {+ ID: publicImageID,+ RepoTags: []string{publicImageRef},+ RepoDigests: []string{publicRepository + "@" + publicImageDigest},},+ }, func(fullRef string, authHeader string) {+ pullsByRef[fullRef]+++ authHeadersByRef[fullRef] = authHeader})dockerService := &DockerClientService{client: newTestDockerClient(t, server)}@@ -782,11 +804,15 @@ func TestProjectService_ComposePullSelectedServicesInternal_ReconcilesOnlyOnSuccServices: composetypes.Services{"app": {Name: "app",- Image: imageRef,+ Image: privateImageRef,+ },+ "app-copy": {+ Name: "app-copy",+ Image: privateImageRef,},"sidecar": {Name: "sidecar",- Image: "registry.example.com/team/sidecar:1.0.0",+ Image: publicImageRef,},"builder": {Name: "builder",@@ -798,7 +824,7 @@ func TestProjectService_ComposePullSelectedServicesInternal_ReconcilesOnlyOnSuccnow := time.Now().UTC().Add(-time.Hour)require.NoError(t, db.Create(&models.ImageUpdateRecord{ID: "sha256:selected-old",- Repository: repository,+ Repository: privateRepository,Tag: "9.9.9",HasUpdate: true,UpdateType: models.UpdateTypeDigest,@@ -807,23 +833,31 @@ func TestProjectService_ComposePullSelectedServicesInternal_ReconcilesOnlyOnSucc}).Error)require.NoError(t, db.Create(&models.ImageUpdateRecord{ID: "sha256:sidecar-old",- Repository: "registry.example.com/team/sidecar",- Tag: "1.0.0",+ Repository: publicRepository,+ Tag: "1.27",HasUpdate: true,UpdateType: models.UpdateTypeDigest,- CurrentVersion: "1.0.0",+ CurrentVersion: "1.27",CheckTime: now,}).Error)- originalComposePull := composePullProjectServicesInternal- t.Cleanup(func() { composePullProjectServicesInternal = originalComposePull })+ credentials := []containerregistry.Credential{{+ URL: "https://registry.example.com",+ Username: "arcane-user",+ Token: "arcane-token",+ Enabled: true,+ }}- composePullProjectServicesInternal = func(_ context.Context, _ *composetypes.Project, services []string) error {- assert.Equal(t, []string{"app"}, services)- return nil- }+ require.NoError(t, svc.composePullSelectedServicesInternal(ctx, projectDef, []string{"app", "app-copy", "sidecar", "builder"}, systemUser, credentials))+ assert.Equal(t, 1, pullsByRef[privateImageRef], "duplicate service refs should only be pulled once")+ assert.Equal(t, 1, pullsByRef[publicImageRef], "selected public image should still be pulled")+ assert.Len(t, pullsByRef, 2, "build-backed services should not trigger image pulls")- require.NoError(t, svc.composePullSelectedServicesInternal(ctx, projectDef, []string{"app"}))+ privateAuth := decodeRegistryAuth(t, authHeadersByRef[privateImageRef])+ assert.Equal(t, "arcane-user", privateAuth.Username)+ assert.Equal(t, "arcane-token", privateAuth.Password)+ assert.Equal(t, "registry.example.com", privateAuth.ServerAddress)+ assert.Empty(t, authHeadersByRef[publicImageRef], "public image pull should not receive unrelated registry auth")// sha256:selected-old may still be used by another container — must not be cleared (fixes #2453).var selectedRecord models.ImageUpdateRecord@@ -834,10 +868,15 @@ func TestProjectService_ComposePullSelectedServicesInternal_ReconcilesOnlyOnSuccrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:sidecar-old").First(&sidecarRecord).Error)assert.True(t, sidecarRecord.HasUpdate)- var currentRecord models.ImageUpdateRecord- require.NoError(t, db.WithContext(ctx).Where("id = ?", imageID).First(¤tRecord).Error)- assert.False(t, currentRecord.HasUpdate)- assert.Equal(t, imageDigest, stringPtrToString(currentRecord.LatestDigest))+ var privateCurrentRecord models.ImageUpdateRecord+ require.NoError(t, db.WithContext(ctx).Where("id = ?", privateImageID).First(&privateCurrentRecord).Error)+ assert.False(t, privateCurrentRecord.HasUpdate)+ assert.Equal(t, privateImageDigest, stringPtrToString(privateCurrentRecord.LatestDigest))++ var publicCurrentRecord models.ImageUpdateRecord+ require.NoError(t, db.WithContext(ctx).Where("id = ?", publicImageID).First(&publicCurrentRecord).Error)+ assert.False(t, publicCurrentRecord.HasUpdate)+ assert.Equal(t, publicImageDigest, stringPtrToString(publicCurrentRecord.LatestDigest))}func TestProjectService_ComposePullSelectedServicesInternal_LeavesRecordsWhenPullFails(t *testing.T) {@@ -850,7 +889,16 @@ func TestProjectService_ComposePullSelectedServicesInternal_LeavesRecordsWhenPulimageRef := "registry.example.com/team/app:9.9.9"repository := "registry.example.com/team/app"- dockerService := &DockerClientService{}+ failingServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ if strings.HasSuffix(r.URL.Path, "/images/create") {+ http.Error(w, "pull failed", http.StatusUnauthorized)+ return+ }+ http.NotFound(w, r)+ }))+ t.Cleanup(failingServer.Close)++ dockerService := &DockerClientService{client: newTestDockerClient(t, failingServer)}imageUpdateService := NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)imageService := NewImageService(db, dockerService, nil, imageUpdateService, nil, NewEventService(db, nil, nil))svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, config.Load())@@ -875,16 +923,9 @@ func TestProjectService_ComposePullSelectedServicesInternal_LeavesRecordsWhenPulCheckTime: time.Now().UTC().Add(-time.Hour),}).Error)- originalComposePull := composePullProjectServicesInternal- t.Cleanup(func() { composePullProjectServicesInternal = originalComposePull })-- composePullProjectServicesInternal = func(context.Context, *composetypes.Project, []string) error {- return errors.New("compose pull failed")- }-- err = svc.composePullSelectedServicesInternal(ctx, projectDef, []string{"app"})+ err = svc.composePullSelectedServicesInternal(ctx, projectDef, []string{"app"}, systemUser, nil)require.Error(t, err)- assert.ErrorContains(t, err, "compose pull failed")+ assert.ErrorContains(t, err, "failed to pull image")var selectedRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:selected-old").First(&selectedRecord).Error)@@ -905,8 +946,22 @@ func TestProjectService_UpdateProjectServicesHardFailsWhenPullFailsInternal(t *trequire.NoError(t, err)require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))+ imageRef := "registry.example.com/team/app:9.9.9"+ failingServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ if strings.HasSuffix(r.URL.Path, "/images/create") {+ http.Error(w, "compose pull failed", http.StatusUnauthorized)+ return+ }+ http.NotFound(w, r)+ }))+ t.Cleanup(failingServer.Close)++ dockerService := &DockerClientService{client: newTestDockerClient(t, failingServer)}+ imageUpdateService := NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)+ imageService := NewImageService(db, dockerService, nil, imageUpdateService, nil, NewEventService(db, nil, nil))+projectPath := createComposeProjectDir(t, projectsDir, "compose-update-pull-fail")- require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n app:\n image: registry.example.com/team/app:9.9.9\n"), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n app:\n image: "+imageRef+"\n"), 0o644))projectRecord := &models.Project{BaseModel: models.BaseModel{ID: "project-update-pull-fail"},@@ -926,23 +981,17 @@ func TestProjectService_UpdateProjectServicesHardFailsWhenPullFailsInternal(t *tCheckTime: time.Now().UTC().Add(-time.Hour),}).Error)- originalComposePull := composePullProjectServicesInternaloriginalComposeUp := composeUpProjectServicesInternalt.Cleanup(func() {- composePullProjectServicesInternal = originalComposePullcomposeUpProjectServicesInternal = originalComposeUp})-- composePullProjectServicesInternal = func(context.Context, *composetypes.Project, []string) error {- return errors.New("compose pull failed")- }upCalled := falsecomposeUpProjectServicesInternal = func(context.Context, *composetypes.Project, []string, bool, bool) error {upCalled = truereturn errors.New("compose up should not run")}- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, config.Load())+ svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, config.Load())err = svc.UpdateProjectServices(ctx, projectRecord.ID, []string{"app"}, systemUser)require.Error(t, err)assert.ErrorContains(t, err, "pull updated service images")@@ -967,8 +1016,25 @@ func TestProjectService_UpdateProjectServicesForcesRecreateInternal(t *testing.Trequire.NoError(t, err)require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))+ imageRef := "registry.example.com/team/app:9.9.9"+ repository := "registry.example.com/team/app"+ imageID := "sha256:project-update-force"+ imageDigest := digest.FromString("project-update-force-digest").String()++ server := newProjectImagePullServer(t, map[string]dockertypesimage.InspectResponse{+ imageRef: {+ ID: imageID,+ RepoTags: []string{imageRef},+ RepoDigests: []string{repository + "@" + imageDigest},+ },+ })++ dockerService := &DockerClientService{client: newTestDockerClient(t, server)}+ imageUpdateService := NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)+ imageService := NewImageService(db, dockerService, nil, imageUpdateService, nil, NewEventService(db, nil, nil))+projectPath := createComposeProjectDir(t, projectsDir, "compose-update-force")- require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n app:\n image: registry.example.com/team/app:9.9.9\n"), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n app:\n image: "+imageRef+"\n"), 0o644))projectRecord := &models.Project{BaseModel: models.BaseModel{ID: "project-update-force"},@@ -979,18 +1045,12 @@ func TestProjectService_UpdateProjectServicesForcesRecreateInternal(t *testing.T}require.NoError(t, db.Create(projectRecord).Error)- originalComposePull := composePullProjectServicesInternaloriginalComposeStop := composeStopProjectServicesInternaloriginalComposeUp := composeUpProjectServicesInternalt.Cleanup(func() {- composePullProjectServicesInternal = originalComposePullcomposeStopProjectServicesInternal = originalComposeStopcomposeUpProjectServicesInternal = originalComposeUp})-- composePullProjectServicesInternal = func(context.Context, *composetypes.Project, []string) error {- return nil- }composeStopProjectServicesInternal = func(context.Context, *composetypes.Project, []string) error {return nil}@@ -1004,7 +1064,7 @@ func TestProjectService_UpdateProjectServicesForcesRecreateInternal(t *testing.Treturn errors.New("compose up failed after assertion")}- svc := NewProjectService(db, settingsService, nil, nil, nil, nil, config.Load())+ svc := NewProjectService(db, settingsService, nil, imageService, dockerService, nil, config.Load())err = svc.UpdateProjectServices(ctx, projectRecord.ID, []string{"app"}, systemUser)require.Error(t, err)assert.True(t, upCalled)diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.goindex 2797c074b..1639e7ffe 100644--- a/backend/internal/services/updater_service_test.go+++ b/backend/internal/services/updater_service_test.go@@ -3,7 +3,13 @@ package servicesimport ("bytes""context"+ "encoding/json""errors"+ "io"+ "net/http"+ "net/http/httptest"+ "net/url"+ "strings""testing""time"@@ -11,10 +17,159 @@ import (moduleapi "github.com/getarcaneapp/updater/api"updaterlabels "github.com/getarcaneapp/updater/pkg/labels"moduletypes "github.com/getarcaneapp/updater/types"+ "github.com/moby/moby/api/types/container"+ dockertypesimage "github.com/moby/moby/api/types/image"+ "github.com/moby/moby/client""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")+type fakeDockerClientProviderInternal struct {+ client any+}++func (f fakeDockerClientProviderInternal) DockerClient(context.Context) (*client.Client, error) {+ cli, _ := f.client.(*client.Client)+ if cli == nil {+ return nil, errors.New("docker client unavailable")+ }+ return cli, nil+}++type fakeImagePullerInternal struct {+ pulled []string+ fail map[string]error+}++func (f *fakeImagePullerInternal) PullImage(_ context.Context, imageRef string, _ io.Writer) error {+ f.pulled = append(f.pulled, imageRef)+ if f.fail == nil {+ return nil+ }+ return f.fail[imageRef]+}++type fakeRunRecorderInternal struct {+ results []moduletypes.ResourceResult+}++func (f *fakeRunRecorderInternal) RecordUpdateRun(_ context.Context, result moduletypes.ResourceResult) error {+ f.results = append(f.results, result)+ return nil+}++type fakeSettingsProviderInternal struct{}++func (fakeSettingsProviderInternal) ExcludedContainers(context.Context) ([]string, error) {+ return nil, nil+}++type fakeUsedImageCollectorInternal struct {+ images map[string]struct{}+}++func (f fakeUsedImageCollectorInternal) UsedImages(context.Context) (map[string]struct{}, error) {+ return f.images, nil+}++type fakeProjectUpdaterInternal struct {+ projects map[string]moduletypes.ComposeProject+ updateErrs map[string]error+ calls []string+}++func (f *fakeProjectUpdaterInternal) ProjectByComposeName(_ context.Context, composeName string) (moduletypes.ComposeProject, error) {+ if project, ok := f.projects[composeName]; ok {+ return project, nil+ }+ return moduletypes.ComposeProject{}, errors.New("project not found")+}++func (f *fakeProjectUpdaterInternal) UpdateServices(_ context.Context, projectID string, services []string) error {+ f.calls = append(f.calls, projectID+":"+strings.Join(services, ","))+ if f.updateErrs == nil {+ return nil+ }+ return f.updateErrs[projectID]+}++func newUpdaterApplyPendingDockerServerInternal(+ t *testing.T,+ containers []container.Summary,+ verificationByService map[string][]container.Summary,+ inspectByID map[string]container.InspectResponse,+ imageInspectByRef map[string]dockertypesimage.InspectResponse,+) *httptest.Server {+ t.Helper()++ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ switch {+ case strings.HasSuffix(r.URL.Path, "/_ping"):+ _, _ = io.WriteString(w, "OK")+ case strings.HasSuffix(r.URL.Path, "/version"):+ w.Header().Set("Content-Type", "application/json")+ _ = json.NewEncoder(w).Encode(map[string]string{+ "ApiVersion": "1.41",+ "MinAPIVersion": "1.24",+ "Version": "24.0.0",+ })+ case strings.HasSuffix(r.URL.Path, "/images/json"):+ w.Header().Set("Content-Type", "application/json")+ _ = json.NewEncoder(w).Encode([]dockertypesimage.Summary{})+ case strings.Contains(r.URL.Path, "/images/") && strings.HasSuffix(r.URL.Path, "/json"):+ encodedRef := strings.TrimSuffix(r.URL.Path[strings.LastIndex(r.URL.Path, "/images/")+len("/images/"):], "/json")+ imageRef, err := url.PathUnescape(encodedRef)+ require.NoError(t, err)+ inspect, ok := imageInspectByRef[imageRef]+ if !ok {+ http.NotFound(w, r)+ return+ }+ w.Header().Set("Content-Type", "application/json")+ _ = json.NewEncoder(w).Encode(inspect)+ case strings.HasSuffix(r.URL.Path, "/containers/json"):+ response := containers+ if filters := strings.TrimSpace(r.URL.Query().Get("filters")); filters != "" {+ var raw map[string]map[string]bool+ require.NoError(t, json.Unmarshal([]byte(filters), &raw))+ projectName := ""+ serviceName := ""+ for value := range raw["label"] {+ switch {+ case strings.HasPrefix(value, "com.docker.compose.project="):+ projectName = strings.TrimPrefix(value, "com.docker.compose.project=")+ case strings.HasPrefix(value, "com.docker.compose.service="):+ serviceName = strings.TrimPrefix(value, "com.docker.compose.service=")+ }+ }+ if projectName != "" && serviceName != "" {+ if matched, ok := verificationByService[projectName+"/"+serviceName]; ok {+ response = matched+ } else {+ response = nil+ }+ }+ }+ w.Header().Set("Content-Type", "application/json")+ _ = json.NewEncoder(w).Encode(response)+ case strings.Contains(r.URL.Path, "/containers/") && strings.HasSuffix(r.URL.Path, "/json"):+ containerID := strings.TrimSuffix(strings.TrimPrefix(r.URL.Path[strings.LastIndex(r.URL.Path, "/containers/"):], "/containers/"), "/json")+ inspect, ok := inspectByID[containerID]+ if !ok {+ http.NotFound(w, r)+ return+ }+ w.Header().Set("Content-Type", "application/json")+ _ = json.NewEncoder(w).Encode(inspect)+ default:+ http.NotFound(w, r)+ }+ }))++ t.Cleanup(server.Close)+ return server+}+type mockSystemUpgradeServiceInternal struct {triggerCalled booltriggerError error@@ -287,6 +442,165 @@ func TestUpdaterService_RecordUpdateRunAdapterInternal(t *testing.T) {assert.Equal(t, "test", record.Details["source"])}+func TestUpdaterService_ApplyPending_ProjectFailureDoesNotBlockOtherProjectsInternal(t *testing.T) {+ ctx := context.Background()++ oldRefFailed := "registry.example.com/team/fail:1.0.0"+ newRefFailed := "registry.example.com/team/fail:1.0.1"+ oldRefUpdated := "registry.example.com/team/success:2.0.0"+ newRefUpdated := "registry.example.com/team/success:2.0.1"+ oldImageIDFailed := "sha256:old-fail"+ newImageIDFailed := "sha256:new-fail"+ oldImageIDUpdated := "sha256:old-success"+ newImageIDUpdated := "sha256:new-success"++ failedLabels := map[string]string{+ "com.docker.compose.project": "proj-fail",+ "com.docker.compose.service": "app",+ }+ updatedLabels := map[string]string{+ "com.docker.compose.project": "proj-success",+ "com.docker.compose.service": "app",+ }++ containers := []container.Summary{+ {+ ID: "container-fail",+ Names: []string{"/proj-fail-app-1"},+ Image: oldRefFailed,+ ImageID: oldImageIDFailed,+ Labels: failedLabels,+ State: "running",+ },+ {+ ID: "container-success",+ Names: []string{"/proj-success-app-1"},+ Image: oldRefUpdated,+ ImageID: oldImageIDUpdated,+ Labels: updatedLabels,+ State: "running",+ },+ }++ verificationByService := map[string][]container.Summary{+ "proj-success/app": {+ {+ ID: "container-success-new",+ Names: []string{"/proj-success-app-1"},+ Image: newRefUpdated,+ ImageID: newImageIDUpdated,+ Labels: updatedLabels,+ State: "running",+ },+ },+ }++ inspectByID := map[string]container.InspectResponse{+ "container-fail": {+ ID: "container-fail",+ Image: oldImageIDFailed,+ Config: &container.Config{+ Image: oldRefFailed,+ Labels: failedLabels,+ },+ },+ "container-success": {+ ID: "container-success",+ Image: oldImageIDUpdated,+ Config: &container.Config{+ Image: oldRefUpdated,+ Labels: updatedLabels,+ },+ },+ }++ imageInspectByRef := map[string]dockertypesimage.InspectResponse{+ newRefFailed: {+ ID: newImageIDFailed,+ RepoTags: []string{newRefFailed},+ },+ newRefUpdated: {+ ID: newImageIDUpdated,+ RepoTags: []string{newRefUpdated},+ },+ }++ server := newUpdaterApplyPendingDockerServerInternal(t, containers, verificationByService, inspectByID, imageInspectByRef)+ dockerProvider := fakeDockerClientProviderInternal{client: newTestDockerClient(t, server)}+ puller := &fakeImagePullerInternal{}+ recorder := &fakeRunRecorderInternal{}+ projectUpdater := &fakeProjectUpdaterInternal{+ projects: map[string]moduletypes.ComposeProject{+ "proj-fail": {ID: "project-fail", Name: "proj-fail"},+ "proj-success": {ID: "project-success", Name: "proj-success"},+ },+ updateErrs: map[string]error{+ "project-fail": errors.New("pull updated service images: unauthorized"),+ },+ }++ svc := NewUpdaterService(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)+ svc.engine = moduleapi.NewService(moduleapi.Config{+ DockerClientProvider: dockerProvider,+ ImagePuller: puller,+ PendingStore: moduleapi.NewMemoryPendingStore(+ moduletypes.ImageUpdateRecord{+ ID: oldImageIDFailed,+ Repository: "registry.example.com/team/fail",+ Tag: "1.0.0",+ HasUpdate: true,+ UpdateType: moduletypes.UpdateTypeTag,+ CurrentVersion: "1.0.0",+ LatestVersion: ptr("1.0.1"),+ },+ moduletypes.ImageUpdateRecord{+ ID: oldImageIDUpdated,+ Repository: "registry.example.com/team/success",+ Tag: "2.0.0",+ HasUpdate: true,+ UpdateType: moduletypes.UpdateTypeTag,+ CurrentVersion: "2.0.0",+ LatestVersion: ptr("2.0.1"),+ },+ ),+ RunRecorder: recorder,+ Settings: fakeSettingsProviderInternal{},+ ProjectUpdater: projectUpdater,+ UsedImageCollector: fakeUsedImageCollectorInternal{images: map[string]struct{}{+ oldRefFailed: {},+ oldRefUpdated: {},+ }},+ LabelPolicy: updaterlabels.DefaultLabelPolicy(),+ })++ result, err := svc.ApplyPending(ctx, false)+ require.NoError(t, err)+ require.NotNil(t, result)+ assert.Equal(t, 3, result.Updated, "updated count should include both image pulls and the successfully updated container")+ assert.Equal(t, 1, result.Failed, "the failed project should be recorded as failed")+ assert.GreaterOrEqual(t, len(result.Items), 4)+ assert.ElementsMatch(t, []string{newRefFailed, newRefUpdated}, puller.pulled)+ assert.ElementsMatch(t, []string{"project-fail:app", "project-success:app"}, projectUpdater.calls)++ statusByResource := map[string]string{}+ errorByResource := map[string]string{}+ for _, item := range result.Items {+ statusByResource[item.ResourceID] = item.Status+ errorByResource[item.ResourceID] = item.Error+ }++ assert.Equal(t, moduletypes.StatusFailed, statusByResource["container-fail"])+ assert.Contains(t, errorByResource["container-fail"], "project-level update failed")+ assert.Equal(t, moduletypes.StatusUpdated, statusByResource["container-success"])++ var recordedStatuses []string+ for _, recorded := range recorder.results {+ recordedStatuses = append(recordedStatuses, recorded.Status)+ }+ assert.Contains(t, recordedStatuses, moduletypes.StatusFailed)+ assert.Contains(t, recordedStatuses, moduletypes.StatusUpdated)+}+func TestResolvePullableImageRefInternal(t *testing.T) {tests := []struct {name stringdiff --git a/backend/pkg/projects/cmds.go b/backend/pkg/projects/cmds.goindex 52afa8ff2..cdd6a6663 100644--- a/backend/pkg/projects/cmds.go+++ b/backend/pkg/projects/cmds.go@@ -70,33 +70,6 @@ func ComposeRestart(ctx context.Context, proj *types.Project, services []string)})}-func ComposePull(ctx context.Context, proj *types.Project, services []string) error {- // Detach from the HTTP request context so that proxy timeouts do not cancel- // long image pulls. See #1209.- pullCtx, cancel := detachFromHTTPContextInternal(ctx)- defer cancel()-- c, err := NewClient(pullCtx)- if err != nil {- return err- }- defer func() { _ = c.Close() }()-- filteredProject, err := filterProjectServicesForPullInternal(proj, services)- if err != nil {- return err- }- return c.svc.Pull(pullCtx, filteredProject, api.PullOptions{})-}--func filterProjectServicesForPullInternal(proj *types.Project, services []string) (*types.Project, error) {- if proj == nil || len(services) == 0 {- return proj, nil- }-- return proj.WithSelectedServices(services, types.IgnoreDependencies)-}-func ComposeStop(ctx context.Context, proj *types.Project, services []string) error {if len(services) == 0 {return nildiff --git a/backend/pkg/projects/cmds_test.go b/backend/pkg/projects/cmds_test.goindex 54fb9784b..e16585d5b 100644--- a/backend/pkg/projects/cmds_test.go+++ b/backend/pkg/projects/cmds_test.go@@ -83,43 +83,6 @@ func TestComposeStopSkipsWhenNoServicesSpecified(t *testing.T) {require.NoError(t, err)}-func TestFilterProjectServicesForPullInternalReturnsDeepCopiedProject(t *testing.T) {- project := &composetypes.Project{- Name: "demo",- Services: composetypes.Services{- "web": {- Name: "web",- DependsOn: composetypes.DependsOnConfig{- "db": {Condition: "service_started"},- },- },- "db": {- Name: "db",- },- },- Networks: composetypes.Networks{- "default": composetypes.NetworkConfig{- Name: "demo_default",- },- },- }-- filtered, err := filterProjectServicesForPullInternal(project, []string{"web"})- require.NoError(t, err)- require.NotNil(t, filtered)-- require.Contains(t, filtered.Services, "web")- require.NotContains(t, filtered.Services, "db")-- web := filtered.Services["web"]- delete(web.DependsOn, "db")- filtered.Services["web"] = web- delete(filtered.Networks, "default")-- require.Contains(t, project.Services["web"].DependsOn, "db")- require.Contains(t, project.Networks, "default")-}-func TestComposeUpOptions_RemoveOrphans(t *testing.T) {proj := &composetypes.Project{Name: "test"}