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

Fixup for allowing empty lists/sets of resources

This commit is contained in:
Pam Selle 2019-12-03 16:29:01 -05:00
parent 19b408e053
commit de953eca6f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
states/module.go
View File

@ -97,7 +97,9 @@ func (ms *Module) SetResourceInstanceCurrent(addr addrs.ResourceInstance, obj *R
if obj == nil && rs != nil { if obj == nil && rs != nil {
// does the resource have any other objects? // does the resource have any other objects?
// if not then delete the whole resource // if not then delete the whole resource
if len(rs.Instances) == 0 { // When deleting the resource, ensure that its EachMode is NoEach,
// as a resource with EachList or EachMap can have 0 instances and be valid
if rs.EachMode == NoEach && len(rs.Instances) == 0 {
delete(ms.Resources, addr.Resource.String()) delete(ms.Resources, addr.Resource.String())
return return
} }
@ -113,7 +115,8 @@ func (ms *Module) SetResourceInstanceCurrent(addr addrs.ResourceInstance, obj *R
if !is.HasObjects() { if !is.HasObjects() {
// If we have no objects at all then we'll clean up. // If we have no objects at all then we'll clean up.
delete(rs.Instances, addr.Key) delete(rs.Instances, addr.Key)
if len(rs.Instances) == 0 { // Delete the resource if it has no instances, but only if NoEach
if rs.EachMode == NoEach && len(rs.Instances) == 0 {
delete(ms.Resources, addr.Resource.String()) delete(ms.Resources, addr.Resource.String())
return return
} }