From 0a49649a3f2b67c9451b201e617b22756f6af682 Mon Sep 17 00:00:00 2001 From: Austin Valle Date: Fri, 6 Sep 2024 09:48:16 -0400 Subject: [PATCH 1/3] all: Bump minimum Go module version to 1.22.7 --- .github/workflows/ci-go.yml | 2 +- README.md | 2 +- go.mod | 4 +--- tools/go.mod | 2 +- website/docs/plugin/framework/migrating/index.mdx | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml index 810dcaf1b..a7a5131fb 100644 --- a/.github/workflows/ci-go.yml +++ b/.github/workflows/ci-go.yml @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: [ '1.22', '1.21' ] + go-version: [ '1.23', '1.22' ] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 diff --git a/README.md b/README.md index 6e2ba9d97..44c197ce8 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Providers built with this framework are compatible with Terraform version v0.12 This project follows the [support policy](https://golang.org/doc/devel/release.html#policy) of Go as its support policy. The two latest major releases of Go are supported by the project. -Currently, that means Go **1.21** or later must be used when including this project as a dependency. +Currently, that means Go **1.22.7** or later must be used when including this project as a dependency. ## Contributing diff --git a/go.mod b/go.mod index bbe8dfada..f13d1b156 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/hashicorp/terraform-plugin-framework -go 1.21 - -toolchain go1.21.6 +go 1.22.7 require ( github.com/google/go-cmp v0.6.0 diff --git a/tools/go.mod b/tools/go.mod index c0b60b613..a7e6c1e36 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module tools -go 1.21 +go 1.22.7 require github.com/hashicorp/copywrite v0.19.0 diff --git a/website/docs/plugin/framework/migrating/index.mdx b/website/docs/plugin/framework/migrating/index.mdx index 880f6c6bc..91906b391 100644 --- a/website/docs/plugin/framework/migrating/index.mdx +++ b/website/docs/plugin/framework/migrating/index.mdx @@ -16,7 +16,7 @@ In addition to this migration guide, we recommend referring to the main [Framewo Before you migrate your provider to the Framework, ensure it meets the following requirements: -- Go 1.21+ +- Go 1.22.7+ - Built on the latest version of SDKv2 - The provider is for use with Terraform >= 0.12.0 From afd25e2b788a1eb9932cc75504af7dad87c3f507 Mon Sep 17 00:00:00 2001 From: Austin Valle Date: Fri, 6 Sep 2024 09:53:30 -0400 Subject: [PATCH 2/3] add changelog --- .changes/unreleased/NOTES-20240906-095258.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changes/unreleased/NOTES-20240906-095258.yaml diff --git a/.changes/unreleased/NOTES-20240906-095258.yaml b/.changes/unreleased/NOTES-20240906-095258.yaml new file mode 100644 index 000000000..01cfff2bd --- /dev/null +++ b/.changes/unreleased/NOTES-20240906-095258.yaml @@ -0,0 +1,7 @@ +kind: NOTES +body: 'all: This Go module has been updated to Go 1.22.7 per the [Go support policy](https://go.dev/doc/devel/release#policy). + It is recommended to review the [Go 1.22 release notes](https://go.dev/doc/go1.22) + before upgrading. Any consumers building on earlier Go versions may experience errors' +time: 2024-09-06T09:52:58.814574-04:00 +custom: + Issue: "1033" From bd4501386f62d8a19c4e420332aae1d025f55088 Mon Sep 17 00:00:00 2001 From: Austin Valle Date: Fri, 6 Sep 2024 16:07:12 -0400 Subject: [PATCH 3/3] back to 1.22.0 --- .changes/unreleased/NOTES-20240906-095258.yaml | 2 +- README.md | 2 +- go.mod | 4 +++- website/docs/plugin/framework/migrating/index.mdx | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.changes/unreleased/NOTES-20240906-095258.yaml b/.changes/unreleased/NOTES-20240906-095258.yaml index 01cfff2bd..8ed59a334 100644 --- a/.changes/unreleased/NOTES-20240906-095258.yaml +++ b/.changes/unreleased/NOTES-20240906-095258.yaml @@ -1,5 +1,5 @@ kind: NOTES -body: 'all: This Go module has been updated to Go 1.22.7 per the [Go support policy](https://go.dev/doc/devel/release#policy). +body: 'all: This Go module has been updated to Go 1.22 per the [Go support policy](https://go.dev/doc/devel/release#policy). It is recommended to review the [Go 1.22 release notes](https://go.dev/doc/go1.22) before upgrading. Any consumers building on earlier Go versions may experience errors' time: 2024-09-06T09:52:58.814574-04:00 diff --git a/README.md b/README.md index 44c197ce8..294ba5ead 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Providers built with this framework are compatible with Terraform version v0.12 This project follows the [support policy](https://golang.org/doc/devel/release.html#policy) of Go as its support policy. The two latest major releases of Go are supported by the project. -Currently, that means Go **1.22.7** or later must be used when including this project as a dependency. +Currently, that means Go **1.22** or later must be used when including this project as a dependency. ## Contributing diff --git a/go.mod b/go.mod index f13d1b156..fc7e8e90b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/hashicorp/terraform-plugin-framework -go 1.22.7 +go 1.22.0 + +toolchain go1.22.7 require ( github.com/google/go-cmp v0.6.0 diff --git a/website/docs/plugin/framework/migrating/index.mdx b/website/docs/plugin/framework/migrating/index.mdx index 91906b391..410db0ac9 100644 --- a/website/docs/plugin/framework/migrating/index.mdx +++ b/website/docs/plugin/framework/migrating/index.mdx @@ -16,7 +16,7 @@ In addition to this migration guide, we recommend referring to the main [Framewo Before you migrate your provider to the Framework, ensure it meets the following requirements: -- Go 1.22.7+ +- Go 1.22+ - Built on the latest version of SDKv2 - The provider is for use with Terraform >= 0.12.0