fix: restore stoppingEvent/stoppedEvent helpers for plugin stop hook#13794
Merged
Conversation
The stop lifecycle hook added in 672dc14 calls stoppingEvent and stoppedEvent from pkg/compose/plugins.go, but the helpers had been removed by the earlier wrapper-cleanup in da530c7. The result was a broken go build for pkg/compose on upstream/main. Restore the two helpers alongside the symmetric creating/created and removing/removed pairs so call sites in plugins.go match the existing pattern used in the same switch. Signed-off-by: Guillaume Lours <glours@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Restores the missing progress event helper functions used by the plugin stop lifecycle hook so pkg/compose builds again and the plugin progress reporting follows the same helper pattern as other lifecycle hooks.
Changes:
- Reintroduces
stoppingEventandstoppedEventhelper functions inpkg/compose/progress.go. - Uses existing
api.StatusStopping/api.StatusStoppedstatus texts vianewEventto match the establishedcreating/createdandremoving/removedpattern.
There was a problem hiding this comment.
Assessment: 🟢 APPROVE
This PR correctly restores the stoppingEvent and stoppedEvent helper functions in pkg/compose/progress.go that were accidentally removed during the refactor in da530c723. The restored helpers follow the same pattern as the existing creatingEvent/createdEvent and removingEvent/removedEvent pairs, and the fix resolves the broken build caused by the missing functions referenced in plugins.go.
No issues found. The change is minimal, targeted, and correct.
ndeloof
approved these changes
May 18, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
May 21, 2026
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. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xODYuNCIsInVwZGF0ZWRJblZlciI6IjQzLjE4Ni40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiLCJhdXRvbWF0aW9uOmJvdC1hdXRob3JlZCIsImRlcGVuZGVuY3ktdHlwZTo6cGF0Y2giXX0=-->
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What I did
The stop lifecycle hook added in 672dc14 calls stoppingEvent and stoppedEvent from pkg/compose/plugins.go, but the helpers had been removed by the earlier wrapper-cleanup in da530c7. The result was a broken go build for pkg/compose on upstream/main.
Restore the two helpers alongside the symmetric creating/created and removing/removed pairs so call sites in plugins.go match the existing pattern used in the same switch.
Related issue
N/A
(not mandatory) A picture of a cute animal, if possible in relation to what you did