localstack-core 4.7.1.dev49__py3-none-any.whl → 4.10.1.dev12__py3-none-any.whl

localstack/services/cloudformation/v2/types.py

@@ -13,20 +13,26 @@ class EngineParameter(TypedDict):
     given_value: NotRequired[str | None]
     resolved_value: NotRequired[str | None]
     default_value: NotRequired[str | None]
+    no_echo: NotRequired[bool | None]
 
 
 def engine_parameter_value(parameter: EngineParameter) -> str:
-    value = parameter.get("given_value") or parameter.get("default_value")
-    if value is None:
-        raise RuntimeError("Parameter value is None")
+    given_value = parameter.get("given_value")
+    if given_value is not None:
+        return given_value
 
-    return value
+    default_value = parameter.get("default_value")
+    if default_value is not None:
+        return default_value
+
+    raise RuntimeError("Parameter value is None")
 
 
 class ResolvedResource(TypedDict):
     LogicalResourceId: str
     Type: str
     Properties: dict
-    ResourceStatus: ResourceStatus
-    PhysicalResourceId: str | None
-    LastUpdatedTimestamp: datetime | None
+    LastUpdatedTimestamp: datetime
+    ResourceStatus: NotRequired[ResourceStatus]
+    PhysicalResourceId: NotRequired[str]
+    ResourceStatusReason: NotRequired[str]

localstack/services/cloudformation/v2/utils.py

@@ -2,4 +2,7 @@ from localstack import config
 
 
 def is_v2_engine() -> bool:
-    return config.SERVICE_PROVIDER_CONFIG.get_provider("cloudformation") == "engine-v2"
+    return config.SERVICE_PROVIDER_CONFIG.get_provider("cloudformation") not in {
+        "engine-legacy",
+        "engine-legacy_pro",
+    }

localstack/services/cloudwatch/alarm_scheduler.py

@@ -69,7 +69,10 @@ class AlarmScheduler:
         schedule_period = evaluation_periods * period
 
         def on_error(e):
-            LOG.exception("Error executing scheduled alarm", exc_info=e)
+            if LOG.isEnabledFor(logging.DEBUG):
+                LOG.exception("Error executing scheduled alarm", exc_info=e)
+            else:
+                LOG.error("Error executing scheduled alarm")
 
         task = self.scheduler.schedule(
             func=calculate_alarm_state,

localstack/services/cloudwatch/provider.py

@@ -1,11 +1,11 @@
 import json
 import logging
 import uuid
+from datetime import datetime
 from typing import Any
-from xml.sax.saxutils import escape
 
 from moto.cloudwatch import cloudwatch_backends
-from moto.cloudwatch.models import CloudWatchBackend, FakeAlarm, MetricDatum
+from moto.cloudwatch.models import Alarm, CloudWatchBackend, MetricDatum
 
 from localstack.aws.accounts import get_account_id_from_access_key_id
 from localstack.aws.api import CommonServiceException, RequestContext, handler
@@ -54,7 +54,7 @@ MOTO_INITIAL_UNCHECKED_REASON = "Unchecked: Initial alarm creation"
 LOG = logging.getLogger(__name__)
 
 
-@patch(target=FakeAlarm.update_state)
+@patch(target=Alarm.update_state)
 def update_state(target, self, reason, reason_data, state_value):
     if reason_data is None:
         reason_data = ""
@@ -127,9 +127,7 @@ def put_metric_alarm(
     threshold_metric_id: str | None = None,
     rule: str | None = None,
     tags: list[dict[str, str]] | None = None,
-) -> FakeAlarm:
-    if description:
-        description = escape(description)
+) -> Alarm:
     return target(
         self,
         name,
@@ -158,7 +156,7 @@ def put_metric_alarm(
     )
 
 
-def create_metric_data_query_from_alarm(alarm: FakeAlarm):
+def create_metric_data_query_from_alarm(alarm: Alarm):
     # TODO may need to be adapted for other use cases
     #  verified return value with a snapshot test
     return [
@@ -179,7 +177,7 @@ def create_metric_data_query_from_alarm(alarm: FakeAlarm):
 
 
 def create_message_response_update_state_lambda(
-    alarm: FakeAlarm, old_state, old_state_reason, old_state_timestamp
+    alarm: Alarm, old_state, old_state_reason, old_state_timestamp
 ):
     response = {
         "accountId": extract_account_id_from_arn(alarm.alarm_arn),
@@ -189,12 +187,12 @@ def create_message_response_update_state_lambda(
             "state": {
                 "value": alarm.state_value,
                 "reason": alarm.state_reason,
-                "timestamp": alarm.state_updated_timestamp,
+                "timestamp": _to_iso_8601_datetime_with_nanoseconds(alarm.state_updated_timestamp),
             },
             "previousState": {
                 "value": old_state,
                 "reason": old_state_reason,
-                "timestamp": old_state_timestamp,
+                "timestamp": _to_iso_8601_datetime_with_nanoseconds(old_state_timestamp),
             },
             "configuration": {
                 "description": alarm.description or "",
@@ -204,7 +202,7 @@ def create_message_response_update_state_lambda(
                 ),  # TODO: add test with metric_data_queries
             },
         },
-        "time": alarm.state_updated_timestamp,
+        "time": _to_iso_8601_datetime_with_nanoseconds(alarm.state_updated_timestamp),
         "region": alarm.region_name,
         "source": "aws.cloudwatch",
     }
@@ -217,10 +215,12 @@ def create_message_response_update_state_sns(alarm, old_state):
         "OldStateValue": old_state,
         "AlarmName": alarm.name,
         "AlarmDescription": alarm.description or "",
-        "AlarmConfigurationUpdatedTimestamp": alarm.configuration_updated_timestamp,
+        "AlarmConfigurationUpdatedTimestamp": _to_iso_8601_datetime_with_nanoseconds(
+            alarm.configuration_updated_timestamp
+        ),
         "NewStateValue": alarm.state_value,
         "NewStateReason": alarm.state_reason,
-        "StateChangeTime": alarm.state_updated_timestamp,
+        "StateChangeTime": _to_iso_8601_datetime_with_nanoseconds(alarm.state_updated_timestamp),
         # the long-name for 'region' should be used - as we don't have it, we use the short name
         # which needs to be slightly changed to make snapshot tests work
         "Region": alarm.region_name.replace("-", " ").capitalize(),
@@ -268,6 +268,11 @@ class ValidationError(CommonServiceException):
         super().__init__("ValidationError", message, 400, True)
 
 
+def _to_iso_8601_datetime_with_nanoseconds(date: datetime | None) -> str | None:
+    if date is not None:
+        return date.strftime("%Y-%m-%dT%H:%M:%S.%f000Z")
+
+
 def _set_alarm_actions(context, alarm_names, enabled):
     backend = cloudwatch_backends[context.account_id][context.region]
     for name in alarm_names:

localstack/services/cloudwatch/provider_v2.py

@@ -15,6 +15,7 @@ from localstack.aws.api.cloudwatch import (
     AlarmTypes,
     AmazonResourceName,
     CloudwatchApi,
+    ContributorId,
     DashboardBody,
     DashboardName,
     DashboardNamePrefix,
@@ -107,17 +108,11 @@ _STORE_LOCK = threading.RLock()
 AWS_MAX_DATAPOINTS_ACCEPTED: int = 1440
 
 
-class ValidationError(CommonServiceException):
-    # TODO: check this error against AWS (doesn't exist in the API)
+class ValidationException(CommonServiceException):
     def __init__(self, message: str):
         super().__init__("ValidationError", message, 400, True)
 
 
-class InvalidParameterCombination(CommonServiceException):
-    def __init__(self, message: str):
-        super().__init__("InvalidParameterCombination", message, 400, True)
-
-
 def _validate_parameters_for_put_metric_data(metric_data: MetricData) -> None:
     for index, metric_item in enumerate(metric_data):
         indexplusone = index + 1
@@ -245,7 +240,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         results: list[MetricDataResult] = []
         limit = max_datapoints or 100_800
         messages: MetricDataResultMessages = []
-        nxt = None
+        nxt: str | None = None
         label_additions = []
 
         for diff in LABEL_DIFFERENTIATORS:
@@ -279,14 +274,14 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             timestamp_value_dicts = [
                 {
                     "Timestamp": timestamp,
-                    "Value": value,
+                    "Value": float(value),
                 }
                 for timestamp, value in zip(timestamps, values, strict=False)
             ]
 
             pagination = PaginatedList(timestamp_value_dicts)
             timestamp_page, nxt = pagination.get_page(
-                lambda item: item.get("Timestamp"),
+                lambda item: str(item.get("Timestamp")),
                 next_token=next_token,
                 page_size=limit,
             )
@@ -314,6 +309,11 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         state_reason_data: StateReasonData = None,
         **kwargs,
     ) -> None:
+        if state_value not in ("OK", "ALARM", "INSUFFICIENT_DATA"):
+            raise ValidationException(
+                f"1 validation error detected: Value '{state_value}' at 'stateValue' failed to satisfy constraint: Member must satisfy enum value set: [INSUFFICIENT_DATA, ALARM, OK]"
+            )
+
         try:
             if state_reason_data:
                 state_reason_data = json.loads(state_reason_data)
@@ -332,10 +332,6 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
                 raise ResourceNotFound()
 
             old_state = alarm.alarm["StateValue"]
-            if state_value not in ("OK", "ALARM", "INSUFFICIENT_DATA"):
-                raise ValidationError(
-                    f"1 validation error detected: Value '{state_value}' at 'stateValue' failed to satisfy constraint: Member must satisfy enum value set: [INSUFFICIENT_DATA, ALARM, OK]"
-                )
 
             old_state_reason = alarm.alarm["StateReason"]
             old_state_update_timestamp = alarm.alarm["StateUpdatedTimestamp"]
@@ -415,7 +411,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             "ignore",
             "missing",
         ]:
-            raise ValidationError(
+            raise ValidationException(
                 f"The value {request['TreatMissingData']} is not supported for TreatMissingData parameter. Supported values are [breaching, notBreaching, ignore, missing]."
             )
             # do some sanity checks:
@@ -424,7 +420,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             value = request.get("Period")
             if value not in (10, 30):
                 if value % 60 != 0:
-                    raise ValidationError("Period must be 10, 30 or a multiple of 60")
+                    raise ValidationException("Period must be 10, 30 or a multiple of 60")
         if request.get("Statistic"):
             if request.get("Statistic") not in [
                 "SampleCount",
@@ -433,7 +429,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
                 "Minimum",
                 "Maximum",
             ]:
-                raise ValidationError(
+                raise ValidationException(
                     f"Value '{request.get('Statistic')}' at 'statistic' failed to satisfy constraint: Member must satisfy enum value set: [Maximum, SampleCount, Sum, Minimum, Average]"
                 )
 
@@ -447,7 +443,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             "evaluate",
             "ignore",
         ):
-            raise ValidationError(
+            raise ValidationException(
                 f"Option {evaluate_low_sample_count_percentile} is not supported. "
                 "Supported options for parameter EvaluateLowSampleCountPercentile are evaluate and ignore."
             )
@@ -690,7 +686,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         expected_datapoints = (end_time_unix - start_time_unix) / period
 
         if expected_datapoints > AWS_MAX_DATAPOINTS_ACCEPTED:
-            raise InvalidParameterCombination(
+            raise InvalidParameterCombinationException(
                 f"You have requested up to {int(expected_datapoints)} datapoints, which exceeds the limit of {AWS_MAX_DATAPOINTS_ACCEPTED}. "
                 f"You may reduce the datapoints requested by increasing Period, or decreasing the time range."
             )
@@ -737,7 +733,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
                 for i, timestamp in enumerate(timestamps):
                     stat_datapoints.setdefault(selected_unit, {})
                     stat_datapoints[selected_unit].setdefault(timestamp, {})
-                    stat_datapoints[selected_unit][timestamp][stat] = values[i]
+                    stat_datapoints[selected_unit][timestamp][stat] = float(values[i])
                     stat_datapoints[selected_unit][timestamp]["Unit"] = selected_unit
 
         datapoints: list[Datapoint] = []
@@ -822,14 +818,15 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
     def describe_alarm_history(
         self,
         context: RequestContext,
-        alarm_name: AlarmName = None,
-        alarm_types: AlarmTypes = None,
-        history_item_type: HistoryItemType = None,
-        start_date: Timestamp = None,
-        end_date: Timestamp = None,
-        max_records: MaxRecords = None,
-        next_token: NextToken = None,
-        scan_by: ScanBy = None,
+        alarm_name: AlarmName | None = None,
+        alarm_contributor_id: ContributorId | None = None,
+        alarm_types: AlarmTypes | None = None,
+        history_item_type: HistoryItemType | None = None,
+        start_date: Timestamp | None = None,
+        end_date: Timestamp | None = None,
+        max_records: MaxRecords | None = None,
+        next_token: NextToken | None = None,
+        scan_by: ScanBy | None = None,
         **kwargs,
     ) -> DescribeAlarmHistoryOutput:
         store = self.get_store(context.account_id, context.region)

localstack/services/dynamodb/packages.py

@@ -17,7 +17,8 @@ from localstack.utils.run import run
 DDB_AGENT_JAR_URL = f"{ARTIFACTS_REPO}/raw/e4e8c8e294b1fcda90c678ff6af5d5ebe1f091eb/dynamodb-local-patch/target/ddb-local-loader-0.2.jar"
 JAVASSIST_JAR_URL = f"{MAVEN_REPO_URL}/org/javassist/javassist/3.30.2-GA/javassist-3.30.2-GA.jar"
 
-DDBLOCAL_URL = "https://d1ni2b6xgvw0s0.cloudfront.net/v3.x/dynamodb_local_latest.zip"
+# URL points to 2.x here - however the latest 3.x builds are available under this URL
+DDBLOCAL_URL = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_latest.zip"
 
 
 class DynamoDBLocalPackage(Package):

localstack/services/dynamodb/provider.py

@@ -47,6 +47,8 @@ from localstack.aws.api.dynamodb import (
     DeleteRequest,
     DeleteTableOutput,
     DescribeContinuousBackupsOutput,
+    DescribeContributorInsightsInput,
+    DescribeContributorInsightsOutput,
     DescribeGlobalTableOutput,
     DescribeKinesisStreamingDestinationOutput,
     DescribeTableOutput,
@@ -746,6 +748,9 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
             if "NumberOfDecreasesToday" not in table_description["ProvisionedThroughput"]:
                 table_description["ProvisionedThroughput"]["NumberOfDecreasesToday"] = 0
 
+        if "WarmThroughput" in table_description:
+            table_description["WarmThroughput"]["Status"] = "UPDATING"
+
         tags = table_definitions.pop("Tags", [])
         if tags:
             get_store(context.account_id, context.region).TABLE_TAGS[table_arn] = {
@@ -763,6 +768,13 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
     ) -> DeleteTableOutput:
         global_table_region = self.get_global_table_region(context, table_name)
 
+        self.ensure_table_exists(
+            context.account_id,
+            global_table_region,
+            table_name,
+            error_message=f"Requested resource not found: Table: {table_name} not found",
+        )
+
         # Limitation note: On AWS, for a replicated table, if the source table is deleted, the replicated tables continue to exist.
         # This is not the case for LocalStack, where all replicated tables will also be removed if source is deleted.
 
@@ -823,6 +835,9 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
                 table_description["TableClassSummary"] = {
                     "TableClass": table_definitions["TableClass"]
                 }
+            if warm_throughput := table_definitions.get("WarmThroughput"):
+                table_description["WarmThroughput"] = warm_throughput.copy()
+                table_description["WarmThroughput"].setdefault("Status", "ACTIVE")
 
         if "GlobalSecondaryIndexes" in table_description:
             for gsi in table_description["GlobalSecondaryIndexes"]:
@@ -835,6 +850,17 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
                 # Terraform depends on this parity for update operations
                 gsi["ProvisionedThroughput"] = default_values | gsi.get("ProvisionedThroughput", {})
 
+        # Set defaults for warm throughput
+        if "WarmThroughput" not in table_description:
+            billing_mode = table_definitions.get("BillingMode") if table_definitions else None
+            table_description["WarmThroughput"] = {
+                "ReadUnitsPerSecond": 12000 if billing_mode == "PAY_PER_REQUEST" else 5,
+                "WriteUnitsPerSecond": 4000 if billing_mode == "PAY_PER_REQUEST" else 5,
+            }
+        table_description["WarmThroughput"]["Status"] = (
+            table_description.get("TableStatus") or "ACTIVE"
+        )
+
         return DescribeTableOutput(
             Table=select_from_typed_dict(TableDescription, table_description)
         )
@@ -955,6 +981,22 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
 
         return response
 
+    #
+    # Contributor Insights
+    #
+
+    @handler("DescribeContributorInsights", expand=False)
+    def describe_contributor_insights(
+        self,
+        context: RequestContext,
+        describe_contributor_insights_input: DescribeContributorInsightsInput,
+    ) -> DescribeContributorInsightsOutput:
+        return DescribeContributorInsightsOutput(
+            TableName=describe_contributor_insights_input["TableName"],
+            IndexName=describe_contributor_insights_input.get("IndexName"),
+            ContributorInsightsStatus="DISABLED",
+        )
+
     #
     # Item ops
     #

localstack/services/dynamodb/server.py

@@ -162,7 +162,7 @@ class DynamodbServer(Server):
         cmd = [
             "java",
             *self._get_java_vm_options(),
-            "-Xmx%s" % self.heap_size,
+            f"-Xmx{self.heap_size}",
             f"-javaagent:{dynamodblocal_package.get_installer().get_ddb_agent_jar_path()}",
             f"-Djava.library.path={self.library_path}",
             "-jar",
@@ -219,7 +219,7 @@ class DynamodbServer(Server):
                 aws_secret_access_key=DEFAULT_AWS_ACCOUNT_ID,
             ).dynamodb.list_tables()
         except Exception:
-            LOG.exception("DynamoDB health check failed")
+            LOG.error("DynamoDB health check failed", exc_info=LOG.isEnabledFor(logging.DEBUG))
         if expect_shutdown:
             assert out is None
         else:

localstack/services/dynamodb/v2/provider.py

@@ -40,6 +40,8 @@ from localstack.aws.api.dynamodb import (
     DeleteRequest,
     DeleteTableOutput,
     DescribeContinuousBackupsOutput,
+    DescribeContributorInsightsInput,
+    DescribeContributorInsightsOutput,
     DescribeGlobalTableOutput,
     DescribeKinesisStreamingDestinationOutput,
     DescribeTableOutput,
@@ -558,6 +560,9 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
             if "NumberOfDecreasesToday" not in table_description["ProvisionedThroughput"]:
                 table_description["ProvisionedThroughput"]["NumberOfDecreasesToday"] = 0
 
+        if "WarmThroughput" in table_description:
+            table_description["WarmThroughput"]["Status"] = "UPDATING"
+
         tags = table_definitions.pop("Tags", [])
         if tags:
             get_store(context.account_id, context.region).TABLE_TAGS[table_arn] = {
@@ -575,6 +580,13 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
     ) -> DeleteTableOutput:
         global_table_region = self.get_global_table_region(context, table_name)
 
+        self.ensure_table_exists(
+            context.account_id,
+            global_table_region,
+            table_name,
+            error_message=f"Requested resource not found: Table: {table_name} not found",
+        )
+
         # Limitation note: On AWS, for a replicated table, if the source table is deleted, the replicated tables continue to exist.
         # This is not the case for LocalStack, where all replicated tables will also be removed if source is deleted.
 
@@ -634,6 +646,9 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
                 table_description["TableClassSummary"] = {
                     "TableClass": table_definitions["TableClass"]
                 }
+            if warm_throughput := table_definitions.get("WarmThroughput"):
+                table_description["WarmThroughput"] = warm_throughput.copy()
+                table_description["WarmThroughput"].setdefault("Status", "ACTIVE")
 
         if "GlobalSecondaryIndexes" in table_description:
             for gsi in table_description["GlobalSecondaryIndexes"]:
@@ -646,6 +661,17 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
                 # Terraform depends on this parity for update operations
                 gsi["ProvisionedThroughput"] = default_values | gsi.get("ProvisionedThroughput", {})
 
+        # Set defaults for warm throughput
+        if "WarmThroughput" not in table_description:
+            billing_mode = table_definitions.get("BillingMode") if table_definitions else None
+            table_description["WarmThroughput"] = {
+                "ReadUnitsPerSecond": 12000 if billing_mode == "PAY_PER_REQUEST" else 5,
+                "WriteUnitsPerSecond": 4000 if billing_mode == "PAY_PER_REQUEST" else 5,
+            }
+        table_description["WarmThroughput"]["Status"] = (
+            table_description.get("TableStatus") or "ACTIVE"
+        )
+
         return DescribeTableOutput(
             Table=select_from_typed_dict(TableDescription, table_description)
         )
@@ -757,6 +783,22 @@ class DynamoDBProvider(DynamodbApi, ServiceLifecycleHook):
 
         return response
 
+    #
+    # Contributor Insights
+    #
+
+    @handler("DescribeContributorInsights", expand=False)
+    def describe_contributor_insights(
+        self,
+        context: RequestContext,
+        describe_contributor_insights_input: DescribeContributorInsightsInput,
+    ) -> DescribeContributorInsightsOutput:
+        return DescribeContributorInsightsOutput(
+            TableName=describe_contributor_insights_input["TableName"],
+            IndexName=describe_contributor_insights_input.get("IndexName"),
+            ContributorInsightsStatus="DISABLED",
+        )
+
     #
     # Item ops
     #

localstack/services/ecr/resource_providers/aws_ecr_repository.py

@@ -6,7 +6,6 @@ from pathlib import Path
 from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
-from localstack.constants import AWS_REGION_US_EAST_1, DEFAULT_AWS_ACCOUNT_ID
 from localstack.services.cloudformation.resource_provider import (
     OperationStatus,
     ProgressEvent,
@@ -90,6 +89,10 @@ class ECRRepositoryProvider(ResourceProvider[ECRRepositoryProperties]):
 
         """
         model = request.desired_state
+        model["RepositoryName"] = (
+            model.get("RepositoryName")
+            or util.generate_default_name(request.stack_name, request.logical_resource_id).lower()
+        )
 
         default_repos_per_stack[request.stack_name] = model["RepositoryName"]
         LOG.warning(
@@ -98,7 +101,7 @@ class ECRRepositoryProvider(ResourceProvider[ECRRepositoryProperties]):
         model.update(
             {
                 "Arn": arns.ecr_repository_arn(
-                    model["RepositoryName"], DEFAULT_AWS_ACCOUNT_ID, AWS_REGION_US_EAST_1
+                    model["RepositoryName"], request.account_id, request.region_name
                 ),
                 "RepositoryUri": "http://localhost:4566",
                 "ImageTagMutability": "MUTABLE",

localstack/services/edge.py

@@ -72,7 +72,7 @@ def start_component(
                 default_port=constants.DEFAULT_PORT_EDGE,
             ),
         )
-    raise Exception("Unexpected component name '%s' received during start up" % component)
+    raise Exception(f"Unexpected component name '{component}' received during start up")
 
 
 def start_proxy(

localstack/services/es/provider.py

@@ -3,7 +3,6 @@ from typing import cast
 
 from botocore.exceptions import ClientError
 
-from localstack import constants
 from localstack.aws.api import RequestContext, handler
 from localstack.aws.api.es import (
     ARN,
@@ -68,6 +67,7 @@ from localstack.aws.api.opensearch import (
     VersionString,
 )
 from localstack.aws.connect import connect_to
+from localstack.services.opensearch.packages import ELASTICSEARCH_DEFAULT_VERSION
 
 
 def _version_to_opensearch(
@@ -236,7 +236,7 @@ class EsProvider(EsApi):
         engine_version = (
             _version_to_opensearch(elasticsearch_version)
             if elasticsearch_version
-            else constants.ELASTICSEARCH_DEFAULT_VERSION
+            else ELASTICSEARCH_DEFAULT_VERSION
         )
         kwargs = {
             "DomainName": domain_name,

localstack/services/events/event_rule_engine.py

@@ -59,14 +59,21 @@ class EventRuleEngine:
             for flat_pattern in flat_pattern_conditions
         )
 
-    def _evaluate_condition(self, value, condition, field_exists: bool):
+    def _evaluate_condition(self, value: t.Any, condition: t.Any, field_exists: bool) -> bool:
         if not isinstance(condition, dict):
             return field_exists and value == condition
+
         elif (must_exist := condition.get("exists")) is not None:
             # if must_exists is True then field_exists must be True
             # if must_exists is False then fields_exists must be False
             return must_exist == field_exists
+
         elif (anything_but := condition.get("anything-but")) is not None:
+            if not field_exists:
+                # anything-but can handle None `value`, but it needs to differentiate between user-set `null` and
+                # missing value
+                return False
+
             if isinstance(anything_but, dict):
                 if (not_condition := anything_but.get("prefix")) is not None:
                     predicate = self._evaluate_prefix
@@ -95,6 +102,7 @@ class EventRuleEngine:
         elif value is None:
             # the remaining conditions require the value to not be None
             return False
+
         elif (prefix := condition.get("prefix")) is not None:
             if isinstance(prefix, dict):
                 if (prefix_equal_ignore_case := prefix.get("equals-ignore-case")) is not None:
@@ -104,7 +112,7 @@ class EventRuleEngine:
 
         elif (suffix := condition.get("suffix")) is not None:
             if isinstance(suffix, dict):
-                if suffix_equal_ignore_case := suffix.get("equals-ignore-case"):
+                if (suffix_equal_ignore_case := suffix.get("equals-ignore-case")) is not None:
                     return self._evaluate_suffix(suffix_equal_ignore_case.lower(), value.lower())
             else:
                 return self._evaluate_suffix(suffix, value)
@@ -126,19 +134,19 @@ class EventRuleEngine:
         return False
 
     @staticmethod
-    def _evaluate_prefix(condition: str | list, value: str) -> bool:
-        return value.startswith(condition)
+    def _evaluate_prefix(condition: str | list, value: t.Any) -> bool:
+        return isinstance(value, str) and value.startswith(condition)
 
     @staticmethod
-    def _evaluate_suffix(condition: str | list, value: str) -> bool:
-        return value.endswith(condition)
+    def _evaluate_suffix(condition: str | list, value: t.Any) -> bool:
+        return isinstance(value, str) and value.endswith(condition)
 
     @staticmethod
-    def _evaluate_equal_ignore_case(condition: str, value: str) -> bool:
-        return condition.lower() == value.lower()
+    def _evaluate_equal_ignore_case(condition: str, value: t.Any) -> bool:
+        return isinstance(value, str) and condition.lower() == value.lower()
 
     @staticmethod
-    def _evaluate_cidr(condition: str, value: str) -> bool:
+    def _evaluate_cidr(condition: str, value: t.Any) -> bool:
         try:
             ip = ipaddress.ip_address(value)
             return ip in ipaddress.ip_network(condition)
@@ -146,8 +154,10 @@ class EventRuleEngine:
             return False
 
     @staticmethod
-    def _evaluate_wildcard(condition: str, value: str) -> bool:
-        return bool(re.match(re.escape(condition).replace("\\*", ".+") + "$", value))
+    def _evaluate_wildcard(condition: str, value: t.Any) -> bool:
+        return isinstance(value, str) and bool(
+            re.match(re.escape(condition).replace("\\*", ".+") + "$", value)
+        )
 
     @staticmethod
     def _evaluate_numeric_condition(conditions: list, value: t.Any) -> bool:
@@ -457,10 +467,18 @@ class EventPatternCompiler:
                     return
 
                 elif operator == "anything-but":
-                    # anything-but can actually contain any kind of simple rule (str, number, and list)
+                    # anything-but can actually contain any kind of simple rule (str, number, and list) except Null
+                    if value is None:
+                        raise InvalidEventPatternException(
+                            f"{self.error_prefix}Value of anything-but must be an array or single string/number value."
+                        )
                     if isinstance(value, list):
                         for v in value:
-                            self._validate_rule(v)
+                            if v is None:
+                                raise InvalidEventPatternException(
+                                    f"{self.error_prefix}Inside anything but list, start|null|boolean is not supported."
+                                )
+                            self._validate_rule(v, from_="anything-but")
 
                         return