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

chore: Upgrade golangci-lint to v1.50.1 from v1.46.0 #2790

Merged
merged 7 commits into from
Jan 19, 2023
Merged

chore: Upgrade golangci-lint to v1.50.1 from v1.46.0 #2790

merged 7 commits into from
Jan 19, 2023

Conversation

dlipovetsky
Copy link
Contributor

@dlipovetsky dlipovetsky commented Jan 14, 2023 •
edited
Loading

Overview

Updates the version of golangci-lint defined in the Makefile.

What this PR does / why we need it

Versions prior to v1.48.0 are incompatible with go v1.19, which is in use since d33e994.

Linting fails:

❯ go version
go version go1.19.2 linux/amd64

❯ make bin/golangci-lint
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | BINARY=golangci-lint bash -s -- v1.46.0
golangci/golangci-lint info checking GitHub for tag 'v1.46.0'
golangci/golangci-lint info found version: 1.46.0 for v1.46.0/linux/amd64
bgolangci/golangci-lint info installed ./bin/golangci-lint

❯ bin/golangci-lint run
panic: load embedded ruleguard rules: rules/rules.go:13: can't load fmt

goroutine 1 [running]:
github.com/go-critic/go-critic/checkers.init.22()
	github.com/go-critic/go-critic@v0.6.3/checkers/embedded_rules.go:47 +0x4b4

Special notes for your reviewer

Does this PR introduce a user-facing change?

NONE

@dlipovetsky dlipovetsky mentioned this pull request Jan 14, 2023
Merged
@dlipovetsky dlipovetsky force-pushed the golangci-lint-for-go-1.19 branch 2 times, most recently from 4b847d9 to df932ca Compare January 17, 2023 20:33
@dlipovetsky dlipovetsky changed the title chore: Upgrade golangci-lint to v1.51.1 from v1.46.0 chore: Upgrade golangci-lint to v1.50.1 from v1.46.0 Jan 17, 2023
@nabokihms nabokihms added the release-note/dependency-update Release note: Dependency Updates label Jan 18, 2023
@nabokihms nabokihms self-requested a review January 18, 2023 09:09
@nabokihms
Copy link
Member

@dlipovetsky thank you for opening this PR. The new version of linter found some errors that should be fixed. Could you please take a look when you have time?

@dlipovetsky
Copy link
Contributor Author

Sorry, I accidentally rebased on master and included two dependabot commits. Removing those and force-pushing.

@dlipovetsky dlipovetsky force-pushed the golangci-lint-for-go-1.19 branch from 8e267fc to 32978ee Compare January 18, 2023 20:32
@dlipovetsky
chore: Upgrade golangci-lint to v1.50.1 from v1.46.0
39cd03c 
Versions prior to v1.48.0 are incompatible with go v1.19, which
is in use since d33e994.

Signed-off-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
@dlipovetsky
fix: Fix linter errors (formatting)
28bbfcc 
Errors reported by golangci-lint v1.50.1.

Fixed using `golangci-lint run --fix`.

Signed-off-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
@dlipovetsky
fix: connector/google: Remove unused parameter from test helper function
7dc20c2 
Reported by golangci-lint v1.50.1

Signed-off-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
@dlipovetsky
fix: storage/kubernetes: Suppress linter warning an effectively const…
787c9e1 
…ant parameter

Reported by golangci-lint v1.50.1

Signed-off-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
@dlipovetsky
fix: connector/google: Remove unused parameter from test helper function
b447df7 
Reported by golangci-lint v1.50.1

The parameter was introduced in
dexidp@87dc843#diff-f4e262eadea100c93616fa91cb230c785e624025a68deeab910e663f9e7356c8L28-L33,
but became unused as of
dexidp@7b19c53#diff-f4e262eadea100c93616fa91cb230c785e624025a68deeab910e663f9e7356c8R27-R29

Signed-off-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
@dlipovetsky dlipovetsky force-pushed the golangci-lint-for-go-1.19 branch from 32978ee to b447df7 Compare January 18, 2023 20:34
@dlipovetsky
Copy link
Contributor Author

Some linter warnings remain, but they don't need to be fixed right away:

❯ bin/golangci-lint run
WARN [runner] The linter 'varcheck' is deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter.  Replaced by unused. 
WARN [runner] The linter 'deadcode' is deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter.  Replaced by unused. 
WARN [runner] The linter 'structcheck' is deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter.  Replaced by unused. 
WARN [linters_context] rowserrcheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649. 
WARN [linters_context] sqlclosecheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649. 
WARN [linters_context] structcheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649.

I'll address those in a separate PR.

@dlipovetsky
Copy link
Contributor Author

On second thought, removing the deprecated linters is straightforward; there were no "nolint" directives. I added a commit to this PR.

I also added a commit to re-enable the typecheck linter, since it seems to be working correctly again.

The remaining warnings are about disabled linters:

❯ bin/golangci-lint run
WARN [linters_context] rowserrcheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649. 
WARN [linters_context] sqlclosecheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649.

@dlipovetsky
build: Remove deprecated linters replaced by 'unused' linter
c9d839a 
Signed-off-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
@dlipovetsky
build: Re-enable 'typecheck' linter
cc0b278 
Signed-off-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
@dlipovetsky dlipovetsky force-pushed the golangci-lint-for-go-1.19 branch from dc578e1 to cc0b278 Compare January 18, 2023 23:51
nabokihms
nabokihms approved these changes Jan 19, 2023
View reviewed changes
Copy link
Member

@nabokihms nabokihms left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you for your work @dlipovetsky.

@nabokihms nabokihms merged commit 07d7913 into dexidp:master Jan 19, 2023
houxul pushed a commit to houxul/dex that referenced this pull request Mar 2, 2023
@dlipovetsky
chore: Upgrade golangci-lint to v1.50.1 from v1.46.0 (dexidp#2790)
7beb31c
xtremerui pushed a commit to concourse/dex that referenced this pull request May 25, 2023
upstream dex release: v2.36.0
2ab05af 
The official container image for this release can be pulled from
```
ghcr.io/dexidp/dex:v2.36.0
```

<!-- Release notes generated using configuration in .github/release.yml at v2.36.0 -->

## What's Changed
### Enhancements 🚀
* TLS configure for OIDC connector by @xtremerui in dexidp#1632
* Add icon for gitea by @pinpox in dexidp#2733
* fix: Do not use connector data from the refresh token field by @nabokihms in dexidp#2729
* Add preferredEmailDomain config option for GitHub connector by @nobuyo in dexidp#2740
* Move unique functionality into getGroups to reduce calls to google by @snuggie12 in dexidp#2628
* fix: prevent server-side request forgery using Kubernetes storage by @nabokihms in dexidp#2479
* fix: return 401 if password is invalid by @nabokihms in dexidp#2796
* feat: Add default robots.txt by @nabokihms in dexidp#2834
* Skip redirection to approval when it is not required (dexidp#2686) by @nobuyo in dexidp#2805
* feat: Bump dependencies and Makefile refactoring by @nabokihms in dexidp#2844
### Bug Fixes 🐛
* Make admin email optional when no service account path is configured by @sagikazarmark in dexidp#2695
* Only initialize google admin service if necessary by @sagikazarmark in dexidp#2700
### Dependency Updates ⬆️
* build(deps): bump golang from 1.19.1-alpine3.16 to 1.19.2-alpine3.16 by @dependabot in dexidp#2697
* fix: Update gomplate version to 3.11.3 fix CVE-2022-27665 by @nabokihms in dexidp#2705
* build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.0 by @dependabot in dexidp#2708
* build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 by @dependabot in dexidp#2715
* build(deps): bump google.golang.org/api from 0.98.0 to 0.101.0 by @dependabot in dexidp#2720
* build(deps): bump github.com/mattn/go-sqlite3 from 1.14.15 to 1.14.16 by @dependabot in dexidp#2721
* build(deps): bump aquasecurity/trivy-action from 0.7.1 to 0.8.0 by @dependabot in dexidp#2723
* build(deps): bump github.com/spf13/cobra from 1.6.0 to 1.6.1 by @dependabot in dexidp#2718
* build(deps): bump golang from 1.19.2-alpine3.16 to 1.19.3-alpine3.16 by @dependabot in dexidp#2724
* build(deps): bump alpine from 3.16.2 to 3.17.0 by @dependabot in dexidp#2746
* build(deps): bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0 by @dependabot in dexidp#2735
* build(deps): bump go.etcd.io/etcd/client/pkg/v3 from 3.5.5 to 3.5.6 by @dependabot in dexidp#2744
* build(deps): bump github.com/Masterminds/sprig/v3 from 3.2.2 to 3.2.3 by @dependabot in dexidp#2751
* build(deps): bump golang from 1.19.3-alpine3.16 to 1.19.4-alpine3.16 by @dependabot in dexidp#2750
* build(deps): bump golang.org/x/crypto from 0.3.0 to 0.4.0 by @dependabot in dexidp#2755
* build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.5 to 3.5.6 by @dependabot in dexidp#2743
* build(deps): bump github.com/go-sql-driver/mysql from 1.6.0 to 1.7.0 by @dependabot in dexidp#2754
* build(deps): bump helm/kind-action from 1.4.0 to 1.5.0 by @dependabot in dexidp#2758
* build(deps): bump google.golang.org/grpc from 1.50.1 to 1.51.0 by @dependabot in dexidp#2741
* build(deps): bump google.golang.org/api from 0.101.0 to 0.104.0 by @dependabot in dexidp#2753
* build(deps): bump google.golang.org/grpc from 1.49.0 to 1.51.0 in /api/v2 by @dependabot in dexidp#2742
* build(deps): bump golang.org/x/net from 0.3.0 to 0.4.0 by @dependabot in dexidp#2761
* build(deps): bump entgo.io/ent from 0.11.3 to 0.11.4 by @dependabot in dexidp#2725
* build(deps): bump google.golang.org/api from 0.104.0 to 0.105.0 by @dependabot in dexidp#2760
* build(deps): bump golang.org/x/net from 0.4.0 to 0.5.0 by @dependabot in dexidp#2774
* build(deps): bump google.golang.org/api from 0.105.0 to 0.106.0 by @dependabot in dexidp#2772
* build(deps): bump github.com/coreos/go-oidc/v3 from 3.4.0 to 3.5.0 by @dependabot in dexidp#2770
* build(deps): bump golang.org/x/crypto from 0.4.0 to 0.5.0 by @dependabot in dexidp#2773
* build(deps): bump golang.org/x/oauth2 from 0.3.0 to 0.4.0 by @dependabot in dexidp#2777
* build(deps): bump entgo.io/ent from 0.11.4 to 0.11.5 by @dependabot in dexidp#2779
* build(deps): bump alpine from 3.17.0 to 3.17.1 by @dependabot in dexidp#2780
* build(deps): bump mheap/github-action-required-labels from 2 to 3 by @dependabot in dexidp#2769
* build(deps): bump google.golang.org/api from 0.106.0 to 0.107.0 by @dependabot in dexidp#2788
* build(deps): bump golang from 1.19.4-alpine3.16 to 1.19.5-alpine3.16 by @dependabot in dexidp#2782
* build(deps): bump google.golang.org/grpc from 1.51.0 to 1.52.0 by @dependabot in dexidp#2783
* build(deps): bump google.golang.org/api from 0.107.0 to 0.108.0 by @dependabot in dexidp#2793
* build(deps): bump google.golang.org/grpc from 1.51.0 to 1.52.0 in /api/v2 by @dependabot in dexidp#2784
* chore: Upgrade golangci-lint to v1.50.1 from v1.46.0 by @dlipovetsky in dexidp#2790
* ci: Use go 1.19 by @dlipovetsky in dexidp#2791
* build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.6 to 3.5.7 by @dependabot in dexidp#2798
* build(deps): bump docker/build-push-action from 3 to 4 by @dependabot in dexidp#2807
* build(deps): bump golang from 1.19.5-alpine3.16 to 1.20.0-alpine3.16 by @dependabot in dexidp#2811
* build(deps): bump aquasecurity/trivy-action from 0.8.0 to 0.9.0 by @dependabot in dexidp#2810
* build(deps): bump alpine from 3.17.1 to 3.17.2 by @dependabot in dexidp#2821
* build(deps): bump aquasecurity/trivy-action from 0.9.0 to 0.9.1 by @dependabot in dexidp#2822
* build(deps): bump entgo.io/ent from 0.11.5 to 0.11.8 by @dependabot in dexidp#2823
* build(deps): bump golang.org/x/crypto from 0.5.0 to 0.6.0 by @dependabot in dexidp#2818
* build(deps): bump golang.org/x/net from 0.5.0 to 0.7.0 by @dependabot in dexidp#2828
* build(deps): bump golang.org/x/net from 0.4.0 to 0.7.0 in /api/v2 by @dependabot in dexidp#2832
* build(deps): bump golang.org/x/sys from 0.0.0-20220114195835-da31bd327af9 to 0.1.0 in /examples by @dependabot in dexidp#2837
* build(deps): bump golang.org/x/net from 0.0.0-20220114011407-0dd24b26b47d to 0.7.0 in /examples by @dependabot in dexidp#2846
* build(deps): bump golang from 1.20.0-alpine3.16 to 1.20.1-alpine3.16 by @dependabot in dexidp#2827
* build(deps): bump aquasecurity/trivy-action from 0.9.1 to 0.9.2 by @dependabot in dexidp#2850
* build(deps): bump golang from 1.20.1-alpine3.16 to 1.20.2-alpine3.16 by @dependabot in dexidp#2849
* feat: Bump gomplate 3.11.4 by @nabokihms in dexidp#2840
* build(deps): bump golang.org/x/crypto from 0.6.0 to 0.7.0 by @dependabot in dexidp#2856
* build(deps): bump golang.org/x/oauth2 from 0.4.0 to 0.6.0 by @dependabot in dexidp#2847
* build(deps): bump google.golang.org/api from 0.108.0 to 0.112.0 by @dependabot in dexidp#2853
* build(deps): bump google.golang.org/api from 0.112.0 to 0.114.0 by @dependabot in dexidp#2869
* build(deps): bump actions/setup-go from 3 to 4 by @dependabot in dexidp#2863
* build(deps): bump github.com/russellhaering/goxmldsig from 1.2.0 to 1.3.0 by @dependabot in dexidp#2862
* build(deps): bump google.golang.org/protobuf from 1.28.1 to 1.30.0 by @dependabot in dexidp#2866
* build(deps): bump google.golang.org/protobuf from 1.28.1 to 1.30.0 in /api/v2 by @dependabot in dexidp#2867
* build(deps): bump golang.org/x/crypto from 0.0.0-20220112180741-5e0467b6c7ce to 0.1.0 in /examples by @dependabot in dexidp#2845
* build(deps): bump google.golang.org/grpc from 1.52.0 to 1.53.0 in /api/v2 by @dependabot in dexidp#2816
* chore: upgrade tools by @sagikazarmark in dexidp#2870
### Other Changes
* Bump image in examples/k8s/dex.yaml to v2.32.0 by @stealthybox in dexidp#2569

## New Contributors
* @pinpox made their first contribution in dexidp#2733
* @nobuyo made their first contribution in dexidp#2740
* @dlipovetsky made their first contribution in dexidp#2790
* @seankhliao made their first contribution in dexidp#2812
* @stealthybox made their first contribution in dexidp#2569

**Full Changelog**: dexidp/dex@v2.35.3...v2.36.0
Cedric-Magnan pushed a commit to Cedric-Magnan/dex that referenced this pull request May 29, 2023
@dlipovetsky @Cedric-Magnan
chore: Upgrade golangci-lint to v1.50.1 from v1.46.0 (dexidp#2790)
7e349ed
palexster pushed a commit to palexster/dex that referenced this pull request Oct 4, 2023
@dlipovetsky
chore: Upgrade golangci-lint to v1.50.1 from v1.46.0 (dexidp#2790)
bbf37d4
michaelliau pushed a commit to FlockFreight/dex that referenced this pull request Oct 4, 2023
@dlipovetsky @michaelliau
chore: Upgrade golangci-lint to v1.50.1 from v1.46.0 (dexidp#2790)
60e92fc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nabokihms nabokihms nabokihms approved these changes

Assignees
No one assigned
Labels
release-note/dependency-update Release note: Dependency Updates
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dlipovetsky @nabokihms