update api-dependencies and check cloudwatch/logs enabled (#9576)

steffyP · web-flow · commit d4933e0a0bfc · 2023-11-13T14:13:36.000+01:00
diff --git a/localstack/services/lambda_/event_source_listeners/event_source_listener.py b/localstack/services/lambda_/event_source_listeners/event_source_listener.py
@@ -1,12 +1,16 @@
+import logging
 from typing import Dict, Optional, Type
 
 from localstack.services.lambda_.event_source_listeners.adapters import (
     EventSourceAdapter,
     EventSourceAsfAdapter,
 )
 from localstack.services.lambda_.invocation.lambda_service import LambdaService
+from localstack.utils.bootstrap import is_api_enabled
 from localstack.utils.objects import SubtypesInstanceManager
 
+LOG = logging.getLogger(__name__)
+
 
 class EventSourceListener(SubtypesInstanceManager):
     INSTANCES: Dict[str, "EventSourceListener"] = {}
@@ -40,6 +44,12 @@ def start_listeners_for_asf(event_source_mapping: Dict, lambda_service: LambdaSe
             )
             if self_managed_endpoints.get("KAFKA_BOOTSTRAP_SERVERS"):
                 service_type = "kafka"
+        elif not is_api_enabled(service_type):
+            LOG.info(
+                "Service %s is not enabled, cannot enable event-source-mapping. Please check your 'SERVICES' configuration variable.",
+                service_type,
+            )
+            return
         instance = EventSourceListener.get(service_type, raise_if_missing=False)
         if instance:
             instance.start(EventSourceAsfAdapter(lambda_service))
diff --git a/localstack/services/lambda_/invocation/logs.py b/localstack/services/lambda_/invocation/logs.py
@@ -6,6 +6,7 @@
 
 from localstack.aws.connect import connect_to
 from localstack.utils.aws.client_types import ServicePrincipal
+from localstack.utils.bootstrap import is_api_enabled
 from localstack.utils.cloudwatch.cloudwatch_util import store_cloudwatch_logs
 from localstack.utils.threads import FuncThread
 
@@ -62,10 +63,15 @@ def run_log_loop(self, *args, **kwargs) -> None:
                 )
 
     def start_subscriber(self) -> None:
+        if not is_api_enabled("logs"):
+            LOG.debug("Service 'logs' is disabled, not storing any logs for lambda executions")
+            return
         self._thread = FuncThread(self.run_log_loop, name="log_handler")
         self._thread.start()
 
     def add_logs(self, log_item: LogItem) -> None:
+        if not is_api_enabled("logs"):
+            return
         self.log_queue.put(log_item)
 
     def stop(self) -> None:
diff --git a/localstack/services/lambda_/provider.py b/localstack/services/lambda_/provider.py
@@ -188,6 +188,7 @@
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.state import StateVisitor
 from localstack.utils.aws.arns import extract_service_from_arn
+from localstack.utils.bootstrap import is_api_enabled
 from localstack.utils.collections import PaginatedList
 from localstack.utils.files import load_file
 from localstack.utils.strings import get_random_hex, long_uid, short_uid, to_bytes, to_str
@@ -393,7 +394,7 @@ def _build_vpc_config(
         region_name: str,
         vpc_config: Optional[dict] = None,
     ) -> VpcConfig | None:
-        if not vpc_config:
+        if not vpc_config or not is_api_enabled("ec2"):
             return None
 
         subnet_ids = vpc_config.get("SubnetIds", [])
diff --git a/localstack/services/logs/provider.py b/localstack/services/logs/provider.py
@@ -41,6 +41,7 @@
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.utils.aws import arns
 from localstack.utils.aws.arns import extract_region_from_arn
+from localstack.utils.bootstrap import is_api_enabled
 from localstack.utils.common import is_number
 from localstack.utils.patch import patch
 
@@ -61,7 +62,7 @@ def put_log_events(
         sequence_token: SequenceToken = None,
     ) -> PutLogEventsResponse:
         logs_backend = get_moto_logs_backend(context.account_id, context.region)
-        metric_filters = logs_backend.filters.metric_filters
+        metric_filters = logs_backend.filters.metric_filters if is_api_enabled("cloudwatch") else []
         for metric_filter in metric_filters:
             pattern = metric_filter.get("filterPattern", "")
             transformations = metric_filter.get("metricTransformations", [])
diff --git a/localstack/utils/bootstrap.py b/localstack/utils/bootstrap.py
@@ -46,8 +46,7 @@
     "dynamodb": ["dynamodbstreams"],
     "dynamodbstreams": ["kinesis"],
     "es": ["opensearch"],
-    "lambda": ["logs", "cloudwatch", "s3", "sqs"],
-    "kinesis": ["dynamodb"],
+    "lambda": ["s3", "sqs", "sts"],
     "firehose": ["kinesis"],
 }
 # composites define an abstract name like "serverless" that maps to a set of services
diff --git a/localstack/utils/cloudwatch/cloudwatch_util.py b/localstack/utils/cloudwatch/cloudwatch_util.py
@@ -5,8 +5,8 @@
 
 from werkzeug import Response as WerkzeugResponse
 
-from localstack import config
 from localstack.aws.connect import connect_to
+from localstack.utils.bootstrap import is_api_enabled
 from localstack.utils.strings import to_str
 from localstack.utils.time import now_utc
 
@@ -25,7 +25,7 @@ def dimension_lambda(kwargs):
 
 def publish_lambda_metric(metric, value, kwargs, region_name: Optional[str] = None):
     # publish metric only if CloudWatch service is available
-    if not config.service_port("cloudwatch"):
+    if not is_api_enabled("cloudwatch"):
         return
     cw_client = connect_to(region_name=region_name).cloudwatch
     try:
@@ -62,6 +62,8 @@ def publish_sqs_metric(
     :param value The value of the metric data, default: 1
     :param unit The unit of the metric data, default: "Count"
     """
+    if not is_api_enabled("cloudwatch"):
+        return
     cw_client = connect_to(region_name=region, aws_access_key_id=account_id).cloudwatch
     try:
         cw_client.put_metric_data(
@@ -104,6 +106,8 @@ def store_cloudwatch_logs(
     start_time=None,
     auto_create_group: Optional[bool] = True,
 ):
+    if not is_api_enabled("logs"):
+        return
     start_time = start_time or int(time.time() * 1000)
     log_output = to_str(log_output)
 
diff --git a/tests/unit/utils/test_bootstrap.py b/tests/unit/utils/test_bootstrap.py
@@ -156,18 +156,17 @@ def test_resolve_meta(self):
         with temporary_env({"SERVICES": "es,lambda", "STRICT_SERVICE_LOADING": "1"}):
             result = get_enabled_apis()
 
-        assert len(result) == 7
+        assert len(result) == 6
         assert result == {
             # directly given
             "lambda",
             "es",
             # a dependency of es
             "opensearch",
-            # lambda has internal dependencies on s3, sqs, logs and cloudwatch
+            # lambda has internal dependencies on s3, sqs, and sts
             "s3",
             "sqs",
-            "logs",
-            "cloudwatch",
+            "sts",
         }
 
 
