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..3b72ef27c3 100644 --- a/go.mod +++ b/go.mod @@ -1,64 +1,126 @@ module github.com/runatlantis/atlantis -go 1.16 +go 1.17 replace google.golang.org/grpc => google.golang.org/grpc v1.29.1 require ( + cloud.google.com/go v0.81.0 // indirect + cloud.google.com/go/storage v1.10.0 // indirect github.com/Laisky/graphql v1.0.5 + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver/v3 v3.1.1 // indirect github.com/Masterminds/sprig/v3 v3.2.2 github.com/agext/levenshtein v1.2.3 // indirect + github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect github.com/aws/aws-sdk-go v1.31.15 // indirect + github.com/aymerick/douceur v0.2.0 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bradleyfalzon/ghinstallation v1.1.1 github.com/briandowns/spinner v0.0.0-20170614154858-48dbb65d7bd5 + github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/docker/docker v0.0.0-20180620051407-e2593239d949 github.com/elazarl/go-bindata-assetfs v1.0.1 + github.com/fatih/color v1.7.0 // indirect github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 github.com/fsnotify/fsnotify v1.4.10-0.20200417215612-7f4cf4dd2b52 // indirect github.com/go-ozzo/ozzo-validation v0.0.0-20170913164239-85dcd8368eba github.com/go-playground/locales v0.12.1 // indirect github.com/go-playground/universal-translator v0.16.0 // indirect github.com/go-test/deep v1.0.7 + 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-github/v31 v31.0.0 + github.com/google/go-querystring v1.0.0 // indirect github.com/google/uuid v1.1.2-0.20200519141726-cb32006e483f // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/gorilla/css v1.0.0 // indirect github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.2 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-getter v1.5.7 + github.com/hashicorp/go-retryablehttp v0.6.8 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.3.0 + github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/hcl/v2 v2.6.0 // indirect github.com/hashicorp/terraform-config-inspect v0.0.0-20200806211835-c481b8bfa41e + github.com/huandu/xstrings v1.3.1 // indirect + github.com/imdario/mergo v0.3.11 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jmespath/go-jmespath v0.3.1-0.20200310193758-2437e8417af5 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect + github.com/klauspost/compress v1.11.2 // indirect github.com/leodido/go-urn v1.2.0 // indirect github.com/lusis/slack-test v0.0.0-20190426140909-c40012f20018 // 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/mcdafydd/go-azuredevops v0.12.0 github.com/microcosm-cc/bluemonday v1.0.15 github.com/mitchellh/colorstring v0.0.0-20150917214807-8631ce90f286 + github.com/mitchellh/copystructure v1.0.0 // indirect github.com/mitchellh/go-homedir v1.1.0 + 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/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb github.com/nlopes/slack v0.4.0 github.com/onsi/ginkgo v1.14.0 // indirect + github.com/onsi/gomega v1.10.1 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect github.com/petergtz/pegomock v2.9.0+incompatible github.com/pkg/errors v0.9.1 + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/remeh/sizedwaitgroup v1.0.0 + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/shopspring/decimal v1.2.0 // indirect github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0 github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/sirupsen/logrus v1.6.1-0.20200528085638-6699a89a232f // indirect + github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cobra v0.0.0-20170905172051-b78744579491 + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.8.1 github.com/stretchr/testify v1.7.0 + github.com/subosito/gotenv v1.2.0 // indirect + github.com/ulikunitz/xz v0.5.8 // indirect github.com/urfave/cli v1.22.5 github.com/urfave/negroni v0.3.0 github.com/xanzy/go-gitlab v0.50.3 github.com/zclconf/go-cty v1.5.1 // indirect go.etcd.io/bbolt v1.3.6 + go.opencensus.io v0.23.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.0 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 + 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/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/go-playground/validator.v9 v9.31.0 + gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect gotest.tools v2.2.0+incompatible // 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