Merge pull request #1572 from snyk/extract_metadata

Extract metadata from enumeration pkg

Author: eliecharra

enumeration/remote/aws/cloudformation_stack_enumerator.go

@@ -1,7 +1,11 @@
 package aws
 
 import (
+	"fmt"
+	"strconv"
+
 	"github.com/aws/aws-sdk-go/service/cloudformation"
+	"github.com/hashicorp/terraform/flatmap"
 	"github.com/snyk/driftctl/enumeration/remote/aws/repository"
 	remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
 	"github.com/snyk/driftctl/enumeration/resource"
@@ -35,7 +39,10 @@ func (e *CloudformationStackEnumerator) Enumerate() ([]*resource.Resource, error
 	for _, stack := range stacks {
 		attrs := map[string]interface{}{}
 		if stack.Parameters != nil && len(stack.Parameters) > 0 {
-			attrs["parameters"] = flattenParameters(stack.Parameters)
+			attrs["parameters.%"] = strconv.FormatInt(int64(len(stack.Parameters)), 10)
+			for k, v := range flattenParameters(stack.Parameters) {
+				attrs[fmt.Sprintf("parameters.%s", k)] = v
+			}
 		}
 
 		results = append(
@@ -51,10 +58,10 @@ func (e *CloudformationStackEnumerator) Enumerate() ([]*resource.Resource, error
 	return results, err
 }
 
-func flattenParameters(parameters []*cloudformation.Parameter) interface{} {
+func flattenParameters(parameters []*cloudformation.Parameter) flatmap.Map {
 	params := make(map[string]interface{}, len(parameters))
 	for _, p := range parameters {
 		params[*p.ParameterKey] = *p.ParameterValue
 	}
-	return params
+	return flatmap.Flatten(params)
 }

enumeration/remote/aws/dynamodb_table_enumerator.go

@@ -37,7 +37,9 @@ func (e *DynamoDBTableEnumerator) Enumerate() ([]*resource.Resource, error) {
 			e.factory.CreateAbstractResource(
 				string(e.SupportedType()),
 				*table,
-				map[string]interface{}{},
+				map[string]interface{}{
+					"table_name": *table,
+				},
 			),
 		)
 	}

enumeration/remote/aws/ec2_network_acl_rule_enumerator.go

@@ -37,9 +37,9 @@ func (e *EC2NetworkACLRuleEnumerator) Enumerate() ([]*resource.Resource, error)
 			attrs := map[string]interface{}{
 				"egress":         *entry.Egress,
 				"network_acl_id": *res.NetworkAclId,
-				"rule_action":    *entry.RuleAction,          // Used in default middleware
-				"rule_number":    float64(*entry.RuleNumber), // Used in default middleware
-				"protocol":       *entry.Protocol,            // Used in default middleware
+				"rule_action":    *entry.RuleAction, // Used in default middleware
+				"rule_number":    *entry.RuleNumber, // Used in default middleware
+				"protocol":       *entry.Protocol,   // Used in default middleware
 			}
 
 			if entry.CidrBlock != nil {
@@ -56,7 +56,7 @@ func (e *EC2NetworkACLRuleEnumerator) Enumerate() ([]*resource.Resource, error)
 					string(e.SupportedType()),
 					aws.CreateNetworkACLRuleID(
 						*res.NetworkAclId,
-						int(float64(*entry.RuleNumber)),
+						*entry.RuleNumber,
 						*entry.Egress,
 						*entry.Protocol,
 					),

enumeration/remote/aws/init.go

@@ -17,13 +17,7 @@ import (
  * Required to use Scanner
  */
 
-func Init(version string, alerter *alerter.Alerter,
-	providerLibrary *terraform.ProviderLibrary,
-	remoteLibrary *common.RemoteLibrary,
-	progress enumeration.ProgressCounter,
-	resourceSchemaRepository *resource.SchemaRepository,
-	factory resource.ResourceFactory,
-	configDir string) error {
+func Init(version string, alerter *alerter.Alerter, providerLibrary *terraform.ProviderLibrary, remoteLibrary *common.RemoteLibrary, progress enumeration.ProgressCounter, factory resource.ResourceFactory, configDir string) error {
 
 	provider, err := NewAWSTerraformProvider(version, progress, configDir)
 	if err != nil {
@@ -248,11 +242,5 @@ func Init(version string, alerter *alerter.Alerter,
 
 	remoteLibrary.AddEnumerator(NewElastiCacheClusterEnumerator(elasticacheRepository, factory))
 
-	err = resourceSchemaRepository.Init(terraform.AWS, provider.Version(), provider.Schema())
-	if err != nil {
-		return err
-	}
-	aws.InitResourcesMetadata(resourceSchemaRepository)
-
 	return nil
 }

enumeration/remote/aws/lambda_function_enumerator.go

@@ -37,7 +37,9 @@ func (e *LambdaFunctionEnumerator) Enumerate() ([]*resource.Resource, error) {
 			e.factory.CreateAbstractResource(
 				string(e.SupportedType()),
 				*function.FunctionName,
-				map[string]interface{}{},
+				map[string]interface{}{
+					"function_name": *function.FunctionName,
+				},
 			),
 		)
 	}

enumeration/remote/aws/s3_bucket_analytic_enumerator.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+
 	"github.com/snyk/driftctl/enumeration/alerter"
 	"github.com/snyk/driftctl/enumeration/remote/alerts"
 	"github.com/snyk/driftctl/enumeration/remote/aws/repository"
@@ -69,7 +70,7 @@ func (e *S3BucketAnalyticEnumerator) Enumerate() ([]*resource.Resource, error) {
 					string(e.SupportedType()),
 					id,
 					map[string]interface{}{
-						"region": region,
+						"alias": region,
 					},
 				),
 			)

enumeration/remote/aws/s3_bucket_enumerator.go

@@ -59,7 +59,7 @@ func (e *S3BucketEnumerator) Enumerate() ([]*resource.Resource, error) {
 				string(e.SupportedType()),
 				*bucket.Name,
 				map[string]interface{}{
-					"region": region,
+					"alias": region,
 				},
 			),
 		)

enumeration/remote/aws/s3_bucket_inventory_enumerator.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+
 	"github.com/snyk/driftctl/enumeration/alerter"
 	"github.com/snyk/driftctl/enumeration/remote/alerts"
 	"github.com/snyk/driftctl/enumeration/remote/aws/repository"
@@ -70,7 +71,7 @@ func (e *S3BucketInventoryEnumerator) Enumerate() ([]*resource.Resource, error)
 					string(e.SupportedType()),
 					id,
 					map[string]interface{}{
-						"region": region,
+						"alias": region,
 					},
 				),
 			)

enumeration/remote/aws/s3_bucket_metrics_enumerator.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+
 	"github.com/snyk/driftctl/enumeration/alerter"
 	"github.com/snyk/driftctl/enumeration/remote/alerts"
 	"github.com/snyk/driftctl/enumeration/remote/aws/repository"
@@ -69,7 +70,7 @@ func (e *S3BucketMetricsEnumerator) Enumerate() ([]*resource.Resource, error) {
 					string(e.SupportedType()),
 					id,
 					map[string]interface{}{
-						"region": region,
+						"alias": region,
 					},
 				),
 			)

enumeration/remote/aws/s3_bucket_notification_enumerator.go

@@ -74,7 +74,7 @@ func (e *S3BucketNotificationEnumerator) Enumerate() ([]*resource.Resource, erro
 				string(e.SupportedType()),
 				*bucket.Name,
 				map[string]interface{}{
-					"region": region,
+					"alias": region,
 				},
 			),
 		)