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

localstack/services/s3/utils.py

@@ -7,9 +7,10 @@ import logging
 import re
 import time
 import zlib
+from collections.abc import Mapping
 from enum import StrEnum
 from secrets import token_bytes
-from typing import Any, Dict, Literal, NamedTuple, Optional, Protocol, Tuple, Union
+from typing import Any, Literal, NamedTuple, Protocol
 from urllib import parse as urlparser
 from zoneinfo import ZoneInfo
 
@@ -50,6 +51,7 @@ from localstack.aws.api.s3 import (
     SSEKMSKeyId,
     TaggingHeader,
     TagSet,
+    UploadPartCopyRequest,
     UploadPartRequest,
 )
 from localstack.aws.api.s3 import Type as GranteeType
@@ -62,7 +64,6 @@ from localstack.services.s3.constants import (
     AUTHENTICATED_USERS_ACL_GRANTEE,
     CHECKSUM_ALGORITHMS,
     LOG_DELIVERY_ACL_GRANTEE,
-    S3_VIRTUAL_HOST_FORWARDED_HEADER,
     SIGNATURE_V2_PARAMS,
     SIGNATURE_V4_PARAMS,
     SYSTEM_METADATA_SETTABLE_HEADERS,
@@ -143,7 +144,7 @@ def get_owner_for_account_id(account_id: str):
 
 def extract_bucket_key_version_id_from_copy_source(
     copy_source: CopySource,
-) -> tuple[BucketName, ObjectKey, Optional[ObjectVersionId]]:
+) -> tuple[BucketName, ObjectKey, ObjectVersionId | None]:
     """
     Utility to parse bucket name, object key and optionally its versionId. It accepts the CopySource format:
     - <bucket-name/<object-key>?versionId=<version-id>, used for example in CopySource for CopyObject
@@ -403,6 +404,45 @@ def parse_copy_source_range_header(copy_source_range: str, object_size: int) ->
     )
 
 
+def get_failed_upload_part_copy_source_preconditions(
+    request: UploadPartCopyRequest, last_modified: datetime.datetime, etag: ETag
+) -> str | None:
+    """
+    Utility which parses the conditions from a S3 UploadPartCopy request.
+    Note: The order in which these conditions are checked if used in conjunction matters
+
+    :param UploadPartCopyRequest request: The S3 UploadPartCopy request.
+    :param datetime last_modified: The time the source object was last modified.
+    :param ETag etag: The ETag of the source object.
+
+    :returns: The name of the failed precondition.
+    """
+    if_match = request.get("CopySourceIfMatch")
+    if_none_match = request.get("CopySourceIfNoneMatch")
+    if_unmodified_since = request.get("CopySourceIfUnmodifiedSince")
+    if_modified_since = request.get("CopySourceIfModifiedSince")
+
+    if if_match:
+        if if_match.strip('"') != etag.strip('"'):
+            return "x-amz-copy-source-If-Match"
+        if if_modified_since and if_modified_since > last_modified:
+            return "x-amz-copy-source-If-Modified-Since"
+        # CopySourceIfMatch is unaffected by CopySourceIfUnmodifiedSince so return early
+        if if_unmodified_since:
+            return None
+
+    if if_unmodified_since and if_unmodified_since < last_modified:
+        return "x-amz-copy-source-If-Unmodified-Since"
+
+    if if_none_match and if_none_match.strip('"') == etag.strip('"'):
+        return "x-amz-copy-source-If-None-Match"
+
+    if if_modified_since and last_modified < if_modified_since < datetime.datetime.now(
+        tz=_gmt_zone_info
+    ):
+        return "x-amz-copy-source-If-Modified-Since"
+
+
 def get_full_default_bucket_location(bucket_name: BucketName) -> str:
     host_definition = localstack_host()
     if host_definition.host != constants.LOCALHOST_HOSTNAME:
@@ -482,7 +522,7 @@ def is_valid_canonical_id(canonical_id: str) -> bool:
         return False
 
 
-def uses_host_addressing(headers: Dict[str, str]) -> str | None:
+def uses_host_addressing(headers: Mapping[str, str]) -> str | None:
     """
     Determines if the request is targeting S3 with virtual host addressing
     :param headers: the request headers
@@ -511,18 +551,9 @@ def get_system_metadata_from_request(request: dict) -> Metadata:
     return metadata
 
 
-def forwarded_from_virtual_host_addressed_request(headers: dict[str, str]) -> bool:
-    """
-    Determines if the request was forwarded from a v-host addressing style into a path one
-    """
-    # we can assume that the host header we are receiving here is actually the header we originally received
-    # from the client (because the edge service is forwarding the request in memory)
-    return S3_VIRTUAL_HOST_FORWARDED_HEADER in headers
-
-
 def extract_bucket_name_and_key_from_headers_and_path(
     headers: dict[str, str], path: str
-) -> tuple[Optional[str], Optional[str]]:
+) -> tuple[str | None, str | None]:
     """
     Extract the bucket name and the object key from a request headers and path. This works with both virtual host
     and path style requests.
@@ -556,7 +587,7 @@ def normalize_bucket_name(bucket_name):
     return bucket_name
 
 
-def get_bucket_and_key_from_s3_uri(s3_uri: str) -> Tuple[str, str]:
+def get_bucket_and_key_from_s3_uri(s3_uri: str) -> tuple[str, str]:
     """
     Extracts the bucket name and key from s3 uri
     """
@@ -564,7 +595,7 @@ def get_bucket_and_key_from_s3_uri(s3_uri: str) -> Tuple[str, str]:
     return output_bucket, output_key
 
 
-def get_bucket_and_key_from_presign_url(presign_url: str) -> Tuple[str, str]:
+def get_bucket_and_key_from_presign_url(presign_url: str) -> tuple[str, str]:
     """
     Extracts the bucket name and key from s3 presign url
     """
@@ -574,22 +605,11 @@ def get_bucket_and_key_from_presign_url(presign_url: str) -> Tuple[str, str]:
     return bucket, key
 
 
-def _create_invalid_argument_exc(
-    message: Union[str, None], name: str, value: str, host_id: str = None
-) -> InvalidArgument:
-    ex = InvalidArgument(message)
-    ex.ArgumentName = name
-    ex.ArgumentValue = value
-    if host_id:
-        ex.HostId = host_id
-    return ex
-
-
 def capitalize_header_name_from_snake_case(header_name: str) -> str:
     return "-".join([part.capitalize() for part in header_name.split("-")])
 
 
-def get_kms_key_arn(kms_key: str, account_id: str, bucket_region: str) -> Optional[str]:
+def get_kms_key_arn(kms_key: str, account_id: str, bucket_region: str) -> str | None:
     """
     In S3, the KMS key can be passed as a KeyId or a KeyArn. This method allows to always get the KeyArn from either.
     It can also validate if the key is in the same region, and raise an exception.
@@ -762,7 +782,7 @@ def _match_lifecycle_filter(
 
 def parse_expiration_header(
     expiration_header: str,
-) -> tuple[Optional[datetime.datetime], Optional[str]]:
+) -> tuple[datetime.datetime | None, str | None]:
     try:
         header_values = dict(
             (p.strip('"') for p in v.split("=")) for v in expiration_header.split('", ')
@@ -878,7 +898,7 @@ def get_retention_from_now(days: int = None, years: int = None) -> datetime.date
 
 def get_failed_precondition_copy_source(
     request: CopyObjectRequest, last_modified: datetime.datetime, etag: ETag
-) -> Optional[str]:
+) -> str | None:
     """
     Validate if the source object LastModified and ETag matches a precondition, and if it does, return the failed
     precondition
@@ -1019,7 +1039,7 @@ def create_redirect_for_post_request(
     return urlparser.urlunparse(newparts)
 
 
-def parse_post_object_tagging_xml(tagging: str) -> Optional[dict]:
+def parse_post_object_tagging_xml(tagging: str) -> dict | None:
     try:
         tag_set = {}
         tags = xmltodict.parse(tagging)

localstack/services/s3/validation.py

@@ -38,7 +38,6 @@ from localstack.aws.api.s3 import Type as GranteeType
 from localstack.services.s3 import constants as s3_constants
 from localstack.services.s3.exceptions import InvalidRequest, MalformedACLError, MalformedXML
 from localstack.services.s3.utils import (
-    _create_invalid_argument_exc,
     get_class_attrs_from_spec_class,
     get_permission_header_name,
     is_bucket_name_valid,
@@ -87,8 +86,11 @@ def validate_canned_acl(canned_acl: str) -> None:
     Validate the canned ACL value, or raise an Exception
     """
     if canned_acl and canned_acl not in VALID_CANNED_ACLS:
-        ex = _create_invalid_argument_exc(None, "x-amz-acl", canned_acl)
-        raise ex
+        raise InvalidArgument(
+            None,
+            ArgumentName="x-amz-acl",
+            ArgumentValue=canned_acl,
+        )
 
 
 def parse_grants_in_headers(permission: Permission, grantees: str) -> Grants:
@@ -98,16 +100,18 @@ def parse_grants_in_headers(permission: Permission, grantees: str) -> Grants:
         grantee_type, grantee_id = seralized_grantee.split("=")
         grantee_id = grantee_id.strip('"')
         if grantee_type not in ("uri", "id", "emailAddress"):
-            ex = _create_invalid_argument_exc(
+            raise InvalidArgument(
                 "Argument format not recognized",
-                get_permission_header_name(permission),
-                seralized_grantee,
+                ArgumentName=get_permission_header_name(permission),
+                ArgumentValue=seralized_grantee,
             )
-            raise ex
         elif grantee_type == "uri":
             if grantee_id not in s3_constants.VALID_ACL_PREDEFINED_GROUPS:
-                ex = _create_invalid_argument_exc("Invalid group uri", "uri", grantee_id)
-                raise ex
+                raise InvalidArgument(
+                    "Invalid group uri",
+                    ArgumentName="uri",
+                    ArgumentValue=grantee_id,
+                )
             grantee = Grantee(
                 Type=GranteeType.Group,
                 URI=grantee_id,
@@ -115,8 +119,11 @@ def parse_grants_in_headers(permission: Permission, grantees: str) -> Grants:
 
         elif grantee_type == "id":
             if not is_valid_canonical_id(grantee_id):
-                ex = _create_invalid_argument_exc("Invalid id", "id", grantee_id)
-                raise ex
+                raise InvalidArgument(
+                    "Invalid id",
+                    ArgumentName="id",
+                    ArgumentValue=grantee_id,
+                )
             grantee = Grantee(
                 Type=GranteeType.CanonicalUser,
                 ID=grantee_id,
@@ -141,8 +148,11 @@ def validate_acl_acp(acp: AccessControlPolicy) -> None:
         )
 
     if not is_valid_canonical_id(owner_id := acp["Owner"].get("ID", "")):
-        ex = _create_invalid_argument_exc("Invalid id", "CanonicalUser/ID", owner_id)
-        raise ex
+        raise InvalidArgument(
+            "Invalid id",
+            ArgumentName="CanonicalUser/ID",
+            ArgumentValue=owner_id,
+        )
 
     for grant in acp["Grants"]:
         if grant.get("Permission") not in s3_constants.VALID_GRANTEE_PERMISSIONS:
@@ -165,18 +175,24 @@ def validate_acl_acp(acp: AccessControlPolicy) -> None:
             and (grant_uri := grantee.get("URI", ""))
             not in s3_constants.VALID_ACL_PREDEFINED_GROUPS
         ):
-            ex = _create_invalid_argument_exc("Invalid group uri", "Group/URI", grant_uri)
-            raise ex
+            raise InvalidArgument(
+                "Invalid group uri",
+                ArgumentName="Group/URI",
+                ArgumentValue=grant_uri,
+            )
 
         elif grant_type == GranteeType.AmazonCustomerByEmail:
             # TODO: add validation here
             continue
 
         elif grant_type == GranteeType.CanonicalUser and not is_valid_canonical_id(
-            (grantee_id := grantee.get("ID", ""))
+            grantee_id := grantee.get("ID", "")
         ):
-            ex = _create_invalid_argument_exc("Invalid id", "CanonicalUser/ID", grantee_id)
-            raise ex
+            raise InvalidArgument(
+                "Invalid id",
+                ArgumentName="CanonicalUser/ID",
+                ArgumentValue=grantee_id,
+            )
 
 
 def validate_lifecycle_configuration(lifecycle_conf: BucketLifecycleConfiguration) -> None:
@@ -242,12 +258,12 @@ def validate_website_configuration(website_config: WebsiteConfiguration) -> None
     """
     if redirect_all_req := website_config.get("RedirectAllRequestsTo", {}):
         if len(website_config) > 1:
-            ex = _create_invalid_argument_exc(
-                message="RedirectAllRequestsTo cannot be provided in conjunction with other Routing Rules.",
-                name="RedirectAllRequestsTo",
-                value="not null",
+            raise InvalidArgument(
+                "RedirectAllRequestsTo cannot be provided in conjunction with other Routing Rules.",
+                ArgumentName="RedirectAllRequestsTo",
+                ArgumentValue="not null",
             )
-            raise ex
+
         if "HostName" not in redirect_all_req:
             raise MalformedXML()
 
@@ -261,20 +277,18 @@ def validate_website_configuration(website_config: WebsiteConfiguration) -> None
     # required
     # https://docs.aws.amazon.com/AmazonS3/latest/API/API_IndexDocument.html
     if not (index_configuration := website_config.get("IndexDocument")):
-        ex = _create_invalid_argument_exc(
-            message="A value for IndexDocument Suffix must be provided if RedirectAllRequestsTo is empty",
-            name="IndexDocument",
-            value="null",
+        raise InvalidArgument(
+            "A value for IndexDocument Suffix must be provided if RedirectAllRequestsTo is empty",
+            ArgumentName="IndexDocument",
+            ArgumentValue="null",
         )
-        raise ex
 
     if not (index_suffix := index_configuration.get("Suffix")) or "/" in index_suffix:
-        ex = _create_invalid_argument_exc(
-            message="The IndexDocument Suffix is not well formed",
-            name="IndexDocument",
-            value=index_suffix or None,
+        raise InvalidArgument(
+            "The IndexDocument Suffix is not well formed",
+            ArgumentName="IndexDocument",
+            ArgumentValue=index_suffix or None,
         )
-        raise ex
 
     if "ErrorDocument" in website_config and not website_config.get("ErrorDocument", {}).get("Key"):
         raise MalformedXML()

localstack/services/s3/website_hosting.py

@@ -1,7 +1,7 @@
 import logging
 import re
+from collections.abc import Callable
 from functools import wraps
-from typing import Callable, Dict, Optional, Union
 from urllib.parse import urlparse
 
 from werkzeug.datastructures import Headers
@@ -32,8 +32,8 @@ class NoSuchKeyFromErrorDocument(NoSuchKey):
     code: str = "NoSuchKey"
     sender_fault: bool = False
     status_code: int = 404
-    Key: Optional[ObjectKey]
-    ErrorDocumentKey: Optional[ObjectKey]
+    Key: ObjectKey | None
+    ErrorDocumentKey: ObjectKey | None
 
 
 class S3WebsiteHostingHandler:
@@ -93,8 +93,10 @@ class S3WebsiteHostingHandler:
             return Response(response_body, status=e.response["ResponseMetadata"]["HTTPStatusCode"])
 
         except Exception:
-            LOG.exception(
-                "Exception encountered while trying to serve s3-website at %s", request.url
+            LOG.error(
+                "Exception encountered while trying to serve s3-website at %s",
+                request.url,
+                exc_info=LOG.isEnabledFor(logging.DEBUG),
             )
             return Response(_create_500_error_string(), status=500)
 
@@ -223,7 +225,7 @@ class S3WebsiteHostingHandler:
             )
 
     @staticmethod
-    def _get_response_headers_from_object(get_object_response: GetObjectOutput) -> Dict[str, str]:
+    def _get_response_headers_from_object(get_object_response: GetObjectOutput) -> dict[str, str]:
         """
         Only return some headers from the S3 Object
         :param get_object_response: the response from S3.GetObject
@@ -248,7 +250,7 @@ class S3WebsiteHostingHandler:
     @staticmethod
     def _find_matching_rule(
         routing_rules: RoutingRules, object_key: ObjectKey, error_code: int = None
-    ) -> Union[RoutingRule, None]:
+    ) -> RoutingRule | None:
         """
         Iterate over the routing rules set in the configuration, and return the first that match the key name and/or the
         error code (in the 4XX range).

localstack/services/scheduler/resource_providers/aws_scheduler_schedule.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,110 +14,110 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SchedulerScheduleProperties(TypedDict):
-    FlexibleTimeWindow: Optional[FlexibleTimeWindow]
-    ScheduleExpression: Optional[str]
-    Target: Optional[Target]
-    Arn: Optional[str]
-    Description: Optional[str]
-    EndDate: Optional[str]
-    GroupName: Optional[str]
-    KmsKeyArn: Optional[str]
-    Name: Optional[str]
-    ScheduleExpressionTimezone: Optional[str]
-    StartDate: Optional[str]
-    State: Optional[str]
+    FlexibleTimeWindow: FlexibleTimeWindow | None
+    ScheduleExpression: str | None
+    Target: Target | None
+    Arn: str | None
+    Description: str | None
+    EndDate: str | None
+    GroupName: str | None
+    KmsKeyArn: str | None
+    Name: str | None
+    ScheduleExpressionTimezone: str | None
+    StartDate: str | None
+    State: str | None
 
 
 class FlexibleTimeWindow(TypedDict):
-    Mode: Optional[str]
-    MaximumWindowInMinutes: Optional[float]
+    Mode: str | None
+    MaximumWindowInMinutes: float | None
 
 
 class DeadLetterConfig(TypedDict):
-    Arn: Optional[str]
+    Arn: str | None
 
 
 class RetryPolicy(TypedDict):
-    MaximumEventAgeInSeconds: Optional[float]
-    MaximumRetryAttempts: Optional[float]
+    MaximumEventAgeInSeconds: float | None
+    MaximumRetryAttempts: float | None
 
 
 class AwsVpcConfiguration(TypedDict):
-    Subnets: Optional[list[str]]
-    AssignPublicIp: Optional[str]
-    SecurityGroups: Optional[list[str]]
+    Subnets: list[str] | None
+    AssignPublicIp: str | None
+    SecurityGroups: list[str] | None
 
 
 class NetworkConfiguration(TypedDict):
-    AwsvpcConfiguration: Optional[AwsVpcConfiguration]
+    AwsvpcConfiguration: AwsVpcConfiguration | None
 
 
 class CapacityProviderStrategyItem(TypedDict):
-    CapacityProvider: Optional[str]
-    Base: Optional[float]
-    Weight: Optional[float]
+    CapacityProvider: str | None
+    Base: float | None
+    Weight: float | None
 
 
 class PlacementConstraint(TypedDict):
-    Expression: Optional[str]
-    Type: Optional[str]
+    Expression: str | None
+    Type: str | None
 
 
 class PlacementStrategy(TypedDict):
-    Field: Optional[str]
-    Type: Optional[str]
+    Field: str | None
+    Type: str | None
 
 
 class EcsParameters(TypedDict):
-    TaskDefinitionArn: Optional[str]
-    CapacityProviderStrategy: Optional[list[CapacityProviderStrategyItem]]
-    EnableECSManagedTags: Optional[bool]
-    EnableExecuteCommand: Optional[bool]
-    Group: Optional[str]
-    LaunchType: Optional[str]
-    NetworkConfiguration: Optional[NetworkConfiguration]
-    PlacementConstraints: Optional[list[PlacementConstraint]]
-    PlacementStrategy: Optional[list[PlacementStrategy]]
-    PlatformVersion: Optional[str]
-    PropagateTags: Optional[str]
-    ReferenceId: Optional[str]
-    Tags: Optional[list[dict]]
-    TaskCount: Optional[float]
+    TaskDefinitionArn: str | None
+    CapacityProviderStrategy: list[CapacityProviderStrategyItem] | None
+    EnableECSManagedTags: bool | None
+    EnableExecuteCommand: bool | None
+    Group: str | None
+    LaunchType: str | None
+    NetworkConfiguration: NetworkConfiguration | None
+    PlacementConstraints: list[PlacementConstraint] | None
+    PlacementStrategy: list[PlacementStrategy] | None
+    PlatformVersion: str | None
+    PropagateTags: str | None
+    ReferenceId: str | None
+    Tags: list[dict] | None
+    TaskCount: float | None
 
 
 class EventBridgeParameters(TypedDict):
-    DetailType: Optional[str]
-    Source: Optional[str]
+    DetailType: str | None
+    Source: str | None
 
 
 class KinesisParameters(TypedDict):
-    PartitionKey: Optional[str]
+    PartitionKey: str | None
 
 
 class SageMakerPipelineParameter(TypedDict):
-    Name: Optional[str]
-    Value: Optional[str]
+    Name: str | None
+    Value: str | None
 
 
 class SageMakerPipelineParameters(TypedDict):
-    PipelineParameterList: Optional[list[SageMakerPipelineParameter]]
+    PipelineParameterList: list[SageMakerPipelineParameter] | None
 
 
 class SqsParameters(TypedDict):
-    MessageGroupId: Optional[str]
+    MessageGroupId: str | None
 
 
 class Target(TypedDict):
-    Arn: Optional[str]
-    RoleArn: Optional[str]
-    DeadLetterConfig: Optional[DeadLetterConfig]
-    EcsParameters: Optional[EcsParameters]
-    EventBridgeParameters: Optional[EventBridgeParameters]
-    Input: Optional[str]
-    KinesisParameters: Optional[KinesisParameters]
-    RetryPolicy: Optional[RetryPolicy]
-    SageMakerPipelineParameters: Optional[SageMakerPipelineParameters]
-    SqsParameters: Optional[SqsParameters]
+    Arn: str | None
+    RoleArn: str | None
+    DeadLetterConfig: DeadLetterConfig | None
+    EcsParameters: EcsParameters | None
+    EventBridgeParameters: EventBridgeParameters | None
+    Input: str | None
+    KinesisParameters: KinesisParameters | None
+    RetryPolicy: RetryPolicy | None
+    SageMakerPipelineParameters: SageMakerPipelineParameters | None
+    SqsParameters: SqsParameters | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/scheduler/resource_providers/aws_scheduler_schedule_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 SchedulerScheduleProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::Scheduler::Schedule"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.scheduler.resource_providers.aws_scheduler_schedule import (

localstack/services/scheduler/resource_providers/aws_scheduler_schedulegroup.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,17 +14,17 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SchedulerScheduleGroupProperties(TypedDict):
-    Arn: Optional[str]
-    CreationDate: Optional[str]
-    LastModificationDate: Optional[str]
-    Name: Optional[str]
-    State: Optional[str]
-    Tags: Optional[list[Tag]]
+    Arn: str | None
+    CreationDate: str | None
+    LastModificationDate: str | None
+    Name: str | None
+    State: str | None
+    Tags: list[Tag] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/scheduler/resource_providers/aws_scheduler_schedulegroup_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 SchedulerScheduleGroupProviderPlugin(CloudFormationResourceProviderPlugin)
     name = "AWS::Scheduler::ScheduleGroup"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.scheduler.resource_providers.aws_scheduler_schedulegroup import (