Skip to content

Commit

Permalink
s/trigger/triggers_replace/
Browse files Browse the repository at this point in the history 
Rename `triggers` to be more descriptive, making it similar to
`replace_triggered_by`.
  • Loading branch information
@jbardin
jbardin committed Dec 5, 2022
1 parent 58e15c7 commit d0d6501
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 100 deletions.
14 changes: 7 additions & 7 deletions internal/builtin/providers/terraform/resource_data.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
},
},
}
Expand Down Expand Up @@ -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():
Expand All @@ -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
Expand Down
184 changes: 92 additions & 92 deletions internal/builtin/providers/terraform/resource_data_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -112,98 +112,98 @@ 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),
}),
},

"update-input-trigger": {
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"),
}),
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"),
}),
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),
Expand Down Expand Up @@ -248,98 +248,98 @@ 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"),
}),
},

"update-input-trigger": {
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"),
}),
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),
}),
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"),
Expand Down
2 changes: 1 addition & 1 deletion internal/command/e2etest/testdata/terraform-managed-data/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down

0 comments on commit d0d6501

Please # to comment.