feat(aws): include resource metadata in services from d* to e* (#6532)

Co-authored-by: Sergio Garcia <hello@mistercloudsec.com>

tests/providers/aws/services/dlm/dlm_ebs_snapshot_lifecycle_policy_exists/dlm_ebs_snapshot_lifecycle_policy_exists_test.py

@@ -72,7 +72,7 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists:
         )["SnapshotId"]
 
         # DLM Mock Client
-        dlm_client = mock.MagicMock
+        dlm_client = mock.MagicMock()
         dlm_client.audited_account = AWS_ACCOUNT_NUMBER
         dlm_client.audited_account_arn = AWS_ACCOUNT_ARN
         dlm_client.region = AWS_REGION_US_EAST_1

tests/providers/aws/services/dynamodb/dynamodb_service_test.py

@@ -49,7 +49,7 @@ class Test_DynamoDB_Service:
         # Generate DynamoDB Client
         dynamodb_client = client("dynamodb", region_name=AWS_REGION_US_EAST_1)
         # Create DynamoDB Tables
-        dynamodb_client.create_table(
+        table1_arn = dynamodb_client.create_table(
             TableName="test1",
             AttributeDefinitions=[
                 {"AttributeName": "client", "AttributeType": "S"},
@@ -60,8 +60,8 @@ class Test_DynamoDB_Service:
                 {"AttributeName": "app", "KeyType": "RANGE"},
             ],
             BillingMode="PAY_PER_REQUEST",
-        )
-        dynamodb_client.create_table(
+        )["TableDescription"]["TableArn"]
+        table2_arn = dynamodb_client.create_table(
             TableName="test2",
             AttributeDefinitions=[
                 {"AttributeName": "client", "AttributeType": "S"},
@@ -73,7 +73,7 @@ class Test_DynamoDB_Service:
             ],
             BillingMode="PROVISIONED",
             ProvisionedThroughput={"ReadCapacityUnits": 5, "WriteCapacityUnits": 5},
-        )
+        )["TableDescription"]["TableArn"]
         # DynamoDB client for this test class
         aws_provider = set_mocked_aws_provider()
         dynamo = DynamoDB(aws_provider)
@@ -81,6 +81,8 @@ class Test_DynamoDB_Service:
         table_names = [table.name for table in dynamo.tables.values()]
         assert "test1" in table_names
         assert "test2" in table_names
+        assert table1_arn == list(dynamo.tables.keys())[0]
+        assert table2_arn == list(dynamo.tables.keys())[1]
         for table in dynamo.tables.values():
             assert table.region == AWS_REGION_US_EAST_1
         table_billing = [table.billing_mode for table in dynamo.tables.values()]

tests/providers/aws/services/dynamodb/dynamodb_table_protected_by_backup_plan/dynamodb_table_protected_by_backup_plan_test.py

@@ -167,6 +167,7 @@ class Test_dynamodb_table_protected_by_backup_plan:
 
         dynamodb_client.tables = {
             f"arn:aws:dynamodb:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:table/test1": Table(
+                arn=f"arn:aws:dynamodb:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:table/test1",
                 name="test1",
                 region=AWS_REGION_US_EAST_1,
             )
@@ -225,6 +226,7 @@ class Test_dynamodb_table_protected_by_backup_plan:
         dynamodb_client.audited_partition = "aws"
         dynamodb_client.tables = {
             f"arn:aws:dynamodb:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:table/test1": Table(
+                arn=f"arn:aws:dynamodb:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:table/test1",
                 name="test1",
                 region=AWS_REGION_US_EAST_1,
             )
@@ -280,6 +282,7 @@ class Test_dynamodb_table_protected_by_backup_plan:
 
         dynamodb_client.tables = {
             f"arn:aws:dynamodb:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:table/test1": Table(
+                arn=f"arn:aws:dynamodb:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:table/test1",
                 name="test1",
                 region=AWS_REGION_US_EAST_1,
             )

tests/providers/aws/services/elb/elb_service_test.py

@@ -72,6 +72,7 @@ class Test_ELB_Service:
         aws_provider = set_mocked_aws_provider()
         elb = ELB(aws_provider)
         assert len(elb.loadbalancers) == 1
+        assert elb.loadbalancers[elb_arn].arn == elb_arn
         assert elb.loadbalancers[elb_arn].name == "my-lb"
         assert elb.loadbalancers[elb_arn].region == AWS_REGION_US_EAST_1
         assert elb.loadbalancers[elb_arn].scheme == "internal"
@@ -130,6 +131,7 @@ class Test_ELB_Service:
         # ELB client for this test class
         aws_provider = set_mocked_aws_provider()
         elb = ELB(aws_provider)
+        assert elb.loadbalancers[elb_arn].arn == elb_arn
         assert elb.loadbalancers[elb_arn].name == "my-lb"
         assert elb.loadbalancers[elb_arn].region == AWS_REGION_US_EAST_1
         assert elb.loadbalancers[elb_arn].scheme == "internal"
@@ -170,6 +172,7 @@ class Test_ELB_Service:
         # ELB client for this test class
         aws_provider = set_mocked_aws_provider()
         elb = ELB(aws_provider)
+        assert elb.loadbalancers[elb_arn].arn == elb_arn
         assert elb.loadbalancers[elb_arn].name == "my-lb"
         assert elb.loadbalancers[elb_arn].region == AWS_REGION_US_EAST_1
         assert elb.loadbalancers[elb_arn].scheme == "internal"

tests/providers/aws/services/elbv2/elbv2_service_test.py

@@ -224,6 +224,7 @@ class Test_ELBv2_Service:
         )
         elbv2 = ELBv2(aws_provider)
         assert len(elbv2.loadbalancersv2) == 1
+        assert elbv2.loadbalancersv2[lb["LoadBalancerArn"]].arn == lb["LoadBalancerArn"]
         assert (
             elbv2.loadbalancersv2[lb["LoadBalancerArn"]].desync_mitigation_mode
             == "defensive"