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

Merge pull request #23561 from hashicorp/pselle/setMetaCleanup1 

Update comment in SetResourceInstanceCurrent
This commit is contained in:
Pam Selle 2019-12-04 17:00:53 -05:00 committed by GitHub
parent 2a2201cc74 e4d2469698
commit 89b1a0107c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
states/module.go
View File

@ -76,7 +76,7 @@ func (ms *Module) RemoveResource(addr addrs.Resource) {
} }
// SetResourceInstanceCurrent saves the given instance object as the current // SetResourceInstanceCurrent saves the given instance object as the current
// generation of the resource instance with the given address, simulataneously // generation of the resource instance with the given address, simultaneously
// updating the recorded provider configuration address, dependencies, and // updating the recorded provider configuration address, dependencies, and
// resource EachMode. // resource EachMode.
// //
@ -106,8 +106,7 @@ func (ms *Module) SetResourceInstanceCurrent(addr addrs.ResourceInstance, obj *R
// 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.Instance(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 on the resource with this address and obj is nil, return and change nothing
// be chill, just return
return return
} }
// if we have an instance, update the current // if we have an instance, update the current