Skip to content

Commit 55f2ba6

Browse files
committed
Merge branch 'main' into av/ephemeral-resources
2 parents b84bb1d + e09ec9d commit 55f2ba6

File tree

94 files changed

+528
-407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+528
-407
lines changed

.changes/1.12.0.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## 1.12.0 (September 18, 2024)
2+
3+
NOTES:
4+
5+
* 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 ([#1033](https://github.com/hashicorp/terraform-plugin-framework/issues/1033))
6+
7+
BUG FIXES:
8+
9+
* providerserver: Fixed bug that prevented `moved` operation support between resource types for framework-only providers. ([#1039](https://github.com/hashicorp/terraform-plugin-framework/issues/1039))
10+

.github/workflows/ci-go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: ubuntu-latest
8080
strategy:
8181
matrix:
82-
go-version: [ '1.22', '1.21' ]
82+
go-version: [ '1.23', '1.22' ]
8383
steps:
8484
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
8585
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
@@ -88,7 +88,7 @@ jobs:
8888
- run: go mod download
8989
- run: go test -coverprofile=coverage.out ./...
9090
- run: go tool cover -html=coverage.out -o coverage.html
91-
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
91+
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
9292
with:
9393
name: go-${{ matrix.go-version }}-coverage
9494
path: coverage.html

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 1.12.0 (September 18, 2024)
2+
3+
NOTES:
4+
5+
* 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 ([#1033](https://github.com/hashicorp/terraform-plugin-framework/issues/1033))
6+
7+
BUG FIXES:
8+
9+
* providerserver: Fixed bug that prevented `moved` operation support between resource types for framework-only providers. ([#1039](https://github.com/hashicorp/terraform-plugin-framework/issues/1039))
10+
111
## 1.11.0 (August 06, 2024)
212

313
NOTES:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Providers built with this framework are compatible with Terraform version v0.12
2828

2929
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.
3030

31-
Currently, that means Go **1.21** or later must be used when including this project as a dependency.
31+
Currently, that means Go **1.22** or later must be used when including this project as a dependency.
3232

3333
## Contributing
3434

datasource/schema/attribute.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import (
1010
// Attribute define a value field inside the Schema. Implementations in this
1111
// package include:
1212
// - BoolAttribute
13+
// - DynamicAttribute
14+
// - Float32Attribute
1315
// - Float64Attribute
16+
// - Int32Attribute
1417
// - Int64Attribute
1518
// - ListAttribute
1619
// - MapAttribute

datasource/schema/float64_attribute_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
1414
"github.com/hashicorp/terraform-plugin-framework/internal/fwschema"
1515
"github.com/hashicorp/terraform-plugin-framework/internal/testing/testschema"
16+
"github.com/hashicorp/terraform-plugin-framework/internal/testing/testtypes"
1617
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
1718
"github.com/hashicorp/terraform-plugin-framework/types"
1819
"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -264,12 +265,12 @@ func TestFloat64AttributeGetType(t *testing.T) {
264265
attribute: schema.Float64Attribute{},
265266
expected: types.Float64Type,
266267
},
267-
// "custom-type": {
268-
// attribute: schema.Float64Attribute{
269-
// CustomType: testtypes.Float64Type{},
270-
// },
271-
// expected: testtypes.Float64Type{},
272-
// },
268+
"custom-type": {
269+
attribute: schema.Float64Attribute{
270+
CustomType: testtypes.Float64Type{},
271+
},
272+
expected: testtypes.Float64Type{},
273+
},
273274
}
274275

275276
for name, testCase := range testCases {

datasource/schema/int32_attribute_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
1616
"github.com/hashicorp/terraform-plugin-framework/internal/fwschema"
1717
"github.com/hashicorp/terraform-plugin-framework/internal/testing/testschema"
18+
"github.com/hashicorp/terraform-plugin-framework/internal/testing/testtypes"
1819
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
1920
"github.com/hashicorp/terraform-plugin-framework/types"
2021
)
@@ -231,12 +232,12 @@ func TestInt32AttributeGetType(t *testing.T) {
231232
attribute: schema.Int32Attribute{},
232233
expected: types.Int32Type,
233234
},
234-
// "custom-type": {
235-
// attribute: schema.Int32Attribute{
236-
// CustomType: testtypes.Int32Type{},
237-
// },
238-
// expected: testtypes.Int32Type{},
239-
// },
235+
"custom-type": {
236+
attribute: schema.Int32Attribute{
237+
CustomType: testtypes.Int32Type{},
238+
},
239+
expected: testtypes.Int32Type{},
240+
},
240241
}
241242

242243
for name, testCase := range testCases {

datasource/schema/int64_attribute_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
1414
"github.com/hashicorp/terraform-plugin-framework/internal/fwschema"
1515
"github.com/hashicorp/terraform-plugin-framework/internal/testing/testschema"
16+
"github.com/hashicorp/terraform-plugin-framework/internal/testing/testtypes"
1617
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
1718
"github.com/hashicorp/terraform-plugin-framework/types"
1819
"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -230,12 +231,12 @@ func TestInt64AttributeGetType(t *testing.T) {
230231
attribute: schema.Int64Attribute{},
231232
expected: types.Int64Type,
232233
},
233-
// "custom-type": {
234-
// attribute: schema.Int64Attribute{
235-
// CustomType: testtypes.Int64Type{},
236-
// },
237-
// expected: testtypes.Int64Type{},
238-
// },
234+
"custom-type": {
235+
attribute: schema.Int64Attribute{
236+
CustomType: testtypes.Int64Type{},
237+
},
238+
expected: testtypes.Int64Type{},
239+
},
239240
}
240241

241242
for name, testCase := range testCases {

datasource/schema/list_attribute_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,12 @@ func TestListAttributeGetType(t *testing.T) {
239239
attribute: schema.ListAttribute{ElementType: types.StringType},
240240
expected: types.ListType{ElemType: types.StringType},
241241
},
242-
// "custom-type": {
243-
// attribute: schema.ListAttribute{
244-
// CustomType: testtypes.ListType{},
245-
// },
246-
// expected: testtypes.ListType{},
247-
// },
242+
"custom-type": {
243+
attribute: schema.ListAttribute{
244+
CustomType: testtypes.ListType{ListType: types.ListType{ElemType: types.StringType}},
245+
},
246+
expected: testtypes.ListType{ListType: types.ListType{ElemType: types.StringType}},
247+
},
248248
}
249249

250250
for name, testCase := range testCases {

datasource/schema/list_nested_attribute_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,12 +386,12 @@ func TestListNestedAttributeGetType(t *testing.T) {
386386
},
387387
},
388388
},
389-
// "custom-type": {
390-
// attribute: schema.ListNestedAttribute{
391-
// CustomType: testtypes.ListType{},
392-
// },
393-
// expected: testtypes.ListType{},
394-
// },
389+
"custom-type": {
390+
attribute: schema.ListNestedAttribute{
391+
CustomType: testtypes.ListType{ListType: types.ListType{ElemType: types.StringType}},
392+
},
393+
expected: testtypes.ListType{ListType: types.ListType{ElemType: types.StringType}},
394+
},
395395
}
396396

397397
for name, testCase := range testCases {

0 commit comments

Comments
 (0)