pkg/compose: explicitly map AuthConfig fields instead of a direct cast #13253
+11
−2
Conversation
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
b5ef738 to
07b2734
Compare
Commit [cli@27b2797] forked the AuthConfig type from the API, and changed existing code to do a direct cast / convert of the forked type to the API type. This can cause issues if the API types diverges, such as the removal of the Email field. This patch explicitly maps each field to the corresponding API type, but adds some TODOs, because various code-paths only included a subset of the fields, which may be intentional for fields that were meant to be handled on the daemon / registry-client only. We should evaluate these conversions to make sure these fields should be sent from the client or not (and possibly even removed from the API type). [cli@27b2797]: docker/cli@27b2797 Signed-off-by: Sebastiaan van Stijn <[email protected]>
07b2734 to
f5fcf7e
Compare
ndeloof
approved these changes
Sep 29, 2025
glours
approved these changes
Sep 29, 2025
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Oct 10, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | minor | `v2.39.4` -> `v2.40.0` | 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> ### [`v2.40.0`](https://github.com/docker/compose/releases/tag/v2.40.0) [Compare Source](docker/compose@v2.39.4...v2.40.0) #### What's Changed ##### ✨ Improvements - publish Compose application as compose.yaml + images by [@​ndeloof](https://github.com/ndeloof) in [#​13257](docker/compose#13257) ##### 🐛 Fixes - resolve secrets based on env var before executing bake by [@​ndeloof](https://github.com/ndeloof) in [#​13237](docker/compose#13237) - pass bake secrets by env by [@​ndeloof](https://github.com/ndeloof) in [#​13249](docker/compose#13249) - escape $ in bake.json as interpolation already has been managed by cpmpose by [@​ndeloof](https://github.com/ndeloof) in [#​13259](docker/compose#13259) ##### 🔧 Internal - pkg/compose: remove uses of deprecated mitchellh/mapstructure module by [@​thaJeztah](https://github.com/thaJeztah) in [#​13239](docker/compose#13239) - pkg/watch: remove unused IsWindowsShortReadError by [@​thaJeztah](https://github.com/thaJeztah) in [#​13052](docker/compose#13052) - pkg/compose: build: remove permissions warning on Windows by [@​thaJeztah](https://github.com/thaJeztah) in [#​13236](docker/compose#13236) - pluginMain: remove uses of DockerCLI.Apply by [@​thaJeztah](https://github.com/thaJeztah) in [#​13240](docker/compose#13240) - use containerd registry client by [@​ndeloof](https://github.com/ndeloof) in [#​13245](docker/compose#13245) - provider services: use '--project-name=' notation by [@​glours](https://github.com/glours) in [#​13250](docker/compose#13250) - gha: update test-matrix: remove docker 26.x by [@​thaJeztah](https://github.com/thaJeztah) in [#​13254](docker/compose#13254) - pkg/compose: explicitly map AuthConfig fields instead of a direct cast by [@​thaJeztah](https://github.com/thaJeztah) in [#​13253](docker/compose#13253) - cmd/compose: fix minor linting issues by [@​thaJeztah](https://github.com/thaJeztah) in [#​13252](docker/compose#13252) - use containerd client for OCI operations by [@​ndeloof](https://github.com/ndeloof) in [#​13251](docker/compose#13251) ##### ⚙️ Dependencies - build(deps): bump github.com/docker/docker, docker/cli v28.5.0-rc.1 by [@​thaJeztah](https://github.com/thaJeztah) in [#​13241](docker/compose#13241) - build(deps): bump github.com/docker/docker from 28.5.0-rc.1+incompatible to 28.5.0+incompatible by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13260](docker/compose#13260) - build(deps): bump github.com/docker/cli from 28.5.0-rc.1+incompatible to 28.5.0+incompatible by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13261](docker/compose#13261) **Full Changelog**: <docker/compose@v2.39.4...v2.40.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, 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 [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMzIuNSIsInVwZGF0ZWRJblZlciI6IjQxLjEzMi41IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Commit cli@27b2797 forked the AuthConfig type from the API, and changed existing code to do a direct cast / convert of the forked type to the API type. This can cause issues if the API types diverges, such as the removal of the Email field.
This patch explicitly maps each field to the corresponding API type, but adds some TODOs, because various code-paths only included a subset of the fields, which may be intentional for fields that were meant to be handled on the daemon / registry-client only.
We should evaluate these conversions to make sure these fields should be sent from the client or not (and possibly even removed from the API type).
What I did
Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did