fixing normalized json format

tenable · Jul 23, 2020 · 5180043 · 5180043
1 parent cdbd444
commit 5180043
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pkg/iac-providers/terraform/v12/convert.go b/pkg/iac-providers/terraform/v12/convert.go
@@ -1,7 +1,7 @@
 package tfv12
 
 /*
-	Following code has been borrowed from:
+	Following code has been borrowed and modifed from:
 	https://github.com/tmccombs/hcl2json/blob/5c1402dc2b410e362afee45a3cf15dcb08bc1f2c/convert.go
 */
 
@@ -45,10 +45,18 @@ func (c *converter) convertBody(body *hclsyntax.Body) (jsonObj, error) {
 	}
 
 	for _, block := range body.Blocks {
-		err = c.convertBlock(block, out)
+		blockOut := make(jsonObj)
+		err = c.convertBlock(block, blockOut)
 		if err != nil {
 			return nil, err
 		}
+		if _, present := out[block.Type]; !present {
+			out[block.Type] = []jsonObj{blockOut}
+		} else {
+			list := out[block.Type].([]jsonObj)
+			list = append(list, blockOut)
+			out[block.Type] = list
+		}
 	}
 
 	return out, nil

diff --git a/pkg/iac-providers/terraform/v12/resource.go b/pkg/iac-providers/terraform/v12/resource.go
@@ -33,13 +33,14 @@ func CreateResourceConfig(managedResource *hclConfigs.Resource) (resourceConfig
 
 	// create a resource config
 	resourceConfig = output.ResourceConfig{
+		ID:     fmt.Sprintf("%s.%s", managedResource.Type, managedResource.Name),
 		Name:   managedResource.Name,
 		Type:   managedResource.Type,
 		Source: managedResource.DeclRange.Filename,
 		Config: goOut,
 	}
 
 	// successful
-	zap.S().Debugf("successfully created resource config for resource '%s', file: '%s'", resourceConfig.Name, resourceConfig.Source)
+	zap.S().Debugf("created resource config for resource '%s', file: '%s'", resourceConfig.Name, resourceConfig.Source)
 	return resourceConfig, nil
 }