localstack-core 4.6.1.dev60__py3-none-any.whl → 4.10.1.dev12__py3-none-any.whl

localstack/services/cloudformation/v2/types.py

@@ -0,0 +1,38 @@
+from datetime import datetime
+from typing import NotRequired, TypedDict
+
+from localstack.aws.api.cloudformation import ResourceStatus
+
+
+class EngineParameter(TypedDict):
+    """
+    Parameters supplied by the user. The resolved value field is populated by the engine
+    """
+
+    type_: str
+    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:
+    given_value = parameter.get("given_value")
+    if given_value is not None:
+        return given_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
+    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

@@ -2,8 +2,8 @@ import json
 import logging
 import math
 import threading
-from datetime import datetime, timedelta, timezone
-from typing import TYPE_CHECKING, List, Optional
+from datetime import UTC, datetime, timedelta
+from typing import TYPE_CHECKING
 
 from localstack.aws.api.cloudwatch import MetricAlarm, MetricDataQuery, MetricStat, StateValue
 from localstack.aws.connect import connect_to
@@ -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,
@@ -120,7 +123,7 @@ class AlarmScheduler:
         return True
 
 
-def get_metric_alarm_details_for_alarm_arn(alarm_arn: str) -> Optional[MetricAlarm]:
+def get_metric_alarm_details_for_alarm_arn(alarm_arn: str) -> MetricAlarm | None:
     alarm_name = arns.extract_resource_from_arn(alarm_arn).split(":", 1)[1]
     client = get_cloudwatch_client_for_region_of_alarm(alarm_arn)
     metric_alarms = client.describe_alarms(AlarmNames=[alarm_name])["MetricAlarms"]
@@ -155,7 +158,7 @@ def generate_metric_query(alarm_details: MetricAlarm) -> MetricDataQuery:
     )
 
 
-def is_threshold_exceeded(metric_values: List[float], alarm_details: MetricAlarm) -> bool:
+def is_threshold_exceeded(metric_values: list[float], alarm_details: MetricAlarm) -> bool:
     """Evaluates if the threshold is exceeded for the configured alarm and given metric values
 
     :param metric_values: values to compare against threshold
@@ -185,7 +188,7 @@ def is_threshold_exceeded(metric_values: List[float], alarm_details: MetricAlarm
     return False
 
 
-def is_triggering_premature_alarm(metric_values: List[float], alarm_details: MetricAlarm) -> bool:
+def is_triggering_premature_alarm(metric_values: list[float], alarm_details: MetricAlarm) -> bool:
     """
     Checks if a premature alarm should be triggered.
     https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#CloudWatch-alarms-avoiding-premature-transition:
@@ -217,7 +220,7 @@ def is_triggering_premature_alarm(metric_values: List[float], alarm_details: Met
     return False
 
 
-def collect_metric_data(alarm_details: MetricAlarm, client: "CloudWatchClient") -> List[float]:
+def collect_metric_data(alarm_details: MetricAlarm, client: "CloudWatchClient") -> list[float]:
     """
     Collects the metric data for the evaluation interval.
 
@@ -236,7 +239,7 @@ def collect_metric_data(alarm_details: MetricAlarm, client: "CloudWatchClient")
     magic_number = max(math.floor(evaluation_periods / 3), 2)
     collected_periods = evaluation_periods + magic_number
 
-    now = datetime.utcnow().replace(tzinfo=timezone.utc)
+    now = datetime.utcnow().replace(tzinfo=UTC)
     metric_query = generate_metric_query(alarm_details)
 
     # get_metric_data needs to be run in a loop, so we also collect empty data points on the right position

localstack/services/cloudwatch/cloudwatch_database_helper.py

@@ -2,8 +2,7 @@ import logging
 import os
 import sqlite3
 import threading
-from datetime import datetime, timezone
-from typing import Dict, List, Optional
+from datetime import UTC, datetime
 
 from localstack import config
 from localstack.aws.api.cloudwatch import MetricData, MetricDataQuery, ScanBy
@@ -92,7 +91,7 @@ class CloudwatchDatabase:
         self, account_id: str, region: str, namespace: str, metric_data: MetricData
     ):
         def _get_current_unix_timestamp_utc():
-            now = datetime.utcnow().replace(tzinfo=timezone.utc)
+            now = datetime.utcnow().replace(tzinfo=UTC)
             return int(now.timestamp())
 
         for metric in metric_data:
@@ -218,7 +217,7 @@ class CloudwatchDatabase:
         start_time: datetime,
         end_time: datetime,
         scan_by: str,
-    ) -> Dict[str, List]:
+    ) -> dict[str, list]:
         metric_stat = query.get("MetricStat")
         metric = metric_stat.get("Metric")
         period = metric_stat.get("Period")
@@ -389,7 +388,7 @@ class CloudwatchDatabase:
             cur.execute("VACUUM")
             conn.commit()
 
-    def _get_ordered_dimensions_with_separator(self, dims: Optional[List[Dict]], for_search=False):
+    def _get_ordered_dimensions_with_separator(self, dims: list[dict] | None, for_search=False):
         """
         Returns a string with the dimensions in the format "Name=Value\tName=Value\tName=Value" in order to store the metric
         with the dimensions in a single column in the database

localstack/services/cloudwatch/models.py

@@ -1,6 +1,4 @@
 import datetime
-from datetime import timezone
-from typing import Dict, List
 
 from localstack.aws.api.cloudwatch import CompositeAlarm, DashboardBody, MetricAlarm, StateValue
 from localstack.services.stores import (
@@ -25,7 +23,7 @@ class LocalStackMetricAlarm:
         self.set_default_attributes()
 
     def set_default_attributes(self):
-        current_time = datetime.datetime.now(timezone.utc)
+        current_time = datetime.datetime.now(datetime.UTC)
         self.alarm["AlarmArn"] = arns.cloudwatch_alarm_arn(
             self.alarm["AlarmName"], account_id=self.account_id, region_name=self.region
         )
@@ -53,7 +51,7 @@ class LocalStackCompositeAlarm:
         self.set_default_attributes()
 
     def set_default_attributes(self):
-        current_time = datetime.datetime.now(timezone.utc)
+        current_time = datetime.datetime.now(datetime.UTC)
         self.alarm["AlarmArn"] = arns.cloudwatch_alarm_arn(
             self.alarm["AlarmName"], account_id=self.account_id, region_name=self.region
         )
@@ -97,13 +95,13 @@ class CloudWatchStore(BaseStore):
     TAGS: TaggingService = CrossRegionAttribute(default=TaggingService)
 
     # maps resource ARN to alarms
-    alarms: Dict[str, LocalStackAlarm] = LocalAttribute(default=dict)
+    alarms: dict[str, LocalStackAlarm] = LocalAttribute(default=dict)
 
     # Contains all the Alarm Histories. Per documentation, an alarm history is retained even if the alarm is deleted,
     # making it necessary to save this at store level
-    histories: List[Dict] = LocalAttribute(default=list)
+    histories: list[dict] = LocalAttribute(default=list)
 
-    dashboards: Dict[str, LocalStackDashboard] = LocalAttribute(default=dict)
+    dashboards: dict[str, LocalStackDashboard] = LocalAttribute(default=dict)
 
 
 cloudwatch_stores = AccountRegionBundle("cloudwatch", CloudWatchStore)

localstack/services/cloudwatch/provider.py

@@ -1,11 +1,11 @@
 import json
 import logging
 import uuid
-from typing import Any, Optional
-from xml.sax.saxutils import escape
+from datetime import datetime
+from typing import Any
 
 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 = ""
@@ -115,21 +115,19 @@ def put_metric_alarm(
     description: str,
     dimensions: list[dict[str, str]],
     alarm_actions: list[str],
-    metric_data_queries: Optional[list[Any]] = None,
-    datapoints_to_alarm: Optional[int] = None,
-    extended_statistic: Optional[str] = None,
-    ok_actions: Optional[list[str]] = None,
-    insufficient_data_actions: Optional[list[str]] = None,
-    unit: Optional[str] = None,
+    metric_data_queries: list[Any] | None = None,
+    datapoints_to_alarm: int | None = None,
+    extended_statistic: str | None = None,
+    ok_actions: list[str] | None = None,
+    insufficient_data_actions: list[str] | None = None,
+    unit: str | None = None,
     actions_enabled: bool = True,
-    treat_missing_data: Optional[str] = None,
-    evaluate_low_sample_count_percentile: Optional[str] = None,
-    threshold_metric_id: Optional[str] = None,
-    rule: Optional[str] = None,
-    tags: Optional[list[dict[str, str]]] = None,
-) -> FakeAlarm:
-    if description:
-        description = escape(description)
+    treat_missing_data: str | None = None,
+    evaluate_low_sample_count_percentile: str | None = None,
+    threshold_metric_id: str | None = None,
+    rule: str | None = None,
+    tags: list[dict[str, str]] | None = None,
+) -> 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

@@ -4,8 +4,6 @@ import logging
 import re
 import threading
 import uuid
-from datetime import timezone
-from typing import List
 
 from localstack.aws.api import CommonServiceException, RequestContext, handler
 from localstack.aws.api.cloudwatch import (
@@ -17,6 +15,7 @@ from localstack.aws.api.cloudwatch import (
     AlarmTypes,
     AmazonResourceName,
     CloudwatchApi,
+    ContributorId,
     DashboardBody,
     DashboardName,
     DashboardNamePrefix,
@@ -109,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
@@ -244,10 +237,10 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         label_options: LabelOptions = None,
         **kwargs,
     ) -> GetMetricDataOutput:
-        results: List[MetricDataResult] = []
+        results: list[MetricDataResult] = []
         limit = max_datapoints or 100_800
         messages: MetricDataResultMessages = []
-        nxt = None
+        nxt: str | None = None
         label_additions = []
 
         for diff in LABEL_DIFFERENTIATORS:
@@ -281,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,
             )
@@ -316,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)
@@ -334,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"]
@@ -345,7 +339,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             if old_state == state_value:
                 return
 
-            alarm.alarm["StateTransitionedTimestamp"] = datetime.datetime.now(timezone.utc)
+            alarm.alarm["StateTransitionedTimestamp"] = datetime.datetime.now(datetime.UTC)
             # update startDate (=last ALARM date) - should only update when a new alarm is triggered
             # the date is only updated if we have a reason-data, which is set by an alarm
             if state_reason_data:
@@ -417,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:
@@ -426,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",
@@ -435,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]"
                 )
 
@@ -449,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."
             )
@@ -692,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."
             )
@@ -739,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] = []
@@ -824,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/cloudwatch/resource_providers/aws_cloudwatch_alarm.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,57 +14,57 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class CloudWatchAlarmProperties(TypedDict):
-    ComparisonOperator: Optional[str]
-    EvaluationPeriods: Optional[int]
-    ActionsEnabled: Optional[bool]
-    AlarmActions: Optional[list[str]]
-    AlarmDescription: Optional[str]
-    AlarmName: Optional[str]
-    Arn: Optional[str]
-    DatapointsToAlarm: Optional[int]
-    Dimensions: Optional[list[Dimension]]
-    EvaluateLowSampleCountPercentile: Optional[str]
-    ExtendedStatistic: Optional[str]
-    Id: Optional[str]
-    InsufficientDataActions: Optional[list[str]]
-    MetricName: Optional[str]
-    Metrics: Optional[list[MetricDataQuery]]
-    Namespace: Optional[str]
-    OKActions: Optional[list[str]]
-    Period: Optional[int]
-    Statistic: Optional[str]
-    Threshold: Optional[float]
-    ThresholdMetricId: Optional[str]
-    TreatMissingData: Optional[str]
-    Unit: Optional[str]
+    ComparisonOperator: str | None
+    EvaluationPeriods: int | None
+    ActionsEnabled: bool | None
+    AlarmActions: list[str] | None
+    AlarmDescription: str | None
+    AlarmName: str | None
+    Arn: str | None
+    DatapointsToAlarm: int | None
+    Dimensions: list[Dimension] | None
+    EvaluateLowSampleCountPercentile: str | None
+    ExtendedStatistic: str | None
+    Id: str | None
+    InsufficientDataActions: list[str] | None
+    MetricName: str | None
+    Metrics: list[MetricDataQuery] | None
+    Namespace: str | None
+    OKActions: list[str] | None
+    Period: int | None
+    Statistic: str | None
+    Threshold: float | None
+    ThresholdMetricId: str | None
+    TreatMissingData: str | None
+    Unit: str | None
 
 
 class Dimension(TypedDict):
-    Name: Optional[str]
-    Value: Optional[str]
+    Name: str | None
+    Value: str | None
 
 
 class Metric(TypedDict):
-    Dimensions: Optional[list[Dimension]]
-    MetricName: Optional[str]
-    Namespace: Optional[str]
+    Dimensions: list[Dimension] | None
+    MetricName: str | None
+    Namespace: str | None
 
 
 class MetricStat(TypedDict):
-    Metric: Optional[Metric]
-    Period: Optional[int]
-    Stat: Optional[str]
-    Unit: Optional[str]
+    Metric: Metric | None
+    Period: int | None
+    Stat: str | None
+    Unit: str | None
 
 
 class MetricDataQuery(TypedDict):
-    Id: Optional[str]
-    AccountId: Optional[str]
-    Expression: Optional[str]
-    Label: Optional[str]
-    MetricStat: Optional[MetricStat]
-    Period: Optional[int]
-    ReturnData: Optional[bool]
+    Id: str | None
+    AccountId: str | None
+    Expression: str | None
+    Label: str | None
+    MetricStat: MetricStat | None
+    Period: int | None
+    ReturnData: bool | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/cloudwatch/resource_providers/aws_cloudwatch_alarm_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class CloudWatchAlarmProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::CloudWatch::Alarm"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.cloudwatch.resource_providers.aws_cloudwatch_alarm import (

localstack/services/cloudwatch/resource_providers/aws_cloudwatch_compositealarm.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -15,17 +15,17 @@ from localstack.utils.strings import str_to_bool
 
 
 class CloudWatchCompositeAlarmProperties(TypedDict):
-    AlarmRule: Optional[str]
-    ActionsEnabled: Optional[bool]
-    ActionsSuppressor: Optional[str]
-    ActionsSuppressorExtensionPeriod: Optional[int]
-    ActionsSuppressorWaitPeriod: Optional[int]
-    AlarmActions: Optional[list[str]]
-    AlarmDescription: Optional[str]
-    AlarmName: Optional[str]
-    Arn: Optional[str]
-    InsufficientDataActions: Optional[list[str]]
-    OKActions: Optional[list[str]]
+    AlarmRule: str | None
+    ActionsEnabled: bool | None
+    ActionsSuppressor: str | None
+    ActionsSuppressorExtensionPeriod: int | None
+    ActionsSuppressorWaitPeriod: int | None
+    AlarmActions: list[str] | None
+    AlarmDescription: str | None
+    AlarmName: str | None
+    Arn: str | None
+    InsufficientDataActions: list[str] | None
+    OKActions: list[str] | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/cloudwatch/resource_providers/aws_cloudwatch_compositealarm_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class CloudWatchCompositeAlarmProviderPlugin(CloudFormationResourceProviderPlugi
     name = "AWS::CloudWatch::CompositeAlarm"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.cloudwatch.resource_providers.aws_cloudwatch_compositealarm import (