From 9ddd1e3320914a90b46800a7100485858651b460 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 18 Aug 2021 19:02:49 -0400 Subject: [PATCH] build: bump to use go1.17 Signed-off-by: Rui Chen --- .circleci/config.yml | 4 +- .github/workflows/atlantis-image.yml | 2 +- Makefile | 2 +- e2e/go.mod | 8 +++- go.mod | 67 +++++++++++++++++++++++++++- testing/Dockerfile | 2 +- 6 files changed, 78 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9f6bee2b3..56d247c290 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - run: make check-lint e2e: docker: - - image: circleci/golang:1.16 # If you update this, update it in the Makefile too + - image: circleci/golang:1.17 # If you update this, update it in the Makefile too environment: # This version of TF will be downloaded before Atlantis is started. # We do this instead of setting --default-tf-version because setting @@ -50,7 +50,7 @@ jobs: # Build and push Docker tag. docker_tag: docker: - - image: circleci/golang:1.16 # If you update this, update it in the Makefile too + - image: circleci/golang:1.17 # If you update this, update it in the Makefile too steps: - checkout - run: make build-service diff --git a/.github/workflows/atlantis-image.yml b/.github/workflows/atlantis-image.yml index 7340fd26f2..6b769dd3aa 100644 --- a/.github/workflows/atlantis-image.yml +++ b/.github/workflows/atlantis-image.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Login to Packages Container registry uses: docker/login-action@v1 with: diff --git a/Makefile b/Makefile index d0603f0707..7b06fe573c 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ dist: ## Package up everything in static/ using go-bindata-assetfs so it can be rm -f server/static/bindata_assetfs.go && go-bindata-assetfs -pkg static -prefix server server/static/... && mv bindata_assetfs.go server/static release: ## Create packages for a release - docker run -v $$(pwd):/go/src/github.com/runatlantis/atlantis circleci/golang:1.16 sh -c 'cd /go/src/github.com/runatlantis/atlantis && scripts/binary-release.sh' + docker run -v $$(pwd):/go/src/github.com/runatlantis/atlantis circleci/golang:1.17 sh -c 'cd /go/src/github.com/runatlantis/atlantis && scripts/binary-release.sh' fmt: ## Run goimports (which also formats) goimports -w $$(find . -type f -name '*.go' ! -path "./vendor/*" ! -path "./server/static/bindata_assetfs.go" ! -path "**/mocks/*") diff --git a/e2e/go.mod b/e2e/go.mod index 948cd685b8..fd0c4355a4 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -1,8 +1,14 @@ module github.com/runatlantis/atlantis/e2e -go 1.16 +go 1.17 require ( github.com/google/go-github/v28 v28.0.0 github.com/hashicorp/go-multierror v1.0.0 ) + +require ( + github.com/google/go-querystring v1.0.0 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect +) diff --git a/go.mod b/go.mod index 61c3023cb3..fc934e47a3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/runatlantis/atlantis -go 1.16 +go 1.17 replace google.golang.org/grpc => google.golang.org/grpc v1.29.1 @@ -62,3 +62,68 @@ require ( gopkg.in/yaml.v2 v2.4.0 gotest.tools v2.2.0+incompatible // indirect ) + +require ( + cloud.google.com/go v0.81.0 // indirect + cloud.google.com/go/storage v1.10.0 // indirect + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver/v3 v3.1.1 // indirect + github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect + github.com/aymerick/douceur v0.2.0 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect + github.com/fatih/color v1.7.0 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/go-github/v29 v29.0.2 // indirect + github.com/google/go-querystring v1.0.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/gorilla/css v1.0.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-retryablehttp v0.6.8 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/huandu/xstrings v1.3.1 // indirect + github.com/imdario/mergo v0.3.11 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect + github.com/klauspost/compress v1.11.2 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mattn/go-colorable v0.0.9 // indirect + github.com/mattn/go-isatty v0.0.4 // indirect + github.com/mitchellh/copystructure v1.0.0 // indirect + github.com/mitchellh/go-testing-interface v1.0.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.0 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/mitchellh/reflectwalk v1.0.0 // indirect + github.com/onsi/gomega v1.10.1 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/shopspring/decimal v1.2.0 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/ulikunitz/xz v0.5.8 // indirect + go.opencensus.io v0.23.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect + golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect + golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect + golang.org/x/tools v0.1.2 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/api v0.44.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect + google.golang.org/grpc v1.38.0 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect +) diff --git a/testing/Dockerfile b/testing/Dockerfile index ae1c78bbb2..aacf341032 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -2,7 +2,7 @@ # We need terraform installed for our full test suite so it installs that. # It's updated by running make build-testing-image which will also push a new # image. -FROM circleci/golang:1.16 +FROM circleci/golang:1.17 # Install Terraform ENV TERRAFORM_VERSION=1.0.5