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

🌱 Update golangci-lint to v1.53.3 #8796

Merged

Conversation

killianmuldoon
Copy link
Contributor

@killianmuldoon killianmuldoon commented Jun 6, 2023

Update golangci-lint to v1.53.2.

Release notes: https://github.com/golangci/golangci-lint/releases/tag/v1.53.2

Changes:

  • Removed a return parameter from a number of functions which returned ctrl.Result where it was always nil
  • Corrected assertions in a number of ginkgo Expect and Eventually calls
  • Removed depguard which now requires a default config with all of the dependencies allowed or disallowed.
  • Small fixup in one test using an incorrect assertion
  • Enabled additional ginkgo linters

Fixes #8050

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 6, 2023
@killianmuldoon killianmuldoon force-pushed the pr-update-golangci-lint branch 2 times, most recently from 027a495 to b6d826d Compare June 6, 2023 09:58
Copy link
Contributor Author

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/area dependency

@k8s-ci-robot k8s-ci-robot added the area/dependency Issues or PRs related to dependency changes label Jun 6, 2023
@sbueringer
Copy link
Member

sbueringer commented Jun 6, 2023

/lgtm
/approve

Let's please hold until the goofy PR is merged (I think golangci-lint is not urgent and I don't want to rebase the goofy PR more often than necessary).

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 6, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 6, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4360ca4ff7b92e7d6f14493289fa3c1bfa9807c7

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 6, 2023
@killianmuldoon
Copy link
Contributor Author

Let's please hold until the goofy PR is merged (I think golangci-lint is not urgent and I don't want to rebase the goofy PR more often than necessary).

Sure thing - I don't think there should be too much conflict between this and that, and I can update this PR with whatever findings there might be for goofy.

@sbueringer
Copy link
Member

sbueringer commented Jun 6, 2023

Sure thing - I don't think there should be too much conflict between this and that, and I can update this PR with whatever findings there might be for goofy.

Yup. There should be ~ no overlap regarding what currently is in this PR. It's mostly about the new findings in the ~ 5,5k Go LOC in the goofy PR :)

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 6, 2023
@k8s-ci-robot k8s-ci-robot added area/clusterctl Issues or PRs related to clusterctl size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 6, 2023
.golangci.yml Outdated Show resolved Hide resolved
@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main

As this now touches a bunch of e2e code.

@killianmuldoon
Copy link
Contributor Author

Some of these changes - e.g. fixing the asserts on ginkgo - should be cherry-picked to release 1.3 and release 1.4

@k8s-ci-robot
Copy link
Contributor

@killianmuldoon: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-e2e-full-main 4096b1c link false /test pull-cluster-api-e2e-full-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@killianmuldoon
Copy link
Contributor Author

/retest

@sbueringer
Copy link
Member

sbueringer commented Jun 6, 2023

/hold cancel

Should probably re-run golangci-lint now that we merged the in-memory provider. Not sure if it strictly requires a rebase onto main. Probably yes. (definitely locally if you have to fix new findings obviously :D)

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 6, 2023
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 6, 2023
@sbueringer
Copy link
Member

Thx
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 6, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: d508a2c4eb48a55ae249615ed9b578e57d8a3919

@chrischdi
Copy link
Member

/lgtm

@fabriziopandini
Copy link
Member

Great job!
/lgtm
/approve

@sbueringer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 7, 2023
@sbueringer
Copy link
Member

sbueringer commented Jul 7, 2023

/hold

Sorry missed the squash

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 7, 2023
Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 7, 2023
@sbueringer
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 7, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1d6366c0586cb335792d606782640c87214e4929

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, sbueringer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [fabriziopandini,sbueringer]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sbueringer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 7, 2023
@k8s-ci-robot k8s-ci-robot merged commit 801ea8d into kubernetes-sigs:main Jul 7, 2023
10 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.5 milestone Jul 7, 2023
@killianmuldoon killianmuldoon removed the area/clusterctl Issues or PRs related to clusterctl label Jul 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enable ginkgolinter and enable checks
5 participants