Skip to content

Conversation

suwakei
Copy link
Contributor

@suwakei suwakei commented Jul 26, 2025

Problem:

Redundant condition check:
In the init() function, the version string is parsed using the github.com/hashicorp/go-version library.
The NewVersion function of this library always returns a version object with three segments: major, minor, and patch, if parsed successfully (e.g., “v1.2” is interpreted as “v1.2.0”).
Thus, the check if len(segments) > 2 after if err == nil is always true and redundant.

How to construct the version string:
Rather than manually reconstructing the version string using fmt.Sprintf, it is clearer in intent and more idiomatic to use the Core() method provided by the go-version library.

Lack of test
No tests were included to verify the behavior of pkg/api/labels.go, especially the initialization logic of the global variable ComposeVersion by the init() function.

Fix:

To improve these points, the init() function has been modified as follows Remove the redundant if statement and use v.Core().String() to set the ComposeVersion.

func init() {
	v, err := version.NewVersion(internal.Version)
	if err == nil {
		--- segments := v.Segments()
		--- if len(segments) > 2 {
			--- ComposeVersion = fmt.Sprintf("%d.%d.%d", segments[0], segments[1], segments[2])
		--- }
		+++ ComposeVersion = v.Core().String()
	}
}

Create a new test file called pkg/api/labels_test.go and add a test case that validates the initialization logic of ComposeVersion.

  • ComposeVersion should be the core version such as 2.1.0 even if internal.Version contains pre-release information such as v2.1.0-beta.

  • ComposeVersion should remain an empty string if internal.Version is a non-parsable string such as “devel”.

Added tests to validate these cases.
This improves maintainability and correctness of version handling.

@suwakei suwakei requested a review from a team as a code owner July 26, 2025 17:29
@suwakei suwakei requested review from ndeloof and glours July 26, 2025 17:29
@suwakei suwakei force-pushed the refact/labels.go branch from d90aa86 to bd14f68 Compare July 26, 2025 17:32
@ndeloof ndeloof enabled auto-merge (rebase) July 27, 2025 12:50
@suwakei
Copy link
Contributor Author

suwakei commented Jul 27, 2025

Thanks for the review! Since I don’t have write access, auto-merge is disabled.
Could you please merge it manually if everything looks good?

Signed-off-by: keitosuwahara <[email protected]>
auto-merge was automatically disabled July 27, 2025 14:52

Head branch was pushed to by a user without write access

@suwakei suwakei force-pushed the refact/labels.go branch from d1de435 to 430ae71 Compare July 27, 2025 14:52
@ndeloof ndeloof enabled auto-merge (rebase) July 27, 2025 17:25
@ndeloof ndeloof merged commit adbd61e into docker:main Jul 27, 2025
25 checks passed
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Aug 11, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/compose](https://github.com/docker/compose) | patch | `v2.39.1` -> `v2.39.2` |

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.39.2`](https://github.com/docker/compose/releases/tag/v2.39.2)

[Compare Source](docker/compose@v2.39.1...v2.39.2)

#### What's Changed

##### 🐛 Fixes

- Fix (regression): compose build render build output with tty support by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#13107
- Add missing `_MODEL` suffix to model variable pass to dependent services of a model by [@&#8203;glours](https://github.com/glours) in docker/compose#13109
- Apply `BUILDKIT_PROGRESS` value when building with bake by [@&#8203;glours](https://github.com/glours) in docker/compose#13110
- Define `pull` and `no_cache` from either service or flags values when building with bake by [@&#8203;glours](https://github.com/glours) in docker/compose#13133
- Only monitor attached services on `up` command by [@&#8203;glours](https://github.com/glours) in docker/compose#13114

##### 🔧  Internal

- Add Streams Comment by [@&#8203;suwakei](https://github.com/suwakei) in docker/compose#13103
- Add test of `json.go` by [@&#8203;suwakei](https://github.com/suwakei) in docker/compose#13106
- Refactoring of redundant condition checks by [@&#8203;suwakei](https://github.com/suwakei) in docker/compose#13104
- Eliminated magic string by [@&#8203;suwakei](https://github.com/suwakei) in docker/compose#13105
- Use log API for containers we didn't attached to by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#13111
- Use `cli-plugins/metadata` package by [@&#8203;thaJeztah](https://github.com/thaJeztah) in docker/compose#13130
- `pkg/compose`: simplify getting auth-config key by [@&#8203;thaJeztah](https://github.com/thaJeztah) in docker/compose#13120
- Add go as a prerequisite in build instructions by [@&#8203;mattrunyon](https://github.com/mattrunyon) in docker/compose#13131

##### ⚙️ Dependencies

- Build(deps): bump github.com/docker/cli from `28.3.2+incompatible` to `28.3.3+incompatible` by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in docker/compose#13116
- Build(deps): bump github.com/docker/docker from `28.3.2+incompatible` to `28.3.3+incompatible` by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in docker/compose#13115
- Build(deps): bump github.com/containerd/containerd/v2 from `2.1.3` to `2.1.4` by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in docker/compose#13119
- Build(deps): bump github.com/docker/go-connections from `0.5.0` to `0.6.0` by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in docker/compose#13137
- Build(deps): bump golang.org/x/sys from `0.34.0` to `0.35.0` by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in docker/compose#13138
- Bump golang to `1.23.12` by [@&#8203;austinvazquez](https://github.com/austinvazquez) in docker/compose#13142

#### New Contributors

- [@&#8203;mattrunyon](https://github.com/mattrunyon) made their first contribution in docker/compose#13131
- [@&#8203;austinvazquez](https://github.com/austinvazquez) made their first contribution in docker/compose#13142

**Full Changelog**: docker/compose@v2.39.1...v2.39.2

</details>

---

### Configuration

📅 **Schedule**: 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 [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS41OC4yIiwidXBkYXRlZEluVmVyIjoiNDEuNTguMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants