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

Add code simplifications for staticheck #8232

Merged
merged 1 commit into from
Dec 30, 2019

Conversation

hakman
Copy link
Member

@hakman hakman commented Dec 30, 2019

Ref: #7800

This change adds back code simplification checks.
It also makes the style rules we are breaking explicit, to prevent other types of style checks to break and to make it easier to fix style these later if wanted.

Errors from staticcheck:
cmd/kops/toolbox_template.go:138:38: should use make(map[string]string) instead (S1019)
cmd/kops/toolbox_template.go:215:42: should use make(map[string]interface{}) instead (S1019)
cmd/kops/toolbox_template.go:228:40: should use make(map[string]interface{}) instead (S1019)
dns-controller/pkg/watchers/ingress.go:170:4: should merge variable declaration with assignment on next line (S1021)
dns-controller/pkg/watchers/service.go:206:5: should merge variable declaration with assignment on next line (S1021)
upup/pkg/fi/cloudup/alitasks/vpc.go:64:5: should omit nil check; len() for nil slices is defined as zero (S1009)
upup/pkg/fi/cloudup/openstacktasks/volume.go:73:2: unnecessary guard around call to delete (S1033)
upup/pkg/fi/cloudup/openstacktasks/volume.go:76:2: unnecessary guard around call to delete (S1033)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 30, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @hakman. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 30, 2019
@hakman
Copy link
Member Author

hakman commented Dec 30, 2019

/cc @rifelpet
/cc @tanjunchen

@rifelpet
Copy link
Member

/ok-to-test

Nice work on enumerating the ignored checks! I also noticed that more recent versions of staticcheck have additional checks that kops fails, so it might be worth upgrading our vendored version at some point too.

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 30, 2019
@hakman
Copy link
Member Author

hakman commented Dec 30, 2019

That would be nice. We should give it a try once the ignored failures list is gone.

@hakman
Copy link
Member Author

hakman commented Dec 30, 2019

/test pull-kops-e2e-kubernetes-aws

@@ -135,7 +135,7 @@ func runToolBoxTemplate(f *util.Factory, out io.Writer, options *toolboxTemplate
templates = append(templates, list...)
}

snippets := make(map[string]string, 0)
Copy link
Member

Choose a reason for hiding this comment

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

it seems that you repeat with me , but you first . i will rebase . hehe

@tanjunchen
Copy link
Member

good job!

@hakman
Copy link
Member Author

hakman commented Dec 30, 2019

/test pull-kops-e2e-kubernetes-aws

1 similar comment
@hakman
Copy link
Member Author

hakman commented Dec 30, 2019

/test pull-kops-e2e-kubernetes-aws

@rifelpet
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 Dec 30, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, rifelpet

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 Dec 30, 2019
@k8s-ci-robot k8s-ci-robot merged commit 388a3cb into kubernetes:master Dec 30, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Dec 30, 2019
@hakman hakman deleted the staticcheck-simplify branch January 19, 2020 19:22
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants