Skip to content

Commit de5ada4

Browse files
eversCeversC
authored
Bump go to 1.18 (#575)
* Bump go to 1.18 * Go mod tidy * Switch circle convenience img * Update working dir * Update working dir * Go get x/sys * Revert "Go get x/sys" This reverts commit 50cbdd3. * Bump aws-cli to go 1.18 * Bump GCP module version to 1.1.3
1 parent 7c66ef2 commit de5ada4

File tree

6 files changed

+90
-733
lines changed

6 files changed

+90
-733
lines changed

‎.circleci/config.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ aliases:
1515
gcloud functions deploy ckr-dummy-$RAND_SUFFIX \
1616
--region europe-west1 \
1717
--entry-point Request \
18-
--runtime go116 \
18+
--runtime go118 \
1919
--trigger-http \
2020
--project pe-dev-185509
2121
gcloud functions delete ckr-dummy-$RAND_SUFFIX \
@@ -24,7 +24,7 @@ aliases:
2424
--quiet
2525
2626
defaults: &defaults
27-
working_directory: /go/src/github.com/ovotech/cloud-key-rotator
27+
working_directory: /home/circleci/project/src/github.com/ovotech/cloud-key-rotator
2828

2929
version: 2.1
3030

@@ -36,7 +36,7 @@ jobs:
3636
<<: *defaults
3737

3838
docker:
39-
- image: circleci/golang:1.16
39+
- image: cimg/go:1.18
4040

4141
steps:
4242
- checkout
@@ -128,7 +128,7 @@ jobs:
128128
<<: *defaults
129129

130130
docker:
131-
- image: eversc/go-pr-checks:1.16
131+
- image: eversc/go-pr-checks:1.18
132132

133133
steps:
134134
- checkout
@@ -141,7 +141,7 @@ jobs:
141141
<<: *defaults
142142

143143
docker:
144-
- image: eversc/go-pr-checks:1.16
144+
- image: eversc/go-pr-checks:1.18
145145

146146
steps:
147147
- checkout
@@ -157,7 +157,7 @@ jobs:
157157
<<: *defaults
158158

159159
docker:
160-
- image: eversc/go-pr-checks:1.16
160+
- image: eversc/go-pr-checks:1.18
161161

162162
steps:
163163
- checkout
@@ -170,7 +170,7 @@ jobs:
170170
<<: *defaults
171171

172172
docker:
173-
- image: eversc/go-pr-checks:1.16
173+
- image: eversc/go-pr-checks:1.18
174174

175175
steps:
176176
- checkout
@@ -183,7 +183,7 @@ jobs:
183183
<<: *defaults
184184

185185
docker:
186-
- image: eversc/go-pr-checks:1.16
186+
- image: eversc/go-pr-checks:1.18
187187

188188
steps:
189189
- checkout
@@ -198,7 +198,7 @@ jobs:
198198
<<: *defaults
199199

200200
docker:
201-
- image: circleci/golang:1.16
201+
- image: cimg/go:1.18
202202

203203
steps:
204204
- checkout
@@ -221,7 +221,7 @@ jobs:
221221
<<: *defaults
222222

223223
docker:
224-
- image: eversc/go-pr-checks:1.16
224+
- image: eversc/go-pr-checks:1.18
225225

226226
steps:
227227
- checkout
@@ -237,7 +237,7 @@ jobs:
237237
<<: *defaults
238238

239239
docker:
240-
- image: eversc/aws-cli:1.16
240+
- image: eversc/aws-cli:1.18
241241

242242
steps:
243243
- checkout

‎go.mod

+68-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/ovotech/cloud-key-rotator
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
cloud.google.com/go/storage v1.28.1
@@ -12,8 +12,6 @@ require (
1212
github.com/beamly/go-gocd v0.0.0-20190719193049-383d56afbf92
1313
github.com/cenkalti/backoff/v4 v4.1.3
1414
github.com/google/go-github/v45 v45.2.0
15-
github.com/google/gofuzz v1.1.0 // indirect
16-
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
1715
github.com/jszwedko/go-circleci v0.3.0
1816
github.com/mongodb/go-client-mongodb-atlas v0.3.0
1917
github.com/ovotech/cloud-key-client v0.2.2
@@ -24,12 +22,78 @@ require (
2422
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
2523
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
2624
google.golang.org/api v0.103.0
27-
gopkg.in/inf.v0 v0.9.0 // indirect
2825
gopkg.in/ini.v1 v1.67.0
2926
gopkg.in/src-d/go-git.v4 v4.13.1
3027
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
3128
k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
3229
k8s.io/client-go v11.0.0+incompatible
30+
)
31+
32+
require (
33+
cloud.google.com/go v0.105.0 // indirect
34+
cloud.google.com/go/compute v1.12.1 // indirect
35+
cloud.google.com/go/compute/metadata v0.2.1 // indirect
36+
cloud.google.com/go/iam v0.7.0 // indirect
37+
github.com/Masterminds/semver v1.4.2 // indirect
38+
github.com/davecgh/go-spew v1.1.1 // indirect
39+
github.com/emirpasic/gods v1.12.0 // indirect
40+
github.com/fsnotify/fsnotify v1.6.0 // indirect
41+
github.com/gogo/protobuf v1.3.2 // indirect
42+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
43+
github.com/golang/protobuf v1.5.2 // indirect
44+
github.com/google/go-cmp v0.5.9 // indirect
45+
github.com/google/go-querystring v1.1.0 // indirect
46+
github.com/google/gofuzz v1.1.0 // indirect
47+
github.com/google/uuid v1.3.0 // indirect
48+
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
49+
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
50+
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
51+
github.com/hashicorp/go-version v1.2.0 // indirect
52+
github.com/hashicorp/hcl v1.0.0 // indirect
53+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
54+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
55+
github.com/jessevdk/go-flags v1.5.0 // indirect
56+
github.com/jmespath/go-jmespath v0.4.0 // indirect
57+
github.com/json-iterator/go v1.1.12 // indirect
58+
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
59+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
60+
github.com/magiconair/properties v1.8.6 // indirect
61+
github.com/mitchellh/go-homedir v1.1.0 // indirect
62+
github.com/mitchellh/mapstructure v1.5.0 // indirect
63+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
64+
github.com/modern-go/reflect2 v1.0.2 // indirect
65+
github.com/openlyinc/pointy v1.1.2 // indirect
66+
github.com/pelletier/go-toml v1.9.5 // indirect
67+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
68+
github.com/pkg/errors v0.9.1 // indirect
69+
github.com/sergi/go-diff v1.1.0 // indirect
70+
github.com/sirupsen/logrus v1.4.2 // indirect
71+
github.com/spf13/afero v1.9.2 // indirect
72+
github.com/spf13/cast v1.5.0 // indirect
73+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
74+
github.com/spf13/pflag v1.0.5 // indirect
75+
github.com/src-d/gcfg v1.4.0 // indirect
76+
github.com/subosito/gotenv v1.4.1 // indirect
77+
github.com/xanzy/ssh-agent v0.2.1 // indirect
78+
go.opencensus.io v0.24.0 // indirect
79+
go.uber.org/atomic v1.9.0 // indirect
80+
go.uber.org/multierr v1.8.0 // indirect
81+
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
82+
golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
83+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
84+
golang.org/x/text v0.4.0 // indirect
85+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
86+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
87+
google.golang.org/appengine v1.6.7 // indirect
88+
google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c // indirect
89+
google.golang.org/grpc v1.50.1 // indirect
90+
google.golang.org/protobuf v1.28.1 // indirect
91+
gopkg.in/inf.v0 v0.9.0 // indirect
92+
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
93+
gopkg.in/warnings.v0 v0.1.2 // indirect
94+
gopkg.in/yaml.v2 v2.4.0 // indirect
95+
gopkg.in/yaml.v3 v3.0.1 // indirect
3396
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 // indirect
3497
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
98+
sigs.k8s.io/yaml v1.3.0 // indirect
3599
)

0 commit comments

Comments
 (0)