ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always close all provisioners after each walk 

This was not done consistently in all cases when the individual
provisioner graph nodes were used. Since we removed the graph nodes, the
only thing left is to close these at the end of the walk.
This commit is contained in:
James Bardin 2021-01-19 12:58:00 -05:00
parent a6db207b87
commit fe7635f438
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
terraform/node_module_expand.go
View File

@ -140,7 +140,9 @@ func (n *nodeExpandModule) Execute(ctx EvalContext, op walkOperation) (diags tfd
// wait on this node.
// Besides providing a root node for dependency ordering, nodeCloseModule also
// cleans up state after all the module nodes have been evaluated, removing
// empty resources and modules from the state.
// empty resources and modules from the state, and closes a remaining
// provisioner plugins which do not have a lifecycle controlled controlled by
// individual graph nodes.
type nodeCloseModule struct {
Addr addrs.Module
}
@ -174,6 +176,12 @@ func (n *nodeCloseModule) Name() string {
}
func (n *nodeCloseModule) Execute(ctx EvalContext, op walkOperation) (diags tfdiags.Diagnostics) {
if n.Addr.IsRoot() {
// If this is the root module, we are cleaning up the walk, so close
// any running provisioners
diags = diags.Append(ctx.CloseProvisioners())
}
switch op {
case walkApply, walkDestroy:
state := ctx.State().Lock()