chore(aws): Replace audit_info for provider (#3521)

Co-authored-by: Sergio Garcia <38561120+sergargar@users.noreply.github.com>

docs/tutorials/mutelist.md

@@ -114,7 +114,7 @@ You will need to pass the S3 URI where your Mute List YAML file was uploaded to
 prowler aws -w s3://<bucket>/<prefix>/mutelist.yaml
 ```
 ???+ note
-    Make sure that the used AWS credentials have s3:GetObject permissions in the S3 path where the allowlist file is located.
+    Make sure that the used AWS credentials have `s3:GetObject` permissions in the S3 path where the mutelist file is located.
 
 ### AWS DynamoDB Table ARN
 

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "about-time"
@@ -2317,13 +2317,13 @@ test = ["pytest", "pytest-cov"]
 
 [[package]]
 name = "moto"
-version = "5.0.2"
+version = "5.0.3"
 description = ""
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "moto-5.0.2-py2.py3-none-any.whl", hash = "sha256:71bb832a18b64f10fc4cec117b9b0e2305e5831d9a17eb74f6b9819ed7613843"},
-    {file = "moto-5.0.2.tar.gz", hash = "sha256:7e27395e5c63ff9554ae14b5baa41bfe6d6b1be0e59eb02977c6ce28411246de"},
+    {file = "moto-5.0.3-py2.py3-none-any.whl", hash = "sha256:261d312d1d69c2afccb450a0566666d7b75d76ed6a7d00aac278a9633b073ff0"},
+    {file = "moto-5.0.3.tar.gz", hash = "sha256:070ac2edf89ad7aee28534481ce68e2f344c8a6a8fefec5427eea0d599bfdbdb"},
 ]
 
 [package.dependencies]
@@ -4455,4 +4455,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.13"
-content-hash = "bf0fbc4e6ba2ecc7f163a3a5048b60cce386dfbf603de925e405326413b7a268"
+content-hash = "7afdc0cc5591b2c397142e9ba88d797d81980a8d3b05b24c8c0bcc60e7e20d9e"

prowler/config/config.yaml

@@ -1,10 +1,10 @@
 # AWS Configuration
 aws:
   # AWS Global Configuration
-  # aws.allowlist_non_default_regions --> Set to True to allowlist failed findings in non-default regions for AccessAnalyzer, GuardDuty, SecurityHub, DRS and Config
-  allowlist_non_default_regions: False
-  # If you want to allowlist/mute failed findings only in specific regions, create a file with the following syntax and run it with `prowler aws -w allowlist.yaml`:
-  # Allowlist:
+  # aws.mute_non_default_regions --> Set to True to muted failed findings in non-default regions for AccessAnalyzer, GuardDuty, SecurityHub, DRS and Config
+  mute_non_default_regions: False
+  # If you want to mute failed findings only in specific regions, create a file with the following syntax and run it with `prowler aws -w mutelist.yaml`:
+  # Mutelist:
   #  Accounts:
   #   "*":
   #     Checks:

prowler/lib/outputs/models.py

@@ -6,6 +6,8 @@ from pydantic import BaseModel
 
 from prowler.config.config import prowler_version
 from prowler.lib.logger import logger
+from prowler.lib.utils.utils import outputs_unix_timestamp
+from prowler.providers.aws.models import AWSOrganizationsInfo
 
 
 def get_check_compliance(finding, provider_type, output_options) -> dict:

prowler/providers/aws/aws_provider.py

@@ -225,9 +225,11 @@ class AwsProvider(Provider):
         self._ignore_unused_services = ignore_unused_services
 
         # Audit Config
-        self._audit_config = load_and_validate_config_file(
-            self._type, arguments.config_file
-        )
+        self._audit_config = {}
+        if hasattr(arguments, "config_file"):
+            self._audit_config = load_and_validate_config_file(
+                self._type, arguments.config_file
+            )
 
     @property
     def identity(self):

prowler/providers/aws/lib/audit_info/audit_info.py

@@ -1,43 +0,0 @@
-from boto3 import session
-from botocore.config import Config
-
-from prowler.providers.aws.config import BOTO3_USER_AGENT_EXTRA
-from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info, AWSAssumeRole
-
-# Default Current Audit Info
-current_audit_info = AWS_Audit_Info(
-    original_session=None,
-    audit_session=session.Session(
-        profile_name=None,
-        botocore_session=None,
-    ),
-    # Default standard retrier config
-    # https://boto3.amazonaws.com/v1/documentation/api/latest/guide/retries.html
-    session_config=Config(
-        retries={"max_attempts": 3, "mode": "standard"},
-        user_agent_extra=BOTO3_USER_AGENT_EXTRA,
-    ),
-    audited_account=None,
-    audited_account_arn=None,
-    audited_user_id=None,
-    audited_partition=None,
-    audited_identity_arn=None,
-    profile=None,
-    profile_region=None,
-    credentials=None,
-    assumed_role_info=AWSAssumeRole(
-        role_arn=None,
-        session_duration=None,
-        external_id=None,
-        mfa_enabled=None,
-        role_session_name=None,
-    ),
-    mfa_enabled=None,
-    audit_resources=None,
-    audited_regions=None,
-    organizations_metadata=None,
-    audit_metadata=None,
-    audit_config=None,
-    ignore_unused_services=False,
-    enabled_regions=set(),
-)

prowler/providers/aws/lib/mutelist/mutelist.py

@@ -193,7 +193,7 @@ def is_muted_in_check(
             muted_regions = muted_check_info.get("Regions")
             muted_resources = muted_check_info.get("Resources")
             muted_tags = muted_check_info.get("Tags", "*")
-            # We need to set the allowlisted_tags if None, "" or [], so the falsy helps
+            # We need to set the muted_tags if None, "" or [], so the falsy helps
             if not muted_tags:
                 muted_tags = "*"
             # If there is a *, it affects to all checks

prowler/providers/aws/lib/quick_inventory/quick_inventory.py

@@ -15,10 +15,10 @@ from prowler.config.config import (
 )
 from prowler.lib.logger import logger
 from prowler.providers.aws.lib.arn.models import get_arn_resource_type
-from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 from prowler.providers.aws.lib.s3.s3 import send_to_s3_bucket
 
 
+# TODO(Audit_Info): use provider here
 def quick_inventory(audit_info: AWS_Audit_Info, args):
     resources = []
     global_resources = []
@@ -209,6 +209,7 @@ def create_inventory_table(resources: list, resources_in_region: dict) -> dict:
     return inventory_table
 
 
+# TODO(Audit_Info): use provider here
 def create_output(resources: list, audit_info: AWS_Audit_Info, args):
     json_output = []
     # Check if custom output filename was input, if not, set the default
@@ -302,6 +303,7 @@ def create_output(resources: list, audit_info: AWS_Audit_Info, args):
             )
 
 
+# TODO(Audit_Info): use provider here
 def get_regional_buckets(audit_info: AWS_Audit_Info, region: str) -> list:
     regional_buckets = []
     s3_client = audit_info.audit_session.client("s3", region_name=region)

prowler/providers/aws/lib/resource_api_tagging/resource_api_tagging.py

@@ -1,11 +1,10 @@
 import sys
 
 from prowler.lib.logger import logger
-from prowler.providers.aws.aws_provider import generate_regional_clients
-from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 
 
-def get_tagged_resources(input_resource_tags: list, current_audit_info: AWS_Audit_Info):
+# TODO(aws): Remove from the provider or from here
+def get_tagged_resources(input_resource_tags: list, provider):
     """
     get_tagged_resources returns a list of the resources that are going to be scanned based on the given input tags
     """
@@ -17,8 +16,8 @@ def get_tagged_resources(input_resource_tags: list, current_audit_info: AWS_Audi
             value = tag.split("=")[1]
             resource_tags.append({"Key": key, "Values": [value]})
         # Get Resources with resource_tags for all regions
-        for regional_client in generate_regional_clients(
-            "resourcegroupstaggingapi", current_audit_info
+        for regional_client in provider.generate_regional_clients(
+            "resourcegroupstaggingapi"
         ).values():
             try:
                 get_resources_paginator = regional_client.get_paginator("get_resources")

prowler/providers/aws/services/globalaccelerator/globalaccelerator_service.py

@@ -11,7 +11,7 @@ class GlobalAccelerator(AWSService):
         # Call AWSService's __init__
         super().__init__(__class__.__name__, provider)
         self.accelerators = {}
-        if provider.audited_partition == "aws":
+        if self.audited_partition == "aws":
             # Global Accelerator is a global service that supports endpoints in multiple AWS Regions
             # but you must specify the US West (Oregon) Region to create, update, or otherwise work with accelerators.
             # That is, for example, specify --region us-west-2 on AWS CLI commands.

prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py

@@ -17,15 +17,13 @@ class TrustedAdvisor(AWSService):
         self.premium_support = PremiumSupport(enabled=False)
         # Support API is not available in China Partition
         # But only in us-east-1 or us-gov-west-1 https://docs.aws.amazon.com/general/latest/gr/awssupport.html
-        if provider.audited_partition != "aws-cn":
-            if provider.audited_partition == "aws":
+        if self.audited_partition != "aws-cn":
+            if self.audited_partition == "aws":
                 support_region = "us-east-1"
             else:
                 support_region = "us-gov-west-1"
 
-            self.client = provider.audit_session.client(
-                self.service, region_name=support_region
-            )
+            self.client = self.session.client(self.service, region_name=support_region)
             self.client.region = support_region
             self.__describe_services__()
             if self.premium_support.enabled:

pyproject.toml

@@ -70,7 +70,7 @@ docker = "7.0.0"
 flake8 = "7.0.0"
 freezegun = "1.4.0"
 mock = "5.1.0"
-moto = {extras = ["all"], version = "5.0.2"}
+moto = {extras = ["all"], version = "5.0.3"}
 openapi-schema-validator = "0.6.2"
 openapi-spec-validator = "0.7.1"
 pylint = "3.1.0"

tests/lib/check/check_test.py

@@ -27,7 +27,7 @@ from prowler.providers.aws.aws_provider import (
     get_checks_from_input_arn,
     get_regions_from_audit_resources,
 )
-from tests.providers.aws.audit_info_utils import set_mocked_aws_audit_info
+from tests.providers.aws.utils import set_mocked_aws_audit_info
 
 AWS_ACCOUNT_NUMBER = "123456789012"
 AWS_REGION = "us-east-1"

tests/lib/outputs/outputs_test.py

@@ -62,7 +62,6 @@ from prowler.lib.outputs.models import (
 )
 from prowler.lib.outputs.outputs import extract_findings_statistics, set_report_color
 from prowler.lib.utils.utils import hash_sha512, open_file
-from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 from prowler.providers.common.models import Audit_Metadata
 
 AWS_ACCOUNT_ID = "123456789012"
@@ -72,6 +71,7 @@ class Test_Outputs:
     def test_fill_file_descriptors(self):
         audited_account = AWS_ACCOUNT_ID
         output_directory = f"{os.path.dirname(os.path.realpath(__file__))}"
+        # TODO(Audit_Info): use provider here
         audit_info = AWS_Audit_Info(
             session_config=None,
             original_session=None,

tests/lib/outputs/slack_test.py

@@ -7,7 +7,6 @@ from prowler.lib.outputs.slack import (
     create_message_identity,
     send_slack_message,
 )
-from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 from prowler.providers.azure.lib.audit_info.models import (
     Azure_Audit_Info,
     AzureIdentityInfo,
@@ -29,6 +28,7 @@ def mock_create_message_identity(*_):
 
 class Test_Slack_Integration:
     def test_create_message_identity(self):
+        # TODO(Audit_Info): use provider here
         aws_audit_info = AWS_Audit_Info(
             session_config=None,
             original_session=None,

tests/providers/aws/aws_provider_test.py

@@ -13,7 +13,7 @@ from prowler.providers.aws.aws_provider import (
     get_global_region,
 )
 from prowler.providers.aws.lib.audit_info.models import AWS_Assume_Role
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_CHINA_PARTITION,
     AWS_GOV_CLOUD_PARTITION,

tests/providers/aws/lib/mutelist/mutelist_test.py

@@ -13,7 +13,7 @@ from prowler.providers.aws.lib.mutelist.mutelist import (
     mutelist_findings,
     parse_mutelist_file,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_CENTRAL_1,
     AWS_REGION_EU_SOUTH_3,
@@ -23,7 +23,7 @@ from tests.providers.aws.audit_info_utils import (
 )
 
 
-class Test_Allowlist:
+class TestMutelist:
     # Test S3 mutelist
     @mock_aws
     def test_s3_mutelist(self):
@@ -40,7 +40,9 @@ class Test_Allowlist:
 
         with open("tests/providers/aws/lib/mutelist/fixtures/mutelist.yaml") as f:
             assert yaml.safe_load(f)["Mute List"] == parse_mutelist_file(
-                audit_info, "s3://test-mutelist/mutelist.yaml"
+                audit_info.session.current_session,
+                audit_info.identity.account,
+                "s3://test-mutelist/mutelist.yaml",
             )
 
     # Test DynamoDB mutelist
@@ -78,7 +80,8 @@ class Test_Allowlist:
         assert (
             "keyword"
             in parse_mutelist_file(
-                audit_info,
+                audit_info.session.current_session,
+                audit_info.identity.account,
                 "arn:aws:dynamodb:"
                 + AWS_REGION_US_EAST_1
                 + ":"
@@ -123,7 +126,8 @@ class Test_Allowlist:
         assert (
             "environment=dev"
             in parse_mutelist_file(
-                audit_info,
+                audit_info.session.current_session,
+                audit_info.identity.account,
                 "arn:aws:dynamodb:"
                 + AWS_REGION_US_EAST_1
                 + ":"
@@ -133,9 +137,8 @@ class Test_Allowlist:
             )["Accounts"]["*"]["Checks"]["*"]["Tags"]
         )
 
-    # Allowlist tests
     def test_mutelist_findings_only_wildcard(self):
-        # Allowlist example
+
         mutelist = {
             "Accounts": {
                 "*": {
@@ -166,7 +169,7 @@ class Test_Allowlist:
         assert muted_findings[0].status == "MUTED"
 
     def test_mutelist_all_exceptions_empty(self):
-        # Allowlist example
+
         mutelist = {
             "Accounts": {
                 "*": {
@@ -201,7 +204,7 @@ class Test_Allowlist:
 
         muted_findings = mutelist_findings(mutelist, AWS_ACCOUNT_NUMBER, check_findings)
         assert len(muted_findings) == 1
-        assert muted_findings[0].status == "WARNING"
+        assert muted_findings[0].status == "MUTED"
 
     def test_is_muted_with_everything_excepted(self):
         mutelist = {
@@ -291,7 +294,7 @@ class Test_Allowlist:
         )
 
     def test_is_muted(self):
-        # Allowlist example
+
         mutelist = {
             "Accounts": {
                 "*": {
@@ -509,7 +512,7 @@ class Test_Allowlist:
         )
 
     def test_is_muted_all_and_single_account_with_different_resources(self):
-        # Allowlist example
+
         mutelist = {
             "Accounts": {
                 "*": {
@@ -579,7 +582,7 @@ class Test_Allowlist:
     def test_is_muted_all_and_single_account_with_different_resources_and_exceptions(
         self,
     ):
-        # Allowlist example
+
         mutelist = {
             "Accounts": {
                 "*": {
@@ -931,7 +934,7 @@ class Test_Allowlist:
         )
 
     def test_is_muted_specific_account_with_other_account_excepted(self):
-        # Allowlist example
+
         mutelist = {
             "Accounts": {
                 AWS_ACCOUNT_NUMBER: {
@@ -966,7 +969,7 @@ class Test_Allowlist:
         )
 
     def test_is_muted_complex_mutelist(self):
-        # Allowlist example
+
         mutelist = {
             "Accounts": {
                 "*": {
@@ -1110,7 +1113,7 @@ class Test_Allowlist:
         )
 
     def test_is_excepted_only_in_account(self):
-        # Allowlist example
+
         exceptions = {
             "Accounts": [AWS_ACCOUNT_NUMBER],
             "Regions": [],
@@ -1127,7 +1130,7 @@ class Test_Allowlist:
         )
 
     def test_is_excepted_only_in_region(self):
-        # Allowlist example
+
         exceptions = {
             "Accounts": [],
             "Regions": [AWS_REGION_EU_CENTRAL_1, AWS_REGION_EU_SOUTH_3],
@@ -1144,7 +1147,7 @@ class Test_Allowlist:
         )
 
     def test_is_excepted_only_in_resources(self):
-        # Allowlist example
+
         exceptions = {
             "Accounts": [],
             "Regions": [],
@@ -1161,7 +1164,7 @@ class Test_Allowlist:
         )
 
     def test_is_excepted_only_in_tags(self):
-        # Allowlist example
+
         exceptions = {
             "Accounts": [],
             "Regions": [],
@@ -1178,7 +1181,7 @@ class Test_Allowlist:
         )
 
     def test_is_excepted_in_account_and_tags(self):
-        # Allowlist example
+
         exceptions = {
             "Accounts": [AWS_ACCOUNT_NUMBER],
             "Regions": [],

tests/providers/aws/lib/organizations/organizations_test.py

@@ -8,10 +8,7 @@ from prowler.providers.aws.lib.organizations.organizations import (
     get_organizations_metadata,
     parse_organizations_metadata,
 )
-from tests.providers.aws.audit_info_utils import (
-    AWS_ACCOUNT_NUMBER,
-    AWS_REGION_US_EAST_1,
-)
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1
 
 
 class Test_AWS_Organizations:

tests/providers/aws/lib/s3/s3_test.py

@@ -28,7 +28,7 @@ class TestS3:
 
         # Create mock session
         audit_info.audit_session = boto3.session.Session(region_name=AWS_REGION)
-        audit_info.audited_account = AWS_ACCOUNT_ID
+        audit_info.identity.account = AWS_ACCOUNT_ID
 
         # Create mock bucket
         client = audit_info.audit_session.client("s3")
@@ -36,7 +36,7 @@ class TestS3:
 
         # Mocked CSV output file
         output_directory = f"{ACTUAL_DIRECTORY}/{FIXTURES_DIR_NAME}"
-        filename = f"prowler-output-{audit_info.audited_account}"
+        filename = f"prowler-output-{audit_info.identity.account}"
 
         # Send mock CSV file to mock S3 Bucket
         send_to_s3_bucket(
@@ -67,7 +67,7 @@ class TestS3:
 
         # Create mock session
         audit_info.audit_session = boto3.session.Session(region_name=AWS_REGION)
-        audit_info.audited_account = AWS_ACCOUNT_ID
+        audit_info.identity.account = AWS_ACCOUNT_ID
 
         # Create mock bucket
         client = audit_info.audit_session.client("s3")
@@ -75,7 +75,7 @@ class TestS3:
 
         # Mocked CSV output file
         output_directory = f"{ACTUAL_DIRECTORY}/{FIXTURES_DIR_NAME}"
-        filename = f"prowler-output-{audit_info.audited_account}"
+        filename = f"prowler-output-{audit_info.identity.account}"
 
         # Send mock CSV file to mock S3 Bucket
         send_to_s3_bucket(

tests/providers/aws/lib/security_hub/security_hub_test.py

@@ -8,14 +8,12 @@ from mock import MagicMock, patch
 
 from prowler.config.config import prowler_version, timestamp_utc
 from prowler.lib.check.models import Check_Report, load_check_metadata
-
-# from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
 from prowler.providers.aws.lib.security_hub.security_hub import (
     batch_send_to_security_hub,
     prepare_security_hub_findings,
     verify_security_hub_integration_enabled_per_region,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_COMMERCIAL_PARTITION,
     AWS_REGION_EU_WEST_1,

tests/providers/aws/lib/service/service_test.py

@@ -1,7 +1,7 @@
 from mock import patch
 
 from prowler.providers.aws.lib.service.service import AWSService
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_ARN,
     AWS_ACCOUNT_NUMBER,
     AWS_COMMERCIAL_PARTITION,
@@ -10,8 +10,8 @@ from tests.providers.aws.audit_info_utils import (
 )
 
 
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_US_EAST_1
     )
     regional_client.region = AWS_REGION_US_EAST_1
@@ -19,22 +19,22 @@ def mock_generate_regional_clients(service, audit_info):
 
 
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_AWSService:
     def test_AWSService_init(self):
         service_name = "s3"
-        audit_info = set_mocked_aws_audit_info()
-        service = AWSService(service_name, audit_info)
+        provider = set_mocked_aws_audit_info()
+        service = AWSService(service_name, provider)
 
-        assert service.audit_info == audit_info
+        assert service.provider == provider
         assert service.audited_account == AWS_ACCOUNT_NUMBER
         assert service.audited_account_arn == AWS_ACCOUNT_ARN
         assert service.audited_partition == AWS_COMMERCIAL_PARTITION
         assert service.audit_resources == []
         assert service.audited_checks == []
-        assert service.session == audit_info.audit_session
+        assert service.session == provider.session.current_session
         assert service.service == service_name
         assert len(service.regional_clients) == 1
         assert (
@@ -46,16 +46,16 @@ class Test_AWSService:
 
     def test_AWSService_init_global_service(self):
         service_name = "cloudfront"
-        audit_info = set_mocked_aws_audit_info()
-        service = AWSService(service_name, audit_info, global_service=True)
+        provider = set_mocked_aws_audit_info()
+        service = AWSService(service_name, provider, global_service=True)
 
-        assert service.audit_info == audit_info
+        assert service.provider == provider
         assert service.audited_account == AWS_ACCOUNT_NUMBER
         assert service.audited_account_arn == AWS_ACCOUNT_ARN
         assert service.audited_partition == AWS_COMMERCIAL_PARTITION
         assert service.audit_resources == []
         assert service.audited_checks == []
-        assert service.session == audit_info.audit_session
+        assert service.session == provider.session.current_session
         assert service.service == service_name
         assert not hasattr(service, "regional_clients")
         assert service.region == AWS_REGION_US_EAST_1

tests/providers/aws/services/accessanalyzer/accessanalyzer_service_test.py

@@ -5,10 +5,10 @@ import botocore
 from prowler.providers.aws.services.accessanalyzer.accessanalyzer_service import (
     AccessAnalyzer,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 # Mocking Access Analyzer Calls
@@ -54,8 +54,8 @@ def mock_make_api_call(self, operation_name, kwarg):
     return make_api_call(self, operation_name, kwarg)
 
 
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_EU_WEST_1
     )
     regional_client.region = AWS_REGION_EU_WEST_1
@@ -65,14 +65,14 @@ def mock_generate_regional_clients(service, audit_info):
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_AccessAnalyzer_Service:
     # Test AccessAnalyzer Client
     def test__get_client__(self):
         access_analyzer = AccessAnalyzer(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert (
             access_analyzer.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__
@@ -82,20 +82,20 @@ class Test_AccessAnalyzer_Service:
     # Test AccessAnalyzer Session
     def test__get_session__(self):
         access_analyzer = AccessAnalyzer(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert access_analyzer.session.__class__.__name__ == "Session"
 
     # Test AccessAnalyzer Service
     def test__get_service__(self):
         access_analyzer = AccessAnalyzer(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert access_analyzer.service == "accessanalyzer"
 
     def test__list_analyzers__(self):
         access_analyzer = AccessAnalyzer(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert len(access_analyzer.analyzers) == 1
         assert access_analyzer.analyzers[0].arn == "ARN"
@@ -107,7 +107,7 @@ class Test_AccessAnalyzer_Service:
 
     def test__list_findings__(self):
         access_analyzer = AccessAnalyzer(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert len(access_analyzer.analyzers) == 1
         assert len(access_analyzer.analyzers[0].findings) == 1

tests/providers/aws/services/account/account_service_test.py

@@ -2,10 +2,7 @@ import botocore
 from mock import patch
 
 from prowler.providers.aws.services.account.account_service import Account, Contact
-from tests.providers.aws.audit_info_utils import (
-    AWS_ACCOUNT_NUMBER,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, set_mocked_aws_provider
 
 # Mocking Access Analyzer Calls
 make_api_call = botocore.client.BaseClient._make_api_call
@@ -55,33 +52,33 @@ def mock_make_api_call(self, operation_name, kwargs):
 class Test_Account_Service:
     # Test Account Service
     def test_service(self):
-        audit_info = set_mocked_aws_audit_info()
-        account = Account(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        account = Account(aws_provider)
         assert account.service == "account"
 
     # Test Account Client
     def test_client(self):
-        audit_info = set_mocked_aws_audit_info()
-        account = Account(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        account = Account(aws_provider)
         assert account.client.__class__.__name__ == "Account"
 
     # Test Account Session
     def test__get_session__(self):
-        audit_info = set_mocked_aws_audit_info()
-        account = Account(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        account = Account(aws_provider)
         assert account.session.__class__.__name__ == "Session"
 
     # Test Account Session
     def test_audited_account(self):
-        audit_info = set_mocked_aws_audit_info()
-        account = Account(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        account = Account(aws_provider)
         assert account.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test Account Get Account Contacts
     def test_get_account_contacts(self):
         # Account client for this test class
-        audit_info = set_mocked_aws_audit_info()
-        account = Account(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        account = Account(aws_provider)
         assert account.number_of_contacts == 4
         assert account.contact_base == Contact(
             type="PRIMARY",

tests/providers/aws/services/acm/acm_service_test.py

@@ -6,10 +6,10 @@ from freezegun import freeze_time
 from mock import patch
 
 from prowler.providers.aws.services.acm.acm_service import ACM
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 # Mocking Access Analyzer Calls
@@ -74,8 +74,8 @@ def mock_make_api_call(self, operation_name, kwargs):
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_US_EAST_1
     )
     regional_client.region = AWS_REGION_US_EAST_1
@@ -84,7 +84,7 @@ def mock_generate_regional_clients(service, audit_info):
 
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
@@ -96,16 +96,16 @@ class Test_ACM_Service:
     # @mock_acm
     def test_service(self):
         # ACM client for this test class
-        audit_info = set_mocked_aws_audit_info()
-        acm = ACM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        acm = ACM(aws_provider)
         assert acm.service == "acm"
 
     # Test ACM Client
     # @mock_acm
     def test_client(self):
         # ACM client for this test class
-        audit_info = set_mocked_aws_audit_info()
-        acm = ACM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        acm = ACM(aws_provider)
         for regional_client in acm.regional_clients.values():
             assert regional_client.__class__.__name__ == "ACM"
 
@@ -113,16 +113,16 @@ class Test_ACM_Service:
     # @mock_acm
     def test__get_session__(self):
         # ACM client for this test class
-        audit_info = set_mocked_aws_audit_info()
-        acm = ACM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        acm = ACM(aws_provider)
         assert acm.session.__class__.__name__ == "Session"
 
     # Test ACM Session
     # @mock_acm
     def test_audited_account(self):
         # ACM client for this test class
-        audit_info = set_mocked_aws_audit_info()
-        acm = ACM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        acm = ACM(aws_provider)
         assert acm.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test ACM List Certificates
@@ -136,8 +136,8 @@ class Test_ACM_Service:
         # )
 
         # ACM client for this test class
-        audit_info = set_mocked_aws_audit_info()
-        acm = ACM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        acm = ACM(aws_provider)
         assert len(acm.certificates) == 1
         assert acm.certificates[0].arn == certificate_arn
         assert acm.certificates[0].name == certificate_name
@@ -157,8 +157,8 @@ class Test_ACM_Service:
         # )
 
         # ACM client for this test class
-        audit_info = set_mocked_aws_audit_info()
-        acm = ACM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        acm = ACM(aws_provider)
         assert len(acm.certificates) == 1
         assert acm.certificates[0].tags == [
             {"Key": "test", "Value": "test"},

tests/providers/aws/services/apigateway/apigateway_authorizers_enabled/apigateway_authorizers_enabled_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -18,16 +18,16 @@ class Test_apigateway_restapi_authorizers_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import (
@@ -72,16 +72,16 @@ class Test_apigateway_restapi_authorizers_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import (
@@ -100,7 +100,7 @@ class Test_apigateway_restapi_authorizers_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]
@@ -117,16 +117,16 @@ class Test_apigateway_restapi_authorizers_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import (
@@ -145,7 +145,7 @@ class Test_apigateway_restapi_authorizers_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]
@@ -178,16 +178,16 @@ class Test_apigateway_restapi_authorizers_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import (
@@ -206,7 +206,7 @@ class Test_apigateway_restapi_authorizers_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]
@@ -239,16 +239,16 @@ class Test_apigateway_restapi_authorizers_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import (
@@ -267,7 +267,7 @@ class Test_apigateway_restapi_authorizers_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]
@@ -307,16 +307,16 @@ class Test_apigateway_restapi_authorizers_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import (
@@ -335,7 +335,7 @@ class Test_apigateway_restapi_authorizers_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]
@@ -377,16 +377,16 @@ class Test_apigateway_restapi_authorizers_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import (
@@ -405,7 +405,7 @@ class Test_apigateway_restapi_authorizers_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]
@@ -437,16 +437,16 @@ class Test_apigateway_restapi_authorizers_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import (
@@ -465,7 +465,7 @@ class Test_apigateway_restapi_authorizers_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]

tests/providers/aws/services/apigateway/apigateway_client_certificate_enabled/apigateway_client_certificate_enabled_test.py

@@ -4,10 +4,10 @@ from boto3 import client
 from moto import mock_aws
 
 from prowler.providers.aws.services.apigateway.apigateway_service import Stage
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -24,16 +24,16 @@ class Test_apigateway_restapi_client_certificate_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled import (
@@ -84,16 +84,16 @@ class Test_apigateway_restapi_client_certificate_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled import (
@@ -112,7 +112,7 @@ class Test_apigateway_restapi_client_certificate_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [None]
@@ -129,16 +129,16 @@ class Test_apigateway_restapi_client_certificate_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ) as service_client:
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled import (
@@ -148,7 +148,7 @@ class Test_apigateway_restapi_client_certificate_enabled:
             service_client.rest_apis[0].stages.append(
                 Stage(
                     name="test",
-                    arn=f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/test-rest-api/stages/test",
+                    arn=f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/test-rest-api/stages/test",
                     logging=True,
                     client_certificate=True,
                     waf=True,
@@ -167,7 +167,7 @@ class Test_apigateway_restapi_client_certificate_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/test-rest-api/stages/test"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/test-rest-api/stages/test"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == []

tests/providers/aws/services/apigateway/apigateway_endpoint_public/apigateway_endpoint_public_test.py

@@ -3,10 +3,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -17,16 +17,16 @@ class Test_apigateway_restapi_public:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public import (
@@ -55,16 +55,16 @@ class Test_apigateway_restapi_public:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public import (
@@ -83,7 +83,7 @@ class Test_apigateway_restapi_public:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]
@@ -105,16 +105,16 @@ class Test_apigateway_restapi_public:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public import (
@@ -133,7 +133,7 @@ class Test_apigateway_restapi_public:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]

tests/providers/aws/services/apigateway/apigateway_endpoint_public_without_authorizer/apigateway_endpoint_public_without_authorizer_test.py

@@ -3,10 +3,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 API_GW_NAME = "test-rest-api"
@@ -19,16 +19,16 @@ class Test_apigateway_restapi_public_with_authorizer:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer import (
@@ -57,16 +57,16 @@ class Test_apigateway_restapi_public_with_authorizer:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer import (
@@ -85,7 +85,7 @@ class Test_apigateway_restapi_public_with_authorizer:
             assert result[0].resource_id == API_GW_NAME
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]
@@ -110,16 +110,16 @@ class Test_apigateway_restapi_public_with_authorizer:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer import (
@@ -138,7 +138,7 @@ class Test_apigateway_restapi_public_with_authorizer:
             assert result[0].resource_id == API_GW_NAME
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [{}]

tests/providers/aws/services/apigateway/apigateway_logging_enabled/apigateway_logging_enabled_test.py

@@ -3,10 +3,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -17,16 +17,16 @@ class Test_apigateway_restapi_logging_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled import (
@@ -87,16 +87,16 @@ class Test_apigateway_restapi_logging_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled import (
@@ -115,7 +115,7 @@ class Test_apigateway_restapi_logging_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [None]
@@ -160,16 +160,16 @@ class Test_apigateway_restapi_logging_enabled:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled import (
@@ -188,7 +188,7 @@ class Test_apigateway_restapi_logging_enabled:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [None]

tests/providers/aws/services/apigateway/apigateway_service_test.py

@@ -2,10 +2,10 @@ from boto3 import client
 from moto import mock_aws
 
 from prowler.providers.aws.services.apigateway.apigateway_service import APIGateway
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -14,16 +14,16 @@ class Test_APIGateway_Service:
     @mock_aws
     def test_service(self):
         # APIGateway client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
         assert apigateway.service == "apigateway"
 
     # Test APIGateway Client
     @mock_aws
     def test_client(self):
         # APIGateway client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
         for regional_client in apigateway.regional_clients.values():
             assert regional_client.__class__.__name__ == "APIGateway"
 
@@ -31,16 +31,16 @@ class Test_APIGateway_Service:
     @mock_aws
     def test__get_session__(self):
         # APIGateway client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
         assert apigateway.session.__class__.__name__ == "Session"
 
     # Test APIGateway Session
     @mock_aws
     def test_audited_account(self):
         # APIGateway client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
         assert apigateway.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test APIGateway Get Rest APIs
@@ -53,8 +53,8 @@ class Test_APIGateway_Service:
             name="test-rest-api",
         )
         # APIGateway client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
         assert len(apigateway.rest_apis) == len(
             apigateway_client.get_rest_apis()["items"]
         )
@@ -75,8 +75,8 @@ class Test_APIGateway_Service:
             type="TOKEN",
         )
         # APIGateway client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
         assert apigateway.rest_apis[0].authorizer is True
 
     # Test APIGateway Get Rest API
@@ -91,8 +91,8 @@ class Test_APIGateway_Service:
             tags={"test": "test"},
         )
         # APIGateway client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
         assert apigateway.rest_apis[0].public_endpoint is False
         assert apigateway.rest_apis[0].tags == [{"test": "test"}]
 
@@ -143,8 +143,8 @@ class Test_APIGateway_Service:
                 },
             ],
         )
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
         assert apigateway.rest_apis[0].stages[0].logging is True
 
     # Test APIGateway __get_resources__
@@ -178,8 +178,8 @@ class Test_APIGateway_Service:
             authorizationType="AWS_IAM",
         )
 
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigateway = APIGateway(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigateway = APIGateway(aws_provider)
 
         # we skip OPTIONS methods
         assert list(apigateway.rest_apis[0].resources[1].resource_methods.keys()) == [

tests/providers/aws/services/apigateway/apigateway_waf_acl_attached/apigateway_waf_acl_attached_test.py

@@ -3,10 +3,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -17,16 +17,16 @@ class Test_apigateway_restapi_waf_acl_attached:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached import (
@@ -92,16 +92,16 @@ class Test_apigateway_restapi_waf_acl_attached:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached import (
@@ -120,7 +120,7 @@ class Test_apigateway_restapi_waf_acl_attached:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [None]
@@ -165,16 +165,16 @@ class Test_apigateway_restapi_waf_acl_attached:
             APIGateway,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached.apigateway_client",
-            new=APIGateway(current_audit_info),
+            new=APIGateway(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached import (
@@ -193,7 +193,7 @@ class Test_apigateway_restapi_waf_acl_attached:
             assert result[0].resource_id == "test-rest-api"
             assert (
                 result[0].resource_arn
-                == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
+                == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test"
             )
             assert result[0].region == AWS_REGION_US_EAST_1
             assert result[0].resource_tags == [None]

tests/providers/aws/services/apigatewayv2/apigatewayv2_access_logging_enabled/apigatewayv2_access_logging_enabled_test.py

@@ -5,10 +5,7 @@ from boto3 import client
 from mock import patch
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
-    AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider
 
 # Mocking ApiGatewayV2 Calls
 make_api_call = botocore.client.BaseClient._make_api_call
@@ -45,16 +42,14 @@ class Test_apigatewayv2_api_access_logging_enabled:
             ApiGatewayV2,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
-            [AWS_REGION_US_EAST_1]
-        )
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_access_logging_enabled.apigatewayv2_api_access_logging_enabled.apigatewayv2_client",
-            new=ApiGatewayV2(current_audit_info),
+            new=ApiGatewayV2(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_access_logging_enabled.apigatewayv2_api_access_logging_enabled import (
@@ -78,16 +73,14 @@ class Test_apigatewayv2_api_access_logging_enabled:
             ApiGatewayV2,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
-            [AWS_REGION_US_EAST_1]
-        )
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_access_logging_enabled.apigatewayv2_api_access_logging_enabled.apigatewayv2_client",
-            new=ApiGatewayV2(current_audit_info),
+            new=ApiGatewayV2(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_access_logging_enabled.apigatewayv2_api_access_logging_enabled import (

tests/providers/aws/services/apigatewayv2/apigatewayv2_authorizers_enabled/apigatewayv2_authorizers_enabled_test.py

@@ -5,10 +5,7 @@ from boto3 import client
 from mock import patch
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
-    AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider
 
 # Mocking ApiGatewayV2 Calls
 make_api_call = botocore.client.BaseClient._make_api_call
@@ -45,16 +42,14 @@ class Test_apigatewayv2_api_authorizers_enabled:
             ApiGatewayV2,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
-            [AWS_REGION_US_EAST_1]
-        )
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_authorizers_enabled.apigatewayv2_api_authorizers_enabled.apigatewayv2_client",
-            new=ApiGatewayV2(current_audit_info),
+            new=ApiGatewayV2(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_authorizers_enabled.apigatewayv2_api_authorizers_enabled import (
@@ -83,16 +78,14 @@ class Test_apigatewayv2_api_authorizers_enabled:
             ApiGatewayV2,
         )
 
-        current_audit_info = current_audit_info = set_mocked_aws_audit_info(
-            [AWS_REGION_US_EAST_1]
-        )
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_authorizers_enabled.apigatewayv2_api_authorizers_enabled.apigatewayv2_client",
-            new=ApiGatewayV2(current_audit_info),
+            new=ApiGatewayV2(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_authorizers_enabled.apigatewayv2_api_authorizers_enabled import (

tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py

@@ -6,10 +6,10 @@ from moto import mock_aws
 from prowler.providers.aws.services.apigatewayv2.apigatewayv2_service import (
     ApiGatewayV2,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 # Mocking ApiGatewayV2 Calls
@@ -45,16 +45,16 @@ class Test_ApiGatewayV2_Service:
     @mock_aws
     def test_service(self):
         # ApiGatewayV2 client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigatewayv2 = ApiGatewayV2(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigatewayv2 = ApiGatewayV2(aws_provider)
         assert apigatewayv2.service == "apigatewayv2"
 
     # Test ApiGatewayV2 Client
     @mock_aws
     def test_client(self):
         # ApiGatewayV2 client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigatewayv2 = ApiGatewayV2(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigatewayv2 = ApiGatewayV2(aws_provider)
         for regional_client in apigatewayv2.regional_clients.values():
             assert regional_client.__class__.__name__ == "ApiGatewayV2"
 
@@ -62,16 +62,16 @@ class Test_ApiGatewayV2_Service:
     @mock_aws
     def test__get_session__(self):
         # ApiGatewayV2 client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigatewayv2 = ApiGatewayV2(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigatewayv2 = ApiGatewayV2(aws_provider)
         assert apigatewayv2.session.__class__.__name__ == "Session"
 
     # Test ApiGatewayV2 Session
     @mock_aws
     def test_audited_account(self):
         # ApiGatewayV2 client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigatewayv2 = ApiGatewayV2(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigatewayv2 = ApiGatewayV2(aws_provider)
         assert apigatewayv2.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test ApiGatewayV2 Get APIs
@@ -84,8 +84,8 @@ class Test_ApiGatewayV2_Service:
             Name="test-api", ProtocolType="HTTP", Tags={"test": "test"}
         )
         # ApiGatewayV2 client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigatewayv2 = ApiGatewayV2(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigatewayv2 = ApiGatewayV2(aws_provider)
         assert len(apigatewayv2.apis) == len(apigatewayv2_client.get_apis()["Items"])
         assert apigatewayv2.apis[0].tags == [{"test": "test"}]
 
@@ -105,8 +105,8 @@ class Test_ApiGatewayV2_Service:
             AuthorizerPayloadFormatVersion="2.0",
         )
         # ApiGatewayV2 client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigatewayv2 = ApiGatewayV2(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigatewayv2 = ApiGatewayV2(aws_provider)
         assert apigatewayv2.apis[0].authorizer is True
 
     # Test ApiGatewayV2 Get Stages
@@ -117,6 +117,6 @@ class Test_ApiGatewayV2_Service:
         # Create ApiGatewayV2 Rest API and a deployment stage
         apigatewayv2_client.create_api(Name="test-api", ProtocolType="HTTP")
 
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        apigatewayv2 = ApiGatewayV2(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        apigatewayv2 = ApiGatewayV2(aws_provider)
         assert apigatewayv2.apis[0].stages[0].logging is True

tests/providers/aws/services/appstream/appstream_service_test.py

@@ -3,10 +3,10 @@ from unittest.mock import patch
 import botocore
 
 from prowler.providers.aws.services.appstream.appstream_service import AppStream
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 # Mock Test Region
@@ -51,8 +51,10 @@ def mock_make_api_call(self, operation_name, kwarg):
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(service, region_name=AWS_REGION)
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
+        service, region_name=AWS_REGION
+    )
     regional_client.region = AWS_REGION
     return {AWS_REGION: regional_client}
 
@@ -60,28 +62,28 @@ def mock_generate_regional_clients(service, audit_info):
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_AppStream_Service:
     # Test AppStream Client
     def test__get_client__(self):
-        appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]))
+        appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1]))
         assert appstream.regional_clients[AWS_REGION].__class__.__name__ == "AppStream"
 
     # Test AppStream Session
     def test__get_session__(self):
-        appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]))
+        appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1]))
         assert appstream.session.__class__.__name__ == "Session"
 
     # Test AppStream Session
     def test__get_service__(self):
-        appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]))
+        appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1]))
         assert appstream.service == "appstream"
 
     def test__describe_fleets__(self):
         # Set partition for the service
-        appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]))
+        appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1]))
         assert len(appstream.fleets) == 2
 
         assert (
@@ -108,7 +110,7 @@ class Test_AppStream_Service:
 
     def test__list_tags_for_resource__(self):
         # Set partition for the service
-        appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]))
+        appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1]))
         assert len(appstream.fleets) == 2
 
         assert appstream.fleets[0].tags == [{"test": "test"}]

tests/providers/aws/services/athena/athena_service_test.py

@@ -3,10 +3,7 @@ from mock import patch
 from moto import mock_aws
 
 from prowler.providers.aws.services.athena.athena_service import Athena
-from tests.providers.aws.audit_info_utils import (
-    AWS_REGION_EU_WEST_1,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider
 
 # Mocking Access Analyzer Calls
 make_api_call = BaseClient._make_api_call
@@ -39,8 +36,8 @@ def mock_make_api_call(self, operation_name, kwarg):
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_EU_WEST_1
     )
     regional_client.region = AWS_REGION_EU_WEST_1
@@ -49,7 +46,7 @@ def mock_generate_regional_clients(service, audit_info):
 
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_Athena_Service:
@@ -57,9 +54,9 @@ class Test_Athena_Service:
     @mock_aws
     def test__get_workgroups__not_encrypted(self):
         default_workgroup_name = "primary"
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        workgroup_arn = f"arn:{audit_info.audited_partition}:athena:{AWS_REGION_EU_WEST_1}:{audit_info.audited_account}:workgroup/{default_workgroup_name}"
-        athena = Athena(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        workgroup_arn = f"arn:{aws_provider.identity.partition}:athena:{AWS_REGION_EU_WEST_1}:{aws_provider.identity.account}:workgroup/{default_workgroup_name}"
+        athena = Athena(aws_provider)
         assert len(athena.workgroups) == 1
         assert athena.workgroups[workgroup_arn]
         assert athena.workgroups[workgroup_arn].arn == workgroup_arn
@@ -81,11 +78,11 @@ class Test_Athena_Service:
     @mock_aws
     def test__get_workgroups__encrypted(self):
         default_workgroup_name = "primary"
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
 
         # Athena client
         # This API call is not implemented by Moto
-        # athena_client = audit_info.audit_session.client(
+        # athena_client = aws_provider.audit_session.client(
         #     "athena", region_name=AWS_REGION
         # )
         # athena_client.update_work_group(
@@ -97,8 +94,8 @@ class Test_Athena_Service:
         #     },
         # )
 
-        workgroup_arn = f"arn:{audit_info.audited_partition}:athena:{AWS_REGION_EU_WEST_1}:{audit_info.audited_account}:workgroup/{default_workgroup_name}"
-        athena = Athena(audit_info)
+        workgroup_arn = f"arn:{aws_provider.identity.partition}:athena:{AWS_REGION_EU_WEST_1}:{aws_provider.identity.account}:workgroup/{default_workgroup_name}"
+        athena = Athena(aws_provider)
         assert len(athena.workgroups) == 1
         assert athena.workgroups[workgroup_arn]
         assert athena.workgroups[workgroup_arn].arn == workgroup_arn

tests/providers/aws/services/athena/athena_workgroup_encryption/athena_workgroup_encryption_test.py

@@ -3,12 +3,12 @@ from unittest import mock
 from mock import patch
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.services.athena.athena_service_test import mock_make_api_call
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
-from tests.providers.aws.services.athena.athena_service_test import mock_make_api_call
 
 ATHENA_PRIMARY_WORKGROUP = "primary"
 ATHENA_PRIMARY_WORKGROUP_ARN = f"arn:aws:athena:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:workgroup/{ATHENA_PRIMARY_WORKGROUP}"
@@ -19,14 +19,14 @@ class Test_athena_workgroup_encryption:
     def test_primary_workgroup_not_encrypted(self):
         from prowler.providers.aws.services.athena.athena_service import Athena
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption.athena_client",
-            new=Athena(current_audit_info),
+            new=Athena(aws_provider),
         ):
             from prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption import (
                 athena_workgroup_encryption,
@@ -50,15 +50,15 @@ class Test_athena_workgroup_encryption:
     def test_primary_workgroup_not_encrypted_ignoring(self):
         from prowler.providers.aws.services.athena.athena_service import Athena
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        current_audit_info.ignore_unused_services = True
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        aws_provider._ignore_unused_services = True
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption.athena_client",
-            new=Athena(current_audit_info),
+            new=Athena(aws_provider),
         ):
             from prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption import (
                 athena_workgroup_encryption,
@@ -75,14 +75,14 @@ class Test_athena_workgroup_encryption:
     def test_primary_workgroup_encrypted(self):
         from prowler.providers.aws.services.athena.athena_service import Athena
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption.athena_client",
-            new=Athena(current_audit_info),
+            new=Athena(aws_provider),
         ):
             from prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption import (
                 athena_workgroup_encryption,

tests/providers/aws/services/athena/athena_workgroup_enforce_configuration/athena_workgroup_enforce_configuration_test.py

@@ -3,12 +3,12 @@ from unittest import mock
 from mock import patch
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.services.athena.athena_service_test import mock_make_api_call
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
-from tests.providers.aws.services.athena.athena_service_test import mock_make_api_call
 
 ATHENA_PRIMARY_WORKGROUP = "primary"
 ATHENA_PRIMARY_WORKGROUP_ARN = f"arn:aws:athena:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:workgroup/{ATHENA_PRIMARY_WORKGROUP}"
@@ -19,14 +19,14 @@ class Test_athena_workgroup_enforce_configuration:
     def test_primary_workgroup_configuration_not_enforced(self):
         from prowler.providers.aws.services.athena.athena_service import Athena
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration.athena_client",
-            new=Athena(current_audit_info),
+            new=Athena(aws_provider),
         ):
             from prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration import (
                 athena_workgroup_enforce_configuration,
@@ -50,15 +50,15 @@ class Test_athena_workgroup_enforce_configuration:
     def test_primary_workgroup_configuration_not_enforced_ignoring(self):
         from prowler.providers.aws.services.athena.athena_service import Athena
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        current_audit_info.ignore_unused_services = True
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        aws_provider._ignore_unused_services = True
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration.athena_client",
-            new=Athena(current_audit_info),
+            new=Athena(aws_provider),
         ):
             from prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration import (
                 athena_workgroup_enforce_configuration,
@@ -75,14 +75,14 @@ class Test_athena_workgroup_enforce_configuration:
     def test_primary_workgroup_configuration_enforced(self):
         from prowler.providers.aws.services.athena.athena_service import Athena
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration.athena_client",
-            new=Athena(current_audit_info),
+            new=Athena(aws_provider),
         ):
             from prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration import (
                 athena_workgroup_enforce_configuration,

tests/providers/aws/services/autoscaling/autoscaling_find_secrets_ec2_launch_configuration/autoscaling_find_secrets_ec2_launch_configuration_test.py

@@ -5,10 +5,7 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
-    AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider
 
 ACTUAL_DIRECTORY = Path(path.dirname(path.realpath(__file__)))
 FIXTURES_DIR_NAME = "fixtures"
@@ -24,14 +21,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import (
@@ -64,14 +61,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import (
                 autoscaling_find_secrets_ec2_launch_configuration,
@@ -111,14 +108,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import (
                 autoscaling_find_secrets_ec2_launch_configuration,
@@ -163,14 +160,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import (
                 autoscaling_find_secrets_ec2_launch_configuration,
@@ -209,14 +206,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import (
                 autoscaling_find_secrets_ec2_launch_configuration,
@@ -262,14 +259,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import (
                 autoscaling_find_secrets_ec2_launch_configuration,

tests/providers/aws/services/autoscaling/autoscaling_group_multiple_az/autoscaling_group_multiple_az_test.py

@@ -3,10 +3,7 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
-    AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider
 
 
 class Test_autoscaling_group_multiple_az:
@@ -19,14 +16,14 @@ class Test_autoscaling_group_multiple_az:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az import (
@@ -66,14 +63,14 @@ class Test_autoscaling_group_multiple_az:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az import (
@@ -122,14 +119,14 @@ class Test_autoscaling_group_multiple_az:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az import (
@@ -189,14 +186,14 @@ class Test_autoscaling_group_multiple_az:
             AutoScaling,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az.autoscaling_client",
-            new=AutoScaling(current_audit_info),
+            new=AutoScaling(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az import (

tests/providers/aws/services/autoscaling/autoscaling_service_test.py

@@ -4,10 +4,10 @@ from boto3 import client
 from moto import mock_aws
 
 from prowler.providers.aws.services.autoscaling.autoscaling_service import AutoScaling
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -16,16 +16,16 @@ class Test_AutoScaling_Service:
     @mock_aws
     def test_service(self):
         # AutoScaling client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        autoscaling = AutoScaling(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        autoscaling = AutoScaling(aws_provider)
         assert autoscaling.service == "autoscaling"
 
     # Test AutoScaling Client
     @mock_aws
     def test_client(self):
         # AutoScaling client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        autoscaling = AutoScaling(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        autoscaling = AutoScaling(aws_provider)
         for regional_client in autoscaling.regional_clients.values():
             assert regional_client.__class__.__name__ == "AutoScaling"
 
@@ -33,16 +33,16 @@ class Test_AutoScaling_Service:
     @mock_aws
     def test__get_session__(self):
         # AutoScaling client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        autoscaling = AutoScaling(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        autoscaling = AutoScaling(aws_provider)
         assert autoscaling.session.__class__.__name__ == "Session"
 
     # Test AutoScaling Session
     @mock_aws
     def test_audited_account(self):
         # AutoScaling client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        autoscaling = AutoScaling(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        autoscaling = AutoScaling(aws_provider)
         assert autoscaling.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test AutoScaling Get APIs
@@ -67,8 +67,8 @@ class Test_AutoScaling_Service:
             SecurityGroups=["default", "default2"],
         )
         # AutoScaling client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        autoscaling = AutoScaling(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        autoscaling = AutoScaling(aws_provider)
         assert len(autoscaling.launch_configurations) == 2
         assert autoscaling.launch_configurations[0].name == "tester1"
         assert (
@@ -107,8 +107,8 @@ class Test_AutoScaling_Service:
         )
 
         # AutoScaling client for this test class
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
-        autoscaling = AutoScaling(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
+        autoscaling = AutoScaling(aws_provider)
         print("asg", asg)
         assert len(autoscaling.groups) == 1
         # create_auto_scaling_group doesn't return the ARN, can't check it

tests/providers/aws/services/awslambda/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled_test.py

@@ -5,16 +5,16 @@ from mock import patch
 from moto import mock_aws
 
 from prowler.providers.aws.services.awslambda.awslambda_service import Function
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_US_EAST_1
     )
     regional_client.region = AWS_REGION_US_EAST_1
@@ -23,7 +23,7 @@ def mock_generate_regional_clients(service, audit_info):
 
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled:
@@ -37,14 +37,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client",
             new=lambda_client,
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client",
-            new=Cloudtrail(set_mocked_aws_audit_info()),
+            new=Cloudtrail(set_mocked_aws_provider()),
         ):
             # Test Check
             from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import (
@@ -90,14 +90,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client",
             new=lambda_client,
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client",
-            new=Cloudtrail(set_mocked_aws_audit_info()),
+            new=Cloudtrail(set_mocked_aws_provider()),
         ):
             # Test Check
             from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import (
@@ -164,14 +164,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client",
             new=lambda_client,
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client",
-            new=Cloudtrail(set_mocked_aws_audit_info()),
+            new=Cloudtrail(set_mocked_aws_provider()),
         ):
             # Test Check
             from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import (
@@ -241,14 +241,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client",
             new=lambda_client,
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client",
-            new=Cloudtrail(set_mocked_aws_audit_info()),
+            new=Cloudtrail(set_mocked_aws_provider()),
         ):
             # Test Check
             from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import (
@@ -315,14 +315,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client",
             new=lambda_client,
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client",
-            new=Cloudtrail(set_mocked_aws_audit_info()),
+            new=Cloudtrail(set_mocked_aws_provider()),
         ):
             # Test Check
             from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import (

tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_code/awslambda_function_no_secrets_in_code_test.py

@@ -5,14 +5,14 @@ from prowler.providers.aws.services.awslambda.awslambda_service import (
     Function,
     LambdaCode,
 )
-from tests.providers.aws.audit_info_utils import (
-    AWS_ACCOUNT_NUMBER,
-    AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
-)
 from tests.providers.aws.services.awslambda.awslambda_service_test import (
     create_zip_file,
 )
+from tests.providers.aws.utils import (
+    AWS_ACCOUNT_NUMBER,
+    AWS_REGION_US_EAST_1,
+    set_mocked_aws_provider,
+)
 
 LAMBDA_FUNCTION_NAME = "test-lambda"
 LAMBDA_FUNCTION_RUNTIME = "nodejs4.3"
@@ -65,8 +65,8 @@ class Test_awslambda_function_no_secrets_in_code:
         lambda_client.functions = {}
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_code.awslambda_function_no_secrets_in_code.awslambda_client",
             new=lambda_client,
@@ -86,8 +86,8 @@ class Test_awslambda_function_no_secrets_in_code:
         lambda_client.functions = {LAMBDA_FUNCTION_ARN: create_lambda_function()}
         lambda_client.__get_function_code__ = mock__get_function_code__with_secrets
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_code.awslambda_function_no_secrets_in_code.awslambda_client",
             new=lambda_client,
@@ -118,8 +118,8 @@ class Test_awslambda_function_no_secrets_in_code:
         lambda_client.__get_function_code__ = mock__get_function_code__without_secrets
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_code.awslambda_function_no_secrets_in_code.awslambda_client",
             new=lambda_client,

tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_variables/awslambda_function_no_secrets_in_variables_test.py

@@ -1,10 +1,10 @@
 from unittest import mock
 
 from prowler.providers.aws.services.awslambda.awslambda_service import Function
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -14,8 +14,8 @@ class Test_awslambda_function_no_secrets_in_variables:
         lambda_client.functions = {}
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_variables.awslambda_function_no_secrets_in_variables.awslambda_client",
             new=lambda_client,
@@ -47,8 +47,8 @@ class Test_awslambda_function_no_secrets_in_variables:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_variables.awslambda_function_no_secrets_in_variables.awslambda_client",
             new=lambda_client,
@@ -90,8 +90,8 @@ class Test_awslambda_function_no_secrets_in_variables:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_variables.awslambda_function_no_secrets_in_variables.awslambda_client",
             new=lambda_client,
@@ -133,8 +133,8 @@ class Test_awslambda_function_no_secrets_in_variables:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_variables.awslambda_function_no_secrets_in_variables.awslambda_client",
             new=lambda_client,

tests/providers/aws/services/awslambda/awslambda_function_not_publicly_accessible/awslambda_function_not_publicly_accessible_test.py

@@ -1,10 +1,10 @@
 from unittest import mock
 
 from prowler.providers.aws.services.awslambda.awslambda_service import Function
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -14,8 +14,8 @@ class Test_awslambda_function_not_publicly_accessible:
         lambda_client.functions = {}
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_not_publicly_accessible.awslambda_function_not_publicly_accessible.awslambda_client",
             new=lambda_client,
@@ -62,8 +62,8 @@ class Test_awslambda_function_not_publicly_accessible:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_not_publicly_accessible.awslambda_function_not_publicly_accessible.awslambda_client",
             new=lambda_client,
@@ -119,8 +119,8 @@ class Test_awslambda_function_not_publicly_accessible:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_not_publicly_accessible.awslambda_function_not_publicly_accessible.awslambda_client",
             new=lambda_client,
@@ -176,8 +176,8 @@ class Test_awslambda_function_not_publicly_accessible:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_not_publicly_accessible.awslambda_function_not_publicly_accessible.awslambda_client",
             new=lambda_client,

tests/providers/aws/services/awslambda/awslambda_function_url_cors_policy/awslambda_function_url_cors_policy_test.py

@@ -1,26 +1,29 @@
 from unittest import mock
 
+from moto import mock_aws
+
 from prowler.providers.aws.services.awslambda.awslambda_service import (
     AuthType,
     Function,
     URLConfig,
     URLConfigCORS,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
+@mock_aws
 class Test_awslambda_function_url_cors_policy:
     def test_no_functions(self):
         lambda_client = mock.MagicMock
         lambda_client.functions = {}
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_url_cors_policy.awslambda_function_url_cors_policy.awslambda_client",
             new=lambda_client,
@@ -56,8 +59,8 @@ class Test_awslambda_function_url_cors_policy:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_url_cors_policy.awslambda_function_url_cors_policy.awslambda_client",
             new=lambda_client,
@@ -102,8 +105,8 @@ class Test_awslambda_function_url_cors_policy:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_url_cors_policy.awslambda_function_url_cors_policy.awslambda_client",
             new=lambda_client,
@@ -150,8 +153,8 @@ class Test_awslambda_function_url_cors_policy:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_url_cors_policy.awslambda_function_url_cors_policy.awslambda_client",
             new=lambda_client,

tests/providers/aws/services/awslambda/awslambda_function_url_public/awslambda_function_url_public_test.py

@@ -6,10 +6,10 @@ from prowler.providers.aws.services.awslambda.awslambda_service import (
     URLConfig,
     URLConfigCORS,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -19,8 +19,8 @@ class Test_awslambda_function_url_public:
         lambda_client.functions = {}
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_url_public.awslambda_function_url_public.awslambda_client",
             new=lambda_client,
@@ -56,8 +56,8 @@ class Test_awslambda_function_url_public:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_url_public.awslambda_function_url_public.awslambda_client",
             new=lambda_client,
@@ -102,8 +102,8 @@ class Test_awslambda_function_url_public:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_url_public.awslambda_function_url_public.awslambda_client",
             new=lambda_client,

tests/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes_test.py

@@ -1,10 +1,10 @@
 from unittest import mock
 
 from prowler.providers.aws.services.awslambda.awslambda_service import Function
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -14,8 +14,8 @@ class Test_awslambda_function_using_supported_runtimes:
         lambda_client.functions = {}
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_using_supported_runtimes.awslambda_function_using_supported_runtimes.awslambda_client",
             new=lambda_client,
@@ -64,8 +64,8 @@ class Test_awslambda_function_using_supported_runtimes:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_using_supported_runtimes.awslambda_function_using_supported_runtimes.awslambda_client",
             new=lambda_client,
@@ -123,8 +123,8 @@ class Test_awslambda_function_using_supported_runtimes:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_using_supported_runtimes.awslambda_function_using_supported_runtimes.awslambda_client",
             new=lambda_client,
@@ -180,8 +180,8 @@ class Test_awslambda_function_using_supported_runtimes:
         }
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            set_mocked_aws_audit_info(),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(),
         ), mock.patch(
             "prowler.providers.aws.services.awslambda.awslambda_function_using_supported_runtimes.awslambda_function_using_supported_runtimes.awslambda_client",
             new=lambda_client,

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

@@ -10,11 +10,11 @@ from boto3 import client, resource
 from moto import mock_aws
 
 from prowler.providers.aws.services.awslambda.awslambda_service import AuthType, Lambda
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 LAMBDA_FUNCTION_CODE = """def lambda_handler(event, context):
@@ -47,11 +47,11 @@ def mock_request_get(_):
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client_eu_west_1 = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client_eu_west_1 = provider.session.current_session.client(
         service, region_name=AWS_REGION_EU_WEST_1
     )
-    regional_client_us_east_1 = audit_info.audit_session.client(
+    regional_client_us_east_1 = provider.session.current_session.client(
         service, region_name=AWS_REGION_US_EAST_1
     )
     regional_client_eu_west_1.region = AWS_REGION_EU_WEST_1
@@ -63,13 +63,13 @@ def mock_generate_regional_clients(service, audit_info):
 
 
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_Lambda_Service:
     # Test Lambda Client
     def test__get_client__(self):
-        awslambda = Lambda(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]))
+        awslambda = Lambda(set_mocked_aws_provider([AWS_REGION_US_EAST_1]))
         assert (
             awslambda.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__
             == "Lambda"
@@ -77,12 +77,12 @@ class Test_Lambda_Service:
 
     # Test Lambda Session
     def test__get_session__(self):
-        awslambda = Lambda(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]))
+        awslambda = Lambda(set_mocked_aws_provider([AWS_REGION_US_EAST_1]))
         assert awslambda.session.__class__.__name__ == "Session"
 
     # Test Lambda Service
     def test__get_service__(self):
-        awslambda = Lambda(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]))
+        awslambda = Lambda(set_mocked_aws_provider([AWS_REGION_US_EAST_1]))
         assert awslambda.service == "lambda"
 
     @mock_aws
@@ -192,7 +192,7 @@ class Test_Lambda_Service:
             new=mock_request_get,
         ):
             awslambda = Lambda(
-                set_mocked_aws_audit_info(audited_regions=[AWS_REGION_US_EAST_1])
+                set_mocked_aws_provider(audited_regions=[AWS_REGION_US_EAST_1])
             )
             assert awslambda.functions
             assert len(awslambda.functions) == 2

tests/providers/aws/services/backup/backup_service_test.py

@@ -2,12 +2,10 @@ from datetime import datetime
 from unittest.mock import patch
 
 import botocore
+from moto import mock_aws
 
 from prowler.providers.aws.services.backup.backup_service import Backup
-from tests.providers.aws.audit_info_utils import (
-    AWS_REGION_EU_WEST_1,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider
 
 # Mocking Backup Calls
 make_api_call = botocore.client.BaseClient._make_api_call
@@ -58,45 +56,46 @@ def mock_make_api_call(self, operation_name, kwarg):
     return make_api_call(self, operation_name, kwarg)
 
 
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_EU_WEST_1
     )
     regional_client.region = AWS_REGION_EU_WEST_1
     return {AWS_REGION_EU_WEST_1: regional_client}
 
 
+@mock_aws
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_Backup_Service:
     # Test Backup Client
     def test__get_client__(self):
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        backup = Backup(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        backup = Backup(aws_provider)
         assert (
             backup.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "Backup"
         )
 
     # Test Backup Session
     def test__get_session__(self):
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        access_analyzer = Backup(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        access_analyzer = Backup(aws_provider)
         assert access_analyzer.session.__class__.__name__ == "Session"
 
     # Test Backup Service
     def test__get_service__(self):
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        access_analyzer = Backup(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        access_analyzer = Backup(aws_provider)
         assert access_analyzer.service == "backup"
 
     # Test Backup List Backup Vaults
     def test__list_backup_vaults__(self):
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        backup = Backup(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        backup = Backup(aws_provider)
         assert len(backup.backup_vaults) == 1
         assert backup.backup_vaults[0].arn == "ARN"
         assert backup.backup_vaults[0].name == "Test Vault"
@@ -109,8 +108,8 @@ class Test_Backup_Service:
 
     # Test Backup List Backup Plans
     def test__list_backup_plans__(self):
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        backup = Backup(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        backup = Backup(aws_provider)
         assert len(backup.backup_plans) == 1
         assert backup.backup_plans[0].arn == "ARN"
         assert backup.backup_plans[0].id == "ID"
@@ -122,8 +121,8 @@ class Test_Backup_Service:
 
     # Test Backup List Report Plans
     def test__list_backup_report_plans__(self):
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        backup = Backup(audit_info)
+        aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1])
+        backup = Backup(aws_provider)
         assert len(backup.backup_report_plans) == 1
         assert backup.backup_report_plans[0].arn == "ARN"
         assert backup.backup_report_plans[0].region == AWS_REGION_EU_WEST_1

tests/providers/aws/services/cloudformation/cloudformation_service_test.py

@@ -10,10 +10,10 @@ from moto import mock_aws
 from prowler.providers.aws.services.cloudformation.cloudformation_service import (
     CloudFormation,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 # Dummy CloudFormation Template
@@ -119,8 +119,8 @@ def mock_make_api_call(self, operation_name, kwarg):
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_EU_WEST_1
     )
     regional_client.region = AWS_REGION_EU_WEST_1
@@ -130,16 +130,14 @@ def mock_generate_regional_clients(service, audit_info):
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_CloudFormation_Service:
     # Test CloudFormation Client
     @mock_aws
     def test__get_client__(self):
-        cloudformation = CloudFormation(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        )
+        cloudformation = CloudFormation(set_mocked_aws_provider([AWS_REGION_EU_WEST_1]))
         assert (
             cloudformation.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__
             == "CloudFormation"
@@ -148,9 +146,7 @@ class Test_CloudFormation_Service:
     # Test CloudFormation Service
     @mock_aws
     def test__get_service__(self):
-        cloudformation = CloudFormation(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        )
+        cloudformation = CloudFormation(set_mocked_aws_provider([AWS_REGION_EU_WEST_1]))
         assert (
             cloudformation.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__
             == "CloudFormation"
@@ -159,9 +155,7 @@ class Test_CloudFormation_Service:
     # Test CloudFormation Session
     @mock_aws
     def test__get_session__(self):
-        cloudformation = CloudFormation(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        )
+        cloudformation = CloudFormation(set_mocked_aws_provider([AWS_REGION_EU_WEST_1]))
         assert cloudformation.session.__class__.__name__ == "Session"
 
     @mock_aws
@@ -187,9 +181,7 @@ class Test_CloudFormation_Service:
             ],
         )
 
-        cloudformation = CloudFormation(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])
-        )
+        cloudformation = CloudFormation(set_mocked_aws_provider([AWS_REGION_EU_WEST_1]))
         assert len(cloudformation.stacks) == 1
         assert cloudformation.stacks[0].arn == stack_arn["StackId"]
         assert cloudformation.stacks[0].name == "Test-Stack"

tests/providers/aws/services/cloudfront/cloudfront_distributions_field_level_encryption_enabled/cloudfront_distributions_field_level_encryption_enabled_test.py

@@ -5,7 +5,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import (
     Distribution,
     ViewerProtocolPolicy,
 )
-from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER
 
 DISTRIBUTION_ID = "E27LVI50CSW06W"
 DISTRIBUTION_ARN = (

tests/providers/aws/services/cloudfront/cloudfront_distributions_geo_restrictions_enabled/cloudfront_distributions_geo_restrictions_enabled_test.py

@@ -4,7 +4,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import (
     Distribution,
     GeoRestrictionType,
 )
-from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER
 
 DISTRIBUTION_ID = "E27LVI50CSW06W"
 DISTRIBUTION_ARN = (

tests/providers/aws/services/cloudfront/cloudfront_distributions_https_enabled/cloudfront_distributions_https_enabled_test.py

@@ -5,7 +5,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import (
     Distribution,
     ViewerProtocolPolicy,
 )
-from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER
 
 DISTRIBUTION_ID = "E27LVI50CSW06W"
 DISTRIBUTION_ARN = (

tests/providers/aws/services/cloudfront/cloudfront_distributions_logging_enabled/cloudfront_distributions_logging_enabled_test.py

@@ -5,7 +5,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import (
     Distribution,
     ViewerProtocolPolicy,
 )
-from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER
 
 DISTRIBUTION_ID = "E27LVI50CSW06W"
 DISTRIBUTION_ARN = (

tests/providers/aws/services/cloudfront/cloudfront_distributions_using_deprecated_ssl_protocols/cloudfront_distributions_using_deprecated_ssl_protocols_test.py

@@ -1,7 +1,7 @@
 from unittest import mock
 
 from prowler.providers.aws.services.cloudfront.cloudfront_service import Distribution
-from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER
 
 DISTRIBUTION_ID = "E27LVI50CSW06W"
 DISTRIBUTION_ARN = (

tests/providers/aws/services/cloudfront/cloudfront_distributions_using_waf/cloudfront_distributions_using_waf_test.py

@@ -1,7 +1,7 @@
 from unittest import mock
 
 from prowler.providers.aws.services.cloudfront.cloudfront_service import Distribution
-from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER
 
 DISTRIBUTION_ID = "E27LVI50CSW06W"
 DISTRIBUTION_ARN = (

tests/providers/aws/services/cloudfront/cloudfront_service_test.py

@@ -9,10 +9,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import (
     GeoRestrictionType,
     ViewerProtocolPolicy,
 )
-from tests.providers.aws.audit_info_utils import (
-    AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider
 
 
 def example_distribution_config(ref):
@@ -153,24 +150,24 @@ class Test_CloudFront_Service:
     # Test CloudFront Client
     @mock_aws
     def test__get_client__(self):
-        cloudfront = CloudFront(set_mocked_aws_audit_info())
+        cloudfront = CloudFront(set_mocked_aws_provider())
         assert cloudfront.client.__class__.__name__ == "CloudFront"
 
     # Test CloudFront Session
     @mock_aws
     def test__get_session__(self):
-        cloudfront = CloudFront(set_mocked_aws_audit_info())
+        cloudfront = CloudFront(set_mocked_aws_provider())
         assert cloudfront.session.__class__.__name__ == "Session"
 
     # Test CloudFront Service
     @mock_aws
     def test__get_service__(self):
-        cloudfront = CloudFront(set_mocked_aws_audit_info())
+        cloudfront = CloudFront(set_mocked_aws_provider())
         assert cloudfront.service == "cloudfront"
 
     @mock_aws
     def test__list_distributions__zero(self):
-        cloudfront = CloudFront(set_mocked_aws_audit_info())
+        cloudfront = CloudFront(set_mocked_aws_provider())
 
         assert len(cloudfront.distributions) == 0
 
@@ -181,7 +178,7 @@ class Test_CloudFront_Service:
         response = cloudfront_client.create_distribution(DistributionConfig=config)
         cloudfront_distribution_id = response["Distribution"]["Id"]
         cloudfront_distribution_arn = response["Distribution"]["ARN"]
-        cloudfront = CloudFront(set_mocked_aws_audit_info())
+        cloudfront = CloudFront(set_mocked_aws_provider())
 
         assert len(cloudfront.distributions) == 1
         assert (

tests/providers/aws/services/cloudtrail/cloudtrail_bucket_requires_mfa_delete/cloudtrail_bucket_requires_mfa_delete_test.py

@@ -7,10 +7,10 @@ from moto import mock_aws
 
 from prowler.providers.aws.services.cloudtrail.cloudtrail_service import Cloudtrail
 from prowler.providers.aws.services.s3.s3_service import S3
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 # Mocking Backup Calls
@@ -20,16 +20,16 @@ make_api_call = botocore.client.BaseClient._make_api_call
 class Test_cloudtrail_bucket_requires_mfa_delete:
     @mock_aws
     def test_no_trails(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import (
@@ -42,7 +42,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete:
 
     @mock_aws
     def test_trails_with_no_mfa_bucket(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
@@ -60,14 +60,14 @@ class Test_cloudtrail_bucket_requires_mfa_delete:
         cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us)
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import (
@@ -105,7 +105,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete:
         new=mock_make_api_call_getbucketversioning_mfadelete_enabled,
     )
     def test_trails_with_mfa_bucket(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
@@ -123,14 +123,14 @@ class Test_cloudtrail_bucket_requires_mfa_delete:
         cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us)
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import (
@@ -152,7 +152,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete:
 
     @mock_aws
     def test_trails_with_no_mfa_bucket_cross(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
@@ -170,14 +170,14 @@ class Test_cloudtrail_bucket_requires_mfa_delete:
         cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us)
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ) as s3_client:
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import (
@@ -207,7 +207,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete:
         new=mock_make_api_call_getbucketversioning_mfadelete_enabled,
     )
     def test_trails_with_mfa_bucket_cross(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
@@ -225,14 +225,14 @@ class Test_cloudtrail_bucket_requires_mfa_delete:
         cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us)
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ) as s3_client:
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import (

tests/providers/aws/services/cloudtrail/cloudtrail_cloudwatch_logging_enabled/cloudtrail_cloudwatch_logging_enabled_test.py

@@ -5,17 +5,17 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
 class Test_cloudtrail_cloudwatch_logging_enabled:
     @mock_aws
     def test_no_trails(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
@@ -24,12 +24,12 @@ class Test_cloudtrail_cloudwatch_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled import (
@@ -71,13 +71,15 @@ class Test_cloudtrail_cloudwatch_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled.cloudtrail_client",
                 new=Cloudtrail(
-                    set_mocked_aws_audit_info(
+                    set_mocked_aws_provider(
                         [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
                     )
                 ),
@@ -158,13 +160,15 @@ class Test_cloudtrail_cloudwatch_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled.cloudtrail_client",
                 new=Cloudtrail(
-                    set_mocked_aws_audit_info(
+                    set_mocked_aws_provider(
                         [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
                     )
                 ),
@@ -246,13 +250,15 @@ class Test_cloudtrail_cloudwatch_logging_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled.cloudtrail_client",
                 new=Cloudtrail(
-                    set_mocked_aws_audit_info(
+                    set_mocked_aws_provider(
                         [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
                     )
                 ),

tests/providers/aws/services/cloudtrail/cloudtrail_insights_exist/cloudtrail_insights_exist_test.py

@@ -4,27 +4,27 @@ from boto3 import client
 from moto import mock_aws
 
 from prowler.providers.aws.services.cloudtrail.cloudtrail_service import Cloudtrail
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
 class Test_cloudtrail_insights_exist:
     @mock_aws
     def test_no_trails(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist import (
@@ -37,7 +37,7 @@ class Test_cloudtrail_insights_exist:
 
     @mock_aws
     def test_trails_with_no_insight_selector(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
@@ -55,12 +55,12 @@ class Test_cloudtrail_insights_exist:
         cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us)
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist import (
@@ -82,7 +82,7 @@ class Test_cloudtrail_insights_exist:
 
     @mock_aws
     def test_trails_with_insight_selector(self):
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
@@ -104,12 +104,12 @@ class Test_cloudtrail_insights_exist:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist import (

tests/providers/aws/services/cloudtrail/cloudtrail_kms_encryption_enabled/cloudtrail_kms_encryption_enabled_test.py

@@ -4,10 +4,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -19,12 +19,14 @@ class Test_cloudtrail_kms_encryption_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_kms_encryption_enabled.cloudtrail_kms_encryption_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -55,12 +57,14 @@ class Test_cloudtrail_kms_encryption_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_kms_encryption_enabled.cloudtrail_kms_encryption_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -105,12 +109,14 @@ class Test_cloudtrail_kms_encryption_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_kms_encryption_enabled.cloudtrail_kms_encryption_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check

tests/providers/aws/services/cloudtrail/cloudtrail_log_file_validation_enabled/cloudtrail_log_file_validation_enabled_test.py

@@ -4,10 +4,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -19,12 +19,14 @@ class Test_cloudtrail_log_file_validation_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_log_file_validation_enabled.cloudtrail_log_file_validation_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -54,12 +56,14 @@ class Test_cloudtrail_log_file_validation_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_log_file_validation_enabled.cloudtrail_log_file_validation_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -112,12 +116,14 @@ class Test_cloudtrail_log_file_validation_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_log_file_validation_enabled.cloudtrail_log_file_validation_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ) as service_client:
             # Test Check

tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_access_logging_enabled/cloudtrail_logs_s3_bucket_access_logging_enabled_test.py

@@ -4,10 +4,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -20,17 +20,19 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -62,17 +64,19 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -133,17 +137,19 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -184,17 +190,19 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ) as s3_client:
             # Test Check

tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_is_not_publicly_accessible/cloudtrail_logs_s3_bucket_is_not_publicly_accessible_test.py

@@ -4,10 +4,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -20,17 +20,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -60,17 +62,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -129,17 +133,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -196,17 +202,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ):
             # Test Check
@@ -245,17 +253,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible:
         from prowler.providers.aws.services.s3.s3_service import S3
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]),
+            "prowler.providers.common.common.get_global_provider",
+            return_value=set_mocked_aws_provider(
+                [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
+            ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client",
             new=Cloudtrail(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client",
             new=S3(
-                set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
+                set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1])
             ),
         ) as s3_client:
             # Test Check

tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled/cloudtrail_multi_region_enabled_test.py

@@ -4,11 +4,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -19,17 +19,17 @@ class Test_cloudtrail_multi_region_enabled:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled import (
@@ -38,7 +38,7 @@ class Test_cloudtrail_multi_region_enabled:
 
                 check = cloudtrail_multi_region_enabled()
                 result = check.execute()
-                assert len(result) == len(current_audit_info.audited_regions)
+                assert len(result) == len(aws_provider.identity.audited_regions)
                 for report in result:
                     if report.region == AWS_REGION_US_EAST_1:
                         assert report.status == "FAIL"
@@ -95,17 +95,17 @@ class Test_cloudtrail_multi_region_enabled:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled import (
@@ -114,7 +114,7 @@ class Test_cloudtrail_multi_region_enabled:
 
                 check = cloudtrail_multi_region_enabled()
                 result = check.execute()
-                assert len(result) == len(current_audit_info.audited_regions)
+                assert len(result) == len(aws_provider.identity.audited_regions)
                 for report in result:
                     if report.region == AWS_REGION_US_EAST_1:
                         assert report.status == "FAIL"
@@ -173,17 +173,17 @@ class Test_cloudtrail_multi_region_enabled:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled import (
@@ -192,7 +192,7 @@ class Test_cloudtrail_multi_region_enabled:
 
                 check = cloudtrail_multi_region_enabled()
                 result = check.execute()
-                assert len(result) == len(current_audit_info.audited_regions)
+                assert len(result) == len(aws_provider.identity.audited_regions)
                 for report in result:
                     if report.resource_id == trail_name_us:
                         assert report.status == "PASS"
@@ -250,17 +250,17 @@ class Test_cloudtrail_multi_region_enabled:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled import (
@@ -269,7 +269,7 @@ class Test_cloudtrail_multi_region_enabled:
 
                 check = cloudtrail_multi_region_enabled()
                 result = check.execute()
-                assert len(result) == len(current_audit_info.audited_regions)
+                assert len(result) == len(aws_provider.identity.audited_regions)
                 for report in result:
                     if report.region == AWS_REGION_US_EAST_1:
                         assert report.status == "PASS"

tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled_logging_management_events/cloudtrail_multi_region_enabled_logging_management_events_test.py

@@ -3,10 +3,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -17,15 +17,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import (
@@ -76,15 +76,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import (
@@ -133,15 +133,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import (
@@ -190,15 +190,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import (
@@ -245,15 +245,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events:
             Cloudtrail,
         )
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ):
             with mock.patch(
                 "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client",
-                new=Cloudtrail(current_audit_info),
+                new=Cloudtrail(aws_provider),
             ):
                 # Test Check
                 from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import (

tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_read_enabled/cloudtrail_s3_dataevents_read_enabled_test.py

@@ -3,10 +3,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -29,17 +29,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import (
@@ -70,18 +70,18 @@ class Test_cloudtrail_s3_dataevents_read_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
-        current_audit_info.ignore_unused_services = True
+        aws_provider = set_mocked_aws_provider()
+        aws_provider._ignore_unused_services = True
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import (
@@ -104,18 +104,18 @@ class Test_cloudtrail_s3_dataevents_read_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
-        current_audit_info.ignore_unused_services = True
+        aws_provider = set_mocked_aws_provider()
+        aws_provider._ignore_unused_services = True
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import (
@@ -169,17 +169,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import (
@@ -233,17 +233,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import (
@@ -294,17 +294,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import (
@@ -361,17 +361,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import (

tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_write_enabled/cloudtrail_s3_dataevents_write_enabled_test.py

@@ -3,10 +3,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -29,17 +29,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import (
@@ -93,17 +93,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import (
@@ -134,18 +134,18 @@ class Test_cloudtrail_s3_dataevents_write_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
-        current_audit_info.ignore_unused_services = True
+        aws_provider = set_mocked_aws_provider()
+        aws_provider._ignore_unused_services = True
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import (
@@ -167,18 +167,18 @@ class Test_cloudtrail_s3_dataevents_write_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
-        current_audit_info.ignore_unused_services = True
+        aws_provider = set_mocked_aws_provider()
+        aws_provider._ignore_unused_services = True
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import (
@@ -232,17 +232,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import (
@@ -292,17 +292,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import (
@@ -359,17 +359,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled:
         )
         from prowler.providers.aws.services.s3.s3_service import S3
 
-        current_audit_info = set_mocked_aws_audit_info()
+        aws_provider = set_mocked_aws_provider()
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client",
-            new=S3(current_audit_info),
+            new=S3(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import (

tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py

@@ -2,11 +2,11 @@ from boto3 import client
 from moto import mock_aws
 
 from prowler.providers.aws.services.cloudtrail.cloudtrail_service import Cloudtrail
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -14,38 +14,38 @@ class Test_Cloudtrail_Service:
     # Test Cloudtrail Service
     @mock_aws
     def test_service(self):
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
-        cloudtrail = Cloudtrail(audit_info)
+        cloudtrail = Cloudtrail(aws_provider)
         assert cloudtrail.service == "cloudtrail"
 
     # Test Cloudtrail client
     @mock_aws
     def test_client(self):
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
-        cloudtrail = Cloudtrail(audit_info)
+        cloudtrail = Cloudtrail(aws_provider)
         for regional_client in cloudtrail.regional_clients.values():
             assert regional_client.__class__.__name__ == "CloudTrail"
 
     # Test Cloudtrail session
     @mock_aws
     def test__get_session__(self):
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
-        cloudtrail = Cloudtrail(audit_info)
+        cloudtrail = Cloudtrail(aws_provider)
         assert cloudtrail.session.__class__.__name__ == "Session"
 
     # Test Cloudtrail Session
     @mock_aws
     def test_audited_account(self):
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
-        cloudtrail = Cloudtrail(audit_info)
+        cloudtrail = Cloudtrail(aws_provider)
         assert cloudtrail.audited_account == AWS_ACCOUNT_NUMBER
 
     @mock_aws
@@ -83,10 +83,10 @@ class Test_Cloudtrail_Service:
                 {"Key": "test", "Value": "test"},
             ],
         )
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
-        cloudtrail = Cloudtrail(audit_info)
+        cloudtrail = Cloudtrail(aws_provider)
         assert len(cloudtrail.trails) == 2
         for trail in cloudtrail.trails:
             if trail.name:
@@ -140,11 +140,11 @@ class Test_Cloudtrail_Service:
         cloudtrail_client_eu_west_1.create_trail(
             Name=trail_name_eu, S3BucketName=bucket_name_eu, IsMultiRegionTrail=False
         )
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
-        cloudtrail = Cloudtrail(audit_info)
-        assert len(cloudtrail.trails) == len(audit_info.audited_regions)
+        cloudtrail = Cloudtrail(aws_provider)
+        assert len(cloudtrail.trails) == len(aws_provider.identity.audited_regions)
         for trail in cloudtrail.trails:
             if trail.name:
                 if trail.name == trail_name_us:
@@ -184,11 +184,11 @@ class Test_Cloudtrail_Service:
                 }
             ],
         )["EventSelectors"]
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
-        cloudtrail = Cloudtrail(audit_info)
-        assert len(cloudtrail.trails) == len(audit_info.audited_regions)
+        cloudtrail = Cloudtrail(aws_provider)
+        assert len(cloudtrail.trails) == len(aws_provider.identity.audited_regions)
         for trail in cloudtrail.trails:
             if trail.name:
                 if trail.name == trail_name_us:
@@ -232,11 +232,11 @@ class Test_Cloudtrail_Service:
                 },
             ],
         )["AdvancedEventSelectors"]
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
-        cloudtrail = Cloudtrail(audit_info)
-        assert len(cloudtrail.trails) == len(audit_info.audited_regions)
+        cloudtrail = Cloudtrail(aws_provider)
+        assert len(cloudtrail.trails) == len(aws_provider.identity.audited_regions)
         for trail in cloudtrail.trails:
             if trail.name:
                 if trail.name == trail_name_us:

tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import (

tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import (

tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import (

tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import (

tests/providers/aws/services/cloudwatch/cloudwatch_cross_account_sharing_disabled/cloudwatch_cross_account_sharing_disabled_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -16,13 +16,13 @@ class Test_cloudwatch_cross_account_sharing_disabled:
     def test_cloudwatch_without_cross_account_role(self):
         from prowler.providers.aws.services.iam.iam_service import IAM
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -31,11 +31,11 @@ class Test_cloudwatch_cross_account_sharing_disabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_cross_account_sharing_disabled.cloudwatch_cross_account_sharing_disabled.iam_client",
-            new=IAM(current_audit_info),
+            new=IAM(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_cross_account_sharing_disabled.cloudwatch_cross_account_sharing_disabled import (
@@ -63,13 +63,13 @@ class Test_cloudwatch_cross_account_sharing_disabled:
         )
         from prowler.providers.aws.services.iam.iam_service import IAM
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -78,11 +78,11 @@ class Test_cloudwatch_cross_account_sharing_disabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_cross_account_sharing_disabled.cloudwatch_cross_account_sharing_disabled.iam_client",
-            new=IAM(current_audit_info),
+            new=IAM(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_cross_account_sharing_disabled.cloudwatch_cross_account_sharing_disabled import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_group_kms_encryption_enabled/cloudwatch_log_group_kms_encryption_enabled_test.py

@@ -3,10 +3,10 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -14,13 +14,13 @@ class Test_cloudwatch_log_group_kms_encryption_enabled:
     def test_cloudwatch_no_log_groups(self):
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -29,11 +29,11 @@ class Test_cloudwatch_log_group_kms_encryption_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled import (
@@ -56,13 +56,13 @@ class Test_cloudwatch_log_group_kms_encryption_enabled:
 
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -71,11 +71,11 @@ class Test_cloudwatch_log_group_kms_encryption_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled import (
@@ -102,13 +102,13 @@ class Test_cloudwatch_log_group_kms_encryption_enabled:
 
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -117,11 +117,11 @@ class Test_cloudwatch_log_group_kms_encryption_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_group_no_secrets_in_logs/cloudwatch_log_group_no_secrets_in_logs_test.py

@@ -5,10 +5,10 @@ from boto3 import client
 from moto import mock_aws
 from moto.core.utils import unix_time_millis
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -16,13 +16,13 @@ class Test_cloudwatch_log_group_no_secrets_in_logs:
     def test_cloudwatch_no_log_groups(self):
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -31,11 +31,11 @@ class Test_cloudwatch_log_group_no_secrets_in_logs:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs import (
@@ -66,13 +66,13 @@ class Test_cloudwatch_log_group_no_secrets_in_logs:
         )
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -81,11 +81,11 @@ class Test_cloudwatch_log_group_no_secrets_in_logs:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs import (
@@ -119,13 +119,13 @@ class Test_cloudwatch_log_group_no_secrets_in_logs:
         )
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -134,11 +134,11 @@ class Test_cloudwatch_log_group_no_secrets_in_logs:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_group_retention_policy_specific_days_enabled/cloudwatch_log_group_retention_policy_specific_days_enabled_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -15,14 +15,14 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled:
     def test_cloudwatch_no_log_groups(self):
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        current_audit_info.audit_config = {"log_group_retention_days": 365}
+        aws_provider._audit_config = {"log_group_retention_days": 365}
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -31,11 +31,11 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled import (
@@ -57,14 +57,14 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled:
         )
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        current_audit_info.audit_config = {"log_group_retention_days": 365}
+        aws_provider._audit_config = {"log_group_retention_days": 365}
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -73,11 +73,11 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled import (
@@ -111,14 +111,14 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled:
         logs_client.put_retention_policy(logGroupName="test", retentionInDays=400)
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        current_audit_info.audit_config = {"log_group_retention_days": 365}
+        aws_provider._audit_config = {"log_group_retention_days": 365}
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -127,11 +127,11 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled import (
@@ -165,14 +165,14 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled:
         logs_client.put_retention_policy(logGroupName="test", retentionInDays=7)
         from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        current_audit_info.audit_config = {"log_group_retention_days": 365}
+        aws_provider._audit_config = {"log_group_retention_days": 365}
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -181,11 +181,11 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import (
@@ -87,13 +87,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -102,17 +102,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import (
@@ -158,13 +158,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -173,17 +173,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import (
@@ -241,13 +241,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -256,17 +256,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import (
@@ -336,13 +336,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -351,17 +351,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import (
@@ -431,13 +431,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -446,17 +446,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import (
@@ -526,13 +526,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -541,17 +541,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import (
@@ -87,13 +87,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -102,17 +102,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import (
@@ -158,13 +158,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -173,17 +173,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import (
@@ -241,13 +241,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -256,17 +256,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import (
@@ -336,13 +336,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -351,17 +351,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import (
@@ -431,13 +431,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -446,17 +446,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import (
@@ -526,13 +526,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -541,17 +541,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import (
@@ -87,13 +87,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -102,17 +102,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import (
@@ -158,13 +158,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -173,17 +173,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import (
@@ -241,13 +241,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -256,17 +256,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import (
@@ -336,13 +336,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -351,17 +351,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import (
@@ -431,13 +431,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -446,17 +446,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import (
@@ -526,13 +526,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -541,17 +541,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_root_usage:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_root_usage:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_root_usage:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_root_usage:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_root_usage:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_root_usage:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_root_usage:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_root_usage:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_root_usage:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_root_usage:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_root_usage:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_root_usage:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_root_usage:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_root_usage:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import (
@@ -86,13 +86,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -101,17 +101,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import (
@@ -156,13 +156,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -171,17 +171,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import (
@@ -238,13 +238,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -253,17 +253,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import (
@@ -331,13 +331,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -346,17 +346,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import (
@@ -424,13 +424,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -439,17 +439,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import (
@@ -517,13 +517,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -532,17 +532,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import (

tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls_test.py

@@ -3,11 +3,11 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import (
@@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import (
@@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import (
@@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import (
@@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import (
@@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import (
@@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
             Logs,
         )
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         from prowler.providers.common.models import Audit_Metadata
 
-        current_audit_info.audit_metadata = Audit_Metadata(
+        aws_provider.audit_metadata = Audit_Metadata(
             services_scanned=0,
             # We need to set this check to call __describe_log_groups__
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"],
@@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls:
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client",
-            new=Logs(current_audit_info),
+            new=Logs(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client",
-            new=CloudWatch(current_audit_info),
+            new=CloudWatch(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client",
-            new=Cloudtrail(current_audit_info),
+            new=Cloudtrail(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import (

tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py

@@ -5,10 +5,10 @@ from prowler.providers.aws.services.cloudwatch.cloudwatch_service import (
     CloudWatch,
     Logs,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -17,20 +17,20 @@ class Test_CloudWatch_Service:
     @mock_aws
     def test_service(self):
         # CloudWatch client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        cloudwatch = CloudWatch(audit_info)
+        cloudwatch = CloudWatch(aws_provider)
         assert cloudwatch.service == "cloudwatch"
 
     # Test CloudWatch Client
     @mock_aws
     def test_client(self):
         # CloudWatch client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        cloudwatch = CloudWatch(audit_info)
+        cloudwatch = CloudWatch(aws_provider)
         for client_ in cloudwatch.regional_clients.values():
             assert client_.__class__.__name__ == "CloudWatch"
 
@@ -38,40 +38,40 @@ class Test_CloudWatch_Service:
     @mock_aws
     def test__get_session__(self):
         # CloudWatch client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        cloudwatch = CloudWatch(audit_info)
+        cloudwatch = CloudWatch(aws_provider)
         assert cloudwatch.session.__class__.__name__ == "Session"
 
     # Test CloudWatch Session
     @mock_aws
     def test_audited_account(self):
         # CloudWatch client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        cloudwatch = CloudWatch(audit_info)
+        cloudwatch = CloudWatch(aws_provider)
         assert cloudwatch.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test Logs Service
     @mock_aws
     def test_logs_service(self):
         # Logs client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        logs = Logs(audit_info)
+        logs = Logs(aws_provider)
         assert logs.service == "logs"
 
     # Test Logs Client
     @mock_aws
     def test_logs_client(self):
         # Logs client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        logs = Logs(audit_info)
+        logs = Logs(aws_provider)
         for client_ in logs.regional_clients.values():
             assert client_.__class__.__name__ == "CloudWatchLogs"
 
@@ -79,20 +79,20 @@ class Test_CloudWatch_Service:
     @mock_aws
     def test__logs_get_session__(self):
         # Logs client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        logs = Logs(audit_info)
+        logs = Logs(aws_provider)
         assert logs.session.__class__.__name__ == "Session"
 
     # Test Logs Session
     @mock_aws
     def test_logs_audited_account(self):
         # Logs client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        logs = Logs(audit_info)
+        logs = Logs(aws_provider)
         assert logs.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test CloudWatch Alarms
@@ -117,10 +117,10 @@ class Test_CloudWatch_Service:
             Unit="Seconds",
             Tags=[{"Key": "key-1", "Value": "value-1"}],
         )
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        cloudwatch = CloudWatch(audit_info)
+        cloudwatch = CloudWatch(aws_provider)
         assert len(cloudwatch.metric_alarms) == 1
         assert (
             cloudwatch.metric_alarms[0].arn
@@ -151,10 +151,10 @@ class Test_CloudWatch_Service:
                 }
             ],
         )
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        logs = Logs(audit_info)
+        logs = Logs(aws_provider)
         assert len(logs.metric_filters) == 1
         assert logs.metric_filters[0].log_group == "/log-group/test"
         assert logs.metric_filters[0].name == "test-filter"
@@ -175,10 +175,10 @@ class Test_CloudWatch_Service:
         logs_client.put_retention_policy(
             logGroupName="/log-group/test", retentionInDays=400
         )
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        logs = Logs(audit_info)
+        logs = Logs(aws_provider)
         assert len(logs.log_groups) == 1
         assert (
             logs.log_groups[0].arn
@@ -203,10 +203,10 @@ class Test_CloudWatch_Service:
             tags={"tag_key_1": "tag_value_1", "tag_key_2": "tag_value_2"},
         )
 
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             expected_checks=["cloudwatch_log_group_no_secrets_in_logs"]
         )
-        logs = Logs(audit_info)
+        logs = Logs(aws_provider)
         assert len(logs.log_groups) == 1
         assert (
             logs.log_groups[0].arn

tests/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled_test.py

@@ -11,7 +11,7 @@ from prowler.providers.aws.services.codeartifact.codeartifact_service import (
     Restrictions,
     RestrictionValues,
 )
-from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER
 
 AWS_REGION = "eu-west-1"
 

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

@@ -8,11 +8,11 @@ from prowler.providers.aws.services.codeartifact.codeartifact_service import (
     OriginInformationValues,
     RestrictionValues,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 # Mocking Access Analyzer Calls
@@ -86,8 +86,8 @@ def mock_make_api_call(self, operation_name, kwarg):
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_EU_WEST_1
     )
     regional_client.region = AWS_REGION_EU_WEST_1
@@ -97,14 +97,14 @@ def mock_generate_regional_clients(service, audit_info):
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_CodeArtifact_Service:
     # Test CodeArtifact Client
     def test__get_client__(self):
         codeartifact = CodeArtifact(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert (
             codeartifact.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__
@@ -114,21 +114,21 @@ class Test_CodeArtifact_Service:
     # Test CodeArtifact Session
     def test__get_session__(self):
         codeartifact = CodeArtifact(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert codeartifact.session.__class__.__name__ == "Session"
 
     # Test CodeArtifact Service
     def test__get_service__(self):
         codeartifact = CodeArtifact(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert codeartifact.service == "codeartifact"
 
     def test__list_repositories__(self):
         # Set partition for the service
         codeartifact = CodeArtifact(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
 
         assert len(codeartifact.repositories) == 1

tests/providers/aws/services/codebuild/codebuild_service_test.py

@@ -4,10 +4,7 @@ from unittest.mock import patch
 import botocore
 
 from prowler.providers.aws.services.codebuild.codebuild_service import Codebuild
-from tests.providers.aws.audit_info_utils import (
-    AWS_REGION_EU_WEST_1,
-    set_mocked_aws_audit_info,
-)
+from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider
 
 # last time invoked time
 last_invoked_time = datetime.now() - timedelta(days=2)
@@ -38,8 +35,8 @@ def mock_make_api_call(self, operation_name, kwarg):
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_EU_WEST_1
     )
     regional_client.region = AWS_REGION_EU_WEST_1
@@ -48,28 +45,28 @@ def mock_generate_regional_clients(service, audit_info):
 
 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_Codebuild_Service:
     # Test Codebuild Session
     def test__get_session__(self):
-        codebuild = Codebuild(set_mocked_aws_audit_info())
+        codebuild = Codebuild(set_mocked_aws_provider())
         assert codebuild.session.__class__.__name__ == "Session"
 
     # Test Codebuild Service
     def test__get_service__(self):
-        codebuild = Codebuild(set_mocked_aws_audit_info())
+        codebuild = Codebuild(set_mocked_aws_provider())
         assert codebuild.service == "codebuild"
 
     def test__list_projects__(self):
-        codebuild = Codebuild(set_mocked_aws_audit_info())
+        codebuild = Codebuild(set_mocked_aws_provider())
         assert len(codebuild.projects) == 1
         assert codebuild.projects[0].name == "test"
         assert codebuild.projects[0].region == AWS_REGION_EU_WEST_1
 
     def test__list_builds_for_project__(self):
-        codebuild = Codebuild(set_mocked_aws_audit_info())
+        codebuild = Codebuild(set_mocked_aws_provider())
         assert len(codebuild.projects) == 1
         assert codebuild.projects[0].name == "test"
         assert codebuild.projects[0].region == AWS_REGION_EU_WEST_1

tests/providers/aws/services/cognito/cognito_service_test.py

@@ -2,11 +2,11 @@ from boto3 import client
 from moto import mock_aws
 
 from prowler.providers.aws.services.cognito.cognito_service import CognitoIDP
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -14,52 +14,52 @@ class Test_Cognito_Service:
     # Test Cognito Service
     @mock_aws
     def test_service(self):
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        cognito = CognitoIDP(audit_info)
+        cognito = CognitoIDP(aws_provider)
         assert cognito.service == "cognito-idp"
 
     # Test Cognito client
     @mock_aws
     def test_client(self):
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        cognito = CognitoIDP(audit_info)
+        cognito = CognitoIDP(aws_provider)
         for regional_client in cognito.regional_clients.values():
             assert regional_client.__class__.__name__ == "CognitoIdentityProvider"
 
     # Test Cognito session
     @mock_aws
     def test__get_session__(self):
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        cognito = CognitoIDP(audit_info)
+        cognito = CognitoIDP(aws_provider)
         assert cognito.session.__class__.__name__ == "Session"
 
     # Test Cognito Session
     @mock_aws
     def test_audited_account(self):
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        cognito = CognitoIDP(audit_info)
+        cognito = CognitoIDP(aws_provider)
         assert cognito.audited_account == AWS_ACCOUNT_NUMBER
 
     @mock_aws
     def test_list_user_pools(self):
         user_pool_name_1 = "user_pool_test_1"
         user_pool_name_2 = "user_pool_test_2"
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
         cognito_client_eu_west_1 = client("cognito-idp", region_name="eu-west-1")
         cognito_client_us_east_1 = client("cognito-idp", region_name="us-east-1")
         cognito_client_eu_west_1.create_user_pool(PoolName=user_pool_name_1)
         cognito_client_us_east_1.create_user_pool(PoolName=user_pool_name_2)
-        cognito = CognitoIDP(audit_info)
+        cognito = CognitoIDP(aws_provider)
         assert len(cognito.user_pools) == 2
         for user_pool in cognito.user_pools.values():
             assert (
@@ -70,14 +70,14 @@ class Test_Cognito_Service:
     @mock_aws
     def test_describe_user_pools(self):
         user_pool_name_1 = "user_pool_test_1"
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
         cognito_client_eu_west_1 = client("cognito-idp", region_name="eu-west-1")
         user_pool_id = cognito_client_eu_west_1.create_user_pool(
             PoolName=user_pool_name_1
         )["UserPool"]["Id"]
-        cognito = CognitoIDP(audit_info)
+        cognito = CognitoIDP(aws_provider)
         assert len(cognito.user_pools) == 1
         for user_pool in cognito.user_pools.values():
             assert user_pool.name == user_pool_name_1
@@ -91,7 +91,7 @@ class Test_Cognito_Service:
     @mock_aws
     def test_get_user_pool_mfa_config(self):
         user_pool_name_1 = "user_pool_test_1"
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
         cognito_client_eu_west_1 = client("cognito-idp", region_name="eu-west-1")
@@ -103,7 +103,7 @@ class Test_Cognito_Service:
             SoftwareTokenMfaConfiguration={"Enabled": True},
             MfaConfiguration="ON",
         )
-        cognito = CognitoIDP(audit_info)
+        cognito = CognitoIDP(aws_provider)
         assert len(cognito.user_pools) == 1
         for user_pool in cognito.user_pools.values():
             assert user_pool.name == user_pool_name_1

tests/providers/aws/services/config/config_recorder_all_regions_enabled/config_recorder_all_regions_enabled_test.py

@@ -3,12 +3,12 @@ from unittest import mock
 from boto3 import client
 from moto import mock_aws
 
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_SOUTH_2,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -17,16 +17,16 @@ class Test_config_recorder_all_regions_enabled:
     def test_config_no_recorders(self):
         from prowler.providers.aws.services.config.config_service import Config
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled.config_client",
-            new=Config(current_audit_info),
+            new=Config(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled import (
@@ -72,14 +72,14 @@ class Test_config_recorder_all_regions_enabled:
         )
         from prowler.providers.aws.services.config.config_service import Config
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled.config_client",
-            new=Config(current_audit_info),
+            new=Config(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled import (
@@ -119,14 +119,14 @@ class Test_config_recorder_all_regions_enabled:
         config_client.start_configuration_recorder(ConfigurationRecorderName="default")
         from prowler.providers.aws.services.config.config_service import Config
 
-        current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled.config_client",
-            new=Config(current_audit_info),
+            new=Config(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled import (
@@ -152,7 +152,7 @@ class Test_config_recorder_all_regions_enabled:
                     assert recorder.region == AWS_REGION_US_EAST_1
 
     @mock_aws
-    def test_config_one_recorder_disabled_allowlisted(self):
+    def test_config_one_recorder_disabled_muted(self):
         # Create Config Mocked Resources
         config_client = client("config", region_name=AWS_REGION_US_EAST_1)
         # Create Config Recorder
@@ -161,18 +161,18 @@ class Test_config_recorder_all_regions_enabled:
         )
         from prowler.providers.aws.services.config.config_service import Config
 
-        current_audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             audited_regions=[AWS_REGION_EU_SOUTH_2, AWS_REGION_US_EAST_1],
             profile_region=AWS_REGION_EU_SOUTH_2,
-            audit_config={"allowlist_non_default_regions": True},
+            audit_config={"mute_non_default_regions": True},
         )
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=current_audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled.config_client",
-            new=Config(current_audit_info),
+            new=Config(aws_provider),
         ):
             # Test Check
             from prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled import (
@@ -185,7 +185,7 @@ class Test_config_recorder_all_regions_enabled:
             # Search for the recorder just created
             for recorder in result:
                 if recorder.region == AWS_REGION_US_EAST_1:
-                    assert recorder.status == "WARNING"
+                    assert recorder.status == "MUTED"
                     assert (
                         recorder.status_extended
                         == f"AWS Config recorder {AWS_ACCOUNT_NUMBER} is disabled."

tests/providers/aws/services/config/config_service_test.py

@@ -2,11 +2,11 @@ from boto3 import client
 from moto import mock_aws
 
 from prowler.providers.aws.services.config.config_service import Config
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 
@@ -15,20 +15,20 @@ class Test_Config_Service:
     @mock_aws
     def test_service(self):
         # Config client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        config = Config(audit_info)
+        config = Config(aws_provider)
         assert config.service == "config"
 
     # Test Config Client
     @mock_aws
     def test_client(self):
         # Config client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        config = Config(audit_info)
+        config = Config(aws_provider)
         for regional_client in config.regional_clients.values():
             assert regional_client.__class__.__name__ == "ConfigService"
 
@@ -36,20 +36,20 @@ class Test_Config_Service:
     @mock_aws
     def test__get_session__(self):
         # Config client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        config = Config(audit_info)
+        config = Config(aws_provider)
         assert config.session.__class__.__name__ == "Session"
 
     # Test Config Session
     @mock_aws
     def test_audited_account(self):
         # Config client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        config = Config(audit_info)
+        config = Config(aws_provider)
         assert config.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test Config Get Rest APIs
@@ -67,10 +67,10 @@ class Test_Config_Service:
         )
         config_client.start_configuration_recorder(ConfigurationRecorderName="default")
         # Config client for this test class
-        audit_info = set_mocked_aws_audit_info(
+        aws_provider = set_mocked_aws_provider(
             [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]
         )
-        config = Config(audit_info)
+        config = Config(aws_provider)
         # One recorder per region
         assert len(config.recorders) == 2
         # Check the active one

tests/providers/aws/services/directoryservice/directoryservice_directory_monitor_notifications/directoryservice_directory_monitor_notifications_test.py

@@ -7,7 +7,7 @@ from prowler.providers.aws.services.directoryservice.directoryservice_service im
     EventTopics,
     EventTopicStatus,
 )
-from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER
+from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER
 
 AWS_REGION = "eu-west-1"
 

tests/providers/aws/services/directoryservice/directoryservice_service_test.py

@@ -13,11 +13,11 @@ from prowler.providers.aws.services.directoryservice.directoryservice_service im
     EventTopicStatus,
     RadiusStatus,
 )
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_EU_WEST_1,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 # Mocking Access Analyzer Calls
@@ -103,8 +103,8 @@ def mock_make_api_call(self, operation_name, kwarg):
 
 
 # Mock generate_regional_clients()
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_EU_WEST_1
     )
     regional_client.region = AWS_REGION_EU_WEST_1
@@ -114,7 +114,7 @@ def mock_generate_regional_clients(service, audit_info):
 # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client
 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 class Test_DirectoryService_Service:
@@ -122,7 +122,7 @@ class Test_DirectoryService_Service:
     @mock_aws
     def test__get_client__(self):
         directoryservice = DirectoryService(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert (
             directoryservice.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__
@@ -133,7 +133,7 @@ class Test_DirectoryService_Service:
     @mock_aws
     def test__get_session__(self):
         directoryservice = DirectoryService(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert directoryservice.session.__class__.__name__ == "Session"
 
@@ -141,7 +141,7 @@ class Test_DirectoryService_Service:
     @mock_aws
     def test__get_service__(self):
         directoryservice = DirectoryService(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
         assert directoryservice.service == "ds"
 
@@ -149,7 +149,7 @@ class Test_DirectoryService_Service:
     def test__describe_directories__(self):
         # Set partition for the service
         directoryservice = DirectoryService(
-            set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
+            set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1])
         )
 
         # __describe_directories__

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

@@ -4,11 +4,11 @@ from boto3 import client, resource
 from moto import mock_aws
 
 from prowler.providers.aws.services.dlm.dlm_service import LifecyclePolicy
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_ARN,
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 LIFECYCLE_POLICY_ID = "policy-XXXXXXXXXXXX"
@@ -23,7 +23,7 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists:
         dlm_client.audited_account_arn = AWS_ACCOUNT_ARN
         dlm_client.lifecycle_policies = {}
 
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         from prowler.providers.aws.services.ec2.ec2_service import EC2
 
@@ -31,11 +31,11 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists:
             "prowler.providers.aws.services.dlm.dlm_service.DLM",
             new=dlm_client,
         ), mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.ec2.ec2_service.EC2",
-            return_value=EC2(audit_info),
+            return_value=EC2(aws_provider),
         ) as ec2_client, mock.patch(
             "prowler.providers.aws.services.ec2.ec2_client.ec2_client",
             new=ec2_client,
@@ -91,16 +91,16 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists:
         dlm_client.__get_lifecycle_policy_arn_template__ = mock.MagicMock(
             return_value=dlm_client.lifecycle_policy_arn_template
         )
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         from prowler.providers.aws.services.ec2.ec2_service import EC2
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.ec2_client",
-            new=EC2(audit_info),
+            new=EC2(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_client",
             new=dlm_client,
@@ -152,16 +152,16 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists:
 
         # from prowler.providers.aws.services.ec2.ec2_service import EC2
 
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         from prowler.providers.aws.services.ec2.ec2_service import EC2
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.ec2_client",
-            new=EC2(audit_info),
+            new=EC2(aws_provider),
         ), mock.patch(
             "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_client",
             new=dlm_client,
@@ -193,16 +193,16 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists:
 
         # from prowler.providers.aws.services.ec2.ec2_service import EC2
 
-        audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])
+        aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])
 
         from prowler.providers.aws.services.ec2.ec2_service import EC2
 
         with mock.patch(
-            "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-            new=audit_info,
+            "prowler.providers.common.common.get_global_provider",
+            return_value=aws_provider,
         ), mock.patch(
             "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.ec2_client",
-            new=EC2(audit_info),
+            new=EC2(aws_provider),
         ) as ec2_client, mock.patch(
             "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_client",
             new=dlm_client,

tests/providers/aws/services/dlm/dlm_service_test.py

@@ -2,10 +2,10 @@ import botocore
 from mock import patch
 
 from prowler.providers.aws.services.dlm.dlm_service import DLM, LifecyclePolicy
-from tests.providers.aws.audit_info_utils import (
+from tests.providers.aws.utils import (
     AWS_ACCOUNT_NUMBER,
     AWS_REGION_US_EAST_1,
-    set_mocked_aws_audit_info,
+    set_mocked_aws_provider,
 )
 
 LIFECYCLE_POLICY_ID = "policy-XXXXXXXXXXXX"
@@ -38,8 +38,8 @@ def mock_make_api_call(self, operation_name, kwargs):
     return make_api_call(self, operation_name, kwargs)
 
 
-def mock_generate_regional_clients(service, audit_info):
-    regional_client = audit_info.audit_session.client(
+def mock_generate_regional_clients(provider, service):
+    regional_client = provider._session.current_session.client(
         service, region_name=AWS_REGION_US_EAST_1
     )
     regional_client.region = AWS_REGION_US_EAST_1
@@ -47,7 +47,7 @@ def mock_generate_regional_clients(service, audit_info):
 
 
 @patch(
-    "prowler.providers.aws.lib.service.service.generate_regional_clients",
+    "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients",
     new=mock_generate_regional_clients,
 )
 # Patch every AWS call using Boto3
@@ -55,33 +55,33 @@ def mock_generate_regional_clients(service, audit_info):
 class Test_DLM_Service:
     # Test DLM Service
     def test_service(self):
-        audit_info = set_mocked_aws_audit_info()
-        dlm = DLM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        dlm = DLM(aws_provider)
         assert dlm.service == "dlm"
 
     # Test DLM Client
     def test_client(self):
-        audit_info = set_mocked_aws_audit_info()
-        dlm = DLM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        dlm = DLM(aws_provider)
         assert dlm.client.__class__.__name__ == "DLM"
 
     # Test DLM Session
     def test__get_session__(self):
-        audit_info = set_mocked_aws_audit_info()
-        dlm = DLM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        dlm = DLM(aws_provider)
         assert dlm.session.__class__.__name__ == "Session"
 
     # Test DLM Session
     def test_audited_account(self):
-        audit_info = set_mocked_aws_audit_info()
-        dlm = DLM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        dlm = DLM(aws_provider)
         assert dlm.audited_account == AWS_ACCOUNT_NUMBER
 
     # Test DLM Get DLM Contacts
     def test_get_lifecycle_policies(self):
         # DLM client for this test class
-        audit_info = set_mocked_aws_audit_info()
-        dlm = DLM(audit_info)
+        aws_provider = set_mocked_aws_provider()
+        dlm = DLM(aws_provider)
         assert dlm.lifecycle_policies == {
             AWS_REGION_US_EAST_1: {
                 LIFECYCLE_POLICY_ID: LifecyclePolicy(