Skip to content

Commit 450992f

Browse files
committed
Merge tag 'v2.21.0' into upstream-v2.21.0
2 parents 06e7da0 + e14d3b6 commit 450992f

40 files changed

+386
-448
lines changed

.changelog/1024.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
helper/schema: Ensured `RawConfig`, `RawPlan`, and `RawState` are correctly copied during planning with recreation
3+
```

.changelog/1027.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:note
2+
This Go module has been updated to Go 1.18 per the [Go support policy](https://golang.org/doc/devel/release.html#policy). Any consumers building on earlier Go versions may experience errors.
3+
```

.changelog/1031.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
helper/resource: Fixed `TestStep` type `Taint` field usage to properly recreate resources
3+
```

.github/workflows/add-content-to-project.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: "Set Issue to 'Priority = Triage Next'"
22-
uses: leonsteinhaeuser/project-beta-automations@v1.2.1
22+
uses: leonsteinhaeuser/project-beta-automations@v1.3.0
2323
if: github.event_name == 'issues'
2424
with:
2525
gh_token: ${{ secrets.TF_DEVEX_PROJECT_GITHUB_TOKEN }}
@@ -29,7 +29,7 @@ jobs:
2929
operation_mode: custom_field
3030
custom_field_values: '[{\"name\":\"Priority\",\"type\":\"single_select\",\"value\":\"Triage Next\"}]'
3131
- name: "Set Pull Request to 'Priority = Triage Next'"
32-
uses: leonsteinhaeuser/project-beta-automations@v1.2.1
32+
uses: leonsteinhaeuser/project-beta-automations@v1.3.0
3333
if: github.event_name == 'pull_request_target'
3434
with:
3535
gh_token: ${{ secrets.TF_DEVEX_PROJECT_GITHUB_TOKEN }}

.github/workflows/ci-go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
strategy:
5050
matrix:
51-
go-version: [ '1.18', '1.17' ]
51+
go-version: [ '1.19', '1.18' ]
5252
steps:
5353
- uses: actions/checkout@v3
5454
- uses: actions/setup-go@v3

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# 2.21.0 (August 15, 2022)
2+
3+
NOTES:
4+
* This Go module has been updated to Go 1.18 per the [Go support policy](https://golang.org/doc/devel/release.html#policy). Any consumers building on earlier Go versions may experience errors. ([#1027](https://github.com/hashicorp/terraform-plugin-sdk/issues/1027))
5+
6+
BUG FIXES:
7+
* helper/resource: Fixed `TestStep` type `Taint` field usage to properly recreate resources ([#1031](https://github.com/hashicorp/terraform-plugin-sdk/issues/1031))
8+
* helper/schema: Ensured `RawConfig`, `RawPlan`, and `RawState` are correctly copied during planning with recreation ([#1024](https://github.com/hashicorp/terraform-plugin-sdk/issues/1024))
9+
110
# 2.20.0 (July 28, 2022)
211

312
NOTES:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ When running provider tests, Terraform 0.12.26 or later is needed for version 2.
1818

1919
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.
2020

21-
Currently, that means Go **1.17** or later must be used when including this project as a dependency.
21+
Currently, that means Go **1.18** or later must be used when including this project as a dependency.
2222

2323
## Getting Started
2424

diag/helpers.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import "fmt"
66
// as the most common use case in Go will be handling a single error
77
// returned from a function.
88
//
9-
// if err != nil {
10-
// return diag.FromErr(err)
11-
// }
9+
// if err != nil {
10+
// return diag.FromErr(err)
11+
// }
1212
func FromErr(err error) Diagnostics {
1313
if err == nil {
1414
return nil
@@ -26,9 +26,9 @@ func FromErr(err error) Diagnostics {
2626
// values. This returns a single error in a Diagnostics as errors typically
2727
// do not occur in multiples as warnings may.
2828
//
29-
// if unexpectedCondition {
30-
// return diag.Errorf("unexpected: %s", someValue)
31-
// }
29+
// if unexpectedCondition {
30+
// return diag.Errorf("unexpected: %s", someValue)
31+
// }
3232
func Errorf(format string, a ...interface{}) Diagnostics {
3333
return Diagnostics{
3434
Diagnostic{

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hashicorp/terraform-plugin-sdk/v2
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/apparentlymart/go-cidr v1.1.0
@@ -18,7 +18,7 @@ require (
1818
github.com/hashicorp/logutils v1.0.0
1919
github.com/hashicorp/terraform-exec v0.17.2
2020
github.com/hashicorp/terraform-json v0.14.0
21-
github.com/hashicorp/terraform-plugin-go v0.12.0
21+
github.com/hashicorp/terraform-plugin-go v0.14.0
2222
github.com/hashicorp/terraform-plugin-log v0.7.0
2323
github.com/mitchellh/copystructure v1.2.0
2424
github.com/mitchellh/go-testing-interface v1.14.1
@@ -56,5 +56,5 @@ require (
5656
google.golang.org/appengine v1.6.6 // indirect
5757
google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
5858
google.golang.org/grpc v1.48.0 // indirect
59-
google.golang.org/protobuf v1.28.0 // indirect
59+
google.golang.org/protobuf v1.28.1 // indirect
6060
)

0 commit comments

Comments
 (0)