localstack-core 4.6.1.dev74__py3-none-any.whl → 4.10.1.dev7__py3-none-any.whl

localstack/config.py

@@ -9,7 +9,8 @@ import tempfile
 import time
 import warnings
 from collections import defaultdict
-from typing import Any, Dict, List, Mapping, Optional, Tuple, TypeVar, Union
+from collections.abc import Mapping
+from typing import Any, TypeVar
 
 from localstack import constants
 from localstack.constants import (
@@ -18,6 +19,7 @@ from localstack.constants import (
     DEFAULT_VOLUME_DIR,
     ENV_INTERNAL_TEST_COLLECT_METRIC,
     ENV_INTERNAL_TEST_RUN,
+    ENV_INTERNAL_TEST_STORE_METRICS_IN_LOCALSTACK,
     FALSE_STRINGS,
     LOCALHOST,
     LOCALHOST_IP,
@@ -207,13 +209,13 @@ class Directories:
         return str(self.__dict__)
 
 
-def eval_log_type(env_var_name: str) -> Union[str, bool]:
+def eval_log_type(env_var_name: str) -> str | bool:
     """Get the log type from environment variable"""
     ls_log = os.environ.get(env_var_name, "").lower().strip()
     return ls_log if ls_log in LOG_LEVELS else False
 
 
-def parse_boolean_env(env_var_name: str) -> Optional[bool]:
+def parse_boolean_env(env_var_name: str) -> bool | None:
     """Parse the value of the given env variable and return True/False, or None if it is not a boolean value."""
     value = os.environ.get(env_var_name, "").lower().strip()
     if value in TRUE_STRINGS:
@@ -233,7 +235,7 @@ def is_env_not_false(env_var_name: str) -> bool:
     return os.environ.get(env_var_name, "").lower().strip() not in FALSE_STRINGS
 
 
-def load_environment(profiles: str = None, env=os.environ) -> List[str]:
+def load_environment(profiles: str = None, env=os.environ) -> list[str]:
     """Loads the environment variables from ~/.localstack/{profile}.env, for each profile listed in the profiles.
     :param env: environment to load profile to. Defaults to `os.environ`
     :param profiles: a comma separated list of profiles to load (defaults to "default")
@@ -285,7 +287,7 @@ def ping(host):
     """Returns True if the host responds to a ping request"""
     is_in_windows = is_windows()
     ping_opts = "-n 1 -w 2000" if is_in_windows else "-c 1 -W 2"
-    args = "ping %s %s" % (ping_opts, host)
+    args = f"ping {ping_opts} {host}"
     return (
         subprocess.call(
             args, shell=not is_in_windows, stdout=subprocess.PIPE, stderr=subprocess.PIPE
@@ -337,7 +339,7 @@ def in_docker():
             return False
     except Exception:
         pass
-    with open("/proc/1/cgroup", "rt") as ifh:
+    with open("/proc/1/cgroup") as ifh:
         content = ifh.read()
         if "docker" in content or "buildkit" in content:
             return True
@@ -348,7 +350,7 @@ def in_docker():
     # containerd does not set any specific file or config, but it does use
     # io.containerd.snapshotter.v1.overlayfs as the overlay filesystem for `/`.
     try:
-        with open("/proc/mounts", "rt") as infile:
+        with open("/proc/mounts") as infile:
             for line in infile:
                 line = line.strip()
 
@@ -434,8 +436,8 @@ TMP_FOLDER = os.path.join(tempfile.gettempdir(), "localstack")
 VOLUME_DIR = os.environ.get("LOCALSTACK_VOLUME_DIR", "").strip() or TMP_FOLDER
 
 # fix for Mac OS, to be able to mount /var/folders in Docker
-if TMP_FOLDER.startswith("/var/folders/") and os.path.exists("/private%s" % TMP_FOLDER):
-    TMP_FOLDER = "/private%s" % TMP_FOLDER
+if TMP_FOLDER.startswith("/var/folders/") and os.path.exists(f"/private{TMP_FOLDER}"):
+    TMP_FOLDER = f"/private{TMP_FOLDER}"
 
 # whether to enable verbose debug logging ("LOG" is used when using the CLI with LOCALSTACK_LOG instead of LS_LOG)
 LS_LOG = eval_log_type("LS_LOG") or eval_log_type("LOG")
@@ -603,9 +605,7 @@ class HostAndPort:
 
     def _get_unprivileged_port_range_start(self) -> int:
         try:
-            with open(
-                "/proc/sys/net/ipv4/ip_unprivileged_port_start", "rt"
-            ) as unprivileged_port_start:
+            with open("/proc/sys/net/ipv4/ip_unprivileged_port_start") as unprivileged_port_start:
                 port = unprivileged_port_start.read()
                 return int(port.strip())
         except Exception:
@@ -637,7 +637,7 @@ class HostAndPort:
         return f"HostAndPort(host={self.host}, port={self.port})"
 
 
-class UniqueHostAndPortList(List[HostAndPort]):
+class UniqueHostAndPortList(list[HostAndPort]):
     """
     Container type that ensures that ports added to the list are unique based
     on these rules:
@@ -650,7 +650,7 @@ class UniqueHostAndPortList(List[HostAndPort]):
         - Identical identical hosts and ports are de-duped
     """
 
-    def __init__(self, iterable: Union[List[HostAndPort], None] = None):
+    def __init__(self, iterable: list[HostAndPort] | None = None):
         super().__init__(iterable or [])
         self._ensure_unique()
 
@@ -661,10 +661,10 @@ class UniqueHostAndPortList(List[HostAndPort]):
         if len(self) <= 1:
             return
 
-        unique: List[HostAndPort] = list()
+        unique: list[HostAndPort] = []
 
         # Build a dictionary of hosts by port
-        hosts_by_port: Dict[int, List[str]] = defaultdict(list)
+        hosts_by_port: dict[int, list[str]] = defaultdict(list)
         for item in self:
             hosts_by_port[item.port].append(item.host)
 
@@ -696,7 +696,7 @@ class UniqueHostAndPortList(List[HostAndPort]):
 
 def populate_edge_configuration(
     environment: Mapping[str, str],
-) -> Tuple[HostAndPort, UniqueHostAndPortList]:
+) -> tuple[HostAndPort, UniqueHostAndPortList]:
     """Populate the LocalStack edge configuration from environment variables."""
     localstack_host_raw = environment.get("LOCALSTACK_HOST")
     gateway_listen_raw = environment.get("GATEWAY_LISTEN")
@@ -824,6 +824,9 @@ OPENAPI_VALIDATE_RESPONSE = is_env_true("OPENAPI_VALIDATE_RESPONSE")
 # Flag to enable the validation of the requests made to the LocalStack internal endpoints. Active by default.
 OPENAPI_VALIDATE_REQUEST = is_env_true("OPENAPI_VALIDATE_REQUEST")
 
+# environment variable to determine whether to include stack traces in http responses
+INCLUDE_STACK_TRACES_IN_HTTP_RESPONSE = is_env_true("INCLUDE_STACK_TRACES_IN_HTTP_RESPONSE")
+
 # whether to skip waiting for the infrastructure to shut down, or exit immediately
 FORCE_SHUTDOWN = is_env_not_false("FORCE_SHUTDOWN")
 
@@ -1182,6 +1185,8 @@ elif _override_dynamodb_v2 == "v2":
     os.environ["PROVIDER_OVERRIDE_DYNAMODBSTREAMS"] = "v2"
     DDB_STREAMS_PROVIDER_V2 = True
 
+SNS_PROVIDER_V2 = os.environ.get("PROVIDER_OVERRIDE_SNS", "") == "v2"
+
 # TODO remove fallback to LAMBDA_DOCKER_NETWORK with next minor version
 MAIN_DOCKER_NETWORK = os.environ.get("MAIN_DOCKER_NETWORK", "") or LAMBDA_DOCKER_NETWORK
 
@@ -1235,8 +1240,8 @@ def use_custom_dns():
 
 
 # s3 virtual host name
-S3_VIRTUAL_HOSTNAME = "s3.%s" % LOCALSTACK_HOST.host
-S3_STATIC_WEBSITE_HOSTNAME = "s3-website.%s" % LOCALSTACK_HOST.host
+S3_VIRTUAL_HOSTNAME = f"s3.{LOCALSTACK_HOST.host}"
+S3_STATIC_WEBSITE_HOSTNAME = f"s3-website.{LOCALSTACK_HOST.host}"
 
 BOTO_WAITER_DELAY = int(os.environ.get("BOTO_WAITER_DELAY") or "1")
 BOTO_WAITER_MAX_ATTEMPTS = int(os.environ.get("BOTO_WAITER_MAX_ATTEMPTS") or "120")
@@ -1255,7 +1260,6 @@ IN_MEMORY_CLIENT = is_env_true("IN_MEMORY_CLIENT")
 LOCALSTACK_RESPONSE_HEADER_ENABLED = is_env_not_false("LOCALSTACK_RESPONSE_HEADER_ENABLED")
 
 # Serialization backend for the LocalStack internal state (`dill` is used by default`).
-# `jsonpickle` enables the new experimental backend.
 STATE_SERIALIZATION_BACKEND = os.environ.get("STATE_SERIALIZATION_BACKEND", "").strip() or "dill"
 
 # List of environment variable names used for configuration that are passed from the host into the LocalStack container.
@@ -1448,7 +1452,12 @@ def is_collect_metrics_mode() -> bool:
     return is_env_true(ENV_INTERNAL_TEST_COLLECT_METRIC)
 
 
-def collect_config_items() -> List[Tuple[str, Any]]:
+def store_test_metrics_in_local_filesystem() -> bool:
+    """Returns True if test metrics should be stored in the local filesystem (instead of the system that runs pytest)."""
+    return is_env_true(ENV_INTERNAL_TEST_STORE_METRICS_IN_LOCALSTACK)
+
+
+def collect_config_items() -> list[tuple[str, Any]]:
     """Returns a list of key-value tuples of LocalStack configuration values."""
     none = object()  # sentinel object
 
@@ -1500,10 +1509,10 @@ def get_protocol() -> str:
 
 
 def external_service_url(
-    host: Optional[str] = None,
-    port: Optional[int] = None,
-    protocol: Optional[str] = None,
-    subdomains: Optional[str] = None,
+    host: str | None = None,
+    port: int | None = None,
+    protocol: str | None = None,
+    subdomains: str | None = None,
 ) -> str:
     """Returns a service URL (e.g., SQS queue URL) to an external client (e.g., boto3) potentially running on another
     machine than LocalStack. The configurations LOCALSTACK_HOST and USE_SSL can customize these returned URLs.
@@ -1520,10 +1529,10 @@ def external_service_url(
 
 
 def internal_service_url(
-    host: Optional[str] = None,
-    port: Optional[int] = None,
-    protocol: Optional[str] = None,
-    subdomains: Optional[str] = None,
+    host: str | None = None,
+    port: int | None = None,
+    protocol: str | None = None,
+    subdomains: str | None = None,
 ) -> str:
     """Returns a service URL for internal use within LocalStack (i.e., same host).
     The configuration USE_SSL can customize these returned URLs but LOCALSTACK_HOST has no effect.
@@ -1598,7 +1607,7 @@ def get_edge_url(localstack_hostname=None, protocol=None):
 
 
 class ServiceProviderConfig(Mapping[str, str]):
-    _provider_config: Dict[str, str]
+    _provider_config: dict[str, str]
     default_value: str
     override_prefix: str = "PROVIDER_OVERRIDE_"
 
@@ -1623,7 +1632,7 @@ class ServiceProviderConfig(Mapping[str, str]):
     def set_provider(self, service: str, provider: str):
         self._provider_config[service] = provider
 
-    def bulk_set_provider_if_not_exists(self, services: List[str], provider: str):
+    def bulk_set_provider_if_not_exists(self, services: list[str], provider: str):
         for service in services:
             self.set_provider_if_not_exists(service, provider)
 

localstack/constants.py

@@ -80,6 +80,10 @@ ENV_INTERNAL_TEST_RUN = "LOCALSTACK_INTERNAL_TEST_RUN"
 # environment variable name to tag collect metrics during a test run
 ENV_INTERNAL_TEST_COLLECT_METRIC = "LOCALSTACK_INTERNAL_TEST_COLLECT_METRIC"
 
+# environment variable name to indicate that metrics should be stored within the container
+ENV_INTERNAL_TEST_STORE_METRICS_IN_LOCALSTACK = "LOCALSTACK_INTERNAL_TEST_METRICS_IN_LOCALSTACK"
+ENV_INTERNAL_TEST_STORE_METRICS_PATH = "LOCALSTACK_INTERNAL_TEST_STORE_METRICS_PATH"
+
 # environment variable that flags whether pro was activated. do not use it for security purposes!
 ENV_PRO_ACTIVATED = "PRO_ACTIVATED"
 
@@ -102,32 +106,6 @@ FALSE_STRINGS = ("0", "false", "False")
 # strings with valid log levels for LS_LOG
 LOG_LEVELS = ("trace-internal", "trace", "debug", "info", "warn", "error", "warning")
 
-# the version of elasticsearch that is pre-seeded into the base image (sync with Dockerfile.base)
-ELASTICSEARCH_DEFAULT_VERSION = "Elasticsearch_7.10"
-# See https://docs.aws.amazon.com/ja_jp/elasticsearch-service/latest/developerguide/aes-supported-plugins.html
-ELASTICSEARCH_PLUGIN_LIST = [
-    "analysis-icu",
-    "ingest-attachment",
-    "analysis-kuromoji",
-    "mapper-murmur3",
-    "mapper-size",
-    "analysis-phonetic",
-    "analysis-smartcn",
-    "analysis-stempel",
-    "analysis-ukrainian",
-]
-# Default ES modules to exclude (save apprx 66MB in the final image)
-ELASTICSEARCH_DELETE_MODULES = ["ingest-geoip"]
-
-# the version of opensearch which is used by default
-OPENSEARCH_DEFAULT_VERSION = "OpenSearch_2.11"
-
-# See https://docs.aws.amazon.com/opensearch-service/latest/developerguide/supported-plugins.html
-OPENSEARCH_PLUGIN_LIST = [
-    "ingest-attachment",
-    "analysis-kuromoji",
-]
-
 # API endpoint for analytics events
 API_ENDPOINT = os.environ.get("API_ENDPOINT") or "https://api.localstack.cloud/v1"
 # new analytics API endpoint
@@ -171,9 +149,6 @@ DEFAULT_DEVELOP_PORT = 5678
 DEFAULT_BUCKET_MARKER_LOCAL = "hot-reload"
 LEGACY_DEFAULT_BUCKET_MARKER_LOCAL = "__local__"
 
-# user that starts the opensearch process if the current user is root
-OS_USER_OPENSEARCH = "localstack"
-
 # output string that indicates that the stack is ready
 READY_MARKER_OUTPUT = "Ready."
 

localstack/deprecations.py

@@ -1,8 +1,8 @@
 # A simple module to track deprecations over time / versions, and some simple functions guiding the affected users.
 import logging
 import os
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable, List, Optional
 
 from localstack.utils.analytics import log
 
@@ -329,8 +329,8 @@ DEPRECATIONS = [
 
 
 def collect_affected_deprecations(
-    deprecations: Optional[List[EnvVarDeprecation]] = None,
-) -> List[EnvVarDeprecation]:
+    deprecations: list[EnvVarDeprecation] | None = None,
+) -> list[EnvVarDeprecation]:
     """
     Collects all deprecations which are used in the OS environ.
     :param deprecations: List of deprecations to check. Uses DEPRECATIONS list by default.
@@ -341,7 +341,7 @@ def collect_affected_deprecations(
     return [deprecation for deprecation in deprecations if deprecation.is_affected]
 
 
-def log_env_warning(deprecations: List[EnvVarDeprecation]) -> None:
+def log_env_warning(deprecations: list[EnvVarDeprecation]) -> None:
     """
     Logs warnings for the given deprecations.
     :param deprecations: list of affected deprecations to show a warning for
@@ -368,7 +368,7 @@ def log_env_warning(deprecations: List[EnvVarDeprecation]) -> None:
         log.event(event="deprecated_env_usage", payload={"deprecated_env_vars": env_vars})
 
 
-def log_deprecation_warnings(deprecations: Optional[List[EnvVarDeprecation]] = None) -> None:
+def log_deprecation_warnings(deprecations: list[EnvVarDeprecation] | None = None) -> None:
     affected_deprecations = collect_affected_deprecations(deprecations)
     log_env_warning(affected_deprecations)
 

localstack/dev/kubernetes/__main__.py

@@ -5,6 +5,11 @@ from typing import Literal
 import click
 import yaml
 
+EDGE_SERVICE_NODE_PORT = 30066
+NODE_PORT_START = 30010
+SERVICE_PORT_START = 4510
+NUMBER_OF_SERVICE_PORTS = 50
+
 
 @dataclasses.dataclass
 class MountPoint:
@@ -27,7 +32,7 @@ def generate_mount_points(
 
     # container paths
     target_path = "/opt/code/localstack/"
-    venv_path = os.path.join(target_path, ".venv", "lib", "python3.11", "site-packages")
+    venv_path = os.path.join(target_path, ".venv", "lib", "python3.13", "site-packages")
 
     # Community code
     if pro:
@@ -148,9 +153,46 @@ def generate_k8s_cluster_config(mount_points: list[MountPoint], port: int = 4566
         for mount_point in mount_points
     ]
 
-    ports = [{"port": f"{port}:31566", "nodeFilters": ["server:0"]}]
+    ports = [
+        # main gateway port
+        {
+            "nodeFilters": [
+                "server:0",
+            ],
+            "port": f"{port}:{EDGE_SERVICE_NODE_PORT}",
+        },
+        # 443 https port for main gateway
+        {
+            "nodeFilters": [
+                "server:0",
+            ],
+            "port": f"443:{EDGE_SERVICE_NODE_PORT}",
+        },
+        # Node ports
+        {
+            "nodeFilters": [
+                "server:0",
+            ],
+            "port": f"{SERVICE_PORT_START}-{SERVICE_PORT_START + NUMBER_OF_SERVICE_PORTS - 1}:{NODE_PORT_START}-{NODE_PORT_START + NUMBER_OF_SERVICE_PORTS - 1}",
+        },
+    ]
 
-    config = {"apiVersion": "k3d.io/v1alpha5", "kind": "Simple", "volumes": volumes, "ports": ports}
+    config = {
+        "apiVersion": "k3d.io/v1alpha5",
+        "kind": "Simple",
+        "volumes": volumes,
+        "ports": ports,
+        "options": {
+            "k3s": {
+                "extraArgs": [
+                    {
+                        "arg": "--kubelet-arg=container-log-max-size=1Gi",
+                        "nodeFilters": ["server:*"],
+                    },
+                ],
+            },
+        },
+    }
 
     return config
 
@@ -159,7 +201,7 @@ def snake_to_kebab_case(string: str):
     return string.lower().replace("_", "-")
 
 
-def generate_k8s_cluster_overrides(
+def generate_k8s_helm_overrides(
     mount_points: list[MountPoint], pro: bool = False, env: list[str] | None = None
 ):
     volumes = [
@@ -200,10 +242,45 @@ def generate_k8s_cluster_overrides(
                 "name": "CONTAINER_RUNTIME",
                 "value": "kubernetes",
             },
+            {
+                "name": "RDS_MYSQL_DOCKER",
+                "value": "1",
+            },
+            {
+                "name": "ENABLE_DMS",
+                "value": "1",
+            },
+            {
+                "name": "ENABLE_BEDROCK",
+                "value": "1",
+            },
+            {
+                "name": "DOCDB_PROXY_CONTAINER",
+                "value": "1",
+            },
+            {
+                "name": "GLUE_JOB_EXECUTOR_PROVIDER",
+                "value": "v2",
+            },
+            {
+                "name": "CLOUDFRONT_LAMBDA_EDGE",
+                "value": "1",
+            },
         ]
 
     image_repository = "localstack/localstack-pro" if pro else "localstack/localstack"
 
+    service = {
+        "edgeService": {
+            "nodePort": EDGE_SERVICE_NODE_PORT,
+        },
+        "externalServicePorts": {
+            "start": SERVICE_PORT_START,
+            "end": SERVICE_PORT_START + NUMBER_OF_SERVICE_PORTS,
+            "nodePortStart": NODE_PORT_START,
+        },
+        "dnsService": True,
+    }
     overrides = {
         "debug": True,
         "volumes": volumes,
@@ -211,6 +288,9 @@ def generate_k8s_cluster_overrides(
         "extraEnvVars": extra_env_vars,
         "image": {"repository": image_repository},
         "lambda": {"executor": "kubernetes"},
+        "service": service,
+        "readinessProbe": {"initialDelaySeconds": 10},
+        "livenessProbe": {"initialDelaySeconds": 10},
     }
 
     return overrides
@@ -295,7 +375,7 @@ def run(
 
     config = generate_k8s_cluster_config(mount_points, port=port)
 
-    overrides = generate_k8s_cluster_overrides(mount_points, pro=pro, env=env)
+    overrides = generate_k8s_helm_overrides(mount_points, pro=pro, env=env)
 
     output_dir = output_dir or os.getcwd()
     overrides_file = overrides_file or "overrides.yml"

localstack/dev/run/__main__.py

@@ -1,6 +1,6 @@
 import dataclasses
 import os
-from typing import Iterable, Tuple
+from collections.abc import Iterable
 
 import click
 from rich.rule import Rule
@@ -133,9 +133,9 @@ def run(
     mount_dependencies: bool = False,
     mount_entrypoints: bool = False,
     mount_docker_socket: bool = True,
-    env: Tuple = (),
-    volume: Tuple = (),
-    publish: Tuple = (),
+    env: tuple = (),
+    volume: tuple = (),
+    publish: tuple = (),
     entrypoint: str = None,
     network: str = None,
     local_packages: list[str] | None = None,
@@ -266,7 +266,7 @@ def run(
             remove=True,
             interactive=True,
             tty=True,
-            env_vars=dict(),
+            env_vars={},
             volumes=VolumeMappings(),
             ports=PortMappings(),
             network=network,

localstack/dev/run/configurators.py

@@ -363,10 +363,7 @@ def _list_files_in_container_image(container_client: ContainerClient, image_name
         try:
             # docker export yields paths without prefixed slashes, so we add them here
             # since the file is pretty big (~4MB for community, ~7MB for pro) we gzip it
-            cmd = "docker export %s | tar -t | awk '{ print \"/\" $0 }' | gzip > %s" % (
-                container_id,
-                cache_file,
-            )
+            cmd = f"docker export {container_id} | tar -t | awk '{{ print \"/\" $0 }}' | gzip > {cache_file}"
             run(cmd, shell=True)
         finally:
             container_client.remove_container(container_id)

localstack/dev/run/paths.py

@@ -1,8 +1,8 @@
 """Utilities to resolve important paths on the host and in the container."""
 
 import os
+from collections.abc import Callable
 from pathlib import Path
-from typing import Callable, Optional, Union
 
 
 class HostPaths:
@@ -20,9 +20,9 @@ class HostPaths:
 
     def __init__(
         self,
-        workspace_dir: Union[os.PathLike, str] = None,
-        volume_dir: Union[os.PathLike, str] = None,
-        venv_dir: Union[os.PathLike, str] = None,
+        workspace_dir: os.PathLike | str = None,
+        volume_dir: os.PathLike | str = None,
+        venv_dir: os.PathLike | str = None,
     ):
         self.workspace_dir = Path(workspace_dir or os.path.abspath(os.path.join(os.getcwd(), "..")))
         self.localstack_project_dir = self.workspace_dir / "localstack"
@@ -68,11 +68,11 @@ class ContainerPaths:
     """Important paths in the container"""
 
     project_dir: str = "/opt/code/localstack"
-    site_packages_target_dir: str = "/opt/code/localstack/.venv/lib/python3.11/site-packages"
+    site_packages_target_dir: str = "/opt/code/localstack/.venv/lib/python3.13/site-packages"
     docker_entrypoint: str = "/usr/local/bin/docker-entrypoint.sh"
     localstack_supervisor: str = "/usr/local/bin/localstack-supervisor"
     localstack_source_dir: str
-    localstack_pro_source_dir: Optional[str]
+    localstack_pro_source_dir: str | None
 
     def dependency_source(self, name: str) -> str:
         """Returns path of the given source dependency in the site-packages directory."""

localstack/dns/models.py

@@ -1,6 +1,7 @@
 import dataclasses
+from collections.abc import Callable
 from enum import Enum, auto
-from typing import Callable, Protocol
+from typing import Protocol
 
 
 class RecordType(Enum):

localstack/dns/plugins.py

@@ -11,8 +11,12 @@ DNS_SHUTDOWN_PRIORITY = -30
 """Make sure the DNS server is shut down after the ON_AFTER_SERVICE_SHUTDOWN_HANDLERS, which in turn is after
 SERVICE_SHUTDOWN_PRIORITY. Currently this value needs to be less than -20"""
 
+DNS_START_PRIORITY = 20
+"""Make sure the DNS server is started before the pro activation, to ensure proper DNS resolution for the activate call,
+if the resolv.conf is set to localhost from outside the container"""
 
-@hooks.on_infra_start(priority=10)
+
+@hooks.on_infra_start(priority=DNS_START_PRIORITY)
 def start_dns_server():
     try:
         from localstack.dns import server

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,
 )