diff options
author | Alexandre Garand <alexandre.garand@fretlink.com> | 2019-08-09 15:59:15 +0200 |
---|---|---|
committer | Alexandre Garand <alexandre.garand@fretlink.com> | 2019-08-09 16:39:21 +0200 |
commit | 863486a6b71ed0e562a3965bed56465d007b1418 (patch) | |
tree | e93f6a687695af86d54237ec9f575d4ef104222d /vendor/github.com/hashicorp/terraform/terraform/eval_apply.go | |
parent | 49c1c7b4dc69ffb9ab52330e6dc52ccdd6351087 (diff) | |
download | terraform-provider-statuscake-863486a6b71ed0e562a3965bed56465d007b1418.tar.gz terraform-provider-statuscake-863486a6b71ed0e562a3965bed56465d007b1418.tar.zst terraform-provider-statuscake-863486a6b71ed0e562a3965bed56465d007b1418.zip |
update vendor and go.modadd_contact_groups
Diffstat (limited to 'vendor/github.com/hashicorp/terraform/terraform/eval_apply.go')
-rw-r--r-- | vendor/github.com/hashicorp/terraform/terraform/eval_apply.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor/github.com/hashicorp/terraform/terraform/eval_apply.go b/vendor/github.com/hashicorp/terraform/terraform/eval_apply.go index 09313f7..422f372 100644 --- a/vendor/github.com/hashicorp/terraform/terraform/eval_apply.go +++ b/vendor/github.com/hashicorp/terraform/terraform/eval_apply.go | |||
@@ -61,7 +61,8 @@ func (n *EvalApply) Eval(ctx EvalContext) (interface{}, error) { | |||
61 | configVal := cty.NullVal(cty.DynamicPseudoType) | 61 | configVal := cty.NullVal(cty.DynamicPseudoType) |
62 | if n.Config != nil { | 62 | if n.Config != nil { |
63 | var configDiags tfdiags.Diagnostics | 63 | var configDiags tfdiags.Diagnostics |
64 | keyData := EvalDataForInstanceKey(n.Addr.Key) | 64 | forEach, _ := evaluateResourceForEachExpression(n.Config.ForEach, ctx) |
65 | keyData := EvalDataForInstanceKey(n.Addr.Key, forEach) | ||
65 | configVal, _, configDiags = ctx.EvaluateBlock(n.Config.Config, schema, nil, keyData) | 66 | configVal, _, configDiags = ctx.EvaluateBlock(n.Config.Config, schema, nil, keyData) |
66 | diags = diags.Append(configDiags) | 67 | diags = diags.Append(configDiags) |
67 | if configDiags.HasErrors() { | 68 | if configDiags.HasErrors() { |
@@ -548,7 +549,8 @@ func (n *EvalApplyProvisioners) apply(ctx EvalContext, provs []*configs.Provisio | |||
548 | provisioner := ctx.Provisioner(prov.Type) | 549 | provisioner := ctx.Provisioner(prov.Type) |
549 | schema := ctx.ProvisionerSchema(prov.Type) | 550 | schema := ctx.ProvisionerSchema(prov.Type) |
550 | 551 | ||
551 | keyData := EvalDataForInstanceKey(instanceAddr.Key) | 552 | // TODO the for_each val is not added here, which might causes issues with provisioners |
553 | keyData := EvalDataForInstanceKey(instanceAddr.Key, nil) | ||
552 | 554 | ||
553 | // Evaluate the main provisioner configuration. | 555 | // Evaluate the main provisioner configuration. |
554 | config, _, configDiags := ctx.EvaluateBlock(prov.Config, schema, instanceAddr, keyData) | 556 | config, _, configDiags := ctx.EvaluateBlock(prov.Config, schema, instanceAddr, keyData) |