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

Add a new method cause doing things in module is weird

This commit is contained in:
Pam Selle 2019-11-22 15:30:51 -05:00
parent 3b4382082d
commit 87fdcd0064
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
states/module.go
View File

@ -102,7 +102,7 @@ func (ms *Module) SetResourceInstanceCurrent(addr addrs.ResourceInstance, obj *R
return return
} }
// check for an existing resource, now that we've ensured that rs.Instances is more than 0/not nil // check for an existing resource, now that we've ensured that rs.Instances is more than 0/not nil
is := rs.Instances[addr.Key] is := rs.Instance(addr.Key)
if is == nil { if is == nil {
// if there is no instance, but the resource exists and has other instances, // if there is no instance, but the resource exists and has other instances,
// be chill, just return // be chill, just return
@ -130,14 +130,12 @@ func (ms *Module) SetResourceInstanceCurrent(addr addrs.ResourceInstance, obj *R
rs = ms.Resource(addr.Resource) rs = ms.Resource(addr.Resource)
} }
// Get our instance from the resource; it could be there or not at this point // Get our instance from the resource; it could be there or not at this point
is := rs.Instances[addr.Key] is := rs.Instance(addr.Key)
if is == nil { if is == nil {
// if we don't have a resource, create one and add to the instances // if we don't have a resource, create one and add to the instances
is = NewResourceInstance() is = rs.CreateInstance(addr.Key)
rs.Instances[addr.Key] = is
// update the resource meta because we have a new instance, so EachMode may have changed // update the resource meta because we have a new instance, so EachMode may have changed
ms.SetResourceMeta(addr.Resource, eachModeForInstanceKey(addr.Key), provider) ms.SetResourceMeta(addr.Resource, eachModeForInstanceKey(addr.Key), provider)
} }
is.Current = obj is.Current = obj
} }

7
states/resource.go
View File

@ -39,6 +39,13 @@ func (rs *Resource) Instance(key addrs.InstanceKey) *ResourceInstance {
return rs.Instances[key] return rs.Instances[key]
} }
// CreateInstance creates an instance and adds it to the resource
func (rs *Resource) CreateInstance(key addrs.InstanceKey) *ResourceInstance {
is := NewResourceInstance()
rs.Instances[key] = is
return is
}
// EnsureInstance returns the state for the instance with the given key, // EnsureInstance returns the state for the instance with the given key,
// creating a new empty state for it if one doesn't already exist. // creating a new empty state for it if one doesn't already exist.
// //