Merge pull request #97 from JackFlukinger/fix-incorrect-visualization

.gitignore

@@ -1,9 +1,11 @@
-rover
+build/rover
 .DS_Store
 rover.zip
 plan.out
 
 # Ignore generated terraform files
 .terraform**
 
-.idea/
+.idea/
+
+build/

example/multiple-files-same-resource-type-test/file-one.tf

@@ -0,0 +1,4 @@
+resource "random_integer" "one" {
+  min = 1
+  max = 3
+}

example/multiple-files-same-resource-type-test/file-two.tf

@@ -0,0 +1,4 @@
+resource "random_integer" "two" {
+  min = 1
+  max = 4
+}

graph.go

@@ -113,10 +113,17 @@ func (r *rover) addNodes(base string, parent string, nodeMap map[string]Node, re
 			label := l[len(l)-1]
 
 			midParent := parent
+
 			if midParent == mid {
-				midParent = strings.TrimSuffix(midParent, fmt.Sprintf(".%v", label))
+				midParent = nodeMap[midParent].Data.Parent
+			}
+
+			if nodeMap[midParent].Data.Type == ResourceTypeFile {
+				mid = fmt.Sprintf("%s {%s}", mid, nodeMap[parent].Data.Label)
 			}
 
+			//fmt.Printf(midParent + " - " + mid + "\n")
+
 			// Append resource type
 			nmo = append(nmo, mid)
 			nodeMap[mid] = Node{
@@ -145,6 +152,7 @@ func (r *rover) addNodes(base string, parent string, nodeMap map[string]Node, re
 				},
 				Classes: fmt.Sprintf("%s-name %s", re.Type, mrChange),
 			}
+			//fmt.Printf(id + " - " + mid + "\n")
 
 			nmo = append(nmo, r.addNodes(base, id, nodeMap, re.Children)...)