Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gofumpt all the things #12392

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Gofumpt all the things #12392

merged 3 commits into from
Dec 17, 2024

Conversation

ndeloof
Copy link
Contributor

@ndeloof ndeloof commented Dec 17, 2024

same as #12365 + make target

@ndeloof ndeloof requested a review from glours December 17, 2024 09:08
thaJeztah and others added 2 commits December 17, 2024 10:08
Format the code  with gofumpt to prevent my IDE from reformatting
every time I open a file. gofumpt provides a superset of gofmt,
so should not impact users that are not using gofumpt.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
@ndeloof ndeloof force-pushed the gofumpt_all_the_things branch from b2c4389 to 50f2f54 Compare December 17, 2024 09:08
Copy link
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Open question, should not we add a check of the formatting during the validation step in the CI? 🤔

@@ -50,6 +50,7 @@ jobs:
- validate-go-mod
- validate-headers
- validate-docs
- validate-fmt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW; there's a golangci-lint linter for gofumpt; https://golangci-lint.run/usage/linters/#gofumpt

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, makes things even simpler

@ndeloof ndeloof force-pushed the gofumpt_all_the_things branch from 57b9d9b to 0c7adab Compare December 17, 2024 11:20
@thaJeztah
Copy link
Member

Thanks! I started to add the same logic as we had in docker/cli in the Makefile, which does a "optimistic" try to see if gofumpt is installed, but then wasn't sure if that's what you wanted, or if you preferred a Dockerfile-based / bake target instead https://github.com/docker/cli/blob/8454e012cadeca7719f170012c5331655ed5e5ec/Makefile#L52-L58

@ndeloof ndeloof force-pushed the gofumpt_all_the_things branch from 0c7adab to 38b61a1 Compare December 17, 2024 11:23
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
@ndeloof ndeloof force-pushed the gofumpt_all_the_things branch from 38b61a1 to 9aec80b Compare December 17, 2024 11:24
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ndeloof ndeloof merged commit ed61e42 into docker:main Dec 17, 2024
28 checks passed
@ndeloof ndeloof deleted the gofumpt_all_the_things branch December 17, 2024 15:50
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Jan 8, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/compose](https://github.com/docker/compose) | patch | `v2.32.1` -> `v2.32.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.32.2`](https://github.com/docker/compose/releases/tag/v2.32.2)

[Compare Source](docker/compose@v2.32.1...v2.32.2)

#### What's Changed

##### ✨ Improvements

-   Add `--pull` to run command by [@&#8203;glours](https://github.com/glours)  [(12397)](docker/compose#12397)

##### 🐛 Fixes

-   Only check bind mount conflict if sync action is involved by [@&#8203;ndeloof](https://github.com/ndeloof) [(12409)](docker/compose#12409)
-   When retrying to resolveOrCreateNetwork, retry with a valid network name by [@&#8203;gtardif](https://github.com/gtardif)  [(12422)](docker/compose#12422)
-   checkExpectedVolumes must ignore anonymous volumes by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12410

##### 🔧  Internal

-   Gofumpt all the things by [@&#8203;ndeloof](https://github.com/ndeloof) [(12392)](docker/compose#12392)
-   Use the 3 latest major versions of the engine to run e2e step by [@&#8203;glours](https://github.com/glours) [(12401)](docker/compose#12401)
-   Replace tibdex/github-app-token by official GitHub create-github-app-token by [@&#8203;glours](https://github.com/glours) [(12411)](docker/compose#12411)

##### ⚙️ Dependencies

-   Bump Golang version to `v1.22.10` and update CI actions by [@&#8203;glours](https://github.com/glours) [(12399)](docker/compose#12399)
-   Bump golang.org/x/net to `v0.33.0` to fix potential security issue by [@&#8203;glours](https://github.com/glours)  [(12405)](docker/compose#12405)
-   Bump `compose-go` to `v2.4.7` by [@&#8203;glours](https://github.com/glours) [(12438)](docker/compose#12438)

**Full Changelog**: docker/compose@v2.32.1...v2.32.2

</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:eyJjcmVhdGVkSW5WZXIiOiIzOS45MS40IiwidXBkYXRlZEluVmVyIjoiMzkuOTEuNCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
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.

3 participants