diff --git a/.go-version b/.go-version index 80138e71466..a4cc55716f5 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.13.4 +1.14.2 diff --git a/.travis.yml b/.travis.yml index 09a5fdb399c..30488da7334 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ services: - docker language: go go: -- "1.13.x" +- "1.14.x" install: # This script is used by the Travis build to install a cookie for diff --git a/GNUmakefile b/GNUmakefile index 8a8268ca248..f320b553965 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,10 +1,6 @@ -TEST?=$$(go list ./... |grep -v 'vendor') WEBSITE_REPO=github.com/hashicorp/terraform-website PKG_NAME=google -GO111MODULE=on -GOFLAGS=-mod=vendor - default: build build: fmtcheck generate @@ -66,4 +62,3 @@ docscheck: @sh -c "'$(CURDIR)/scripts/docscheck.sh'" .PHONY: build test testacc vet fmt fmtcheck lint tools errcheck test-compile website website-test docscheck generate - diff --git a/README.md b/README.md index 161663970ba..11cab52bd89 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ for more details on how to use `google-beta`. Upgrading the provider ---------------------- -The Google provider doesn't upgrade automatically once you've started using it. After a new release you can run +The Google provider doesn't upgrade automatically once you've started using it. After a new release you can run ```bash terraform init -upgrade @@ -63,7 +63,7 @@ Developing the provider --------------------------- If you wish to work on the provider, you'll first need [Go](http://www.golang.org) -installed on your machine (version 1.13.0+ is *required*). You can use [goenv](https://github.com/syndbg/goenv) +installed on your machine (version 1.14.0+ is *required*). You can use [goenv](https://github.com/syndbg/goenv) to manage your Go version. You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`. diff --git a/go.mod b/go.mod index aba4951e92a..af949724427 100644 --- a/go.mod +++ b/go.mod @@ -24,4 +24,4 @@ require ( google.golang.org/api v0.22.0 ) -go 1.13 +go 1.14 diff --git a/vendor/modules.txt b/vendor/modules.txt index 6a1965a005a..02dadfaf634 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -9,6 +9,7 @@ cloud.google.com/go/internal/version cloud.google.com/go/longrunning cloud.google.com/go/longrunning/autogen # cloud.google.com/go/bigtable v1.1.0 +## explicit cloud.google.com/go/bigtable cloud.google.com/go/bigtable/internal/option # cloud.google.com/go/storage v1.0.0 @@ -20,6 +21,7 @@ github.com/OpenPeeDeeP/depguard # github.com/agext/levenshtein v1.2.2 github.com/agext/levenshtein # github.com/apparentlymart/go-cidr v1.0.1 +## explicit github.com/apparentlymart/go-cidr/cidr # github.com/apparentlymart/go-textseg v1.0.0 github.com/apparentlymart/go-textseg/textseg @@ -68,22 +70,28 @@ github.com/bgentry/go-netrc/netrc # github.com/bgentry/speakeasy v0.1.0 github.com/bgentry/speakeasy # github.com/client9/misspell v0.3.4 +## explicit github.com/client9/misspell github.com/client9/misspell/cmd/misspell # github.com/davecgh/go-spew v1.1.1 +## explicit github.com/davecgh/go-spew/spew # github.com/dnaeon/go-vcr v1.0.1 +## explicit github.com/dnaeon/go-vcr/cassette github.com/dnaeon/go-vcr/recorder # github.com/dustinkirkland/golang-petname v0.0.0-20170921220637-d3c2ba80e75e +## explicit github.com/dustinkirkland/golang-petname # github.com/fatih/color v1.7.0 github.com/fatih/color # github.com/fsnotify/fsnotify v1.4.7 github.com/fsnotify/fsnotify # github.com/gammazero/deque v0.0.0-20180920172122-f6adf94963e4 +## explicit github.com/gammazero/deque # github.com/gammazero/workerpool v0.0.0-20181230203049-86a96b5d5d92 +## explicit github.com/gammazero/workerpool # github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540 github.com/go-critic/go-critic/checkers @@ -115,6 +123,7 @@ github.com/gobwas/glob/syntax/lexer github.com/gobwas/glob/util/runes github.com/gobwas/glob/util/strings # github.com/gogo/protobuf v1.2.0 +## explicit github.com/gogo/protobuf/proto # github.com/golang/mock v1.3.1 github.com/golang/mock/gomock @@ -176,6 +185,7 @@ github.com/golangci/gocyclo/pkg/gocyclo github.com/golangci/gofmt/gofmt github.com/golangci/gofmt/goimports # github.com/golangci/golangci-lint v1.18.0 +## explicit github.com/golangci/golangci-lint/cmd/golangci-lint github.com/golangci/golangci-lint/pkg/commands github.com/golangci/golangci-lint/pkg/config @@ -227,8 +237,10 @@ github.com/googleapis/gax-go/v2 # github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3 github.com/gostaticanalysis/analysisutil # github.com/hashicorp/errwrap v1.0.0 +## explicit github.com/hashicorp/errwrap # github.com/hashicorp/go-cleanhttp v0.5.1 +## explicit github.com/hashicorp/go-cleanhttp # github.com/hashicorp/go-getter v1.4.0 github.com/hashicorp/go-getter @@ -236,6 +248,7 @@ github.com/hashicorp/go-getter/helper/url # github.com/hashicorp/go-hclog v0.9.2 github.com/hashicorp/go-hclog # github.com/hashicorp/go-multierror v1.0.0 +## explicit github.com/hashicorp/go-multierror # github.com/hashicorp/go-plugin v1.0.1 github.com/hashicorp/go-plugin @@ -245,6 +258,7 @@ github.com/hashicorp/go-safetemp # github.com/hashicorp/go-uuid v1.0.1 github.com/hashicorp/go-uuid # github.com/hashicorp/go-version v1.2.0 +## explicit github.com/hashicorp/go-version # github.com/hashicorp/golang-lru v0.5.1 github.com/hashicorp/golang-lru/simplelru @@ -275,6 +289,7 @@ github.com/hashicorp/logutils # github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 github.com/hashicorp/terraform-config-inspect/tfconfig # github.com/hashicorp/terraform-plugin-sdk v1.4.0 +## explicit github.com/hashicorp/terraform-plugin-sdk/helper/acctest github.com/hashicorp/terraform-plugin-sdk/helper/customdiff github.com/hashicorp/terraform-plugin-sdk/helper/hashcode @@ -360,6 +375,7 @@ github.com/mitchellh/go-testing-interface # github.com/mitchellh/go-wordwrap v1.0.0 github.com/mitchellh/go-wordwrap # github.com/mitchellh/hashstructure v1.0.0 +## explicit github.com/mitchellh/hashstructure # github.com/mitchellh/mapstructure v1.1.2 github.com/mitchellh/mapstructure @@ -387,6 +403,7 @@ github.com/posener/complete/cmd github.com/posener/complete/cmd/install github.com/posener/complete/match # github.com/sirupsen/logrus v1.2.0 +## explicit github.com/sirupsen/logrus # github.com/sourcegraph/go-diff v0.5.1 github.com/sourcegraph/go-diff/diff @@ -404,8 +421,10 @@ github.com/spf13/pflag # github.com/spf13/viper v1.0.2 github.com/spf13/viper # github.com/stoewer/go-strcase v1.0.2 +## explicit github.com/stoewer/go-strcase # github.com/terraform-providers/terraform-provider-random v0.0.0-20190925200408-30dac3233094 +## explicit github.com/terraform-providers/terraform-provider-random/random # github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec github.com/timakin/bodyclose/passes/bodyclose @@ -482,6 +501,7 @@ golang.org/x/net/idna golang.org/x/net/internal/timeseries golang.org/x/net/trace # golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 +## explicit golang.org/x/oauth2 golang.org/x/oauth2/google golang.org/x/oauth2/internal @@ -549,6 +569,7 @@ golang.org/x/tools/internal/module golang.org/x/tools/internal/semver golang.org/x/tools/internal/span # google.golang.org/api v0.22.0 +## explicit google.golang.org/api/appengine/v1 google.golang.org/api/bigquery/v2 google.golang.org/api/bigtableadmin/v2