localstack-core 4.7.1.dev22__py3-none-any.whl → 4.7.1.dev24__py3-none-any.whl

localstack/aws/protocol/service_router.py

@@ -1,5 +1,5 @@
 import logging
-from typing import NamedTuple, Optional, Set
+from typing import NamedTuple
 
 from botocore.model import ServiceModel
 from werkzeug.exceptions import RequestEntityTooLarge
@@ -28,15 +28,15 @@ class _ServiceIndicators(NamedTuple):
 
     # AWS service's "signing name" - Contained in the Authorization header
     # (https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-auth-using-authorization-header.html)
-    signing_name: Optional[str] = None
+    signing_name: str | None = None
     # Target prefix as defined in the service specs for non-rest protocols - Contained in the X-Amz-Target header
-    target_prefix: Optional[str] = None
+    target_prefix: str | None = None
     # Targeted operation as defined in the service specs for non-rest protocols - Contained in the X-Amz-Target header
-    operation: Optional[str] = None
+    operation: str | None = None
     # Host field of the HTTP request
-    host: Optional[str] = None
+    host: str | None = None
     # Path of the HTTP request
-    path: Optional[str] = None
+    path: str | None = None
 
 
 def _extract_service_indicators(request: Request) -> _ServiceIndicators:
@@ -111,7 +111,7 @@ signing_name_path_prefix_rules = {
 }
 
 
-def custom_signing_name_rules(signing_name: str, path: str) -> Optional[ServiceModelIdentifier]:
+def custom_signing_name_rules(signing_name: str, path: str) -> ServiceModelIdentifier | None:
     """
     Rules which are based on the signing name (in the auth header) and the request path.
     """
@@ -134,7 +134,7 @@ def custom_signing_name_rules(signing_name: str, path: str) -> Optional[ServiceM
     return rules.get("*", ServiceModelIdentifier(signing_name))
 
 
-def custom_host_addressing_rules(host: str) -> Optional[ServiceModelIdentifier]:
+def custom_host_addressing_rules(host: str) -> ServiceModelIdentifier | None:
     """
     Rules based on the host header of the request, which is typically the data plane of a service.
 
@@ -147,7 +147,7 @@ def custom_host_addressing_rules(host: str) -> Optional[ServiceModelIdentifier]:
         return ServiceModelIdentifier("s3")
 
 
-def custom_path_addressing_rules(path: str) -> Optional[ServiceModelIdentifier]:
+def custom_path_addressing_rules(path: str) -> ServiceModelIdentifier | None:
     """
     Rules which are only based on the request path.
     """
@@ -159,7 +159,7 @@ def custom_path_addressing_rules(path: str) -> Optional[ServiceModelIdentifier]:
         return ServiceModelIdentifier("lambda")
 
 
-def legacy_s3_rules(request: Request) -> Optional[ServiceModelIdentifier]:
+def legacy_s3_rules(request: Request) -> ServiceModelIdentifier | None:
     """
     *Legacy* rules which allow us to fallback to S3 if no other service was matched.
     All rules which are implemented here should be removed once we make sure it would not break any use-cases.
@@ -228,7 +228,7 @@ def legacy_s3_rules(request: Request) -> Optional[ServiceModelIdentifier]:
 
 
 def resolve_conflicts(
-    candidates: Set[ServiceModelIdentifier], request: Request
+    candidates: set[ServiceModelIdentifier], request: Request
 ) -> ServiceModelIdentifier:
     """
     Some service definitions are overlapping to a point where they are _not_ distinguishable at all
@@ -258,7 +258,7 @@ def resolve_conflicts(
 
 def determine_aws_service_model_for_data_plane(
     request: Request, services: ServiceCatalog = None
-) -> Optional[ServiceModel]:
+) -> ServiceModel | None:
     """
     A stripped down version of ``determine_aws_service_model`` which only checks hostname indicators for
     the AWS data plane, such as s3 websites, lambda function URLs, or API gateway routes.
@@ -271,7 +271,7 @@ def determine_aws_service_model_for_data_plane(
 
 def determine_aws_service_model(
     request: Request, services: ServiceCatalog = None
-) -> Optional[ServiceModel]:
+) -> ServiceModel | None:
     """
     Tries to determine the name of the AWS service an incoming request is targeting.
     :param request: to determine the target service name of

localstack/aws/protocol/validate.py

@@ -1,6 +1,6 @@
 """Slightly extends the ``botocore.validate`` package to provide better integration with our parser/serializer."""
 
-from typing import Any, Dict, List, NamedTuple
+from typing import Any, NamedTuple
 
 from botocore.model import OperationModel, Shape
 from botocore.validate import ParamValidator as BotocoreParamValidator
@@ -22,7 +22,7 @@ class Error(NamedTuple):
 
     reason: str
     name: str
-    attributes: Dict[str, Any]
+    attributes: dict[str, Any]
 
 
 class ParameterValidationError(Exception):
@@ -88,11 +88,11 @@ class EmptyInput(ParameterValidationError):
 
 
 class ValidationErrors(BotocoreValidationErrors):
-    def __init__(self, shape: Shape, params: Dict[str, Any]):
+    def __init__(self, shape: Shape, params: dict[str, Any]):
         super().__init__()
         self.shape = shape
         self.params = params
-        self._exceptions: List[ParameterValidationError] = []
+        self._exceptions: list[ParameterValidationError] = []
 
     @property
     def exceptions(self):
@@ -133,7 +133,7 @@ class ValidationErrors(BotocoreValidationErrors):
 
 
 class ParamValidator(BotocoreParamValidator):
-    def validate(self, params: Dict[str, Any], shape: Shape):
+    def validate(self, params: dict[str, Any], shape: Shape):
         """Validate parameters against a shape model.
 
         This method will validate the parameters against a provided shape model.

localstack/aws/scaffold.py

@@ -1,10 +1,10 @@
 import io
 import keyword
 import re
+from collections import OrderedDict
 from functools import cached_property
 from multiprocessing import Pool
 from pathlib import Path
-from typing import Dict, List, Optional, Set
 
 import click
 from botocore import xform_name
@@ -18,7 +18,6 @@ from botocore.model import (
     StringShape,
     StructureShape,
 )
-from typing_extensions import OrderedDict
 
 from localstack.aws.spec import load_service
 from localstack.utils.common import camel_to_snake_case, snake_to_camel_case
@@ -75,7 +74,7 @@ class ShapeNode:
         self.shape = shape
 
     @cached_property
-    def request_operation(self) -> Optional[OperationModel]:
+    def request_operation(self) -> OperationModel | None:
         for operation_name in self.service.operation_names:
             operation = self.service.operation_model(operation_name)
             if operation.input_shape is None:
@@ -89,7 +88,7 @@ class ShapeNode:
         return None
 
     @cached_property
-    def response_operation(self) -> Optional[OperationModel]:
+    def response_operation(self) -> OperationModel | None:
         for operation_name in self.service.operation_names:
             operation = self.service.operation_model(operation_name)
             if operation.output_shape is None:
@@ -128,7 +127,7 @@ class ShapeNode:
         return isinstance(self.shape, StringShape) and self.shape.enum
 
     @property
-    def dependencies(self) -> List[str]:
+    def dependencies(self) -> list[str]:
         shape = self.shape
 
         if isinstance(shape, StructureShape):
@@ -327,7 +326,7 @@ def generate_service_types(output, service: ServiceModel, doc=True):
     output.write("\n")
 
     # ==================================== print type declarations
-    nodes: Dict[str, ShapeNode] = {}
+    nodes: dict[str, ShapeNode] = {}
 
     for shape_name in service.shape_names:
         shape = service.shape_for(shape_name)
@@ -338,9 +337,9 @@ def generate_service_types(output, service: ServiceModel, doc=True):
     #     output.write(f'    "{name}",\n')
     # output.write("]\n")
 
-    printed: Set[str] = set()
-    visited: Set[str] = set()
-    stack: List[str] = list(nodes.keys())
+    printed: set[str] = set()
+    visited: set[str] = set()
+    stack: list[str] = list(nodes.keys())
 
     stack = sorted(stack, key=lambda name: nodes[name].get_order())
     stack.reverse()

localstack/aws/serving/edge.py

@@ -1,6 +1,5 @@
 import logging
 import threading
-from typing import List
 
 from rolo.gateway.wsgi import WsgiGateway
 
@@ -15,7 +14,7 @@ LOG = logging.getLogger(__name__)
 
 
 def serve_gateway(
-    listen: HostAndPort | List[HostAndPort], use_ssl: bool, asynchronous: bool = False
+    listen: HostAndPort | list[HostAndPort], use_ssl: bool, asynchronous: bool = False
 ):
     """
     Implementation of the edge.do_start_edge_proxy interface to start a Hypercorn server instance serving the
@@ -37,7 +36,7 @@ def serve_gateway(
 
 
 def _serve_werkzeug(
-    gateway: LocalstackAwsGateway, listen: List[HostAndPort], use_ssl: bool, asynchronous: bool
+    gateway: LocalstackAwsGateway, listen: list[HostAndPort], use_ssl: bool, asynchronous: bool
 ):
     from werkzeug.serving import ThreadedWSGIServer
 
@@ -57,7 +56,7 @@ def _serve_werkzeug(
         params["ssl_context"] = (cert_file_name, key_file_name)
 
     threads = []
-    servers: List[ThreadedWSGIServer] = []
+    servers: list[ThreadedWSGIServer] = []
 
     for host_port in listen:
         kwargs = dict(params)
@@ -90,7 +89,7 @@ def _serve_werkzeug(
 
 
 def _serve_hypercorn(
-    gateway: LocalstackAwsGateway, listen: List[HostAndPort], use_ssl: bool, asynchronous: bool
+    gateway: LocalstackAwsGateway, listen: list[HostAndPort], use_ssl: bool, asynchronous: bool
 ):
     from localstack.http.hypercorn import GatewayServer
 
@@ -112,7 +111,7 @@ def _serve_hypercorn(
 
 
 def _serve_twisted(
-    gateway: LocalstackAwsGateway, listen: List[HostAndPort], use_ssl: bool, asynchronous: bool
+    gateway: LocalstackAwsGateway, listen: list[HostAndPort], use_ssl: bool, asynchronous: bool
 ):
     from .twisted import serve_gateway
 

localstack/aws/serving/hypercorn.py

@@ -1,5 +1,5 @@
 import asyncio
-from typing import Any, Optional, Tuple
+from typing import Any
 
 from hypercorn import Config
 from hypercorn.asyncio import serve as serve_hypercorn
@@ -15,7 +15,7 @@ def serve(
     host: str = "localhost",
     port: int = constants.DEFAULT_PORT_EDGE,
     use_reloader: bool = True,
-    ssl_creds: Optional[Tuple[Any, Any]] = None,
+    ssl_creds: tuple[Any, Any] | None = None,
     **kwargs,
 ) -> None:
     """

localstack/aws/serving/twisted.py

@@ -4,7 +4,6 @@ Bindings to serve LocalStack using twisted.
 
 import logging
 import time
-from typing import List
 
 from rolo.gateway import Gateway
 from rolo.serving.twisted import TwistedGateway
@@ -130,7 +129,7 @@ def stop_thread_pool(self: ThreadPool, stop, timeout: float = None):
 
 
 def serve_gateway(
-    gateway: Gateway, listen: List[HostAndPort], use_ssl: bool, asynchronous: bool = False
+    gateway: Gateway, listen: list[HostAndPort], use_ssl: bool, asynchronous: bool = False
 ):
     """
     Serve a Gateway instance using twisted.

localstack/aws/serving/werkzeug.py

@@ -1,5 +1,5 @@
 import ssl
-from typing import TYPE_CHECKING, Any, Optional, Tuple
+from typing import TYPE_CHECKING, Any
 
 from rolo.gateway import Gateway
 from rolo.gateway.wsgi import WsgiGateway
@@ -17,7 +17,7 @@ def serve(
     host: str = "localhost",
     port: int = constants.DEFAULT_PORT_EDGE,
     use_reloader: bool = True,
-    ssl_creds: Optional[Tuple[Any, Any]] = None,
+    ssl_creds: tuple[Any, Any] | None = None,
     **kwargs,
 ) -> None:
     """

localstack/aws/skeleton.py

@@ -1,6 +1,7 @@
 import inspect
 import logging
-from typing import Any, Callable, Dict, NamedTuple, Optional, Union
+from collections.abc import Callable
+from typing import Any, NamedTuple
 
 from botocore import xform_name
 from botocore.model import ServiceModel
@@ -20,10 +21,10 @@ from localstack.utils.coverage_docs import get_coverage_link_for_service
 
 LOG = logging.getLogger(__name__)
 
-DispatchTable = Dict[str, ServiceRequestHandler]
+DispatchTable = dict[str, ServiceRequestHandler]
 
 
-def create_skeleton(service: Union[str, ServiceModel], delegate: Any):
+def create_skeleton(service: str | ServiceModel, delegate: Any):
     if isinstance(service, str):
         service = load_service(service)
 
@@ -49,7 +50,7 @@ def create_dispatch_table(delegate: object) -> DispatchTable:
     # scan class tree for @handler wrapped functions (reverse class tree so that inherited functions overwrite parent
     # functions)
     cls_tree = inspect.getmro(delegate.__class__)
-    handlers: Dict[str, HandlerAttributes] = {}
+    handlers: dict[str, HandlerAttributes] = {}
     cls_tree = reversed(list(cls_tree))
     for cls in cls_tree:
         if cls == object:
@@ -98,9 +99,7 @@ class ServiceRequestDispatcher:
         self.pass_context = pass_context
         self.expand_parameters = expand_parameters
 
-    def __call__(
-        self, context: RequestContext, request: ServiceRequest
-    ) -> Optional[ServiceResponse]:
+    def __call__(self, context: RequestContext, request: ServiceRequest) -> ServiceResponse | None:
         args = []
         kwargs = {}
 
@@ -122,7 +121,7 @@ class Skeleton:
     service: ServiceModel
     dispatch_table: DispatchTable
 
-    def __init__(self, service: ServiceModel, implementation: Union[Any, DispatchTable]):
+    def __init__(self, service: ServiceModel, implementation: Any | DispatchTable):
         self.service = service
 
         if isinstance(implementation, dict):

localstack/aws/spec.py

@@ -4,8 +4,9 @@ import logging
 import os
 import sys
 from collections import defaultdict
+from collections.abc import Generator
 from functools import cached_property, lru_cache
-from typing import Dict, Generator, List, Literal, NamedTuple, Optional, Tuple
+from typing import Literal, NamedTuple
 
 import botocore
 import jsonpatch
@@ -31,13 +32,13 @@ class ServiceModelIdentifier(NamedTuple):
     """
 
     name: ServiceName
-    protocol: Optional[ProtocolName] = None
+    protocol: ProtocolName | None = None
 
 
 spec_patches_json = os.path.join(os.path.dirname(__file__), "spec-patches.json")
 
 
-def load_spec_patches() -> Dict[str, list]:
+def load_spec_patches() -> dict[str, list]:
     if not os.path.exists(spec_patches_json):
         return {}
     with open(spec_patches_json) as fd:
@@ -59,9 +60,9 @@ class PatchingLoader(Loader):
     A custom botocore Loader that applies JSON patches from the given json patch file to the specs as they are loaded.
     """
 
-    patches: Dict[str, list]
+    patches: dict[str, list]
 
-    def __init__(self, patches: Dict[str, list], *args, **kwargs):
+    def __init__(self, patches: dict[str, list], *args, **kwargs):
         # add the builtin data path to the extra_search_paths to ensure they are discovered by the loader
         super().__init__(*args, **kwargs)
         self.patches = patches
@@ -94,12 +95,12 @@ class UnknownServiceProtocolError(UnknownServiceError):
     fmt = "Unknown service protocol: '{service_name}-{protocol}'."
 
 
-def list_services() -> List[ServiceModel]:
+def list_services() -> list[ServiceModel]:
     return [load_service(service) for service in loader.list_available_services("service-2")]
 
 
 def load_service(
-    service: ServiceName, version: Optional[str] = None, protocol: Optional[ProtocolName] = None
+    service: ServiceName, version: str | None = None, protocol: ProtocolName | None = None
 ) -> ServiceModel:
     """
     Loads a service
@@ -136,7 +137,7 @@ def load_service(
     return ServiceModel(service_description, service)
 
 
-def iterate_service_operations() -> Generator[Tuple[ServiceModel, OperationModel], None, None]:
+def iterate_service_operations() -> Generator[tuple[ServiceModel, OperationModel], None, None]:
     """
     Returns one record per operation in the AWS service spec, where the first item is the service model the operation
     belongs to, and the second is the operation model.
@@ -154,11 +155,11 @@ class ServiceCatalogIndex:
     The ServiceCatalogIndex enables fast lookups for common operations to determine a service from service indicators.
     """
 
-    service_names: List[ServiceName]
-    target_prefix_index: Dict[str, List[ServiceModelIdentifier]]
-    signing_name_index: Dict[str, List[ServiceModelIdentifier]]
-    operations_index: Dict[str, List[ServiceModelIdentifier]]
-    endpoint_prefix_index: Dict[str, List[ServiceModelIdentifier]]
+    service_names: list[ServiceName]
+    target_prefix_index: dict[str, list[ServiceModelIdentifier]]
+    signing_name_index: dict[str, list[ServiceModelIdentifier]]
+    operations_index: dict[str, list[ServiceModelIdentifier]]
+    endpoint_prefix_index: dict[str, list[ServiceModelIdentifier]]
 
 
 class LazyServiceCatalogIndex:
@@ -167,11 +168,11 @@ class LazyServiceCatalogIndex:
     """
 
     @cached_property
-    def service_names(self) -> List[ServiceName]:
+    def service_names(self) -> list[ServiceName]:
         return list(self._services.keys())
 
     @cached_property
-    def target_prefix_index(self) -> Dict[str, List[ServiceModelIdentifier]]:
+    def target_prefix_index(self) -> dict[str, list[ServiceModelIdentifier]]:
         result = defaultdict(list)
         for service_models in self._services.values():
             for service_model in service_models:
@@ -183,7 +184,7 @@ class LazyServiceCatalogIndex:
         return dict(result)
 
     @cached_property
-    def signing_name_index(self) -> Dict[str, List[ServiceModelIdentifier]]:
+    def signing_name_index(self) -> dict[str, list[ServiceModelIdentifier]]:
         result = defaultdict(list)
         for service_models in self._services.values():
             for service_model in service_models:
@@ -193,7 +194,7 @@ class LazyServiceCatalogIndex:
         return dict(result)
 
     @cached_property
-    def operations_index(self) -> Dict[str, List[ServiceModelIdentifier]]:
+    def operations_index(self) -> dict[str, list[ServiceModelIdentifier]]:
         result = defaultdict(list)
         for service_models in self._services.values():
             for service_model in service_models:
@@ -208,7 +209,7 @@ class LazyServiceCatalogIndex:
         return dict(result)
 
     @cached_property
-    def endpoint_prefix_index(self) -> Dict[str, List[ServiceModelIdentifier]]:
+    def endpoint_prefix_index(self) -> dict[str, list[ServiceModelIdentifier]]:
         result = defaultdict(list)
         for service_models in self._services.values():
             for service_model in service_models:
@@ -218,7 +219,7 @@ class LazyServiceCatalogIndex:
         return dict(result)
 
     @cached_property
-    def _services(self) -> Dict[ServiceName, List[ServiceModel]]:
+    def _services(self) -> dict[ServiceName, list[ServiceModel]]:
         services = defaultdict(list)
         for service in list_services():
             services[service.service_name].append(service)
@@ -232,38 +233,36 @@ class ServiceCatalog:
         self.index = index or LazyServiceCatalogIndex()
 
     @lru_cache(maxsize=512)
-    def get(
-        self, name: ServiceName, protocol: Optional[ProtocolName] = None
-    ) -> Optional[ServiceModel]:
+    def get(self, name: ServiceName, protocol: ProtocolName | None = None) -> ServiceModel | None:
         return load_service(name, protocol=protocol)
 
     @property
-    def service_names(self) -> List[ServiceName]:
+    def service_names(self) -> list[ServiceName]:
         return self.index.service_names
 
     @property
-    def target_prefix_index(self) -> Dict[str, List[ServiceModelIdentifier]]:
+    def target_prefix_index(self) -> dict[str, list[ServiceModelIdentifier]]:
         return self.index.target_prefix_index
 
     @property
-    def signing_name_index(self) -> Dict[str, List[ServiceModelIdentifier]]:
+    def signing_name_index(self) -> dict[str, list[ServiceModelIdentifier]]:
         return self.index.signing_name_index
 
     @property
-    def operations_index(self) -> Dict[str, List[ServiceModelIdentifier]]:
+    def operations_index(self) -> dict[str, list[ServiceModelIdentifier]]:
         return self.index.operations_index
 
     @property
-    def endpoint_prefix_index(self) -> Dict[str, List[ServiceModelIdentifier]]:
+    def endpoint_prefix_index(self) -> dict[str, list[ServiceModelIdentifier]]:
         return self.index.endpoint_prefix_index
 
-    def by_target_prefix(self, target_prefix: str) -> List[ServiceModelIdentifier]:
+    def by_target_prefix(self, target_prefix: str) -> list[ServiceModelIdentifier]:
         return self.target_prefix_index.get(target_prefix, [])
 
-    def by_signing_name(self, signing_name: str) -> List[ServiceModelIdentifier]:
+    def by_signing_name(self, signing_name: str) -> list[ServiceModelIdentifier]:
         return self.signing_name_index.get(signing_name, [])
 
-    def by_operation(self, operation_name: str) -> List[ServiceModelIdentifier]:
+    def by_operation(self, operation_name: str) -> list[ServiceModelIdentifier]:
         return self.operations_index.get(operation_name, [])
 
 

localstack/cli/localstack.py

@@ -3,7 +3,7 @@ import logging
 import os
 import sys
 import traceback
-from typing import Dict, List, Optional, Tuple, TypedDict
+from typing import Optional, TypedDict
 
 import click
 import requests
@@ -405,7 +405,7 @@ def cmd_status_services(format_: str) -> None:
         raise CLIError(f"could not connect to LocalStack health endpoint at {url}")
 
 
-def _print_service_table(services: Dict[str, str]) -> None:
+def _print_service_table(services: dict[str, str]) -> None:
     from rich.table import Table
 
     status_display = {
@@ -486,9 +486,9 @@ def cmd_start(
     no_banner: bool,
     detached: bool,
     network: str = None,
-    env: Tuple = (),
-    publish: Tuple = (),
-    volume: Tuple = (),
+    env: tuple = (),
+    publish: tuple = (),
+    volume: tuple = (),
     host_dns: bool = False,
     stack: str = None,
 ) -> None:
@@ -825,7 +825,7 @@ def cmd_update_docker_images() -> None:
     update_images(localstack_images)
 
 
-def update_images(image_list: List[str]) -> None:
+def update_images(image_list: list[str]) -> None:
     from rich.markup import escape
     from rich.progress import MofNCompleteColumn, Progress
 

localstack/cli/lpm.py

@@ -1,7 +1,7 @@
 import itertools
 import logging
 from multiprocessing.pool import ThreadPool
-from typing import List, Optional
+from typing import Optional
 
 import click
 from rich.console import Console
@@ -74,7 +74,7 @@ def _do_install_package(package: Package, version: str = None, target: InstallTa
     help="target of the installation",
 )
 def install(
-    package: List[str],
+    package: list[str],
     parallel: Optional[int] = 1,
     version: Optional[str] = None,
     target: Optional[str] = None,