terraform: fixing dependency handling for orphans

terraform/graph.go

@@ -636,8 +636,12 @@ func graphAddOrphans(g *depgraph.Graph, c *config.Config, s *State) {
 			continue
 		}
 
-		for _, n2 := range nlist {
-			rn2 := n2.Meta.(*GraphNodeResource)
+		for _, n2 := range g.Nouns {
+			rn2, ok := n2.Meta.(*GraphNodeResource)
+			if !ok {
+				continue
+			}
+
 			// Don't ever depend on ourselves
 			if rn2 == rn {
 				continue

terraform/graph_test.go

@@ -529,6 +529,54 @@ func TestEncodeDependencies_Count(t *testing.T) {
 	}
 }
 
+func TestGraph_orphan_dependencies(t *testing.T) {
+	config := testConfig(t, "graph-count")
+	state := &State{
+		Modules: []*ModuleState{
+			&ModuleState{
+				Path: rootModulePath,
+
+				Resources: map[string]*ResourceState{
+					"aws_instance.web.0": &ResourceState{
+						Type: "aws_instance",
+						Primary: &InstanceState{
+							ID: "foo",
+						},
+					},
+					"aws_instance.web.1": &ResourceState{
+						Type: "aws_instance",
+						Primary: &InstanceState{
+							ID: "foo",
+						},
+					},
+					"aws_load_balancer.old": &ResourceState{
+						Type: "aws_load_balancer",
+						Primary: &InstanceState{
+							ID: "foo",
+						},
+						Dependencies: []string{
+							"aws_instance.web.0",
+							"aws_instance.web.1",
+							"aws_instance.web.2",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	g, err := Graph(&GraphOpts{Config: config, State: state})
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	actual := strings.TrimSpace(g.String())
+	expected := strings.TrimSpace(testTerraformGraphCountOrphanStr)
+	if actual != expected {
+		t.Fatalf("bad:\n\nactual:\n%s\n\nexpected:\n%s", actual, expected)
+	}
+}
+
 const testTerraformGraphStr = `
 root: root
 aws_instance.web
@@ -666,3 +714,24 @@ root
   root -> aws_security_group.firewall
   root -> openstack_floating_ip.random
 `
+
+const testTerraformGraphCountOrphanStr = `
+root: root
+aws_instance.web
+  aws_instance.web -> aws_instance.web.0
+  aws_instance.web -> aws_instance.web.1
+  aws_instance.web -> aws_instance.web.2
+aws_instance.web.0
+aws_instance.web.1
+aws_instance.web.2
+aws_load_balancer.old
+  aws_load_balancer.old -> aws_instance.web.0
+  aws_load_balancer.old -> aws_instance.web.1
+  aws_load_balancer.old -> aws_instance.web.2
+aws_load_balancer.weblb
+  aws_load_balancer.weblb -> aws_instance.web
+root
+  root -> aws_instance.web
+  root -> aws_load_balancer.old
+  root -> aws_load_balancer.weblb
+`