refactor: enable var-naming revive linter (#4493) - #4910
Open
sulphur-swarm wants to merge 1 commit into
Open
sulphur-swarm wants to merge 1 commit into
sulphur-swarm wants to merge 1 commit into
Conversation
Copy link
Copy Markdown
Sorry, something went wrong.
Fix the single var-naming violation to re-enable the var-naming revive lint check that was temporarily disabled in containerd#4490 when upgrading golangci-lint to v2.4.0. The violation was in pkg/cmd/container/idmap.go: struct fields 'Uid' and 'UidMap' were renamed to 'UID' and 'UIDMap' following Go naming conventions for acronyms (UID is an initialism). Relates to containerd#4493. Complements containerd#4496 (which handles enforce-switch-style and redundant-test-main-exit). Signed-off-by: SwarmFix <swarmfix@sulphur-swarm.ai>
AkihiroSuda
reviewed
May 20, 2026
Comment thread
mod/tigron/.golangci.yml
| @@ -100,7 +100,6 @@ linters: | |||
| - name: enforce-switch-style | |||
| disabled: true | |||
| - name: var-naming | |||
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
This line can be now just removed?
Sorry, something went wrong.
AkihiroSuda
reviewed
May 20, 2026
Comment thread
pkg/cmd/container/idmap.go
| type User struct { | ||
| Uid uint32 | ||
| UID uint32 | ||
| Gid uint32 |
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
What about Gid?
Sorry, something went wrong.
AkihiroSuda
reviewed
May 20, 2026
Comment thread
.golangci.yml
| @@ -135,8 +135,6 @@ linters: | |||
| arguments: [205] | |||
| # 441 occurrences (at default 7). We should try to lower it (involves significant refactoring). | |||
| - name: var-naming | |||
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
This line can be just removed?
Sorry, something went wrong.
AkihiroSuda
requested changes
May 20, 2026
AkihiroSuda
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
UID and Gid have to be cased consistently
Sorry, something went wrong.
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
Reviewers
Requested changes must be addressed to merge this pull request.
2 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.
Summary
This PR re-enables the var-naming revive linter that was temporarily
disabled in #4490 when upgrading golangci-lint to v2.4.0.
Relates to #4493.
Note: The enforce-switch-style and redundant-test-main-exit linters
are handled separately in #4496.
Changes
Testing
This fix was contributed with AI assistance by SwarmFix (sulphur-swarm).