Skip to content

🐛 fix golangci-lint nolint:ifshort #4894

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

Merged
merged 1 commit into from
Jul 8, 2021

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Jul 8, 2021

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
I just set up my local environment on mac and got the following error:

controllers/machine_controller.go:276:36: directive `// nolint:ifshort` is unused for linter "ifshort" (nolintlint)
isDeleteNodeAllowed := err == nil // nolint:ifshort

When I remove the nolint I get a finding of the ifshort linter, so we definitely need the nolint. I'm not sure why we don't get the error in CI but apparently all our other nolint's don't have a space between // and nolint.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 8, 2021
Signed-off-by: Stefan Büringer [email protected]
@fabriziopandini
Copy link
Member

/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 8, 2021
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

I think the linter is getting confused.
Instead of adding a pragma i would have moved the code a bit. E.g. have foo = true in the err == nil branch.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2021
@sbueringer
Copy link
Member Author

sbueringer commented Jul 8, 2021

I think the linter is getting confused.
Instead of adding a pragma i would have moved the code a bit. E.g. have foo = true in the err == nil branch.

/approve

@neolit123 I can change could have changed it to:

	isDeleteNodeAllowed := false
	if err != nil {
		switch err {
		case errNoControlPlaneNodes, errLastControlPlaneNode, errNilNodeRef, errClusterIsBeingDeleted, errControlPlaneIsBeingDeleted:
			log.Info("Deleting Kubernetes Node associated with Machine is not allowed", "node", m.Status.NodeRef, "cause", err.Error())
		default:
			return ctrl.Result{}, errors.Wrapf(err, "failed to check if Kubernetes Node deletion is allowed")
		}
	} else {
		isDeleteNodeAllowed = true
	}

Although I'm not sure which version is easier readable.

@k8s-ci-robot k8s-ci-robot merged commit 37c862b into kubernetes-sigs:master Jul 8, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.4 milestone Jul 8, 2021
@neolit123
Copy link
Member

neolit123 commented Jul 8, 2021 via email

@sbueringer sbueringer deleted the pr-fix-nolint branch July 8, 2021 12:54
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. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants