Adds the module name to the base name if ENV TF_ADD_MODULE_PATH is set.

Author: cgroschupp

cli.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"sort"
+	"strings"
 )
 
 type counterSorter struct {
@@ -61,10 +62,17 @@ func gatherResources(s *state) map[string]interface{} {
 		tp := fmt.Sprintf("type_%s", res.resourceType)
 		types[tp] = appendUniq(types[tp], res.Address())
 
-		unsortedOrdered[res.baseName] = append(unsortedOrdered[res.baseName], res)
+		var baseNameArray []string
+		if os.Getenv("TF_ADD_MODULE_PATH") != "" && res.modulePath != "" {
+			baseNameArray = append(baseNameArray, res.modulePath)
+		}
+		baseNameArray = append(baseNameArray, res.baseName)
+		baseName := strings.Join(baseNameArray, ".")
+
+		unsortedOrdered[baseName] = append(unsortedOrdered[baseName], res)
 
 		// store as invdividual host (eg. <name>.<count>)
-		invdName := fmt.Sprintf("%s.%d", res.baseName, res.counter)
+		invdName := fmt.Sprintf("%s.%d", baseName, res.counter)
 		if old, exists := individual[invdName]; exists {
 			fmt.Fprintf(os.Stderr, "overwriting already existing individual key %s, old: %v, new: %v", invdName, old, res.Address())
 		}

parser.go

@@ -62,7 +62,7 @@ func (s *state) resources() []*Resource {
 			// Terraform stores resources in a name->map map, but we need the name to
 			// decide which groups to include the resource in. So wrap it in a higher-
 			// level object with both properties.
-			r, err := NewResource(k, m.ResourceStates[k])
+			r, err := NewResource(k, m.ResourceStates[k], m.Path)
 			if err != nil {
 				continue
 			}
@@ -76,6 +76,7 @@ func (s *state) resources() []*Resource {
 }
 
 type moduleState struct {
+	Path           []string                 `json:"path"`
 	ResourceStates map[string]resourceState `json:"resources"`
 	Outputs        map[string]interface{}   `json:"outputs"`
 }

resource.go

@@ -55,9 +55,10 @@ type Resource struct {
 	resourceType string
 	baseName     string
 	counter      int
+	modulePath   string
 }
 
-func NewResource(keyName string, state resourceState) (*Resource, error) {
+func NewResource(keyName string, state resourceState, path []string) (*Resource, error) {
 	m := nameParser.FindStringSubmatch(keyName)
 
 	// This should not happen unless our regex changes.
@@ -85,6 +86,7 @@ func NewResource(keyName string, state resourceState) (*Resource, error) {
 		resourceType: m[1],
 		baseName:     m[2],
 		counter:      c,
+		modulePath:   strings.Join(path, "."),
 	}, nil
 }