refactor: code deduplication and simplification by ndeloof · Pull Request #13759 · docker/compose

ndeloof · 2026-04-27T11:32:26Z

Pure refactoring — no functional changes. All existing tests pass.

Changes:

Extract withBackend() helper in cmd/compose/ to replace repetitive NewComposeService → backend.Foo boilerplate in pause, unpause, kill, start, stop, restart
Extract optionalTimeout() helper to deduplicate timeout-pointer construction in stop/restart
Collapse ~18 trivial event-helper one-liners in progress.go to newEvent() calls; keep only functions used ≥3 times or as function values
Remove redundant package-level wrapper functions in dependencies.go (leaves, roots, getChildren, filterChildren, filterParents) — replaced with method expressions; replace remove(slice, item) with slices.DeleteFunc
Extract removeResource() helper in down.go to deduplicate the remove-emit pattern shared by removeImage and removeVolume
Extract forEachContainerConcurrent() in containers.go to deduplicate the errgroup iteration pattern in pause, unpause, kill
Collapse three identical blocks in resolveSharedNamespaces (NetworkMode/Ipc/Pid) into a resolve closure
Inline containers.forEach (only 1 remaining call site); add mutation comment to sorted(); replace hasConfigHashLabel() with api.ConfigHashLabel directly; add labelFilter() factory for label filters; remove unused Set.Clear and Set.Union

Copilot

Pull request overview

Refactors Compose CLI/service code to reduce duplication by extracting shared helpers and inlining/removing trivial wrappers, while keeping behavior the same.

Changes:

Added shared helpers in cmd/compose/ (withBackend, optionalTimeout) and pkg/compose/ (forEachContainerConcurrent, removeResource, labelFilter) to deduplicate common patterns.
Simplified progress/event emission by collapsing many one-off event helper functions into direct newEvent(...) calls.
Removed unused utilities/wrappers (graph traversal wrapper fns; utils.Set methods/tests) and updated call sites/tests accordingly.

Reviewed changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
pkg/utils/set_test.go	Removes the `Union` unit test and its now-unused import.
pkg/utils/set.go	Removes unused `Set` methods and repositions `RemoveAll`.
pkg/compose/restart.go	Switches to `newEvent(...)` for restart progress events.
pkg/compose/remove.go	Simplifies iteration over stopped containers; adds cyclo suppression annotation.
pkg/compose/pull.go	Replaces pull progress helpers with `newEvent(...)` calls.
pkg/compose/ps_test.go	Updates label filtering to use `api.ConfigHashLabel` directly.
pkg/compose/progress.go	Collapses many trivial event helper wrappers into `newEvent(...)`; keeps function-value helpers.
pkg/compose/pause.go	Uses `forEachContainerConcurrent` to deduplicate pause/unpause concurrency pattern.
pkg/compose/monitor.go	Uses `api.ConfigHashLabel` directly (removes wrapper indirection).
pkg/compose/logs_test.go	Updates label filtering to use `api.ConfigHashLabel` directly.
pkg/compose/kill_test.go	Updates label filtering to use `api.ConfigHashLabel` directly.
pkg/compose/kill.go	Uses `forEachContainerConcurrent` and `newEvent(...)` for kill progress events.
pkg/compose/filters.go	Introduces `labelFilter(...)` and removes redundant `hasConfigHashLabel()`.
pkg/compose/down.go	Extracts `removeResource(...)` helper and switches stop events to `newEvent(...)`.
pkg/compose/dependencies.go	Removes redundant wrapper functions via method expressions; replaces custom slice remove with `slices.DeleteFunc`.
pkg/compose/convergence_test.go	Updates label filtering to use `api.ConfigHashLabel` directly.
pkg/compose/convergence.go	Replaces several progress helpers with `newEvent(...)`; refactors shared-namespace resolution via closure.
pkg/compose/containers.go	Adds `forEachContainerConcurrent`; documents `sorted()` as in-place mutation; uses `api.ConfigHashLabel` directly.
cmd/compose/stop.go	Uses `withBackend(...)` and `optionalTimeout(...)` to deduplicate backend/timeout boilerplate.
cmd/compose/start.go	Uses `withBackend(...)` to deduplicate backend creation boilerplate.
cmd/compose/restart.go	Uses `withBackend(...)` and `optionalTimeout(...)` to deduplicate backend/timeout boilerplate.
cmd/compose/pause.go	Uses `withBackend(...)` to deduplicate backend creation boilerplate.
cmd/compose/kill.go	Uses `withBackend(...)` to deduplicate backend creation boilerplate.
cmd/compose/backend.go	Adds new shared backend/timeout helper functions.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-27T11:38:48Z

+func (s Set[T]) RemoveAll(elements ...T) {
+	for _, e := range elements {
+s.Remove(e)
 	}
 }


Set is an exported type, and this change removes exported methods (Clear, Union). Even if they’re unused internally, this is a compile-time breaking API change for any downstream consumers importing pkg/utils. Consider keeping these methods as thin wrappers (potentially marked deprecated) or moving Set to an internal/ package if it’s not meant to be part of the public API.

Restored. Both Clear and Union are back as thin wrappers with // Deprecated: godoc comments, preserving API compatibility for any downstream consumers. Fixed in the latest commit.

Copilot · 2026-04-27T11:38:48Z

 	resource := "Image " + service.Image
-	s.events.On(pullingEvent(service.Image))
+	s.events.On(newEvent("Image "+service.Image, api.Working, api.StatusPulling))


resource is computed as "Image "+service.Image, but the progress events re-create the same string literal. Using the resource variable for the newEvent calls would avoid duplication and guarantees the event IDs stay consistent if the formatting ever changes.

Fixed — the newEvent calls now use the already-computed resource variable instead of re-constructing the string literal. Fixed in the latest commit.

Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

…pause/kill logic Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

codecov · 2026-04-27T11:52:16Z

Codecov Report

❌ Patch coverage is 82.63889% with 25 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
cmd/compose/pause.go	50.00%	5 Missing ⚠️
pkg/compose/pause.go	50.00%	5 Missing ⚠️
pkg/utils/set.go	16.66%	4 Missing and 1 partial ⚠️
cmd/compose/backend.go	60.00%	3 Missing and 1 partial ⚠️
pkg/compose/kill.go	70.00%	2 Missing and 1 partial ⚠️
pkg/compose/convergence.go	86.66%	1 Missing and 1 partial ⚠️
pkg/compose/down.go	94.11%	1 Missing ⚠️

📢 Thoughts on this report? Let us know!

glours

LGTM

glours · 2026-05-12T09:17:51Z

nit
Suggested change
returnlabelFilter(api.OneoffLabel, v)

Applied — oneOffFilter now uses labelFilter(api.OneoffLabel, v). Fixed in the latest commit.

glours · 2026-05-12T09:18:30Z

-
-func hasConfigHashLabel() string {
-	return api.ConfigHashLabel
+	return labelFilter(api.ContainerNumberLabel, fmt.Sprintf("%d", index))


nit
Suggested change
returnlabelFilter(api.ContainerNumberLabel, fmt.Sprintf("%d", index))
returnlabelFilter(api.ContainerNumberLabel, strconv.Itoa(index))

Applied — containerNumberFilter now uses labelFilter(api.ContainerNumberLabel, strconv.Itoa(index)). Fixed in the latest commit.

Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | patch | `v5.1.3` → `v5.1.4` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v5.1.4`](https://github.com/docker/compose/releases/tag/v5.1.4) [Compare Source](docker/compose@v5.1.3...v5.1.4) #### What's Changed ##### ✨ Improvements - feat: add stop lifecycle hook for external providers by [@glours](https://github.com/glours) in [#13779](docker/compose#13779) ##### 🐛 Fixes - fix: route OCI artifact pulls through Docker Desktop HTTP proxy by [@glours](https://github.com/glours) in [#13770](docker/compose#13770) - fix: restore stoppingEvent/stoppedEvent helpers for plugin stop hook by [@glours](https://github.com/glours) in [#13794](docker/compose#13794) - fix(publish): flag literal inline environment values by [@glours](https://github.com/glours) in [#13760](docker/compose#13760) ##### 🔧 Internal - ci: remove unused e2e job from merge workflow by [@glours](https://github.com/glours) in [#13740](docker/compose#13740) - chore: update cagent-action to `v1.4.4` by [@derekmisler](https://github.com/derekmisler) in [#13745](docker/compose#13745) - Change verb tense in Docker Compose reference documentation by [@ryanjbonnell](https://github.com/ryanjbonnell) in [#13773](docker/compose#13773) - pkg/compose: go fix by [@thaJeztah](https://github.com/thaJeztah) in [#13782](docker/compose#13782) - refactor: code deduplication and simplification by [@ndeloof](https://github.com/ndeloof) in [#13759](docker/compose#13759) - fix: make e2e tests pass reliably locally with Docker Desktop by [@glours](https://github.com/glours) in [#13741](docker/compose#13741) - refactor: drop Desktop beta-settings check; gate hint on LogsTab flag by [@glours](https://github.com/glours) in [#13755](docker/compose#13755) ##### ⚙️ Dependencies - build(deps): bump github.com/mattn/go-shellwords from `1.0.12` to `1.0.13` by [@dependabot](https://github.com/dependabot)\[bot] in [#13731](docker/compose#13731) - build(deps): bump github.com/docker/cli from `29.4.0+incompatible` to `29.4.2+incompatible` by [@dependabot](https://github.com/dependabot)\[bot] in [#13768](docker/compose#13768) - build(deps): bump github.com/moby/moby/client from `0.4.0` to `0.4.1` by [@dependabot](https://github.com/dependabot)\[bot] in [#13752](docker/compose#13752) - build(deps): bump github.com/docker/cli from `29.4.2+incompatible` to `29.4.3+incompatible` by [@dependabot](https://github.com/dependabot)\[bot] in [#13776](docker/compose#13776) - build(deps): bump google.golang.org/grpc from `1.80.0` to `1.81.0` by [@dependabot](https://github.com/dependabot)\[bot] in [#13775](docker/compose#13775) - build(deps): update to `go 1.26.3` by [@thaJeztah](https://github.com/thaJeztah) in [#13783](docker/compose#13783) - build(deps): bump google.golang.org/grpc from `1.81.0` to `1.81.1` by [@dependabot](https://github.com/dependabot)\[bot] in [#13791](docker/compose#13791) - build(deps): bump github.com/compose-spec/compose-go/v2 from `2.10.2` to `2.11.0` by [@dependabot](https://github.com/dependabot)\[bot] in [#13798](docker/compose#13798) - build(deps): bump github.com/docker/cli from `29.4.3+incompatible` to `29.5.1+incompatible` by [@dependabot](https://github.com/dependabot)\[bot] in [#13796](docker/compose#13796) - build(deps): bump golang.org/x/sys from `0.42.0` to `0.44.0` by [@dependabot](https://github.com/dependabot)\[bot] in [#13788](docker/compose#13788) #### New Contributors - [@ryanjbonnell](https://github.com/ryanjbonnell) made their first contribution in [#13773](docker/compose#13773) **Full Changelog**: <docker/compose@v5.1.3...v5.1.4> </details> --- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate).

CopilotAI review requested due to automatic review settings April 27, 2026 11:32

ndeloof requested a review from a team as a code owner April 27, 2026 11:32

ndeloof requested a review from glours April 27, 2026 11:32

Copilotstarted reviewing on behalf of ndeloof April 27, 2026 11:32 View session

CopilotAI reviewed Apr 27, 2026
View reviewed changes

ndeloof added 8 commits April 27, 2026 11:39

refactor(cmd): extract withBackend helper to remove CLI boilerplate
9e2b701
Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

refactor(compose): collapse trivial event-helper wrappers in progress.go
f443c41
Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

refactor(compose): remove redundant wrapper funcs in dependencies.go
a60a177
Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

refactor(compose): extract removeResource helper in down.go
44324e7
Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

refactor(compose): extract forEachContainerConcurrent to deduplicate …
732a74b
…pause/kill logic Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

refactor(compose): collapse resolveSharedNamespaces repeated blocks
9c2f14f
Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

refactor: miscellaneous small cleanups (forEach, filters, Set)
c86bcda
Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

refactor: fix lint issues from cleanup changes
de5e11d
Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

ndeloof force-pushed the cleanup/code-dedup branch from 63752ea to de5e11dCompare April 27, 2026 11:39

fix: restore deprecated Set.Clear/Union; use resource var in pull.go
9da4e7f
Assisted-By: docker-agent Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

glours previously approved these changes May 12, 2026
View reviewed changes

nit: use labelFilter consistently in filters.go
f10d5a9
Signed-off-by: Nicolas De loof <nicolas.deloof@gmail.com>

ndeloof dismissed glours’s stale review via f10d5a9May 12, 2026 09:21

glours approved these changes May 12, 2026
View reviewed changes

glours enabled auto-merge (rebase) May 12, 2026 09:27

glours merged commit 659b269 into docker:mainMay 12, 2026
41 checks passed

BrewTestBot mentioned this pull request May 20, 2026
docker-compose 5.1.4 Homebrew/homebrew-core#283843
Merged

rancherbot mentioned this pull request May 21, 2026
rddepman: bump dockerCompose from 5.1.3 to 5.1.4 rancher-sandbox/rancher-desktop#10325
Merged

Navigation Menu

Uh oh!

refactor: code deduplication and simplification - #13759

refactor: code deduplication and simplification#13759
glours merged 10 commits into
docker:mainfrom
ndeloof:cleanup/code-dedup

ndeloof commented Apr 27, 2026

Uh oh!

CopilotAI left a comment

Uh oh!

CopilotAIApr 27, 2026

Uh oh!

ndeloofApr 27, 2026

Uh oh!

CopilotAIApr 27, 2026

Uh oh!

ndeloofApr 27, 2026

Uh oh!

codecovBot commented Apr 27, 2026•
edited
Loading

Uh oh!

glours left a comment

Uh oh!

gloursMay 12, 2026

Uh oh!

ndeloofMay 12, 2026

Uh oh!

gloursMay 12, 2026

Uh oh!

ndeloofMay 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	returnlabelFilter(api.ContainerNumberLabel, fmt.Sprintf("%d", index))
	returnlabelFilter(api.ContainerNumberLabel, strconv.Itoa(index))

Uh oh!

Conversation

ndeloof commented Apr 27, 2026

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

CopilotAIApr 27, 2026

Choose a reason for hiding this comment

Uh oh!

ndeloofApr 27, 2026

Choose a reason for hiding this comment

Uh oh!

CopilotAIApr 27, 2026

Choose a reason for hiding this comment

Uh oh!

ndeloofApr 27, 2026

Choose a reason for hiding this comment

Uh oh!

codecovBot commented Apr 27, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

glours left a comment

Choose a reason for hiding this comment

Uh oh!

gloursMay 12, 2026

Choose a reason for hiding this comment

Uh oh!

ndeloofMay 12, 2026

Choose a reason for hiding this comment

Uh oh!

gloursMay 12, 2026

Choose a reason for hiding this comment

Uh oh!

ndeloofMay 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecovBot commented Apr 27, 2026•
edited
Loading