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

states: Prune empty modules after possibly removing resources 

Also includes a new log message for the situation where we _do_ prune,
since this seems helpful during debugging.
This commit is contained in:
Martin Atkins 2018-09-11 16:57:27 -07:00
parent 26aef7dc22
commit edc0ce6333
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
states/sync.go
View File

@ -1,6 +1,7 @@
package states package states
import ( import (
"log"
"sync" "sync"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
@ -267,6 +268,7 @@ func (s *SyncState) SetResourceInstanceCurrent(addr addrs.AbsResourceInstance, o
ms := s.state.EnsureModule(addr.Module) ms := s.state.EnsureModule(addr.Module)
ms.SetResourceInstanceCurrent(addr.Resource, obj.DeepCopy(), provider) ms.SetResourceInstanceCurrent(addr.Resource, obj.DeepCopy(), provider)
s.maybePruneModule(addr.Module)
} }
// SetResourceInstanceDeposed saves the given instance object as a deposed // SetResourceInstanceDeposed saves the given instance object as a deposed
@ -298,6 +300,7 @@ func (s *SyncState) SetResourceInstanceDeposed(addr addrs.AbsResourceInstance, k
ms := s.state.EnsureModule(addr.Module) ms := s.state.EnsureModule(addr.Module)
ms.SetResourceInstanceDeposed(addr.Resource, key, obj.DeepCopy(), provider) ms.SetResourceInstanceDeposed(addr.Resource, key, obj.DeepCopy(), provider)
s.maybePruneModule(addr.Module)
} }
// DeposeResourceInstanceObject moves the current instance object for the // DeposeResourceInstanceObject moves the current instance object for the
@ -334,6 +337,7 @@ func (s *SyncState) ForgetResourceInstanceDeposed(addr addrs.AbsResourceInstance
return return
} }
ms.ForgetResourceInstanceDeposed(addr.Resource, key) ms.ForgetResourceInstanceDeposed(addr.Resource, key)
s.maybePruneModule(addr.Module)
} }
// RemovePlannedResourceInstanceObjects removes from the state any resource // RemovePlannedResourceInstanceObjects removes from the state any resource
@ -428,6 +432,7 @@ func (s *SyncState) maybePruneModule(addr addrs.ModuleInstance) {
} }
if ms.empty() { if ms.empty() {
log.Printf("[TRACE] states.SyncState: pruning %s because it is empty", addr)
s.state.RemoveModule(addr) s.state.RemoveModule(addr)
} }
} }