Skip to content

Commit

Permalink
Bump go to 1.18 (#575)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
eversC authored Dec 23, 2022
1 parent 7c66ef2 commit de5ada4
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 733 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ aliases:
gcloud functions deploy ckr-dummy-$RAND_SUFFIX \
--region europe-west1 \
--entry-point Request \
--runtime go116 \
--runtime go118 \
--trigger-http \
--project pe-dev-185509
gcloud functions delete ckr-dummy-$RAND_SUFFIX \
Expand All @@ -24,7 +24,7 @@ aliases:
--quiet
defaults: &defaults
working_directory: /go/src/github.com/ovotech/cloud-key-rotator
working_directory: /home/circleci/project/src/github.com/ovotech/cloud-key-rotator

version: 2.1

Expand All @@ -36,7 +36,7 @@ jobs:
<<: *defaults

docker:
- image: circleci/golang:1.16
- image: cimg/go:1.18

steps:
- checkout
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
<<: *defaults

docker:
- image: eversc/go-pr-checks:1.16
- image: eversc/go-pr-checks:1.18

steps:
- checkout
Expand All @@ -141,7 +141,7 @@ jobs:
<<: *defaults

docker:
- image: eversc/go-pr-checks:1.16
- image: eversc/go-pr-checks:1.18

steps:
- checkout
Expand All @@ -157,7 +157,7 @@ jobs:
<<: *defaults

docker:
- image: eversc/go-pr-checks:1.16
- image: eversc/go-pr-checks:1.18

steps:
- checkout
Expand All @@ -170,7 +170,7 @@ jobs:
<<: *defaults

docker:
- image: eversc/go-pr-checks:1.16
- image: eversc/go-pr-checks:1.18

steps:
- checkout
Expand All @@ -183,7 +183,7 @@ jobs:
<<: *defaults

docker:
- image: eversc/go-pr-checks:1.16
- image: eversc/go-pr-checks:1.18

steps:
- checkout
Expand All @@ -198,7 +198,7 @@ jobs:
<<: *defaults

docker:
- image: circleci/golang:1.16
- image: cimg/go:1.18

steps:
- checkout
Expand All @@ -221,7 +221,7 @@ jobs:
<<: *defaults

docker:
- image: eversc/go-pr-checks:1.16
- image: eversc/go-pr-checks:1.18

steps:
- checkout
Expand All @@ -237,7 +237,7 @@ jobs:
<<: *defaults

docker:
- image: eversc/aws-cli:1.16
- image: eversc/aws-cli:1.18

steps:
- checkout
Expand Down
72 changes: 68 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/ovotech/cloud-key-rotator

go 1.16
go 1.18

require (
cloud.google.com/go/storage v1.28.1
Expand All @@ -12,8 +12,6 @@ require (
github.com/beamly/go-gocd v0.0.0-20190719193049-383d56afbf92
github.com/cenkalti/backoff/v4 v4.1.3
github.com/google/go-github/v45 v45.2.0
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
github.com/jszwedko/go-circleci v0.3.0
github.com/mongodb/go-client-mongodb-atlas v0.3.0
github.com/ovotech/cloud-key-client v0.2.2
Expand All @@ -24,12 +22,78 @@ require (
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
google.golang.org/api v0.103.0
gopkg.in/inf.v0 v0.9.0 // indirect
gopkg.in/ini.v1 v1.67.0
gopkg.in/src-d/go-git.v4 v4.13.1
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
k8s.io/client-go v11.0.0+incompatible
)

require (
cloud.google.com/go v0.105.0 // indirect
cloud.google.com/go/compute v1.12.1 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
cloud.google.com/go/iam v0.7.0 // indirect
github.com/Masterminds/semver v1.4.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jessevdk/go-flags v1.5.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/openlyinc/pointy v1.1.2 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/xanzy/ssh-agent v0.2.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.0 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 // indirect
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit de5ada4

Please sign in to comment.