Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tfsdk: Migrate RequiresReplace(), RequiresReplaceIf(), and UseStateForUnknown() plan modifier functions to the resource package #434

Merged
merged 3 commits into from Aug 2, 2022
Merged

tfsdk: Migrate RequiresReplace(), RequiresReplaceIf(), and UseStateForUnknown() plan modifier functions to the resource package #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98e41bc
tfsdk: Migrate `RequiresReplace()`, `RequiresReplaceIf()`, and `UseSt…
bflad Aug 2, 2022
a49c787
Update CHANGELOG for #434
bflad Aug 2, 2022
a2776a5
Merge branch 'main' into bflad/resource-plan-modifier-refactoring
bflad Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/434.txt
View file
Open in desktop
@@ -0,0 +1,3 @@
```release-note:breaking-change
tfsdk: The `RequiresReplace()`, `RequiresReplaceIf()`, and `UseStateForUnknown()` plan modifier functions, which only apply to managed resources, have been moved to the `resource` package.
```
25 changes: 13 additions & 12 deletions internal/fwserver/attribute_plan_modification_test.go
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/internal/testing/planmodifiers"
"github.com/hashicorp/terraform-plugin-framework/internal/totftypes"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-go/tftypes"
Expand Down Expand Up @@ -849,7 +850,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
},
},
},
Expand All @@ -869,7 +870,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
},
},
},
Expand All @@ -889,7 +890,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
},
},
},
Expand Down Expand Up @@ -937,7 +938,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
},
},
},
Expand All @@ -957,7 +958,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
},
},
},
Expand All @@ -977,7 +978,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
},
},
},
Expand Down Expand Up @@ -1039,7 +1040,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
planmodifiers.TestAttrPlanValueModifierOne{},
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
},
},
},
Expand All @@ -1059,7 +1060,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestAttrPlanValueModifierOne{},
},
},
Expand All @@ -1080,7 +1081,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestAttrPlanValueModifierOne{},
},
},
Expand Down Expand Up @@ -1129,7 +1130,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestRequiresReplaceFalseModifier{},
},
},
Expand All @@ -1150,7 +1151,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestRequiresReplaceFalseModifier{},
},
},
Expand All @@ -1171,7 +1172,7 @@ func TestAttributeModifyPlan(t *testing.T) {
Type: types.StringType,
Required: true,
PlanModifiers: []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestRequiresReplaceFalseModifier{},
},
},
Expand Down
33 changes: 17 additions & 16 deletions internal/fwserver/block_plan_modification_test.go
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/internal/testing/planmodifiers"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-go/tftypes"
Expand Down Expand Up @@ -208,7 +209,7 @@ func TestBlockModifyPlan(t *testing.T) {
req: modifyAttributePlanRequest(
path.Root("test"),
schema([]tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
}, nil),
modifyAttributePlanValues{
config: "newtestvalue",
Expand All @@ -221,7 +222,7 @@ func TestBlockModifyPlan(t *testing.T) {
Plan: tfsdk.Plan{
Raw: schemaTfValue("newtestvalue"),
Schema: schema([]tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
}, nil),
},
RequiresReplace: path.Paths{
Expand All @@ -233,7 +234,7 @@ func TestBlockModifyPlan(t *testing.T) {
req: modifyAttributePlanRequest(
path.Root("test"),
schema([]tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
}, nil),
modifyAttributePlanValues{
config: "newtestvalue",
Expand All @@ -259,7 +260,7 @@ func TestBlockModifyPlan(t *testing.T) {
Plan: tfsdk.Plan{
Raw: schemaTfValue("newtestvalue"),
Schema: schema([]tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
}, nil),
},
RequiresReplace: path.Paths{
Expand All @@ -271,7 +272,7 @@ func TestBlockModifyPlan(t *testing.T) {
req: modifyAttributePlanRequest(
path.Root("test"),
schema([]tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
testBlockPlanModifierNullList{},
}, nil),
modifyAttributePlanValues{
Expand All @@ -285,7 +286,7 @@ func TestBlockModifyPlan(t *testing.T) {
Plan: tfsdk.Plan{
Raw: schemaNullTfValue,
Schema: schema([]tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
testBlockPlanModifierNullList{},
}, nil),
},
Expand All @@ -298,7 +299,7 @@ func TestBlockModifyPlan(t *testing.T) {
req: modifyAttributePlanRequest(
path.Root("test"),
schema([]tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestRequiresReplaceFalseModifier{},
}, nil),
modifyAttributePlanValues{
Expand All @@ -312,7 +313,7 @@ func TestBlockModifyPlan(t *testing.T) {
Plan: tfsdk.Plan{
Raw: schemaTfValue("newtestvalue"),
Schema: schema([]tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestRequiresReplaceFalseModifier{},
}, nil),
},
Expand Down Expand Up @@ -531,7 +532,7 @@ func TestBlockModifyPlan(t *testing.T) {
req: modifyAttributePlanRequest(
path.Root("test"),
schema(nil, []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
}),
modifyAttributePlanValues{
config: "newtestvalue",
Expand All @@ -544,7 +545,7 @@ func TestBlockModifyPlan(t *testing.T) {
Plan: tfsdk.Plan{
Raw: schemaTfValue("newtestvalue"),
Schema: schema(nil, []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
}),
},
RequiresReplace: path.Paths{
Expand All @@ -556,7 +557,7 @@ func TestBlockModifyPlan(t *testing.T) {
req: modifyAttributePlanRequest(
path.Root("test"),
schema(nil, []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
}),
modifyAttributePlanValues{
config: "newtestvalue",
Expand All @@ -582,7 +583,7 @@ func TestBlockModifyPlan(t *testing.T) {
Plan: tfsdk.Plan{
Raw: schemaTfValue("newtestvalue"),
Schema: schema(nil, []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
}),
},
RequiresReplace: path.Paths{
Expand All @@ -594,7 +595,7 @@ func TestBlockModifyPlan(t *testing.T) {
req: modifyAttributePlanRequest(
path.Root("test"),
schema(nil, []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestAttrPlanValueModifierOne{},
}),
modifyAttributePlanValues{
Expand All @@ -608,7 +609,7 @@ func TestBlockModifyPlan(t *testing.T) {
Plan: tfsdk.Plan{
Raw: schemaTfValue("TESTATTRTWO"),
Schema: schema(nil, []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestAttrPlanValueModifierOne{},
}),
},
Expand All @@ -621,7 +622,7 @@ func TestBlockModifyPlan(t *testing.T) {
req: modifyAttributePlanRequest(
path.Root("test"),
schema(nil, []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestRequiresReplaceFalseModifier{},
}),
modifyAttributePlanValues{
Expand All @@ -635,7 +636,7 @@ func TestBlockModifyPlan(t *testing.T) {
Plan: tfsdk.Plan{
Raw: schemaTfValue("newtestvalue"),
Schema: schema(nil, []tfsdk.AttributePlanModifier{
tfsdk.RequiresReplace(),
resource.RequiresReplace(),
planmodifiers.TestRequiresReplaceFalseModifier{},
}),
},
Expand Down