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.

Sign up for GitHub

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

Jump to bottom

upup/pkg/fi/cloudup/awstasks/ staticcheck #8235

Merged
merged 1 commit into from
Jan 14, 2020
Merged

upup/pkg/fi/cloudup/awstasks/ staticcheck #8235

merged 1 commit into from
Jan 14, 2020

Conversation

tanjunchen
Copy link
Member

@tanjunchen tanjunchen commented Dec 31, 2019 •
edited
Loading

ref:#7800

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 31, 2019
@tanjunchen
Copy link
Member Author

/cc @rifelpet
@hakman
for review

@hakman
Copy link
Member

hakman commented Dec 31, 2019

I think this clashes with this #8193.
Maybe should wait with with the formatting fixes until the last few files are removed from hack/.staticcheck_failures.

@tanjunchen tanjunchen changed the title upup/pkg/fi/cloudup/awstasks/ staticcheck upup/pkg/fi/cloudup/awstasks/ staticcheck: Fix ST1005 Dec 31, 2019
@tanjunchen
Copy link
Member Author

/test pull-kops-e2e-kubernetes-aws

1 similar comment
@rifelpet
Copy link
Member

/test pull-kops-e2e-kubernetes-aws

justinsb
justinsb reviewed Jan 12, 2020
View reviewed changes
upup/pkg/fi/cloudup/apply_cluster.go Outdated
@@ -1024,7 +1024,7 @@ func (c *ApplyClusterCmd) validateKopsVersion() error {
fmt.Println("")
fmt.Printf("More information: %s\n", buildPermalink("upgrade_kops", recommended.String()))
fmt.Println("")
fmt.Printf(starline)
fmt.Println(starline)
Copy link
Member

Choose a reason for hiding this comment

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

Sorry - I think I just approved an earlier PR that is now conflicting here. You might want to rebase / drop the changes in this file, as I think this file now passes staticcheck.

Copy link
Member Author

Choose a reason for hiding this comment

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

no matter.
i will update it.
thanks

@justinsb
Copy link
Member

Sorry - I think I just created a conflict on this file (I've been working through the PR backlog in submission order). But if you rebase I think you can drop the changes to apply_cluster.go, and the other changes LGTM - thanks @tanjunchen

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added 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 Jan 12, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, tanjunchen

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 12, 2020
tanjunchen
tanjunchen commented Jan 14, 2020
View reviewed changes
upup/pkg/kutil/import_cluster.go
@@ -507,18 +506,18 @@ func (x *ImportCluster) ImportAWSCluster() error {
return nil
}

func parseInt(s string) (int, error) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Some commented files refer to this function. So comment this function not remove it

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 14, 2020
@tanjunchen tanjunchen changed the title upup/pkg/fi/cloudup/awstasks/ staticcheck: Fix ST1005 upup/pkg/fi/cloudup/awstasks/ staticcheck Jan 14, 2020
@johngmyers
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 Jan 14, 2020
@tanjunchen
Copy link
Member Author

@johngmyers
thanks review

@tanjunchen
Copy link
Member Author

/test pull-kops-e2e-kubernetes-aws

@k8s-ci-robot k8s-ci-robot merged commit de4a86f into kubernetes:master Jan 14, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jan 14, 2020
@tanjunchen tanjunchen deleted the staticcheck-005 branch January 14, 2020 04:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb justinsb left review comments

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

@rifelpet rifelpet Awaiting requested review from rifelpet

Assignees

@justinsb justinsb

@johngmyers johngmyers

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tanjunchen @hakman @rifelpet @justinsb @k8s-ci-robot @johngmyers