Added: Grouping for VPCs on AWS

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+### Added
+
+- Add Groups logic for VPCs on AWS
+  ([Issue #6](https://github.com/cycloidio/inframap/issues/6))
+
 ### Fixed
 
 - Google graph generation from HCL

generate/hcl.go

@@ -117,6 +117,15 @@ func FromHCL(fs afero.Fs, path string, opt Options) (*graph.Graph, error) {
 		}
 	}
 
+	// Now that we have the full config we can set the Groups
+	for _, n := range g.Nodes {
+		pv, _, err := getProviderAndResource(n.Canonical, opt)
+		if err != nil {
+			return nil, err
+		}
+		n.AddGroupIDs(pv.Groups(n.ID, resourcesRawConfig)...)
+	}
+
 	for nid, resources := range nodeIDEdges {
 		for _, rkattr := range resources {
 			keys := strings.Split(rkattr, ".")

generate/helper_test.go

@@ -50,11 +50,7 @@ func assertEqualGraph(t *testing.T, expected, actual *graph.Graph, actualCfg map
 
 	for _, en := range expected.Nodes {
 		if an, ok := nodeCans[en.Canonical]; ok {
-			en.ID = an.ID
-			en.TFID = an.TFID
-			en.Resource = an.Resource
-			en.Weight = an.Weight
-			assert.Equal(t, en, an)
+			assert.Equal(t, en.GroupIDs, an.GroupIDs)
 		} else {
 			assert.Failf(t, "Fail", "The Node with Canonical %q is missing", en.Canonical)
 		}

generate/state.go

@@ -120,6 +120,15 @@ func FromState(tfstate json.RawMessage, opt Options) (*graph.Graph, map[string]i
 		}
 	}
 
+	// Now that we have the full config we can set the Groups
+	for _, n := range g.Nodes {
+		pv, _, err := getProviderAndResource(n.Canonical, opt)
+		if err != nil {
+			return nil, nil, err
+		}
+		n.AddGroupIDs(pv.Groups(n.ID, cfg)...)
+	}
+
 	for sourceID, edges := range nodeIDEdges {
 		edgeIDs := make([]string, 0)
 		for _, e := range edges {

generate/state_test.go

@@ -147,6 +147,65 @@ func TestFromState_AWS(t *testing.T) {
 		require.NotNil(t, cfg)
 		assert.Len(t, g.Nodes, 2)
 	})
+	t.Run("SuccessVPC", func(t *testing.T) {
+		src, err := ioutil.ReadFile("./testdata/aws_state_vpc.json")
+		require.NoError(t, err)
+
+		g, cfg, err := generate.FromState(src, generate.Options{Clean: true, Connections: true})
+		require.NoError(t, err)
+		require.NotNil(t, g)
+		require.NotNil(t, cfg)
+
+		eg := &graph.Graph{
+			Nodes: []*graph.Node{
+				&graph.Node{
+					Canonical: "aws_elb.front",
+					GroupIDs:  []string{"vpc-0d96ad69"},
+				},
+				&graph.Node{
+					Canonical: "aws_instance.front",
+					GroupIDs:  []string{"vpc-0d96ad69"},
+				},
+				&graph.Node{
+					Canonical: "aws_db_instance.magento",
+					GroupIDs:  []string{"vpc-0d96ad69"},
+				},
+				&graph.Node{
+					Canonical: "aws_elasticache_cluster.redis",
+					GroupIDs:  []string{"vpc-0d96ad69"},
+				},
+			},
+			Edges: []*graph.Edge{
+				&graph.Edge{
+					Source: "aws_elb.front",
+					Target: "aws_instance.front",
+					Canonicals: []string{
+						"aws_security_group.elb-front",
+						"aws_security_group.front",
+						"aws_security_group_rule.elb_to_front_http",
+					},
+				},
+				&graph.Edge{
+					Source: "aws_instance.front",
+					Target: "aws_db_instance.magento",
+					Canonicals: []string{
+						"aws_security_group.front",
+						"aws_security_group.rds",
+					},
+				},
+				&graph.Edge{
+					Source: "aws_instance.front",
+					Target: "aws_elasticache_cluster.redis",
+					Canonicals: []string{
+						"aws_security_group.front",
+						"aws_security_group.redis",
+					},
+				},
+			},
+		}
+
+		assertEqualGraph(t, eg, g, cfg)
+	})
 }
 
 func TestFromState_OpenStack(t *testing.T) {