diff options
Diffstat (limited to 'vendor/github.com/hashicorp/terraform/terraform/node_resource_apply_instance.go')
-rw-r--r-- | vendor/github.com/hashicorp/terraform/terraform/node_resource_apply_instance.go | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/vendor/github.com/hashicorp/terraform/terraform/node_resource_apply_instance.go b/vendor/github.com/hashicorp/terraform/terraform/node_resource_apply_instance.go index dad7bfc..d795324 100644 --- a/vendor/github.com/hashicorp/terraform/terraform/node_resource_apply_instance.go +++ b/vendor/github.com/hashicorp/terraform/terraform/node_resource_apply_instance.go | |||
@@ -101,13 +101,6 @@ func (n *NodeApplyableResourceInstance) References() []*addrs.Reference { | |||
101 | func (n *NodeApplyableResourceInstance) EvalTree() EvalNode { | 101 | func (n *NodeApplyableResourceInstance) EvalTree() EvalNode { |
102 | addr := n.ResourceInstanceAddr() | 102 | addr := n.ResourceInstanceAddr() |
103 | 103 | ||
104 | // State still uses legacy-style internal ids, so we need to shim to get | ||
105 | // a suitable key to use. | ||
106 | stateId := NewLegacyResourceInstanceAddress(addr).stateId() | ||
107 | |||
108 | // Determine the dependencies for the state. | ||
109 | stateDeps := n.StateReferences() | ||
110 | |||
111 | if n.Config == nil { | 104 | if n.Config == nil { |
112 | // This should not be possible, but we've got here in at least one | 105 | // This should not be possible, but we've got here in at least one |
113 | // case as discussed in the following issue: | 106 | // case as discussed in the following issue: |
@@ -132,15 +125,15 @@ func (n *NodeApplyableResourceInstance) EvalTree() EvalNode { | |||
132 | // Eval info is different depending on what kind of resource this is | 125 | // Eval info is different depending on what kind of resource this is |
133 | switch n.Config.Mode { | 126 | switch n.Config.Mode { |
134 | case addrs.ManagedResourceMode: | 127 | case addrs.ManagedResourceMode: |
135 | return n.evalTreeManagedResource(addr, stateId, stateDeps) | 128 | return n.evalTreeManagedResource(addr) |
136 | case addrs.DataResourceMode: | 129 | case addrs.DataResourceMode: |
137 | return n.evalTreeDataResource(addr, stateId, stateDeps) | 130 | return n.evalTreeDataResource(addr) |
138 | default: | 131 | default: |
139 | panic(fmt.Errorf("unsupported resource mode %s", n.Config.Mode)) | 132 | panic(fmt.Errorf("unsupported resource mode %s", n.Config.Mode)) |
140 | } | 133 | } |
141 | } | 134 | } |
142 | 135 | ||
143 | func (n *NodeApplyableResourceInstance) evalTreeDataResource(addr addrs.AbsResourceInstance, stateId string, stateDeps []addrs.Referenceable) EvalNode { | 136 | func (n *NodeApplyableResourceInstance) evalTreeDataResource(addr addrs.AbsResourceInstance) EvalNode { |
144 | var provider providers.Interface | 137 | var provider providers.Interface |
145 | var providerSchema *ProviderSchema | 138 | var providerSchema *ProviderSchema |
146 | var change *plans.ResourceInstanceChange | 139 | var change *plans.ResourceInstanceChange |
@@ -206,7 +199,7 @@ func (n *NodeApplyableResourceInstance) evalTreeDataResource(addr addrs.AbsResou | |||
206 | } | 199 | } |
207 | } | 200 | } |
208 | 201 | ||
209 | func (n *NodeApplyableResourceInstance) evalTreeManagedResource(addr addrs.AbsResourceInstance, stateId string, stateDeps []addrs.Referenceable) EvalNode { | 202 | func (n *NodeApplyableResourceInstance) evalTreeManagedResource(addr addrs.AbsResourceInstance) EvalNode { |
210 | // Declare a bunch of variables that are used for state during | 203 | // Declare a bunch of variables that are used for state during |
211 | // evaluation. Most of this are written to by-address below. | 204 | // evaluation. Most of this are written to by-address below. |
212 | var provider providers.Interface | 205 | var provider providers.Interface |