Skip to content

golangci-lint: set go version to prevent fallback to go1.17, and fix copyloopvar linting issues - #5594

Merged
thaJeztah merged 15 commits into
docker:masterfrom
thaJeztah:fix_golangci_go_version
Nov 5, 2024
Merged

golangci-lint: set go version to prevent fallback to go1.17, and fix copyloopvar linting issues#5594
thaJeztah merged 15 commits into
docker:masterfrom
thaJeztah:fix_golangci_go_version

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Nov 5, 2024

Copy link
Copy Markdown
Member

GolangCI-lint attempts to deduct the Go version to lint for through the
go version specified in go.mod, which we don't have, and therefore it
falls back to go1.17 semantics:

level=warning msg="[linters_context] copyloopvar: this linter is disabled because the Go version (1.17) of your project is lower than Go 1.22

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)
@thaJeztah
cli/command: remove redundant capturing of loop vars in tests (copylo…
67458f7
…opvar)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cli/compose: remove redundant capturing of loop vars in tests (copylo…
1448cec
…opvar)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cli/config: remove redundant capturing of loop vars in tests (copyloo…
20de861
…pvar)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
e2e: remove redundant capturing of loop vars in tests (copyloopvar)
6489a77
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cli/manifest: remove redundant capturing of loop vars in tests (copyl…
bf37e26
…oopvar)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cmd/docker: remove redundant capturing of loop vars in tests (copyloo…
417974c
…pvar)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
opts: remove redundant capturing of loop vars in tests (copyloopvar)
762b5a8
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
service: remove redundant capturing of loop vars in tests (copyloopvar)
046ac97
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
templates: remove redundant capturing of loop vars in tests (copyloop…
7d9ea25
…var)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
service/logs/parse_logs_test.go:50:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
tc := tc
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cli/command/image: remove redundant capturing of loop vars (copyloopvar)
4a71ce0
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
cli/command/image/tree.go:59:4: The copy of the 'for' variable "im" can be deleted (Go 1.22+) (copyloopvar)
im := im
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cli/command/container: remove redundant capturing of loop vars (copyl…
78a7e15
…oopvar)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
cli/command/container/opts.go:765:3: The copy of the 'for' variable "n" can be deleted (Go 1.22+) (copyloopvar)
n := n
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cli/compose/loader: remove redundant capturing of loop vars (copyloop…
40833fd
…var)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
cli/compose/loader/merge.go:71:3: The copy of the 'for' variable "overrideService" can be deleted (Go 1.22+) (copyloopvar)
overrideService := overrideService
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cli/command/service: remove redundant capturing of loop vars (copyloo…
32b40de
…pvar)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
cli/command/service/update.go:1061:3: The copy of the 'for' variable "entry" can be deleted (Go 1.22+) (copyloopvar)
entry := entry
^
cli/command/service/update.go:1089:4: The copy of the 'for' variable "port" can be deleted (Go 1.22+) (copyloopvar)
port := port
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
cli-plugins/manager: remove redundant capturing of loop vars (copyloo…
d77760f
…pvar)
go1.22 and up now produce a unique variable in loops, tehrefore no longer
requiring to capture the variable manually;
cli-plugins/manager/cobra.go:55:4: The copy of the 'for' variable "p" can be deleted (Go 1.22+) (copyloopvar)
p := p
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
golangci-lint: set go version to prevent fallback to go1.17
4a7b04d
GolangCI-lint attempts to deduct the Go version to lint for through the
go version specified in go.mod, which we don't have, and therefore it
falls back to go1.17 semantics:
level=warning msg="[linters_context] copyloopvar: this linter is disabled because the Go version (1.17) of your project is lower than Go 1.22
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztahthaJeztah
added this to the 28.0.0 milestone
Nov 5, 2024
@thaJeztah
thaJeztah
requested review from
a team and silvin-lubecki
as code ownersNovember 5, 2024 09:18
@thaJeztahthaJeztah
self-assigned this
Nov 5, 2024
@codecov-commenter
codecov-commenter
commented
Nov 5, 2024•

edited

Loading

Copy link


Copy Markdown

Codecov Report
All modified and coverable lines are covered by tests ✅
Project coverage is 59.63%. Comparing base (b45477b) to head (4a7b04d).

Report is 35 commits behind head on master.
Additional details and impacted files
@@ Coverage Diff @@## master #5594 +/- ##
==========================================
- Coverage 59.63% 59.63% -0.01% 
==========================================
Files 346 346 Lines 29214 29208 -6 ==========================================
- Hits 17421 17417 -4 + Misses 10824 10822 -2 
Partials 969 969 
Benehiko
Benehiko
approved these changes
Nov 5, 2024
View reviewed changes
Comment threadcli-plugins/manager/cobra.go
 return
 }
 for _, p := range plugins {
 p := p
@BenehikoBenehikoNov 5, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

just adding this here for future reference: https://go.dev/ref/spec#For_statements
Go 1.22 fixed iterations to use their own variables instead of sharing them. https://go.dev/ref/spec#Go_1.22
@thaJeztahthaJeztahNov 5, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Thanks for linking that! Yes, indeed, they fixed that situation. I know they had some back-and-forth on fixing it, because it could be a breaking change, but ultimately they decided that fixing the "footgun" part outweighed the "breaking change" part.
@thaJeztahthaJeztahNov 12, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I realised we were also setting go: build-tags; not exactly sure if those would affect the behavior (i.e., if go would downgrade to go1.21 semantics, and thus disable the new behavior), but just in case it would, I opened a PR to update those;
@thaJeztah
thaJeztah
merged commit 9eb7b52
into
docker:masterNov 5, 2024
@thaJeztah
thaJeztah
deleted the

fix_golangci_go_version

branch
November 5, 2024 10:24

This was referenced Nov 12, 2024
 Merged

 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@vvolandvvolandvvoland approved these changes
@BenehikoBenehikoBenehiko approved these changes
@silvin-lubeckisilvin-lubeckiAwaiting requested review from silvin-lubeckisilvin-lubecki is a code owner

Assignees

@thaJeztahthaJeztah

Labels

area/testingstatus/2-code-review

Projects


None yet


Milestone

28.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah@codecov-commenter@vvoland@Benehiko