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

Run goimports in make ci #8023

Merged
merged 1 commit into from
Nov 28, 2019
Merged

Conversation

tioxy
Copy link
Contributor

@tioxy tioxy commented Nov 27, 2019

What type of PR is this?
/kind bug

What this PR does / why we need it:
When running make ci, assures that autogenerated files are properly indented when developing locally. It also fixes the scenario where upup/models/bindata.go is generated locally, not indented, and breaks the verify-goimports test.

Which issue(s) this PR fixes:
NONE

Special notes for your reviewer:
The discussion started here: #7865 (comment)

Does this PR introduce a user-facing change?:

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


Assure that autogenerated files are properly indented when running make
ci
@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 27, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @tioxy. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 27, 2019
@tioxy
Copy link
Contributor Author

tioxy commented Nov 27, 2019

cc @geojaz

@tioxy
Copy link
Contributor Author

tioxy commented Nov 27, 2019

/assign @chrislovecnm

@chrisz100
Copy link
Contributor

/ok-to-test

@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 Nov 27, 2019
Copy link
Member

@geojaz geojaz left a comment

Choose a reason for hiding this comment

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

/lgtm
thanks :)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 27, 2019
@geojaz
Copy link
Member

geojaz commented Nov 27, 2019

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: geojaz, tioxy

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 Nov 27, 2019
@k8s-ci-robot k8s-ci-robot merged commit de7f7a8 into kubernetes:master Nov 28, 2019
@johngmyers
Copy link
Member

This change introduces a new bug.

If the current commit contains a file with an import formatting error, such that make verify-goimports would fail, then a make ci will give the wrong error message, giving the user the wrong instructions for fixing the problem.

The added goimports will "fix up" the problem, causing the later verify-goimports to incorrectly pass. Then, verify-gomod will notice the dirty workspace and incorrectly tell the user to run go mod tidy.

@tioxy
Copy link
Contributor Author

tioxy commented Nov 28, 2019

@johngmyers What I think would solve this is removing the goimports from make ci, and then adding the following command to this alias:

goimports -w -v $(BINDATA_TARGETS)

or maybe directly

goimports -w -v upup/models/bindata.go

What do you think about it?

@johngmyers
Copy link
Member

@tioxy That seems a reasonable approach. The other would be to fix go-bindata to format things properly, but that seems a bit time-consuming.

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. kind/bug Categorizes issue or PR as related to a bug. 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/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.

None yet

6 participants