Skip to content

Commit 903632a

Browse files
memmem
committed
Fix: Move to Go 1.17
Signed-off-by: Marcelo E. Magallon <[email protected]>
1 parent f04586d commit 903632a

File tree

9 files changed

+862
-312
lines changed

9 files changed

+862
-312
lines changed

‎.drone/drone.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
local step(name, commands, image='golang:1.14') = {
1+
local step(name, commands, image='golang:1.17') = {
22
name: name,
33
commands: commands,
44
image: image,

‎.drone/drone.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ steps:
1414
- echo $DRONE_RUNNER_NAME
1515

1616
- name: lint
17-
image: golang:1.14
17+
image: golang:1.17
1818
commands:
1919
- make lint
2020

2121
- name: test
22-
image: golang:1.14
22+
image: golang:1.17
2323
commands:
2424
- make test
2525

2626
- name: build
27-
image: golang:1.14
27+
image: golang:1.17
2828
commands:
2929
- git fetch origin --tags
3030
- git status --porcelain --untracked-files=no
@@ -40,6 +40,6 @@ trigger:
4040

4141
---
4242
kind: signature
43-
hmac: 43ab9d90f0fc9a9e54f6b6dfce2d76ce109c7987616eb975c588e19d435a3690
43+
hmac: e634ab72aba3229c8ce2e31eeabf3f64ddb8b6a1b7fc85ceca64a8c58ab172a8
4444

4545
...

‎go.mod

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
module github.com/grafana/synthetic-monitoring-api-go-client
22

3-
go 1.14
3+
go 1.17
44

55
require (
66
github.com/google/go-cmp v0.5.6
77
github.com/grafana/synthetic-monitoring-agent v0.1.2
88
github.com/stretchr/testify v1.7.0
99
)
1010

11+
require (
12+
github.com/davecgh/go-spew v1.1.1 // indirect
13+
github.com/gogo/protobuf v1.3.2 // indirect
14+
github.com/golang/protobuf v1.5.2 // indirect
15+
github.com/pmezard/go-difflib v1.0.0 // indirect
16+
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
17+
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
18+
golang.org/x/text v0.3.6 // indirect
19+
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
20+
google.golang.org/grpc v1.40.0 // indirect
21+
google.golang.org/protobuf v1.27.1 // indirect
22+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
23+
)
24+
1125
// Without the following replace, you get an error like
1226
//
1327
// k8s.io/[email protected]+incompatible: invalid version: +incompatible suffix not allowed: module contains a go.mod file, so semantic import versioning is required

‎model/model.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,11 @@ func (e *ErrorResponse) MarshalJSON() ([]byte, error) {
128128
}
129129
}
130130

131-
return json.Marshal(&resp)
131+
buf, err := json.Marshal(&resp)
132+
if err != nil {
133+
// This should never happen.
134+
return nil, fmt.Errorf("cannot marshal error: %w", err)
135+
}
136+
137+
return buf, nil
132138
}

‎scripts/go/dep.go

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package main
2+
3+
import (
4+
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
5+
_ "github.com/securego/gosec/cmd/gosec"
6+
_ "github.com/unknwon/bra"
7+
_ "gotest.tools/gotestsum"
8+
)
9+
10+
func main() {
11+
}

‎scripts/go/go.mod

+155-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,161 @@
11
module github.com/grafana/synthetic-monitoring-api/scripts/go
22

3-
go 1.14
3+
go 1.17
44

55
require (
6-
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect
7-
github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3 // indirect
8-
github.com/golangci/golangci-lint v1.36.0 // indirect
6+
github.com/golangci/golangci-lint v1.42.0
7+
github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989
8+
github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8
9+
gotest.tools/gotestsum v1.7.0
10+
)
11+
12+
require (
13+
4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a // indirect
14+
github.com/Antonboom/errname v0.1.3 // indirect
15+
github.com/BurntSushi/toml v0.4.1 // indirect
16+
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
17+
github.com/Masterminds/semver v1.5.0 // indirect
18+
github.com/OpenPeeDeeP/depguard v1.0.1 // indirect
19+
github.com/alexkohler/prealloc v1.0.0 // indirect
20+
github.com/ashanbrown/forbidigo v1.2.0 // indirect
21+
github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde // indirect
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/bkielbasa/cyclop v1.2.0 // indirect
24+
github.com/bombsimon/wsl/v3 v3.3.0 // indirect
25+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
26+
github.com/charithe/durationcheck v0.0.8 // indirect
27+
github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af // indirect
28+
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
29+
github.com/daixiang0/gci v0.2.9 // indirect
30+
github.com/davecgh/go-spew v1.1.1 // indirect
31+
github.com/denis-tingajkin/go-header v0.4.2 // indirect
32+
github.com/dnephin/pflag v1.0.7 // indirect
33+
github.com/esimonov/ifshort v1.0.2 // indirect
34+
github.com/ettle/strcase v0.1.1 // indirect
35+
github.com/fatih/color v1.12.0 // indirect
36+
github.com/fatih/structtag v1.2.0 // indirect
37+
github.com/fsnotify/fsnotify v1.4.9 // indirect
38+
github.com/fzipp/gocyclo v0.3.1 // indirect
39+
github.com/go-critic/go-critic v0.5.6 // indirect
40+
github.com/go-toolsmith/astcast v1.0.0 // indirect
41+
github.com/go-toolsmith/astcopy v1.0.0 // indirect
42+
github.com/go-toolsmith/astequal v1.0.0 // indirect
43+
github.com/go-toolsmith/astfmt v1.0.0 // indirect
44+
github.com/go-toolsmith/astp v1.0.0 // indirect
45+
github.com/go-toolsmith/strparse v1.0.0 // indirect
46+
github.com/go-toolsmith/typep v1.0.2 // indirect
47+
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
48+
github.com/gobwas/glob v0.2.3 // indirect
49+
github.com/gofrs/flock v0.8.1 // indirect
50+
github.com/golang/protobuf v1.5.2 // indirect
51+
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
52+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
53+
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 // indirect
54+
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
55+
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
56+
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
57+
github.com/golangci/misspell v0.3.5 // indirect
58+
github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5 // indirect
59+
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
60+
github.com/google/go-cmp v0.5.5 // indirect
61+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
62+
github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect
63+
github.com/gostaticanalysis/analysisutil v0.4.1 // indirect
64+
github.com/gostaticanalysis/comment v1.4.1 // indirect
65+
github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5 // indirect
66+
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
67+
github.com/hashicorp/errwrap v1.0.0 // indirect
68+
github.com/hashicorp/go-multierror v1.1.1 // indirect
69+
github.com/hashicorp/hcl v1.0.0 // indirect
70+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
71+
github.com/jgautheron/goconst v1.5.1 // indirect
72+
github.com/jingyugao/rowserrcheck v1.1.0 // indirect
73+
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
974
github.com/jonboulle/clockwork v0.2.2 // indirect
10-
github.com/markbates/pkger v0.17.1 // indirect
11-
github.com/sclevine/agouti v3.0.0+incompatible // indirect
12-
github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989 // indirect
13-
github.com/tommy-muehle/go-mnd v1.3.1-0.20201008215730-16041ac3fe65 // indirect
14-
github.com/ugorji/go v1.1.4 // indirect
15-
github.com/unknwon/bra v0.0.0-20191020212106-9f09ca301444 // indirect
16-
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect
17-
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
18-
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
19-
golang.org/x/sys v0.0.0-20210108172913-0df2131ae363 // indirect
20-
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
21-
golang.org/x/tools v0.0.0-20210108195035-e9a2c0706a5b // indirect
22-
gotest.tools/gotestsum v0.6.0 // indirect
75+
github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d // indirect
76+
github.com/kisielk/errcheck v1.6.0 // indirect
77+
github.com/kisielk/gotool v1.0.0 // indirect
78+
github.com/kulti/thelper v0.4.0 // indirect
79+
github.com/kunwardeep/paralleltest v1.0.2 // indirect
80+
github.com/kyoh86/exportloopref v0.1.8 // indirect
81+
github.com/ldez/gomoddirectives v0.2.2 // indirect
82+
github.com/ldez/tagliatelle v0.2.0 // indirect
83+
github.com/magiconair/properties v1.8.5 // indirect
84+
github.com/maratori/testpackage v1.0.1 // indirect
85+
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
86+
github.com/mattn/go-colorable v0.1.8 // indirect
87+
github.com/mattn/go-isatty v0.0.12 // indirect
88+
github.com/mattn/go-runewidth v0.0.9 // indirect
89+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
90+
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
91+
github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 // indirect
92+
github.com/mgechev/revive v1.1.0 // indirect
93+
github.com/mitchellh/go-homedir v1.1.0 // indirect
94+
github.com/mitchellh/mapstructure v1.4.1 // indirect
95+
github.com/moricho/tparallel v0.2.1 // indirect
96+
github.com/nakabonne/nestif v0.3.0 // indirect
97+
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
98+
github.com/nishanths/exhaustive v0.2.3 // indirect
99+
github.com/nishanths/predeclared v0.2.1 // indirect
100+
github.com/olekukonko/tablewriter v0.0.5 // indirect
101+
github.com/pelletier/go-toml v1.9.3 // indirect
102+
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
103+
github.com/pkg/errors v0.9.1 // indirect
104+
github.com/pmezard/go-difflib v1.0.0 // indirect
105+
github.com/polyfloyd/go-errorlint v0.0.0-20210510181950-ab96adb96fea // indirect
106+
github.com/prometheus/client_golang v1.7.1 // indirect
107+
github.com/prometheus/client_model v0.2.0 // indirect
108+
github.com/prometheus/common v0.10.0 // indirect
109+
github.com/prometheus/procfs v0.6.0 // indirect
110+
github.com/quasilyte/go-ruleguard v0.3.4 // indirect
111+
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
112+
github.com/russross/blackfriday/v2 v2.0.1 // indirect
113+
github.com/ryancurrah/gomodguard v1.2.3 // indirect
114+
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
115+
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
116+
github.com/securego/gosec/v2 v2.8.1 // indirect
117+
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
118+
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
119+
github.com/sirupsen/logrus v1.8.1 // indirect
120+
github.com/sonatard/noctx v0.0.1 // indirect
121+
github.com/sourcegraph/go-diff v0.6.1 // indirect
122+
github.com/spf13/afero v1.6.0 // indirect
123+
github.com/spf13/cast v1.3.1 // indirect
124+
github.com/spf13/cobra v1.2.1 // indirect
125+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
126+
github.com/spf13/pflag v1.0.5 // indirect
127+
github.com/spf13/viper v1.8.1 // indirect
128+
github.com/ssgreg/nlreturn/v2 v2.1.0 // indirect
129+
github.com/stretchr/objx v0.2.0 // indirect
130+
github.com/stretchr/testify v1.7.0 // indirect
131+
github.com/subosito/gotenv v1.2.0 // indirect
132+
github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect
133+
github.com/tetafro/godot v1.4.8 // indirect
134+
github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect
135+
github.com/tomarrell/wrapcheck/v2 v2.3.0 // indirect
136+
github.com/tommy-muehle/go-mnd/v2 v2.4.0 // indirect
137+
github.com/ultraware/funlen v0.0.3 // indirect
138+
github.com/ultraware/whitespace v0.0.4 // indirect
139+
github.com/unknwon/com v1.0.1 // indirect
140+
github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
141+
github.com/urfave/cli v1.22.1 // indirect
142+
github.com/uudashr/gocognit v1.0.5 // indirect
143+
github.com/yeya24/promlinter v0.1.0 // indirect
144+
golang.org/x/mod v0.4.2 // indirect
145+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
146+
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
147+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
148+
golang.org/x/text v0.3.6 // indirect
149+
golang.org/x/tools v0.1.5 // indirect
150+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
151+
google.golang.org/protobuf v1.26.0 // indirect
152+
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
153+
gopkg.in/ini.v1 v1.62.0 // indirect
154+
gopkg.in/yaml.v2 v2.4.0 // indirect
155+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
156+
honnef.co/go/tools v0.2.1 // indirect
157+
mvdan.cc/gofumpt v0.1.1 // indirect
158+
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
159+
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
160+
mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect
23161
)

0 commit comments

Comments
 (0)