fix(aws): Handle unique map keys (#2390)

Co-authored-by: Sergio Garcia <sergargar1@gmail.com>

tests/providers/aws/services/awslambda/awslambda_service_test.py

@@ -16,6 +16,7 @@ from prowler.providers.common.models import Audit_Metadata
 
 # Mock Test Region
 AWS_REGION = "eu-west-1"
+AWS_REGION_NORTH_VIRGINIA = "us-east-1"
 
 
 def create_zip_file(code: str = "") -> io.BytesIO:
@@ -47,9 +48,18 @@ def mock_request_get(_):
 
 # Mock generate_regional_clients()
 def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(service, region_name=AWS_REGION)
-    regional_client.region = AWS_REGION
-    return {AWS_REGION: regional_client}
+    regional_client_eu_west_1 = audit_info.audit_session.client(
+        service, region_name=AWS_REGION
+    )
+    regional_client_us_east_1 = audit_info.audit_session.client(
+        service, region_name=AWS_REGION_NORTH_VIRGINIA
+    )
+    regional_client_eu_west_1.region = AWS_REGION
+    regional_client_us_east_1.region = AWS_REGION_NORTH_VIRGINIA
+    return {
+        AWS_REGION: regional_client_eu_west_1,
+        AWS_REGION_NORTH_VIRGINIA: regional_client_us_east_1,
+    }
 
 
 @patch(
@@ -118,7 +128,7 @@ class Test_Lambda_Service:
             Bucket="test-bucket",
             CreateBucketConfiguration={"LocationConstraint": AWS_REGION},
         )
-        # Create Test Lambda
+        # Create Test Lambda 1
         lambda_client = client("lambda", region_name=AWS_REGION)
         lambda_name = "test-lambda"
         resp = lambda_client.create_function(
@@ -139,6 +149,7 @@ class Test_Lambda_Service:
             Environment={"Variables": {"db-password": "test-password"}},
             Tags={"test": "test"},
         )
+        lambda_arn_1 = resp["FunctionArn"]
         # Update Lambda Policy
         lambda_policy = {
             "Version": "2012-10-17",
@@ -181,49 +192,72 @@ class Test_Lambda_Service:
             },
         )
 
-        lambda_arn = resp["FunctionArn"]
+        # Create Test Lambda 2 (with the same attributes but different region)
+        lambda_client_2 = client("lambda", region_name=AWS_REGION_NORTH_VIRGINIA)
+        lambda_name = "test-lambda"
+        resp_2 = lambda_client_2.create_function(
+            FunctionName=lambda_name,
+            Runtime="python3.7",
+            Role=iam_role,
+            Handler="lambda_function.lambda_handler",
+            Code={"ZipFile": create_zip_file().read()},
+            Description="test lambda function",
+            Timeout=3,
+            MemorySize=128,
+            PackageType="ZIP",
+            Publish=True,
+            VpcConfig={
+                "SecurityGroupIds": ["sg-123abc"],
+                "SubnetIds": ["subnet-123abc"],
+            },
+            Environment={"Variables": {"db-password": "test-password"}},
+            Tags={"test": "test"},
+        )
+        lambda_arn_2 = resp_2["FunctionArn"]
+
         with mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_service.requests.get",
             new=mock_request_get,
         ):
             awslambda = Lambda(self.set_mocked_audit_info())
-
             assert awslambda.functions
-            assert awslambda.functions[lambda_name].name == lambda_name
-            assert awslambda.functions[lambda_name].arn == lambda_arn
-            assert awslambda.functions[lambda_name].runtime == "python3.7"
-            assert awslambda.functions[lambda_name].environment == {
+            assert len(awslambda.functions) == 2
+            # Lambda 1
+            assert awslambda.functions[lambda_arn_1].name == lambda_name
+            assert awslambda.functions[lambda_arn_1].arn == lambda_arn_1
+            assert awslambda.functions[lambda_arn_1].runtime == "python3.7"
+            assert awslambda.functions[lambda_arn_1].environment == {
                 "db-password": "test-password"
             }
-            assert awslambda.functions[lambda_name].region == AWS_REGION
-            assert awslambda.functions[lambda_name].policy == lambda_policy
+            assert awslambda.functions[lambda_arn_1].region == AWS_REGION
+            assert awslambda.functions[lambda_arn_1].policy == lambda_policy
 
-            assert awslambda.functions[lambda_name].code
+            assert awslambda.functions[lambda_arn_1].code
             assert search(
                 f"s3://awslambda-{AWS_REGION}-tasks.s3-{AWS_REGION}.amazonaws.com",
-                awslambda.functions[lambda_name].code.location,
+                awslambda.functions[lambda_arn_1].code.location,
             )
 
-            assert awslambda.functions[lambda_name].url_config
+            assert awslambda.functions[lambda_arn_1].url_config
             assert (
-                awslambda.functions[lambda_name].url_config.auth_type
+                awslambda.functions[lambda_arn_1].url_config.auth_type
                 == AuthType.AWS_IAM
             )
             assert search(
                 "lambda-url.eu-west-1.on.aws",
-                awslambda.functions[lambda_name].url_config.url,
+                awslambda.functions[lambda_arn_1].url_config.url,
             )
 
-            assert awslambda.functions[lambda_name].url_config.cors_config
+            assert awslambda.functions[lambda_arn_1].url_config.cors_config
             assert awslambda.functions[
-                lambda_name
+                lambda_arn_1
             ].url_config.cors_config.allow_origins == ["*"]
 
-            assert awslambda.functions[lambda_name].tags == [{"test": "test"}]
+            assert awslambda.functions[lambda_arn_1].tags == [{"test": "test"}]
 
             # Pending ZipFile tests
             with tempfile.TemporaryDirectory() as tmp_dir_name:
-                awslambda.functions[lambda_name].code.code_zip.extractall(tmp_dir_name)
+                awslambda.functions[lambda_arn_1].code.code_zip.extractall(tmp_dir_name)
                 files_in_zip = next(os.walk(tmp_dir_name))[2]
                 assert len(files_in_zip) == 1
                 assert files_in_zip[0] == "lambda_function.py"
@@ -237,3 +271,24 @@ class Test_Lambda_Service:
                     # return event
                     # """
                     # )
+
+            # Lambda 2
+            assert awslambda.functions[lambda_arn_2].name == lambda_name
+            assert awslambda.functions[lambda_arn_2].arn == lambda_arn_2
+            assert awslambda.functions[lambda_arn_2].runtime == "python3.7"
+            assert awslambda.functions[lambda_arn_2].environment == {
+                "db-password": "test-password"
+            }
+            assert awslambda.functions[lambda_arn_2].region == AWS_REGION_NORTH_VIRGINIA
+            # Emtpy policy
+            assert awslambda.functions[lambda_arn_2].policy == {
+                "Id": "default",
+                "Statement": [],
+                "Version": "2012-10-17",
+            }
+
+            assert awslambda.functions[lambda_arn_2].code
+            assert search(
+                f"s3://awslambda-{AWS_REGION_NORTH_VIRGINIA}-tasks.s3-{AWS_REGION_NORTH_VIRGINIA}.amazonaws.com",
+                awslambda.functions[lambda_arn_2].code.location,
+            )

tests/providers/aws/services/codeartifact/codeartifact_service_test.py

@@ -20,6 +20,10 @@ AWS_ACCOUNT_NUMBER = "123456789012"
 # Mocking Access Analyzer Calls
 make_api_call = botocore.client.BaseClient._make_api_call
 
+TEST_REPOSITORY_ARN = (
+    f"arn:aws:codebuild:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:repository/test-repository"
+)
+
 
 def mock_make_api_call(self, operation_name, kwarg):
     """We have to mock every AWS API call using Boto3"""
@@ -31,7 +35,7 @@ def mock_make_api_call(self, operation_name, kwarg):
                     "administratorAccount": DEFAULT_ACCOUNT_ID,
                     "domainName": "test-domain",
                     "domainOwner": DEFAULT_ACCOUNT_ID,
-                    "arn": f"arn:aws:codebuild:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:repository/test-repository",
+                    "arn": TEST_REPOSITORY_ARN,
                     "description": "test description",
                 },
             ]
@@ -146,63 +150,70 @@ class Test_CodeArtifact_Service:
 
         assert len(codeartifact.repositories) == 1
         assert codeartifact.repositories
-        assert codeartifact.repositories["test-repository"]
-        assert codeartifact.repositories["test-repository"].name == "test-repository"
-        assert codeartifact.repositories["test-repository"].tags == [
+        assert codeartifact.repositories[
+            f"arn:aws:codebuild:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:repository/test-repository"
+        ]
+        assert codeartifact.repositories[TEST_REPOSITORY_ARN].name == "test-repository"
+        assert codeartifact.repositories[
+            f"arn:aws:codebuild:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:repository/test-repository"
+        ].tags == [
             {"key": "test", "value": "test"},
         ]
+        assert codeartifact.repositories[TEST_REPOSITORY_ARN].arn == TEST_REPOSITORY_ARN
         assert (
-            codeartifact.repositories["test-repository"].arn
-            == f"arn:aws:codebuild:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:repository/test-repository"
+            codeartifact.repositories[TEST_REPOSITORY_ARN].domain_name == "test-domain"
         )
-        assert codeartifact.repositories["test-repository"].domain_name == "test-domain"
         assert (
-            codeartifact.repositories["test-repository"].domain_owner
+            codeartifact.repositories[TEST_REPOSITORY_ARN].domain_owner
             == DEFAULT_ACCOUNT_ID
         )
-        assert codeartifact.repositories["test-repository"].region == AWS_REGION
+        assert codeartifact.repositories[TEST_REPOSITORY_ARN].region == AWS_REGION
 
-        assert codeartifact.repositories["test-repository"].packages
-        assert len(codeartifact.repositories["test-repository"].packages) == 1
+        assert codeartifact.repositories[
+            f"arn:aws:codebuild:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:repository/test-repository"
+        ].packages
+        assert len(codeartifact.repositories[TEST_REPOSITORY_ARN].packages) == 1
         assert (
-            codeartifact.repositories["test-repository"].packages[0].name
+            codeartifact.repositories[TEST_REPOSITORY_ARN].packages[0].name
             == "test-package"
         )
         assert (
-            codeartifact.repositories["test-repository"].packages[0].namespace
+            codeartifact.repositories[TEST_REPOSITORY_ARN].packages[0].namespace
             == "test-namespace"
         )
 
-        assert codeartifact.repositories["test-repository"].packages[0].format == "pypi"
         assert (
-            codeartifact.repositories["test-repository"]
+            codeartifact.repositories[TEST_REPOSITORY_ARN].packages[0].format == "pypi"
+        )
+        assert (
+            codeartifact.repositories[TEST_REPOSITORY_ARN]
             .packages[0]
             .origin_configuration.restrictions.publish
             == RestrictionValues.ALLOW
         )
         assert (
-            codeartifact.repositories["test-repository"]
+            codeartifact.repositories[TEST_REPOSITORY_ARN]
             .packages[0]
             .origin_configuration.restrictions.upstream
             == RestrictionValues.ALLOW
         )
 
         assert (
-            codeartifact.repositories["test-repository"]
+            codeartifact.repositories[TEST_REPOSITORY_ARN]
             .packages[0]
             .latest_version.version
             == "latest"
         )
 
         assert (
-            codeartifact.repositories["test-repository"]
+            codeartifact.repositories[TEST_REPOSITORY_ARN]
             .packages[0]
             .latest_version.status
             == LatestPackageVersionStatus.Published
         )
 
         assert (
-            codeartifact.repositories["test-repository"]
+            codeartifact.repositories[TEST_REPOSITORY_ARN]
             .packages[0]
             .latest_version.origin.origin_type
             == OriginInformationValues.INTERNAL

tests/providers/aws/services/elb/elb_ssl_listeners/elb_ssl_listeners_test.py

@@ -39,6 +39,9 @@ class Test_elb_ssl_listeners:
         from prowler.providers.aws.services.elb.elb_service import ELB
 
         with mock.patch(
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=self.set_mocked_audit_info(),
+        ), mock.patch(
             "prowler.providers.aws.services.elb.elb_ssl_listeners.elb_ssl_listeners.elb_client",
             new=ELB(self.set_mocked_audit_info()),
         ):

tests/providers/aws/services/elbv2/elbv2_desync_mitigation_mode/elbv2_desync_mitigation_mode_test.py

@@ -24,7 +24,7 @@ class Test_elbv2_desync_mitigation_mode:
             audited_partition="aws",
             audited_identity_arn=None,
             profile=None,
-            profile_region=None,
+            profile_region=AWS_REGION,
             credentials=None,
             assumed_role_info=None,
             audited_regions=["us-east-1", "eu-west-1"],
@@ -39,6 +39,9 @@ class Test_elbv2_desync_mitigation_mode:
         from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2
 
         with mock.patch(
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=self.set_mocked_audit_info(),
+        ), mock.patch(
             "prowler.providers.aws.services.elbv2.elbv2_desync_mitigation_mode.elbv2_desync_mitigation_mode.elbv2_client",
             new=ELBv2(self.set_mocked_audit_info()),
         ):

tests/providers/aws/services/glacier/glacier_service_test.py

@@ -15,6 +15,9 @@ AWS_ACCOUNT_NUMBER = "123456789012"
 # Mocking Access Analyzer Calls
 make_api_call = botocore.client.BaseClient._make_api_call
 
+TEST_VAULT_ARN = (
+    f"arn:aws:glacier:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:vaults/examplevault"
+)
 vault_json_policy = {
     "Version": "2012-10-17",
     "Statement": [
@@ -28,9 +31,7 @@ vault_json_policy = {
                 "glacier:AbortMultipartUpload",
                 "glacier:CompleteMultipartUpload",
             ],
-            "Resource": [
-                f"arn:aws:glacier:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:vaults/examplevault"
-            ],
+            "Resource": [TEST_VAULT_ARN],
         }
     ],
 }
@@ -42,7 +43,7 @@ def mock_make_api_call(self, operation_name, kwarg):
         return {
             "VaultList": [
                 {
-                    "VaultARN": f"arn:aws:glacier:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:vaults/examplevault",
+                    "VaultARN": TEST_VAULT_ARN,
                     "VaultName": "examplevault",
                     "CreationDate": "2012-03-16T22:22:47.214Z",
                     "LastInventoryDate": "2012-03-21T22:06:51.218Z",
@@ -118,25 +119,25 @@ class Test_Glacier_Service:
         glacier = Glacier(self.set_mocked_audit_info())
         vault_name = "examplevault"
         assert len(glacier.vaults) == 1
-        assert glacier.vaults[vault_name]
-        assert glacier.vaults[vault_name].name == vault_name
+        assert glacier.vaults[TEST_VAULT_ARN]
+        assert glacier.vaults[TEST_VAULT_ARN].name == vault_name
         assert (
-            glacier.vaults[vault_name].arn
+            glacier.vaults[TEST_VAULT_ARN].arn
             == f"arn:aws:glacier:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:vaults/examplevault"
         )
-        assert glacier.vaults[vault_name].region == AWS_REGION
-        assert glacier.vaults[vault_name].tags == [{"test": "test"}]
+        assert glacier.vaults[TEST_VAULT_ARN].region == AWS_REGION
+        assert glacier.vaults[TEST_VAULT_ARN].tags == [{"test": "test"}]
 
     def test__get_vault_access_policy__(self):
         # Set partition for the service
         glacier = Glacier(self.set_mocked_audit_info())
         vault_name = "examplevault"
         assert len(glacier.vaults) == 1
-        assert glacier.vaults[vault_name]
-        assert glacier.vaults[vault_name].name == vault_name
+        assert glacier.vaults[TEST_VAULT_ARN]
+        assert glacier.vaults[TEST_VAULT_ARN].name == vault_name
         assert (
-            glacier.vaults[vault_name].arn
+            glacier.vaults[TEST_VAULT_ARN].arn
             == f"arn:aws:glacier:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:vaults/examplevault"
         )
-        assert glacier.vaults[vault_name].region == AWS_REGION
-        assert glacier.vaults[vault_name].access_policy == vault_json_policy
+        assert glacier.vaults[TEST_VAULT_ARN].region == AWS_REGION
+        assert glacier.vaults[TEST_VAULT_ARN].access_policy == vault_json_policy

tests/providers/aws/services/globalaccelerator/globalaccelerator_service_test.py

@@ -14,6 +14,8 @@ AWS_REGION = "us-west-2"
 # Mocking Access Analyzer Calls
 make_api_call = botocore.client.BaseClient._make_api_call
 
+TEST_ACCELERATOR_ARN = f"arn:aws:globalaccelerator::{DEFAULT_ACCOUNT_ID}:accelerator/5555abcd-abcd-5555-abcd-5555EXAMPLE1"
+
 
 def mock_make_api_call(self, operation_name, kwarg):
     """We have to mock every AWS API call using Boto3"""
@@ -21,7 +23,7 @@ def mock_make_api_call(self, operation_name, kwarg):
         return {
             "Accelerators": [
                 {
-                    "AcceleratorArn": f"arn:aws:globalaccelerator::{DEFAULT_ACCOUNT_ID}:accelerator/5555abcd-abcd-5555-abcd-5555EXAMPLE1",
+                    "AcceleratorArn": TEST_ACCELERATOR_ARN,
                     "Name": "TestAccelerator",
                     "IpAddressType": "IPV4",
                     "Enabled": True,
@@ -96,13 +98,18 @@ class Test_GlobalAccelerator_Service:
         audit_info = self.set_mocked_audit_info()
         globalaccelerator = GlobalAccelerator(audit_info)
 
-        accelerator_arn = f"arn:aws:globalaccelerator::{DEFAULT_ACCOUNT_ID}:accelerator/5555abcd-abcd-5555-abcd-5555EXAMPLE1"
         accelerator_name = "TestAccelerator"
 
         assert globalaccelerator.accelerators
         assert len(globalaccelerator.accelerators) == 1
-        assert globalaccelerator.accelerators[accelerator_name]
-        assert globalaccelerator.accelerators[accelerator_name].name == accelerator_name
-        assert globalaccelerator.accelerators[accelerator_name].arn == accelerator_arn
-        assert globalaccelerator.accelerators[accelerator_name].region == AWS_REGION
-        assert globalaccelerator.accelerators[accelerator_name].enabled
+        assert globalaccelerator.accelerators[TEST_ACCELERATOR_ARN]
+        assert (
+            globalaccelerator.accelerators[TEST_ACCELERATOR_ARN].name
+            == accelerator_name
+        )
+        assert (
+            globalaccelerator.accelerators[TEST_ACCELERATOR_ARN].arn
+            == TEST_ACCELERATOR_ARN
+        )
+        assert globalaccelerator.accelerators[TEST_ACCELERATOR_ARN].region == AWS_REGION
+        assert globalaccelerator.accelerators[TEST_ACCELERATOR_ARN].enabled

tests/providers/aws/services/iam/iam_role_cross_service_confused_deputy_prevention/iam_role_cross_service_confused_deputy_prevention_test.py

@@ -81,9 +81,13 @@ class Test_iam_role_cross_service_confused_deputy_prevention:
 
         current_audit_info = self.set_mocked_audit_info()
         current_audit_info.audited_account = AWS_ACCOUNT_ID
+
         with mock.patch(
-            "prowler.providers.aws.services.iam.iam_service.IAM",
-            iam_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=current_audit_info,
+        ), mock.patch(
+            "prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention.iam_client",
+            new=iam_client,
         ):
             # Test Check
             from prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention import (

tests/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc_test.py

@@ -1,11 +1,15 @@
 from unittest import mock
 
+from boto3 import session
+
+from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 from prowler.providers.aws.services.networkfirewall.networkfirewall_service import (
     Firewall,
 )
 from prowler.providers.aws.services.vpc.vpc_service import VPCs, VpcSubnet
 
 AWS_REGION = "us-east-1"
+AWS_ACCOUNT_NUMBER = "123456789012"
 FIREWALL_ARN = "arn:aws:network-firewall:us-east-1:123456789012:firewall/my-firewall"
 FIREWALL_NAME = "my-firewall"
 VPC_ID_PROTECTED = "vpc-12345678901234567"
@@ -14,6 +18,30 @@ POLICY_ARN = "arn:aws:network-firewall:us-east-1:123456789012:firewall-policy/my
 
 
 class Test_networkfirewall_in_all_vpc:
+    # Mocked Audit Info
+    def set_mocked_audit_info(self):
+        audit_info = AWS_Audit_Info(
+            session_config=None,
+            original_session=None,
+            audit_session=session.Session(
+                profile_name=None,
+                botocore_session=None,
+                region_name=AWS_REGION,
+            ),
+            audited_account=AWS_ACCOUNT_NUMBER,
+            audited_user_id=None,
+            audited_partition="aws",
+            audited_identity_arn=None,
+            profile=None,
+            profile_region=AWS_REGION,
+            credentials=None,
+            assumed_role_info=None,
+            audited_regions=None,
+            organizations_metadata=None,
+            audit_resources=None,
+        )
+        return audit_info
+
     def test_no_vpcs(self):
         networkfirewall_client = mock.MagicMock
         networkfirewall_client.region = AWS_REGION
@@ -21,23 +49,30 @@ class Test_networkfirewall_in_all_vpc:
         vpc_client = mock.MagicMock
         vpc_client.region = AWS_REGION
         vpc_client.vpcs = {}
+
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.networkfirewall.networkfirewall_service.NetworkFirewall",
-            new=networkfirewall_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
             with mock.patch(
-                "prowler.providers.aws.services.vpc.vpc_service.VPC",
+                "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client",
                 new=vpc_client,
             ):
-                # Test Check
-                from prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc import (
-                    networkfirewall_in_all_vpc,
-                )
+                with mock.patch(
+                    "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.networkfirewall_client",
+                    new=networkfirewall_client,
+                ):
+                    # Test Check
+                    from prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc import (
+                        networkfirewall_in_all_vpc,
+                    )
 
-                check = networkfirewall_in_all_vpc()
-                result = check.execute()
+                    check = networkfirewall_in_all_vpc()
+                    result = check.execute()
 
-                assert len(result) == 0
+                    assert len(result) == 0
 
     def test_vpcs_with_firewall_all(self):
         networkfirewall_client = mock.MagicMock
@@ -78,32 +113,39 @@ class Test_networkfirewall_in_all_vpc:
                 tags=[],
             )
         }
+
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.networkfirewall.networkfirewall_service.NetworkFirewall",
-            new=networkfirewall_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
             with mock.patch(
-                "prowler.providers.aws.services.vpc.vpc_service.VPC",
+                "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client",
                 new=vpc_client,
             ):
-                # Test Check
-                from prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc import (
-                    networkfirewall_in_all_vpc,
-                )
+                with mock.patch(
+                    "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.networkfirewall_client",
+                    new=networkfirewall_client,
+                ):
+                    # Test Check
+                    from prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc import (
+                        networkfirewall_in_all_vpc,
+                    )
 
-                check = networkfirewall_in_all_vpc()
-                result = check.execute()
+                    check = networkfirewall_in_all_vpc()
+                    result = check.execute()
 
-                assert len(result) == 1
-                assert result[0].status == "PASS"
-                assert (
-                    result[0].status_extended
-                    == f"VPC {VPC_ID_PROTECTED} has Network Firewall enabled."
-                )
-                assert result[0].region == AWS_REGION
-                assert result[0].resource_id == VPC_ID_PROTECTED
-                assert result[0].resource_tags == []
-                assert result[0].resource_arn == ""
+                    assert len(result) == 1
+                    assert result[0].status == "PASS"
+                    assert (
+                        result[0].status_extended
+                        == f"VPC {VPC_ID_PROTECTED} has Network Firewall enabled."
+                    )
+                    assert result[0].region == AWS_REGION
+                    assert result[0].resource_id == VPC_ID_PROTECTED
+                    assert result[0].resource_tags == []
+                    assert result[0].resource_arn == ""
 
     def test_vpcs_without_firewall(self):
         networkfirewall_client = mock.MagicMock
@@ -134,32 +176,39 @@ class Test_networkfirewall_in_all_vpc:
                 tags=[],
             )
         }
+
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.networkfirewall.networkfirewall_service.NetworkFirewall",
-            new=networkfirewall_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
             with mock.patch(
-                "prowler.providers.aws.services.vpc.vpc_service.VPC",
+                "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client",
                 new=vpc_client,
             ):
-                # Test Check
-                from prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc import (
-                    networkfirewall_in_all_vpc,
-                )
+                with mock.patch(
+                    "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.networkfirewall_client",
+                    new=networkfirewall_client,
+                ):
+                    # Test Check
+                    from prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc import (
+                        networkfirewall_in_all_vpc,
+                    )
 
-                check = networkfirewall_in_all_vpc()
-                result = check.execute()
+                    check = networkfirewall_in_all_vpc()
+                    result = check.execute()
 
-                assert len(result) == 1
-                assert result[0].status == "FAIL"
-                assert (
-                    result[0].status_extended
-                    == f"VPC {VPC_ID_UNPROTECTED} does not have Network Firewall enabled."
-                )
-                assert result[0].region == AWS_REGION
-                assert result[0].resource_id == VPC_ID_UNPROTECTED
-                assert result[0].resource_tags == []
-                assert result[0].resource_arn == ""
+                    assert len(result) == 1
+                    assert result[0].status == "FAIL"
+                    assert (
+                        result[0].status_extended
+                        == f"VPC {VPC_ID_UNPROTECTED} does not have Network Firewall enabled."
+                    )
+                    assert result[0].region == AWS_REGION
+                    assert result[0].resource_id == VPC_ID_UNPROTECTED
+                    assert result[0].resource_tags == []
+                    assert result[0].resource_arn == ""
 
     def test_vpcs_with_and_without_firewall(self):
         networkfirewall_client = mock.MagicMock
@@ -221,41 +270,48 @@ class Test_networkfirewall_in_all_vpc:
                 tags=[],
             ),
         }
+
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.networkfirewall.networkfirewall_service.NetworkFirewall",
-            new=networkfirewall_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
             with mock.patch(
-                "prowler.providers.aws.services.vpc.vpc_service.VPC",
+                "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client",
                 new=vpc_client,
             ):
-                # Test Check
-                from prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc import (
-                    networkfirewall_in_all_vpc,
-                )
+                with mock.patch(
+                    "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.networkfirewall_client",
+                    new=networkfirewall_client,
+                ):
+                    # Test Check
+                    from prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc import (
+                        networkfirewall_in_all_vpc,
+                    )
 
-                check = networkfirewall_in_all_vpc()
-                result = check.execute()
+                    check = networkfirewall_in_all_vpc()
+                    result = check.execute()
 
-                assert len(result) == 2
-                for r in result:
-                    if r.resource_id == VPC_ID_PROTECTED:
-                        assert r.status == "PASS"
-                        assert (
-                            r.status_extended
-                            == f"VPC {VPC_ID_PROTECTED} has Network Firewall enabled."
-                        )
-                        assert r.region == AWS_REGION
-                        assert r.resource_id == VPC_ID_PROTECTED
-                        assert r.resource_tags == []
-                        assert r.resource_arn == ""
-                    if r.resource_id == VPC_ID_UNPROTECTED:
-                        assert r.status == "FAIL"
-                        assert (
-                            r.status_extended
-                            == f"VPC {VPC_ID_UNPROTECTED} does not have Network Firewall enabled."
-                        )
-                        assert r.region == AWS_REGION
-                        assert r.resource_id == VPC_ID_UNPROTECTED
-                        assert r.resource_tags == []
-                        assert r.resource_arn == ""
+                    assert len(result) == 2
+                    for r in result:
+                        if r.resource_id == VPC_ID_PROTECTED:
+                            assert r.status == "PASS"
+                            assert (
+                                r.status_extended
+                                == f"VPC {VPC_ID_PROTECTED} has Network Firewall enabled."
+                            )
+                            assert r.region == AWS_REGION
+                            assert r.resource_id == VPC_ID_PROTECTED
+                            assert r.resource_tags == []
+                            assert r.resource_arn == ""
+                        if r.resource_id == VPC_ID_UNPROTECTED:
+                            assert r.status == "FAIL"
+                            assert (
+                                r.status_extended
+                                == f"VPC {VPC_ID_UNPROTECTED} does not have Network Firewall enabled."
+                            )
+                            assert r.region == AWS_REGION
+                            assert r.resource_id == VPC_ID_UNPROTECTED
+                            assert r.resource_tags == []
+                            assert r.resource_arn == ""

tests/providers/aws/services/organizations/organizations_tags_policies_enabled_and_attached/organizations_tags_policies_enabled_and_attached_test.py

@@ -1,17 +1,44 @@
 from unittest import mock
 
+from boto3 import session
+
+from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 from prowler.providers.aws.services.organizations.organizations_service import (
     Organization,
     Policy,
 )
 
 AWS_REGION = "us-east-1"
-
+AWS_ACCOUNT_NUMBER = "123456789012"
 # Moto: NotImplementedError: The TAG_POLICY policy type has not been implemented
 # Needs to Mock manually
 
 
 class Test_organizations_tags_policies_enabled_and_attached:
+    # Mocked Audit Info
+    def set_mocked_audit_info(self):
+        audit_info = AWS_Audit_Info(
+            session_config=None,
+            original_session=None,
+            audit_session=session.Session(
+                profile_name=None,
+                botocore_session=None,
+                region_name=AWS_REGION,
+            ),
+            audited_account=AWS_ACCOUNT_NUMBER,
+            audited_user_id=None,
+            audited_partition="aws",
+            audited_identity_arn=None,
+            profile=None,
+            profile_region=AWS_REGION,
+            credentials=None,
+            assumed_role_info=None,
+            audited_regions=None,
+            organizations_metadata=None,
+            audit_resources=None,
+        )
+        return audit_info
+
     def test_organization_no_organization(self):
         organizations_client = mock.MagicMock
         organizations_client.region = AWS_REGION
@@ -24,27 +51,33 @@ class Test_organizations_tags_policies_enabled_and_attached:
             )
         ]
 
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.organizations.organizations_service.Organizations",
-            new=organizations_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
-            # Test Check
-            from prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached import (
-                organizations_tags_policies_enabled_and_attached,
-            )
+            with mock.patch(
+                "prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached.organizations_client",
+                new=organizations_client,
+            ):
+                # Test Check
+                from prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached import (
+                    organizations_tags_policies_enabled_and_attached,
+                )
 
-            check = organizations_tags_policies_enabled_and_attached()
-            result = check.execute()
+                check = organizations_tags_policies_enabled_and_attached()
+                result = check.execute()
 
-            assert len(result) == 1
-            assert result[0].status == "FAIL"
-            assert (
-                result[0].status_extended
-                == "AWS Organizations is not in-use for this AWS Account"
-            )
-            assert result[0].resource_id == "AWS Organization"
-            assert result[0].resource_arn == ""
-            assert result[0].region == AWS_REGION
+                assert len(result) == 1
+                assert result[0].status == "FAIL"
+                assert (
+                    result[0].status_extended
+                    == "AWS Organizations is not in-use for this AWS Account"
+                )
+                assert result[0].resource_id == "AWS Organization"
+                assert result[0].resource_arn == ""
+                assert result[0].region == AWS_REGION
 
     def test_organization_with_tag_policies_not_attached(self):
         organizations_client = mock.MagicMock
@@ -69,30 +102,36 @@ class Test_organizations_tags_policies_enabled_and_attached:
             )
         ]
 
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached.organizations_client",
-            new=organizations_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
-            # Test Check
-            from prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached import (
-                organizations_tags_policies_enabled_and_attached,
-            )
+            with mock.patch(
+                "prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached.organizations_client",
+                new=organizations_client,
+            ):
+                # Test Check
+                from prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached import (
+                    organizations_tags_policies_enabled_and_attached,
+                )
 
-            check = organizations_tags_policies_enabled_and_attached()
-            result = check.execute()
+                check = organizations_tags_policies_enabled_and_attached()
+                result = check.execute()
 
-            assert len(result) == 1
-            assert result[0].status == "FAIL"
-            assert (
-                result[0].status_extended
-                == "AWS Organization o-1234567890 has tag policies enabled but not attached"
-            )
-            assert result[0].resource_id == "o-1234567890"
-            assert (
-                result[0].resource_arn
-                == "arn:aws:organizations::1234567890:organization/o-1234567890"
-            )
-            assert result[0].region == AWS_REGION
+                assert len(result) == 1
+                assert result[0].status == "FAIL"
+                assert (
+                    result[0].status_extended
+                    == "AWS Organization o-1234567890 has tag policies enabled but not attached"
+                )
+                assert result[0].resource_id == "o-1234567890"
+                assert (
+                    result[0].resource_arn
+                    == "arn:aws:organizations::1234567890:organization/o-1234567890"
+                )
+                assert result[0].region == AWS_REGION
 
     def test_organization_with_tag_policies_attached(self):
         organizations_client = mock.MagicMock
@@ -117,27 +156,33 @@ class Test_organizations_tags_policies_enabled_and_attached:
             )
         ]
 
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached.organizations_client",
-            new=organizations_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
-            # Test Check
-            from prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached import (
-                organizations_tags_policies_enabled_and_attached,
-            )
+            with mock.patch(
+                "prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached.organizations_client",
+                new=organizations_client,
+            ):
+                # Test Check
+                from prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached import (
+                    organizations_tags_policies_enabled_and_attached,
+                )
 
-            check = organizations_tags_policies_enabled_and_attached()
-            result = check.execute()
+                check = organizations_tags_policies_enabled_and_attached()
+                result = check.execute()
 
-            assert len(result) == 1
-            assert result[0].status == "PASS"
-            assert (
-                result[0].status_extended
-                == "AWS Organization o-1234567890 has tag policies enabled and attached to an AWS account"
-            )
-            assert result[0].resource_id == "o-1234567890"
-            assert (
-                result[0].resource_arn
-                == "arn:aws:organizations::1234567890:organization/o-1234567890"
-            )
-            assert result[0].region == AWS_REGION
+                assert len(result) == 1
+                assert result[0].status == "PASS"
+                assert (
+                    result[0].status_extended
+                    == "AWS Organization o-1234567890 has tag policies enabled and attached to an AWS account"
+                )
+                assert result[0].resource_id == "o-1234567890"
+                assert (
+                    result[0].resource_arn
+                    == "arn:aws:organizations::1234567890:organization/o-1234567890"
+                )
+                assert result[0].region == AWS_REGION

tests/providers/aws/services/rds/rds_instance_backup_enabled/rds_instance_backup_enabled_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -10,6 +11,25 @@ AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
 
+make_api_call = botocore.client.BaseClient._make_api_call
+
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_backup_enabled:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -99,6 +119,12 @@ class Test_rds_instance_backup_enabled:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_with_backup(self):
@@ -138,3 +164,9 @@ class Test_rds_instance_backup_enabled:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -10,6 +11,25 @@ AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
 
+make_api_call = botocore.client.BaseClient._make_api_call
+
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_deletion_protection:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -96,6 +116,12 @@ class Test_rds_instance_deletion_protection:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_with_deletion_protection(self):
@@ -136,6 +162,12 @@ class Test_rds_instance_deletion_protection:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_without_cluster_deletion_protection(self):
@@ -188,6 +220,12 @@ class Test_rds_instance_deletion_protection:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_with_cluster_deletion_protection(self):
@@ -240,3 +278,9 @@ class Test_rds_instance_deletion_protection:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_deprecated_engine_version/rds_instance_deprecated_engine_version_test.py

@@ -117,6 +117,11 @@ class Test_rds_instance_deprecated_engine_version:
                     == "RDS instance db-master-1 is not using a deprecated engine mysql with version 8.0.32."
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
                 assert result[0].resource_tags == []
 
     @mock_rds
@@ -158,4 +163,9 @@ class Test_rds_instance_deprecated_engine_version:
                     == "RDS instance db-master-2 is using a deprecated engine mysql with version 8.0.23."
                 )
                 assert result[0].resource_id == "db-master-2"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-2"
+                )
                 assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -9,7 +10,25 @@ from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
+make_api_call = botocore.client.BaseClient._make_api_call
 
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_enhanced_monitoring_enabled:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -97,6 +116,12 @@ class Test_rds_instance_enhanced_monitoring_enabled:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_with_monitoring(self):
@@ -137,3 +162,9 @@ class Test_rds_instance_enhanced_monitoring_enabled:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -9,7 +10,25 @@ from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
+make_api_call = botocore.client.BaseClient._make_api_call
 
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_integration_cloudwatch_logs:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -97,6 +116,12 @@ class Test_rds_instance_integration_cloudwatch_logs:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_with_logs(self):
@@ -137,3 +162,9 @@ class Test_rds_instance_integration_cloudwatch_logs:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -9,7 +10,25 @@ from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
+make_api_call = botocore.client.BaseClient._make_api_call
 
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_minor_version_upgrade_enabled:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -97,6 +116,12 @@ class Test_rds_instance_minor_version_upgrade_enabled:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_with_auto_upgrade(self):
@@ -137,3 +162,9 @@ class Test_rds_instance_minor_version_upgrade_enabled:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -10,7 +11,25 @@ from prowler.providers.aws.services.rds.rds_service import DBCluster, DBInstance
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
+make_api_call = botocore.client.BaseClient._make_api_call
 
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_multi_az:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -97,6 +116,12 @@ class Test_rds_instance_multi_az:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_multi_az(self):
@@ -137,12 +162,22 @@ class Test_rds_instance_multi_az:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     def test_rds_instance_in_cluster_multi_az(self):
         rds_client = mock.MagicMock
+        cluster_arn = (
+            f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:cluster:test-cluster"
+        )
         rds_client.db_clusters = {
-            "test-cluster": DBCluster(
+            cluster_arn: DBCluster(
                 id="test-cluster",
+                arn=cluster_arn,
                 endpoint="",
                 engine="aurora",
                 status="available",
@@ -161,6 +196,7 @@ class Test_rds_instance_multi_az:
         rds_client.db_instances = [
             DBInstance(
                 id="test-instance",
+                arn=f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:test-instance",
                 endpoint="",
                 engine="aurora",
                 engine_version="1.0.0",
@@ -174,36 +210,53 @@ class Test_rds_instance_multi_az:
                 parameter_group=[],
                 multi_az=False,
                 cluster_id="test-cluster",
+                cluster_arn=cluster_arn,
                 region=AWS_REGION,
                 tags=[],
             )
         ]
 
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client",
-            new=rds_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
-            # Test Check
-            from prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az import (
-                rds_instance_multi_az,
-            )
+            with mock.patch(
+                "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client",
+                new=rds_client,
+            ):
+                # Test Check
+                from prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az import (
+                    rds_instance_multi_az,
+                )
 
-            check = rds_instance_multi_az()
-            result = check.execute()
+                check = rds_instance_multi_az()
+                result = check.execute()
 
-            assert len(result) == 1
-            assert result[0].status == "PASS"
-            assert search(
-                "has multi-AZ enabled at cluster",
-                result[0].status_extended,
-            )
-            assert result[0].resource_id == "test-instance"
+                assert len(result) == 1
+                assert result[0].status == "PASS"
+                assert search(
+                    "has multi-AZ enabled at cluster",
+                    result[0].status_extended,
+                )
+                assert result[0].resource_id == "test-instance"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:test-instance"
+                )
+                assert result[0].resource_tags == []
 
     def test_rds_instance_in_cluster_without_multi_az(self):
         rds_client = mock.MagicMock
+        cluster_arn = (
+            f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:cluster:test-cluster"
+        )
         rds_client.db_clusters = {
-            "test-cluster": DBCluster(
+            cluster_arn: DBCluster(
                 id="test-cluster",
+                arn=cluster_arn,
                 endpoint="",
                 engine="aurora",
                 status="available",
@@ -222,6 +275,7 @@ class Test_rds_instance_multi_az:
         rds_client.db_instances = [
             DBInstance(
                 id="test-instance",
+                arn=f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:test-instance",
                 endpoint="",
                 engine="aurora",
                 engine_version="1.0.0",
@@ -235,27 +289,40 @@ class Test_rds_instance_multi_az:
                 parameter_group=[],
                 multi_az=False,
                 cluster_id="test-cluster",
+                cluster_arn=cluster_arn,
                 region=AWS_REGION,
                 tags=[],
             )
         ]
 
+        audit_info = self.set_mocked_audit_info()
+
         with mock.patch(
-            "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client",
-            new=rds_client,
+            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
+            new=audit_info,
         ):
-            # Test Check
-            from prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az import (
-                rds_instance_multi_az,
-            )
+            with mock.patch(
+                "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client",
+                new=rds_client,
+            ):
+                # Test Check
+                from prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az import (
+                    rds_instance_multi_az,
+                )
 
-            check = rds_instance_multi_az()
-            result = check.execute()
+                check = rds_instance_multi_az()
+                result = check.execute()
 
-            assert len(result) == 1
-            assert result[0].status == "FAIL"
-            assert search(
-                "does not have multi-AZ enabled at cluster",
-                result[0].status_extended,
-            )
-            assert result[0].resource_id == "test-instance"
+                assert len(result) == 1
+                assert result[0].status == "FAIL"
+                assert search(
+                    "does not have multi-AZ enabled at cluster",
+                    result[0].status_extended,
+                )
+                assert result[0].resource_id == "test-instance"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:test-instance"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_no_public_access/rds_instance_no_public_access_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -9,7 +10,25 @@ from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
+make_api_call = botocore.client.BaseClient._make_api_call
 
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_no_public_access:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -97,6 +116,12 @@ class Test_rds_instance_no_public_access:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_public(self):
@@ -137,3 +162,9 @@ class Test_rds_instance_no_public_access:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -9,7 +10,25 @@ from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
+make_api_call = botocore.client.BaseClient._make_api_call
 
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_storage_encrypted:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -96,6 +115,12 @@ class Test_rds_instance_storage_encrypted:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_with_encryption(self):
@@ -136,3 +161,9 @@ class Test_rds_instance_storage_encrypted:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_instance_transport_encrypted/rds_instance_transport_encrypted_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -9,7 +10,25 @@ from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
+make_api_call = botocore.client.BaseClient._make_api_call
 
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    return make_api_call(self, operation_name, kwarg)
+
+
+@mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 class Test_rds_instance_transport_encrypted:
     # Mocked Audit Info
     def set_mocked_audit_info(self):
@@ -152,6 +171,12 @@ class Test_rds_instance_transport_encrypted:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
     def test_rds_instance_with_ssl(self):
@@ -208,3 +233,9 @@ class Test_rds_instance_transport_encrypted:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "db-master-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:db:db-master-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/rds/rds_service_test.py

@@ -228,23 +228,31 @@ class Test_RDS_Service:
         # RDS client for this test class
         audit_info = self.set_mocked_audit_info()
         rds = RDS(audit_info)
+
+        db_cluster_arn = (
+            f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:cluster:{cluster_id}"
+        )
+
         assert len(rds.db_clusters) == 1
-        assert rds.db_clusters[cluster_id].id == "db-master-1"
-        assert rds.db_clusters[cluster_id].engine == "postgres"
-        assert rds.db_clusters[cluster_id].region == AWS_REGION
-        assert f"{AWS_REGION}.rds.amazonaws.com" in rds.db_clusters[cluster_id].endpoint
-        assert rds.db_clusters[cluster_id].status == "available"
-        assert not rds.db_clusters[cluster_id].public
-        assert not rds.db_clusters[cluster_id].encrypted
-        assert rds.db_clusters[cluster_id].backup_retention_period == 1
-        assert rds.db_clusters[cluster_id].cloudwatch_logs == ["audit", "error"]
-        assert rds.db_clusters[cluster_id].deletion_protection
-        assert not rds.db_clusters[cluster_id].auto_minor_version_upgrade
-        assert not rds.db_clusters[cluster_id].multi_az
-        assert rds.db_clusters[cluster_id].tags == [
+        assert rds.db_clusters[db_cluster_arn].id == "db-master-1"
+        assert rds.db_clusters[db_cluster_arn].engine == "postgres"
+        assert rds.db_clusters[db_cluster_arn].region == AWS_REGION
+        assert (
+            f"{AWS_REGION}.rds.amazonaws.com"
+            in rds.db_clusters[db_cluster_arn].endpoint
+        )
+        assert rds.db_clusters[db_cluster_arn].status == "available"
+        assert not rds.db_clusters[db_cluster_arn].public
+        assert not rds.db_clusters[db_cluster_arn].encrypted
+        assert rds.db_clusters[db_cluster_arn].backup_retention_period == 1
+        assert rds.db_clusters[db_cluster_arn].cloudwatch_logs == ["audit", "error"]
+        assert rds.db_clusters[db_cluster_arn].deletion_protection
+        assert not rds.db_clusters[db_cluster_arn].auto_minor_version_upgrade
+        assert not rds.db_clusters[db_cluster_arn].multi_az
+        assert rds.db_clusters[db_cluster_arn].tags == [
             {"Key": "test", "Value": "test"},
         ]
-        assert rds.db_clusters[cluster_id].parameter_group == "test"
+        assert rds.db_clusters[db_cluster_arn].parameter_group == "test"
 
     # Test RDS Describe DB Cluster Snapshots
     @mock_rds

tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py

@@ -1,6 +1,7 @@
 from re import search
 from unittest import mock
 
+import botocore
 from boto3 import client, session
 from moto import mock_rds
 
@@ -9,6 +10,32 @@ from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"
 
+make_api_call = botocore.client.BaseClient._make_api_call
+
+
+def mock_make_api_call(self, operation_name, kwarg):
+    if operation_name == "DescribeDBEngineVersions":
+        return {
+            "DBEngineVersions": [
+                {
+                    "Engine": "mysql",
+                    "EngineVersion": "8.0.32",
+                    "DBEngineDescription": "description",
+                    "DBEngineVersionDescription": "description",
+                },
+            ]
+        }
+    # if operation_name == "DescribeDBClusterSnapshotAttributes":
+    #     return {
+    #         "DBClusterSnapshotAttributesResult": {
+    #             "DBClusterSnapshotIdentifier": "test-snapshot",
+    #             "DBClusterSnapshotAttributes": [
+    #                 {"AttributeName": "restore", "AttributeValues": ["all"]}
+    #             ],
+    #         }
+    #     }
+    return make_api_call(self, operation_name, kwarg)
+
 
 class Test_rds_snapshots_public_access:
     # Mocked Audit Info
@@ -29,13 +56,14 @@ class Test_rds_snapshots_public_access:
             profile_region=AWS_REGION,
             credentials=None,
             assumed_role_info=None,
-            audited_regions=None,
+            audited_regions=[AWS_REGION],
             organizations_metadata=None,
             audit_resources=None,
         )
         return audit_info
 
     @mock_rds
+    @mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
     def test_rds_no_snapshots(self):
         from prowler.providers.aws.services.rds.rds_service import RDS
 
@@ -60,6 +88,7 @@ class Test_rds_snapshots_public_access:
                 assert len(result) == 0
 
     @mock_rds
+    @mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
     def test_rds_private_snapshot(self):
         conn = client("rds", region_name=AWS_REGION)
         conn.create_db_instance(
@@ -103,6 +132,7 @@ class Test_rds_snapshots_public_access:
                 assert result[0].resource_id == "snapshot-1"
 
     @mock_rds
+    @mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
     def test_rds_public_snapshot(self):
         conn = client("rds", region_name=AWS_REGION)
         conn.create_db_instance(
@@ -145,8 +175,15 @@ class Test_rds_snapshots_public_access:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "snapshot-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:snapshot:snapshot-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
+    @mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
     def test_rds_cluster_private_snapshot(self):
         conn = client("rds", region_name=AWS_REGION)
         conn.create_db_cluster(
@@ -188,8 +225,15 @@ class Test_rds_snapshots_public_access:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "snapshot-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:cluster-snapshot:snapshot-1"
+                )
+                assert result[0].resource_tags == []
 
     @mock_rds
+    @mock.patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
     def test_rds_cluster_public_snapshot(self):
         conn = client("rds", region_name=AWS_REGION)
         conn.create_db_cluster(
@@ -232,3 +276,9 @@ class Test_rds_snapshots_public_access:
                     result[0].status_extended,
                 )
                 assert result[0].resource_id == "snapshot-1"
+                assert result[0].region == AWS_REGION
+                assert (
+                    result[0].resource_arn
+                    == f"arn:aws:rds:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:cluster-snapshot:snapshot-1"
+                )
+                assert result[0].resource_tags == []

tests/providers/aws/services/secretsmanager/secretsmanager_service_test.py

@@ -154,11 +154,11 @@ class Test_SecretsManager_Service:
 
         assert len(secretsmanager.secrets) == 1
         assert secretsmanager.secrets
-        assert secretsmanager.secrets[secret_name]
-        assert secretsmanager.secrets[secret_name].name == secret_name
-        assert secretsmanager.secrets[secret_name].arn == secret_arn
-        assert secretsmanager.secrets[secret_name].region == AWS_REGION
-        assert secretsmanager.secrets[secret_name].rotation_enabled is True
-        assert secretsmanager.secrets[secret_name].tags == [
+        assert secretsmanager.secrets[secret_arn]
+        assert secretsmanager.secrets[secret_arn].name == secret_name
+        assert secretsmanager.secrets[secret_arn].arn == secret_arn
+        assert secretsmanager.secrets[secret_arn].region == AWS_REGION
+        assert secretsmanager.secrets[secret_arn].rotation_enabled is True
+        assert secretsmanager.secrets[secret_arn].tags == [
             {"Key": "test", "Value": "test"},
         ]

tests/providers/aws/services/securityhub/securityhub_enabled/securityhub_enabled_test.py

@@ -5,7 +5,7 @@ from prowler.providers.aws.services.securityhub.securityhub_service import (
 )
 
 
-class Test_accessanalyzer_enabled_without_findings:
+class Test_securityhub_enabled:
     def test_securityhub_hub_inactive(self):
         securityhub_client = mock.MagicMock
         securityhub_client.securityhubs = [

tests/providers/aws/services/ssm/ssm_service_test.py

@@ -53,6 +53,14 @@ def mock_make_api_call(self, operation_name, kwarg):
                 },
             ],
         }
+    if operation_name == "DescribeInstanceInformation":
+        return {
+            "InstanceInformationList": [
+                {
+                    "InstanceId": "test-instance-id",
+                },
+            ],
+        }
 
     return make_api_call(self, operation_name, kwarg)
 
@@ -132,7 +140,7 @@ class Test_SSM_Service:
                 profile_name=None,
                 botocore_session=None,
             ),
-            audited_account=None,
+            audited_account=DEFAULT_ACCOUNT_ID,
             audited_user_id=None,
             audited_partition="aws",
             audited_identity_arn=None,
@@ -187,18 +195,19 @@ class Test_SSM_Service:
 
         ssm = SSM(self.set_mocked_audit_info())
 
+        document_arn = f"arn:aws:ssm:{AWS_REGION}:{DEFAULT_ACCOUNT_ID}:document/{ssm_document_name}"
+
         assert len(ssm.documents) == 1
         assert ssm.documents
-        assert ssm.documents[ssm_document_name]
-        assert ssm.documents[ssm_document_name].name == ssm_document_name
-        assert ssm.documents[ssm_document_name].region == AWS_REGION
-        assert ssm.documents[ssm_document_name].tags == [
+        assert ssm.documents[document_arn]
+        assert ssm.documents[document_arn].arn == document_arn
+        assert ssm.documents[document_arn].name == ssm_document_name
+        assert ssm.documents[document_arn].region == AWS_REGION
+        assert ssm.documents[document_arn].tags == [
             {"Key": "test", "Value": "test"},
         ]
-        assert ssm.documents[ssm_document_name].content == yaml.safe_load(
-            ssm_document_yaml
-        )
-        assert ssm.documents[ssm_document_name].account_owners == [DEFAULT_ACCOUNT_ID]
+        assert ssm.documents[document_arn].content == yaml.safe_load(ssm_document_yaml)
+        assert ssm.documents[document_arn].account_owners == [DEFAULT_ACCOUNT_ID]
 
     @mock_ssm
     def test__list_resource_compliance_summaries__(self):