Skip to content

Commit fc3a8fe

Browse files
otaviootavio
committed
go: use golang 1.17 as minimal version
Signed-off-by: Otavio Salvador <[email protected]>
1 parent 5836c62 commit fc3a8fe

File tree

5 files changed

+76
-16
lines changed

5 files changed

+76
-16
lines changed

‎.golangci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ linters-settings:
1818

1919
stylecheck:
2020
# Select the Go version to target. The default is '1.13'.
21-
go: "1.16"
21+
go: "1.17"
2222
# https://staticcheck.io/docs/options#checks
2323
checks: [ "all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022" ]
2424
# https://staticcheck.io/docs/options#dot_import_whitelist
@@ -31,7 +31,7 @@ linters-settings:
3131

3232
unused:
3333
# Select the Go version to target. The default is '1.13'.
34-
go: "1.16"
34+
go: "1.17"
3535

3636
whitespace:
3737
multi-if: true # Enforces newlines (or comments) after every multi-line if statement

‎agent/go.mod

+32-10
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
module github.com/shellhub-io/shellhub/agent
22

3-
go 1.14
3+
go 1.17
44

55
require (
66
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
77
github.com/Masterminds/semver v1.5.0
8-
github.com/Microsoft/go-winio v0.4.16 // indirect
98
github.com/creack/pty v1.1.18
10-
github.com/docker/distribution v2.8.0+incompatible // indirect
119
github.com/docker/docker v23.0.1+incompatible
12-
github.com/docker/go-connections v0.4.0 // indirect
13-
github.com/docker/go-units v0.4.0 // indirect
1410
github.com/gliderlabs/ssh v0.3.5
15-
github.com/gogo/protobuf v1.3.2 // indirect
1611
github.com/gorilla/mux v1.8.0
1712
github.com/kelseyhightower/envconfig v1.4.0
1813
github.com/mattn/go-shellwords v1.0.12
19-
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
20-
github.com/morikuni/aec v1.0.0 // indirect
21-
github.com/opencontainers/go-digest v1.0.0 // indirect
22-
github.com/opencontainers/image-spec v1.0.2 // indirect
2314
github.com/pkg/errors v0.9.1
2415
github.com/pkg/sftp v1.13.5
2516
github.com/shellhub-io/shellhub v0.5.2
@@ -30,6 +21,37 @@ require (
3021
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64
3122
)
3223

24+
require (
25+
github.com/Microsoft/go-winio v0.4.16 // indirect
26+
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
27+
github.com/davecgh/go-spew v1.1.1 // indirect
28+
github.com/docker/distribution v2.8.0+incompatible // indirect
29+
github.com/docker/go-connections v0.4.0 // indirect
30+
github.com/docker/go-units v0.4.0 // indirect
31+
github.com/go-playground/locales v0.14.0 // indirect
32+
github.com/go-playground/universal-translator v0.18.0 // indirect
33+
github.com/go-playground/validator/v10 v10.10.0 // indirect
34+
github.com/go-resty/resty/v2 v2.7.0 // indirect
35+
github.com/gogo/protobuf v1.3.2 // indirect
36+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
37+
github.com/google/go-cmp v0.5.9 // indirect
38+
github.com/gorilla/websocket v1.5.0 // indirect
39+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
40+
github.com/kr/fs v0.1.0 // indirect
41+
github.com/leodido/go-urn v1.2.1 // indirect
42+
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
43+
github.com/morikuni/aec v1.0.0 // indirect
44+
github.com/opencontainers/go-digest v1.0.0 // indirect
45+
github.com/opencontainers/image-spec v1.0.2 // indirect
46+
github.com/pmezard/go-difflib v1.0.0 // indirect
47+
github.com/spf13/pflag v1.0.5 // indirect
48+
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
49+
golang.org/x/text v0.3.7 // indirect
50+
golang.org/x/time v0.3.0 // indirect
51+
gopkg.in/yaml.v3 v3.0.1 // indirect
52+
gotest.tools/v3 v3.0.2 // indirect
53+
)
54+
3355
replace github.com/shellhub-io/shellhub => ../
3456

3557
replace github.com/gliderlabs/ssh => github.com/shellhub-io/ssh v0.0.0-20230224143412-edd48dfd6eea

‎agent/go.sum

+4-3
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,9 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
146146
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
147147
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
148148
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
149-
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
150149
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
150+
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
151+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
151152
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
152153
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
153154
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
@@ -534,8 +535,9 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
534535
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
535536
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
536537
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
537-
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
538538
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
539+
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
540+
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
539541
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
540542
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
541543
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -560,7 +562,6 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
560562
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
561563
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
562564
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
563-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
564565
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
565566
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
566567
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=

‎devscripts/prepare-release

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
prepare_go_dir() {
44
(
55
cd $1
6+
rm -f go.sum
67
go mod tidy
78
)
89
}

‎go.mod

+37-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/shellhub-io/shellhub
22

3-
go 1.14
3+
go 1.17
44

55
require (
66
github.com/go-playground/validator/v10 v10.10.0
@@ -19,3 +19,39 @@ require (
1919
github.com/sirupsen/logrus v1.8.1
2020
github.com/stretchr/testify v1.7.0
2121
)
22+
23+
require (
24+
github.com/andybalholm/brotli v1.0.0 // indirect
25+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
26+
github.com/davecgh/go-spew v1.1.1 // indirect
27+
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
28+
github.com/dsnet/compress v0.0.1 // indirect
29+
github.com/go-playground/locales v0.14.0 // indirect
30+
github.com/go-playground/universal-translator v0.18.0 // indirect
31+
github.com/golang/snappy v0.0.1 // indirect
32+
github.com/klauspost/compress v1.13.6 // indirect
33+
github.com/klauspost/pgzip v1.2.4 // indirect
34+
github.com/labstack/gommon v0.3.1 // indirect
35+
github.com/leodido/go-urn v1.2.1 // indirect
36+
github.com/mattn/go-colorable v0.1.11 // indirect
37+
github.com/mattn/go-isatty v0.0.14 // indirect
38+
github.com/nwaples/rardecode v1.1.0 // indirect
39+
github.com/oschwald/maxminddb-golang v1.8.0 // indirect
40+
github.com/pierrec/lz4/v4 v4.0.3 // indirect
41+
github.com/pmezard/go-difflib v1.0.0 // indirect
42+
github.com/stretchr/objx v0.1.1 // indirect
43+
github.com/ulikunitz/xz v0.5.7 // indirect
44+
github.com/valyala/bytebufferpool v1.0.0 // indirect
45+
github.com/valyala/fasttemplate v1.2.1 // indirect
46+
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
47+
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
48+
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
49+
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
50+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
51+
golang.org/x/exp v0.0.0-20210916165020-5cb4fee858ee // indirect
52+
golang.org/x/net v0.0.0-20211029224645-99673261e6eb // indirect
53+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
54+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
55+
golang.org/x/text v0.3.7 // indirect
56+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
57+
)

0 commit comments

Comments
 (0)