localstack-core 4.9.3.dev25__py3-none-any.whl → 4.9.3.dev27__py3-none-any.whl

localstack/utils/archives.py

@@ -8,7 +8,7 @@ import tempfile
 import time
 import zipfile
 from subprocess import Popen
-from typing import IO, Literal, Optional, Union
+from typing import IO, Literal
 
 from localstack.constants import MAVEN_REPO_URL
 from localstack.utils.files import load_file, mkdir, new_tmp_file, rm_rf, save_file
@@ -22,7 +22,7 @@ from .strings import truncate
 LOG = logging.getLogger(__name__)
 
 
-StrPath = Union[str, os.PathLike]
+StrPath = str | os.PathLike
 
 
 def is_zip_file(content):
@@ -30,13 +30,13 @@ def is_zip_file(content):
     return zipfile.is_zipfile(stream)
 
 
-def get_unzipped_size(zip_file: Union[str, IO[bytes]]):
+def get_unzipped_size(zip_file: str | IO[bytes]):
     """Returns the size of the unzipped file."""
     with zipfile.ZipFile(zip_file, "r") as zip_ref:
         return sum(f.file_size for f in zip_ref.infolist())
 
 
-def unzip(path: str, target_dir: str, overwrite: bool = True) -> Optional[Union[str, Popen]]:
+def unzip(path: str, target_dir: str, overwrite: bool = True) -> str | Popen | None:
     from localstack.utils.platform import is_debian
 
     use_native_cmd = is_debian() or is_command_available("unzip")
@@ -99,7 +99,7 @@ def create_zip_file_python(
     base_dir: StrPath,
     zip_file: StrPath,
     mode: Literal["r", "w", "x", "a"] = "w",
-    content_root: Optional[str] = None,
+    content_root: str | None = None,
 ):
     with zipfile.ZipFile(zip_file, mode) as zip_file:
         for root, dirs, files in os.walk(base_dir):
@@ -122,7 +122,7 @@ def add_file_to_jar(class_file, class_url, target_jar, base_dir=None):
 
 
 def update_jar_manifest(
-    jar_file_name: str, parent_dir: str, search: Union[str, re.Pattern], replace: str
+    jar_file_name: str, parent_dir: str, search: str | re.Pattern, replace: str
 ):
     manifest_file_path = "META-INF/MANIFEST.MF"
     jar_path = os.path.join(parent_dir, jar_file_name)
@@ -174,10 +174,10 @@ def upgrade_jar_file(base_dir: str, file_glob: str, maven_asset: str):
 def download_and_extract(
     archive_url: str,
     target_dir: str,
-    retries: Optional[int] = 0,
-    sleep: Optional[int] = 3,
-    tmp_archive: Optional[str] = None,
-    checksum_url: Optional[str] = None,
+    retries: int | None = 0,
+    sleep: int | None = 3,
+    tmp_archive: str | None = None,
+    checksum_url: str | None = None,
 ) -> None:
     """
     Download and extract an archive to a target directory with optional checksum verification.
@@ -250,7 +250,7 @@ def download_and_extract_with_retry(
     archive_url,
     tmp_archive,
     target_dir,
-    checksum_url: Optional[str] = None,
+    checksum_url: str | None = None,
 ):
     try:
         download_and_extract(

localstack/utils/aws/arns.py

@@ -1,7 +1,7 @@
 import logging
 import re
 from functools import cache
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 from botocore.utils import ArnParser, InvalidArnException
 
@@ -27,7 +27,7 @@ PARTITION_NAMES = list(REGION_PREFIX_TO_PARTITION.values()) + [DEFAULT_PARTITION
 ARN_PARTITION_REGEX = r"^arn:(" + "|".join(sorted(PARTITION_NAMES)) + ")"
 
 
-def get_partition(region: Optional[str]) -> str:
+def get_partition(region: str | None) -> str:
     if not region:
         return DEFAULT_PARTITION
     if region in PARTITION_NAMES:
@@ -65,28 +65,28 @@ def parse_arn(arn: str) -> ArnData:
     return _arn_parser.parse_arn(arn)
 
 
-def extract_account_id_from_arn(arn: str) -> Optional[str]:
+def extract_account_id_from_arn(arn: str) -> str | None:
     try:
         return parse_arn(arn).get("account")
     except InvalidArnException:
         return None
 
 
-def extract_region_from_arn(arn: str) -> Optional[str]:
+def extract_region_from_arn(arn: str) -> str | None:
     try:
         return parse_arn(arn).get("region")
     except InvalidArnException:
         return None
 
 
-def extract_service_from_arn(arn: str) -> Optional[str]:
+def extract_service_from_arn(arn: str) -> str | None:
     try:
         return parse_arn(arn).get("service")
     except InvalidArnException:
         return None
 
 
-def extract_resource_from_arn(arn: str) -> Optional[str]:
+def extract_resource_from_arn(arn: str) -> str | None:
     try:
         return parse_arn(arn).get("resource")
     except InvalidArnException:
@@ -285,7 +285,7 @@ def lambda_event_source_mapping_arn(uuid: str, account_id: str, region_name: str
 def lambda_function_or_layer_arn(
     type: str,
     entity_name: str,
-    version: Optional[str],
+    version: str | None,
     account_id: str,
     region_name: str,
 ) -> str:

localstack/utils/aws/aws_responses.py

@@ -3,7 +3,7 @@ import datetime
 import json
 import re
 from binascii import crc32
-from typing import Any, Optional, Union
+from typing import Any
 from urllib.parse import parse_qs
 
 import xmltodict
@@ -36,10 +36,10 @@ def requests_error_response_json(message, code=500, error_type="InternalFailure"
 
 def requests_error_response_xml(
     message: str,
-    code: Optional[int] = 400,
-    code_string: Optional[str] = "InvalidParameter",
-    service: Optional[str] = None,
-    xmlns: Optional[str] = None,
+    code: int | None = 400,
+    code_string: str | None = "InvalidParameter",
+    service: str | None = None,
+    xmlns: str | None = None,
 ):
     response = RequestsResponse()
     xmlns = xmlns or f"http://{service}.amazonaws.com/doc/2010-03-31/"
@@ -100,7 +100,7 @@ def requests_error_response_xml_signature_calculation(
 
 def requests_error_response(
     req_headers: dict,
-    message: Union[str, bytes],
+    message: str | bytes,
     code: int = 500,
     error_type: str = "InternalFailure",
     service: str = None,
@@ -201,7 +201,7 @@ def parse_query_string(url_or_qs: str, multi_values=False) -> dict[str, str]:
     return result
 
 
-def calculate_crc32(content: Union[str, bytes]) -> int:
+def calculate_crc32(content: str | bytes) -> int:
     return crc32(to_bytes(content)) & 0xFFFFFFFF
 
 

localstack/utils/aws/aws_stack.py

@@ -2,7 +2,6 @@ import logging
 import re
 import socket
 from functools import lru_cache
-from typing import Union
 
 import boto3
 
@@ -46,7 +45,7 @@ def get_boto3_region() -> str:
     return boto3.session.Session().region_name
 
 
-def get_local_service_url(service_name_or_port: Union[str, int]) -> str:
+def get_local_service_url(service_name_or_port: str | int) -> str:
     """Return the local service URL for the given service name or port."""
     # TODO(srw): we don't need to differentiate on service name any more, so remove the argument
     if isinstance(service_name_or_port, int):
@@ -68,7 +67,7 @@ def get_s3_hostname():
 
 
 def fix_account_id_in_arns(
-    response, replacement: str, colon_delimiter: str = ":", existing: Union[str, list[str]] = None
+    response, replacement: str, colon_delimiter: str = ":", existing: str | list[str] = None
 ):
     """Fix the account ID in the ARNs returned in the given Flask response or string"""
     from moto.core import DEFAULT_ACCOUNT_ID

localstack/utils/aws/message_forwarding.py

@@ -3,7 +3,6 @@ import json
 import logging
 import re
 import uuid
-from typing import Optional
 
 from moto.events.models import events_backends
 
@@ -214,7 +213,7 @@ def list_of_parameters_to_object(items):
     return {item.get("Key"): item.get("Value") for item in items}
 
 
-def send_event_to_api_destination(target_arn, event, http_parameters: Optional[dict] = None):
+def send_event_to_api_destination(target_arn, event, http_parameters: dict | None = None):
     """Send an event to an EventBridge API destination
     See https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-api-destinations.html"""
 

localstack/utils/aws/request_context.py

@@ -4,7 +4,6 @@ This module has utilities relating to creating/parsing AWS requests.
 
 import logging
 import re
-from typing import Optional
 
 from rolo import Request as RoloRequest
 
@@ -30,7 +29,7 @@ def get_account_id_from_request(request: RoloRequest) -> str:
     return get_account_id_from_access_key_id(access_key_id)
 
 
-def extract_region_from_auth_header(headers) -> Optional[str]:
+def extract_region_from_auth_header(headers) -> str | None:
     auth = headers.get("Authorization") or ""
     region = re.sub(r".*Credential=[^/]+/[^/]+/([^/]+)/.*", r"\1", auth)
     if region == auth:
@@ -38,12 +37,12 @@ def extract_region_from_auth_header(headers) -> Optional[str]:
     return region
 
 
-def extract_account_id_from_auth_header(headers) -> Optional[str]:
+def extract_account_id_from_auth_header(headers) -> str | None:
     if access_key_id := extract_access_key_id_from_auth_header(headers):
         return get_account_id_from_access_key_id(access_key_id)
 
 
-def extract_access_key_id_from_auth_header(headers: dict[str, str]) -> Optional[str]:
+def extract_access_key_id_from_auth_header(headers: dict[str, str]) -> str | None:
     auth = headers.get("Authorization") or ""
 
     if auth.startswith("AWS4-"):
@@ -67,7 +66,7 @@ def extract_region_from_headers(headers) -> str:
     return extract_region_from_auth_header(headers) or AWS_REGION_US_EAST_1
 
 
-def extract_service_name_from_auth_header(headers: dict) -> Optional[str]:
+def extract_service_name_from_auth_header(headers: dict) -> str | None:
     try:
         auth_header = headers.get("authorization", "")
         credential_scope = auth_header.split(",")[0].split()[1]

localstack/utils/batch_policy.py

@@ -1,6 +1,6 @@
 import copy
 import time
-from typing import Generic, Optional, TypeVar, overload
+from typing import Generic, TypeVar, overload
 
 from pydantic import Field
 from pydantic.dataclasses import dataclass
@@ -47,8 +47,8 @@ class Batcher(Generic[T]):
         assert batcher.flush() == ["item1", "item2", "item3", "item4"]
     """
 
-    max_count: Optional[int] = Field(default=None, description="Maximum number of items", ge=0)
-    max_window: Optional[float] = Field(
+    max_count: int | None = Field(default=None, description="Maximum number of items", ge=0)
+    max_window: float | None = Field(
         default=None, description="Maximum time window in seconds", ge=0
     )
 

localstack/utils/bootstrap.py

@@ -9,9 +9,9 @@ import shlex
 import signal
 import threading
 import time
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from functools import wraps
-from typing import Any, Callable, Optional, Union
+from typing import Any
 
 from localstack import config, constants
 from localstack.config import (
@@ -175,7 +175,7 @@ def get_docker_image_details(image_name: str = None) -> dict[str, str]:
     return result
 
 
-def get_image_environment_variable(env_name: str) -> Optional[str]:
+def get_image_environment_variable(env_name: str) -> str | None:
     image_name = get_docker_image_to_start()
     image_info = DOCKER_CLIENT.inspect_image(image_name)
     image_envs = image_info["Config"]["Env"]
@@ -544,7 +544,7 @@ class ContainerConfigurators:
 
     @staticmethod
     def gateway_listen(
-        port: Union[int, Iterable[int], HostAndPort, Iterable[HostAndPort]],
+        port: int | Iterable[int] | HostAndPort | Iterable[HostAndPort],
     ):
         """
         Uses the given ports to configure GATEWAY_LISTEN. For instance, ``gateway_listen([4566, 443])`` would
@@ -1000,7 +1000,7 @@ class RunningContainer:
                     return
                 raise
 
-    def inspect(self) -> dict[str, Union[dict, str]]:
+    def inspect(self) -> dict[str, dict | str]:
         return self.container_client.inspect_container(container_name_or_id=self.id)
 
     def attach(self):
@@ -1028,7 +1028,7 @@ class ContainerLogPrinter:
         self.callback = callback
 
         self._closed = threading.Event()
-        self._stream: Optional[CancellableStream] = None
+        self._stream: CancellableStream | None = None
 
     def _can_start_streaming(self):
         if self._closed.is_set():
@@ -1338,7 +1338,7 @@ def start_infra_in_docker_detached(console, cli_params: dict[str, Any] = None):
     console.log("detaching")
 
 
-def wait_container_is_ready(timeout: Optional[float] = None):
+def wait_container_is_ready(timeout: float | None = None):
     """Blocks until the localstack main container is running and the ready marker has been printed."""
     container_name = config.MAIN_CONTAINER_NAME
     started = time.time()

localstack/utils/cloudwatch/cloudwatch_util.py

@@ -2,7 +2,7 @@ import logging
 import time
 from datetime import datetime, timezone
 from itertools import islice
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 from werkzeug import Response as WerkzeugResponse
 
@@ -20,8 +20,8 @@ LOG = logging.getLogger(__name__)
 class SqsMetricBatchData(TypedDict, total=False):
     MetricName: str
     QueueName: str
-    Value: Optional[int]
-    Unit: Optional[str]
+    Value: int | None
+    Unit: str | None
 
 
 def dimension_lambda(kwargs):
@@ -30,7 +30,7 @@ def dimension_lambda(kwargs):
 
 
 def publish_lambda_metric(
-    metric, value, kwargs, account_id: Optional[str] = None, region_name: Optional[str] = None
+    metric, value, kwargs, account_id: str | None = None, region_name: str | None = None
 ):
     # publish metric only if CloudWatch service is available
     if not is_api_enabled("cloudwatch"):
@@ -155,7 +155,7 @@ def store_cloudwatch_logs(
     log_stream_name,
     log_output,
     start_time=None,
-    auto_create_group: Optional[bool] = True,
+    auto_create_group: bool | None = True,
 ):
     if not is_api_enabled("logs"):
         return

localstack/utils/collections.py

@@ -5,10 +5,9 @@ and manipulate python collection (dicts, list, sets).
 
 import logging
 import re
-from collections.abc import Iterable, Iterator, Mapping, Sized
+from collections.abc import Callable, Iterable, Iterator, Mapping, Sized
 from typing import (
     Any,
-    Callable,
     Optional,
     TypedDict,
     TypeVar,
@@ -116,7 +115,7 @@ class PaginatedList(list[_ListType]):
         next_token: str = None,
         page_size: int = None,
         filter_function: Callable[[_ListType], bool] = None,
-    ) -> tuple[list[_ListType], Optional[str]]:
+    ) -> tuple[list[_ListType], str | None]:
         if filter_function is not None:
             result_list = list(filter(filter_function, self))
         else:
@@ -148,7 +147,7 @@ class PaginatedList(list[_ListType]):
 class CustomExpiryTTLCache(cachetools.TTLCache):
     """TTLCache that allows to set custom expiry times for individual keys."""
 
-    def set_expiry(self, key: Any, ttl: Union[float, int]) -> float:
+    def set_expiry(self, key: Any, ttl: float | int) -> float:
         """Set the expiry of the given key in a TTLCache to (<current_time> + <ttl>)"""
         with self.timer as time:
             # note: need to access the internal dunder API here
@@ -315,7 +314,7 @@ def is_list_or_tuple(obj) -> bool:
     return isinstance(obj, (list, tuple))
 
 
-def ensure_list(obj: Any, wrap_none=False) -> Optional[list]:
+def ensure_list(obj: Any, wrap_none=False) -> list | None:
     """Wrap the given object in a list, or return the object itself if it already is a list."""
     if obj is None and not wrap_none:
         return obj
@@ -414,7 +413,7 @@ def items_equivalent(list1, list2, comparator):
     return True
 
 
-def is_none_or_empty(obj: Union[Optional[str], Optional[list]]) -> bool:
+def is_none_or_empty(obj: str | None | list | None) -> bool:
     return (
         obj is None
         or (isinstance(obj, str) and obj.strip() == "")
@@ -475,7 +474,7 @@ def convert_to_typed_dict(typed_dict: type[T], obj: dict, strict: bool = False)
     return result
 
 
-def dict_multi_values(elements: Union[list, dict]) -> dict[str, list[Any]]:
+def dict_multi_values(elements: list | dict) -> dict[str, list[Any]]:
     """
     Return a dictionary with the original keys from the list of dictionary and the
     values are the list of values of the original dictionary.
@@ -516,7 +515,7 @@ def split_list_by(
     return truthy, falsy
 
 
-def is_comma_delimited_list(string: str, item_regex: Optional[str] = None) -> bool:
+def is_comma_delimited_list(string: str, item_regex: str | None = None) -> bool:
     """
     Checks if the given string is a comma-delimited list of items.
     The optional `item_regex` parameter specifies the regex pattern for each item in the list.

localstack/utils/config_listener.py

@@ -1,7 +1,7 @@
 import json
 import logging
 import re
-from typing import Callable
+from collections.abc import Callable
 
 from requests.models import Response
 

localstack/utils/container_networking.py

@@ -2,7 +2,6 @@ import logging
 import os
 import re
 from functools import lru_cache
-from typing import Optional
 
 from localstack import config, constants
 from localstack.utils.container_utils.container_client import ContainerException
@@ -13,7 +12,7 @@ LOG = logging.getLogger(__name__)
 
 
 @lru_cache
-def get_main_container_network() -> Optional[str]:
+def get_main_container_network() -> str | None:
     """
     Gets the main network of the LocalStack container (if we run in one, bridge otherwise)
     If there are multiple networks connected to the LocalStack container, we choose the first as "main" network
@@ -50,7 +49,7 @@ def get_main_container_network() -> Optional[str]:
 
 
 @lru_cache
-def get_endpoint_for_network(network: Optional[str] = None) -> str:
+def get_endpoint_for_network(network: str | None = None) -> str:
     """
     Get the LocalStack endpoint (= IP address) on the given network.
     If a network is given, it will return the IP address/hostname of LocalStack on that network