sundowndev
/
driftctl
mirror of https://github.com/sundowndev/driftctl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1572 from snyk/extract_metadata 

Extract metadata from enumeration pkg
main
Elie 2022-08-01 14:08:14 +02:00 committed by GitHub
parent 1b23b4e2c4 a18af39da8
commit d4cc40009f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
805 changed files with 13966 additions and 3990 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
enumeration/remote/aws/cloudformation_stack_enumerator.go
View File

@ -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)
}

4
enumeration/remote/aws/dynamodb_table_enumerator.go
View File

@ -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,
},
),
)
}

8
enumeration/remote/aws/ec2_network_acl_rule_enumerator.go
View File

@ -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,
),

14
enumeration/remote/aws/init.go
View File

@ -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
}

4
enumeration/remote/aws/lambda_function_enumerator.go
View File

@ -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,
},
),
)
}

3
enumeration/remote/aws/s3_bucket_analytic_enumerator.go
View File

@ -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,
},
),
)

2
enumeration/remote/aws/s3_bucket_enumerator.go
View File

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

3
enumeration/remote/aws/s3_bucket_inventory_enumerator.go
View File

@ -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,
},
),
)

3
enumeration/remote/aws/s3_bucket_metrics_enumerator.go
View File

@ -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,
},
),
)

2
enumeration/remote/aws/s3_bucket_notification_enumerator.go
View File

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

2
enumeration/remote/aws/s3_bucket_policy_enumerator.go
View File

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

4
enumeration/remote/aws/sns_topic_enumerator.go
View File

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

4
enumeration/remote/aws/sns_topic_policy_enumerator.go
View File

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

5
enumeration/remote/aws/sns_topic_subscription_enumerator.go
View File

@ -2,6 +2,7 @@ package aws
import (
"fmt"
"github.com/snyk/driftctl/enumeration/alerter"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
@ -75,7 +76,9 @@ func (e *SNSTopicSubscriptionEnumerator) Enumerate() ([]*resource.Resource, erro
e.factory.CreateAbstractResource(
string(e.SupportedType()),
*subscription.SubscriptionArn,
map[string]interface{}{},
map[string]interface{}{
"SubscriptionId": *subscription.SubscriptionArn,
},
),
)
}

4
enumeration/remote/aws/vpc_security_group_rule_enumerator.go
View File

@ -43,8 +43,8 @@ func (s *securityGroupRule) getAttrs() resource.Attributes {
"type": s.Type,
"security_group_id": s.SecurityGroupId,
"protocol": s.Protocol,
"from_port": s.FromPort,
"to_port": s.ToPort,
"from_port": int(s.FromPort),
"to_port": int(s.ToPort),
"self": s.Self,
"source_security_group_id": s.SourceSecurityGroupId,
"cidr_blocks": toInterfaceSlice(s.CidrBlocks),

91
enumeration/remote/aws_api_gateway_scanner_test.go
View File

@ -18,7 +18,6 @@ import (
"github.com/snyk/driftctl/mocks"
"github.com/snyk/driftctl/test/remote"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -69,10 +68,7 @@ func TestApiGatewayRestApi(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -146,10 +142,7 @@ func TestApiGatewayAccount(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -229,10 +222,7 @@ func TestApiGatewayApiKey(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -330,10 +320,7 @@ func TestApiGatewayAuthorizer(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -427,10 +414,7 @@ func TestApiGatewayStage(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -524,10 +508,7 @@ func TestApiGatewayResource(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -603,10 +584,7 @@ func TestApiGatewayDomainName(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -682,10 +660,7 @@ func TestApiGatewayVpcLink(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -779,10 +754,7 @@ func TestApiGatewayRequestValidator(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -865,10 +837,7 @@ func TestApiGatewayRestApiPolicy(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -962,10 +931,7 @@ func TestApiGatewayBasePathMapping(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1067,10 +1033,7 @@ func TestApiGatewayMethod(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1164,10 +1127,7 @@ func TestApiGatewayModel(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1273,10 +1233,7 @@ func TestApiGatewayMethodResponse(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1370,10 +1327,7 @@ func TestApiGatewayGatewayResponse(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1475,10 +1429,7 @@ func TestApiGatewayMethodSettings(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1580,10 +1531,7 @@ func TestApiGatewayIntegration(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1689,10 +1637,7 @@ func TestApiGatewayIntegrationResponse(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

61
enumeration/remote/aws_apigatewayv2_scanner_test.go
View File

@ -19,7 +19,6 @@ import (
resourceaws "github.com/snyk/driftctl/enumeration/resource/aws"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -66,10 +65,7 @@ func TestApiGatewayV2Api(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -155,10 +151,7 @@ func TestApiGatewayV2Route(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -264,10 +257,7 @@ func TestApiGatewayV2Deployment(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -343,10 +333,7 @@ func TestApiGatewayV2VpcLink(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -445,10 +432,7 @@ func TestApiGatewayV2Authorizer(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -553,10 +537,7 @@ func TestApiGatewayV2Integration(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -664,10 +645,7 @@ func TestApiGatewayV2Model(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -747,10 +725,7 @@ func TestApiGatewayV2Stage(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -868,10 +843,7 @@ func TestApiGatewayV2RouteResponse(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -993,10 +965,7 @@ func TestApiGatewayV2Mapping(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1072,10 +1041,7 @@ func TestApiGatewayV2DomainName(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1193,10 +1159,7 @@ func TestApiGatewayV2IntegrationResponse(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

14
enumeration/remote/aws_applicationautoscaling_scanner_test.go
View File

@ -21,7 +21,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -67,9 +66,7 @@ func TestAppAutoScalingTarget(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -170,9 +167,7 @@ func TestAppAutoScalingPolicy(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -290,10 +285,7 @@ func TestAppAutoScalingScheduledAction(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

5
enumeration/remote/aws_autoscaling_scanner_test.go
View File

@ -19,7 +19,6 @@ import (
resourceaws "github.com/snyk/driftctl/enumeration/resource/aws"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -73,9 +72,7 @@ func TestAutoscaling_LaunchConfiguration(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

5
enumeration/remote/aws_cloudformation_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -66,9 +65,7 @@ func TestCloudformationStack(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

5
enumeration/remote/aws_cloudfront_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -65,9 +64,7 @@ func TestCloudfrontDistribution(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

5
enumeration/remote/aws_dynamodb_scanner_test.go
View File

@ -22,7 +22,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -67,9 +66,7 @@ func TestDynamoDBTable(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

107
enumeration/remote/aws_ec2_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -66,9 +65,7 @@ func TestEC2EbsVolume(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -163,9 +160,7 @@ func TestEC2EbsSnapshot(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -262,9 +257,7 @@ func TestEC2Eip(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -315,7 +308,7 @@ func TestEC2Eip(t *testing.T) {
if err != nil {
return
}
test.TestAgainstGoldenFile(got, resourceaws.AwsEipResourceType, c.dirName, provider, deserializer, shouldUpdate, tt)
test.TestAgainstGoldenFileNoCty(got, resourceaws.AwsEipResourceType, c.dirName, provider, deserializer, shouldUpdate, tt)
alerter.AssertExpectations(tt)
fakeRepo.AssertExpectations(tt)
})
@ -359,9 +352,7 @@ func TestEC2Ami(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -456,9 +447,7 @@ func TestEC2KeyPair(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -555,9 +544,7 @@ func TestEC2EipAssociation(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -662,9 +649,7 @@ func TestEC2Instance(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -759,9 +744,7 @@ func TestEC2InternetGateway(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -873,9 +856,7 @@ func TestVPC(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -984,9 +965,7 @@ func TestDefaultVPC(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1150,9 +1129,7 @@ func TestEC2RouteTableAssociation(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1270,9 +1247,7 @@ func TestEC2Subnet(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1390,9 +1365,7 @@ func TestEC2DefaultSubnet(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1497,9 +1470,7 @@ func TestEC2RouteTable(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1604,9 +1575,7 @@ func TestEC2DefaultRouteTable(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1711,9 +1680,7 @@ func TestVpcSecurityGroup(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1818,9 +1785,7 @@ func TestVpcDefaultSecurityGroup(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1914,9 +1879,7 @@ func TestEC2NatGateway(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -2032,9 +1995,7 @@ func TestEC2NetworkACL(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -2185,10 +2146,7 @@ func TestEC2NetworkACLRule(t *testing.T) {
},
}
version := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", version)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -2205,8 +2163,7 @@ func TestEC2NetworkACLRule(t *testing.T) {
c.mocks(fakeRepo, alerter)
var repo repository.EC2Repository = fakeRepo
providerVersion := version
realProvider, err := terraform2.InitTestAwsProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestAwsProvider(providerLibrary, "3.19.0")
if err != nil {
t.Fatal(err)
}
@ -2299,9 +2256,7 @@ func TestEC2DefaultNetworkACL(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -2468,9 +2423,7 @@ func TestEC2Route(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -2659,9 +2612,7 @@ func TestVpcSecurityGroupRule(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -2758,9 +2709,7 @@ func TestEC2LaunchTemplate(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -2846,9 +2795,7 @@ func TestEC2EbsEncryptionByDefault(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

10
enumeration/remote/aws_ecr_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -68,9 +67,7 @@ func TestECRRepository(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -161,10 +158,7 @@ func TestECRRepositoryPolicy(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

6
enumeration/remote/aws_elasticache_scanner_test.go
View File

@ -19,7 +19,6 @@ import (
resourceaws "github.com/snyk/driftctl/enumeration/resource/aws"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -78,10 +77,7 @@ func TestElastiCacheCluster(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

5
enumeration/remote/aws_elb_scanner_test.go
View File

@ -19,7 +19,6 @@ import (
resourceaws "github.com/snyk/driftctl/enumeration/resource/aws"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -81,9 +80,7 @@ func TestELB_LoadBalancer(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

9
enumeration/remote/aws_elbv2_scanner_test.go
View File

@ -19,7 +19,6 @@ import (
resourceaws "github.com/snyk/driftctl/enumeration/resource/aws"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -82,9 +81,7 @@ func TestELBV2_LoadBalancer(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -210,9 +207,7 @@ func TestELBV2_LoadBalancerListener(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

45
enumeration/remote/aws_iam_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -75,9 +74,8 @@ func TestIamUser(t *testing.T) {
wantErr: nil,
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -214,9 +212,8 @@ func TestIamUserPolicy(t *testing.T) {
wantErr: nil,
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -321,9 +318,7 @@ func TestIamPolicy(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -441,9 +436,7 @@ func TestIamRole(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -624,9 +617,7 @@ func TestIamRolePolicyAttachment(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -762,9 +753,7 @@ func TestIamAccessKey(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -975,9 +964,7 @@ func TestIamUserPolicyAttachment(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -1106,9 +1093,7 @@ func TestIamRolePolicy(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -1207,10 +1192,7 @@ func TestIamGroupPolicy(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1284,10 +1266,7 @@ func TestIamGroup(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

9
enumeration/remote/aws_kms_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -67,9 +66,7 @@ func TestKMSKey(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -165,9 +162,7 @@ func TestKMSAlias(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

11
enumeration/remote/aws_lambda_scanner_test.go
View File

@ -19,7 +19,6 @@ import (
"github.com/pkg/errors"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -87,9 +86,7 @@ func TestScanLambdaFunction(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -140,7 +137,7 @@ func TestScanLambdaFunction(t *testing.T) {
if err != nil {
return
}
test.TestAgainstGoldenFile(got, resourceaws.AwsLambdaFunctionResourceType, c.dirName, provider, deserializer, shouldUpdate, tt)
test.TestAgainstGoldenFileNoCty(got, resourceaws.AwsLambdaFunctionResourceType, c.dirName, provider, deserializer, shouldUpdate, tt)
alerter.AssertExpectations(tt)
fakeRepo.AssertExpectations(tt)
})
@ -203,9 +200,7 @@ func TestScanLambdaEventSourceMapping(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

15
enumeration/remote/aws_rds_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -75,9 +74,7 @@ func TestRDSDBInstance(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -128,7 +125,7 @@ func TestRDSDBInstance(t *testing.T) {
if err != nil {
return
}
test.TestAgainstGoldenFile(got, resourceaws.AwsDbInstanceResourceType, c.dirName, provider, deserializer, shouldUpdate, tt)
test.TestAgainstGoldenFileNoCty(got, resourceaws.AwsDbInstanceResourceType, c.dirName, provider, deserializer, shouldUpdate, tt)
alerter.AssertExpectations(tt)
fakeRepo.AssertExpectations(tt)
})
@ -172,9 +169,7 @@ func TestRDSDBSubnetGroup(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -274,9 +269,7 @@ func TestRDSCluster(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

13
enumeration/remote/aws_route53_scanner_test.go
View File

@ -18,7 +18,6 @@ import (
"github.com/pkg/errors"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -70,9 +69,7 @@ func TestRoute53_HealthCheck(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -205,9 +202,7 @@ func TestRoute53_Zone(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -415,9 +410,7 @@ func TestRoute53_Record(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

30
enumeration/remote/aws_s3_scanner_test.go
View File

@ -21,7 +21,6 @@ import (
"github.com/pkg/errors"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -89,9 +88,7 @@ func TestS3Bucket(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -249,9 +246,7 @@ func TestS3BucketInventory(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -435,9 +430,7 @@ func TestS3BucketNotification(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -596,9 +589,7 @@ func TestS3BucketMetrics(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -754,9 +745,7 @@ func TestS3BucketPolicy(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -880,10 +869,7 @@ func TestS3BucketPublicAccessBlock(t *testing.T) {
},
}
providerVersion := "3.19.0"
schemaRepository := testresource.InitFakeSchemaRepository("aws", providerVersion)
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -1021,9 +1007,7 @@ func TestS3BucketAnalytic(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

13
enumeration/remote/aws_sns_scanner_test.go
View File

@ -19,7 +19,6 @@ import (
"github.com/pkg/errors"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -72,9 +71,7 @@ func TestScanSNSTopic(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -172,9 +169,7 @@ func TestSNSTopicPolicyScan(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -289,9 +284,7 @@ func TestSNSTopicSubscriptionScan(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {

9
enumeration/remote/aws_sqs_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -68,9 +67,7 @@ func TestSQSQueue(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -195,9 +192,7 @@ func TestSQSQueuePolicy(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("aws", "3.19.0")
resourceaws.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {

16
enumeration/remote/azurerm/init.go
View File

@ -13,15 +13,7 @@ import (
"github.com/snyk/driftctl/enumeration/terraform"
)
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 := NewAzureTerraformProvider(version, progress, configDir)
if err != nil {
@ -95,11 +87,5 @@ func Init(
remoteLibrary.AddEnumerator(NewAzurermSSHPublicKeyEnumerator(computeRepo, factory))
remoteLibrary.AddDetailsFetcher(azurerm.AzureSSHPublicKeyResourceType, common.NewGenericDetailsFetcher(azurerm.AzureSSHPublicKeyResourceType, provider, deserializer))
err = resourceSchemaRepository.Init(terraform.AZURE, provider.Version(), provider.Schema())
if err != nil {
return err
}
azurerm.InitResourcesMetadata(resourceSchemaRepository)
return nil
}

11
enumeration/remote/azurerm_compute_scanner_test.go
View File

@ -22,7 +22,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -90,10 +89,7 @@ func TestAzurermCompute_Image(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -171,10 +167,7 @@ func TestAzurermCompute_SSHPublicKey(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

6
enumeration/remote/azurerm_containerregistry_scanner_test.go
View File

@ -17,7 +17,6 @@ import (
resourceazure "github.com/snyk/driftctl/enumeration/resource/azurerm"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -76,10 +75,7 @@ func TestAzurermContainerRegistry(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

46
enumeration/remote/azurerm_network_scanner_test.go
View File

@ -22,7 +22,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -84,10 +83,7 @@ func TestAzurermVirtualNetwork(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -177,10 +173,7 @@ func TestAzurermRouteTables(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -326,10 +319,7 @@ func TestAzurermRoutes(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -459,10 +449,7 @@ func TestAzurermSubnets(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -552,10 +539,7 @@ func TestAzurermFirewalls(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -645,10 +629,7 @@ func TestAzurermPublicIP(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -729,10 +710,7 @@ func TestAzurermSecurityGroups(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -848,10 +826,7 @@ func TestAzurermLoadBalancers(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -950,10 +925,7 @@ func TestAzurermLoadBalancerRules(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

11
enumeration/remote/azurerm_postgresql_scanner_test.go
View File

@ -17,7 +17,6 @@ import (
resourceazure "github.com/snyk/driftctl/enumeration/resource/azurerm"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -82,10 +81,7 @@ func TestAzurermPostgresqlServer(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -208,10 +204,7 @@ func TestAzurermPostgresqlDatabase(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

42
enumeration/remote/azurerm_privatedns_scanner_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraformtest "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -87,10 +87,7 @@ func TestAzurermPrivateDNSZone(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -241,10 +238,7 @@ func TestAzurermPrivateDNSARecord(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -396,10 +390,7 @@ func TestAzurermPrivateDNSAAAARecord(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -539,10 +530,7 @@ func TestAzurermPrivateDNSCNAMERecord(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -693,10 +681,7 @@ func TestAzurermPrivateDNSPTRRecord(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -848,10 +833,7 @@ func TestAzurermPrivateDNSMXRecord(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1002,10 +984,7 @@ func TestAzurermPrivateDNSSRVRecord(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {
@ -1156,10 +1135,7 @@ func TestAzurermPrivateDNSTXTRecord(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

6
enumeration/remote/azurerm_resources_scanner_test.go
View File

@ -17,7 +17,6 @@ import (
resourceazure "github.com/snyk/driftctl/enumeration/resource/azurerm"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -74,10 +73,7 @@ func TestAzurermResourceGroups(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

11
enumeration/remote/azurerm_storage_scanner_test.go
View File

@ -16,7 +16,6 @@ import (
resourceazure "github.com/snyk/driftctl/enumeration/resource/azurerm"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@ -79,10 +78,7 @@ func TestAzurermStorageAccount(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {
@ -224,10 +220,7 @@ func TestAzurermStorageContainer(t *testing.T) {
},
}
providerVersion := "2.71.0"
schemaRepository := testresource.InitFakeSchemaRepository("azurerm", providerVersion)
resourceazure.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range tests {
t.Run(c.test, func(tt *testing.T) {

26
enumeration/remote/common/details_fetcher.go
View File

@ -1,6 +1,9 @@
package common
import (
"strconv"
"github.com/hashicorp/terraform/flatmap"
"github.com/sirupsen/logrus"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
@ -27,8 +30,27 @@ func NewGenericDetailsFetcher(resType resource.ResourceType, provider terraform.
func (f *GenericDetailsFetcher) ReadDetails(res *resource.Resource) (*resource.Resource, error) {
attributes := map[string]string{}
if res.Schema().ResolveReadAttributesFunc != nil {
attributes = res.Schema().ResolveReadAttributesFunc(res)
if res.Attributes() != nil {
for k, v := range *res.Attributes() {
if b, ok := v.(bool); ok {
attributes[k] = strconv.FormatBool(b)
}
if i, ok := v.(int); ok {
attributes[k] = strconv.Itoa(i)
}
if i64, ok := v.(int64); ok {
attributes[k] = strconv.FormatInt(i64, 10)
}
if str, ok := v.(string); ok {
attributes[k] = str
}
if sliceOfInterface, ok := v.([]interface{}); ok {
m := flatmap.Flatten(map[string]interface{}{k: sliceOfInterface})
for k2, v2 := range m {
attributes[k2] = v2
}
}
}
}
ctyVal, err := f.reader.ReadResource(terraform.ReadResourceArgs{
Ty: f.resType,

14
enumeration/remote/github/init.go
View File

@ -15,13 +15,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 := NewGithubTerraformProvider(version, progress, configDir)
if err != nil {
@ -53,11 +47,5 @@ func Init(version string, alerter *alerter.Alerter,
remoteLibrary.AddEnumerator(NewGithubBranchProtectionEnumerator(repository, factory))
remoteLibrary.AddDetailsFetcher(github.GithubBranchProtectionResourceType, common.NewGenericDetailsFetcher(github.GithubBranchProtectionResourceType, provider, deserializer))
err = resourceSchemaRepository.Init(terraform.GITHUB, provider.Version(), provider.Schema())
if err != nil {
return err
}
github.InitResourcesMetadata(resourceSchemaRepository)
return nil
}

5
enumeration/remote/github_branch_protection_scanner_test.go
View File

@ -15,7 +15,6 @@ import (
githubres "github.com/snyk/driftctl/enumeration/resource/github"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
tftest "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -68,9 +67,7 @@ func TestScanGithubBranchProtection(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("github", "4.4.0")
githubres.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {

5
enumeration/remote/github_membership_scanner_test.go
View File

@ -15,7 +15,6 @@ import (
githubres "github.com/snyk/driftctl/enumeration/resource/github"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
tftest "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -64,9 +63,7 @@ func TestScanGithubMembership(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("github", "4.4.0")
githubres.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {

5
enumeration/remote/github_repository_scanner_test.go
View File

@ -15,7 +15,6 @@ import (
githubres "github.com/snyk/driftctl/enumeration/resource/github"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
tftest "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -64,9 +63,7 @@ func TestScanGithubRepository(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("github", "4.4.0")
githubres.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

5
enumeration/remote/github_team_membership_scanner_test.go
View File

@ -15,7 +15,6 @@ import (
githubres "github.com/snyk/driftctl/enumeration/resource/github"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
tftest "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -64,9 +63,7 @@ func TestScanGithubTeamMembership(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("github", "4.4.0")
githubres.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {

5
enumeration/remote/github_team_scanner_test.go
View File

@ -15,7 +15,6 @@ import (
githubres "github.com/snyk/driftctl/enumeration/resource/github"
"github.com/snyk/driftctl/mocks"
testresource "github.com/snyk/driftctl/test/resource"
tftest "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/mock"
@ -65,9 +64,7 @@ func TestScanGithubTeam(t *testing.T) {
},
}
schemaRepository := testresource.InitFakeSchemaRepository("github", "4.4.0")
githubres.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range tests {

9
enumeration/remote/google/google_compute_instance_group_enumerator.go
View File

@ -1,9 +1,10 @@
package google
import (
"strings"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/remote/google/repository"
"strings"
"github.com/sirupsen/logrus"
"github.com/snyk/driftctl/enumeration/resource"
@ -46,9 +47,9 @@ func (e *GoogleComputeInstanceGroupEnumerator) Enumerate() ([]*resource.Resource
string(e.SupportedType()),
trimResourceName(res.GetName()),
map[string]interface{}{
"name": res.GetDisplayName(),
"project": project,
"location": res.GetLocation(),
"name": res.GetDisplayName(),
"project": project,
"zone": res.GetLocation(),
},
),
)

6
enumeration/remote/google/google_compute_router_enumerator.go
View File

@ -37,7 +37,11 @@ func (e *GoogleComputeRouterEnumerator) Enumerate() ([]*resource.Resource, error
e.factory.CreateAbstractResource(
string(e.SupportedType()),
trimResourceName(res.GetName()),
map[string]interface{}{},
map[string]interface{}{
"name": res.GetDisplayName(),
"region": res.GetLocation(),
"project": res.GetProject(),
},
),
)
}

4
enumeration/remote/google/google_storage_bucket_enumerator.go
View File

@ -38,7 +38,9 @@ func (e *GoogleStorageBucketEnumerator) Enumerate() ([]*resource.Resource, error
e.factory.CreateAbstractResource(
string(e.SupportedType()),
res.DisplayName,
map[string]interface{}{},
map[string]interface{}{
"name": res.DisplayName,
},
),
)
}

14
enumeration/remote/google/init.go
View File

@ -18,13 +18,7 @@ import (
"google.golang.org/api/cloudresourcemanager/v1"
)
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 := NewGCPTerraformProvider(version, progress, configDir)
if err != nil {
@ -111,11 +105,5 @@ func Init(version string, alerter *alerter.Alerter,
remoteLibrary.AddEnumerator(NewGoogleComputeInstanceGroupManagerEnumerator(assetRepository, factory))
remoteLibrary.AddEnumerator(NewGoogleComputeGlobalForwardingRuleEnumerator(assetRepository, factory))
err = resourceSchemaRepository.Init(terraform.GOOGLE, provider.Version(), provider.Schema())
if err != nil {
return err
}
google.InitResourcesMetadata(resourceSchemaRepository)
return nil
}

17
enumeration/remote/google_bigquery_scanner_test.go
View File

@ -13,11 +13,10 @@ import (
"github.com/snyk/driftctl/enumeration/terraform"
"github.com/snyk/driftctl/enumeration/resource"
googleresource "github.com/snyk/driftctl/enumeration/resource/google"
"github.com/snyk/driftctl/mocks"
testgoogle "github.com/snyk/driftctl/test/google"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -80,10 +79,7 @@ func TestGoogleBigqueryDataset(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -102,7 +98,7 @@ func TestGoogleBigqueryDataset(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -183,10 +179,7 @@ func TestGoogleBigqueryTable(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -205,7 +198,7 @@ func TestGoogleBigqueryTable(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}

17
enumeration/remote/google_bigtable_scanner_test.go
View File

@ -13,11 +13,10 @@ import (
"github.com/snyk/driftctl/enumeration/terraform"
"github.com/snyk/driftctl/enumeration/resource"
googleresource "github.com/snyk/driftctl/enumeration/resource/google"
"github.com/snyk/driftctl/mocks"
testgoogle "github.com/snyk/driftctl/test/google"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -117,10 +116,7 @@ func TestGoogleBigtableInstance(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -139,7 +135,7 @@ func TestGoogleBigtableInstance(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -243,10 +239,7 @@ func TestGoogleBigtableTable(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -265,7 +258,7 @@ func TestGoogleBigtableTable(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}

10
enumeration/remote/google_cloudfunctions_scanner_test.go
View File

@ -13,11 +13,10 @@ import (
"github.com/snyk/driftctl/enumeration/terraform"
"github.com/snyk/driftctl/enumeration/resource"
googleresource "github.com/snyk/driftctl/enumeration/resource/google"
"github.com/snyk/driftctl/mocks"
testgoogle "github.com/snyk/driftctl/test/google"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -104,10 +103,7 @@ func TestGoogleCloudFunctionsFunction(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -126,7 +122,7 @@ func TestGoogleCloudFunctionsFunction(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}

9
enumeration/remote/google_cloudrun_scanner_test.go
View File

@ -17,7 +17,7 @@ import (
"github.com/snyk/driftctl/mocks"
testgoogle "github.com/snyk/driftctl/test/google"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -99,10 +99,7 @@ func TestGoogleCloudRunService(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -121,7 +118,7 @@ func TestGoogleCloudRunService(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}

110
enumeration/remote/google_compute_scanner_test.go
View File

@ -3,6 +3,8 @@ package remote
import (
"testing"
resource2 "github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/enumeration"
"github.com/snyk/driftctl/enumeration/remote/alerts"
"github.com/snyk/driftctl/enumeration/remote/cache"
@ -19,7 +21,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testgoogle "github.com/snyk/driftctl/test/google"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -89,11 +90,8 @@ func TestGoogleComputeFirewall(t *testing.T) {
},
}
providerVersion := "3.78.0"
resType := resource.ResourceType(googleresource.GoogleComputeFirewallResourceType)
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -115,7 +113,7 @@ func TestGoogleComputeFirewall(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -227,10 +225,7 @@ func TestGoogleComputeRouter(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -249,7 +244,7 @@ func TestGoogleComputeRouter(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -331,10 +326,7 @@ func TestGoogleComputeInstance(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -353,7 +345,7 @@ func TestGoogleComputeInstance(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -440,11 +432,8 @@ func TestGoogleComputeNetwork(t *testing.T) {
},
}
providerVersion := "3.78.0"
resType := resource.ResourceType(googleresource.GoogleComputeNetworkResourceType)
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -466,7 +455,7 @@ func TestGoogleComputeNetwork(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -562,11 +551,8 @@ func TestGoogleComputeInstanceGroup(t *testing.T) {
},
}
providerVersion := "3.78.0"
resType := resource.ResourceType(googleresource.GoogleComputeInstanceGroupResourceType)
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
resType := resource2.ResourceType(googleresource.GoogleComputeInstanceGroupResourceType)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -588,7 +574,7 @@ func TestGoogleComputeInstanceGroup(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -698,10 +684,7 @@ func TestGoogleComputeAddress(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -720,7 +703,7 @@ func TestGoogleComputeAddress(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -824,10 +807,7 @@ func TestGoogleComputeGlobalAddress(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -846,7 +826,7 @@ func TestGoogleComputeGlobalAddress(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -933,11 +913,8 @@ func TestGoogleComputeSubnetwork(t *testing.T) {
},
}
providerVersion := "3.78.0"
resType := resource.ResourceType(googleresource.GoogleComputeSubnetworkResourceType)
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -959,7 +936,7 @@ func TestGoogleComputeSubnetwork(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -1057,10 +1034,7 @@ func TestGoogleComputeDisk(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -1079,7 +1053,7 @@ func TestGoogleComputeDisk(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -1167,10 +1141,7 @@ func TestGoogleComputeImage(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -1189,7 +1160,7 @@ func TestGoogleComputeImage(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -1277,10 +1248,7 @@ func TestGoogleComputeHealthCheck(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository(terraform.GOOGLE, providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -1299,7 +1267,7 @@ func TestGoogleComputeHealthCheck(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -1387,10 +1355,7 @@ func TestGoogleComputeNodeGroup(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository(terraform.GOOGLE, providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -1409,7 +1374,7 @@ func TestGoogleComputeNodeGroup(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -1496,10 +1461,7 @@ func TestGoogleComputeForwardingRule(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository(terraform.GOOGLE, providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -1518,7 +1480,7 @@ func TestGoogleComputeForwardingRule(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -1606,10 +1568,7 @@ func TestGoogleComputeInstanceGroupManager(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository(terraform.GOOGLE, providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -1628,7 +1587,7 @@ func TestGoogleComputeInstanceGroupManager(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -1715,10 +1674,7 @@ func TestGoogleComputeGlobalForwardingRule(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository(terraform.GOOGLE, providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -1737,7 +1693,7 @@ func TestGoogleComputeGlobalForwardingRule(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}

9
enumeration/remote/google_network_scanner_test.go
View File

@ -17,7 +17,7 @@ import (
"github.com/snyk/driftctl/mocks"
testgoogle "github.com/snyk/driftctl/test/google"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -105,10 +105,7 @@ func TestGoogleDNSNanagedZone(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -127,7 +124,7 @@ func TestGoogleDNSNanagedZone(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}

10
enumeration/remote/google_project_scanner_test.go
View File

@ -18,7 +18,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -87,11 +86,8 @@ func TestGoogleProjectIAMMember(t *testing.T) {
},
}
providerVersion := "3.78.0"
resType := resource.ResourceType(googleresource.GoogleProjectIamMemberResourceType)
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -109,7 +105,7 @@ func TestGoogleProjectIAMMember(t *testing.T) {
c.setupAlerterMock(alerter)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -134,7 +130,7 @@ func TestGoogleProjectIAMMember(t *testing.T) {
}
alerter.AssertExpectations(tt)
testFilter.AssertExpectations(tt)
test.TestAgainstGoldenFile(got, resType.String(), c.dirName, provider, deserializer, shouldUpdate, tt)
test.TestAgainstGoldenFileNoCty(got, resType.String(), c.dirName, provider, deserializer, shouldUpdate, tt)
})
}
}

10
enumeration/remote/google_sql_scanner_test.go
View File

@ -13,11 +13,10 @@ import (
"github.com/snyk/driftctl/enumeration/terraform"
"github.com/snyk/driftctl/enumeration/resource"
googleresource "github.com/snyk/driftctl/enumeration/resource/google"
"github.com/snyk/driftctl/mocks"
testgoogle "github.com/snyk/driftctl/test/google"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -102,10 +101,7 @@ func TestGoogleSQLDatabaseInstance(t *testing.T) {
},
}
providerVersion := "3.78.0"
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
for _, c := range cases {
t.Run(c.test, func(tt *testing.T) {
@ -124,7 +120,7 @@ func TestGoogleSQLDatabaseInstance(t *testing.T) {
tt.Fatal(err)
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}

17
enumeration/remote/google_storage_scanner_test.go
View File

@ -23,7 +23,6 @@ import (
"github.com/snyk/driftctl/test"
"github.com/snyk/driftctl/test/goldenfile"
testgoogle "github.com/snyk/driftctl/test/google"
testresource "github.com/snyk/driftctl/test/resource"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
@ -89,11 +88,8 @@ func TestGoogleStorageBucket(t *testing.T) {
},
}
providerVersion := "3.78.0"
resType := resource.ResourceType(googleresource.GoogleStorageBucketResourceType)
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -119,7 +115,7 @@ func TestGoogleStorageBucket(t *testing.T) {
}
}
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -263,11 +259,8 @@ func TestGoogleStorageBucketIAMMember(t *testing.T) {
},
}
providerVersion := "3.78.0"
resType := resource.ResourceType(googleresource.GoogleStorageBucketIamMemberResourceType)
schemaRepository := testresource.InitFakeSchemaRepository("google", providerVersion)
googleresource.InitResourcesMetadata(schemaRepository)
factory := terraform.NewTerraformResourceFactory(schemaRepository)
factory := terraform.NewTerraformResourceFactory()
deserializer := resource.NewDeserializer(factory)
for _, c := range cases {
@ -305,7 +298,7 @@ func TestGoogleStorageBucketIAMMember(t *testing.T) {
}
var assetRepository repository.AssetRepository = assetRepo
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, providerVersion)
realProvider, err := terraform2.InitTestGoogleProvider(providerLibrary, "3.78.0")
if err != nil {
tt.Fatal(err)
}
@ -325,7 +318,7 @@ func TestGoogleStorageBucketIAMMember(t *testing.T) {
}
alerter.AssertExpectations(tt)
testFilter.AssertExpectations(tt)
test.TestAgainstGoldenFile(got, resType.String(), c.dirName, provider, deserializer, shouldUpdate, tt)
test.TestAgainstGoldenFileNoCty(got, resType.String(), c.dirName, provider, deserializer, shouldUpdate, tt)
})
}
}

16
enumeration/remote/remote.go
View File

@ -29,22 +29,16 @@ func IsSupported(remote string) bool {
return false
}
func Activate(remote, version string, alerter *alerter.Alerter,
providerLibrary *terraform.ProviderLibrary,
remoteLibrary *common.RemoteLibrary,
progress enumeration.ProgressCounter,
resourceSchemaRepository *resource.SchemaRepository,
factory resource.ResourceFactory,
configDir string) error {
func Activate(remote, version string, alerter *alerter.Alerter, providerLibrary *terraform.ProviderLibrary, remoteLibrary *common.RemoteLibrary, progress enumeration.ProgressCounter, factory resource.ResourceFactory, configDir string) error {
switch remote {
case common.RemoteAWSTerraform:
return aws.Init(version, alerter, providerLibrary, remoteLibrary, progress, resourceSchemaRepository, factory, configDir)
return aws.Init(version, alerter, providerLibrary, remoteLibrary, progress, factory, configDir)
case common.RemoteGithubTerraform:
return github.Init(version, alerter, providerLibrary, remoteLibrary, progress, resourceSchemaRepository, factory, configDir)
return github.Init(version, alerter, providerLibrary, remoteLibrary, progress, factory, configDir)
case common.RemoteGoogleTerraform:
return google.Init(version, alerter, providerLibrary, remoteLibrary, progress, resourceSchemaRepository, factory, configDir)
return google.Init(version, alerter, providerLibrary, remoteLibrary, progress, factory, configDir)
case common.RemoteAzureTerraform:
return azurerm.Init(version, alerter, providerLibrary, remoteLibrary, progress, resourceSchemaRepository, factory, configDir)
return azurerm.Init(version, alerter, providerLibrary, remoteLibrary, progress, factory, configDir)
default:
return errors.Errorf("unsupported remote '%s'", remote)

4
enumeration/remote/test/aws_appautoscaling_policy_single/results.golden.json
View File

@ -7,10 +7,10 @@
"resource_id": "table/GameScores",
"scalable_dimension": "dynamodb:table:ReadCapacityUnits",
"service_namespace": "dynamodb",
"step_scaling_policy_configuration": null,
"step_scaling_policy_configuration": [],
"target_tracking_scaling_policy_configuration": [
{
"customized_metric_specification": null,
"customized_metric_specification": [],
"disable_scale_in": false,
"predefined_metric_specification": [
{

10
enumeration/remote/test/aws_cloudformation_stack_multiple/results.golden.json
View File

@ -7,13 +7,13 @@
"name": "foo-stack",
"notification_arns": null,
"on_failure": null,
"outputs": null,
"outputs": {},
"parameters": {
"VPCCidr": "10.0.0.0/16"
},
"policy_body": null,
"policy_url": null,
"tags": null,
"tags": {},
"template_body": "{\"Parameters\":{\"VPCCidr\":{\"Default\":\"10.0.0.0/16\",\"Description\":\"Enter the CIDR block for the VPC. Default is 10.0.0.0/16.\",\"Type\":\"String\"}},\"Resources\":{\"myVpc\":{\"Properties\":{\"CidrBlock\":{\"Ref\":\"VPCCidr\"},\"Tags\":[{\"Key\":\"Name\",\"Value\":\"Primary_CF_VPC\"}]},\"Type\":\"AWS::EC2::VPC\"}}}",
"template_url": null,
"timeout_in_minutes": null,
@ -29,11 +29,11 @@
"name": "bar-stack",
"notification_arns": null,
"on_failure": null,
"outputs": null,
"parameters": null,
"outputs": {},
"parameters": {},
"policy_body": null,
"policy_url": null,
"tags": null,
"tags": {},
"template_body": "Resources:\n myUser:\n Type: AWS::IAM::User\n Properties:\n UserName: \"bar_cfn\"\n",
"template_url": null,
"timeout_in_minutes": null,

0
enumeration/remote/test/aws_ebs_encryption_by_default_list/aws_ebs_encryption_by_default-ebs_encryption_default.res.golden.json → enumeration/remote/test/aws_ebs_encryption_by_default_list/aws_ebs_encryption_by_default-ebs_encryption_default-false.res.golden.json
View File

2
enumeration/remote/test/aws_ec2_default_network_acl/results.golden.json
View File

@ -38,7 +38,7 @@
"subnet-ad17e3cb",
"subnet-afa656f0"
],
"tags": null,
"tags": {},
"vpc_id": "vpc-41d1d13b"
}
]

0
enumeration/remote/test/aws_ec2_eip_association_single/aws_eip_association-eipassoc-0e9a7356e30f0c3d1.res.golden.json → enumeration/remote/test/aws_ec2_eip_association_single/aws_eip_association-eipassoc-0e9a7356e30f0c3d1-eipalloc-017d5267e4dda73f1.res.golden.json
View File

49
enumeration/remote/test/aws_ec2_eip_multiple/results.golden.json
View File

@ -1 +1,48 @@
[{"allocation_id":null,"associate_with_private_ip":null,"association_id":"","customer_owned_ip":"","customer_owned_ipv4_pool":"","domain":"vpc","id":"eipalloc-0cf714dc097c992cc","instance":"","network_interface":"","private_dns":null,"private_ip":"","public_dns":"ec2-52-47-35-117.eu-west-3.compute.amazonaws.com","public_ip":"52.47.35.117","public_ipv4_pool":"amazon","tags":{},"timeouts":{"delete":null,"read":null,"update":null},"vpc":true},{"allocation_id":null,"associate_with_private_ip":null,"association_id":"eipassoc-0e9a7356e30f0c3d1","customer_owned_ip":"","customer_owned_ipv4_pool":"","domain":"vpc","id":"eipalloc-017d5267e4dda73f1","instance":"i-0d3650a23f4e45dc0","network_interface":"eni-0f35ce5577bbab251","private_dns":"ip-172-31-22-12.eu-west-3.compute.internal","private_ip":"172.31.22.12","public_dns":"ec2-35-180-239-105.eu-west-3.compute.amazonaws.com","public_ip":"35.180.239.105","public_ipv4_pool":"amazon","tags":{},"timeouts":{"delete":null,"read":null,"update":null},"vpc":true}]
[
{
"allocation_id": null,
"associate_with_private_ip": null,
"association_id": "",
"customer_owned_ip": "",
"customer_owned_ipv4_pool": "",
"domain": "vpc",
"id": "eipalloc-0cf714dc097c992cc",
"instance": "",
"network_interface": "",
"private_dns": null,
"private_ip": "",
"public_dns": "ec2-52-47-35-117.eu-west-3.compute.amazonaws.com",
"public_ip": "52.47.35.117",
"public_ipv4_pool": "amazon",
"tags": {},
"timeouts": {
"delete": null,
"read": null,
"update": null
},
"vpc": true
},
{
"allocation_id": null,
"associate_with_private_ip": null,
"association_id": "eipassoc-0e9a7356e30f0c3d1",
"customer_owned_ip": "",
"customer_owned_ipv4_pool": "",
"domain": "vpc",
"id": "eipalloc-017d5267e4dda73f1",
"instance": "i-0d3650a23f4e45dc0",
"network_interface": "eni-0f35ce5577bbab251",
"private_dns": "ip-172-31-22-12.eu-west-3.compute.internal",
"private_ip": "172.31.22.12",
"public_dns": "ec2-35-180-239-105.eu-west-3.compute.amazonaws.com",
"public_ip": "35.180.239.105",
"public_ipv4_pool": "amazon",
"tags": {},
"timeouts": {
"delete": null,
"read": null,
"update": null
},
"vpc": true
}
]

4
enumeration/remote/test/aws_ec2_network_acl/results.golden.json
View File

@ -29,7 +29,7 @@
}
],
"owner_id": "929327065333",
"subnet_ids": null,
"subnet_ids": [],
"tags": {
"Name": "test"
},
@ -65,7 +65,7 @@
}
],
"owner_id": "929327065333",
"subnet_ids": null,
"subnet_ids": [],
"tags": {
"Name": "test2"
},

0
enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-2289824980-false-acl-0ad6d657494d17ee2-200.res.golden.json → enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-2289824980-false-___0-acl-0ad6d657494d17ee2-6-allow-200.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-246660311-true-acl-0ad6d657494d17ee2-100.res.golden.json → enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-246660311-172.16.1.0_0-true-acl-0ad6d657494d17ee2-17-allow-100.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-4268384215-true-acl-0de54ef59074b622e-100.res.golden.json → enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-4268384215-172.16.1.0_0-true-acl-0de54ef59074b622e-17-allow-100.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-4293207588-false-acl-0ad6d657494d17ee2-100.res.golden.json → enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-4293207588-0.0.0.0_0-false-acl-0ad6d657494d17ee2-6-deny-100.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-515082162-false-acl-0de54ef59074b622e-100.res.golden.json → enumeration/remote/test/aws_ec2_network_acl_rule/aws_network_acl_rule-nacl-515082162-0.0.0.0_0-false-acl-0de54ef59074b622e-17-deny-100.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-179966490-10.0.0.0_16-.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-179966490-10.0.0.0_16-CreateRouteTable-.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-0169b0937fd963ddc1080289494-0.0.0.0_0-rtb-0169b0937fd963ddc.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-0169b0937fd963ddc1080289494-0.0.0.0_0-igw-030e74f73bd67f21b-CreateRoute-rtb-0169b0937fd963ddc.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-0169b0937fd963ddc179966490-10.0.0.0_16-rtb-0169b0937fd963ddc.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-0169b0937fd963ddc179966490-10.0.0.0_16-CreateRouteTable-rtb-0169b0937fd963ddc.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-0169b0937fd963ddc2750132062-___0-rtb-0169b0937fd963ddc.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-0169b0937fd963ddc2750132062-___0-igw-030e74f73bd67f21b-CreateRoute-rtb-0169b0937fd963ddc.res.golden.json Executable file → Normal file
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-02780c485f0be93c51325105504-10.1.2.0_24-rtb-02780c485f0be93c5.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-02780c485f0be93c51325105504-10.1.2.0_24-igw-030e74f73bd67f21b-CreateRoute-rtb-02780c485f0be93c5.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-02780c485f0be93c5179966490-10.0.0.0_16-rtb-02780c485f0be93c5.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-02780c485f0be93c5179966490-10.0.0.0_16-CreateRouteTable-rtb-02780c485f0be93c5.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-02780c485f0be93c53362780110-10.1.1.0_24-rtb-02780c485f0be93c5.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-02780c485f0be93c53362780110-10.1.1.0_24-igw-030e74f73bd67f21b-CreateRoute-rtb-02780c485f0be93c5.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-096bdfb69309c54c3179966490-10.0.0.0_16-rtb-096bdfb69309c54c3.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-096bdfb69309c54c3179966490-10.0.0.0_16-CreateRouteTable-rtb-096bdfb69309c54c3.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-096bdfb69309c54c3243279527-1.1.1.1_32-rtb-096bdfb69309c54c3.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-096bdfb69309c54c3243279527-1.1.1.1_32-igw-030e74f73bd67f21b-CreateRoute-rtb-096bdfb69309c54c3.res.golden.json
View File

0
enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-096bdfb69309c54c32750132062-___0-rtb-096bdfb69309c54c3.res.golden.json → enumeration/remote/test/aws_ec2_route_multiple/aws_route-r-rtb-096bdfb69309c54c32750132062-___0-igw-030e74f73bd67f21b-CreateRoute-rtb-096bdfb69309c54c3.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_0.res.golden.json → enumeration/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_0-_.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_1.res.golden.json → enumeration/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_1-_.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_2.res.golden.json → enumeration/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_2-_.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-0.res.golden.json → enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-0-test_role_0.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-1.res.golden.json → enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-1-test_role_0.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-2.res.golden.json → enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-2-test_role_0.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-0.res.golden.json → enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-0-test_role_1.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-1.res.golden.json → enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-1-test_role_1.res.golden.json
View File

0
enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-2.res.golden.json → enumeration/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-2-test_role_1.res.golden.json
View File

62
enumeration/remote/test/aws_launch_template_multiple/results.golden.json
View File

@ -1,40 +1,40 @@
[
{
"arn": "arn:aws:ec2:us-east-1:533948124879:launch-template/lt-00b2d18c6cee7fe23",
"block_device_mappings": null,
"capacity_reservation_specification": null,
"cpu_options": null,
"credit_specification": null,
"block_device_mappings": [],
"capacity_reservation_specification": [],
"cpu_options": [],
"credit_specification": [],
"default_version": 1,
"description": "",
"disable_api_termination": false,
"ebs_optimized": "",
"elastic_gpu_specifications": null,
"elastic_inference_accelerator": null,
"hibernation_options": null,
"iam_instance_profile": null,
"elastic_gpu_specifications": [],
"elastic_inference_accelerator": [],
"hibernation_options": [],
"iam_instance_profile": [],
"id": "lt-00b2d18c6cee7fe23",
"image_id": "ami-000b3a073fc20e415",
"instance_initiated_shutdown_behavior": "",
"instance_market_options": null,
"instance_market_options": [],
"instance_type": "t3.micro",
"kernel_id": "",
"key_name": "",
"latest_version": 1,
"license_specification": null,
"metadata_options": null,
"monitoring": null,
"license_specification": [],
"metadata_options": [],
"monitoring": [],
"name": "test-template-2",
"name_prefix": null,
"network_interfaces": null,
"placement": null,
"network_interfaces": [],
"placement": [],
"ram_disk_id": "",
"security_group_names": null,
"tag_specifications": null,
"tags": null,
"security_group_names": [],
"tag_specifications": [],
"tags": {},
"update_default_version": null,
"user_data": "",
"vpc_security_group_ids": null
"vpc_security_group_ids": []
},
{
"arn": "arn:aws:ec2:us-east-1:533948124879:launch-template/lt-0ed993d09ce6afc67",
@ -59,7 +59,7 @@
"capacity_reservation_specification": [
{
"capacity_reservation_preference": "open",
"capacity_reservation_target": null
"capacity_reservation_target": []
}
],
"cpu_options": [
@ -73,19 +73,19 @@
"description": "",
"disable_api_termination": true,
"ebs_optimized": "true",
"elastic_gpu_specifications": null,
"elastic_inference_accelerator": null,
"hibernation_options": null,
"iam_instance_profile": null,
"elastic_gpu_specifications": [],
"elastic_inference_accelerator": [],
"hibernation_options": [],
"iam_instance_profile": [],
"id": "lt-0ed993d09ce6afc67",
"image_id": "ami-000b3a073fc20e415",
"instance_initiated_shutdown_behavior": "terminate",
"instance_market_options": null,
"instance_market_options": [],
"instance_type": "",
"kernel_id": "",
"key_name": "",
"latest_version": 1,
"license_specification": null,
"license_specification": [],
"metadata_options": [
{
"http_endpoint": "enabled",
@ -107,12 +107,12 @@
"description": "",
"device_index": 0,
"ipv4_address_count": 0,
"ipv4_addresses": null,
"ipv4_addresses": [],
"ipv6_address_count": 0,
"ipv6_addresses": null,
"ipv6_addresses": [],
"network_interface_id": "",
"private_ip_address": "",
"security_groups": null,
"security_groups": [],
"subnet_id": ""
}
],
@ -128,7 +128,7 @@
}
],
"ram_disk_id": "",
"security_group_names": null,
"security_group_names": [],
"tag_specifications": [
{
"resource_type": "instance",
@ -137,9 +137,9 @@
}
}
],
"tags": null,
"tags": {},
"update_default_version": null,
"user_data": "",
"vpc_security_group_ids": null
"vpc_security_group_ids": []
}
]

16
enumeration/remote/test/aws_rds_clusters_results/results.golden.json
View File

@ -22,7 +22,7 @@
"db_subnet_group_name": "default",
"deletion_protection": false,
"enable_http_endpoint": false,
"enabled_cloudwatch_logs_exports": null,
"enabled_cloudwatch_logs_exports": [],
"endpoint": "aurora-cluster-demo.cluster-cd539r6quiux.us-east-1.rds.amazonaws.com",
"engine": "aurora-postgresql",
"engine_mode": "provisioned",
@ -31,7 +31,7 @@
"global_cluster_identifier": "",
"hosted_zone_id": "Z2R2ITUGPM61AM",
"iam_database_authentication_enabled": false,
"iam_roles": null,
"iam_roles": [],
"id": "aurora-cluster-demo",
"kms_key_id": "",
"master_password": null,
@ -43,12 +43,12 @@
"replication_source_identifier": "",
"restore_to_point_in_time": null,
"s3_import": null,
"scaling_configuration": null,
"scaling_configuration": [],
"skip_final_snapshot": null,
"snapshot_identifier": null,
"source_region": null,
"storage_encrypted": false,
"tags": null,
"tags": {},
"timeouts": {},
"vpc_security_group_ids": [
"sg-49e38646"
@ -77,7 +77,7 @@
"db_subnet_group_name": "default",
"deletion_protection": false,
"enable_http_endpoint": false,
"enabled_cloudwatch_logs_exports": null,
"enabled_cloudwatch_logs_exports": [],
"endpoint": "aurora-cluster-demo.cluster-cd539r6quiux.us-east-1.rds.amazonaws.com",
"engine": "aurora-postgresql",
"engine_mode": "provisioned",
@ -86,7 +86,7 @@
"global_cluster_identifier": "",
"hosted_zone_id": "Z2R2ITUGPM61AM",
"iam_database_authentication_enabled": false,
"iam_roles": null,
"iam_roles": [],
"id": "aurora-cluster-demo-2",
"kms_key_id": "",
"master_password": null,
@ -98,12 +98,12 @@
"replication_source_identifier": "",
"restore_to_point_in_time": null,
"s3_import": null,
"scaling_configuration": null,
"scaling_configuration": [],
"skip_final_snapshot": null,
"snapshot_identifier": null,
"source_region": null,
"storage_encrypted": false,
"tags": null,
"tags": {},
"timeouts": {},
"vpc_security_group_ids": [
"sg-49e38646"

6
enumeration/remote/test/aws_rds_db_instance_multiple/results.golden.json
View File

@ -17,7 +17,7 @@
"deletion_protection": true,
"domain": "",
"domain_iam_role_name": "",
"enabled_cloudwatch_logs_exports": null,
"enabled_cloudwatch_logs_exports": [],
"endpoint": "database-1.c4j6qwp34sb1.eu-west-3.rds.amazonaws.com:5432",
"engine": "postgres",
"engine_version": "12.3",
@ -49,7 +49,7 @@
"replicate_source_db": "",
"resource_id": "db-HNCUL5PDUDVYNCZNSR546B2DVI",
"s3_import": null,
"security_group_names": null,
"security_group_names": [],
"skip_final_snapshot": null,
"snapshot_identifier": null,
"status": "modifying",
@ -120,7 +120,7 @@
"replicate_source_db": "",
"resource_id": "db-C22NACLA2B45VA3WLVG6TKEAJE",
"s3_import": null,
"security_group_names": null,
"security_group_names": [],
"skip_final_snapshot": null,
"snapshot_identifier": null,
"status": "available",

2
enumeration/remote/test/aws_rds_db_instance_single/results.golden.json
View File

@ -52,7 +52,7 @@
"replicate_source_db": "",
"resource_id": "db-C22NACLA2B45VA3WLVG6TKEAJE",
"s3_import": null,
"security_group_names": null,
"security_group_names": [],
"skip_final_snapshot": null,
"snapshot_identifier": null,
"status": "available",

0
enumeration/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_A.res.golden.json → enumeration/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_A-A.res.golden.json
View File

Some files were not shown because too many files have changed in this diff Show More