Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Go to 1.16 #1365

Merged
merged 8 commits into from
Mar 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2

references:
images:
go: &GOLANG_IMAGE docker.mirror.hashicorp.services/circleci/circleci/golang:1.13
go: &GOLANG_IMAGE docker.mirror.hashicorp.services/circleci/circleci/golang:1.16

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.5
1.16.2
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker
language: go
go:
- "1.14.x"
- "1.16.x"

env:
- GO111MODULE=on
Expand All @@ -15,7 +15,6 @@ install:
# packages that live there.
# See: https://github.com/golang/go/issues/12933
- bash scripts/gogetcookie.sh
- go get github.com/kardianos/govendor

script:
- make test
Expand Down
4 changes: 2 additions & 2 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ build: fmtcheck
go install

test: fmtcheck
go test -i $(TEST) || exit 1
go test -mod=vendor $(TEST) || exit 1
echo $(TEST) | \
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
xargs -t -n4 go test -mod=vendor $(TESTARGS) -timeout=30s -parallel=4

testacc: fmtcheck
TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 240m
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This provider plugin is maintained by the Terraform team at [HashiCorp](https://
- Note that version 0.11.x currently works, but is [deprecated](https://www.hashicorp.com/blog/deprecating-terraform-0-11-support-in-terraform-providers/)
- vSphere 6.5
- Currently, this provider is not tested for vSphere 7, but plans are underway to add support.
- [Go](https://golang.org/doc/install) 1.14.x (to build the provider plugin)
- [Go](https://golang.org/doc/install) 1.16.x (to build the provider plugin)

## Building The Provider

Expand Down
2 changes: 1 addition & 1 deletion _about/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ new issue.
[gh-prs]: https://github.com/hashicorp/terraform-provider-vsphere/pulls

If you wish to work on the provider, you'll first need [Go][go-website]
installed on your machine (version 1.14+ is **required**). You'll also need to
installed on your machine (version 1.16+ is **required**). You'll also need to
correctly setup a [GOPATH][gopath], as well as adding `$GOPATH/bin` to your
`$PATH`.

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/terraform-provider-vsphere

go 1.13
go 1.16

require (
github.com/aws/aws-sdk-go v1.28.8 // indirect
Expand Down
4 changes: 2 additions & 2 deletions scripts/config_builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ categories=$(sed -e s/^TestAcc//g <<< "$tests" | sed -e s/_.*//g | sort -u)
cat << EOF >> /tmp/config.yml
linters:
docker:
- image: circleci/golang:1.13
- image: circleci/golang:1.16
working_directory: /home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
Expand All @@ -35,7 +35,7 @@ for category in $categories; do
cat << EOF >> /tmp/config.yml
test_acc_$category:
docker:
- image: circleci/golang:1.13
- image: circleci/golang:1.16
working_directory: /home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
Expand Down
12 changes: 12 additions & 0 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ github.com/apparentlymart/go-textseg/textseg
# github.com/armon/go-radix v1.0.0
github.com/armon/go-radix
# github.com/aws/aws-sdk-go v1.28.8
## explicit
github.com/aws/aws-sdk-go/aws
github.com/aws/aws-sdk-go/aws/arn
github.com/aws/aws-sdk-go/aws/awserr
Expand Down Expand Up @@ -60,8 +61,10 @@ github.com/bgentry/go-netrc/netrc
# github.com/bgentry/speakeasy v0.1.0
github.com/bgentry/speakeasy
# github.com/davecgh/go-spew v1.1.1
## explicit
github.com/davecgh/go-spew/spew
# github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
## explicit
github.com/dustinkirkland/golang-petname
# github.com/fatih/color v1.7.0
github.com/fatih/color
Expand All @@ -87,6 +90,7 @@ github.com/hashicorp/errwrap
# github.com/hashicorp/go-cleanhttp v0.5.1
github.com/hashicorp/go-cleanhttp
# github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02
## explicit
github.com/hashicorp/go-getter
github.com/hashicorp/go-getter/helper/url
# github.com/hashicorp/go-hclog v0.9.2
Expand Down Expand Up @@ -115,6 +119,7 @@ github.com/hashicorp/hcl/json/parser
github.com/hashicorp/hcl/json/scanner
github.com/hashicorp/hcl/json/token
# github.com/hashicorp/hcl/v2 v2.3.0
## explicit
github.com/hashicorp/hcl/v2
github.com/hashicorp/hcl/v2/ext/customdecode
github.com/hashicorp/hcl/v2/ext/dynblock
Expand All @@ -129,10 +134,12 @@ github.com/hashicorp/hcl/v2/json
# github.com/hashicorp/logutils v1.0.0
github.com/hashicorp/logutils
# github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7
## explicit
github.com/hashicorp/terraform-config-inspect/tfconfig
# github.com/hashicorp/terraform-json v0.4.0
github.com/hashicorp/terraform-json
# github.com/hashicorp/terraform-plugin-sdk v1.7.0
## explicit
github.com/hashicorp/terraform-plugin-sdk/acctest
github.com/hashicorp/terraform-plugin-sdk/helper/acctest
github.com/hashicorp/terraform-plugin-sdk/helper/hashcode
Expand Down Expand Up @@ -197,6 +204,7 @@ github.com/mitchellh/cli
# github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
github.com/mitchellh/colorstring
# github.com/mitchellh/copystructure v1.0.0
## explicit
github.com/mitchellh/copystructure
# github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/go-homedir
Expand All @@ -219,8 +227,10 @@ github.com/posener/complete/match
github.com/spf13/afero
github.com/spf13/afero/mem
# github.com/terraform-providers/terraform-provider-null v1.0.1-0.20191204185112-e5c592237f62
## explicit
github.com/terraform-providers/terraform-provider-null/null
# github.com/terraform-providers/terraform-provider-random v1.3.2-0.20190925210718-83518d96ae4f
## explicit
github.com/terraform-providers/terraform-provider-random/random
# github.com/ulikunitz/xz v0.5.5
github.com/ulikunitz/xz
Expand All @@ -231,6 +241,7 @@ github.com/ulikunitz/xz/lzma
github.com/vmihailenco/msgpack
github.com/vmihailenco/msgpack/codes
# github.com/vmware/govmomi v0.22.2-0.20200523220130-61b30e20be49
## explicit
github.com/vmware/govmomi
github.com/vmware/govmomi/event
github.com/vmware/govmomi/find
Expand Down Expand Up @@ -355,6 +366,7 @@ google.golang.org/appengine/internal/remote_api
google.golang.org/appengine/internal/urlfetch
google.golang.org/appengine/urlfetch
# google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150
## explicit
google.golang.org/genproto/googleapis/api/annotations
google.golang.org/genproto/googleapis/iam/v1
google.golang.org/genproto/googleapis/rpc/code
Expand Down