From d0d6501c1f32a35a413e069a04a25336af30142b Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 30 Nov 2022 11:30:38 -0500 Subject: [PATCH] s/trigger/triggers_replace/ Rename `triggers` to be more descriptive, making it similar to `replace_triggered_by`. --- .../providers/terraform/resource_data.go | 14 +- .../providers/terraform/resource_data_test.go | 184 +++++++++--------- .../testdata/terraform-managed-data/main.tf | 2 +- 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/internal/builtin/providers/terraform/resource_data.go b/internal/builtin/providers/terraform/resource_data.go index 61d6a07aa495..23ae91fc4a34 100644 --- a/internal/builtin/providers/terraform/resource_data.go +++ b/internal/builtin/providers/terraform/resource_data.go @@ -15,10 +15,10 @@ func dataStoreResourceSchema() providers.Schema { return providers.Schema{ Block: &configschema.Block{ Attributes: map[string]*configschema.Attribute{ - "input": {Type: cty.DynamicPseudoType, Optional: true}, - "output": {Type: cty.DynamicPseudoType, Computed: true}, - "trigger": {Type: cty.DynamicPseudoType, Optional: true}, - "id": {Type: cty.String, Computed: true}, + "input": {Type: cty.DynamicPseudoType, Optional: true}, + "output": {Type: cty.DynamicPseudoType, Computed: true}, + "triggers_replace": {Type: cty.DynamicPseudoType, Optional: true}, + "id": {Type: cty.String, Computed: true}, }, }, } @@ -66,7 +66,7 @@ func planDataStoreResourceChange(req providers.PlanResourceChangeRequest) (resp planned := req.ProposedNewState.AsValueMap() input := req.ProposedNewState.GetAttr("input") - trigger := req.ProposedNewState.GetAttr("trigger") + trigger := req.ProposedNewState.GetAttr("triggers_replace") switch { case req.PriorState.IsNull(): @@ -82,9 +82,9 @@ func planDataStoreResourceChange(req providers.PlanResourceChangeRequest) (resp resp.PlannedState = cty.ObjectVal(planned) 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 - resp.RequiresReplace = append(resp.RequiresReplace, cty.GetAttrPath("trigger")) + resp.RequiresReplace = append(resp.RequiresReplace, cty.GetAttrPath("triggers_replace")) planned["id"] = cty.UnknownVal(cty.String) // We need to check the input for the replacement instance to compute a diff --git a/internal/builtin/providers/terraform/resource_data_test.go b/internal/builtin/providers/terraform/resource_data_test.go index c6f6352dbb4b..6b1c3a30e119 100644 --- a/internal/builtin/providers/terraform/resource_data_test.go +++ b/internal/builtin/providers/terraform/resource_data_test.go @@ -11,10 +11,10 @@ import ( func TestManagedDataValidate(t *testing.T) { cfg := map[string]cty.Value{ - "input": cty.NullVal(cty.DynamicPseudoType), - "output": cty.NullVal(cty.DynamicPseudoType), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.NullVal(cty.String), + "input": cty.NullVal(cty.DynamicPseudoType), + "output": cty.NullVal(cty.DynamicPseudoType), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.NullVal(cty.String), } // empty @@ -50,7 +50,7 @@ func TestManagedDataUpgradeState(t *testing.T) { state := cty.ObjectVal(map[string]cty.Value{ "input": cty.StringVal("input"), "output": cty.StringVal("input"), - "trigger": cty.ListVal([]cty.Value{ + "triggers_replace": cty.ListVal([]cty.Value{ cty.StringVal("a"), cty.StringVal("b"), }), "id": cty.StringVal("not-quite-unique"), @@ -83,7 +83,7 @@ func TestManagedDataRead(t *testing.T) { PriorState: cty.ObjectVal(map[string]cty.Value{ "input": cty.StringVal("input"), "output": cty.StringVal("input"), - "trigger": cty.ListVal([]cty.Value{ + "triggers_replace": cty.ListVal([]cty.Value{ cty.StringVal("a"), cty.StringVal("b"), }), "id": cty.StringVal("not-quite-unique"), @@ -112,74 +112,74 @@ func TestManagedDataPlan(t *testing.T) { "create": { prior: cty.NullVal(ty), proposed: cty.ObjectVal(map[string]cty.Value{ - "input": cty.NullVal(cty.DynamicPseudoType), - "output": cty.NullVal(cty.DynamicPseudoType), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.NullVal(cty.String), + "input": cty.NullVal(cty.DynamicPseudoType), + "output": cty.NullVal(cty.DynamicPseudoType), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.NullVal(cty.String), }), planned: cty.ObjectVal(map[string]cty.Value{ - "input": cty.NullVal(cty.DynamicPseudoType), - "output": cty.NullVal(cty.DynamicPseudoType), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.UnknownVal(cty.String), + "input": cty.NullVal(cty.DynamicPseudoType), + "output": cty.NullVal(cty.DynamicPseudoType), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.UnknownVal(cty.String), }), }, "create-output": { prior: cty.NullVal(ty), proposed: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.NullVal(cty.DynamicPseudoType), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.NullVal(cty.String), + "input": cty.StringVal("input"), + "output": cty.NullVal(cty.DynamicPseudoType), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.NullVal(cty.String), }), planned: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.UnknownVal(cty.String), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.UnknownVal(cty.String), + "input": cty.StringVal("input"), + "output": cty.UnknownVal(cty.String), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.UnknownVal(cty.String), }), }, "update-input": { prior: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.StringVal("input"), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.StringVal("input"), + "output": cty.StringVal("input"), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), proposed: cty.ObjectVal(map[string]cty.Value{ - "input": cty.UnknownVal(cty.List(cty.String)), - "output": cty.StringVal("input"), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.UnknownVal(cty.List(cty.String)), + "output": cty.StringVal("input"), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), planned: cty.ObjectVal(map[string]cty.Value{ - "input": cty.UnknownVal(cty.List(cty.String)), - "output": cty.UnknownVal(cty.List(cty.String)), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.UnknownVal(cty.List(cty.String)), + "output": cty.UnknownVal(cty.List(cty.String)), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), }, "update-trigger": { prior: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.StringVal("input"), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.StringVal("input"), + "output": cty.StringVal("input"), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), proposed: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.StringVal("input"), - "trigger": cty.StringVal("new-value"), - "id": cty.StringVal("not-quite-unique"), + "input": cty.StringVal("input"), + "output": cty.StringVal("input"), + "triggers_replace": cty.StringVal("new-value"), + "id": cty.StringVal("not-quite-unique"), }), planned: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.UnknownVal(cty.String), - "trigger": cty.StringVal("new-value"), - "id": cty.UnknownVal(cty.String), + "input": cty.StringVal("input"), + "output": cty.UnknownVal(cty.String), + "triggers_replace": cty.StringVal("new-value"), + "id": cty.UnknownVal(cty.String), }), }, @@ -187,7 +187,7 @@ func TestManagedDataPlan(t *testing.T) { prior: cty.ObjectVal(map[string]cty.Value{ "input": 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"), }), "id": cty.StringVal("not-quite-unique"), @@ -195,7 +195,7 @@ func TestManagedDataPlan(t *testing.T) { proposed: cty.ObjectVal(map[string]cty.Value{ "input": cty.ListVal([]cty.Value{cty.StringVal("new-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"), }), "id": cty.StringVal("not-quite-unique"), @@ -203,7 +203,7 @@ func TestManagedDataPlan(t *testing.T) { planned: cty.ObjectVal(map[string]cty.Value{ "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "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"), }), "id": cty.UnknownVal(cty.String), @@ -248,74 +248,74 @@ func TestManagedDataApply(t *testing.T) { "create": { prior: cty.NullVal(ty), planned: cty.ObjectVal(map[string]cty.Value{ - "input": cty.NullVal(cty.DynamicPseudoType), - "output": cty.NullVal(cty.DynamicPseudoType), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.UnknownVal(cty.String), + "input": cty.NullVal(cty.DynamicPseudoType), + "output": cty.NullVal(cty.DynamicPseudoType), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.UnknownVal(cty.String), }), state: cty.ObjectVal(map[string]cty.Value{ - "input": cty.NullVal(cty.DynamicPseudoType), - "output": cty.NullVal(cty.DynamicPseudoType), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.NullVal(cty.DynamicPseudoType), + "output": cty.NullVal(cty.DynamicPseudoType), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), }, "create-output": { prior: cty.NullVal(ty), planned: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.UnknownVal(cty.String), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.UnknownVal(cty.String), + "input": cty.StringVal("input"), + "output": cty.UnknownVal(cty.String), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.UnknownVal(cty.String), }), state: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.StringVal("input"), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.StringVal("input"), + "output": cty.StringVal("input"), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), }, "update-input": { prior: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.StringVal("input"), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.StringVal("input"), + "output": cty.StringVal("input"), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), planned: cty.ObjectVal(map[string]cty.Value{ - "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), - "output": cty.UnknownVal(cty.List(cty.String)), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), + "output": cty.UnknownVal(cty.List(cty.String)), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), state: cty.ObjectVal(map[string]cty.Value{ - "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), - "output": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), + "output": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), }, "update-trigger": { prior: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.StringVal("input"), - "trigger": cty.NullVal(cty.DynamicPseudoType), - "id": cty.StringVal("not-quite-unique"), + "input": cty.StringVal("input"), + "output": cty.StringVal("input"), + "triggers_replace": cty.NullVal(cty.DynamicPseudoType), + "id": cty.StringVal("not-quite-unique"), }), planned: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.UnknownVal(cty.String), - "trigger": cty.StringVal("new-value"), - "id": cty.UnknownVal(cty.String), + "input": cty.StringVal("input"), + "output": cty.UnknownVal(cty.String), + "triggers_replace": cty.StringVal("new-value"), + "id": cty.UnknownVal(cty.String), }), state: cty.ObjectVal(map[string]cty.Value{ - "input": cty.StringVal("input"), - "output": cty.StringVal("input"), - "trigger": cty.StringVal("new-value"), - "id": cty.StringVal("not-quite-unique"), + "input": cty.StringVal("input"), + "output": cty.StringVal("input"), + "triggers_replace": cty.StringVal("new-value"), + "id": cty.StringVal("not-quite-unique"), }), }, @@ -323,7 +323,7 @@ func TestManagedDataApply(t *testing.T) { prior: cty.ObjectVal(map[string]cty.Value{ "input": 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"), }), "id": cty.StringVal("not-quite-unique"), @@ -331,7 +331,7 @@ func TestManagedDataApply(t *testing.T) { planned: cty.ObjectVal(map[string]cty.Value{ "input": cty.ListVal([]cty.Value{cty.StringVal("new-input")}), "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"), }), "id": cty.UnknownVal(cty.String), @@ -339,7 +339,7 @@ func TestManagedDataApply(t *testing.T) { state: cty.ObjectVal(map[string]cty.Value{ "input": 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"), }), "id": cty.StringVal("not-quite-unique"), diff --git a/internal/command/e2etest/testdata/terraform-managed-data/main.tf b/internal/command/e2etest/testdata/terraform-managed-data/main.tf index 2e69094d0b32..271888e6a10a 100644 --- a/internal/command/e2etest/testdata/terraform-managed-data/main.tf +++ b/internal/command/e2etest/testdata/terraform-managed-data/main.tf @@ -6,7 +6,7 @@ resource "terraform_data" "b" { } resource "terraform_data" "c" { - trigger = terraform_data.b + triggers_replace = terraform_data.b } resource "terraform_data" "d" {