From e6817f6319103691624d5de5df89dfa6a97622b7 Mon Sep 17 00:00:00 2001
From: Pam Selle <204372+pselle@users.noreply.github.com>
Date: Tue, 13 Aug 2019 17:22:14 -0400
Subject: [PATCH] Reordering, comment update

---
 states/sync.go                      |  2 +-
 terraform/transform_orphan_count.go | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/states/sync.go b/states/sync.go
index a37744673..47fb16d6e 100644
--- a/states/sync.go
+++ b/states/sync.go
@@ -283,7 +283,7 @@ func (s *SyncState) MaybeFixUpResourceInstanceAddressForCount(addr addrs.AbsReso
 }
 
 // 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
 // resource EachMode.
 //
diff --git a/terraform/transform_orphan_count.go b/terraform/transform_orphan_count.go
index 6ad1d02ac..40163cf91 100644
--- a/terraform/transform_orphan_count.go
+++ b/terraform/transform_orphan_count.go
@@ -50,12 +50,12 @@ func (t *OrphanResourceCountTransformer) Transform(g *Graph) error {
 }
 
 func (t *OrphanResourceCountTransformer) transformForEach(haveKeys map[addrs.InstanceKey]struct{}, g *Graph) error {
-	// If there is a no-key node, add this to the graph first,
+	// If there is a NoKey node, add this to the graph first,
 	// so that we can create edges to it in subsequent (StringKey) nodes.
 	// This is because the last item determines the resource mode for the whole resource,
-	// so if this (non-deterministically) happens to end up as the last one,
-	// that will change the resource's EachMode and our addressing for our instances
-	// will not work as expected
+	// (see SetResourceInstanceCurrent for more information) and we need to evaluate
+	// an orphaned (NoKey) resource before the in-memory state is updated
+	// to deal with a new for_each resource
 	_, hasNoKeyNode := haveKeys[addrs.NoKey]
 	var noKeyNode dag.Vertex
 	if hasNoKeyNode {
@@ -68,14 +68,14 @@ func (t *OrphanResourceCountTransformer) transformForEach(haveKeys map[addrs.Ins
 	}
 
 	for key := range haveKeys {
-		s, _ := key.(addrs.StringKey)
-		// If the key is present in our current for_each, carry on
-		if _, ok := t.ForEach[string(s)]; ok {
+		// If the key is no-key, we have already added it, so skip
+		if key == addrs.NoKey {
 			continue
 		}
 
-		// If the key is no-key, we have already added it, so skip
-		if key == addrs.NoKey {
+		s, _ := key.(addrs.StringKey)
+		// If the key is present in our current for_each, carry on
+		if _, ok := t.ForEach[string(s)]; ok {
 			continue
 		}