From 64088a0cfc0cc6e5bd25c9bb5d96bfda73b8cac1 Mon Sep 17 00:00:00 2001 From: Rickard Granberg Date: Thu, 6 Oct 2022 13:18:06 +0000 Subject: [PATCH] Bump to Go 1.19 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 5 +- README.md | 11 ++-- go.mod | 108 +++++++++++++++++++++++++++++--- 5 files changed, 111 insertions(+), 17 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 588b7de..16a20a8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ "dockerfile": "Dockerfile", "args": { // Update the VARIANT arg to pick a version of Go: 1, 1.17, 1.16, 1.15 - "VARIANT": "1.17", + "VARIANT": "1.19", // Options "INSTALL_NODE": "false", "NODE_VERSION": "lts/*" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 338bedb..c996c02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.19 - name: Import GPG key id: import_gpg diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f7ddeb6..5ca7c98 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2.1.3 with: - go-version: '1.17' + go-version: '1.19' id: go - name: Check out code into the Go module directory @@ -51,7 +51,6 @@ jobs: matrix: # list whatever Terraform versions here you would like to support terraform: - - '0.14.7' - '0.15.0' - '1.0.5' steps: @@ -63,7 +62,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2.1.3 with: - go-version: '1.17' + go-version: '1.19' id: go - name: Check out code into the Go module directory diff --git a/README.md b/README.md index 9fa37ec..e5176bc 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,17 @@ ## Requirements -- [Terraform](https://www.terraform.io/downloads.html) >= 0.15.x -- [Go](https://golang.org/doc/install) >= 1.16 +- [Terraform](https://www.terraform.io/downloads.html) >= 0.15.x +- [Go](https://golang.org/doc/install) >= 1.19 ## Building The Provider 1. Clone the repository 1. Enter the repository directory -1. Build the provider using the Go `install` command: +1. Build the provider using the Go `install` command: + ```sh -$ go install +go install ``` ## Adding Dependencies @@ -45,5 +46,5 @@ In order to run the full suite of Acceptance tests, run `make testacc`. *Note:* Acceptance tests create real resources, and often cost money to run. ```sh -$ make testacc +make testacc ``` diff --git a/go.mod b/go.mod index 29add5e..5608fa5 100644 --- a/go.mod +++ b/go.mod @@ -1,26 +1,120 @@ module github.com/rickardgranberg/terraform-provider-vaultoperator -go 1.16 +go 1.19 require ( + github.com/hashicorp/terraform-plugin-docs v0.5.0 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0 + github.com/hashicorp/vault/api v1.2.0 + k8s.io/api v0.23.2 + k8s.io/apimachinery v0.23.3 + k8s.io/client-go v0.23.2 +) + +require ( + cloud.google.com/go v0.100.2 // indirect cloud.google.com/go/compute v1.1.0 // indirect cloud.google.com/go/iam v0.1.1 // indirect + cloud.google.com/go/storage v1.10.0 // indirect + github.com/Masterminds/goutils v1.1.0 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Masterminds/sprig v2.22.0+incompatible // indirect + github.com/agext/levenshtein v1.2.2 // indirect + github.com/apparentlymart/go-textseg v1.0.0 // indirect + github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/armon/go-metrics v0.3.3 // indirect + github.com/armon/go-radix v1.0.0 // indirect + github.com/aws/aws-sdk-go v1.30.27 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/bgentry/speakeasy v0.1.0 // indirect + github.com/cenkalti/backoff/v3 v3.0.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fatih/color v1.7.0 // indirect github.com/go-logr/logr v1.2.2 // 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/golang/snappy v0.0.3 // indirect github.com/google/go-cmp v0.5.7 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/hashicorp/terraform-plugin-docs v0.5.0 - github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0 - github.com/hashicorp/vault/api v1.2.0 + github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gax-go/v2 v2.1.1 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-checkpoint v0.5.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect + github.com/hashicorp/go-getter v1.5.3 // indirect + github.com/hashicorp/go-hclog v0.16.2 // indirect + github.com/hashicorp/go-immutable-radix v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-plugin v1.4.1 // indirect + github.com/hashicorp/go-retryablehttp v0.6.6 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1 // indirect + github.com/hashicorp/go-secure-stdlib/strutil v0.1.1 // indirect + github.com/hashicorp/go-sockaddr v1.0.2 // indirect + github.com/hashicorp/go-uuid v1.0.2 // indirect + github.com/hashicorp/go-version v1.3.0 // indirect + github.com/hashicorp/golang-lru v0.5.3 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/hcl/v2 v2.3.0 // indirect + github.com/hashicorp/logutils v1.0.0 // indirect + github.com/hashicorp/terraform-exec v0.14.0 // indirect + github.com/hashicorp/terraform-json v0.12.0 // indirect + github.com/hashicorp/terraform-plugin-go v0.4.0 // indirect + github.com/hashicorp/vault/sdk v0.2.1 // indirect + github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect + github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/jmespath/go-jmespath v0.3.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.11.2 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mitchellh/cli v1.1.2 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-testing-interface v1.0.4 // indirect + github.com/mitchellh/go-wordwrap v1.0.0 // indirect + github.com/mitchellh/mapstructure v1.4.2 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/oklog/run v1.0.0 // indirect + github.com/pierrec/lz4 v2.5.2+incompatible // indirect + github.com/posener/complete v1.1.1 // indirect + github.com/russross/blackfriday v1.6.0 // indirect + github.com/ryanuber/go-glob v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/ulikunitz/xz v0.5.8 // indirect + github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect + github.com/zclconf/go-cty v1.9.1 // indirect + go.opencensus.io v0.23.0 // indirect + go.uber.org/atomic v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect golang.org/x/net v0.0.0-20220127074510-2fabfed7e28f // indirect + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/api v0.65.0 // indirect + google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 // indirect google.golang.org/grpc v1.44.0 // indirect - k8s.io/api v0.23.2 - k8s.io/apimachinery v0.23.3 - k8s.io/client-go v0.23.2 + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/square/go-jose.v2 v2.5.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/klog/v2 v2.40.1 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect )