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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃尡 Bump golangci-lint #1794

Merged
merged 3 commits into from
Jul 8, 2020
Merged

Conversation

benmoss
Copy link

@benmoss benmoss commented Jul 7, 2020

What this PR does / why we need it:

  • Bumps golangci-lint to 1.28.1
  • Globally disable godot, goerr113. Godot seems insignificant, goerr113 is more substantial of changes than I want to make right now.
  • Use specific nolints everywhere else

It'd be nice to fix the nestif nolints but not gonna tackle them now. It would also probably be nice to use static errors everywhere and enable goerr113 but I felt like that was too significant a change.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 7, 2020
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jul 7, 2020
@benmoss
Copy link
Author

benmoss commented Jul 7, 2020

Hmm, not sure why the generated files are out of sync. Is this just a bug in something?

-       // WARNING: in.Bastion requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-aws/api/v1alpha2.Instance vs *sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3.Instance)
+       // WARNING: in.Bastion requires manual conversion: inconvertible types (./api/v1alpha2.Instance vs *sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3.Instance)

-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'

The go path diffs only show up when I run it on my machine, but the newline changes seem to be in the k8s-ci-robot diff

@randomvariable
Copy link
Member

randomvariable commented Jul 8, 2020

@benmoss this has been intermittently happening. both me and @detiber have attempted to solve it once and for all to no avail.

The workaround right now is to check out the repo to ${GOPATH}/src/sigs.k8s.io/cluster-api-provider-aws.

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 8, 2020
.golangci.yml Show resolved Hide resolved
controllers/awsmachine_controller_test.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/console.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/gateways.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/routetables.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/securitygroups.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/subnets.go Outdated Show resolved Hide resolved
test/e2e/conformance_test.go Outdated Show resolved Hide resolved
test/e2e_new/common.go Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 8, 2020
@benmoss benmoss mentioned this pull request Jul 8, 2020
Ben Moss added 3 commits July 8, 2020 18:48
- Globally disable godot, goerr113. Godot seems insignificant, goerr113 is more substantial of changes than I want to make right now.
- Use specific nolints everywhere else
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 8, 2020
@randomvariable
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 8, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: randomvariable

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, 2020
@k8s-ci-robot k8s-ci-robot merged commit db9a69b into kubernetes-sigs:master Jul 8, 2020
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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants