chore(deps-dev): bump moto from 5.0.16 to 5.0.27 (#6648)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MrCloudSec <[email protected]>
prowler-cloud · Jan 21, 2025 · 27fe201 · 27fe201
1 parent a154fb4
commit 27fe201
Show file tree

Hide file tree

Showing 59 changed files with 4,603 additions and 3,402 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/prowler/providers/aws/services/opensearch/opensearch_service.py b/prowler/providers/aws/services/opensearch/opensearch_service.py
@@ -10,13 +10,9 @@
 
 class OpenSearchService(AWSService):
     def __init__(self, provider):
-        # Call AWSService's __init__
         super().__init__("opensearch", provider)
         self.opensearch_domains = {}
         self.__threading_call__(self._list_domain_names)
-        self.__threading_call__(
-            self._describe_domain_config, self.opensearch_domains.values()
-        )
         self.__threading_call__(self._describe_domain, self.opensearch_domains.values())
         self.__threading_call__(self._list_tags, self.opensearch_domains.values())
 
@@ -39,43 +35,6 @@ def _list_domain_names(self, regional_client):
                 f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
             )
 
-    def _describe_domain_config(self, domain):
-        logger.info("OpenSearch - describing domain configurations...")
-        try:
-            regional_client = self.regional_clients[domain.region]
-            describe_domain = regional_client.describe_domain_config(
-                DomainName=domain.name
-            )
-            for logging_key in [
-                "SEARCH_SLOW_LOGS",
-                "INDEX_SLOW_LOGS",
-                "AUDIT_LOGS",
-            ]:
-                if logging_key in describe_domain["DomainConfig"].get(
-                    "LogPublishingOptions", {}
-                ).get("Options", {}):
-                    domain.logging.append(
-                        PublishingLoggingOption(
-                            name=logging_key,
-                            enabled=describe_domain["DomainConfig"][
-                                "LogPublishingOptions"
-                            ]["Options"][logging_key]["Enabled"],
-                        )
-                    )
-            try:
-                domain.access_policy = loads(
-                    describe_domain["DomainConfig"]["AccessPolicies"]["Options"]
-                )
-            except JSONDecodeError as error:
-                logger.warning(
-                    f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                )
-
-        except Exception as error:
-            logger.error(
-                f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-            )
-
     def _describe_domain(self, domain):
         logger.info("OpenSearch - describing domain configurations...")
         try:
@@ -130,6 +89,32 @@ def _describe_domain(self, domain):
             domain.dedicated_master_count = cluster_config.get(
                 "DedicatedMasterCount", 0
             )
+            for logging_key in [
+                "SEARCH_SLOW_LOGS",
+                "INDEX_SLOW_LOGS",
+                "AUDIT_LOGS",
+            ]:
+                if logging_key in describe_domain["DomainStatus"].get(
+                    "LogPublishingOptions", {}
+                ):
+                    domain.logging.append(
+                        PublishingLoggingOption(
+                            name=logging_key,
+                            enabled=describe_domain["DomainStatus"][
+                                "LogPublishingOptions"
+                            ][logging_key]["Enabled"],
+                        )
+                    )
+            try:
+                if describe_domain["DomainStatus"].get("AccessPolicies"):
+                    domain.access_policy = loads(
+                        describe_domain["DomainStatus"]["AccessPolicies"]
+                    )
+            except JSONDecodeError as error:
+                logger.warning(
+                    f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
+                )
+
         except Exception as error:
             logger.error(
                 f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"

diff --git a/prowler/providers/aws/services/rds/rds_service.py b/prowler/providers/aws/services/rds/rds_service.py
@@ -122,14 +122,19 @@ def _describe_db_parameters(self, regional_client):
             for instance in self.db_instances.values():
                 if instance.region == regional_client.region:
                     for parameter_group in instance.parameter_groups:
-                        describe_db_parameters_paginator = (
-                            regional_client.get_paginator("describe_db_parameters")
-                        )
-                        for page in describe_db_parameters_paginator.paginate(
-                            DBParameterGroupName=parameter_group
-                        ):
-                            for parameter in page["Parameters"]:
-                                instance.parameters.append(parameter)
+                        try:
+                            describe_db_parameters_paginator = (
+                                regional_client.get_paginator("describe_db_parameters")
+                            )
+                            for page in describe_db_parameters_paginator.paginate(
+                                DBParameterGroupName=parameter_group
+                            ):
+                                for parameter in page["Parameters"]:
+                                    instance.parameters.append(parameter)
+                        except Exception as error:
+                            logger.error(
+                                f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
+                            )
 
         except Exception as error:
             logger.error(

diff --git a/pyproject.toml b/pyproject.toml
@@ -82,7 +82,7 @@ docker = "7.1.0"
 flake8 = "7.1.1"
 freezegun = "1.5.1"
 mock = "5.1.0"
-moto = {extras = ["all"], version = "5.0.16"}
+moto = {extras = ["all"], version = "5.0.27"}
 openapi-schema-validator = "0.6.3"
 openapi-spec-validator = "0.7.1"
 pylint = "3.3.3"

diff --git a/...gging_enabled/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled_test.py b/...gging_enabled/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled_test.py
@@ -36,15 +36,21 @@ def test_no_functions(self):
             Cloudtrail,
         )
 
-        with mock.patch(
-            "prowler.providers.common.provider.Provider.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_provider()),
+        with (
+            mock.patch(
+                "prowler.providers.common.provider.Provider.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_provider(create_default_organization=False)
+                ),
+            ),
         ):
             # 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 (
@@ -89,15 +95,21 @@ def test_lambda_not_recorded_by_cloudtrail(self):
             Cloudtrail,
         )
 
-        with mock.patch(
-            "prowler.providers.common.provider.Provider.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_provider()),
+        with (
+            mock.patch(
+                "prowler.providers.common.provider.Provider.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_provider(create_default_organization=False)
+                ),
+            ),
         ):
             # 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 (
@@ -163,15 +175,21 @@ def test_lambda_recorded_by_cloudtrail_classic_event_selector(self):
             Cloudtrail,
         )
 
-        with mock.patch(
-            "prowler.providers.common.provider.Provider.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_provider()),
+        with (
+            mock.patch(
+                "prowler.providers.common.provider.Provider.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_provider(create_default_organization=False)
+                ),
+            ),
         ):
             # 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 (
@@ -240,15 +258,21 @@ def test_lambda_recorded_by_cloudtrail_advanced_event_selector(self):
             Cloudtrail,
         )
 
-        with mock.patch(
-            "prowler.providers.common.provider.Provider.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_provider()),
+        with (
+            mock.patch(
+                "prowler.providers.common.provider.Provider.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_provider(create_default_organization=False)
+                ),
+            ),
         ):
             # 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 (
@@ -314,15 +338,21 @@ def test_all_lambdas_recorded_by_cloudtrail(self):
             Cloudtrail,
         )
 
-        with mock.patch(
-            "prowler.providers.common.provider.Provider.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_provider()),
+        with (
+            mock.patch(
+                "prowler.providers.common.provider.Provider.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_provider(create_default_organization=False)
+                ),
+            ),
         ):
             # 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 (

diff --git a/tests/providers/aws/services/awslambda/awslambda_service_test.py b/tests/providers/aws/services/awslambda/awslambda_service_test.py
@@ -241,7 +241,7 @@ def test_list_functions(self):
                 for function, function_code in awslambda._get_function_code():
                     if function.arn == lambda_arn_1 or function.arn == lambda_arn_2:
                         assert search(
-                            f"s3://awslambda-{function.region}-tasks.s3-{function.region}.amazonaws.com",
+                            f"https://awslambda-{function.region}-tasks.s3.{function.region}.amazonaws.com",
                             function_code.location,
                         )
                         assert function_code