Skip to content

Commit 681bc8e

Browse files
SuperQSuperQ
committed
Update Go modules
* Update Go testing to 1.18. * Update Go minimum version to 1.17. * Update Go module format for 1.17. * Bump Go modules. * Update yaml.v3 use. Signed-off-by: SuperQ <superq@gmail.com>
1 parent 627089d commit 681bc8e

File tree

9 files changed

+55
-31
lines changed

9 files changed

+55
-31
lines changed

‎.circleci/config.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
version: 2.1
33

44
orbs:
5-
go: circleci/go@0.2.0
5+
go: circleci/go@1.7.1
66

77
jobs:
88
test:
@@ -13,7 +13,10 @@ jobs:
1313
type: boolean
1414
default: true
1515
docker:
16-
- image: circleci/golang:<< parameters.go_version >>
16+
- image: cimg/go:<< parameters.go_version >>
17+
environment:
18+
# Override Go 1.18 security deprecations.
19+
GODEBUG: "x509sha1=1,tls10default=1"
1720
steps:
1821
- checkout
1922
- when:
@@ -38,7 +41,7 @@ jobs:
3841
type: boolean
3942
default: true
4043
docker:
41-
- image: circleci/golang:<< parameters.go_version >>
44+
- image: cimg/go:<< parameters.go_version >>
4245
steps:
4346
- checkout
4447
- when:
@@ -62,7 +65,7 @@ jobs:
6265
type: boolean
6366
default: true
6467
docker:
65-
- image: circleci/golang:<< parameters.go_version >>
68+
- image: cimg/go:<< parameters.go_version >>
6669
steps:
6770
- checkout
6871
- when:
@@ -91,14 +94,14 @@ workflows:
9194
matrix:
9295
parameters:
9396
go_version:
94-
- "1.16"
9597
- "1.17"
98+
- "1.18"
9699
- test-assets:
97100
name: assets-go-<< matrix.go_version >>
98101
matrix:
99102
parameters:
100103
go_version:
101-
- "1.17"
104+
- "1.18"
102105
- style:
103106
name: style
104-
go_version: "1.17"
107+
go_version: "1.18"

‎.github/workflows/golangci-lint.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ jobs:
2020
- name: install Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: 1.17.x
23+
go-version: 1.18.x
24+
- name: Install snmp_exporter/generator dependencies
25+
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
26+
if: github.repository == 'prometheus/snmp_exporter'
2427
- name: Lint
2528
uses: golangci/golangci-lint-action@v3.1.0
2629
with:
27-
version: v1.44.2
30+
version: v1.45.2

‎Makefile.common‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
8383

8484
GOLANGCI_LINT :=
8585
GOLANGCI_LINT_OPTS ?=
86-
GOLANGCI_LINT_VERSION ?= v1.44.2
86+
GOLANGCI_LINT_VERSION ?= v1.45.2
8787
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
8888
# windows isn't included here because of the path separator being different.
8989
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))

‎config/http_config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"golang.org/x/net/http2"
3434
"golang.org/x/oauth2"
3535
"golang.org/x/oauth2/clientcredentials"
36-
"gopkg.in/yaml.v2"
36+
"gopkg.in/yaml.v3"
3737
)
3838

3939
var (

‎config/http_config_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"testing"
3636
"time"
3737

38-
yaml "gopkg.in/yaml.v2"
38+
yaml "gopkg.in/yaml.v3"
3939
)
4040

4141
const (
@@ -664,6 +664,7 @@ func TestTLSConfig(t *testing.T) {
664664

665665
// tlsConfig.rootCAs.LazyCerts contains functions getCert() in go 1.16, which are
666666
// never equal. Compare the Subjects instead.
667+
// nolint:staticcheck // ignoring tlsCert.RootCAs.Subjects is deprecated ERR because cert does not come from SystemCertPool.
667668
if !reflect.DeepEqual(tlsConfig.RootCAs.Subjects(), expectedTLSConfig.RootCAs.Subjects()) {
668669
t.Fatalf("Unexpected RootCAs result: \n\n%+v\n expected\n\n%+v", tlsConfig.RootCAs.Subjects(), expectedTLSConfig.RootCAs.Subjects())
669670
}
@@ -1127,7 +1128,7 @@ func TestInvalidHTTPConfigs(t *testing.T) {
11271128
// LoadHTTPConfig parses the YAML input s into a HTTPClientConfig.
11281129
func LoadHTTPConfig(s string) (*HTTPClientConfig, error) {
11291130
cfg := &HTTPClientConfig{}
1130-
err := yaml.UnmarshalStrict([]byte(s), cfg)
1131+
err := yaml.Unmarshal([]byte(s), cfg)
11311132
if err != nil {
11321133
return nil, err
11331134
}

‎config/tls_config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"encoding/json"
2626

27-
"gopkg.in/yaml.v2"
27+
"gopkg.in/yaml.v3"
2828
)
2929

3030
// LoadTLSConfig parses the given file into a tls.Config.
@@ -36,7 +36,7 @@ func LoadTLSConfig(filename string) (*tls.Config, error) {
3636
cfg := TLSConfig{}
3737
switch filepath.Ext(filename) {
3838
case ".yml":
39-
if err = yaml.UnmarshalStrict(content, &cfg); err != nil {
39+
if err = yaml.Unmarshal(content, &cfg); err != nil {
4040
return nil, err
4141
}
4242
case ".json":

‎go.mod‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,31 @@
11
module github.com/prometheus/common
22

3+
go 1.17
4+
35
require (
4-
github.com/go-kit/log v0.2.0
6+
github.com/go-kit/log v0.2.1
57
github.com/golang/protobuf v1.5.2
68
github.com/julienschmidt/httprouter v1.3.0
79
github.com/matttproud/golang_protobuf_extensions v1.0.1
810
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
9-
github.com/prometheus/client_golang v1.12.1
11+
github.com/prometheus/client_golang v1.12.2
1012
github.com/prometheus/client_model v0.2.0
11-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
12-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
13+
golang.org/x/net v0.0.0-20220526153639-5463443f8c37
14+
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401
1315
gopkg.in/alecthomas/kingpin.v2 v2.2.6
14-
gopkg.in/yaml.v2 v2.4.0
16+
gopkg.in/yaml.v3 v3.0.1
1517
)
1618

17-
go 1.16
19+
require (
20+
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
21+
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
24+
github.com/go-logfmt/logfmt v0.5.1 // indirect
25+
github.com/jpillora/backoff v1.0.0 // indirect
26+
github.com/prometheus/procfs v0.7.3 // indirect
27+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
28+
golang.org/x/text v0.3.7 // indirect
29+
google.golang.org/appengine v1.6.6 // indirect
30+
google.golang.org/protobuf v1.26.0 // indirect
31+
)

‎go.sum‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
6666
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
6767
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
6868
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
69-
github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
70-
github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
69+
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
70+
github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
7171
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
7272
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
7373
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
@@ -170,8 +170,8 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
170170
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
171171
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
172172
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
173-
github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
174-
github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
173+
github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34=
174+
github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
175175
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
176176
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
177177
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -271,16 +271,16 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
271271
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
272272
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
273273
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
274-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
275-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
274+
golang.org/x/net v0.0.0-20220526153639-5463443f8c37 h1:lUkvobShwKsOesNfWWlCS5q7fnbG1MEliIzwu886fn8=
275+
golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
276276
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
277277
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
278278
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
279279
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
280280
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
281281
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
282-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg=
283-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
282+
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 h1:zwrSfklXn0gxyLRX/aR+q6cgHbV/ItVyzbPlbA+dkAw=
283+
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
284284
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
285285
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
286286
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -327,8 +327,9 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
327327
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
328328
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
329329
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
330-
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
331330
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
331+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
332+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
332333
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
333334
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
334335
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -478,6 +479,8 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
478479
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
479480
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
480481
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
482+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
483+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
481484
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
482485
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
483486
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎promlog/log_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"testing"
1919

2020
"github.com/go-kit/log/level"
21-
"gopkg.in/yaml.v2"
21+
"gopkg.in/yaml.v3"
2222
)
2323

2424
// Make sure creating and using a logger with an empty configuration doesn't

0 commit comments

Comments
 (0)