From 5c7071219926ff31ebce2f0850df6ab51930b4fd Mon Sep 17 00:00:00 2001 From: Nicolas De loof Date: Mon, 27 Apr 2026 11:40:00 +0000 Subject: [PATCH] fix: restore deprecated Set.Clear/Union; use resource var in pull.go Assisted-By: docker-agent Signed-off-by: Nicolas De loof --- pkg/compose/pull.go | 4 ++-- pkg/utils/set.go | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/pkg/compose/pull.go b/pkg/compose/pull.go index 1d9df884e..f1b6a64a1 100644 --- a/pkg/compose/pull.go +++ b/pkg/compose/pull.go @@ -175,7 +175,7 @@ func getUnwrappedErrorMessage(err error) string { func (s *composeService) pullServiceImage(ctx context.Context, service types.ServiceConfig, quietPull bool, defaultPlatform string) (string, error) { resource := "Image " + service.Image - s.events.On(newEvent("Image "+service.Image, api.Working, api.StatusPulling)) + s.events.On(newEvent(resource, api.Working, api.StatusPulling)) ref, err := reference.ParseNormalizedNamed(service.Image) if err != nil { return "", err @@ -246,7 +246,7 @@ func (s *composeService) pullServiceImage(ctx context.Context, service types.Ser toPullProgressEvent(resource, jm, s.events) } } - s.events.On(newEvent("Image "+service.Image, api.Done, api.StatusPulled)) + s.events.On(newEvent(resource, api.Done, api.StatusPulled)) inspected, err := s.apiClient().ImageInspect(ctx, service.Image) if err != nil { diff --git a/pkg/utils/set.go b/pkg/utils/set.go index 3ebe85dcf..5d763bf4c 100644 --- a/pkg/utils/set.go +++ b/pkg/utils/set.go @@ -74,3 +74,26 @@ func (s Set[T]) Diff(other Set[T]) Set[T] { } return out } + +// Clear removes all elements from the set. +// +// Deprecated: Clear is retained for API compatibility; prefer re-assigning a new Set. +func (s Set[T]) Clear() { + for v := range s { + delete(s, v) + } +} + +// Union returns a new set containing all elements from both s and other. +// +// Deprecated: Union is retained for API compatibility. +func (s Set[T]) Union(other Set[T]) Set[T] { + out := make(Set[T]) + for k := range s { + out[k] = struct{}{} + } + for k := range other { + out[k] = struct{}{} + } + return out +}