Skip to content

Commit 0e61d80

Browse files
committed
Remove golangci-lint from Go deps
1 parent fb859a7 commit 0e61d80

File tree

4 files changed

+163
-568
lines changed

4 files changed

+163
-568
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ all: test lint verify-codegen update-crds debian-image
2424

2525
.PHONY: lint
2626
lint: ## Run linter
27-
go run github.com/golangci/golangci-lint/cmd/golangci-lint run
27+
@git fetch
28+
docker run --pull always --rm -v $(shell pwd):/kubernetes-ingress -w /kubernetes-ingress -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest git diff -p origin/master > /tmp/diff.patch && golangci-lint --color always run -v --new-from-patch=/tmp/diff.patch
2829

2930
.PHONY: test
3031
test: ## Run tests

go.mod

Lines changed: 18 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.0
88
github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
99
github.com/golang/glog v1.0.0
10-
github.com/golangci/golangci-lint v1.40.1
1110
github.com/google/go-cmp v0.5.7
1211
github.com/nginxinc/nginx-plus-go-client v0.9.0
1312
github.com/nginxinc/nginx-prometheus-exporter v0.10.0
@@ -21,16 +20,8 @@ require (
2120
)
2221

2322
require (
24-
4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a // indirect
25-
github.com/BurntSushi/toml v0.3.1 // indirect
26-
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
27-
github.com/Masterminds/semver v1.5.0 // indirect
28-
github.com/OpenPeeDeeP/depguard v1.0.1 // indirect
2923
github.com/PuerkitoBio/purell v1.1.1 // indirect
3024
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
31-
github.com/alexkohler/prealloc v1.0.0 // indirect
32-
github.com/ashanbrown/forbidigo v1.1.0 // indirect
33-
github.com/ashanbrown/makezero v0.0.0-20210308000810-4155955488a0 // indirect
3425
github.com/aws/aws-sdk-go-v2 v1.15.0 // indirect
3526
github.com/aws/aws-sdk-go-v2/credentials v1.10.0 // indirect
3627
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.0 // indirect
@@ -42,161 +33,62 @@ require (
4233
github.com/aws/aws-sdk-go-v2/service/sts v1.16.0 // indirect
4334
github.com/aws/smithy-go v1.11.1 // indirect
4435
github.com/beorn7/perks v1.0.1 // indirect
45-
github.com/bkielbasa/cyclop v1.2.0 // indirect
46-
github.com/bombsimon/wsl/v3 v3.3.0 // indirect
4736
github.com/cespare/xxhash/v2 v2.1.2 // indirect
48-
github.com/charithe/durationcheck v0.0.6 // indirect
49-
github.com/chavacava/garif v0.0.0-20210405163807-87a70f3d418b // indirect
50-
github.com/daixiang0/gci v0.2.8 // indirect
5137
github.com/davecgh/go-spew v1.1.1 // indirect
52-
github.com/denis-tingajkin/go-header v0.4.2 // indirect
53-
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
54-
github.com/esimonov/ifshort v1.0.2 // indirect
55-
github.com/ettle/strcase v0.1.1 // indirect
38+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
5639
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
57-
github.com/fatih/color v1.12.0 // indirect
58-
github.com/fatih/structtag v1.2.0 // indirect
59-
github.com/fsnotify/fsnotify v1.4.9 // indirect
60-
github.com/fzipp/gocyclo v0.3.1 // indirect
61-
github.com/go-critic/go-critic v0.5.6 // indirect
40+
github.com/fatih/color v1.13.0 // indirect
41+
github.com/fsnotify/fsnotify v1.5.1 // indirect
6242
github.com/go-logr/logr v1.2.0 // indirect
6343
github.com/go-openapi/jsonpointer v0.19.5 // indirect
6444
github.com/go-openapi/jsonreference v0.19.5 // indirect
6545
github.com/go-openapi/swag v0.19.14 // indirect
66-
github.com/go-toolsmith/astcast v1.0.0 // indirect
67-
github.com/go-toolsmith/astcopy v1.0.0 // indirect
68-
github.com/go-toolsmith/astequal v1.0.0 // indirect
69-
github.com/go-toolsmith/astfmt v1.0.0 // indirect
70-
github.com/go-toolsmith/astp v1.0.0 // indirect
71-
github.com/go-toolsmith/strparse v1.0.0 // indirect
72-
github.com/go-toolsmith/typep v1.0.2 // indirect
73-
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
74-
github.com/gobuffalo/flect v0.2.2 // indirect
75-
github.com/gobwas/glob v0.2.3 // indirect
76-
github.com/gofrs/flock v0.8.0 // indirect
46+
github.com/gobuffalo/flect v0.2.3 // indirect
7747
github.com/gogo/protobuf v1.3.2 // indirect
7848
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7949
github.com/golang/protobuf v1.5.2 // indirect
80-
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
81-
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
82-
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 // indirect
83-
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
84-
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
85-
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
86-
github.com/golangci/misspell v0.3.5 // indirect
87-
github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5 // indirect
88-
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
8950
github.com/google/gofuzz v1.1.0 // indirect
51+
github.com/google/uuid v1.3.0 // indirect
9052
github.com/googleapis/gnostic v0.5.5 // indirect
91-
github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect
92-
github.com/gostaticanalysis/analysisutil v0.4.1 // indirect
93-
github.com/gostaticanalysis/comment v1.4.1 // indirect
94-
github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5 // indirect
95-
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
96-
github.com/hashicorp/errwrap v1.0.0 // indirect
97-
github.com/hashicorp/go-multierror v1.1.1 // indirect
98-
github.com/hashicorp/hcl v1.0.0 // indirect
99-
github.com/imdario/mergo v0.3.12 // indirect
53+
github.com/imdario/mergo v0.3.8 // indirect
10054
github.com/inconshreveable/mousetrap v1.0.0 // indirect
101-
github.com/jgautheron/goconst v1.4.0 // indirect
102-
github.com/jingyugao/rowserrcheck v0.0.0-20210315055705-d907ca737bb1 // indirect
103-
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
10455
github.com/josharian/intern v1.0.0 // indirect
10556
github.com/json-iterator/go v1.1.12 // indirect
106-
github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d // indirect
107-
github.com/kisielk/errcheck v1.6.0 // indirect
108-
github.com/kisielk/gotool v1.0.0 // indirect
109-
github.com/kulti/thelper v0.4.0 // indirect
110-
github.com/kunwardeep/paralleltest v1.0.2 // indirect
111-
github.com/kyoh86/exportloopref v0.1.8 // indirect
112-
github.com/ldez/gomoddirectives v0.2.1 // indirect
113-
github.com/ldez/tagliatelle v0.2.0 // indirect
114-
github.com/magiconair/properties v1.8.1 // indirect
11557
github.com/mailru/easyjson v0.7.6 // indirect
116-
github.com/maratori/testpackage v1.0.1 // indirect
117-
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
118-
github.com/mattn/go-colorable v0.1.8 // indirect
119-
github.com/mattn/go-isatty v0.0.12 // indirect
120-
github.com/mattn/go-runewidth v0.0.9 // indirect
58+
github.com/mattn/go-colorable v0.1.12 // indirect
59+
github.com/mattn/go-isatty v0.0.14 // indirect
12160
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
122-
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
123-
github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 // indirect
124-
github.com/mgechev/revive v1.0.6 // indirect
125-
github.com/mitchellh/go-homedir v1.1.0 // indirect
126-
github.com/mitchellh/mapstructure v1.1.2 // indirect
12761
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
12862
github.com/modern-go/reflect2 v1.0.2 // indirect
129-
github.com/moricho/tparallel v0.2.1 // indirect
130-
github.com/nakabonne/nestif v0.3.0 // indirect
131-
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
132-
github.com/nishanths/exhaustive v0.1.0 // indirect
133-
github.com/nishanths/predeclared v0.2.1 // indirect
134-
github.com/olekukonko/tablewriter v0.0.5 // indirect
135-
github.com/pelletier/go-toml v1.2.0 // indirect
136-
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
63+
github.com/onsi/gomega v1.18.1 // indirect
13764
github.com/pkg/errors v0.9.1 // indirect
138-
github.com/pmezard/go-difflib v1.0.0 // indirect
139-
github.com/polyfloyd/go-errorlint v0.0.0-20210418123303-74da32850375 // indirect
14065
github.com/prometheus/client_model v0.2.0 // indirect
14166
github.com/prometheus/common v0.32.1 // indirect
14267
github.com/prometheus/procfs v0.7.3 // indirect
143-
github.com/quasilyte/go-ruleguard v0.3.4 // indirect
144-
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
145-
github.com/ryancurrah/gomodguard v1.2.0 // indirect
146-
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
147-
github.com/sanposhiho/wastedassign v1.0.0 // indirect
148-
github.com/securego/gosec/v2 v2.7.0 // indirect
149-
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
150-
github.com/sirupsen/logrus v1.8.1 // indirect
151-
github.com/sonatard/noctx v0.0.1 // indirect
152-
github.com/sourcegraph/go-diff v0.6.1 // indirect
153-
github.com/spf13/afero v1.2.2 // indirect
154-
github.com/spf13/cast v1.3.0 // indirect
155-
github.com/spf13/cobra v1.1.3 // indirect
156-
github.com/spf13/jwalterweatherman v1.0.0 // indirect
68+
github.com/spf13/cobra v1.4.0 // indirect
15769
github.com/spf13/pflag v1.0.5 // indirect
158-
github.com/spf13/viper v1.7.1 // indirect
159-
github.com/ssgreg/nlreturn/v2 v2.1.0 // indirect
160-
github.com/stretchr/objx v0.2.0 // indirect
161-
github.com/stretchr/testify v1.7.0 // indirect
162-
github.com/subosito/gotenv v1.2.0 // indirect
163-
github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect
164-
github.com/tetafro/godot v1.4.6 // indirect
165-
github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect
166-
github.com/tomarrell/wrapcheck/v2 v2.1.0 // indirect
167-
github.com/tommy-muehle/go-mnd/v2 v2.3.2 // indirect
168-
github.com/ultraware/funlen v0.0.3 // indirect
169-
github.com/ultraware/whitespace v0.0.4 // indirect
170-
github.com/uudashr/gocognit v1.0.1 // indirect
171-
github.com/yeya24/promlinter v0.1.0 // indirect
172-
golang.org/x/mod v0.4.2 // indirect
70+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
17371
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
174-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
175-
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
72+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
73+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
17674
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
17775
golang.org/x/text v0.3.7 // indirect
17876
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
179-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
77+
golang.org/x/tools v0.1.10 // indirect
18078
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
18179
google.golang.org/appengine v1.6.7 // indirect
182-
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1 // indirect
183-
google.golang.org/grpc v1.36.1 // indirect
80+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
81+
google.golang.org/grpc v1.43.0 // indirect
18482
google.golang.org/protobuf v1.27.1 // indirect
18583
gopkg.in/inf.v0 v0.9.1 // indirect
186-
gopkg.in/ini.v1 v1.51.0 // indirect
18784
gopkg.in/yaml.v2 v2.4.0 // indirect
18885
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
189-
honnef.co/go/tools v0.1.4 // indirect
190-
k8s.io/apiextensions-apiserver v0.21.1 // indirect
86+
k8s.io/apiextensions-apiserver v0.23.0 // indirect
19187
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
19288
k8s.io/klog/v2 v2.30.0 // indirect
19389
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
19490
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
195-
mvdan.cc/gofumpt v0.1.1 // indirect
196-
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
197-
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
198-
mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect
19991
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
20092
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
201-
sigs.k8s.io/yaml v1.2.0 // indirect
93+
sigs.k8s.io/yaml v1.3.0 // indirect
20294
)

0 commit comments

Comments
 (0)