diff --git a/pkg/iac/terraform/state/terraform_state_reader_test.go b/pkg/iac/terraform/state/terraform_state_reader_test.go index fda6e435b..c07dcfdd7 100644 --- a/pkg/iac/terraform/state/terraform_state_reader_test.go +++ b/pkg/iac/terraform/state/terraform_state_reader_test.go @@ -102,75 +102,75 @@ func TestTerraformStateReader_AWS_Resources(t *testing.T) { }{ {name: "IAM user module", dirName: "module.iam_iam-user", wantErr: false}, {name: "Data source", dirName: "data_source", wantErr: false}, - {name: "Route 53 zone", dirName: "route53_zone", wantErr: false}, - {name: "Route 53 record - single record", dirName: "route53_record", wantErr: false}, - {name: "Route 53 record - multiples zones, multiples records", dirName: "route53_record_multiples", wantErr: false}, - {name: "Route 53 record - empty records", dirName: "route53_record_null_records", wantErr: false}, - {name: "s3 full", dirName: "s3_full", wantErr: false}, - {name: "RDS DB instance", dirName: "db_instance", wantErr: false}, - {name: "RDS DB Subnet group", dirName: "db_subnet_group", wantErr: false}, - {name: "Lambda function", dirName: "lambda_function", wantErr: false}, + {name: "Route 53 zone", dirName: "aws_route53_zone", wantErr: false}, + {name: "Route 53 record - single record", dirName: "aws_route53_record", wantErr: false}, + {name: "Route 53 record - multiples zones, multiples records", dirName: "aws_route53_record_multiples", wantErr: false}, + {name: "Route 53 record - empty records", dirName: "aws_route53_record_null_records", wantErr: false}, + {name: "s3 full", dirName: "aws_s3_full", wantErr: false}, + {name: "RDS DB instance", dirName: "aws_db_instance", wantErr: false}, + {name: "RDS DB Subnet group", dirName: "aws_db_subnet_group", wantErr: false}, + {name: "Lambda function", dirName: "aws_lambda_function", wantErr: false}, {name: "unsupported attribute", dirName: "unsupported_attribute", wantErr: false}, {name: "Unsupported provider", dirName: "unsupported_provider", wantErr: false}, {name: "Unsupported resource", dirName: "unsupported_resource", wantErr: false}, - {name: "EC2 instance", dirName: "ec2_instance", wantErr: false}, - {name: "EC2 key pair", dirName: "ec2_key_pair", wantErr: false}, - {name: "EC2 ami", dirName: "ec2_ami", wantErr: false}, - {name: "EC2 eip", dirName: "ec2_eip", wantErr: false}, - {name: "EC2 eip with its association", dirName: "ec2_eip_association", wantErr: false}, - {name: "EC2 ebs volume", dirName: "ec2_ebs_volume", wantErr: false}, - {name: "EC2 ebs snapshot", dirName: "ec2_ebs_snapshot", wantErr: false}, - {name: "VPC security group", dirName: "vpc_security_group", wantErr: false}, - {name: "IAM Users", dirName: "iam_user_multiple", wantErr: false}, - {name: "IAM User Policy", dirName: "iam_user_policy_multiple", wantErr: false}, - {name: "IAM access keys", dirName: "iam_access_key_multiple", wantErr: false}, - {name: "IAM role", dirName: "iam_role_multiple", wantErr: false}, - {name: "IAM policy", dirName: "iam_policy_multiple", wantErr: false}, - {name: "IAM role policy", dirName: "iam_role_policy_multiple", wantErr: false}, - {name: "IAM role policy attachment", dirName: "iam_role_policy_attachment", wantErr: false}, - {name: "IAM user policy attachment", dirName: "iam_user_policy_attachment", wantErr: false}, - {name: "VPC security group rule", dirName: "vpc_security_group_rule", wantErr: false}, - {name: "route table", dirName: "route_table", wantErr: false}, - {name: "route", dirName: "route", wantErr: false}, - {name: "route table associations", dirName: "route_assoc", wantErr: false}, + {name: "EC2 instance", dirName: "aws_ec2_instance", wantErr: false}, + {name: "EC2 key pair", dirName: "aws_ec2_key_pair", wantErr: false}, + {name: "EC2 ami", dirName: "aws_ec2_ami", wantErr: false}, + {name: "EC2 eip", dirName: "aws_ec2_eip", wantErr: false}, + {name: "EC2 eip with its association", dirName: "aws_ec2_eip_association", wantErr: false}, + {name: "EC2 ebs volume", dirName: "aws_ec2_ebs_volume", wantErr: false}, + {name: "EC2 ebs snapshot", dirName: "aws_ec2_ebs_snapshot", wantErr: false}, + {name: "VPC security group", dirName: "aws_vpc_security_group", wantErr: false}, + {name: "IAM Users", dirName: "aws_iam_user_multiple", wantErr: false}, + {name: "IAM User Policy", dirName: "aws_iam_user_policy_multiple", wantErr: false}, + {name: "IAM access keys", dirName: "aws_iam_access_key_multiple", wantErr: false}, + {name: "IAM role", dirName: "aws_iam_role_multiple", wantErr: false}, + {name: "IAM policy", dirName: "aws_iam_policy_multiple", wantErr: false}, + {name: "IAM role policy", dirName: "aws_iam_role_policy_multiple", wantErr: false}, + {name: "IAM role policy attachment", dirName: "aws_iam_role_policy_attachment", wantErr: false}, + {name: "IAM user policy attachment", dirName: "aws_iam_user_policy_attachment", wantErr: false}, + {name: "VPC security group rule", dirName: "aws_vpc_security_group_rule", wantErr: false}, + {name: "route table", dirName: "aws_route_table", wantErr: false}, + {name: "route table associations", dirName: "aws_route_assoc", wantErr: false}, + {name: "route", dirName: "aws_route", wantErr: false}, {name: "NAT gateway", dirName: "aws_nat_gateway", wantErr: false}, - {name: "Internet Gateway", dirName: "internet_gateway", wantErr: false}, - {name: "SQS queue", dirName: "sqs_queue", wantErr: false}, - {name: "SQS queue policy", dirName: "sqs_queue_policy", wantErr: false}, - {name: "SNS Topic", dirName: "sns_topic", wantErr: false}, - {name: "SNS Topic Policy", dirName: "sns_topic_policy", wantErr: false}, - {name: "SNS Topic Subscription", dirName: "sns_topic_subscription", wantErr: false}, - {name: "DynamoDB table", dirName: "dynamodb_table", wantErr: false}, - {name: "Route53 Health Check", dirName: "route53_health_check", wantErr: false}, - {name: "Cloudfront distribution", dirName: "cloudfront_distribution", wantErr: false}, - {name: "ECR Repository", dirName: "ecr_repository", wantErr: false}, - {name: "KMS key", dirName: "kms_key", wantErr: false}, - {name: "KMS alias", dirName: "kms_alias", wantErr: false}, + {name: "Internet Gateway", dirName: "aws_internet_gateway", wantErr: false}, + {name: "SQS queue", dirName: "aws_sqs_queue", wantErr: false}, + {name: "SQS queue policy", dirName: "aws_sqs_queue_policy", wantErr: false}, + {name: "SNS Topic", dirName: "aws_sns_topic", wantErr: false}, + {name: "SNS Topic Policy", dirName: "aws_sns_topic_policy", wantErr: false}, + {name: "SNS Topic Subscription", dirName: "aws_sns_topic_subscription", wantErr: false}, + {name: "DynamoDB table", dirName: "aws_dynamodb_table", wantErr: false}, + {name: "Route53 Health Check", dirName: "aws_route53_health_check", wantErr: false}, + {name: "Cloudfront distribution", dirName: "aws_cloudfront_distribution", wantErr: false}, + {name: "ECR Repository", dirName: "aws_ecr_repository", wantErr: false}, + {name: "KMS key", dirName: "aws_kms_key", wantErr: false}, + {name: "KMS alias", dirName: "aws_kms_alias", wantErr: false}, {name: "lambda event source mapping", dirName: "aws_lambda_event_source_mapping", wantErr: false}, - {name: "VPC", dirName: "vpc", wantErr: false}, - {name: "Subnet", dirName: "subnet", wantErr: false}, - {name: "RDS cluster", dirName: "rds_cluster", wantErr: false}, - {name: "Cloudformation stack", dirName: "cloudformation_stack", wantErr: false}, - {name: "Api Gateway Rest Api", dirName: "api_gateway_rest_api", wantErr: false}, - {name: "Api Gateway Account", dirName: "api_gateway_account", wantErr: false}, - {name: "Api Gateway Api Key", dirName: "api_gateway_api_key", wantErr: false}, - {name: "Api Gateway authorizer", dirName: "api_gateway_authorizer", wantErr: false}, - {name: "Api Gateway stage", dirName: "api_gateway_stage", wantErr: false}, - {name: "Api Gateway resource", dirName: "api_gateway_resource", wantErr: false}, - {name: "Api Gateway domain name", dirName: "api_gateway_domain_name", wantErr: false}, - {name: "Api Gateway vpc link", dirName: "api_gateway_vpc_link", wantErr: false}, - {name: "Api Gateway V2 Api", dirName: "apigatewayv2_api", wantErr: false}, - {name: "Api Gateway V2 Route", dirName: "apigatewayv2_route", wantErr: false}, - {name: "Api Gateway request validator", dirName: "api_gateway_request_validator", wantErr: false}, - {name: "Api Gateway rest api policy", dirName: "api_gateway_rest_api_policy", wantErr: false}, - {name: "Api Gateway base path mapping", dirName: "api_gateway_base_path_mapping", wantErr: false}, - {name: "Api Gateway method", dirName: "api_gateway_method", wantErr: false}, - {name: "Api Gateway model", dirName: "api_gateway_model", wantErr: false}, - {name: "Api Gateway method response", dirName: "api_gateway_method_response", wantErr: false}, - {name: "Api Gateway gateway response", dirName: "api_gateway_gateway_response", wantErr: false}, - {name: "Api Gateway method settings", dirName: "api_gateway_method_settings", wantErr: false}, - {name: "Api Gateway integration", dirName: "api_gateway_integration", wantErr: false}, - {name: "Api Gateway integration response", dirName: "api_gateway_integration_response", wantErr: false}, + {name: "VPC", dirName: "aws_vpc", wantErr: false}, + {name: "Subnet", dirName: "aws_subnet", wantErr: false}, + {name: "RDS cluster", dirName: "aws_rds_cluster", wantErr: false}, + {name: "Cloudformation stack", dirName: "aws_cloudformation_stack", wantErr: false}, + {name: "Api Gateway Rest Api", dirName: "aws_api_gateway_rest_api", wantErr: false}, + {name: "Api Gateway Account", dirName: "aws_api_gateway_account", wantErr: false}, + {name: "Api Gateway Api Key", dirName: "aws_api_gateway_api_key", wantErr: false}, + {name: "Api Gateway authorizer", dirName: "aws_api_gateway_authorizer", wantErr: false}, + {name: "Api Gateway stage", dirName: "aws_api_gateway_stage", wantErr: false}, + {name: "Api Gateway resource", dirName: "aws_api_gateway_resource", wantErr: false}, + {name: "Api Gateway domain name", dirName: "aws_api_gateway_domain_name", wantErr: false}, + {name: "Api Gateway vpc link", dirName: "aws_api_gateway_vpc_link", wantErr: false}, + {name: "Api Gateway V2 Api", dirName: "aws_apigatewayv2_api", wantErr: false}, + {name: "Api Gateway V2 Route", dirName: "aws_apigatewayv2_route", wantErr: false}, + {name: "Api Gateway request validator", dirName: "aws_api_gateway_request_validator", wantErr: false}, + {name: "Api Gateway rest api policy", dirName: "aws_api_gateway_rest_api_policy", wantErr: false}, + {name: "Api Gateway base path mapping", dirName: "aws_api_gateway_base_path_mapping", wantErr: false}, + {name: "Api Gateway method", dirName: "aws_api_gateway_method", wantErr: false}, + {name: "Api Gateway model", dirName: "aws_api_gateway_model", wantErr: false}, + {name: "Api Gateway method response", dirName: "aws_api_gateway_method_response", wantErr: false}, + {name: "Api Gateway gateway response", dirName: "aws_api_gateway_gateway_response", wantErr: false}, + {name: "Api Gateway method settings", dirName: "aws_api_gateway_method_settings", wantErr: false}, + {name: "Api Gateway integration", dirName: "aws_api_gateway_integration", wantErr: false}, + {name: "Api Gateway integration response", dirName: "aws_api_gateway_integration_response", wantErr: false}, {name: "Api Gateway V2 authorizer", dirName: "aws_apigatewayv2_authorizer", wantErr: false}, {name: "AppAutoScaling Targets", dirName: "aws_appautoscaling_target", wantErr: false}, {name: "network acl", dirName: "aws_network_acl", wantErr: false}, @@ -178,7 +178,7 @@ func TestTerraformStateReader_AWS_Resources(t *testing.T) { {name: "default network acl", dirName: "aws_default_network_acl", wantErr: false}, {name: "App autoscaling policy", dirName: "aws_appautoscaling_policy", wantErr: false}, {name: "App autoscaling scheduled action", dirName: "aws_appautoscaling_scheduled_action", wantErr: false}, - {name: "App gateway v2 vpc link", dirName: "apigatewayv2_vpc_link", wantErr: false}, + {name: "App gateway v2 vpc link", dirName: "aws_apigatewayv2_vpc_link", wantErr: false}, {name: "Launch template", dirName: "aws_launch_template", wantErr: false}, {name: "Launch configuration", dirName: "aws_launch_configuration", wantErr: false}, } diff --git a/pkg/iac/terraform/state/test/api_gateway_account/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_account/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_account/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_account/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_account/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_account/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_account/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_account/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_account/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_account/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_account/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_account/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_api_key/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_api_key/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_api_key/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_api_key/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_api_key/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_api_key/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_api_key/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_api_key/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_api_key/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_api_key/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_api_key/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_api_key/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_authorizer/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_authorizer/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_authorizer/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_authorizer/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_authorizer/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_authorizer/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_authorizer/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_authorizer/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_authorizer/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_authorizer/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_authorizer/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_authorizer/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_base_path_mapping/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_base_path_mapping/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_base_path_mapping/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_base_path_mapping/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_base_path_mapping/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_base_path_mapping/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_base_path_mapping/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_base_path_mapping/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_base_path_mapping/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_base_path_mapping/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_base_path_mapping/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_base_path_mapping/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_domain_name/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_domain_name/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_domain_name/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_domain_name/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_domain_name/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_domain_name/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_domain_name/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_domain_name/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_domain_name/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_domain_name/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_domain_name/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_domain_name/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_gateway_response/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_gateway_response/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_gateway_response/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_gateway_response/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_gateway_response/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_gateway_response/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_gateway_response/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_gateway_response/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_gateway_response/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_gateway_response/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_gateway_response/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_gateway_response/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_integration/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_integration/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_integration/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_integration/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_integration/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_integration/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_integration/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_integration/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_integration/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_integration/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_integration/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_integration/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_integration_response/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_integration_response/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_integration_response/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_integration_response/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_integration_response/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_integration_response/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_integration_response/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_integration_response/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_integration_response/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_integration_response/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_integration_response/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_integration_response/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_method/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_method/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_method/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_method/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_method/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_method/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_method/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_method/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_method/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_method_response/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_method_response/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method_response/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_method_response/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_method_response/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_method_response/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method_response/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_method_response/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_method_response/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_method_response/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method_response/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_method_response/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_method_settings/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_method_settings/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method_settings/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_method_settings/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_method_settings/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_method_settings/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method_settings/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_method_settings/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_method_settings/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_method_settings/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_method_settings/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_method_settings/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_model/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_model/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_model/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_model/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_model/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_model/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_model/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_model/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_model/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_model/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_model/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_model/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_request_validator/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_request_validator/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_request_validator/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_request_validator/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_request_validator/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_request_validator/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_request_validator/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_request_validator/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_request_validator/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_request_validator/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_request_validator/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_request_validator/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_resource/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_resource/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_resource/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_resource/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_resource/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_resource/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_resource/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_resource/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_resource/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_resource/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_resource/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_resource/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_rest_api/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_rest_api/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_rest_api/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_rest_api/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_rest_api/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_rest_api/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_rest_api/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_rest_api/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_rest_api/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_rest_api/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_rest_api/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_rest_api/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_rest_api_policy/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_rest_api_policy/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_rest_api_policy/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_rest_api_policy/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_rest_api_policy/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_rest_api_policy/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_rest_api_policy/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_rest_api_policy/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_rest_api_policy/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_rest_api_policy/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_rest_api_policy/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_rest_api_policy/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_stage/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_stage/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_stage/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_stage/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_stage/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_stage/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_stage/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_stage/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_stage/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_stage/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_stage/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_stage/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/api_gateway_vpc_link/results.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_vpc_link/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_vpc_link/results.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_vpc_link/results.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_vpc_link/schema.golden.json b/pkg/iac/terraform/state/test/aws_api_gateway_vpc_link/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_vpc_link/schema.golden.json rename to pkg/iac/terraform/state/test/aws_api_gateway_vpc_link/schema.golden.json diff --git a/pkg/iac/terraform/state/test/api_gateway_vpc_link/terraform.tfstate b/pkg/iac/terraform/state/test/aws_api_gateway_vpc_link/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/api_gateway_vpc_link/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_api_gateway_vpc_link/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/apigatewayv2_api/results.golden.json b/pkg/iac/terraform/state/test/aws_apigatewayv2_api/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_api/results.golden.json rename to pkg/iac/terraform/state/test/aws_apigatewayv2_api/results.golden.json diff --git a/pkg/iac/terraform/state/test/apigatewayv2_api/schema.golden.json b/pkg/iac/terraform/state/test/aws_apigatewayv2_api/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_api/schema.golden.json rename to pkg/iac/terraform/state/test/aws_apigatewayv2_api/schema.golden.json diff --git a/pkg/iac/terraform/state/test/apigatewayv2_api/terraform.tfstate b/pkg/iac/terraform/state/test/aws_apigatewayv2_api/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_api/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_apigatewayv2_api/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/apigatewayv2_route/results.golden.json b/pkg/iac/terraform/state/test/aws_apigatewayv2_route/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_route/results.golden.json rename to pkg/iac/terraform/state/test/aws_apigatewayv2_route/results.golden.json diff --git a/pkg/iac/terraform/state/test/apigatewayv2_route/schema.golden.json b/pkg/iac/terraform/state/test/aws_apigatewayv2_route/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_route/schema.golden.json rename to pkg/iac/terraform/state/test/aws_apigatewayv2_route/schema.golden.json diff --git a/pkg/iac/terraform/state/test/apigatewayv2_route/terraform.tfstate b/pkg/iac/terraform/state/test/aws_apigatewayv2_route/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_route/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_apigatewayv2_route/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/apigatewayv2_vpc_link/results.golden.json b/pkg/iac/terraform/state/test/aws_apigatewayv2_vpc_link/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_vpc_link/results.golden.json rename to pkg/iac/terraform/state/test/aws_apigatewayv2_vpc_link/results.golden.json diff --git a/pkg/iac/terraform/state/test/apigatewayv2_vpc_link/schema.golden.json b/pkg/iac/terraform/state/test/aws_apigatewayv2_vpc_link/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_vpc_link/schema.golden.json rename to pkg/iac/terraform/state/test/aws_apigatewayv2_vpc_link/schema.golden.json diff --git a/pkg/iac/terraform/state/test/apigatewayv2_vpc_link/terraform.tfstate b/pkg/iac/terraform/state/test/aws_apigatewayv2_vpc_link/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/apigatewayv2_vpc_link/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_apigatewayv2_vpc_link/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/cloudformation_stack/results.golden.json b/pkg/iac/terraform/state/test/aws_cloudformation_stack/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/cloudformation_stack/results.golden.json rename to pkg/iac/terraform/state/test/aws_cloudformation_stack/results.golden.json diff --git a/pkg/iac/terraform/state/test/cloudformation_stack/schema.golden.json b/pkg/iac/terraform/state/test/aws_cloudformation_stack/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/cloudformation_stack/schema.golden.json rename to pkg/iac/terraform/state/test/aws_cloudformation_stack/schema.golden.json diff --git a/pkg/iac/terraform/state/test/cloudformation_stack/terraform.tfstate b/pkg/iac/terraform/state/test/aws_cloudformation_stack/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/cloudformation_stack/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_cloudformation_stack/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/cloudfront_distribution/results.golden.json b/pkg/iac/terraform/state/test/aws_cloudfront_distribution/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/cloudfront_distribution/results.golden.json rename to pkg/iac/terraform/state/test/aws_cloudfront_distribution/results.golden.json diff --git a/pkg/iac/terraform/state/test/cloudfront_distribution/schema.golden.json b/pkg/iac/terraform/state/test/aws_cloudfront_distribution/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/cloudfront_distribution/schema.golden.json rename to pkg/iac/terraform/state/test/aws_cloudfront_distribution/schema.golden.json diff --git a/pkg/iac/terraform/state/test/cloudfront_distribution/terraform.tf b/pkg/iac/terraform/state/test/aws_cloudfront_distribution/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/cloudfront_distribution/terraform.tf rename to pkg/iac/terraform/state/test/aws_cloudfront_distribution/terraform.tf diff --git a/pkg/iac/terraform/state/test/cloudfront_distribution/terraform.tfstate b/pkg/iac/terraform/state/test/aws_cloudfront_distribution/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/cloudfront_distribution/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_cloudfront_distribution/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/db_instance/results.golden.json b/pkg/iac/terraform/state/test/aws_db_instance/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/db_instance/results.golden.json rename to pkg/iac/terraform/state/test/aws_db_instance/results.golden.json diff --git a/pkg/iac/terraform/state/test/db_instance/schema.golden.json b/pkg/iac/terraform/state/test/aws_db_instance/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/db_instance/schema.golden.json rename to pkg/iac/terraform/state/test/aws_db_instance/schema.golden.json diff --git a/pkg/iac/terraform/state/test/db_instance/terraform.tf b/pkg/iac/terraform/state/test/aws_db_instance/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/db_instance/terraform.tf rename to pkg/iac/terraform/state/test/aws_db_instance/terraform.tf diff --git a/pkg/iac/terraform/state/test/db_instance/terraform.tfstate b/pkg/iac/terraform/state/test/aws_db_instance/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/db_instance/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_db_instance/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/db_subnet_group/results.golden.json b/pkg/iac/terraform/state/test/aws_db_subnet_group/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/db_subnet_group/results.golden.json rename to pkg/iac/terraform/state/test/aws_db_subnet_group/results.golden.json diff --git a/pkg/iac/terraform/state/test/db_subnet_group/schema.golden.json b/pkg/iac/terraform/state/test/aws_db_subnet_group/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/db_subnet_group/schema.golden.json rename to pkg/iac/terraform/state/test/aws_db_subnet_group/schema.golden.json diff --git a/pkg/iac/terraform/state/test/db_subnet_group/terraform.tf b/pkg/iac/terraform/state/test/aws_db_subnet_group/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/db_subnet_group/terraform.tf rename to pkg/iac/terraform/state/test/aws_db_subnet_group/terraform.tf diff --git a/pkg/iac/terraform/state/test/db_subnet_group/terraform.tfstate b/pkg/iac/terraform/state/test/aws_db_subnet_group/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/db_subnet_group/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_db_subnet_group/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/dynamodb_table/results.golden.json b/pkg/iac/terraform/state/test/aws_dynamodb_table/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/dynamodb_table/results.golden.json rename to pkg/iac/terraform/state/test/aws_dynamodb_table/results.golden.json diff --git a/pkg/iac/terraform/state/test/dynamodb_table/schema.golden.json b/pkg/iac/terraform/state/test/aws_dynamodb_table/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/dynamodb_table/schema.golden.json rename to pkg/iac/terraform/state/test/aws_dynamodb_table/schema.golden.json diff --git a/pkg/iac/terraform/state/test/dynamodb_table/terraform.tf b/pkg/iac/terraform/state/test/aws_dynamodb_table/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/dynamodb_table/terraform.tf rename to pkg/iac/terraform/state/test/aws_dynamodb_table/terraform.tf diff --git a/pkg/iac/terraform/state/test/dynamodb_table/terraform.tfstate b/pkg/iac/terraform/state/test/aws_dynamodb_table/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/dynamodb_table/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_dynamodb_table/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/ec2_ami/results.golden.json b/pkg/iac/terraform/state/test/aws_ec2_ami/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ami/results.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_ami/results.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_ami/schema.golden.json b/pkg/iac/terraform/state/test/aws_ec2_ami/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ami/schema.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_ami/schema.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_ami/terraform.tf b/pkg/iac/terraform/state/test/aws_ec2_ami/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ami/terraform.tf rename to pkg/iac/terraform/state/test/aws_ec2_ami/terraform.tf diff --git a/pkg/iac/terraform/state/test/ec2_ami/terraform.tfstate b/pkg/iac/terraform/state/test/aws_ec2_ami/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ami/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_ec2_ami/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/ec2_ebs_snapshot/results.golden.json b/pkg/iac/terraform/state/test/aws_ec2_ebs_snapshot/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ebs_snapshot/results.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_ebs_snapshot/results.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_ebs_snapshot/schema.golden.json b/pkg/iac/terraform/state/test/aws_ec2_ebs_snapshot/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ebs_snapshot/schema.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_ebs_snapshot/schema.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_ebs_snapshot/terraform.tf b/pkg/iac/terraform/state/test/aws_ec2_ebs_snapshot/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ebs_snapshot/terraform.tf rename to pkg/iac/terraform/state/test/aws_ec2_ebs_snapshot/terraform.tf diff --git a/pkg/iac/terraform/state/test/ec2_ebs_snapshot/terraform.tfstate b/pkg/iac/terraform/state/test/aws_ec2_ebs_snapshot/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ebs_snapshot/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_ec2_ebs_snapshot/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/ec2_ebs_volume/results.golden.json b/pkg/iac/terraform/state/test/aws_ec2_ebs_volume/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ebs_volume/results.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_ebs_volume/results.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_ebs_volume/schema.golden.json b/pkg/iac/terraform/state/test/aws_ec2_ebs_volume/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ebs_volume/schema.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_ebs_volume/schema.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_ebs_volume/terraform.tfstate b/pkg/iac/terraform/state/test/aws_ec2_ebs_volume/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/ec2_ebs_volume/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_ec2_ebs_volume/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/ec2_eip/results.golden.json b/pkg/iac/terraform/state/test/aws_ec2_eip/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_eip/results.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_eip/results.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_eip/schema.golden.json b/pkg/iac/terraform/state/test/aws_ec2_eip/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_eip/schema.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_eip/schema.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_eip/terraform.tfstate b/pkg/iac/terraform/state/test/aws_ec2_eip/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/ec2_eip/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_ec2_eip/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/ec2_eip_association/results.golden.json b/pkg/iac/terraform/state/test/aws_ec2_eip_association/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_eip_association/results.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_eip_association/results.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_eip_association/schema.golden.json b/pkg/iac/terraform/state/test/aws_ec2_eip_association/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_eip_association/schema.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_eip_association/schema.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_eip_association/terraform.tfstate b/pkg/iac/terraform/state/test/aws_ec2_eip_association/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/ec2_eip_association/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_ec2_eip_association/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/ec2_instance/results.golden.json b/pkg/iac/terraform/state/test/aws_ec2_instance/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_instance/results.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_instance/results.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_instance/schema.golden.json b/pkg/iac/terraform/state/test/aws_ec2_instance/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_instance/schema.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_instance/schema.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_instance/terraform.tfstate b/pkg/iac/terraform/state/test/aws_ec2_instance/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/ec2_instance/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_ec2_instance/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/ec2_key_pair/results.golden.json b/pkg/iac/terraform/state/test/aws_ec2_key_pair/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_key_pair/results.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_key_pair/results.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_key_pair/schema.golden.json b/pkg/iac/terraform/state/test/aws_ec2_key_pair/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ec2_key_pair/schema.golden.json rename to pkg/iac/terraform/state/test/aws_ec2_key_pair/schema.golden.json diff --git a/pkg/iac/terraform/state/test/ec2_key_pair/terraform.tfstate b/pkg/iac/terraform/state/test/aws_ec2_key_pair/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/ec2_key_pair/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_ec2_key_pair/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/ecr_repository/results.golden.json b/pkg/iac/terraform/state/test/aws_ecr_repository/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ecr_repository/results.golden.json rename to pkg/iac/terraform/state/test/aws_ecr_repository/results.golden.json diff --git a/pkg/iac/terraform/state/test/ecr_repository/schema.golden.json b/pkg/iac/terraform/state/test/aws_ecr_repository/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/ecr_repository/schema.golden.json rename to pkg/iac/terraform/state/test/aws_ecr_repository/schema.golden.json diff --git a/pkg/iac/terraform/state/test/ecr_repository/terraform.tfstate b/pkg/iac/terraform/state/test/aws_ecr_repository/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/ecr_repository/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_ecr_repository/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/iam_access_key_multiple/results.golden.json b/pkg/iac/terraform/state/test/aws_iam_access_key_multiple/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_access_key_multiple/results.golden.json rename to pkg/iac/terraform/state/test/aws_iam_access_key_multiple/results.golden.json diff --git a/pkg/iac/terraform/state/test/iam_access_key_multiple/schema.golden.json b/pkg/iac/terraform/state/test/aws_iam_access_key_multiple/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_access_key_multiple/schema.golden.json rename to pkg/iac/terraform/state/test/aws_iam_access_key_multiple/schema.golden.json diff --git a/pkg/iac/terraform/state/test/iam_access_key_multiple/terraform.tfstate b/pkg/iac/terraform/state/test/aws_iam_access_key_multiple/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/iam_access_key_multiple/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_iam_access_key_multiple/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/iam_policy_multiple/results.golden.json b/pkg/iac/terraform/state/test/aws_iam_policy_multiple/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_policy_multiple/results.golden.json rename to pkg/iac/terraform/state/test/aws_iam_policy_multiple/results.golden.json diff --git a/pkg/iac/terraform/state/test/iam_policy_multiple/schema.golden.json b/pkg/iac/terraform/state/test/aws_iam_policy_multiple/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_policy_multiple/schema.golden.json rename to pkg/iac/terraform/state/test/aws_iam_policy_multiple/schema.golden.json diff --git a/pkg/iac/terraform/state/test/iam_policy_multiple/terraform.tfstate b/pkg/iac/terraform/state/test/aws_iam_policy_multiple/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/iam_policy_multiple/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_iam_policy_multiple/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/iam_role_multiple/results.golden.json b/pkg/iac/terraform/state/test/aws_iam_role_multiple/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_multiple/results.golden.json rename to pkg/iac/terraform/state/test/aws_iam_role_multiple/results.golden.json diff --git a/pkg/iac/terraform/state/test/iam_role_multiple/schema.golden.json b/pkg/iac/terraform/state/test/aws_iam_role_multiple/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_multiple/schema.golden.json rename to pkg/iac/terraform/state/test/aws_iam_role_multiple/schema.golden.json diff --git a/pkg/iac/terraform/state/test/iam_role_multiple/terraform.tfstate b/pkg/iac/terraform/state/test/aws_iam_role_multiple/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_multiple/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_iam_role_multiple/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/iam_role_policy_attachment/results.golden.json b/pkg/iac/terraform/state/test/aws_iam_role_policy_attachment/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_policy_attachment/results.golden.json rename to pkg/iac/terraform/state/test/aws_iam_role_policy_attachment/results.golden.json diff --git a/pkg/iac/terraform/state/test/iam_role_policy_attachment/schema.golden.json b/pkg/iac/terraform/state/test/aws_iam_role_policy_attachment/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_policy_attachment/schema.golden.json rename to pkg/iac/terraform/state/test/aws_iam_role_policy_attachment/schema.golden.json diff --git a/pkg/iac/terraform/state/test/iam_role_policy_attachment/terraform.tfstate b/pkg/iac/terraform/state/test/aws_iam_role_policy_attachment/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_policy_attachment/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_iam_role_policy_attachment/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/iam_role_policy_multiple/results.golden.json b/pkg/iac/terraform/state/test/aws_iam_role_policy_multiple/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_policy_multiple/results.golden.json rename to pkg/iac/terraform/state/test/aws_iam_role_policy_multiple/results.golden.json diff --git a/pkg/iac/terraform/state/test/iam_role_policy_multiple/schema.golden.json b/pkg/iac/terraform/state/test/aws_iam_role_policy_multiple/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_policy_multiple/schema.golden.json rename to pkg/iac/terraform/state/test/aws_iam_role_policy_multiple/schema.golden.json diff --git a/pkg/iac/terraform/state/test/iam_role_policy_multiple/terraform.tfstate b/pkg/iac/terraform/state/test/aws_iam_role_policy_multiple/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/iam_role_policy_multiple/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_iam_role_policy_multiple/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/iam_user_multiple/results.golden.json b/pkg/iac/terraform/state/test/aws_iam_user_multiple/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_multiple/results.golden.json rename to pkg/iac/terraform/state/test/aws_iam_user_multiple/results.golden.json diff --git a/pkg/iac/terraform/state/test/iam_user_multiple/schema.golden.json b/pkg/iac/terraform/state/test/aws_iam_user_multiple/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_multiple/schema.golden.json rename to pkg/iac/terraform/state/test/aws_iam_user_multiple/schema.golden.json diff --git a/pkg/iac/terraform/state/test/iam_user_multiple/terraform.tfstate b/pkg/iac/terraform/state/test/aws_iam_user_multiple/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_multiple/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_iam_user_multiple/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/iam_user_policy_attachment/results.golden.json b/pkg/iac/terraform/state/test/aws_iam_user_policy_attachment/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_policy_attachment/results.golden.json rename to pkg/iac/terraform/state/test/aws_iam_user_policy_attachment/results.golden.json diff --git a/pkg/iac/terraform/state/test/iam_user_policy_attachment/schema.golden.json b/pkg/iac/terraform/state/test/aws_iam_user_policy_attachment/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_policy_attachment/schema.golden.json rename to pkg/iac/terraform/state/test/aws_iam_user_policy_attachment/schema.golden.json diff --git a/pkg/iac/terraform/state/test/iam_user_policy_attachment/terraform.tfstate b/pkg/iac/terraform/state/test/aws_iam_user_policy_attachment/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_policy_attachment/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_iam_user_policy_attachment/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/iam_user_policy_multiple/results.golden.json b/pkg/iac/terraform/state/test/aws_iam_user_policy_multiple/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_policy_multiple/results.golden.json rename to pkg/iac/terraform/state/test/aws_iam_user_policy_multiple/results.golden.json diff --git a/pkg/iac/terraform/state/test/iam_user_policy_multiple/schema.golden.json b/pkg/iac/terraform/state/test/aws_iam_user_policy_multiple/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_policy_multiple/schema.golden.json rename to pkg/iac/terraform/state/test/aws_iam_user_policy_multiple/schema.golden.json diff --git a/pkg/iac/terraform/state/test/iam_user_policy_multiple/terraform.tfstate b/pkg/iac/terraform/state/test/aws_iam_user_policy_multiple/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/iam_user_policy_multiple/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_iam_user_policy_multiple/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/internet_gateway/results.golden.json b/pkg/iac/terraform/state/test/aws_internet_gateway/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/internet_gateway/results.golden.json rename to pkg/iac/terraform/state/test/aws_internet_gateway/results.golden.json diff --git a/pkg/iac/terraform/state/test/internet_gateway/schema.golden.json b/pkg/iac/terraform/state/test/aws_internet_gateway/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/internet_gateway/schema.golden.json rename to pkg/iac/terraform/state/test/aws_internet_gateway/schema.golden.json diff --git a/pkg/iac/terraform/state/test/internet_gateway/terraform.tfstate b/pkg/iac/terraform/state/test/aws_internet_gateway/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/internet_gateway/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_internet_gateway/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/kms_alias/results.golden.json b/pkg/iac/terraform/state/test/aws_kms_alias/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/kms_alias/results.golden.json rename to pkg/iac/terraform/state/test/aws_kms_alias/results.golden.json diff --git a/pkg/iac/terraform/state/test/kms_alias/schema.golden.json b/pkg/iac/terraform/state/test/aws_kms_alias/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/kms_alias/schema.golden.json rename to pkg/iac/terraform/state/test/aws_kms_alias/schema.golden.json diff --git a/pkg/iac/terraform/state/test/kms_alias/terraform.tfstate b/pkg/iac/terraform/state/test/aws_kms_alias/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/kms_alias/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_kms_alias/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/kms_key/results.golden.json b/pkg/iac/terraform/state/test/aws_kms_key/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/kms_key/results.golden.json rename to pkg/iac/terraform/state/test/aws_kms_key/results.golden.json diff --git a/pkg/iac/terraform/state/test/kms_key/schema.golden.json b/pkg/iac/terraform/state/test/aws_kms_key/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/kms_key/schema.golden.json rename to pkg/iac/terraform/state/test/aws_kms_key/schema.golden.json diff --git a/pkg/iac/terraform/state/test/kms_key/terraform.tfstate b/pkg/iac/terraform/state/test/aws_kms_key/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/kms_key/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_kms_key/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/lambda_function/results.golden.json b/pkg/iac/terraform/state/test/aws_lambda_function/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/lambda_function/results.golden.json rename to pkg/iac/terraform/state/test/aws_lambda_function/results.golden.json diff --git a/pkg/iac/terraform/state/test/lambda_function/schema.golden.json b/pkg/iac/terraform/state/test/aws_lambda_function/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/lambda_function/schema.golden.json rename to pkg/iac/terraform/state/test/aws_lambda_function/schema.golden.json diff --git a/pkg/iac/terraform/state/test/lambda_function/terraform.tfstate b/pkg/iac/terraform/state/test/aws_lambda_function/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/lambda_function/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_lambda_function/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/rds_cluster/results.golden.json b/pkg/iac/terraform/state/test/aws_rds_cluster/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/rds_cluster/results.golden.json rename to pkg/iac/terraform/state/test/aws_rds_cluster/results.golden.json diff --git a/pkg/iac/terraform/state/test/rds_cluster/schema.golden.json b/pkg/iac/terraform/state/test/aws_rds_cluster/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/rds_cluster/schema.golden.json rename to pkg/iac/terraform/state/test/aws_rds_cluster/schema.golden.json diff --git a/pkg/iac/terraform/state/test/rds_cluster/terraform.tf b/pkg/iac/terraform/state/test/aws_rds_cluster/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/rds_cluster/terraform.tf rename to pkg/iac/terraform/state/test/aws_rds_cluster/terraform.tf diff --git a/pkg/iac/terraform/state/test/rds_cluster/terraform.tfstate b/pkg/iac/terraform/state/test/aws_rds_cluster/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/rds_cluster/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_rds_cluster/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/route/results.golden.json b/pkg/iac/terraform/state/test/aws_route/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route/results.golden.json rename to pkg/iac/terraform/state/test/aws_route/results.golden.json diff --git a/pkg/iac/terraform/state/test/route/schema.golden.json b/pkg/iac/terraform/state/test/aws_route/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route/schema.golden.json rename to pkg/iac/terraform/state/test/aws_route/schema.golden.json diff --git a/pkg/iac/terraform/state/test/route/terraform.tf b/pkg/iac/terraform/state/test/aws_route/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/route/terraform.tf rename to pkg/iac/terraform/state/test/aws_route/terraform.tf diff --git a/pkg/iac/terraform/state/test/route/terraform.tfstate b/pkg/iac/terraform/state/test/aws_route/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/route/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_route/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/route53_health_check/results.golden.json b/pkg/iac/terraform/state/test/aws_route53_health_check/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_health_check/results.golden.json rename to pkg/iac/terraform/state/test/aws_route53_health_check/results.golden.json diff --git a/pkg/iac/terraform/state/test/route53_health_check/schema.golden.json b/pkg/iac/terraform/state/test/aws_route53_health_check/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_health_check/schema.golden.json rename to pkg/iac/terraform/state/test/aws_route53_health_check/schema.golden.json diff --git a/pkg/iac/terraform/state/test/route53_health_check/terraform.tfstate b/pkg/iac/terraform/state/test/aws_route53_health_check/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/route53_health_check/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_route53_health_check/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/route53_record/results.golden.json b/pkg/iac/terraform/state/test/aws_route53_record/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_record/results.golden.json rename to pkg/iac/terraform/state/test/aws_route53_record/results.golden.json diff --git a/pkg/iac/terraform/state/test/route53_record/schema.golden.json b/pkg/iac/terraform/state/test/aws_route53_record/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_record/schema.golden.json rename to pkg/iac/terraform/state/test/aws_route53_record/schema.golden.json diff --git a/pkg/iac/terraform/state/test/route53_record/terraform.tfstate b/pkg/iac/terraform/state/test/aws_route53_record/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/route53_record/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_route53_record/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/route53_record_multiples/results.golden.json b/pkg/iac/terraform/state/test/aws_route53_record_multiples/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_record_multiples/results.golden.json rename to pkg/iac/terraform/state/test/aws_route53_record_multiples/results.golden.json diff --git a/pkg/iac/terraform/state/test/route53_record_multiples/schema.golden.json b/pkg/iac/terraform/state/test/aws_route53_record_multiples/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_record_multiples/schema.golden.json rename to pkg/iac/terraform/state/test/aws_route53_record_multiples/schema.golden.json diff --git a/pkg/iac/terraform/state/test/route53_record_multiples/terraform.tfstate b/pkg/iac/terraform/state/test/aws_route53_record_multiples/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/route53_record_multiples/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_route53_record_multiples/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/route53_record_null_records/results.golden.json b/pkg/iac/terraform/state/test/aws_route53_record_null_records/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_record_null_records/results.golden.json rename to pkg/iac/terraform/state/test/aws_route53_record_null_records/results.golden.json diff --git a/pkg/iac/terraform/state/test/route53_record_null_records/schema.golden.json b/pkg/iac/terraform/state/test/aws_route53_record_null_records/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_record_null_records/schema.golden.json rename to pkg/iac/terraform/state/test/aws_route53_record_null_records/schema.golden.json diff --git a/pkg/iac/terraform/state/test/route53_record_null_records/terraform.tfstate b/pkg/iac/terraform/state/test/aws_route53_record_null_records/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/route53_record_null_records/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_route53_record_null_records/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/route53_zone/results.golden.json b/pkg/iac/terraform/state/test/aws_route53_zone/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_zone/results.golden.json rename to pkg/iac/terraform/state/test/aws_route53_zone/results.golden.json diff --git a/pkg/iac/terraform/state/test/route53_zone/schema.golden.json b/pkg/iac/terraform/state/test/aws_route53_zone/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route53_zone/schema.golden.json rename to pkg/iac/terraform/state/test/aws_route53_zone/schema.golden.json diff --git a/pkg/iac/terraform/state/test/route53_zone/terraform.tfstate b/pkg/iac/terraform/state/test/aws_route53_zone/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/route53_zone/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_route53_zone/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/route_assoc/results.golden.json b/pkg/iac/terraform/state/test/aws_route_assoc/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route_assoc/results.golden.json rename to pkg/iac/terraform/state/test/aws_route_assoc/results.golden.json diff --git a/pkg/iac/terraform/state/test/route_assoc/schema.golden.json b/pkg/iac/terraform/state/test/aws_route_assoc/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route_assoc/schema.golden.json rename to pkg/iac/terraform/state/test/aws_route_assoc/schema.golden.json diff --git a/pkg/iac/terraform/state/test/route_assoc/terraform.tfstate b/pkg/iac/terraform/state/test/aws_route_assoc/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/route_assoc/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_route_assoc/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/route_table/results.golden.json b/pkg/iac/terraform/state/test/aws_route_table/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route_table/results.golden.json rename to pkg/iac/terraform/state/test/aws_route_table/results.golden.json diff --git a/pkg/iac/terraform/state/test/route_table/schema.golden.json b/pkg/iac/terraform/state/test/aws_route_table/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/route_table/schema.golden.json rename to pkg/iac/terraform/state/test/aws_route_table/schema.golden.json diff --git a/pkg/iac/terraform/state/test/route_table/terraform.tf b/pkg/iac/terraform/state/test/aws_route_table/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/route_table/terraform.tf rename to pkg/iac/terraform/state/test/aws_route_table/terraform.tf diff --git a/pkg/iac/terraform/state/test/route_table/terraform.tfstate b/pkg/iac/terraform/state/test/aws_route_table/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/route_table/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_route_table/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/s3_full/results.golden.json b/pkg/iac/terraform/state/test/aws_s3_full/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/s3_full/results.golden.json rename to pkg/iac/terraform/state/test/aws_s3_full/results.golden.json diff --git a/pkg/iac/terraform/state/test/s3_full/schema.golden.json b/pkg/iac/terraform/state/test/aws_s3_full/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/s3_full/schema.golden.json rename to pkg/iac/terraform/state/test/aws_s3_full/schema.golden.json diff --git a/pkg/iac/terraform/state/test/s3_full/terraform.tfstate b/pkg/iac/terraform/state/test/aws_s3_full/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/s3_full/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_s3_full/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/sns_topic/results.golden.json b/pkg/iac/terraform/state/test/aws_sns_topic/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic/results.golden.json rename to pkg/iac/terraform/state/test/aws_sns_topic/results.golden.json diff --git a/pkg/iac/terraform/state/test/sns_topic/schema.golden.json b/pkg/iac/terraform/state/test/aws_sns_topic/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic/schema.golden.json rename to pkg/iac/terraform/state/test/aws_sns_topic/schema.golden.json diff --git a/pkg/iac/terraform/state/test/sns_topic/terraform.tfstate b/pkg/iac/terraform/state/test/aws_sns_topic/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_sns_topic/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/sns_topic_policy/results.golden.json b/pkg/iac/terraform/state/test/aws_sns_topic_policy/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic_policy/results.golden.json rename to pkg/iac/terraform/state/test/aws_sns_topic_policy/results.golden.json diff --git a/pkg/iac/terraform/state/test/sns_topic_policy/schema.golden.json b/pkg/iac/terraform/state/test/aws_sns_topic_policy/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic_policy/schema.golden.json rename to pkg/iac/terraform/state/test/aws_sns_topic_policy/schema.golden.json diff --git a/pkg/iac/terraform/state/test/sns_topic_policy/terraform.tfstate b/pkg/iac/terraform/state/test/aws_sns_topic_policy/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic_policy/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_sns_topic_policy/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/sns_topic_subscription/results.golden.json b/pkg/iac/terraform/state/test/aws_sns_topic_subscription/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic_subscription/results.golden.json rename to pkg/iac/terraform/state/test/aws_sns_topic_subscription/results.golden.json diff --git a/pkg/iac/terraform/state/test/sns_topic_subscription/schema.golden.json b/pkg/iac/terraform/state/test/aws_sns_topic_subscription/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic_subscription/schema.golden.json rename to pkg/iac/terraform/state/test/aws_sns_topic_subscription/schema.golden.json diff --git a/pkg/iac/terraform/state/test/sns_topic_subscription/terraform.tfstate b/pkg/iac/terraform/state/test/aws_sns_topic_subscription/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/sns_topic_subscription/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_sns_topic_subscription/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/sqs_queue/results.golden.json b/pkg/iac/terraform/state/test/aws_sqs_queue/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sqs_queue/results.golden.json rename to pkg/iac/terraform/state/test/aws_sqs_queue/results.golden.json diff --git a/pkg/iac/terraform/state/test/sqs_queue/schema.golden.json b/pkg/iac/terraform/state/test/aws_sqs_queue/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sqs_queue/schema.golden.json rename to pkg/iac/terraform/state/test/aws_sqs_queue/schema.golden.json diff --git a/pkg/iac/terraform/state/test/sqs_queue/terraform.tfstate b/pkg/iac/terraform/state/test/aws_sqs_queue/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/sqs_queue/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_sqs_queue/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/sqs_queue_policy/results.golden.json b/pkg/iac/terraform/state/test/aws_sqs_queue_policy/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sqs_queue_policy/results.golden.json rename to pkg/iac/terraform/state/test/aws_sqs_queue_policy/results.golden.json diff --git a/pkg/iac/terraform/state/test/sqs_queue_policy/schema.golden.json b/pkg/iac/terraform/state/test/aws_sqs_queue_policy/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/sqs_queue_policy/schema.golden.json rename to pkg/iac/terraform/state/test/aws_sqs_queue_policy/schema.golden.json diff --git a/pkg/iac/terraform/state/test/sqs_queue_policy/terraform.tfstate b/pkg/iac/terraform/state/test/aws_sqs_queue_policy/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/sqs_queue_policy/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_sqs_queue_policy/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/subnet/results.golden.json b/pkg/iac/terraform/state/test/aws_subnet/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/subnet/results.golden.json rename to pkg/iac/terraform/state/test/aws_subnet/results.golden.json diff --git a/pkg/iac/terraform/state/test/subnet/schema.golden.json b/pkg/iac/terraform/state/test/aws_subnet/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/subnet/schema.golden.json rename to pkg/iac/terraform/state/test/aws_subnet/schema.golden.json diff --git a/pkg/iac/terraform/state/test/subnet/terraform.tfstate b/pkg/iac/terraform/state/test/aws_subnet/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/subnet/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_subnet/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/vpc/results.golden.json b/pkg/iac/terraform/state/test/aws_vpc/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/vpc/results.golden.json rename to pkg/iac/terraform/state/test/aws_vpc/results.golden.json diff --git a/pkg/iac/terraform/state/test/vpc/schema.golden.json b/pkg/iac/terraform/state/test/aws_vpc/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/vpc/schema.golden.json rename to pkg/iac/terraform/state/test/aws_vpc/schema.golden.json diff --git a/pkg/iac/terraform/state/test/vpc/terraform.tfstate b/pkg/iac/terraform/state/test/aws_vpc/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/vpc/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_vpc/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/vpc_security_group/results.golden.json b/pkg/iac/terraform/state/test/aws_vpc_security_group/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/vpc_security_group/results.golden.json rename to pkg/iac/terraform/state/test/aws_vpc_security_group/results.golden.json diff --git a/pkg/iac/terraform/state/test/vpc_security_group/schema.golden.json b/pkg/iac/terraform/state/test/aws_vpc_security_group/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/vpc_security_group/schema.golden.json rename to pkg/iac/terraform/state/test/aws_vpc_security_group/schema.golden.json diff --git a/pkg/iac/terraform/state/test/vpc_security_group/terraform.tf b/pkg/iac/terraform/state/test/aws_vpc_security_group/terraform.tf similarity index 100% rename from pkg/iac/terraform/state/test/vpc_security_group/terraform.tf rename to pkg/iac/terraform/state/test/aws_vpc_security_group/terraform.tf diff --git a/pkg/iac/terraform/state/test/vpc_security_group/terraform.tfstate b/pkg/iac/terraform/state/test/aws_vpc_security_group/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/vpc_security_group/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_vpc_security_group/terraform.tfstate diff --git a/pkg/iac/terraform/state/test/vpc_security_group_rule/results.golden.json b/pkg/iac/terraform/state/test/aws_vpc_security_group_rule/results.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/vpc_security_group_rule/results.golden.json rename to pkg/iac/terraform/state/test/aws_vpc_security_group_rule/results.golden.json diff --git a/pkg/iac/terraform/state/test/vpc_security_group_rule/schema.golden.json b/pkg/iac/terraform/state/test/aws_vpc_security_group_rule/schema.golden.json similarity index 100% rename from pkg/iac/terraform/state/test/vpc_security_group_rule/schema.golden.json rename to pkg/iac/terraform/state/test/aws_vpc_security_group_rule/schema.golden.json diff --git a/pkg/iac/terraform/state/test/vpc_security_group_rule/terraform.tfstate b/pkg/iac/terraform/state/test/aws_vpc_security_group_rule/terraform.tfstate similarity index 100% rename from pkg/iac/terraform/state/test/vpc_security_group_rule/terraform.tfstate rename to pkg/iac/terraform/state/test/aws_vpc_security_group_rule/terraform.tfstate diff --git a/pkg/remote/aws_dynamodb_scanner_test.go b/pkg/remote/aws_dynamodb_scanner_test.go index e02739767..b1ad56434 100644 --- a/pkg/remote/aws_dynamodb_scanner_test.go +++ b/pkg/remote/aws_dynamodb_scanner_test.go @@ -35,7 +35,7 @@ func TestDynamoDBTable(t *testing.T) { }{ { test: "no DynamoDB Table", - dirName: "dynamodb_table_empty", + dirName: "aws_dynamodb_table_empty", mocks: func(client *repository.MockDynamoDBRepository, alerter *mocks.AlerterInterface) { client.On("ListAllTables").Return([]*string{}, nil) }, @@ -43,7 +43,7 @@ func TestDynamoDBTable(t *testing.T) { }, { test: "Multiple DynamoDB Table", - dirName: "dynamodb_table_multiple", + dirName: "aws_dynamodb_table_multiple", mocks: func(client *repository.MockDynamoDBRepository, alerter *mocks.AlerterInterface) { client.On("ListAllTables").Return([]*string{ awssdk.String("GameScores"), @@ -54,7 +54,7 @@ func TestDynamoDBTable(t *testing.T) { }, { test: "cannot list DynamoDB Table", - dirName: "dynamodb_table_list", + dirName: "aws_dynamodb_table_list", mocks: func(client *repository.MockDynamoDBRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 400, "") client.On("ListAllTables").Return(nil, awsError) diff --git a/pkg/remote/aws_ec2_scanner_test.go b/pkg/remote/aws_ec2_scanner_test.go index 3d6bbc45b..cec416d47 100644 --- a/pkg/remote/aws_ec2_scanner_test.go +++ b/pkg/remote/aws_ec2_scanner_test.go @@ -825,7 +825,7 @@ func TestVPC(t *testing.T) { }{ { test: "no VPC", - dirName: "vpc_empty", + dirName: "aws_vpc_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllVPCs").Once().Return([]*ec2.Vpc{}, []*ec2.Vpc{}, nil) }, @@ -833,7 +833,7 @@ func TestVPC(t *testing.T) { }, { test: "VPC results", - dirName: "vpc", + dirName: "aws_vpc", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllVPCs").Once().Return([]*ec2.Vpc{ { @@ -858,7 +858,7 @@ func TestVPC(t *testing.T) { }, { test: "cannot list VPC", - dirName: "vpc_empty", + dirName: "aws_vpc_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllVPCs").Once().Return(nil, nil, awsError) @@ -939,7 +939,7 @@ func TestDefaultVPC(t *testing.T) { }{ { test: "no VPC", - dirName: "vpc_empty", + dirName: "aws_vpc_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllVPCs").Once().Return([]*ec2.Vpc{}, []*ec2.Vpc{}, nil) }, @@ -947,7 +947,7 @@ func TestDefaultVPC(t *testing.T) { }, { test: "default VPC results", - dirName: "default_vpc", + dirName: "aws_default_vpc", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllVPCs").Once().Return([]*ec2.Vpc{ { @@ -969,7 +969,7 @@ func TestDefaultVPC(t *testing.T) { }, { test: "cannot list VPC", - dirName: "vpc_empty", + dirName: "aws_vpc_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllVPCs").Once().Return(nil, nil, awsError) @@ -1670,7 +1670,7 @@ func TestVpcSecurityGroup(t *testing.T) { }{ { test: "no security groups", - dirName: "vpc_security_group_empty", + dirName: "aws_vpc_security_group_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllSecurityGroups").Once().Return([]*ec2.SecurityGroup{}, []*ec2.SecurityGroup{}, nil) }, @@ -1678,7 +1678,7 @@ func TestVpcSecurityGroup(t *testing.T) { }, { test: "with security groups", - dirName: "vpc_security_group_multiple", + dirName: "aws_vpc_security_group_multiple", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllSecurityGroups").Once().Return([]*ec2.SecurityGroup{ { @@ -1696,7 +1696,7 @@ func TestVpcSecurityGroup(t *testing.T) { }, { test: "cannot list security groups", - dirName: "vpc_security_group_empty", + dirName: "aws_vpc_security_group_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllSecurityGroups").Return(nil, nil, awsError) @@ -1777,7 +1777,7 @@ func TestVpcDefaultSecurityGroup(t *testing.T) { }{ { test: "no security groups", - dirName: "vpc_default_security_group_empty", + dirName: "aws_vpc_default_security_group_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllSecurityGroups").Once().Return([]*ec2.SecurityGroup{}, []*ec2.SecurityGroup{}, nil) }, @@ -1785,7 +1785,7 @@ func TestVpcDefaultSecurityGroup(t *testing.T) { }, { test: "with security groups", - dirName: "vpc_default_security_group_multiple", + dirName: "aws_vpc_default_security_group_multiple", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllSecurityGroups").Once().Return([]*ec2.SecurityGroup{ { @@ -1803,7 +1803,7 @@ func TestVpcDefaultSecurityGroup(t *testing.T) { }, { test: "cannot list security groups", - dirName: "vpc_default_security_group_empty", + dirName: "aws_vpc_default_security_group_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllSecurityGroups").Return(nil, nil, awsError) @@ -2534,7 +2534,7 @@ func TestVpcSecurityGroupRule(t *testing.T) { }{ { test: "no security group rules", - dirName: "vpc_security_group_rule_empty", + dirName: "aws_vpc_security_group_rule_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllSecurityGroups").Once().Return([]*ec2.SecurityGroup{ { @@ -2548,7 +2548,7 @@ func TestVpcSecurityGroupRule(t *testing.T) { }, { test: "with security group rules", - dirName: "vpc_security_group_rule_multiple", + dirName: "aws_vpc_security_group_rule_multiple", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { client.On("ListAllSecurityGroups").Once().Return([]*ec2.SecurityGroup{ { @@ -2644,7 +2644,7 @@ func TestVpcSecurityGroupRule(t *testing.T) { }, { test: "cannot list security group rules", - dirName: "vpc_security_group_rule_empty", + dirName: "aws_vpc_security_group_rule_empty", mocks: func(client *repository.MockEC2Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllSecurityGroups").Once().Return(nil, nil, awsError) diff --git a/pkg/remote/aws_iam_scanner_test.go b/pkg/remote/aws_iam_scanner_test.go index dc9be11b1..9c8aacbc8 100644 --- a/pkg/remote/aws_iam_scanner_test.go +++ b/pkg/remote/aws_iam_scanner_test.go @@ -37,7 +37,7 @@ func TestIamUser(t *testing.T) { }{ { test: "no iam user", - dirName: "iam_user_empty", + dirName: "aws_iam_user_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllUsers").Return([]*iam.User{}, nil) }, @@ -45,7 +45,7 @@ func TestIamUser(t *testing.T) { }, { test: "iam multiples users", - dirName: "iam_user_multiple", + dirName: "aws_iam_user_multiple", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllUsers").Return([]*iam.User{ { @@ -63,7 +63,7 @@ func TestIamUser(t *testing.T) { }, { test: "cannot list iam user", - dirName: "iam_user_empty", + dirName: "aws_iam_user_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repo.On("ListAllUsers").Return(nil, awsError) @@ -143,7 +143,7 @@ func TestIamUserPolicy(t *testing.T) { }{ { test: "no iam user policy", - dirName: "iam_user_policy_empty", + dirName: "aws_iam_user_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { users := []*iam.User{ { @@ -157,7 +157,7 @@ func TestIamUserPolicy(t *testing.T) { }, { test: "iam multiples users multiple policies", - dirName: "iam_user_policy_multiple", + dirName: "aws_iam_user_policy_multiple", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { users := []*iam.User{ { @@ -190,7 +190,7 @@ func TestIamUserPolicy(t *testing.T) { }, { test: "cannot list user", - dirName: "iam_user_policy_empty", + dirName: "aws_iam_user_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repo.On("ListAllUsers").Return(nil, awsError) @@ -201,7 +201,7 @@ func TestIamUserPolicy(t *testing.T) { }, { test: "cannot list user policy", - dirName: "iam_user_policy_empty", + dirName: "aws_iam_user_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllUsers").Once().Return([]*iam.User{}, nil) awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") @@ -282,7 +282,7 @@ func TestIamPolicy(t *testing.T) { }{ { test: "no iam custom policies", - dirName: "iam_policy_empty", + dirName: "aws_iam_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllPolicies").Once().Return([]*iam.Policy{}, nil) }, @@ -290,7 +290,7 @@ func TestIamPolicy(t *testing.T) { }, { test: "iam multiples custom policies", - dirName: "iam_policy_multiple", + dirName: "aws_iam_policy_multiple", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllPolicies").Once().Return([]*iam.Policy{ { @@ -308,7 +308,7 @@ func TestIamPolicy(t *testing.T) { }, { test: "cannot list iam custom policies", - dirName: "iam_policy_empty", + dirName: "aws_iam_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repo.On("ListAllPolicies").Once().Return(nil, awsError) @@ -389,7 +389,7 @@ func TestIamRole(t *testing.T) { }{ { test: "no iam roles", - dirName: "iam_role_empty", + dirName: "aws_iam_role_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllRoles").Return([]*iam.Role{}, nil) }, @@ -397,7 +397,7 @@ func TestIamRole(t *testing.T) { }, { test: "iam multiples roles", - dirName: "iam_role_multiple", + dirName: "aws_iam_role_multiple", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllRoles").Return([]*iam.Role{ { @@ -418,7 +418,7 @@ func TestIamRole(t *testing.T) { }, { test: "iam roles ignore services roles", - dirName: "iam_role_ignore_services_roles", + dirName: "aws_iam_role_ignore_services_roles", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllRoles").Return([]*iam.Role{ { @@ -509,7 +509,7 @@ func TestIamRolePolicyAttachment(t *testing.T) { }{ { test: "no iam role policy", - dirName: "aws_iam_role_policy_empty", + dirName: "aws_aws_iam_role_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { roles := []*iam.Role{ { @@ -692,7 +692,7 @@ func TestIamAccessKey(t *testing.T) { }{ { test: "no iam access_key", - dirName: "iam_access_key_empty", + dirName: "aws_iam_access_key_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { users := []*iam.User{ { @@ -706,7 +706,7 @@ func TestIamAccessKey(t *testing.T) { }, { test: "iam multiples keys for multiples users", - dirName: "iam_access_key_multiple", + dirName: "aws_iam_access_key_multiple", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { users := []*iam.User{ { @@ -737,7 +737,7 @@ func TestIamAccessKey(t *testing.T) { }, { test: "Cannot list iam user", - dirName: "iam_access_key_empty", + dirName: "aws_iam_access_key_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repo.On("ListAllUsers").Once().Return(nil, awsError) @@ -748,7 +748,7 @@ func TestIamAccessKey(t *testing.T) { }, { test: "Cannot list iam access_key", - dirName: "iam_access_key_empty", + dirName: "aws_iam_access_key_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllUsers").Once().Return([]*iam.User{}, nil) awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") @@ -830,7 +830,7 @@ func TestIamUserPolicyAttachment(t *testing.T) { }{ { test: "no iam user policy", - dirName: "iam_user_policy_empty", + dirName: "aws_iam_user_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { users := []*iam.User{ { @@ -844,7 +844,7 @@ func TestIamUserPolicyAttachment(t *testing.T) { }, { test: "iam multiples users multiple policies", - dirName: "iam_user_policy_attachment_multiple", + dirName: "aws_iam_user_policy_attachment_multiple", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { users := []*iam.User{ { @@ -950,7 +950,7 @@ func TestIamUserPolicyAttachment(t *testing.T) { }, { test: "cannot list user", - dirName: "iam_user_policy_empty", + dirName: "aws_iam_user_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repo.On("ListAllUsers").Return(nil, awsError) @@ -961,7 +961,7 @@ func TestIamUserPolicyAttachment(t *testing.T) { }, { test: "cannot list user policies attachment", - dirName: "iam_user_policy_empty", + dirName: "aws_iam_user_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllUsers").Once().Return([]*iam.User{}, nil) awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") @@ -1043,7 +1043,7 @@ func TestIamRolePolicy(t *testing.T) { }{ { test: "no iam role policy", - dirName: "iam_role_policy_empty", + dirName: "aws_iam_role_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { roles := []*iam.Role{ { @@ -1057,7 +1057,7 @@ func TestIamRolePolicy(t *testing.T) { }, { test: "multiples roles with inline policies", - dirName: "iam_role_policy_multiple", + dirName: "aws_iam_role_policy_multiple", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { roles := []*iam.Role{ { @@ -1081,7 +1081,7 @@ func TestIamRolePolicy(t *testing.T) { }, { test: "Cannot list roles", - dirName: "iam_role_policy_empty", + dirName: "aws_iam_role_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repo.On("ListAllRoles").Once().Return(nil, awsError) @@ -1092,7 +1092,7 @@ func TestIamRolePolicy(t *testing.T) { }, { test: "cannot list role policy", - dirName: "iam_role_policy_empty", + dirName: "aws_iam_role_policy_empty", mocks: func(repo *repository.MockIAMRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllRoles").Once().Return([]*iam.Role{}, nil) awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") diff --git a/pkg/remote/aws_lambda_scanner_test.go b/pkg/remote/aws_lambda_scanner_test.go index ab6da26f7..f29001b18 100644 --- a/pkg/remote/aws_lambda_scanner_test.go +++ b/pkg/remote/aws_lambda_scanner_test.go @@ -39,7 +39,7 @@ func TestScanLambdaFunction(t *testing.T) { }{ { test: "no lambda functions", - dirName: "lambda_function_empty", + dirName: "aws_lambda_function_empty", mocks: func(repo *repository.MockLambdaRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllLambdaFunctions").Return([]*lambda.FunctionConfiguration{}, nil) }, @@ -47,7 +47,7 @@ func TestScanLambdaFunction(t *testing.T) { }, { test: "with lambda functions", - dirName: "lambda_function_multiple", + dirName: "aws_lambda_function_multiple", mocks: func(repo *repository.MockLambdaRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllLambdaFunctions").Return([]*lambda.FunctionConfiguration{ { @@ -62,7 +62,7 @@ func TestScanLambdaFunction(t *testing.T) { }, { test: "One lambda with signing", - dirName: "lambda_function_signed", + dirName: "aws_lambda_function_signed", mocks: func(repo *repository.MockLambdaRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllLambdaFunctions").Return([]*lambda.FunctionConfiguration{ { @@ -74,7 +74,7 @@ func TestScanLambdaFunction(t *testing.T) { }, { test: "cannot list lambda functions", - dirName: "lambda_function_empty", + dirName: "aws_lambda_function_empty", mocks: func(repo *repository.MockLambdaRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repo.On("ListAllLambdaFunctions").Return([]*lambda.FunctionConfiguration{}, awsError) @@ -155,7 +155,7 @@ func TestScanLambdaEventSourceMapping(t *testing.T) { }{ { test: "no EventSourceMapping", - dirName: "lambda_source_mapping_empty", + dirName: "aws_lambda_source_mapping_empty", mocks: func(repo *repository.MockLambdaRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllLambdaEventSourceMappings").Return([]*lambda.EventSourceMappingConfiguration{}, nil) }, @@ -163,7 +163,7 @@ func TestScanLambdaEventSourceMapping(t *testing.T) { }, { test: "with 2 sqs EventSourceMapping", - dirName: "lambda_source_mapping_sqs_multiple", + dirName: "aws_lambda_source_mapping_sqs_multiple", mocks: func(repo *repository.MockLambdaRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllLambdaEventSourceMappings").Return([]*lambda.EventSourceMappingConfiguration{ { @@ -178,7 +178,7 @@ func TestScanLambdaEventSourceMapping(t *testing.T) { }, { test: "with dynamo EventSourceMapping", - dirName: "lambda_source_mapping_dynamo_multiple", + dirName: "aws_lambda_source_mapping_dynamo_multiple", mocks: func(repo *repository.MockLambdaRepository, alerter *mocks.AlerterInterface) { repo.On("ListAllLambdaEventSourceMappings").Return([]*lambda.EventSourceMappingConfiguration{ { @@ -190,7 +190,7 @@ func TestScanLambdaEventSourceMapping(t *testing.T) { }, { test: "cannot list lambda functions", - dirName: "lambda_function_empty", + dirName: "aws_lambda_function_empty", mocks: func(repo *repository.MockLambdaRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repo.On("ListAllLambdaEventSourceMappings").Return([]*lambda.EventSourceMappingConfiguration{}, awsError) diff --git a/pkg/remote/aws_route53_scanner_test.go b/pkg/remote/aws_route53_scanner_test.go index e08b6e2b4..422767e2f 100644 --- a/pkg/remote/aws_route53_scanner_test.go +++ b/pkg/remote/aws_route53_scanner_test.go @@ -39,7 +39,7 @@ func TestRoute53_HealthCheck(t *testing.T) { }{ { test: "no health check", - dirName: "route53_health_check_empty", + dirName: "aws_route53_health_check_empty", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllHealthChecks").Return([]*route53.HealthCheck{}, nil) }, @@ -47,7 +47,7 @@ func TestRoute53_HealthCheck(t *testing.T) { }, { test: "Multiple health check", - dirName: "route53_health_check_multiple", + dirName: "aws_route53_health_check_multiple", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllHealthChecks").Return([]*route53.HealthCheck{ {Id: awssdk.String("7001a9df-ded4-4802-9909-668eb80b972b")}, @@ -58,7 +58,7 @@ func TestRoute53_HealthCheck(t *testing.T) { }, { test: "cannot list health check", - dirName: "route53_health_check_empty", + dirName: "aws_route53_health_check_empty", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllHealthChecks").Return(nil, awsError) @@ -139,7 +139,7 @@ func TestRoute53_Zone(t *testing.T) { }{ { test: "no zones", - dirName: "route53_zone_empty", + dirName: "aws_route53_zone_empty", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllZones").Return( []*route53.HostedZone{}, @@ -150,7 +150,7 @@ func TestRoute53_Zone(t *testing.T) { }, { test: "single zone", - dirName: "route53_zone_single", + dirName: "aws_route53_zone_single", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllZones").Return( []*route53.HostedZone{ @@ -166,7 +166,7 @@ func TestRoute53_Zone(t *testing.T) { }, { test: "multiples zone (test pagination)", - dirName: "route53_zone_multiples", + dirName: "aws_route53_zone_multiples", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllZones").Return( []*route53.HostedZone{ @@ -190,7 +190,7 @@ func TestRoute53_Zone(t *testing.T) { }, { test: "cannot list zones", - dirName: "route53_zone_empty", + dirName: "aws_route53_zone_empty", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllZones").Return( @@ -274,7 +274,7 @@ func TestRoute53_Record(t *testing.T) { }{ { test: "no records", - dirName: "route53_zone_with_no_record", + dirName: "aws_route53_zone_with_no_record", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllZones").Return( []*route53.HostedZone{ @@ -291,7 +291,7 @@ func TestRoute53_Record(t *testing.T) { }, { test: "multiples records in multiples zones", - dirName: "route53_record_multiples", + dirName: "aws_route53_record_multiples", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllZones").Return( []*route53.HostedZone{ @@ -339,7 +339,7 @@ func TestRoute53_Record(t *testing.T) { }, { test: "explicit subdomain records", - dirName: "route53_record_explicit_subdomain", + dirName: "aws_route53_record_explicit_subdomain", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllZones").Return( []*route53.HostedZone{ @@ -381,7 +381,7 @@ func TestRoute53_Record(t *testing.T) { }, { test: "cannot list zones", - dirName: "route53_zone_with_no_record", + dirName: "aws_route53_zone_with_no_record", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllZones").Return( @@ -394,7 +394,7 @@ func TestRoute53_Record(t *testing.T) { }, { test: "cannot list records", - dirName: "route53_zone_with_no_record", + dirName: "aws_route53_zone_with_no_record", mocks: func(client *repository.MockRoute53Repository, alerter *mocks.AlerterInterface) { client.On("ListAllZones").Return( []*route53.HostedZone{ diff --git a/pkg/remote/aws_s3_scanner_test.go b/pkg/remote/aws_s3_scanner_test.go index 089dd227e..0ea501802 100644 --- a/pkg/remote/aws_s3_scanner_test.go +++ b/pkg/remote/aws_s3_scanner_test.go @@ -76,7 +76,7 @@ func TestS3Bucket(t *testing.T) { }, }, { - test: "cannot list bucket", dirName: "s3_bucket_list", + test: "cannot list bucket", dirName: "aws_s3_bucket_list", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repository.On("ListAllBuckets").Return(nil, awsError) @@ -158,7 +158,7 @@ func TestS3BucketInventory(t *testing.T) { wantErr error }{ { - test: "multiple bucket with multiple inventories", dirName: "s3_bucket_inventories_multiple", + test: "multiple bucket with multiple inventories", dirName: "aws_s3_bucket_inventories_multiple", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On( "ListAllBuckets", @@ -206,7 +206,7 @@ func TestS3BucketInventory(t *testing.T) { }, }, { - test: "cannot list bucket", dirName: "s3_bucket_inventories_list_bucket", + test: "cannot list bucket", dirName: "aws_s3_bucket_inventories_list_bucket", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repository.On("ListAllBuckets").Return(nil, awsError) @@ -216,7 +216,7 @@ func TestS3BucketInventory(t *testing.T) { wantErr: nil, }, { - test: "cannot list bucket inventories", dirName: "s3_bucket_inventories_list_inventories", + test: "cannot list bucket inventories", dirName: "aws_s3_bucket_inventories_list_inventories", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On("ListAllBuckets").Return( []*s3.Bucket{ @@ -319,7 +319,7 @@ func TestS3BucketNotification(t *testing.T) { }{ { test: "single bucket without notifications", - dirName: "s3_bucket_notifications_no_notif", + dirName: "aws_s3_bucket_notifications_no_notif", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On( "ListAllBuckets", @@ -346,7 +346,7 @@ func TestS3BucketNotification(t *testing.T) { }, }, { - test: "multiple bucket with notifications", dirName: "s3_bucket_notifications_multiple", + test: "multiple bucket with notifications", dirName: "aws_s3_bucket_notifications_multiple", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On( "ListAllBuckets", @@ -400,7 +400,7 @@ func TestS3BucketNotification(t *testing.T) { }, }, { - test: "Cannot get bucket notification", dirName: "s3_bucket_notifications_list_bucket", + test: "Cannot get bucket notification", dirName: "aws_s3_bucket_notifications_list_bucket", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On( "ListAllBuckets", @@ -422,7 +422,7 @@ func TestS3BucketNotification(t *testing.T) { wantErr: nil, }, { - test: "Cannot list bucket", dirName: "s3_bucket_notifications_list_bucket", + test: "Cannot list bucket", dirName: "aws_s3_bucket_notifications_list_bucket", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repository.On("ListAllBuckets").Return(nil, awsError) @@ -504,7 +504,7 @@ func TestS3BucketMetrics(t *testing.T) { wantErr error }{ { - test: "multiple bucket with multiple metrics", dirName: "s3_bucket_metrics_multiple", + test: "multiple bucket with multiple metrics", dirName: "aws_s3_bucket_metrics_multiple", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On( "ListAllBuckets", @@ -552,7 +552,7 @@ func TestS3BucketMetrics(t *testing.T) { }, }, { - test: "cannot list bucket", dirName: "s3_bucket_metrics_list_bucket", + test: "cannot list bucket", dirName: "aws_s3_bucket_metrics_list_bucket", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repository.On("ListAllBuckets").Return(nil, awsError) @@ -562,7 +562,7 @@ func TestS3BucketMetrics(t *testing.T) { wantErr: nil, }, { - test: "cannot list metrics", dirName: "s3_bucket_metrics_list_metrics", + test: "cannot list metrics", dirName: "aws_s3_bucket_metrics_list_metrics", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On("ListAllBuckets").Return( []*s3.Bucket{ @@ -666,7 +666,7 @@ func TestS3BucketPolicy(t *testing.T) { }{ { test: "single bucket without policy", - dirName: "s3_bucket_policy_no_policy", + dirName: "aws_s3_bucket_policy_no_policy", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On( "ListAllBuckets", @@ -693,7 +693,7 @@ func TestS3BucketPolicy(t *testing.T) { }, }, { - test: "multiple bucket with policies", dirName: "s3_bucket_policies_multiple", + test: "multiple bucket with policies", dirName: "aws_s3_bucket_policies_multiple", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { repository.On( "ListAllBuckets", @@ -741,7 +741,7 @@ func TestS3BucketPolicy(t *testing.T) { }, }, { - test: "cannot list bucket", dirName: "s3_bucket_policies_list_bucket", + test: "cannot list bucket", dirName: "aws_s3_bucket_policies_list_bucket", mocks: func(repository *repository.MockS3Repository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") repository.On("ListAllBuckets").Return(nil, awsError) diff --git a/pkg/remote/aws_sns_scanner_test.go b/pkg/remote/aws_sns_scanner_test.go index a7c1177f4..781d62451 100644 --- a/pkg/remote/aws_sns_scanner_test.go +++ b/pkg/remote/aws_sns_scanner_test.go @@ -39,7 +39,7 @@ func TestScanSNSTopic(t *testing.T) { }{ { test: "no SNS Topic", - dirName: "sns_topic_empty", + dirName: "aws_sns_topic_empty", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllTopics").Return([]*sns.Topic{}, nil) }, @@ -47,7 +47,7 @@ func TestScanSNSTopic(t *testing.T) { }, { test: "Multiple SNSTopic", - dirName: "sns_topic_multiple", + dirName: "aws_sns_topic_multiple", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllTopics").Return([]*sns.Topic{ {TopicArn: awssdk.String("arn:aws:sns:eu-west-3:526954929923:user-updates-topic")}, @@ -59,7 +59,7 @@ func TestScanSNSTopic(t *testing.T) { }, { test: "cannot list SNSTopic", - dirName: "sns_topic_empty", + dirName: "aws_sns_topic_empty", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllTopics").Return(nil, awsError) @@ -140,7 +140,7 @@ func TestSNSTopicPolicyScan(t *testing.T) { }{ { test: "no SNS Topic policy", - dirName: "sns_topic_policy_empty", + dirName: "aws_sns_topic_policy_empty", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllTopics").Return([]*sns.Topic{}, nil) }, @@ -148,7 +148,7 @@ func TestSNSTopicPolicyScan(t *testing.T) { }, { test: "Multiple SNSTopicPolicy", - dirName: "sns_topic_policy_multiple", + dirName: "aws_sns_topic_policy_multiple", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllTopics").Return([]*sns.Topic{ {TopicArn: awssdk.String("arn:aws:sns:us-east-1:526954929923:my-topic-with-policy")}, @@ -159,7 +159,7 @@ func TestSNSTopicPolicyScan(t *testing.T) { }, { test: "cannot list SNSTopic", - dirName: "sns_topic_policy_topic_list", + dirName: "aws_sns_topic_policy_topic_list", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllTopics").Return(nil, awsError) @@ -240,7 +240,7 @@ func TestSNSTopicSubscriptionScan(t *testing.T) { }{ { test: "no SNS Topic Subscription", - dirName: "sns_topic_subscription_empty", + dirName: "aws_sns_topic_subscription_empty", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllSubscriptions").Return([]*sns.Subscription{}, nil) }, @@ -248,7 +248,7 @@ func TestSNSTopicSubscriptionScan(t *testing.T) { }, { test: "Multiple SNSTopic Subscription", - dirName: "sns_topic_subscription_multiple", + dirName: "aws_sns_topic_subscription_multiple", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllSubscriptions").Return([]*sns.Subscription{ {SubscriptionArn: awssdk.String("arn:aws:sns:us-east-1:526954929923:user-updates-topic2:c0f794c5-a009-4db4-9147-4c55959787fa")}, @@ -259,7 +259,7 @@ func TestSNSTopicSubscriptionScan(t *testing.T) { }, { test: "Multiple SNSTopic Subscription with one pending and one incorrect", - dirName: "sns_topic_subscription_multiple", + dirName: "aws_sns_topic_subscription_multiple", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllSubscriptions").Return([]*sns.Subscription{ {SubscriptionArn: awssdk.String("PendingConfirmation"), Endpoint: awssdk.String("TEST")}, @@ -276,7 +276,7 @@ func TestSNSTopicSubscriptionScan(t *testing.T) { }, { test: "cannot list SNSTopic subscription", - dirName: "sns_topic_subscription_list", + dirName: "aws_sns_topic_subscription_list", mocks: func(client *repository.MockSNSRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllSubscriptions").Return(nil, awsError) diff --git a/pkg/remote/aws_sqs_scanner_test.go b/pkg/remote/aws_sqs_scanner_test.go index b13d377a2..dd60d6c0a 100644 --- a/pkg/remote/aws_sqs_scanner_test.go +++ b/pkg/remote/aws_sqs_scanner_test.go @@ -36,7 +36,7 @@ func TestSQSQueue(t *testing.T) { }{ { test: "no sqs queues", - dirName: "sqs_queue_empty", + dirName: "aws_sqs_queue_empty", mocks: func(client *repository.MockSQSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllQueues").Return([]*string{}, nil) }, @@ -44,7 +44,7 @@ func TestSQSQueue(t *testing.T) { }, { test: "multiple sqs queues", - dirName: "sqs_queue_multiple", + dirName: "aws_sqs_queue_multiple", mocks: func(client *repository.MockSQSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllQueues").Return([]*string{ awssdk.String("https://sqs.eu-west-3.amazonaws.com/047081014315/bar.fifo"), @@ -55,7 +55,7 @@ func TestSQSQueue(t *testing.T) { }, { test: "cannot list sqs queues", - dirName: "sqs_queue_empty", + dirName: "aws_sqs_queue_empty", mocks: func(client *repository.MockSQSRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllQueues").Return(nil, awsError) @@ -136,7 +136,7 @@ func TestSQSQueuePolicy(t *testing.T) { // sqs queue with no policy case is not possible // as a default SQSDefaultPolicy (e.g. policy="") will always be present in each queue test: "no sqs queue policies", - dirName: "sqs_queue_policy_empty", + dirName: "aws_sqs_queue_policy_empty", mocks: func(client *repository.MockSQSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllQueues").Return([]*string{}, nil) }, @@ -144,7 +144,7 @@ func TestSQSQueuePolicy(t *testing.T) { }, { test: "multiple sqs queue policies (default or not)", - dirName: "sqs_queue_policy_multiple", + dirName: "aws_sqs_queue_policy_multiple", mocks: func(client *repository.MockSQSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllQueues").Return([]*string{ awssdk.String("https://sqs.eu-west-3.amazonaws.com/047081014315/bar.fifo"), @@ -165,7 +165,7 @@ func TestSQSQueuePolicy(t *testing.T) { }, { test: "multiple sqs queue policies (with nil attributes)", - dirName: "sqs_queue_policy_multiple", + dirName: "aws_sqs_queue_policy_multiple", mocks: func(client *repository.MockSQSRepository, alerter *mocks.AlerterInterface) { client.On("ListAllQueues").Return([]*string{ awssdk.String("https://sqs.eu-west-3.amazonaws.com/047081014315/bar.fifo"), @@ -182,7 +182,7 @@ func TestSQSQueuePolicy(t *testing.T) { }, { test: "cannot list sqs queues, thus sqs queue policies", - dirName: "sqs_queue_policy_empty", + dirName: "aws_sqs_queue_policy_empty", mocks: func(client *repository.MockSQSRepository, alerter *mocks.AlerterInterface) { awsError := awserr.NewRequestFailure(awserr.New("AccessDeniedException", "", errors.New("")), 403, "") client.On("ListAllQueues").Return(nil, awsError) diff --git a/pkg/remote/test/default_vpc/aws_default_vpc-vpc-a8c5d4c1.res.golden.json b/pkg/remote/test/aws_default_vpc/aws_default_vpc-vpc-a8c5d4c1.res.golden.json similarity index 100% rename from pkg/remote/test/default_vpc/aws_default_vpc-vpc-a8c5d4c1.res.golden.json rename to pkg/remote/test/aws_default_vpc/aws_default_vpc-vpc-a8c5d4c1.res.golden.json diff --git a/pkg/remote/test/default_vpc/results.golden.json b/pkg/remote/test/aws_default_vpc/results.golden.json similarity index 100% rename from pkg/remote/test/default_vpc/results.golden.json rename to pkg/remote/test/aws_default_vpc/results.golden.json diff --git a/pkg/remote/test/default_vpc/terraform.tf b/pkg/remote/test/aws_default_vpc/terraform.tf similarity index 100% rename from pkg/remote/test/default_vpc/terraform.tf rename to pkg/remote/test/aws_default_vpc/terraform.tf diff --git a/pkg/remote/test/dynamodb_table_multiple/aws_dynamodb_table-GameScores-GameScores.res.golden.json b/pkg/remote/test/aws_dynamodb_table_multiple/aws_dynamodb_table-GameScores-GameScores.res.golden.json similarity index 100% rename from pkg/remote/test/dynamodb_table_multiple/aws_dynamodb_table-GameScores-GameScores.res.golden.json rename to pkg/remote/test/aws_dynamodb_table_multiple/aws_dynamodb_table-GameScores-GameScores.res.golden.json diff --git a/pkg/remote/test/dynamodb_table_multiple/aws_dynamodb_table-example-example.res.golden.json b/pkg/remote/test/aws_dynamodb_table_multiple/aws_dynamodb_table-example-example.res.golden.json similarity index 100% rename from pkg/remote/test/dynamodb_table_multiple/aws_dynamodb_table-example-example.res.golden.json rename to pkg/remote/test/aws_dynamodb_table_multiple/aws_dynamodb_table-example-example.res.golden.json diff --git a/pkg/remote/test/dynamodb_table_multiple/results.golden.json b/pkg/remote/test/aws_dynamodb_table_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/dynamodb_table_multiple/results.golden.json rename to pkg/remote/test/aws_dynamodb_table_multiple/results.golden.json diff --git a/pkg/remote/test/iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD223VWU32A-test-driftctl.res.golden.json b/pkg/remote/test/aws_iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD223VWU32A-test-driftctl.res.golden.json similarity index 100% rename from pkg/remote/test/iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD223VWU32A-test-driftctl.res.golden.json rename to pkg/remote/test/aws_iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD223VWU32A-test-driftctl.res.golden.json diff --git a/pkg/remote/test/iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD26EJME25D-test-driftctl2.res.golden.json b/pkg/remote/test/aws_iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD26EJME25D-test-driftctl2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD26EJME25D-test-driftctl2.res.golden.json rename to pkg/remote/test/aws_iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD26EJME25D-test-driftctl2.res.golden.json diff --git a/pkg/remote/test/iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD2QYI36UZP-test-driftctl.res.golden.json b/pkg/remote/test/aws_iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD2QYI36UZP-test-driftctl.res.golden.json similarity index 100% rename from pkg/remote/test/iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD2QYI36UZP-test-driftctl.res.golden.json rename to pkg/remote/test/aws_iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD2QYI36UZP-test-driftctl.res.golden.json diff --git a/pkg/remote/test/iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD2SWDFVVMG-test-driftctl2.res.golden.json b/pkg/remote/test/aws_iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD2SWDFVVMG-test-driftctl2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD2SWDFVVMG-test-driftctl2.res.golden.json rename to pkg/remote/test/aws_iam_access_key_multiple/aws_iam_access_key-AKIA5QYBVVD2SWDFVVMG-test-driftctl2.res.golden.json diff --git a/pkg/remote/test/iam_access_key_multiple/results.golden.json b/pkg/remote/test/aws_iam_access_key_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/iam_access_key_multiple/results.golden.json rename to pkg/remote/test/aws_iam_access_key_multiple/results.golden.json diff --git a/pkg/remote/test/iam_access_key_multiple/terraform.tf b/pkg/remote/test/aws_iam_access_key_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/iam_access_key_multiple/terraform.tf rename to pkg/remote/test/aws_iam_access_key_multiple/terraform.tf diff --git a/pkg/remote/test/iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-0.res.golden.json b/pkg/remote/test/aws_iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-0.res.golden.json similarity index 100% rename from pkg/remote/test/iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-0.res.golden.json rename to pkg/remote/test/aws_iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-0.res.golden.json diff --git a/pkg/remote/test/iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-1.res.golden.json b/pkg/remote/test/aws_iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-1.res.golden.json similarity index 100% rename from pkg/remote/test/iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-1.res.golden.json rename to pkg/remote/test/aws_iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-1.res.golden.json diff --git a/pkg/remote/test/iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-2.res.golden.json b/pkg/remote/test/aws_iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-2.res.golden.json rename to pkg/remote/test/aws_iam_policy_multiple/aws_iam_policy-arn_aws_iam__929327065333_policy_policy-2.res.golden.json diff --git a/pkg/remote/test/iam_policy_multiple/results.golden.json b/pkg/remote/test/aws_iam_policy_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/iam_policy_multiple/results.golden.json rename to pkg/remote/test/aws_iam_policy_multiple/results.golden.json diff --git a/pkg/remote/test/iam_role_multiple/aws_iam_role-test_role_0.res.golden.json b/pkg/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_0.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_multiple/aws_iam_role-test_role_0.res.golden.json rename to pkg/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_0.res.golden.json diff --git a/pkg/remote/test/iam_role_multiple/aws_iam_role-test_role_1.res.golden.json b/pkg/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_1.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_multiple/aws_iam_role-test_role_1.res.golden.json rename to pkg/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_1.res.golden.json diff --git a/pkg/remote/test/iam_role_multiple/aws_iam_role-test_role_2.res.golden.json b/pkg/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_multiple/aws_iam_role-test_role_2.res.golden.json rename to pkg/remote/test/aws_iam_role_multiple/aws_iam_role-test_role_2.res.golden.json diff --git a/pkg/remote/test/iam_role_multiple/results.golden.json b/pkg/remote/test/aws_iam_role_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/iam_role_multiple/results.golden.json rename to pkg/remote/test/aws_iam_role_multiple/results.golden.json diff --git a/pkg/remote/test/iam_role_multiple/terraform.tf b/pkg/remote/test/aws_iam_role_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/iam_role_multiple/terraform.tf rename to pkg/remote/test/aws_iam_role_multiple/terraform.tf diff --git a/pkg/remote/test/iam_role_policy_empty/schema.golden.json b/pkg/remote/test/aws_iam_role_policy_empty/schema.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_empty/schema.golden.json rename to pkg/remote/test/aws_iam_role_policy_empty/schema.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-0.res.golden.json b/pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-0.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-0.res.golden.json rename to pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-0.res.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-1.res.golden.json b/pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-1.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-1.res.golden.json rename to pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-1.res.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-2.res.golden.json b/pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-2.res.golden.json rename to pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_0_policy-role0-2.res.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-0.res.golden.json b/pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-0.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-0.res.golden.json rename to pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-0.res.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-1.res.golden.json b/pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-1.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-1.res.golden.json rename to pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-1.res.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-2.res.golden.json b/pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-2.res.golden.json rename to pkg/remote/test/aws_iam_role_policy_multiple/aws_iam_role_policy-test_role_1_policy-role1-2.res.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/results.golden.json b/pkg/remote/test/aws_iam_role_policy_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/results.golden.json rename to pkg/remote/test/aws_iam_role_policy_multiple/results.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/schema.golden.json b/pkg/remote/test/aws_iam_role_policy_multiple/schema.golden.json similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/schema.golden.json rename to pkg/remote/test/aws_iam_role_policy_multiple/schema.golden.json diff --git a/pkg/remote/test/iam_role_policy_multiple/terraform.tf b/pkg/remote/test/aws_iam_role_policy_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/iam_role_policy_multiple/terraform.tf rename to pkg/remote/test/aws_iam_role_policy_multiple/terraform.tf diff --git a/pkg/remote/test/iam_user_multiple/aws_iam_user-test-driftctl-0.res.golden.json b/pkg/remote/test/aws_iam_user_multiple/aws_iam_user-test-driftctl-0.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_multiple/aws_iam_user-test-driftctl-0.res.golden.json rename to pkg/remote/test/aws_iam_user_multiple/aws_iam_user-test-driftctl-0.res.golden.json diff --git a/pkg/remote/test/iam_user_multiple/aws_iam_user-test-driftctl-1.res.golden.json b/pkg/remote/test/aws_iam_user_multiple/aws_iam_user-test-driftctl-1.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_multiple/aws_iam_user-test-driftctl-1.res.golden.json rename to pkg/remote/test/aws_iam_user_multiple/aws_iam_user-test-driftctl-1.res.golden.json diff --git a/pkg/remote/test/iam_user_multiple/aws_iam_user-test-driftctl-2.res.golden.json b/pkg/remote/test/aws_iam_user_multiple/aws_iam_user-test-driftctl-2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_multiple/aws_iam_user-test-driftctl-2.res.golden.json rename to pkg/remote/test/aws_iam_user_multiple/aws_iam_user-test-driftctl-2.res.golden.json diff --git a/pkg/remote/test/iam_user_multiple/results.golden.json b/pkg/remote/test/aws_iam_user_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/iam_user_multiple/results.golden.json rename to pkg/remote/test/aws_iam_user_multiple/results.golden.json diff --git a/pkg/remote/test/iam_user_multiple/terraform.tf b/pkg/remote/test/aws_iam_user_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/iam_user_multiple/terraform.tf rename to pkg/remote/test/aws_iam_user_multiple/terraform.tf diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer-arn_aws_iam__726421854799_policy_test-loadbalancer.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer-arn_aws_iam__726421854799_policy_test-loadbalancer.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer-arn_aws_iam__726421854799_policy_test-loadbalancer.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer-arn_aws_iam__726421854799_policy_test-loadbalancer.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer2-arn_aws_iam__726421854799_policy_test-loadbalancer2.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer2-arn_aws_iam__726421854799_policy_test-loadbalancer2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer2-arn_aws_iam__726421854799_policy_test-loadbalancer2.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer2-arn_aws_iam__726421854799_policy_test-loadbalancer2.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer3-arn_aws_iam__726421854799_policy_test-loadbalancer3.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer3-arn_aws_iam__726421854799_policy_test-loadbalancer3.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer3-arn_aws_iam__726421854799_policy_test-loadbalancer3.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test-loadbalancer3-arn_aws_iam__726421854799_policy_test-loadbalancer3.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer-arn_aws_iam__726421854799_policy_test2-loadbalancer.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer-arn_aws_iam__726421854799_policy_test2-loadbalancer.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer-arn_aws_iam__726421854799_policy_test2-loadbalancer.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer-arn_aws_iam__726421854799_policy_test2-loadbalancer.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer2-arn_aws_iam__726421854799_policy_test2-loadbalancer2.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer2-arn_aws_iam__726421854799_policy_test2-loadbalancer2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer2-arn_aws_iam__726421854799_policy_test2-loadbalancer2.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer2-arn_aws_iam__726421854799_policy_test2-loadbalancer2.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer3-arn_aws_iam__726421854799_policy_test2-loadbalancer3.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer3-arn_aws_iam__726421854799_policy_test2-loadbalancer3.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer3-arn_aws_iam__726421854799_policy_test2-loadbalancer3.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test2-loadbalancer3-arn_aws_iam__726421854799_policy_test2-loadbalancer3.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer-arn_aws_iam__726421854799_policy_test3-loadbalancer.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer-arn_aws_iam__726421854799_policy_test3-loadbalancer.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer-arn_aws_iam__726421854799_policy_test3-loadbalancer.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer-arn_aws_iam__726421854799_policy_test3-loadbalancer.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer2-arn_aws_iam__726421854799_policy_test3-loadbalancer2.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer2-arn_aws_iam__726421854799_policy_test3-loadbalancer2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer2-arn_aws_iam__726421854799_policy_test3-loadbalancer2.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer2-arn_aws_iam__726421854799_policy_test3-loadbalancer2.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer3-arn_aws_iam__726421854799_policy_test3-loadbalancer3.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer3-arn_aws_iam__726421854799_policy_test3-loadbalancer3.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer3-arn_aws_iam__726421854799_policy_test3-loadbalancer3.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test3-loadbalancer3-arn_aws_iam__726421854799_policy_test3-loadbalancer3.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer-arn_aws_iam__726421854799_policy_test4-loadbalancer.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer-arn_aws_iam__726421854799_policy_test4-loadbalancer.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer-arn_aws_iam__726421854799_policy_test4-loadbalancer.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer-arn_aws_iam__726421854799_policy_test4-loadbalancer.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer2-arn_aws_iam__726421854799_policy_test4-loadbalancer2.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer2-arn_aws_iam__726421854799_policy_test4-loadbalancer2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer2-arn_aws_iam__726421854799_policy_test4-loadbalancer2.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer2-arn_aws_iam__726421854799_policy_test4-loadbalancer2.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer3-arn_aws_iam__726421854799_policy_test4-loadbalancer3.res.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer3-arn_aws_iam__726421854799_policy_test4-loadbalancer3.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer3-arn_aws_iam__726421854799_policy_test4-loadbalancer3.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/aws_iam_user_policy_attachment-test4-loadbalancer3-arn_aws_iam__726421854799_policy_test4-loadbalancer3.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/main.tf b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/main.tf similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/main.tf rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/main.tf diff --git a/pkg/remote/test/iam_user_policy_attachment_multiple/results.golden.json b/pkg/remote/test/aws_iam_user_policy_attachment_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_attachment_multiple/results.golden.json rename to pkg/remote/test/aws_iam_user_policy_attachment_multiple/results.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test2.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test2.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test2.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test22.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test22.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test22.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test22.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test23.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test23.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test23.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test23.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test24.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test24.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test24.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test24.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test3.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test3.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test3.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test3.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test4.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test4.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test4.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer2_test4.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test2.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test2.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test2.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test22.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test22.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test22.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test22.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test23.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test23.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test23.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test23.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test24.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test24.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test24.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test24.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test3.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test3.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test3.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test3.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test32.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test32.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test32.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test32.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test33.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test33.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test33.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test33.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test34.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test34.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test34.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test34.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test4.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test4.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test4.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer3_test4.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test2.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test2.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test2.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test2.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test3.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test3.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test3.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test3.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test4.res.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test4.res.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test4.res.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/aws_iam_user_policy-loadbalancer_test4.res.golden.json diff --git a/pkg/remote/test/iam_user_policy_multiple/main.tf b/pkg/remote/test/aws_iam_user_policy_multiple/main.tf similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/main.tf rename to pkg/remote/test/aws_iam_user_policy_multiple/main.tf diff --git a/pkg/remote/test/iam_user_policy_multiple/results.golden.json b/pkg/remote/test/aws_iam_user_policy_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/iam_user_policy_multiple/results.golden.json rename to pkg/remote/test/aws_iam_user_policy_multiple/results.golden.json diff --git a/pkg/remote/test/lambda_function_multiple/aws_lambda_function-bar-bar.res.golden.json b/pkg/remote/test/aws_lambda_function_multiple/aws_lambda_function-bar-bar.res.golden.json similarity index 100% rename from pkg/remote/test/lambda_function_multiple/aws_lambda_function-bar-bar.res.golden.json rename to pkg/remote/test/aws_lambda_function_multiple/aws_lambda_function-bar-bar.res.golden.json diff --git a/pkg/remote/test/lambda_function_multiple/aws_lambda_function-foo-foo.res.golden.json b/pkg/remote/test/aws_lambda_function_multiple/aws_lambda_function-foo-foo.res.golden.json similarity index 100% rename from pkg/remote/test/lambda_function_multiple/aws_lambda_function-foo-foo.res.golden.json rename to pkg/remote/test/aws_lambda_function_multiple/aws_lambda_function-foo-foo.res.golden.json diff --git a/pkg/remote/test/lambda_function_multiple/results.golden.json b/pkg/remote/test/aws_lambda_function_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/lambda_function_multiple/results.golden.json rename to pkg/remote/test/aws_lambda_function_multiple/results.golden.json diff --git a/pkg/remote/test/lambda_function_signed/aws_lambda_function-foo-foo.res.golden.json b/pkg/remote/test/aws_lambda_function_signed/aws_lambda_function-foo-foo.res.golden.json similarity index 100% rename from pkg/remote/test/lambda_function_signed/aws_lambda_function-foo-foo.res.golden.json rename to pkg/remote/test/aws_lambda_function_signed/aws_lambda_function-foo-foo.res.golden.json diff --git a/pkg/remote/test/lambda_function_signed/lambda.zip b/pkg/remote/test/aws_lambda_function_signed/lambda.zip similarity index 100% rename from pkg/remote/test/lambda_function_signed/lambda.zip rename to pkg/remote/test/aws_lambda_function_signed/lambda.zip diff --git a/pkg/remote/test/lambda_function_signed/main.tf b/pkg/remote/test/aws_lambda_function_signed/main.tf similarity index 100% rename from pkg/remote/test/lambda_function_signed/main.tf rename to pkg/remote/test/aws_lambda_function_signed/main.tf diff --git a/pkg/remote/test/lambda_function_signed/results.golden.json b/pkg/remote/test/aws_lambda_function_signed/results.golden.json similarity index 100% rename from pkg/remote/test/lambda_function_signed/results.golden.json rename to pkg/remote/test/aws_lambda_function_signed/results.golden.json diff --git a/pkg/remote/test/lambda_source_mapping_dynamo_multiple/aws_lambda_event_source_mapping-1aa9c4a0-060b-41c1-a9ae-dc304ebcdb00.res.golden.json b/pkg/remote/test/aws_lambda_source_mapping_dynamo_multiple/aws_lambda_event_source_mapping-1aa9c4a0-060b-41c1-a9ae-dc304ebcdb00.res.golden.json similarity index 100% rename from pkg/remote/test/lambda_source_mapping_dynamo_multiple/aws_lambda_event_source_mapping-1aa9c4a0-060b-41c1-a9ae-dc304ebcdb00.res.golden.json rename to pkg/remote/test/aws_lambda_source_mapping_dynamo_multiple/aws_lambda_event_source_mapping-1aa9c4a0-060b-41c1-a9ae-dc304ebcdb00.res.golden.json diff --git a/pkg/remote/test/lambda_source_mapping_dynamo_multiple/results.golden.json b/pkg/remote/test/aws_lambda_source_mapping_dynamo_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/lambda_source_mapping_dynamo_multiple/results.golden.json rename to pkg/remote/test/aws_lambda_source_mapping_dynamo_multiple/results.golden.json diff --git a/pkg/remote/test/lambda_source_mapping_sqs_multiple/aws_lambda_event_source_mapping-13ff66f8-37eb-4ad6-a0a8-594fea72df4f.res.golden.json b/pkg/remote/test/aws_lambda_source_mapping_sqs_multiple/aws_lambda_event_source_mapping-13ff66f8-37eb-4ad6-a0a8-594fea72df4f.res.golden.json similarity index 100% rename from pkg/remote/test/lambda_source_mapping_sqs_multiple/aws_lambda_event_source_mapping-13ff66f8-37eb-4ad6-a0a8-594fea72df4f.res.golden.json rename to pkg/remote/test/aws_lambda_source_mapping_sqs_multiple/aws_lambda_event_source_mapping-13ff66f8-37eb-4ad6-a0a8-594fea72df4f.res.golden.json diff --git a/pkg/remote/test/lambda_source_mapping_sqs_multiple/aws_lambda_event_source_mapping-4ad7e2b3-79e9-4713-9d9d-5af2c01d9058.res.golden.json b/pkg/remote/test/aws_lambda_source_mapping_sqs_multiple/aws_lambda_event_source_mapping-4ad7e2b3-79e9-4713-9d9d-5af2c01d9058.res.golden.json similarity index 100% rename from pkg/remote/test/lambda_source_mapping_sqs_multiple/aws_lambda_event_source_mapping-4ad7e2b3-79e9-4713-9d9d-5af2c01d9058.res.golden.json rename to pkg/remote/test/aws_lambda_source_mapping_sqs_multiple/aws_lambda_event_source_mapping-4ad7e2b3-79e9-4713-9d9d-5af2c01d9058.res.golden.json diff --git a/pkg/remote/test/lambda_source_mapping_sqs_multiple/results.golden.json b/pkg/remote/test/aws_lambda_source_mapping_sqs_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/lambda_source_mapping_sqs_multiple/results.golden.json rename to pkg/remote/test/aws_lambda_source_mapping_sqs_multiple/results.golden.json diff --git a/pkg/remote/test/route53_health_check_empty/schema.golden.json b/pkg/remote/test/aws_route53_health_check_empty/schema.golden.json similarity index 100% rename from pkg/remote/test/route53_health_check_empty/schema.golden.json rename to pkg/remote/test/aws_route53_health_check_empty/schema.golden.json diff --git a/pkg/remote/test/route53_health_check_multiple/aws_route53_health_check-7001a9df-ded4-4802-9909-668eb80b972b.res.golden.json b/pkg/remote/test/aws_route53_health_check_multiple/aws_route53_health_check-7001a9df-ded4-4802-9909-668eb80b972b.res.golden.json similarity index 100% rename from pkg/remote/test/route53_health_check_multiple/aws_route53_health_check-7001a9df-ded4-4802-9909-668eb80b972b.res.golden.json rename to pkg/remote/test/aws_route53_health_check_multiple/aws_route53_health_check-7001a9df-ded4-4802-9909-668eb80b972b.res.golden.json diff --git a/pkg/remote/test/route53_health_check_multiple/aws_route53_health_check-84fc318a-2e0d-41d6-b638-280e2f0f4e26.res.golden.json b/pkg/remote/test/aws_route53_health_check_multiple/aws_route53_health_check-84fc318a-2e0d-41d6-b638-280e2f0f4e26.res.golden.json similarity index 100% rename from pkg/remote/test/route53_health_check_multiple/aws_route53_health_check-84fc318a-2e0d-41d6-b638-280e2f0f4e26.res.golden.json rename to pkg/remote/test/aws_route53_health_check_multiple/aws_route53_health_check-84fc318a-2e0d-41d6-b638-280e2f0f4e26.res.golden.json diff --git a/pkg/remote/test/route53_health_check_multiple/results.golden.json b/pkg/remote/test/aws_route53_health_check_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/route53_health_check_multiple/results.golden.json rename to pkg/remote/test/aws_route53_health_check_multiple/results.golden.json diff --git a/pkg/remote/test/route53_health_check_multiple/terraform.tf b/pkg/remote/test/aws_route53_health_check_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/route53_health_check_multiple/terraform.tf rename to pkg/remote/test/aws_route53_health_check_multiple/terraform.tf diff --git a/pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_A.res.golden.json b/pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_A.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_A.res.golden.json rename to pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_A.res.golden.json diff --git a/pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_TXT.res.golden.json b/pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_TXT.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_TXT.res.golden.json rename to pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM__test2.foo-2.com_TXT.res.golden.json diff --git a/pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test0_A.res.golden.json b/pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test0_A.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test0_A.res.golden.json rename to pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test0_A.res.golden.json diff --git a/pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test0_TXT.res.golden.json b/pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test0_TXT.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test0_TXT.res.golden.json rename to pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test0_TXT.res.golden.json diff --git a/pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test1.foo-2.com_A.res.golden.json b/pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test1.foo-2.com_A.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test1.foo-2.com_A.res.golden.json rename to pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test1.foo-2.com_A.res.golden.json diff --git a/pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test1.foo-2.com_TXT.res.golden.json b/pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test1.foo-2.com_TXT.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test1.foo-2.com_TXT.res.golden.json rename to pkg/remote/test/aws_route53_record_explicit_subdomain/aws_route53_record-Z06486383UC8WYSBZTWFM_test1.foo-2.com_TXT.res.golden.json diff --git a/pkg/remote/test/route53_record_explicit_subdomain/main.tf b/pkg/remote/test/aws_route53_record_explicit_subdomain/main.tf similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/main.tf rename to pkg/remote/test/aws_route53_record_explicit_subdomain/main.tf diff --git a/pkg/remote/test/route53_record_explicit_subdomain/results.golden.json b/pkg/remote/test/aws_route53_record_explicit_subdomain/results.golden.json similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/results.golden.json rename to pkg/remote/test/aws_route53_record_explicit_subdomain/results.golden.json diff --git a/pkg/remote/test/route53_record_explicit_subdomain/schema.golden.json b/pkg/remote/test/aws_route53_record_explicit_subdomain/schema.golden.json similarity index 100% rename from pkg/remote/test/route53_record_explicit_subdomain/schema.golden.json rename to pkg/remote/test/aws_route53_record_explicit_subdomain/schema.golden.json diff --git a/pkg/remote/test/route53_record_multiples/aws_route53_record-Z10347383HV75H96J919W_test2_A.res.golden.json b/pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z10347383HV75H96J919W_test2_A.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_multiples/aws_route53_record-Z10347383HV75H96J919W_test2_A.res.golden.json rename to pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z10347383HV75H96J919W_test2_A.res.golden.json diff --git a/pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_foo-0.com_NS.res.golden.json b/pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_foo-0.com_NS.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_foo-0.com_NS.res.golden.json rename to pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_foo-0.com_NS.res.golden.json diff --git a/pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test0_A.res.golden.json b/pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test0_A.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test0_A.res.golden.json rename to pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test0_A.res.golden.json diff --git a/pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test1_A.res.golden.json b/pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test1_A.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test1_A.res.golden.json rename to pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test1_A.res.golden.json diff --git a/pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test2_A.res.golden.json b/pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test2_A.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test2_A.res.golden.json rename to pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test2_A.res.golden.json diff --git a/pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test3_A.res.golden.json b/pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test3_A.res.golden.json similarity index 100% rename from pkg/remote/test/route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test3_A.res.golden.json rename to pkg/remote/test/aws_route53_record_multiples/aws_route53_record-Z1035360GLIB82T1EH2G_test3_A.res.golden.json diff --git a/pkg/remote/test/route53_record_multiples/results.golden.json b/pkg/remote/test/aws_route53_record_multiples/results.golden.json similarity index 100% rename from pkg/remote/test/route53_record_multiples/results.golden.json rename to pkg/remote/test/aws_route53_record_multiples/results.golden.json diff --git a/pkg/remote/test/route53_record_multiples/schema.golden.json b/pkg/remote/test/aws_route53_record_multiples/schema.golden.json similarity index 100% rename from pkg/remote/test/route53_record_multiples/schema.golden.json rename to pkg/remote/test/aws_route53_record_multiples/schema.golden.json diff --git a/pkg/remote/test/route53_zone_empty/schema.golden.json b/pkg/remote/test/aws_route53_zone_empty/schema.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_empty/schema.golden.json rename to pkg/remote/test/aws_route53_zone_empty/schema.golden.json diff --git a/pkg/remote/test/route53_zone_multiples/aws_route53_zone-Z01804312AV8PHE3C43AD.res.golden.json b/pkg/remote/test/aws_route53_zone_multiples/aws_route53_zone-Z01804312AV8PHE3C43AD.res.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_multiples/aws_route53_zone-Z01804312AV8PHE3C43AD.res.golden.json rename to pkg/remote/test/aws_route53_zone_multiples/aws_route53_zone-Z01804312AV8PHE3C43AD.res.golden.json diff --git a/pkg/remote/test/route53_zone_multiples/aws_route53_zone-Z01809283VH9BBALZHO7B.res.golden.json b/pkg/remote/test/aws_route53_zone_multiples/aws_route53_zone-Z01809283VH9BBALZHO7B.res.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_multiples/aws_route53_zone-Z01809283VH9BBALZHO7B.res.golden.json rename to pkg/remote/test/aws_route53_zone_multiples/aws_route53_zone-Z01809283VH9BBALZHO7B.res.golden.json diff --git a/pkg/remote/test/route53_zone_multiples/aws_route53_zone-Z01874941AR1TCGV5K65C.res.golden.json b/pkg/remote/test/aws_route53_zone_multiples/aws_route53_zone-Z01874941AR1TCGV5K65C.res.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_multiples/aws_route53_zone-Z01874941AR1TCGV5K65C.res.golden.json rename to pkg/remote/test/aws_route53_zone_multiples/aws_route53_zone-Z01874941AR1TCGV5K65C.res.golden.json diff --git a/pkg/remote/test/route53_zone_multiples/results.golden.json b/pkg/remote/test/aws_route53_zone_multiples/results.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_multiples/results.golden.json rename to pkg/remote/test/aws_route53_zone_multiples/results.golden.json diff --git a/pkg/remote/test/route53_zone_multiples/schema.golden.json b/pkg/remote/test/aws_route53_zone_multiples/schema.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_multiples/schema.golden.json rename to pkg/remote/test/aws_route53_zone_multiples/schema.golden.json diff --git a/pkg/remote/test/route53_zone_multiples/terraform.tf b/pkg/remote/test/aws_route53_zone_multiples/terraform.tf similarity index 100% rename from pkg/remote/test/route53_zone_multiples/terraform.tf rename to pkg/remote/test/aws_route53_zone_multiples/terraform.tf diff --git a/pkg/remote/test/route53_zone_single/aws_route53_zone-Z08068311RGDXPHF8KE62.res.golden.json b/pkg/remote/test/aws_route53_zone_single/aws_route53_zone-Z08068311RGDXPHF8KE62.res.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_single/aws_route53_zone-Z08068311RGDXPHF8KE62.res.golden.json rename to pkg/remote/test/aws_route53_zone_single/aws_route53_zone-Z08068311RGDXPHF8KE62.res.golden.json diff --git a/pkg/remote/test/route53_zone_single/aws_route53_zone-Z093553112BLINKY4N57.res.golden.json b/pkg/remote/test/aws_route53_zone_single/aws_route53_zone-Z093553112BLINKY4N57.res.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_single/aws_route53_zone-Z093553112BLINKY4N57.res.golden.json rename to pkg/remote/test/aws_route53_zone_single/aws_route53_zone-Z093553112BLINKY4N57.res.golden.json diff --git a/pkg/remote/test/route53_zone_single/results.golden.json b/pkg/remote/test/aws_route53_zone_single/results.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_single/results.golden.json rename to pkg/remote/test/aws_route53_zone_single/results.golden.json diff --git a/pkg/remote/test/route53_zone_single/schema.golden.json b/pkg/remote/test/aws_route53_zone_single/schema.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_single/schema.golden.json rename to pkg/remote/test/aws_route53_zone_single/schema.golden.json diff --git a/pkg/remote/test/route53_zone_single/terraform.tf b/pkg/remote/test/aws_route53_zone_single/terraform.tf similarity index 100% rename from pkg/remote/test/route53_zone_single/terraform.tf rename to pkg/remote/test/aws_route53_zone_single/terraform.tf diff --git a/pkg/remote/test/route53_zone_with_no_record/schema.golden.json b/pkg/remote/test/aws_route53_zone_with_no_record/schema.golden.json similarity index 100% rename from pkg/remote/test/route53_zone_with_no_record/schema.golden.json rename to pkg/remote/test/aws_route53_zone_with_no_record/schema.golden.json diff --git a/pkg/remote/test/s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift2_Inventory2_Bucket2-eu-west-3.res.golden.json b/pkg/remote/test/aws_s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift2_Inventory2_Bucket2-eu-west-3.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift2_Inventory2_Bucket2-eu-west-3.res.golden.json rename to pkg/remote/test/aws_s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift2_Inventory2_Bucket2-eu-west-3.res.golden.json diff --git a/pkg/remote/test/s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift2_Inventory_Bucket2-eu-west-3.res.golden.json b/pkg/remote/test/aws_s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift2_Inventory_Bucket2-eu-west-3.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift2_Inventory_Bucket2-eu-west-3.res.golden.json rename to pkg/remote/test/aws_s3_bucket_inventories_multiple/aws_s3_bucket_inventory-bucket-martin-test-drift2_Inventory_Bucket2-eu-west-3.res.golden.json diff --git a/pkg/remote/test/s3_bucket_inventories_multiple/results.golden.json b/pkg/remote/test/aws_s3_bucket_inventories_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_inventories_multiple/results.golden.json rename to pkg/remote/test/aws_s3_bucket_inventories_multiple/results.golden.json diff --git a/pkg/remote/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metric2_Bucket2-eu-west-3.res.golden.json b/pkg/remote/test/aws_s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metric2_Bucket2-eu-west-3.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metric2_Bucket2-eu-west-3.res.golden.json rename to pkg/remote/test/aws_s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metric2_Bucket2-eu-west-3.res.golden.json diff --git a/pkg/remote/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metric_Bucket2-eu-west-3.res.golden.json b/pkg/remote/test/aws_s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metric_Bucket2-eu-west-3.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metric_Bucket2-eu-west-3.res.golden.json rename to pkg/remote/test/aws_s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metric_Bucket2-eu-west-3.res.golden.json diff --git a/pkg/remote/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metrics2_Bucket2-eu-west-3.res.golden.json b/pkg/remote/test/aws_s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metrics2_Bucket2-eu-west-3.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metrics2_Bucket2-eu-west-3.res.golden.json rename to pkg/remote/test/aws_s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metrics2_Bucket2-eu-west-3.res.golden.json diff --git a/pkg/remote/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metrics_Bucket2-eu-west-3.res.golden.json b/pkg/remote/test/aws_s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metrics_Bucket2-eu-west-3.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metrics_Bucket2-eu-west-3.res.golden.json rename to pkg/remote/test/aws_s3_bucket_metrics_multiple/aws_s3_bucket_metric-bucket-martin-test-drift2_Metrics_Bucket2-eu-west-3.res.golden.json diff --git a/pkg/remote/test/s3_bucket_metrics_multiple/results.golden.json b/pkg/remote/test/aws_s3_bucket_metrics_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_metrics_multiple/results.golden.json rename to pkg/remote/test/aws_s3_bucket_metrics_multiple/results.golden.json diff --git a/pkg/remote/test/s3_bucket_notifications_multiple/aws_s3_bucket_notification-bucket-martin-test-drift2-eu-west-3.res.golden.json b/pkg/remote/test/aws_s3_bucket_notifications_multiple/aws_s3_bucket_notification-bucket-martin-test-drift2-eu-west-3.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_notifications_multiple/aws_s3_bucket_notification-bucket-martin-test-drift2-eu-west-3.res.golden.json rename to pkg/remote/test/aws_s3_bucket_notifications_multiple/aws_s3_bucket_notification-bucket-martin-test-drift2-eu-west-3.res.golden.json diff --git a/pkg/remote/test/s3_bucket_notifications_multiple/results.golden.json b/pkg/remote/test/aws_s3_bucket_notifications_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_notifications_multiple/results.golden.json rename to pkg/remote/test/aws_s3_bucket_notifications_multiple/results.golden.json diff --git a/pkg/remote/test/s3_bucket_notifications_no_notif/aws_s3_bucket_notification-dritftctl-test-no-notifications.res.golden.json b/pkg/remote/test/aws_s3_bucket_notifications_no_notif/aws_s3_bucket_notification-dritftctl-test-no-notifications.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_notifications_no_notif/aws_s3_bucket_notification-dritftctl-test-no-notifications.res.golden.json rename to pkg/remote/test/aws_s3_bucket_notifications_no_notif/aws_s3_bucket_notification-dritftctl-test-no-notifications.res.golden.json diff --git a/pkg/remote/test/s3_bucket_notifications_no_notif/terraform.tf b/pkg/remote/test/aws_s3_bucket_notifications_no_notif/terraform.tf similarity index 100% rename from pkg/remote/test/s3_bucket_notifications_no_notif/terraform.tf rename to pkg/remote/test/aws_s3_bucket_notifications_no_notif/terraform.tf diff --git a/pkg/remote/test/s3_bucket_policies_multiple/aws_s3_bucket_policy-bucket-martin-test-drift2-eu-west-3.res.golden.json b/pkg/remote/test/aws_s3_bucket_policies_multiple/aws_s3_bucket_policy-bucket-martin-test-drift2-eu-west-3.res.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_policies_multiple/aws_s3_bucket_policy-bucket-martin-test-drift2-eu-west-3.res.golden.json rename to pkg/remote/test/aws_s3_bucket_policies_multiple/aws_s3_bucket_policy-bucket-martin-test-drift2-eu-west-3.res.golden.json diff --git a/pkg/remote/test/s3_bucket_policies_multiple/results.golden.json b/pkg/remote/test/aws_s3_bucket_policies_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/s3_bucket_policies_multiple/results.golden.json rename to pkg/remote/test/aws_s3_bucket_policies_multiple/results.golden.json diff --git a/pkg/remote/test/s3_bucket_policy_no_policy/terraform.tf b/pkg/remote/test/aws_s3_bucket_policy_no_policy/terraform.tf similarity index 100% rename from pkg/remote/test/s3_bucket_policy_no_policy/terraform.tf rename to pkg/remote/test/aws_s3_bucket_policy_no_policy/terraform.tf diff --git a/pkg/remote/test/sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic.res.golden.json b/pkg/remote/test/aws_sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic.res.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic.res.golden.json rename to pkg/remote/test/aws_sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic.res.golden.json diff --git a/pkg/remote/test/sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic2-arn_aws_sns_eu-west-3_526954929923_user-updates-topic2.res.golden.json b/pkg/remote/test/aws_sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic2-arn_aws_sns_eu-west-3_526954929923_user-updates-topic2.res.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic2-arn_aws_sns_eu-west-3_526954929923_user-updates-topic2.res.golden.json rename to pkg/remote/test/aws_sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic2-arn_aws_sns_eu-west-3_526954929923_user-updates-topic2.res.golden.json diff --git a/pkg/remote/test/sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic3-arn_aws_sns_eu-west-3_526954929923_user-updates-topic3.res.golden.json b/pkg/remote/test/aws_sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic3-arn_aws_sns_eu-west-3_526954929923_user-updates-topic3.res.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic3-arn_aws_sns_eu-west-3_526954929923_user-updates-topic3.res.golden.json rename to pkg/remote/test/aws_sns_topic_multiple/aws_sns_topic-arn_aws_sns_eu-west-3_526954929923_user-updates-topic3-arn_aws_sns_eu-west-3_526954929923_user-updates-topic3.res.golden.json diff --git a/pkg/remote/test/sns_topic_multiple/main.tf b/pkg/remote/test/aws_sns_topic_multiple/main.tf similarity index 100% rename from pkg/remote/test/sns_topic_multiple/main.tf rename to pkg/remote/test/aws_sns_topic_multiple/main.tf diff --git a/pkg/remote/test/sns_topic_multiple/results.golden.json b/pkg/remote/test/aws_sns_topic_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_multiple/results.golden.json rename to pkg/remote/test/aws_sns_topic_multiple/results.golden.json diff --git a/pkg/remote/test/sns_topic_policy_multiple/aws_sns_topic_policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy.res.golden.json b/pkg/remote/test/aws_sns_topic_policy_multiple/aws_sns_topic_policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy.res.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_policy_multiple/aws_sns_topic_policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy.res.golden.json rename to pkg/remote/test/aws_sns_topic_policy_multiple/aws_sns_topic_policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy.res.golden.json diff --git a/pkg/remote/test/sns_topic_policy_multiple/aws_sns_topic_policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy2-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy2.res.golden.json b/pkg/remote/test/aws_sns_topic_policy_multiple/aws_sns_topic_policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy2-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy2.res.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_policy_multiple/aws_sns_topic_policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy2-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy2.res.golden.json rename to pkg/remote/test/aws_sns_topic_policy_multiple/aws_sns_topic_policy-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy2-arn_aws_sns_us-east-1_526954929923_my-topic-with-policy2.res.golden.json diff --git a/pkg/remote/test/sns_topic_policy_multiple/results.golden.json b/pkg/remote/test/aws_sns_topic_policy_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_policy_multiple/results.golden.json rename to pkg/remote/test/aws_sns_topic_policy_multiple/results.golden.json diff --git a/pkg/remote/test/sns_topic_subscription_multiple/aws_sns_topic_subscription-arn_aws_sns_us-east-1_526954929923_user-updates-topic2_c0f794c5-a009-4db4-9147-4c55959787fa-arn_aws_sns_us-east-1_526954929923_user-updates-topic2_c0f794c5-a009-4db4-9147-4c55959787fa.res.golden.json b/pkg/remote/test/aws_sns_topic_subscription_multiple/aws_sns_topic_subscription-arn_aws_sns_us-east-1_526954929923_user-updates-topic2_c0f794c5-a009-4db4-9147-4c55959787fa-arn_aws_sns_us-east-1_526954929923_user-updates-topic2_c0f794c5-a009-4db4-9147-4c55959787fa.res.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_subscription_multiple/aws_sns_topic_subscription-arn_aws_sns_us-east-1_526954929923_user-updates-topic2_c0f794c5-a009-4db4-9147-4c55959787fa-arn_aws_sns_us-east-1_526954929923_user-updates-topic2_c0f794c5-a009-4db4-9147-4c55959787fa.res.golden.json rename to pkg/remote/test/aws_sns_topic_subscription_multiple/aws_sns_topic_subscription-arn_aws_sns_us-east-1_526954929923_user-updates-topic2_c0f794c5-a009-4db4-9147-4c55959787fa-arn_aws_sns_us-east-1_526954929923_user-updates-topic2_c0f794c5-a009-4db4-9147-4c55959787fa.res.golden.json diff --git a/pkg/remote/test/sns_topic_subscription_multiple/aws_sns_topic_subscription-arn_aws_sns_us-east-1_526954929923_user-updates-topic_b6e66147-2b31-4486-8d4b-2a2272264c8e-arn_aws_sns_us-east-1_526954929923_user-updates-topic_b6e66147-2b31-4486-8d4b-2a2272264c8e.res.golden.json b/pkg/remote/test/aws_sns_topic_subscription_multiple/aws_sns_topic_subscription-arn_aws_sns_us-east-1_526954929923_user-updates-topic_b6e66147-2b31-4486-8d4b-2a2272264c8e-arn_aws_sns_us-east-1_526954929923_user-updates-topic_b6e66147-2b31-4486-8d4b-2a2272264c8e.res.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_subscription_multiple/aws_sns_topic_subscription-arn_aws_sns_us-east-1_526954929923_user-updates-topic_b6e66147-2b31-4486-8d4b-2a2272264c8e-arn_aws_sns_us-east-1_526954929923_user-updates-topic_b6e66147-2b31-4486-8d4b-2a2272264c8e.res.golden.json rename to pkg/remote/test/aws_sns_topic_subscription_multiple/aws_sns_topic_subscription-arn_aws_sns_us-east-1_526954929923_user-updates-topic_b6e66147-2b31-4486-8d4b-2a2272264c8e-arn_aws_sns_us-east-1_526954929923_user-updates-topic_b6e66147-2b31-4486-8d4b-2a2272264c8e.res.golden.json diff --git a/pkg/remote/test/sns_topic_subscription_multiple/main.tf b/pkg/remote/test/aws_sns_topic_subscription_multiple/main.tf similarity index 100% rename from pkg/remote/test/sns_topic_subscription_multiple/main.tf rename to pkg/remote/test/aws_sns_topic_subscription_multiple/main.tf diff --git a/pkg/remote/test/sns_topic_subscription_multiple/results.golden.json b/pkg/remote/test/aws_sns_topic_subscription_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/sns_topic_subscription_multiple/results.golden.json rename to pkg/remote/test/aws_sns_topic_subscription_multiple/results.golden.json diff --git a/pkg/remote/test/sqs_queue_multiple/aws_sqs_queue-https___sqs.eu-west-3.amazonaws.com_047081014315_bar.fifo.res.golden.json b/pkg/remote/test/aws_sqs_queue_multiple/aws_sqs_queue-https___sqs.eu-west-3.amazonaws.com_047081014315_bar.fifo.res.golden.json similarity index 100% rename from pkg/remote/test/sqs_queue_multiple/aws_sqs_queue-https___sqs.eu-west-3.amazonaws.com_047081014315_bar.fifo.res.golden.json rename to pkg/remote/test/aws_sqs_queue_multiple/aws_sqs_queue-https___sqs.eu-west-3.amazonaws.com_047081014315_bar.fifo.res.golden.json diff --git a/pkg/remote/test/sqs_queue_multiple/aws_sqs_queue-https___sqs.eu-west-3.amazonaws.com_047081014315_foo.res.golden.json b/pkg/remote/test/aws_sqs_queue_multiple/aws_sqs_queue-https___sqs.eu-west-3.amazonaws.com_047081014315_foo.res.golden.json similarity index 100% rename from pkg/remote/test/sqs_queue_multiple/aws_sqs_queue-https___sqs.eu-west-3.amazonaws.com_047081014315_foo.res.golden.json rename to pkg/remote/test/aws_sqs_queue_multiple/aws_sqs_queue-https___sqs.eu-west-3.amazonaws.com_047081014315_foo.res.golden.json diff --git a/pkg/remote/test/sqs_queue_multiple/results.golden.json b/pkg/remote/test/aws_sqs_queue_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/sqs_queue_multiple/results.golden.json rename to pkg/remote/test/aws_sqs_queue_multiple/results.golden.json diff --git a/pkg/remote/test/sqs_queue_multiple/terraform.tf b/pkg/remote/test/aws_sqs_queue_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/sqs_queue_multiple/terraform.tf rename to pkg/remote/test/aws_sqs_queue_multiple/terraform.tf diff --git a/pkg/remote/test/sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_bar.fifo.res.golden.json b/pkg/remote/test/aws_sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_bar.fifo.res.golden.json similarity index 100% rename from pkg/remote/test/sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_bar.fifo.res.golden.json rename to pkg/remote/test/aws_sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_bar.fifo.res.golden.json diff --git a/pkg/remote/test/sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_baz.res.golden.json b/pkg/remote/test/aws_sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_baz.res.golden.json similarity index 100% rename from pkg/remote/test/sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_baz.res.golden.json rename to pkg/remote/test/aws_sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_baz.res.golden.json diff --git a/pkg/remote/test/sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_foo.res.golden.json b/pkg/remote/test/aws_sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_foo.res.golden.json similarity index 100% rename from pkg/remote/test/sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_foo.res.golden.json rename to pkg/remote/test/aws_sqs_queue_policy_multiple/aws_sqs_queue_policy-https___sqs.eu-west-3.amazonaws.com_047081014315_foo.res.golden.json diff --git a/pkg/remote/test/sqs_queue_policy_multiple/policy.json b/pkg/remote/test/aws_sqs_queue_policy_multiple/policy.json similarity index 100% rename from pkg/remote/test/sqs_queue_policy_multiple/policy.json rename to pkg/remote/test/aws_sqs_queue_policy_multiple/policy.json diff --git a/pkg/remote/test/sqs_queue_policy_multiple/results.golden.json b/pkg/remote/test/aws_sqs_queue_policy_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/sqs_queue_policy_multiple/results.golden.json rename to pkg/remote/test/aws_sqs_queue_policy_multiple/results.golden.json diff --git a/pkg/remote/test/sqs_queue_policy_multiple/terraform.tf b/pkg/remote/test/aws_sqs_queue_policy_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/sqs_queue_policy_multiple/terraform.tf rename to pkg/remote/test/aws_sqs_queue_policy_multiple/terraform.tf diff --git a/pkg/remote/test/vpc/aws_vpc-vpc-020b072316a95b97f.res.golden.json b/pkg/remote/test/aws_vpc/aws_vpc-vpc-020b072316a95b97f.res.golden.json similarity index 100% rename from pkg/remote/test/vpc/aws_vpc-vpc-020b072316a95b97f.res.golden.json rename to pkg/remote/test/aws_vpc/aws_vpc-vpc-020b072316a95b97f.res.golden.json diff --git a/pkg/remote/test/vpc/aws_vpc-vpc-02c50896b59598761.res.golden.json b/pkg/remote/test/aws_vpc/aws_vpc-vpc-02c50896b59598761.res.golden.json similarity index 100% rename from pkg/remote/test/vpc/aws_vpc-vpc-02c50896b59598761.res.golden.json rename to pkg/remote/test/aws_vpc/aws_vpc-vpc-02c50896b59598761.res.golden.json diff --git a/pkg/remote/test/vpc/aws_vpc-vpc-0768e1fd0029e3fc3.res.golden.json b/pkg/remote/test/aws_vpc/aws_vpc-vpc-0768e1fd0029e3fc3.res.golden.json similarity index 100% rename from pkg/remote/test/vpc/aws_vpc-vpc-0768e1fd0029e3fc3.res.golden.json rename to pkg/remote/test/aws_vpc/aws_vpc-vpc-0768e1fd0029e3fc3.res.golden.json diff --git a/pkg/remote/test/vpc/aws_vpc-vpc-a8c5d4c1.res.golden.json b/pkg/remote/test/aws_vpc/aws_vpc-vpc-a8c5d4c1.res.golden.json similarity index 100% rename from pkg/remote/test/vpc/aws_vpc-vpc-a8c5d4c1.res.golden.json rename to pkg/remote/test/aws_vpc/aws_vpc-vpc-a8c5d4c1.res.golden.json diff --git a/pkg/remote/test/vpc/results.golden.json b/pkg/remote/test/aws_vpc/results.golden.json similarity index 100% rename from pkg/remote/test/vpc/results.golden.json rename to pkg/remote/test/aws_vpc/results.golden.json diff --git a/pkg/remote/test/vpc/terraform.tf b/pkg/remote/test/aws_vpc/terraform.tf similarity index 100% rename from pkg/remote/test/vpc/terraform.tf rename to pkg/remote/test/aws_vpc/terraform.tf diff --git a/pkg/remote/test/vpc_default_security_group_multiple/aws_default_security_group-sg-9e0204ff.res.golden.json b/pkg/remote/test/aws_vpc_default_security_group_multiple/aws_default_security_group-sg-9e0204ff.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_default_security_group_multiple/aws_default_security_group-sg-9e0204ff.res.golden.json rename to pkg/remote/test/aws_vpc_default_security_group_multiple/aws_default_security_group-sg-9e0204ff.res.golden.json diff --git a/pkg/remote/test/vpc_default_security_group_multiple/results.golden.json b/pkg/remote/test/aws_vpc_default_security_group_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/vpc_default_security_group_multiple/results.golden.json rename to pkg/remote/test/aws_vpc_default_security_group_multiple/results.golden.json diff --git a/pkg/remote/test/vpc_default_security_group_multiple/terraform.tf b/pkg/remote/test/aws_vpc_default_security_group_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/vpc_default_security_group_multiple/terraform.tf rename to pkg/remote/test/aws_vpc_default_security_group_multiple/terraform.tf diff --git a/pkg/remote/test/vpc_security_group_default_rules/aws_security_group_rule-sgrule-3820791514-1-1.2.0.0_16-0-0-0--1-sg-a74815c8-false--0-ingress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_default_rules/aws_security_group_rule-sgrule-3820791514-1-1.2.0.0_16-0-0-0--1-sg-a74815c8-false--0-ingress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_default_rules/aws_security_group_rule-sgrule-3820791514-1-1.2.0.0_16-0-0-0--1-sg-a74815c8-false--0-ingress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_default_rules/aws_security_group_rule-sgrule-3820791514-1-1.2.0.0_16-0-0-0--1-sg-a74815c8-false--0-ingress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_default_rules/aws_security_group_rule-sgrule-529352477-1-1.2.3.4_32-0-0-0--1-sg-a74815c8-false--0-egress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_default_rules/aws_security_group_rule-sgrule-529352477-1-1.2.3.4_32-0-0-0--1-sg-a74815c8-false--0-egress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_default_rules/aws_security_group_rule-sgrule-529352477-1-1.2.3.4_32-0-0-0--1-sg-a74815c8-false--0-egress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_default_rules/aws_security_group_rule-sgrule-529352477-1-1.2.3.4_32-0-0-0--1-sg-a74815c8-false--0-egress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_default_rules/results.golden.json b/pkg/remote/test/aws_vpc_security_group_default_rules/results.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_default_rules/results.golden.json rename to pkg/remote/test/aws_vpc_security_group_default_rules/results.golden.json diff --git a/pkg/remote/test/vpc_security_group_multiple/aws_security_group-sg-0254c038e32f25530.res.golden.json b/pkg/remote/test/aws_vpc_security_group_multiple/aws_security_group-sg-0254c038e32f25530.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_multiple/aws_security_group-sg-0254c038e32f25530.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_multiple/aws_security_group-sg-0254c038e32f25530.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_multiple/results.golden.json b/pkg/remote/test/aws_vpc_security_group_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_multiple/results.golden.json rename to pkg/remote/test/aws_vpc_security_group_multiple/results.golden.json diff --git a/pkg/remote/test/vpc_security_group_multiple/terraform.tf b/pkg/remote/test/aws_vpc_security_group_multiple/terraform.tf similarity index 100% rename from pkg/remote/test/vpc_security_group_multiple/terraform.tf rename to pkg/remote/test/aws_vpc_security_group_multiple/terraform.tf diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-1175318309-1-0.0.0.0_0-0--1-sg-0cc8b3c3c2851705a-false-0-egress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-1175318309-1-0.0.0.0_0-0--1-sg-0cc8b3c3c2851705a-false-0-egress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-1175318309-1-0.0.0.0_0-0--1-sg-0cc8b3c3c2851705a-false-0-egress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-1175318309-1-0.0.0.0_0-0--1-sg-0cc8b3c3c2851705a-false-0-egress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-1707973622-1-0.0.0.0_0-0--1-sg-0254c038e32f25530-false-0-egress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-1707973622-1-0.0.0.0_0-0--1-sg-0254c038e32f25530-false-0-egress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-1707973622-1-0.0.0.0_0-0--1-sg-0254c038e32f25530-false-0-egress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-1707973622-1-0.0.0.0_0-0--1-sg-0254c038e32f25530-false-0-egress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2165103420-1-5.6.7.0_24-0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2165103420-1-5.6.7.0_24-0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2165103420-1-5.6.7.0_24-0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2165103420-1-5.6.7.0_24-0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2582518759-1-1.2.0.0_16-0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2582518759-1-1.2.0.0_16-0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2582518759-1-1.2.0.0_16-0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2582518759-1-1.2.0.0_16-0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2821752134-0-1-___0--1-sg-0254c038e32f25530-false-0-egress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2821752134-0-1-___0--1-sg-0254c038e32f25530-false-0-egress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2821752134-0-1-___0--1-sg-0254c038e32f25530-false-0-egress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-2821752134-0-1-___0--1-sg-0254c038e32f25530-false-0-egress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-350400929-0-1-___0--1-sg-0cc8b3c3c2851705a-false-0-egress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-350400929-0-1-___0--1-sg-0cc8b3c3c2851705a-false-0-egress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-350400929-0-1-___0--1-sg-0cc8b3c3c2851705a-false-0-egress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-350400929-0-1-___0--1-sg-0cc8b3c3c2851705a-false-0-egress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-3587309474-0-tcp-sg-0254c038e32f25530-false-sg-9e0204ff-65535-ingress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-3587309474-0-tcp-sg-0254c038e32f25530-false-sg-9e0204ff-65535-ingress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-3587309474-0-tcp-sg-0254c038e32f25530-false-sg-9e0204ff-65535-ingress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-3587309474-0-tcp-sg-0254c038e32f25530-false-sg-9e0204ff-65535-ingress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-3970541193-0-tcp-sg-0254c038e32f25530-true-65535-ingress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-3970541193-0-tcp-sg-0254c038e32f25530-true-65535-ingress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-3970541193-0-tcp-sg-0254c038e32f25530-true-65535-ingress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-3970541193-0-tcp-sg-0254c038e32f25530-true-65535-ingress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-453320892-1-0.0.0.0_0-443-tcp-sg-0cc8b3c3c2851705a-false-443-ingress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-453320892-1-0.0.0.0_0-443-tcp-sg-0cc8b3c3c2851705a-false-443-ingress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-453320892-1-0.0.0.0_0-443-tcp-sg-0cc8b3c3c2851705a-false-443-ingress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-453320892-1-0.0.0.0_0-443-tcp-sg-0cc8b3c3c2851705a-false-443-ingress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-674800228-0-1-___0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-674800228-0-1-___0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-674800228-0-1-___0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-674800228-0-1-___0--1-sg-0254c038e32f25530-false-0-ingress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-850043874-1-0.0.0.0_0-5-sg-0cc8b3c3c2851705a-false-egress.res.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-850043874-1-0.0.0.0_0-5-sg-0cc8b3c3c2851705a-false-egress.res.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-850043874-1-0.0.0.0_0-5-sg-0cc8b3c3c2851705a-false-egress.res.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/aws_security_group_rule-sgrule-850043874-1-0.0.0.0_0-5-sg-0cc8b3c3c2851705a-false-egress.res.golden.json diff --git a/pkg/remote/test/vpc_security_group_rule_multiple/results.golden.json b/pkg/remote/test/aws_vpc_security_group_rule_multiple/results.golden.json similarity index 100% rename from pkg/remote/test/vpc_security_group_rule_multiple/results.golden.json rename to pkg/remote/test/aws_vpc_security_group_rule_multiple/results.golden.json