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

localstack/dns/server.py

@@ -5,12 +5,13 @@ import os
 import re
 import textwrap
 import threading
+from collections.abc import Iterable
 from datetime import datetime
 from functools import cache
 from ipaddress import IPv4Address, IPv4Interface
 from pathlib import Path
 from socket import AddressFamily
-from typing import Iterable, Literal, Tuple
+from typing import Literal
 
 import psutil
 from cachetools import TTLCache, cached
@@ -90,7 +91,7 @@ THREAD_LOCAL = threading.local()
 
 # Type of the value given by DNSHandler.client_address
 # in the form (ip, port) e.g. ("127.0.0.1", 58291)
-ClientAddress = Tuple[str, int]
+ClientAddress = tuple[str, int]
 
 psutil_cache = TTLCache(maxsize=100, ttl=10)
 
@@ -253,7 +254,7 @@ class NonLoggingHandler(DNSHandler):
             THREAD_LOCAL.client_address = self.client_address
             THREAD_LOCAL.server = self.server
             THREAD_LOCAL.request = self.request
-            return super(NonLoggingHandler, self).handle(*args, **kwargs)
+            return super().handle(*args, **kwargs)
         except Exception:
             pass
 
@@ -444,13 +445,22 @@ class Resolver(DnsServerProtocol):
                 return True
         return False
 
+    def _find_matching_aliases(self, question: DNSQuestion) -> list[AliasTarget] | None:
+        """
+        Find aliases matching the question, supporting wildcards.
+        """
+        qlabel = DNSLabel(to_bytes(question.qname))
+        qtype = RecordType[QTYPE[question.qtype]]
+        for (label, rtype), targets in self.aliases.items():
+            if rtype == qtype and qlabel.matchWildcard(label):
+                return targets
+        return None
+
     def _resolve_alias(
         self, request: DNSRecord, reply: DNSRecord, client_address: ClientAddress
     ) -> bool:
         if request.q.qtype in (QTYPE.A, QTYPE.AAAA, QTYPE.CNAME):
-            key = (DNSLabel(to_bytes(request.q.qname)), RecordType[QTYPE[request.q.qtype]])
-            # check if we have aliases defined for our given qname/qtype pair
-            if aliases := self.aliases.get(key):
+            if aliases := self._find_matching_aliases(request.q):
                 for alias in aliases:
                     # if there is no health check, or the healthcheck is successful, we will consider this alias
                     # take the first alias passing this check

localstack/http/dispatcher.py

@@ -1,5 +1,4 @@
 from json import JSONEncoder
-from typing import Type
 
 from rolo.routing.handler import Handler, ResultValue
 from rolo.routing.handler import handler_dispatcher as _handler_dispatcher
@@ -14,7 +13,7 @@ __all__ = [
 ]
 
 
-def handler_dispatcher(json_encoder: Type[JSONEncoder] = None) -> Dispatcher[Handler]:
+def handler_dispatcher(json_encoder: type[JSONEncoder] = None) -> Dispatcher[Handler]:
     """
     Replacement for ``rolo.dispatcher.handler_dispatcher`` that uses by default LocalStack's CustomEncoder for
     serializing JSON documents.

localstack/http/response.py

@@ -1,5 +1,5 @@
 from json import JSONEncoder
-from typing import Any, Type
+from typing import Any
 
 from rolo import Response as RoloResponse
 
@@ -11,7 +11,7 @@ class Response(RoloResponse):
     An HTTP Response object, which simply extends werkzeug's Response object with a few convenience methods.
     """
 
-    def set_json(self, doc: Any, cls: Type[JSONEncoder] = CustomEncoder):
+    def set_json(self, doc: Any, cls: type[JSONEncoder] = CustomEncoder):
         """
         Serializes the given dictionary using localstack's ``CustomEncoder`` into a json response, and sets the
         mimetype automatically to ``application/json``.

localstack/http/router.py

@@ -1,6 +1,6 @@
+from collections.abc import Mapping
 from typing import (
     Any,
-    Mapping,
     TypeVar,
 )
 

localstack/http/trace.py

@@ -2,7 +2,8 @@ import dataclasses
 import inspect
 import logging
 import time
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from rolo import Response
 from rolo.gateway import ExceptionHandler, Handler, HandlerChain, RequestContext

localstack/logging/format.py

@@ -3,7 +3,7 @@
 import logging
 import re
 from functools import lru_cache
-from typing import Any, Dict
+from typing import Any
 
 from localstack.utils.numbers import format_bytes
 from localstack.utils.strings import to_bytes
@@ -32,7 +32,7 @@ class DefaultFormatter(logging.Formatter):
     """
 
     def __init__(self, fmt=LOG_FORMAT, datefmt=LOG_DATE_FORMAT):
-        super(DefaultFormatter, self).__init__(fmt=fmt, datefmt=datefmt)
+        super().__init__(fmt=fmt, datefmt=datefmt)
 
 
 class AddFormattedAttributes(logging.Filter):
@@ -48,7 +48,7 @@ class AddFormattedAttributes(logging.Filter):
     max_thread_len: int
 
     def __init__(self, max_name_len: int = None, max_thread_len: int = None):
-        super(AddFormattedAttributes, self).__init__()
+        super().__init__()
         self.max_name_len = max_name_len if max_name_len else MAX_NAME_LEN
         self.max_thread_len = max_thread_len if max_thread_len else MAX_THREAD_NAME_LEN
 
@@ -75,7 +75,7 @@ class MaskSensitiveInputFilter(logging.Filter):
     patterns: list[tuple[re.Pattern[bytes], bytes]]
 
     def __init__(self, sensitive_keys: list[str]):
-        super(MaskSensitiveInputFilter, self).__init__()
+        super().__init__()
 
         self.patterns = [
             (re.compile(to_bytes(rf'"{key}":\s*"[^"]+"')), to_bytes(f'"{key}": "******"'))
@@ -173,8 +173,8 @@ class AwsTraceLoggingFormatter(TraceLoggingFormatter):
     def __init__(self):
         super().__init__()
 
-    def _copy_service_dict(self, service_dict: Dict) -> Dict:
-        if not isinstance(service_dict, Dict):
+    def _copy_service_dict(self, service_dict: dict) -> dict:
+        if not isinstance(service_dict, dict):
             return service_dict
         result = {}
         for key, value in service_dict.items():

localstack/packages/api.py

@@ -3,10 +3,11 @@ import functools
 import logging
 import os
 from collections import defaultdict
+from collections.abc import Callable
 from enum import Enum
 from inspect import getmodule
-from threading import RLock
-from typing import Any, Callable, Generic, List, Optional, ParamSpec, TypeVar
+from threading import Lock, RLock
+from typing import Any, Generic, ParamSpec, TypeVar
 
 from plux import Plugin, PluginManager, PluginSpec  # type: ignore
 
@@ -56,7 +57,7 @@ class PackageInstaller(abc.ABC):
     multiple versions).
     """
 
-    def __init__(self, name: str, version: str, install_lock: Optional[RLock] = None):
+    def __init__(self, name: str, version: str, install_lock: Lock | None = None):
         """
         :param name: technical package name, f.e. "opensearch"
         :param version: version of the package to install
@@ -70,7 +71,7 @@ class PackageInstaller(abc.ABC):
         self.install_lock = install_lock or RLock()
         self._setup_for_target: dict[InstallTarget, bool] = defaultdict(lambda: False)
 
-    def install(self, target: Optional[InstallTarget] = None) -> None:
+    def install(self, target: InstallTarget | None = None) -> None:
         """
         Performs the package installation.
 
@@ -210,7 +211,7 @@ class Package(abc.ABC, Generic[T]):
         """
         return self.get_installer(version).get_installed_dir()
 
-    def install(self, version: str | None = None, target: Optional[InstallTarget] = None) -> None:
+    def install(self, version: str | None = None, target: InstallTarget | None = None) -> None:
         """
         Installs the package in the given version in the preferred target location.
         :param version: version of the package to install. If None, the default version of the package will be used.
@@ -219,7 +220,7 @@ class Package(abc.ABC, Generic[T]):
         """
         self.get_installer(version).install(target)
 
-    @functools.lru_cache()
+    @functools.lru_cache
     def get_installer(self, version: str | None = None) -> T:
         """
         Returns the installer instance for a specific version of the package.
@@ -237,7 +238,7 @@ class Package(abc.ABC, Generic[T]):
             raise NoSuchVersionException(package=self.name, version=version)
         return self._get_installer(version)
 
-    def get_versions(self) -> List[str]:
+    def get_versions(self) -> list[str]:
         """
         :return: List of all versions available for this package.
         """
@@ -262,7 +263,7 @@ class MultiPackageInstaller(PackageInstaller):
     PackageInstaller implementation which composes of multiple package installers.
     """
 
-    def __init__(self, name: str, version: str, package_installer: List[PackageInstaller]):
+    def __init__(self, name: str, version: str, package_installer: list[PackageInstaller]):
         """
         :param name: of the (multi-)package installer
         :param version: of this (multi-)package installer
@@ -274,7 +275,7 @@ class MultiPackageInstaller(PackageInstaller):
         assert len(package_installer) > 0
         self.package_installer = package_installer
 
-    def install(self, target: Optional[InstallTarget] = None) -> None:
+    def install(self, target: InstallTarget | None = None) -> None:
         """
         Installs the different packages this installer is composed of.
 
@@ -317,7 +318,7 @@ class PackagesPlugin(Plugin):  # type: ignore[misc]
         self,
         name: str,
         scope: str,
-        get_package: Callable[[], Package[PackageInstaller] | List[Package[PackageInstaller]]],
+        get_package: Callable[[], Package[PackageInstaller] | list[Package[PackageInstaller]]],
         should_load: Callable[[], bool] | None = None,
     ) -> None:
         super().__init__()
@@ -356,7 +357,7 @@ class PackagesPluginManager(PluginManager[PackagesPlugin]):  # type: ignore[misc
         )
 
     def get_packages(
-        self, package_names: list[str], version: Optional[str] = None
+        self, package_names: list[str], version: str | None = None
     ) -> list[Package[PackageInstaller]]:
         # Plugin names are unique, but there could be multiple packages with the same name in different scopes
         plugin_specs_per_name = defaultdict(list)
@@ -390,7 +391,7 @@ T2 = TypeVar("T2")
 def package(
     name: str | None = None,
     scope: str = "community",
-    should_load: Optional[Callable[[], bool]] = None,
+    should_load: Callable[[], bool] | None = None,
 ) -> Callable[[Callable[[], Package[Any] | list[Package[Any]]]], PluginSpec]:
     """
     Decorator for marking methods that create Package instances as a PackagePlugin.

localstack/packages/core.py

@@ -4,7 +4,7 @@ import re
 from abc import ABC
 from functools import lru_cache
 from sys import version_info
-from typing import Any, Optional, Tuple
+from typing import Any
 
 import requests
 
@@ -190,7 +190,7 @@ class GitHubReleaseInstaller(PermissionDownloadInstaller):
             f"https://api.github.com/repos/{github_slug}/releases/tags/{self.version}"
         )
 
-    @lru_cache()
+    @lru_cache
     def _get_download_url(self) -> str:
         asset_name = self._get_github_asset_name()
         # try to use a token when calling the GH API for increased API rate limits
@@ -238,7 +238,7 @@ class NodePackageInstaller(ExecutableInstaller):
         self,
         package_name: str,
         version: str,
-        package_spec: Optional[str] = None,
+        package_spec: str | None = None,
         main_module: str = "main.js",
     ):
         """
@@ -404,7 +404,7 @@ class MavenPackageInstaller(MavenDownloadInstaller):
         super()._install(target)
 
 
-def parse_maven_package_url(package_url: str) -> Tuple[str, str, str]:
+def parse_maven_package_url(package_url: str) -> tuple[str, str, str]:
     """Example: parse_maven_package_url("pkg:maven/software.amazon.event.ruler/event-ruler@1.7.3")
     -> software.amazon.event.ruler, event-ruler, 1.7.3
     """

localstack/packages/debugpy.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from localstack.packages import InstallTarget, Package, PackageInstaller
 from localstack.utils.run import run
 
@@ -8,7 +6,7 @@ class DebugPyPackage(Package["DebugPyPackageInstaller"]):
     def __init__(self) -> None:
         super().__init__("DebugPy", "latest")
 
-    def get_versions(self) -> List[str]:
+    def get_versions(self) -> list[str]:
         return ["latest"]
 
     def _get_installer(self, version: str) -> "DebugPyPackageInstaller":

localstack/packages/ffmpeg.py

@@ -1,5 +1,4 @@
 import os
-from typing import List
 
 from localstack.packages import Package
 from localstack.packages.core import ArchiveDownloadAndExtractInstaller
@@ -21,7 +20,7 @@ class FfmpegPackage(Package["FfmpegPackageInstaller"]):
     def _get_installer(self, version: str) -> "FfmpegPackageInstaller":
         return FfmpegPackageInstaller(version)
 
-    def get_versions(self) -> List[str]:
+    def get_versions(self) -> list[str]:
         return ["7.1"]
 
 

localstack/packages/java.py

@@ -1,6 +1,5 @@
 import logging
 import os
-from typing import List
 
 import requests
 
@@ -23,6 +22,7 @@ JAVA_VERSIONS = {
     "11": "11.0.25+9",
     "17": "17.0.13+11",
     "21": "21.0.5+11",
+    "24": "24.0.1+9",
 }
 
 
@@ -115,23 +115,49 @@ class JavaPackageInstaller(ArchiveDownloadAndExtractInstaller):
 
         # Build a custom JRE with only the necessary bits to minimise disk footprint
         LOG.debug("Optimising JRE installation")
-        cmd = (
-            "bin/jlink --add-modules "
+
+        base_modules = [
             # Required modules
-            "java.base,java.desktop,java.instrument,java.management,"
-            "java.naming,java.scripting,java.sql,java.xml,jdk.compiler,"
+            "java.base",
+            "java.desktop",
+            "java.instrument",
+            "java.management",
+            "java.naming",
+            "java.scripting",
+            "java.sql",
+            "java.xml",
+            "jdk.compiler",
             # jdk.unsupported contains sun.misc.Unsafe which is required by some dependencies
-            "jdk.unsupported,"
+            "jdk.unsupported",
             # Additional cipher suites
-            "jdk.crypto.cryptoki,"
+            "jdk.crypto.cryptoki",
             # Archive support
-            "jdk.zipfs,"
+            "jdk.zipfs",
             # Required by MQ broker
-            "jdk.httpserver,jdk.management,jdk.management.agent,"
+            "jdk.httpserver",
+            "jdk.management",
+            "jdk.management.agent",
             # Required by Spark and Hadoop
-            "java.security.jgss,jdk.security.auth,"
+            "java.security.jgss",
+            "jdk.security.auth",
+            # Include required locales
+            "jdk.localedata",
+        ]
+
+        # Add version-specific modules, not all versions require/support the same set
+        version_specific_modules = {
+            "24": ["jdk.incubator.vector"],  # Required for Trino latest version
+        }
+
+        modules = base_modules + version_specific_modules.get(self.version, [])
+        modules_str = ",".join(modules)
+
+        cmd = (
+            "bin/jlink "
+            # Add modules
+            f"--add-modules {modules_str} "
             # Include required locales
-            "jdk.localedata --include-locales en "
+            "--include-locales en "
             # Supplementary args
             "--compress 2 --strip-debug --no-header-files --no-man-pages "
             # Output directory
@@ -198,7 +224,7 @@ class JavaPackage(Package[JavaPackageInstaller]):
     def __init__(self, default_version: str = DEFAULT_JAVA_VERSION):
         super().__init__(name="Java", default_version=default_version)
 
-    def get_versions(self) -> List[str]:
+    def get_versions(self) -> list[str]:
         return list(JAVA_VERSIONS.keys())
 
     def _get_installer(self, version: str) -> JavaPackageInstaller:

localstack/packages/plugins.py

@@ -5,14 +5,6 @@ from localstack.packages.api import Package, package
 if TYPE_CHECKING:
     from localstack.packages.ffmpeg import FfmpegPackageInstaller
     from localstack.packages.java import JavaPackageInstaller
-    from localstack.packages.terraform import TerraformPackageInstaller
-
-
-@package(name="terraform")
-def terraform_package() -> Package["TerraformPackageInstaller"]:
-    from .terraform import terraform_package
-
-    return terraform_package
 
 
 @package(name="ffmpeg")

localstack/runtime/analytics.py

@@ -11,6 +11,7 @@ TRACKED_ENV_VAR = [
     "ACTIVATE_PRO",
     "ALLOW_NONSTANDARD_REGIONS",
     "BEDROCK_PREWARM",
+    "CFN_IGNORE_UNSUPPORTED_RESOURCE_TYPES",
     "CLOUDFRONT_LAMBDA_EDGE",
     "CONTAINER_RUNTIME",
     "DEBUG",
@@ -53,6 +54,7 @@ TRACKED_ENV_VAR = [
     "LAMBDA_RUNTIME_ENVIRONMENT_TIMEOUT",
     "LEGACY_EDGE_PROXY",  # Not functional; deprecated in 1.0.0, removed in 2.0.0
     "LS_LOG",
+    "LOCALSTACK_K8S_DEPLOYMENT_METHOD",
     "MOCK_UNIMPLEMENTED",  # Not functional; deprecated in 1.3.0, removed in 3.0.0
     "OPENSEARCH_ENDPOINT_STRATEGY",
     "PERSISTENCE",
@@ -78,6 +80,7 @@ PRESENCE_ENV_VAR = [
     "HOSTNAME_FROM_LAMBDA",
     "HOST_TMP_FOLDER",  # Not functional; deprecated in 1.0.0, removed in 2.0.0
     "INIT_SCRIPTS_PATH",  # Not functional; deprecated in 1.1.0, removed in 2.0.0
+    "KUBERNETES_SERVICE_HOST",
     "LAMBDA_DEBUG_MODE_CONFIG_PATH",
     "LEGACY_DIRECTORIES",  # Not functional; deprecated in 1.1.0, removed in 2.0.0
     "LEGACY_INIT_DIR",  # Not functional; deprecated in 1.1.0, removed in 2.0.0

localstack/runtime/hooks.py

@@ -65,7 +65,7 @@ class HookManager(PluginManager):
             fn_plugin(*args, **kwargs)
 
     def __str__(self):
-        return "HookManager(%s)" % self.namespace
+        return f"HookManager({self.namespace})"
 
     def __repr__(self):
         return self.__str__()

localstack/runtime/init.py

@@ -7,7 +7,6 @@ import subprocess
 import time
 from enum import Enum
 from functools import cached_property
-from typing import Dict, List, Optional
 
 from plux import Plugin, PluginManager
 
@@ -90,9 +89,9 @@ class ShellScriptRunner(ScriptRunner):
     suffixes = [".sh"]
 
     def run(self, path: str) -> None:
-        exit_code = subprocess.call(args=[], executable=path)
+        exit_code = subprocess.call(args=[path])
         if exit_code != 0:
-            raise OSError("Script %s returned a non-zero exit code %s" % (path, exit_code))
+            raise OSError(f"Script {path} returned a non-zero exit code {exit_code}")
 
 
 class PythonScriptRunner(ScriptRunner):
@@ -109,7 +108,7 @@ class PythonScriptRunner(ScriptRunner):
 
 
 class InitScriptManager:
-    _stage_directories: Dict[Stage, str] = {
+    _stage_directories: dict[Stage, str] = {
         Stage.BOOT: "boot.d",
         Stage.START: "start.d",
         Stage.READY: "ready.d",
@@ -117,7 +116,7 @@ class InitScriptManager:
     }
 
     script_root: str
-    stage_completed: Dict[Stage, bool]
+    stage_completed: dict[Stage, bool]
 
     def __init__(self, script_root: str):
         self.script_root = script_root
@@ -125,10 +124,10 @@ class InitScriptManager:
         self.runner_manager: PluginManager[ScriptRunner] = PluginManager(ScriptRunner.namespace)
 
     @cached_property
-    def scripts(self) -> Dict[Stage, List[Script]]:
+    def scripts(self) -> dict[Stage, list[Script]]:
         return self._find_scripts()
 
-    def get_script_runner(self, script_file: str) -> Optional[ScriptRunner]:
+    def get_script_runner(self, script_file: str) -> ScriptRunner | None:
         runners = self.runner_manager.load_all()
         for runner in runners:
             if runner.should_run(script_file):
@@ -138,7 +137,7 @@ class InitScriptManager:
     def has_script_runner(self, script_file: str) -> bool:
         return self.get_script_runner(script_file) is not None
 
-    def run_stage(self, stage: Stage) -> List[Script]:
+    def run_stage(self, stage: Stage) -> list[Script]:
         """
         Runs all scripts in the given stage.
 
@@ -188,7 +187,7 @@ class InitScriptManager:
 
         return scripts
 
-    def _find_scripts(self) -> Dict[Stage, List[Script]]:
+    def _find_scripts(self) -> dict[Stage, list[Script]]:
         scripts = {}
 
         if self.script_root is None:

localstack/runtime/main.py

@@ -20,13 +20,13 @@ def print_runtime_information(in_docker: bool = False):
     if in_docker:
         try:
             container_name = get_main_container_name()
-            print("LocalStack Docker container name: %s" % container_name)
+            print(f"LocalStack Docker container name: {container_name}")
             inspect_result = DOCKER_CLIENT.inspect_container(container_name)
             container_id = inspect_result["Id"]
-            print("LocalStack Docker container id: %s" % container_id[:12])
+            print(f"LocalStack Docker container id: {container_id[:12]}")
             image_details = DOCKER_CLIENT.inspect_image(inspect_result["Image"])
             digests = image_details.get("RepoDigests") or ["Unavailable"]
-            print("LocalStack Docker image sha: %s" % digests[0])
+            print(f"LocalStack Docker image sha: {digests[0]}")
         except ContainerException:
             print(
                 "LocalStack Docker container info: Failed to inspect the LocalStack docker container. "
@@ -44,10 +44,10 @@ def print_runtime_information(in_docker: bool = False):
                 )
 
     if config.LOCALSTACK_BUILD_DATE:
-        print("LocalStack build date: %s" % config.LOCALSTACK_BUILD_DATE)
+        print(f"LocalStack build date: {config.LOCALSTACK_BUILD_DATE}")
 
     if config.LOCALSTACK_BUILD_GIT_HASH:
-        print("LocalStack build git hash: %s" % config.LOCALSTACK_BUILD_GIT_HASH)
+        print(f"LocalStack build git hash: {config.LOCALSTACK_BUILD_GIT_HASH}")
 
     print()
 

localstack/runtime/patches.py

@@ -38,14 +38,14 @@ def patch_urllib3_connection_pool(**constructor_kwargs):
         class MyHTTPSConnectionPool(connectionpool.HTTPSConnectionPool):
             def __init__(self, *args, **kwargs):
                 kwargs.update(constructor_kwargs)
-                super(MyHTTPSConnectionPool, self).__init__(*args, **kwargs)
+                super().__init__(*args, **kwargs)
 
         poolmanager.pool_classes_by_scheme["https"] = MyHTTPSConnectionPool
 
         class MyHTTPConnectionPool(connectionpool.HTTPConnectionPool):
             def __init__(self, *args, **kwargs):
                 kwargs.update(constructor_kwargs)
-                super(MyHTTPConnectionPool, self).__init__(*args, **kwargs)
+                super().__init__(*args, **kwargs)
 
         poolmanager.pool_classes_by_scheme["http"] = MyHTTPConnectionPool
     except Exception:

localstack/runtime/shutdown.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from localstack.runtime import hooks
 from localstack.utils.functions import call_safe

localstack/services/apigateway/exporter.py

@@ -1,6 +1,5 @@
 import abc
 import json
-from typing import Type
 
 from apispec import APISpec
 
@@ -320,7 +319,7 @@ class _OpenApiOAS30Exporter(_BaseOpenApiExporter):
 
 
 class OpenApiExporter:
-    exporters: dict[str, Type[_BaseOpenApiExporter]]
+    exporters: dict[str, type[_BaseOpenApiExporter]]
 
     def __init__(self):
         self.exporters = {"swagger": _OpenApiSwaggerExporter, "oas30": _OpenApiOAS30Exporter}

localstack/services/apigateway/helpers.py

@@ -3,7 +3,7 @@ import copy
 import hashlib
 import json
 import logging
-from typing import List, Optional, TypedDict, Union
+from typing import TypedDict
 from urllib import parse as urlparse
 
 from jsonpatch import apply_patch
@@ -93,7 +93,7 @@ class OpenAPIExt:
 
 class AuthorizerConfig(TypedDict):
     authorizer: Authorizer
-    authorization_scopes: Optional[list[str]]
+    authorization_scopes: list[str] | None
 
 
 # TODO: make the CRUD operations in this file generic for the different model types (authorizes, validators, ...)
@@ -198,11 +198,11 @@ class OpenAPISpecificationResolver:
 
             return cur
 
-    def _namespaced_resolution(self, namespace: str, data: Union[dict, list]) -> Union[dict, list]:
+    def _namespaced_resolution(self, namespace: str, data: dict | list) -> dict | list:
         with self._pathctx(namespace):
             return self._resolve_references(data)
 
-    def _resolve_references(self, data) -> Union[dict, list]:
+    def _resolve_references(self, data) -> dict | list:
         if self._is_ref(data):
             return self._resolve_refpath(data["$ref"])
 
@@ -367,10 +367,7 @@ def resolve_references(data: dict, rest_api_id, allow_recursive=True) -> dict:
 
 def path_based_url(api_id: str, stage_name: str, path: str) -> str:
     """Return URL for inbound API gateway for given API ID, stage name, and path"""
-    pattern = "%s/restapis/{api_id}/{stage_name}/%s{path}" % (
-        config.external_service_url(),
-        PATH_USER_REQUEST,
-    )
+    pattern = f"{config.external_service_url()}/restapis/{{api_id}}/{{stage_name}}/{PATH_USER_REQUEST}{{path}}"
     return pattern.format(api_id=api_id, stage_name=stage_name, path=path)
 
 
@@ -578,7 +575,7 @@ def import_api_from_openapi_spec(
 
             authorizers[security_scheme_name] = authorizer
 
-    def get_authorizer(path_payload: dict) -> Optional[AuthorizerConfig]:
+    def get_authorizer(path_payload: dict) -> AuthorizerConfig | None:
         if not (security_schemes := path_payload.get("security")):
             return None
 
@@ -605,7 +602,7 @@ def import_api_from_openapi_spec(
         rel_path = abs_path.removeprefix(base_path)
         return add_path_methods(rel_path, parts, parent_id=parent_id)
 
-    def add_path_methods(rel_path: str, parts: List[str], parent_id=""):
+    def add_path_methods(rel_path: str, parts: list[str], parent_id=""):
         rel_path = rel_path or "/"
         child_id = ApigwResourceIdentifier(account_id, region_name, parent_id, rel_path).generate()