IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

s/trigger/triggers_replace/

Browse Source 
Rename `triggers` to be more descriptive, making it similar to
`replace_triggered_by`.
This commit is contained in:
James Bardin 2022-11-30 11:30:38 -05:00
parent 58e15c7f0e
commit d0d6501c1f
3 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/builtin/providers/terraform/resource_data.go
View File

@ -17,7 +17,7 @@ func dataStoreResourceSchema() providers.Schema {
Attributes: map[string]*configschema.Attribute{ Attributes: map[string]*configschema.Attribute{
"input": {Type: cty.DynamicPseudoType, Optional: true}, "input": {Type: cty.DynamicPseudoType, Optional: true},
"output": {Type: cty.DynamicPseudoType, Computed: true}, "output": {Type: cty.DynamicPseudoType, Computed: true},
"trigger": {Type: cty.DynamicPseudoType, Optional: true}, "triggers_replace": {Type: cty.DynamicPseudoType, Optional: true},
"id": {Type: cty.String, Computed: true}, "id": {Type: cty.String, Computed: true},
}, },
}, },
@ -66,7 +66,7 @@ func planDataStoreResourceChange(req providers.PlanResourceChangeRequest) (resp
planned := req.ProposedNewState.AsValueMap() planned := req.ProposedNewState.AsValueMap()
input := req.ProposedNewState.GetAttr("input") input := req.ProposedNewState.GetAttr("input")
trigger := req.ProposedNewState.GetAttr("trigger") trigger := req.ProposedNewState.GetAttr("triggers_replace")
switch { switch {
case req.PriorState.IsNull(): case req.PriorState.IsNull():
@ -82,9 +82,9 @@ func planDataStoreResourceChange(req providers.PlanResourceChangeRequest) (resp
resp.PlannedState = cty.ObjectVal(planned) resp.PlannedState = cty.ObjectVal(planned)
return resp return resp
case !req.PriorState.GetAttr("trigger").RawEquals(trigger): case !req.PriorState.GetAttr("triggers_replace").RawEquals(trigger):
// trigger changed, so we need to replace the entire instance // trigger changed, so we need to replace the entire instance
resp.RequiresReplace = append(resp.RequiresReplace, cty.GetAttrPath("trigger")) resp.RequiresReplace = append(resp.RequiresReplace, cty.GetAttrPath("triggers_replace"))
planned["id"] = cty.UnknownVal(cty.String) planned["id"] = cty.UnknownVal(cty.String)
// We need to check the input for the replacement instance to compute a // We need to check the input for the replacement instance to compute a

58
internal/builtin/providers/terraform/resource_data_test.go
View File

@ -13,7 +13,7 @@ func TestManagedDataValidate(t *testing.T) {
cfg := map[string]cty.Value{ cfg := map[string]cty.Value{
"input": cty.NullVal(cty.DynamicPseudoType), "input": cty.NullVal(cty.DynamicPseudoType),
"output": cty.NullVal(cty.DynamicPseudoType), "output": cty.NullVal(cty.DynamicPseudoType),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.NullVal(cty.String), "id": cty.NullVal(cty.String),
} }
@ -50,7 +50,7 @@ func TestManagedDataUpgradeState(t *testing.T) {
state := cty.ObjectVal(map[string]cty.Value{ state := cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.ListVal([]cty.Value{ "triggers_replace": cty.ListVal([]cty.Value{
cty.StringVal("a"), cty.StringVal("b"), cty.StringVal("a"), cty.StringVal("b"),
}), }),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
@ -83,7 +83,7 @@ func TestManagedDataRead(t *testing.T) {
PriorState: cty.ObjectVal(map[string]cty.Value{ PriorState: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.ListVal([]cty.Value{ "triggers_replace": cty.ListVal([]cty.Value{
cty.StringVal("a"), cty.StringVal("b"), cty.StringVal("a"), cty.StringVal("b"),
}), }),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
@ -114,13 +114,13 @@ func TestManagedDataPlan(t *testing.T) {
proposed: cty.ObjectVal(map[string]cty.Value{ proposed: cty.ObjectVal(map[string]cty.Value{
"input": cty.NullVal(cty.DynamicPseudoType), "input": cty.NullVal(cty.DynamicPseudoType),
"output": cty.NullVal(cty.DynamicPseudoType), "output": cty.NullVal(cty.DynamicPseudoType),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.NullVal(cty.String), "id": cty.NullVal(cty.String),
}), }),
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.NullVal(cty.DynamicPseudoType), "input": cty.NullVal(cty.DynamicPseudoType),
"output": cty.NullVal(cty.DynamicPseudoType), "output": cty.NullVal(cty.DynamicPseudoType),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.UnknownVal(cty.String), "id": cty.UnknownVal(cty.String),
}), }),
}, },
@ -130,13 +130,13 @@ func TestManagedDataPlan(t *testing.T) {
proposed: cty.ObjectVal(map[string]cty.Value{ proposed: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.NullVal(cty.DynamicPseudoType), "output": cty.NullVal(cty.DynamicPseudoType),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.NullVal(cty.String), "id": cty.NullVal(cty.String),
}), }),
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.UnknownVal(cty.String), "output": cty.UnknownVal(cty.String),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.UnknownVal(cty.String), "id": cty.UnknownVal(cty.String),
}), }),
}, },
@ -145,19 +145,19 @@ func TestManagedDataPlan(t *testing.T) {
prior: cty.ObjectVal(map[string]cty.Value{ prior: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
proposed: cty.ObjectVal(map[string]cty.Value{ proposed: cty.ObjectVal(map[string]cty.Value{
"input": cty.UnknownVal(cty.List(cty.String)), "input": cty.UnknownVal(cty.List(cty.String)),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.UnknownVal(cty.List(cty.String)), "input": cty.UnknownVal(cty.List(cty.String)),
"output": cty.UnknownVal(cty.List(cty.String)), "output": cty.UnknownVal(cty.List(cty.String)),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
}, },
@ -166,19 +166,19 @@ func TestManagedDataPlan(t *testing.T) {
prior: cty.ObjectVal(map[string]cty.Value{ prior: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
proposed: cty.ObjectVal(map[string]cty.Value{ proposed: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.StringVal("new-value"), "triggers_replace": cty.StringVal("new-value"),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.UnknownVal(cty.String), "output": cty.UnknownVal(cty.String),
"trigger": cty.StringVal("new-value"), "triggers_replace": cty.StringVal("new-value"),
"id": cty.UnknownVal(cty.String), "id": cty.UnknownVal(cty.String),
}), }),
}, },
@ -187,7 +187,7 @@ func TestManagedDataPlan(t *testing.T) {
prior: cty.ObjectVal(map[string]cty.Value{ prior: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.MapVal(map[string]cty.Value{ "triggers_replace": cty.MapVal(map[string]cty.Value{
"key": cty.StringVal("value"), "key": cty.StringVal("value"),
}), }),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
@ -195,7 +195,7 @@ func TestManagedDataPlan(t *testing.T) {
proposed: cty.ObjectVal(map[string]cty.Value{ proposed: cty.ObjectVal(map[string]cty.Value{
"input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.MapVal(map[string]cty.Value{ "triggers_replace": cty.MapVal(map[string]cty.Value{
"key": cty.StringVal("new value"), "key": cty.StringVal("new value"),
}), }),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
@ -203,7 +203,7 @@ func TestManagedDataPlan(t *testing.T) {
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}),
"output": cty.UnknownVal(cty.List(cty.String)), "output": cty.UnknownVal(cty.List(cty.String)),
"trigger": cty.MapVal(map[string]cty.Value{ "triggers_replace": cty.MapVal(map[string]cty.Value{
"key": cty.StringVal("new value"), "key": cty.StringVal("new value"),
}), }),
"id": cty.UnknownVal(cty.String), "id": cty.UnknownVal(cty.String),
@ -250,13 +250,13 @@ func TestManagedDataApply(t *testing.T) {
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.NullVal(cty.DynamicPseudoType), "input": cty.NullVal(cty.DynamicPseudoType),
"output": cty.NullVal(cty.DynamicPseudoType), "output": cty.NullVal(cty.DynamicPseudoType),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.UnknownVal(cty.String), "id": cty.UnknownVal(cty.String),
}), }),
state: cty.ObjectVal(map[string]cty.Value{ state: cty.ObjectVal(map[string]cty.Value{
"input": cty.NullVal(cty.DynamicPseudoType), "input": cty.NullVal(cty.DynamicPseudoType),
"output": cty.NullVal(cty.DynamicPseudoType), "output": cty.NullVal(cty.DynamicPseudoType),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
}, },
@ -266,13 +266,13 @@ func TestManagedDataApply(t *testing.T) {
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.UnknownVal(cty.String), "output": cty.UnknownVal(cty.String),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.UnknownVal(cty.String), "id": cty.UnknownVal(cty.String),
}), }),
state: cty.ObjectVal(map[string]cty.Value{ state: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
}, },
@ -281,19 +281,19 @@ func TestManagedDataApply(t *testing.T) {
prior: cty.ObjectVal(map[string]cty.Value{ prior: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}),
"output": cty.UnknownVal(cty.List(cty.String)), "output": cty.UnknownVal(cty.List(cty.String)),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
state: cty.ObjectVal(map[string]cty.Value{ state: cty.ObjectVal(map[string]cty.Value{
"input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}),
"output": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "output": cty.ListVal([]cty.Value{cty.StringVal("new-input")}),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
}, },
@ -302,19 +302,19 @@ func TestManagedDataApply(t *testing.T) {
prior: cty.ObjectVal(map[string]cty.Value{ prior: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.NullVal(cty.DynamicPseudoType), "triggers_replace": cty.NullVal(cty.DynamicPseudoType),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.UnknownVal(cty.String), "output": cty.UnknownVal(cty.String),
"trigger": cty.StringVal("new-value"), "triggers_replace": cty.StringVal("new-value"),
"id": cty.UnknownVal(cty.String), "id": cty.UnknownVal(cty.String),
}), }),
state: cty.ObjectVal(map[string]cty.Value{ state: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.StringVal("new-value"), "triggers_replace": cty.StringVal("new-value"),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
}), }),
}, },
@ -323,7 +323,7 @@ func TestManagedDataApply(t *testing.T) {
prior: cty.ObjectVal(map[string]cty.Value{ prior: cty.ObjectVal(map[string]cty.Value{
"input": cty.StringVal("input"), "input": cty.StringVal("input"),
"output": cty.StringVal("input"), "output": cty.StringVal("input"),
"trigger": cty.MapVal(map[string]cty.Value{ "triggers_replace": cty.MapVal(map[string]cty.Value{
"key": cty.StringVal("value"), "key": cty.StringVal("value"),
}), }),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),
@ -331,7 +331,7 @@ func TestManagedDataApply(t *testing.T) {
planned: cty.ObjectVal(map[string]cty.Value{ planned: cty.ObjectVal(map[string]cty.Value{
"input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}),
"output": cty.UnknownVal(cty.List(cty.String)), "output": cty.UnknownVal(cty.List(cty.String)),
"trigger": cty.MapVal(map[string]cty.Value{ "triggers_replace": cty.MapVal(map[string]cty.Value{
"key": cty.StringVal("new value"), "key": cty.StringVal("new value"),
}), }),
"id": cty.UnknownVal(cty.String), "id": cty.UnknownVal(cty.String),
@ -339,7 +339,7 @@ func TestManagedDataApply(t *testing.T) {
state: cty.ObjectVal(map[string]cty.Value{ state: cty.ObjectVal(map[string]cty.Value{
"input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}),
"output": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "output": cty.ListVal([]cty.Value{cty.StringVal("new-input")}),
"trigger": cty.MapVal(map[string]cty.Value{ "triggers_replace": cty.MapVal(map[string]cty.Value{
"key": cty.StringVal("new value"), "key": cty.StringVal("new value"),
}), }),
"id": cty.StringVal("not-quite-unique"), "id": cty.StringVal("not-quite-unique"),

2
internal/command/e2etest/testdata/terraform-managed-data/main.tf vendored
View File

@ -6,7 +6,7 @@ resource "terraform_data" "b" {
} }
resource "terraform_data" "c" { resource "terraform_data" "c" {
trigger = terraform_data.b triggers_replace = terraform_data.b
} }
resource "terraform_data" "d" { resource "terraform_data" "d" {