localstack-core 4.7.1.dev49__py3-none-any.whl → 4.10.1.dev12__py3-none-any.whl

localstack/config.py

@@ -10,7 +10,7 @@ import time
 import warnings
 from collections import defaultdict
 from collections.abc import Mapping
-from typing import Any, Optional, TypeVar, Union
+from typing import Any, TypeVar
 
 from localstack import constants
 from localstack.constants import (
@@ -19,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,
@@ -208,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:
@@ -286,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
@@ -435,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")
@@ -649,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()
 
@@ -1184,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
 
@@ -1237,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")
@@ -1257,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.
@@ -1450,6 +1452,11 @@ def is_collect_metrics_mode() -> bool:
     return is_env_true(ENV_INTERNAL_TEST_COLLECT_METRIC)
 
 
+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
@@ -1502,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.
@@ -1522,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.

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/dev/kubernetes/__main__.py

@@ -5,6 +5,12 @@ 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
+EDGE_SERVICE_DNS_PORT = 31053
+
 
 @dataclasses.dataclass
 class MountPoint:
@@ -27,7 +33,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:
@@ -139,7 +145,12 @@ def generate_mount_points(
     return mount_points
 
 
-def generate_k8s_cluster_config(mount_points: list[MountPoint], port: int = 4566):
+def generate_k8s_cluster_config(
+    mount_points: list[MountPoint],
+    port: int = 4566,
+    expose_dns: bool = False,
+    dns_port: int = 53,
+):
     volumes = [
         {
             "volume": f"{mount_point.host_path}:{mount_point.node_path}",
@@ -148,9 +159,64 @@ 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}
+    if expose_dns:
+        ports.append(
+            {
+                "nodeFilters": [
+                    "server:0",
+                ],
+                "port": f"{dns_port}:{EDGE_SERVICE_DNS_PORT}/udp",
+            }
+        )
+        ports.append(
+            {
+                "nodeFilters": [
+                    "server:0",
+                ],
+                "port": f"{dns_port}:{EDGE_SERVICE_DNS_PORT}/tcp",
+            }
+        )
+
+    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 +225,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 +266,48 @@ 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": {
+            "enabled": True,
+            "nodePort": EDGE_SERVICE_DNS_PORT,
+        },
+    }
     overrides = {
         "debug": True,
         "volumes": volumes,
@@ -211,6 +315,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
@@ -275,6 +382,18 @@ def print_file(content: dict, file_name: str):
     help="Port to expose from the kubernetes node",
     type=click.IntRange(0, 65535),
 )
+@click.option(
+    "--expose-dns",
+    is_flag=True,
+    default=False,
+    help="Expose DNS port from the kubernetes node.",
+)
+@click.option(
+    "--dns-port",
+    default=53,
+    help="DNS port to expose from the kubernetes node. It is applied only if --expose-dns is set.",
+    type=click.IntRange(0, 65535),
+)
 @click.argument("command", nargs=-1, required=False)
 def run(
     pro: bool = None,
@@ -287,15 +406,19 @@ def run(
     command: str = None,
     env: list[str] = None,
     port: int = None,
+    expose_dns: bool = False,
+    dns_port: int = 53,
 ):
     """
     A tool for localstack developers to generate the kubernetes cluster configuration file and the overrides to mount the localstack code into the cluster.
     """
     mount_points = generate_mount_points(pro, mount_moto, mount_entrypoints)
 
-    config = generate_k8s_cluster_config(mount_points, port=port)
+    config = generate_k8s_cluster_config(
+        mount_points, port=port, expose_dns=expose_dns, dns_port=dns_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/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

@@ -68,7 +68,7 @@ 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/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

@@ -254,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
 
@@ -445,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/logging/format.py

@@ -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}": "******"'))

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, 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.
@@ -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.
 
@@ -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
+from typing import Any
 
 import requests
 
@@ -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",
     ):
         """

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

@@ -89,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):

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