From a0cee1072091247a5dda18c2a081fe83f86f8d95 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Tue, 22 Sep 2020 17:02:10 -0400 Subject: [PATCH] add Addr field for logging --- terraform/eval_state.go | 5 ++++- terraform/node_resource_plan_instance.go | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/terraform/eval_state.go b/terraform/eval_state.go index 0699b4494..6fcb9a858 100644 --- a/terraform/eval_state.go +++ b/terraform/eval_state.go @@ -534,6 +534,8 @@ func (n *EvalWriteResourceState) Eval(ctx EvalContext) (interface{}, error) { // the status of the lifecycle options stored in the state. // This currently only applies to create_before_destroy. type EvalRefreshLifecycle struct { + Addr addrs.AbsResourceInstance + Config *configs.Resource // Prior State State **states.ResourceInstanceObject @@ -552,7 +554,8 @@ func (n *EvalRefreshLifecycle) Eval(ctx EvalContext) (interface{}, error) { // In 0.13 we could be refreshing a resource with no config. // We should be operating on managed resource, but check here to be certain if n.Config == nil || n.Config.Managed == nil { - log.Print("[WARN] no Managed config value found in instance state") + log.Printf("[WARN] EvalRefreshLifecycle: no Managed config value found in instance state for %q", n.Addr) + return nil, nil } state.CreateBeforeDestroy = n.Config.Managed.CreateBeforeDestroy || n.ForceCreateBeforeDestroy diff --git a/terraform/node_resource_plan_instance.go b/terraform/node_resource_plan_instance.go index 4e930bd16..2605b6f14 100644 --- a/terraform/node_resource_plan_instance.go +++ b/terraform/node_resource_plan_instance.go @@ -149,6 +149,7 @@ func (n *NodePlannableResourceInstance) evalTreeManagedResource(addr addrs.AbsRe Output: &instanceRefreshState, }, &EvalRefreshLifecycle{ + Addr: addr, Config: n.Config, State: &instanceRefreshState, ForceCreateBeforeDestroy: n.ForceCreateBeforeDestroy,