Skip to content

Commit 15b5adc

Browse files
authored
Update go to 1.17.7 (#62)
Update circleci and Makefile golang to 1.17.7. Also update go.mod go version to 1.17. Use cimg/go instead of circleci/golang and remove working_directory directive in the circleci config.
1 parent 8c94b28 commit 15b5adc

File tree

3 files changed

+51
-9
lines changed

3 files changed

+51
-9
lines changed

.circleci/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ version: 2.1
33

44
references:
55
images:
6-
go: &GOLANG_IMAGE docker.mirror.hashicorp.services/circleci/golang:1.17.2
6+
go: &GOLANG_IMAGE docker.mirror.hashicorp.services/cimg/go:1.17.7
77

88
paths:
99
test-results: &TEST_RESULTS_DIR /tmp/test-results
10-
working-directory: &WORKING_DIRECTORY /go/src/github.com/hashicorp/vault-lambda-extension
1110

1211
environment: &ENVIRONMENT
1312
TEST_RESULTS_DIR: *TEST_RESULTS_DIR
@@ -18,7 +17,6 @@ jobs:
1817
lint:
1918
docker:
2019
- image: *GOLANG_IMAGE
21-
working_directory: *WORKING_DIRECTORY
2220
environment:
2321
<<: *ENVIRONMENT
2422
steps:
@@ -30,7 +28,6 @@ jobs:
3028
gomod:
3129
docker:
3230
- image: *GOLANG_IMAGE
33-
working_directory: *WORKING_DIRECTORY
3431
steps:
3532
- checkout
3633
- run:
@@ -44,7 +41,6 @@ jobs:
4441
build:
4542
docker:
4643
- image: *GOLANG_IMAGE
47-
working_directory: *WORKING_DIRECTORY
4844
steps:
4945
- checkout
5046
- run: make build
@@ -54,7 +50,6 @@ jobs:
5450
- image: *GOLANG_IMAGE
5551
environment:
5652
<<: *ENVIRONMENT
57-
working_directory: *WORKING_DIRECTORY
5853
steps:
5954
- checkout
6055
- run: mkdir -p $TEST_RESULTS_DIR/go-test && make test

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GOOS?=linux
22
GOARCH?=amd64
3-
GOLANG_IMAGE?=docker.mirror.hashicorp.services/golang:1.16.3
3+
GOLANG_IMAGE?=docker.mirror.hashicorp.services/golang:1.17.7
44
CI_TEST_ARGS=
55
ifdef CI
66
override CI_TEST_ARGS:=--junitfile=$(TEST_RESULTS_DIR)/go-test/results.xml --jsonfile=$(TEST_RESULTS_DIR)/go-test/results.json

go.mod

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,61 @@
11
module github.com/hashicorp/vault-lambda-extension
22

3-
go 1.15
3+
go 1.17
44

55
require (
66
github.com/aws/aws-sdk-go v1.41.10
7-
github.com/fatih/color v1.10.0 // indirect
87
github.com/hashicorp/go-multierror v1.1.1
98
github.com/hashicorp/vault/api v1.4.1
109
github.com/hashicorp/vault/sdk v0.4.1
1110
github.com/patrickmn/go-cache v2.1.0+incompatible
1211
github.com/stretchr/testify v1.7.0
12+
)
13+
14+
require (
15+
github.com/armon/go-metrics v0.3.9 // indirect
16+
github.com/armon/go-radix v1.0.0 // indirect
17+
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
18+
github.com/davecgh/go-spew v1.1.1 // indirect
19+
github.com/fatih/color v1.10.0 // indirect
20+
github.com/golang/protobuf v1.5.2 // indirect
21+
github.com/golang/snappy v0.0.4 // indirect
22+
github.com/hashicorp/errwrap v1.1.0 // indirect
23+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
24+
github.com/hashicorp/go-hclog v0.16.2 // indirect
25+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
26+
github.com/hashicorp/go-plugin v1.4.3 // indirect
27+
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
28+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
29+
github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
30+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1 // indirect
31+
github.com/hashicorp/go-secure-stdlib/strutil v0.1.1 // indirect
32+
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
33+
github.com/hashicorp/go-uuid v1.0.2 // indirect
34+
github.com/hashicorp/go-version v1.2.0 // indirect
35+
github.com/hashicorp/golang-lru v0.5.4 // indirect
36+
github.com/hashicorp/hcl v1.0.0 // indirect
37+
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
38+
github.com/jmespath/go-jmespath v0.4.0 // indirect
39+
github.com/mattn/go-colorable v0.1.8 // indirect
40+
github.com/mattn/go-isatty v0.0.12 // indirect
41+
github.com/mitchellh/copystructure v1.0.0 // indirect
42+
github.com/mitchellh/go-homedir v1.1.0 // indirect
43+
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
44+
github.com/mitchellh/mapstructure v1.4.2 // indirect
45+
github.com/mitchellh/reflectwalk v1.0.0 // indirect
46+
github.com/oklog/run v1.0.0 // indirect
47+
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
48+
github.com/pmezard/go-difflib v1.0.0 // indirect
49+
github.com/ryanuber/go-glob v1.0.0 // indirect
50+
go.uber.org/atomic v1.9.0 // indirect
51+
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
52+
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
53+
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
54+
golang.org/x/text v0.3.6 // indirect
55+
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
56+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
57+
google.golang.org/grpc v1.41.0 // indirect
58+
google.golang.org/protobuf v1.26.0 // indirect
59+
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
1360
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
1461
)

0 commit comments

Comments
 (0)