Merge branch 'tfzk:main' into main

SiftScience · Oct 2, 2024 · 5ea84d0 · 5ea84d0
2 parents 88d68c6 + 03cfb3f
commit 5ea84d0
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 83 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -35,7 +35,7 @@ jobs:
           check-latest: true
 
       - name: Run linters
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
 
@@ -76,6 +76,7 @@ jobs:
           - '1.6.*'
           - '1.7.*'
           - '1.8.*'
+          - '1.9.*'
     steps:
 
       - name: Check out code

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,7 +39,7 @@ jobs:
           passphrase: ${{ secrets.PASSPHRASE }}
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: latest
           args: release --clean

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.2
+1.23.1
diff --git a/.golangci.yml b/.golangci.yml
@@ -8,14 +8,14 @@ linters:
     - bidichk
     - bodyclose
     - contextcheck
+    - copyloopvar
     - cyclop
     - decorder
     - dogsled
     - durationcheck
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
     - gci
     - gochecknoglobals
     - goconst

diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-golang 1.22.2
+golang 1.23.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## NEXT (MONTH DAY, 2024)
+
+IMPROVEMENTS:
+
+* Enabling CI testing for versions `1.9` of Terraform
+
+NOTES:
+
+* Moved build to [Golang `v1.23`](https://go.dev/blog/go1.23)
+* Updated all dependencies to latest
+* Updated [golangci-lint](https://golangci-lint.run/) linters
+  * Removed `exportloopref`
+  * Added `copyloopvar`
+* Updated all GitHub Actions used in this repository:
+  * [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) to `v6`
+  * [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) to `v6`
+
 ## 1.1.0 (April 21, 2024)
 
 IMPROVEMENTS:

diff --git a/README.md b/README.md
@@ -28,6 +28,12 @@ version it implements, and Terraform:
 |:--------:|:-----------------:|:---------:|
 | `>= 1.x` |        `5`        | `>= 0.12` |
 
+### CI Testing
+
+This provider is tested against Terraform versions from `0.12` to `1.9`.
+See the [Build and Test](https://github.com/tfzk/terraform-provider-zookeeper/blob/main/.github/workflows/build-test.yml)
+workflow.
+
 ## Provider features
 
 * [x] support for ZK standard multi-server connection string
@@ -47,7 +53,7 @@ version it implements, and Terraform:
 
 ### Requirements
 
-* [Go](https://go.dev/dl/) >= `1.22`
+* [Go](https://go.dev/dl/) >= `1.23`
 * [Docker](https://docs.docker.com/get-docker/)
 * [Docker Compose](https://docs.docker.com/compose/install/)
 * [golangci-lint](https://golangci-lint.run/)

diff --git a/go.mod b/go.mod
@@ -1,11 +1,11 @@
 module github.com/tfzk/terraform-provider-zookeeper
 
-go 1.22
+go 1.23
 
 require (
-	github.com/go-zookeeper/zk v1.0.3
-	github.com/hashicorp/terraform-plugin-docs v0.19.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
+	github.com/go-zookeeper/zk v1.0.4
+	github.com/hashicorp/terraform-plugin-docs v0.19.4
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
 	github.com/stretchr/testify v1.9.0
 )
 
@@ -23,7 +23,7 @@ require (
 	github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.16.0 // indirect
+	github.com/fatih/color v1.17.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -34,19 +34,19 @@ require (
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.6.0 // indirect
+	github.com/hashicorp/go-plugin v1.6.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/hc-install v0.6.4 // indirect
-	github.com/hashicorp/hcl/v2 v2.20.1 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/hc-install v0.7.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.22.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.20.0 // indirect
-	github.com/hashicorp/terraform-json v0.21.0 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.22.2 // indirect
+	github.com/hashicorp/terraform-exec v0.21.0 // indirect
+	github.com/hashicorp/terraform-json v0.22.1 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.24.0 // indirect
 	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
 	github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
-	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -65,22 +65,22 @@ require (
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	github.com/yuin/goldmark v1.7.0 // indirect
+	github.com/yuin/goldmark v1.7.1 // indirect
 	github.com/yuin/goldmark-meta v1.1.0 // indirect
-	github.com/zclconf/go-cty v1.14.4 // indirect
+	github.com/zclconf/go-cty v1.15.0 // indirect
 	go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.20.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/tools v0.25.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
-	google.golang.org/grpc v1.63.2 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect
+	google.golang.org/grpc v1.67.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )