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

localstack/services/ec2/resource_providers/aws_ec2_vpcendpoint_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 EC2VPCEndpointProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::EC2::VPCEndpoint"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ec2.resource_providers.aws_ec2_vpcendpoint import (

localstack/services/ec2/resource_providers/aws_ec2_vpcgatewayattachment.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,10 +14,10 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class EC2VPCGatewayAttachmentProperties(TypedDict):
-    VpcId: Optional[str]
-    Id: Optional[str]
-    InternetGatewayId: Optional[str]
-    VpnGatewayId: Optional[str]
+    VpcId: str | None
+    Id: str | None
+    InternetGatewayId: str | None
+    VpnGatewayId: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ec2/resource_providers/aws_ec2_vpcgatewayattachment_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 EC2VPCGatewayAttachmentProviderPlugin(CloudFormationResourceProviderPlugin
     name = "AWS::EC2::VPCGatewayAttachment"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ec2.resource_providers.aws_ec2_vpcgatewayattachment import (

localstack/services/ecr/resource_providers/aws_ecr_repository.py

@@ -3,10 +3,9 @@ from __future__ import annotations
 
 import logging
 from pathlib import Path
-from typing import Optional, TypedDict
+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,
@@ -22,34 +21,34 @@ default_repos_per_stack = {}
 
 
 class ECRRepositoryProperties(TypedDict):
-    Arn: Optional[str]
-    EncryptionConfiguration: Optional[EncryptionConfiguration]
-    ImageScanningConfiguration: Optional[ImageScanningConfiguration]
-    ImageTagMutability: Optional[str]
-    LifecyclePolicy: Optional[LifecyclePolicy]
-    RepositoryName: Optional[str]
-    RepositoryPolicyText: Optional[dict | str]
-    RepositoryUri: Optional[str]
-    Tags: Optional[list[Tag]]
+    Arn: str | None
+    EncryptionConfiguration: EncryptionConfiguration | None
+    ImageScanningConfiguration: ImageScanningConfiguration | None
+    ImageTagMutability: str | None
+    LifecyclePolicy: LifecyclePolicy | None
+    RepositoryName: str | None
+    RepositoryPolicyText: dict | str | None
+    RepositoryUri: str | None
+    Tags: list[Tag] | None
 
 
 class LifecyclePolicy(TypedDict):
-    LifecyclePolicyText: Optional[str]
-    RegistryId: Optional[str]
+    LifecyclePolicyText: str | None
+    RegistryId: str | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 class ImageScanningConfiguration(TypedDict):
-    ScanOnPush: Optional[bool]
+    ScanOnPush: bool | None
 
 
 class EncryptionConfiguration(TypedDict):
-    EncryptionType: Optional[str]
-    KmsKey: Optional[str]
+    EncryptionType: str | None
+    KmsKey: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"
@@ -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/ecr/resource_providers/aws_ecr_repository_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 ECRRepositoryProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::ECR::Repository"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ecr.resource_providers.aws_ecr_repository import (

localstack/services/edge.py

@@ -3,7 +3,7 @@ import logging
 import shlex
 import subprocess
 import sys
-from typing import List, Optional, TypeVar
+from typing import TypeVar
 
 from localstack import config, constants
 from localstack.config import HostAndPort
@@ -32,7 +32,7 @@ the actual AWS service call is made."""
 
 
 def do_start_edge(
-    listen: HostAndPort | List[HostAndPort], use_ssl: bool, asynchronous: bool = False
+    listen: HostAndPort | list[HostAndPort], use_ssl: bool, asynchronous: bool = False
 ):
     from localstack.aws.serving.edge import serve_gateway
 
@@ -50,7 +50,7 @@ def can_use_sudo():
 def ensure_can_use_sudo():
     if not is_root() and not can_use_sudo():
         if not sys.stdin.isatty():
-            raise IOError("cannot get sudo password from non-tty input")
+            raise OSError("cannot get sudo password from non-tty input")
         print("Please enter your sudo password (required to configure local network):")
         run("sudo -v", stdin=True)
 
@@ -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(
@@ -166,7 +166,7 @@ def start_edge(listen_str: str, use_ssl: bool = True, asynchronous: bool = False
 
 
 def run_module_as_sudo(
-    module: str, arguments: Optional[List[str]] = None, asynchronous=False, env_vars=None
+    module: str, arguments: list[str] | None = None, asynchronous=False, env_vars=None
 ):
     # prepare environment
     env_vars = env_vars or {}
@@ -195,7 +195,7 @@ def run_module_as_sudo(
     return result
 
 
-def parse_gateway_listen(listen: str, default_host: str, default_port: int) -> List[HostAndPort]:
+def parse_gateway_listen(listen: str, default_host: str, default_port: int) -> list[HostAndPort]:
     addresses = []
     for address in listen.split(","):
         addresses.append(HostAndPort.parse(address, default_host, default_port))

localstack/services/es/provider.py

@@ -1,9 +1,8 @@
 from contextlib import contextmanager
-from typing import Dict, Optional, cast
+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,11 +67,12 @@ 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(
-    version: Optional[ElasticsearchVersionString],
-) -> Optional[VersionString]:
+    version: ElasticsearchVersionString | None,
+) -> VersionString | None:
     if version is not None:
         if version.startswith("OpenSearch_"):
             return version
@@ -81,8 +81,8 @@ def _version_to_opensearch(
 
 
 def _version_from_opensearch(
-    version: Optional[VersionString],
-) -> Optional[ElasticsearchVersionString]:
+    version: VersionString | None,
+) -> ElasticsearchVersionString | None:
     if version is not None:
         if version.startswith("Elasticsearch_"):
             return version.split("_")[1]
@@ -90,19 +90,19 @@ def _version_from_opensearch(
             return version
 
 
-def _instancetype_to_opensearch(instance_type: Optional[str]) -> Optional[str]:
+def _instancetype_to_opensearch(instance_type: str | None) -> str | None:
     if instance_type is not None:
         return instance_type.replace("elasticsearch", "search")
 
 
-def _instancetype_from_opensearch(instance_type: Optional[str]) -> Optional[str]:
+def _instancetype_from_opensearch(instance_type: str | None) -> str | None:
     if instance_type is not None:
         return instance_type.replace("search", "elasticsearch")
 
 
 def _clusterconfig_from_opensearch(
-    cluster_config: Optional[ClusterConfig],
-) -> Optional[ElasticsearchClusterConfig]:
+    cluster_config: ClusterConfig | None,
+) -> ElasticsearchClusterConfig | None:
     if cluster_config is not None:
         # Just take the whole typed dict and typecast it to our target type
         result = cast(ElasticsearchClusterConfig, cluster_config)
@@ -117,8 +117,8 @@ def _clusterconfig_from_opensearch(
 
 
 def _domainstatus_from_opensearch(
-    domain_status: Optional[DomainStatus],
-) -> Optional[ElasticsearchDomainStatus]:
+    domain_status: DomainStatus | None,
+) -> ElasticsearchDomainStatus | None:
     if domain_status is not None:
         # Just take the whole typed dict and typecast it to our target type
         result = cast(ElasticsearchDomainStatus, domain_status)
@@ -135,8 +135,8 @@ def _domainstatus_from_opensearch(
 
 
 def _clusterconfig_to_opensearch(
-    elasticsearch_cluster_config: Optional[ElasticsearchClusterConfig],
-) -> Optional[ClusterConfig]:
+    elasticsearch_cluster_config: ElasticsearchClusterConfig | None,
+) -> ClusterConfig | None:
     if elasticsearch_cluster_config is not None:
         result = cast(ClusterConfig, elasticsearch_cluster_config)
         if instance_type := result.get("InstanceType"):
@@ -149,8 +149,8 @@ def _clusterconfig_to_opensearch(
 
 
 def _domainconfig_from_opensearch(
-    domain_config: Optional[DomainConfig],
-) -> Optional[ElasticsearchDomainConfig]:
+    domain_config: DomainConfig | None,
+) -> ElasticsearchDomainConfig | None:
     if domain_config is not None:
         result = cast(ElasticsearchDomainConfig, domain_config)
         engine_version = domain_config.get("EngineVersion", {})
@@ -169,8 +169,8 @@ def _domainconfig_from_opensearch(
 
 
 def _compatible_version_list_from_opensearch(
-    compatible_version_list: Optional[CompatibleVersionsList],
-) -> Optional[CompatibleElasticsearchVersionsList]:
+    compatible_version_list: CompatibleVersionsList | None,
+) -> CompatibleElasticsearchVersionsList | None:
     if compatible_version_list is not None:
         return [
             CompatibleVersionsMap(
@@ -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,
@@ -304,7 +304,7 @@ class EsProvider(EsApi):
             region_name=context.region, aws_access_key_id=context.account_id
         ).opensearch
 
-        payload: Dict
+        payload: dict
         if "ElasticsearchClusterConfig" in payload:
             payload["ClusterConfig"] = payload["ElasticsearchClusterConfig"]
             payload["ClusterConfig"]["InstanceType"] = _instancetype_to_opensearch(
@@ -347,7 +347,7 @@ class EsProvider(EsApi):
         with exception_mapper():
             domain_names = opensearch_client.list_domain_names(**kwargs)["DomainNames"]
 
-        return ListDomainNamesResponse(DomainNames=cast(Optional[DomainInfoList], domain_names))
+        return ListDomainNamesResponse(DomainNames=cast(DomainInfoList | None, domain_names))
 
     def list_elasticsearch_versions(
         self,

localstack/services/events/archive.py

@@ -1,6 +1,6 @@
 import json
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Self
 
 from botocore.client import BaseClient
@@ -95,7 +95,7 @@ class ArchiveService:
         self.archive.state = state
 
     def set_creation_time(self) -> None:
-        self.archive.creation_time = datetime.now(timezone.utc)
+        self.archive.creation_time = datetime.now(UTC)
 
     def update(
         self,

localstack/services/events/connection.py

@@ -2,7 +2,7 @@ import json
 import logging
 import re
 import uuid
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from localstack.aws.api.events import (
     Arn,
@@ -138,7 +138,7 @@ class ConnectionService:
                     auth_parameters,
                 )
                 self.connection.secret_arn = secret_arn
-                self.connection.last_authorized_time = datetime.now(timezone.utc)
+                self.connection.last_authorized_time = datetime.now(UTC)
 
             # Set new values
             self.connection.authorization_type = auth_type
@@ -149,7 +149,7 @@ class ConnectionService:
             )
             self.connection.auth_parameters = public_auth_parameters
             self.set_state(ConnectionState.AUTHORIZED)
-            self.connection.last_modified_time = datetime.now(timezone.utc)
+            self.connection.last_modified_time = datetime.now(UTC)
 
         except Exception as error:
             LOG.warning(
@@ -162,7 +162,7 @@ class ConnectionService:
         self.set_state(ConnectionState.DELETING)
         self.delete_connection_secret(self.connection.secret_arn)
         self.set_state(ConnectionState.DELETING)  # required for AWS parity
-        self.connection.last_modified_time = datetime.now(timezone.utc)
+        self.connection.last_modified_time = datetime.now(UTC)
 
     def create_connection_secret(
         self,
@@ -204,7 +204,7 @@ class ConnectionService:
         try:
             secretsmanager_client.update_secret(SecretId=secret_arn, SecretString=secret_value)
             self.set_state(ConnectionState.AUTHORIZED)
-            self.connection.last_authorized_time = datetime.now(timezone.utc)
+            self.connection.last_authorized_time = datetime.now(UTC)
         except Exception as error:
             LOG.warning("Secret with id %s updating failed with errors: %s.", secret_arn, error)
 

localstack/services/events/event_bus.py

@@ -1,6 +1,6 @@
 import json
-from datetime import datetime, timezone
-from typing import Optional, Self
+from datetime import UTC, datetime
+from typing import Self
 
 from localstack.aws.api.events import (
     Action,
@@ -34,11 +34,11 @@ class EventBusService:
         name: EventBusName,
         region: str,
         account_id: str,
-        event_source_name: Optional[str] = None,
-        description: Optional[str] = None,
-        tags: Optional[TagList] = None,
-        policy: Optional[str] = None,
-        rules: Optional[RuleDict] = None,
+        event_source_name: str | None = None,
+        description: str | None = None,
+        tags: TagList | None = None,
+        policy: str | None = None,
+        rules: RuleDict | None = None,
     ) -> Self:
         return cls(
             EventBus(
@@ -68,7 +68,7 @@ class EventBusService:
         # TODO: cover via test
         # if policy and any([action, principal, statement_id, condition]):
         #     raise ValueError("Combination of policy with other arguments is not allowed")
-        self.event_bus.last_modified_time = datetime.now(timezone.utc)
+        self.event_bus.last_modified_time = datetime.now(UTC)
         if policy:  # policy document replaces all existing permissions
             policy = json.loads(policy)
             parsed_policy = ResourcePolicy(**policy)
@@ -102,7 +102,7 @@ class EventBusService:
                 for statement in policy["Statement"]
                 if statement.get("Sid") != statement_id
             ]
-            self.event_bus.last_modified_time = datetime.now(timezone.utc)
+            self.event_bus.last_modified_time = datetime.now(UTC)
 
     def _parse_statement(
         self,

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
 

localstack/services/events/models.py

@@ -1,10 +1,10 @@
 import uuid
 from dataclasses import dataclass, field
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from enum import Enum
-from typing import Literal, Optional, TypeAlias, TypedDict
+from typing import Literal, TypeAlias, TypedDict
 
-from localstack.aws.api.core import ServiceException
+from localstack.aws.api import CommonServiceException
 from localstack.aws.api.events import (
     ApiDestinationDescription,
     ApiDestinationHttpMethod,
@@ -66,10 +66,9 @@ from localstack.utils.tagging import TaggingService
 TargetDict = dict[TargetId, Target]
 
 
-class ValidationException(ServiceException):
-    code: str = "ValidationException"
-    sender_fault: bool = True
-    status_code: int = 400
+class ValidationException(CommonServiceException):
+    def __init__(self, message: str):
+        super().__init__("ValidationException", message, 400, True)
 
 
 class InvalidEventPatternException(Exception):
@@ -85,14 +84,14 @@ FormattedEvent = TypedDict(  # functional syntax required due to name-name keys
     {
         "version": str,
         "id": str,
-        "detail-type": Optional[str],
-        "source": Optional[EventSourceName],
+        "detail-type": str | None,
+        "source": EventSourceName | None,
         "account": str,
         "time": EventTime,
         "region": str,
-        "resources": Optional[EventResourceList],
+        "resources": EventResourceList | None,
         "detail": dict[str, str | dict],
-        "replay-name": Optional[ReplayName],
+        "replay-name": ReplayName | None,
         "event-bus-name": EventBusName,
     },
 )
@@ -134,15 +133,15 @@ class Rule:
     name: RuleName
     region: str
     account_id: str
-    schedule_expression: Optional[ScheduleExpression] = None
-    event_pattern: Optional[EventPattern] = None
-    state: Optional[RuleState] = None
-    description: Optional[RuleDescription] = None
-    role_arn: Optional[RoleArn] = None
+    schedule_expression: ScheduleExpression | None = None
+    event_pattern: EventPattern | None = None
+    state: RuleState | None = None
+    description: RuleDescription | None = None
+    role_arn: RoleArn | None = None
     tags: TagList = field(default_factory=list)
     event_bus_name: EventBusName = "default"
     targets: TargetDict = field(default_factory=dict)
-    managed_by: Optional[ManagedBy] = None  # can only be set by AWS services
+    managed_by: ManagedBy | None = None  # can only be set by AWS services
     created_by: CreatedBy = field(init=False)
 
     def __post_init__(self):
@@ -171,12 +170,12 @@ class Replay:
     destination: ReplayDestination  # Event Bus Arn or Rule Arns
     event_start_time: Timestamp
     event_end_time: Timestamp
-    description: Optional[ReplayDescription] = None
-    state: Optional[ReplayState] = None
-    state_reason: Optional[ReplayStateReason] = None
-    event_last_replayed_time: Optional[Timestamp] = None
-    replay_start_time: Optional[Timestamp] = None
-    replay_end_time: Optional[Timestamp] = None
+    description: ReplayDescription | None = None
+    state: ReplayState | None = None
+    state_reason: ReplayStateReason | None = None
+    event_last_replayed_time: Timestamp | None = None
+    replay_start_time: Timestamp | None = None
+    replay_end_time: Timestamp | None = None
 
     @property
     def arn(self) -> Arn:
@@ -217,17 +216,17 @@ class EventBus:
     name: EventBusName
     region: str
     account_id: str
-    event_source_name: Optional[str] = None
-    description: Optional[str] = None
+    event_source_name: str | None = None
+    description: str | None = None
     tags: TagList = field(default_factory=list)
-    policy: Optional[ResourcePolicy] = None
+    policy: ResourcePolicy | None = None
     rules: RuleDict = field(default_factory=dict)
     creation_time: Timestamp = field(init=False)
     last_modified_time: Timestamp = field(init=False)
 
     def __post_init__(self):
-        self.creation_time = datetime.now(timezone.utc)
-        self.last_modified_time = datetime.now(timezone.utc)
+        self.creation_time = datetime.now(UTC)
+        self.last_modified_time = datetime.now(UTC)
         if self.rules is None:
             self.rules = {}
         if self.tags is None:
@@ -259,7 +258,7 @@ class Connection:
     id: str = str(uuid.uuid4())
 
     def __post_init__(self):
-        timestamp_now = datetime.now(timezone.utc)
+        timestamp_now = datetime.now(UTC)
         self.creation_time = timestamp_now
         self.last_modified_time = timestamp_now
         self.last_authorized_time = timestamp_now
@@ -292,7 +291,7 @@ class ApiDestination:
     id: str = str(short_uid())
 
     def __post_init__(self):
-        timestamp_now = datetime.now(timezone.utc)
+        timestamp_now = datetime.now(UTC)
         self.creation_time = timestamp_now
         self.last_modified_time = timestamp_now
         self.last_authorized_time = timestamp_now