Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 25e89d7

Browse files
authored
Refactor (#12)
* refactor: Use go list and xargs for parallel installation * refactor: Use goimports instead of gogroup * chore: Update goreleaser version to v1.5.0
1 parent d5d2e11 commit 25e89d7

File tree

899 files changed

+87129
-18286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

899 files changed

+87129
-18286
lines changed

scripts/install/install-vendored-tools.sh

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/sh
1+
2+
3+
#!/bin/bash
24

35
set -eu
46

@@ -11,8 +13,38 @@ echo "${SCRIPT_NAME} is running... "
1113

1214
cd "${TOOLS_DIR}" || exit 1
1315

14-
go generate -x -tags=tools
16+
function check_status() {
17+
# first param is error message to print in case of error
18+
if [ $? -ne 0 ]; then
19+
if [ -n "$1" ]; then
20+
echo "$1"
21+
fi
22+
23+
# Exit 255 to pass signal to xargs to abort process with code 1, in other cases xargs will complete with 0.
24+
exit 255
25+
fi
26+
}
27+
28+
function install_dep() {
29+
dep=$1
30+
31+
echo "[INFO]: Going to build ${dep}"
32+
33+
go install -mod=vendor "${dep}"
34+
35+
check_status "[FAIL]: build [${dep}] failed!"
36+
37+
echo "[SUCCESS]: build [${dep}] finished."
38+
}
39+
40+
export -f install_dep
41+
export -f check_status
1542

16-
cd - || exit 1
43+
function install_deps() {
44+
tools_module="$(go list -m)"
45+
46+
go list -f '{{ join .Imports "\n" }}' -tags="tools" "${tools_module}" |
47+
xargs -n 1 -P 0 -I {} bash -c 'install_dep "$@"' _ {}
48+
}
1749

18-
echo "${SCRIPT_NAME} done."
50+
install_deps

scripts/style/fix-imports.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ source "${SCRIPTS_DIR}/helpers-source.sh"
1111

1212
echo "${SCRIPT_NAME} is running... "
1313

14-
checkInstalled 'gogroup'
14+
checkInstalled 'goimports'
1515

16-
gogroup -order std,other,prefix=github.com/obalunenko/ -rewrite $(find . -type f -name "*.go" | grep -v "vendor/" | grep -v ".git")
16+
goimports -local=github.com/obalunenko/obalunenko/ -w $(find . -type f -name "*.go" | grep -v "vendor/" | grep -v ".git")
1717

1818
echo "${SCRIPT_NAME} done."

tools/go.mod

Lines changed: 64 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,63 +5,66 @@ go 1.17
55
require (
66
github.com/axw/gocov v1.0.0
77
github.com/golangci/golangci-lint v1.44.2
8-
github.com/goreleaser/goreleaser v0.182.1
8+
github.com/goreleaser/goreleaser v1.5.0
99
github.com/matm/gocov-html v0.0.0-20200509184451-71874e2e203b
10-
github.com/vasi-stripe/gogroup v0.0.0-20200806161525-b5d7f67a97b5
1110
golang.org/x/tools v0.1.9
1211
gotest.tools/gotestsum v1.7.0
1312
)
1413

1514
require (
1615
4d63.com/gochecknoglobals v0.1.0 // indirect
1716
cloud.google.com/go v0.99.0 // indirect
18-
cloud.google.com/go/kms v0.1.0 // indirect
19-
cloud.google.com/go/storage v1.16.1 // indirect
20-
code.gitea.io/sdk/gitea v0.15.0 // indirect
21-
github.com/AlekSi/pointer v1.1.0 // indirect
17+
cloud.google.com/go/kms v1.1.0 // indirect
18+
cloud.google.com/go/storage v1.18.2 // indirect
19+
code.gitea.io/sdk/gitea v0.15.1 // indirect
20+
github.com/AlekSi/pointer v1.2.0 // indirect
2221
github.com/Antonboom/errname v0.1.5 // indirect
2322
github.com/Antonboom/nilnil v0.1.0 // indirect
2423
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
25-
github.com/Azure/azure-sdk-for-go v57.0.0+incompatible // indirect
24+
github.com/Azure/azure-sdk-for-go v60.2.0+incompatible // indirect
2625
github.com/Azure/azure-storage-blob-go v0.14.0 // indirect
2726
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
28-
github.com/Azure/go-autorest/autorest v0.11.20 // indirect
29-
github.com/Azure/go-autorest/autorest/adal v0.9.15 // indirect
30-
github.com/Azure/go-autorest/autorest/azure/auth v0.5.8 // indirect
31-
github.com/Azure/go-autorest/autorest/azure/cli v0.4.3 // indirect
27+
github.com/Azure/go-autorest/autorest v0.11.23 // indirect
28+
github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
29+
github.com/Azure/go-autorest/autorest/azure/auth v0.5.10 // indirect
30+
github.com/Azure/go-autorest/autorest/azure/cli v0.4.4 // indirect
3231
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
3332
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
3433
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
3534
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3635
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3736
github.com/BurntSushi/toml v1.0.0 // indirect
38-
github.com/DisgoOrg/disgohook v1.4.3 // indirect
39-
github.com/DisgoOrg/log v1.1.0 // indirect
40-
github.com/DisgoOrg/restclient v1.2.7 // indirect
37+
github.com/DisgoOrg/disgohook v1.4.4 // indirect
38+
github.com/DisgoOrg/log v1.1.2 // indirect
39+
github.com/DisgoOrg/restclient v1.2.8 // indirect
4140
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
4241
github.com/Masterminds/goutils v1.1.1 // indirect
4342
github.com/Masterminds/semver v1.5.0 // indirect
4443
github.com/Masterminds/semver/v3 v3.1.1 // indirect
4544
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
46-
github.com/Microsoft/go-winio v0.4.16 // indirect
45+
github.com/Microsoft/go-winio v0.5.1 // indirect
4746
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
4847
github.com/ProtonMail/go-crypto v0.0.0-20210512092938-c05353c2d58c // indirect
48+
github.com/acomagu/bufpipe v1.0.3 // indirect
49+
github.com/alecthomas/jsonschema v0.0.0-20211209230136-e2b41affa5c1 // indirect
4950
github.com/alexkohler/prealloc v1.0.0 // indirect
5051
github.com/apex/log v1.9.0 // indirect
5152
github.com/ashanbrown/forbidigo v1.3.0 // indirect
5253
github.com/ashanbrown/makezero v1.1.0 // indirect
5354
github.com/atc0005/go-teams-notify/v2 v2.6.0 // indirect
54-
github.com/aws/aws-sdk-go v1.40.34 // indirect
55-
github.com/aws/aws-sdk-go-v2 v1.9.0 // indirect
56-
github.com/aws/aws-sdk-go-v2/config v1.7.0 // indirect
57-
github.com/aws/aws-sdk-go-v2/credentials v1.4.0 // indirect
58-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.5.0 // indirect
59-
github.com/aws/aws-sdk-go-v2/internal/ini v1.2.2 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.0 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/kms v1.5.0 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/sso v1.4.0 // indirect
63-
github.com/aws/aws-sdk-go-v2/service/sts v1.7.0 // indirect
64-
github.com/aws/smithy-go v1.8.0 // indirect
55+
github.com/aws/aws-sdk-go v1.42.24 // indirect
56+
github.com/aws/aws-sdk-go-v2 v1.11.2 // indirect
57+
github.com/aws/aws-sdk-go-v2/config v1.11.0 // indirect
58+
github.com/aws/aws-sdk-go-v2/credentials v1.6.4 // indirect
59+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 // indirect
60+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.2 // indirect
61+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.2 // indirect
62+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 // indirect
64+
github.com/aws/aws-sdk-go-v2/service/kms v1.11.1 // indirect
65+
github.com/aws/aws-sdk-go-v2/service/sso v1.6.2 // indirect
66+
github.com/aws/aws-sdk-go-v2/service/sts v1.11.1 // indirect
67+
github.com/aws/smithy-go v1.9.0 // indirect
6568
github.com/beorn7/perks v1.0.1 // indirect
6669
github.com/bkielbasa/cyclop v1.2.0 // indirect
6770
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
@@ -71,23 +74,24 @@ require (
7174
github.com/breml/errchkjson v0.2.3 // indirect
7275
github.com/butuzov/ireturn v0.1.1 // indirect
7376
github.com/caarlos0/ctrlc v1.0.0 // indirect
74-
github.com/caarlos0/env/v6 v6.7.0 // indirect
77+
github.com/caarlos0/env/v6 v6.9.1 // indirect
78+
github.com/caarlos0/go-reddit/v3 v3.0.1 // indirect
7579
github.com/caarlos0/go-shellwords v1.0.12 // indirect
76-
github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e // indirect
77-
github.com/cenkalti/backoff v2.1.1+incompatible // indirect
80+
github.com/cavaliergopher/cpio v1.0.1 // indirect
81+
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
7882
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
7983
github.com/cespare/xxhash/v2 v2.1.2 // indirect
8084
github.com/charithe/durationcheck v0.0.9 // indirect
8185
github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af // indirect
8286
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
83-
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
87+
github.com/cncf/xds/go v0.0.0-20211216145620-d92e9ce0af51 // indirect
8488
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
8589
github.com/daixiang0/gci v0.3.1-0.20220208004058-76d765e3ab48 // indirect
8690
github.com/davecgh/go-spew v1.1.1 // indirect
8791
github.com/denis-tingajkin/go-header v0.4.2 // indirect
88-
github.com/dghubble/go-twitter v0.0.0-20210609183100-2fdbf421508e // indirect
89-
github.com/dghubble/oauth1 v0.7.0 // indirect
90-
github.com/dghubble/sling v1.3.0 // indirect
92+
github.com/dghubble/go-twitter v0.0.0-20211115160449-93a8679adecb // indirect
93+
github.com/dghubble/oauth1 v0.7.1 // indirect
94+
github.com/dghubble/sling v1.4.0 // indirect
9195
github.com/dimchansky/utfbom v1.1.1 // indirect
9296
github.com/dnephin/pflag v1.0.7 // indirect
9397
github.com/emirpasic/gods v1.12.0 // indirect
@@ -101,8 +105,8 @@ require (
101105
github.com/fzipp/gocyclo v0.4.0 // indirect
102106
github.com/go-critic/go-critic v0.6.2 // indirect
103107
github.com/go-git/gcfg v1.5.0 // indirect
104-
github.com/go-git/go-billy/v5 v5.1.0 // indirect
105-
github.com/go-git/go-git/v5 v5.3.0 // indirect
108+
github.com/go-git/go-billy/v5 v5.3.1 // indirect
109+
github.com/go-git/go-git/v5 v5.4.2 // indirect
106110
github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
107111
github.com/go-toolsmith/astcast v1.0.0 // indirect
108112
github.com/go-toolsmith/astcopy v1.0.0 // indirect
@@ -114,7 +118,7 @@ require (
114118
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
115119
github.com/gobwas/glob v0.2.3 // indirect
116120
github.com/gofrs/flock v0.8.1 // indirect
117-
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
121+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
118122
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
119123
github.com/golang/protobuf v1.5.2 // indirect
120124
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
@@ -127,17 +131,17 @@ require (
127131
github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect
128132
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
129133
github.com/google/go-cmp v0.5.7 // indirect
130-
github.com/google/go-github/v35 v35.3.0 // indirect
131-
github.com/google/go-querystring v1.0.0 // indirect
132-
github.com/google/rpmpack v0.0.0-20210410105602-e20c988a6f5a // indirect
134+
github.com/google/go-github/v42 v42.0.0 // indirect
135+
github.com/google/go-querystring v1.1.0 // indirect
136+
github.com/google/rpmpack v0.0.0-20211125064518-d0ed9b1b61b9 // indirect
133137
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
134138
github.com/google/uuid v1.3.0 // indirect
135139
github.com/google/wire v0.5.0 // indirect
136140
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
137141
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
138142
github.com/goreleaser/chglog v0.1.2 // indirect
139-
github.com/goreleaser/fileglob v1.2.0 // indirect
140-
github.com/goreleaser/nfpm/v2 v2.6.0 // indirect
143+
github.com/goreleaser/fileglob v1.3.0 // indirect
144+
github.com/goreleaser/nfpm/v2 v2.13.0 // indirect
141145
github.com/gorilla/websocket v1.4.2 // indirect
142146
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
143147
github.com/gostaticanalysis/comment v1.4.2 // indirect
@@ -146,11 +150,12 @@ require (
146150
github.com/hashicorp/errwrap v1.0.0 // indirect
147151
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
148152
github.com/hashicorp/go-multierror v1.1.1 // indirect
149-
github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
150-
github.com/hashicorp/go-version v1.2.1 // indirect
153+
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
154+
github.com/hashicorp/go-version v1.3.0 // indirect
151155
github.com/hashicorp/hcl v1.0.0 // indirect
152156
github.com/hexops/gotextdiff v1.0.3 // indirect
153157
github.com/huandu/xstrings v1.3.2 // indirect
158+
github.com/iancoleman/orderedmap v0.2.0 // indirect
154159
github.com/imdario/mergo v0.3.12 // indirect
155160
github.com/inconshreveable/mousetrap v1.0.0 // indirect
156161
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -163,6 +168,7 @@ require (
163168
github.com/kevinburke/ssh_config v1.1.0 // indirect
164169
github.com/kisielk/errcheck v1.6.0 // indirect
165170
github.com/kisielk/gotool v1.0.0 // indirect
171+
github.com/klauspost/compress v1.13.6 // indirect
166172
github.com/kulti/thelper v0.5.1 // indirect
167173
github.com/kunwardeep/paralleltest v1.0.3 // indirect
168174
github.com/kyoh86/exportloopref v0.1.8 // indirect
@@ -180,17 +186,21 @@ require (
180186
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
181187
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
182188
github.com/mgechev/revive v1.1.4 // indirect
183-
github.com/mitchellh/copystructure v1.1.2 // indirect
189+
github.com/mitchellh/copystructure v1.2.0 // indirect
184190
github.com/mitchellh/go-homedir v1.1.0 // indirect
185191
github.com/mitchellh/mapstructure v1.4.3 // indirect
186-
github.com/mitchellh/reflectwalk v1.0.1 // indirect
192+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
187193
github.com/moricho/tparallel v0.2.1 // indirect
194+
github.com/muesli/coral v1.0.0 // indirect
195+
github.com/muesli/mango v0.1.0 // indirect
196+
github.com/muesli/mango-coral v1.0.1 // indirect
197+
github.com/muesli/mango-pflag v0.1.0 // indirect
198+
github.com/muesli/roff v0.1.0 // indirect
188199
github.com/nakabonne/nestif v0.3.1 // indirect
189200
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
190201
github.com/nishanths/exhaustive v0.7.11 // indirect
191202
github.com/nishanths/predeclared v0.2.1 // indirect
192203
github.com/olekukonko/tablewriter v0.0.5 // indirect
193-
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
194204
github.com/pelletier/go-toml v1.9.4 // indirect
195205
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
196206
github.com/pkg/errors v0.9.1 // indirect
@@ -207,14 +217,13 @@ require (
207217
github.com/ryancurrah/gomodguard v1.2.3 // indirect
208218
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
209219
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
210-
github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b // indirect
211220
github.com/securego/gosec/v2 v2.9.6 // indirect
212221
github.com/sergi/go-diff v1.2.0 // indirect
213222
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
214223
github.com/sirupsen/logrus v1.8.1 // indirect
215224
github.com/sivchari/containedctx v1.0.1 // indirect
216225
github.com/sivchari/tenv v1.4.7 // indirect
217-
github.com/slack-go/slack v0.9.4 // indirect
226+
github.com/slack-go/slack v0.10.1 // indirect
218227
github.com/sonatard/noctx v0.0.1 // indirect
219228
github.com/sourcegraph/go-diff v0.6.1 // indirect
220229
github.com/spf13/afero v1.6.0 // indirect
@@ -238,23 +247,22 @@ require (
238247
github.com/ultraware/funlen v0.0.3 // indirect
239248
github.com/ultraware/whitespace v0.0.5 // indirect
240249
github.com/uudashr/gocognit v1.0.5 // indirect
241-
github.com/vartanbeno/go-reddit/v2 v2.0.1 // indirect
242-
github.com/xanzy/go-gitlab v0.50.3 // indirect
243-
github.com/xanzy/ssh-agent v0.3.0 // indirect
250+
github.com/xanzy/go-gitlab v0.55.1 // indirect
251+
github.com/xanzy/ssh-agent v0.3.1 // indirect
244252
github.com/yagipy/maintidx v1.0.0 // indirect
245253
github.com/yeya24/promlinter v0.1.1-0.20210918184747-d757024714a1 // indirect
246254
gitlab.com/bosi/decorder v0.2.1 // indirect
247255
go.opencensus.io v0.23.0 // indirect
248256
gocloud.dev v0.24.0 // indirect
249-
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
257+
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
250258
golang.org/x/mod v0.5.1 // indirect
251-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
259+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
252260
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
253261
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
254-
golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect
255-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
262+
golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a // indirect
263+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
256264
golang.org/x/text v0.3.7 // indirect
257-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
265+
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
258266
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
259267
google.golang.org/api v0.63.0 // indirect
260268
google.golang.org/appengine v1.6.7 // indirect

0 commit comments

Comments
 (0)