localstack-core 4.7.1.dev139__py3-none-any.whl → 4.10.1.dev42__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:
@@ -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()
 
@@ -1451,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
@@ -1503,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.
@@ -1523,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

@@ -9,6 +9,7 @@ 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
@@ -32,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:
@@ -144,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}",
@@ -177,6 +183,16 @@ def generate_k8s_cluster_config(mount_points: list[MountPoint], port: int = 4566
         },
     ]
 
+    if expose_dns:
+        ports.append(
+            {
+                "nodeFilters": [
+                    "server:0",
+                ],
+                "port": f"{dns_port}:{EDGE_SERVICE_DNS_PORT}",
+            }
+        )
+
     config = {
         "apiVersion": "k3d.io/v1alpha5",
         "kind": "Simple",
@@ -279,7 +295,10 @@ def generate_k8s_helm_overrides(
             "end": SERVICE_PORT_START + NUMBER_OF_SERVICE_PORTS,
             "nodePortStart": NODE_PORT_START,
         },
-        "dnsService": True,
+        "dnsService": {
+            "enabled": True,
+            "nodePort": EDGE_SERVICE_DNS_PORT,
+        },
     }
     overrides = {
         "debug": True,
@@ -355,6 +374,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,
@@ -367,13 +398,17 @@ 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_helm_overrides(mount_points, pro=pro, env=env)
 

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

@@ -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/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/init.py

@@ -89,7 +89,7 @@ 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(f"Script {path} returned a non-zero exit code {exit_code}")
 

localstack/services/apigateway/helpers.py

@@ -23,7 +23,7 @@ from localstack.aws.api.apigateway import (
     IntegrationType,
     Model,
     NotFoundException,
-    PutRestApiRequest,
+    PutMode,
     RequestValidator,
 )
 from localstack.constants import (
@@ -39,8 +39,7 @@ from localstack.services.apigateway.models import (
     apigateway_stores,
 )
 from localstack.utils import common
-from localstack.utils.json import parse_json_or_yaml
-from localstack.utils.strings import short_uid, to_bytes, to_str
+from localstack.utils.strings import short_uid, to_bytes
 from localstack.utils.urls import localstack_host
 
 LOG = logging.getLogger(__name__)
@@ -472,11 +471,9 @@ def add_documentation_parts(rest_api_container, documentation):
 
 
 def import_api_from_openapi_spec(
-    rest_api: MotoRestAPI, context: RequestContext, request: PutRestApiRequest
+    rest_api: MotoRestAPI, context: RequestContext, open_api_spec: dict, mode: PutMode
 ) -> tuple[MotoRestAPI, list[str]]:
     """Import an API from an OpenAPI spec document"""
-    body = parse_json_or_yaml(to_str(request["body"].read()))
-
     warnings = []
 
     # TODO There is an issue with the botocore specs so the parameters doesn't get populated as it should
@@ -484,15 +481,14 @@ def import_api_from_openapi_spec(
     # query_params = request.get("parameters") or {}
     query_params: dict = context.request.values.to_dict()
 
-    resolved_schema = resolve_references(copy.deepcopy(body), rest_api_id=rest_api.id)
+    resolved_schema = resolve_references(copy.deepcopy(open_api_spec), rest_api_id=rest_api.id)
     account_id = context.account_id
     region_name = context.region
 
     # TODO:
-    # 1. validate the "mode" property of the spec document, "merge" or "overwrite", and properly apply it
+    # 1. properly apply the mode (overwrite or merge)
     #    for now, it only considers it for the binaryMediaTypes
     # 2. validate the document type, "swagger" or "openapi"
-    mode = request.get("mode", "merge")
 
     rest_api.version = (
         str(version) if (version := resolved_schema.get("info", {}).get("version")) else None

localstack/services/apigateway/legacy/provider.py

@@ -323,8 +323,18 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
         tags: MapOfStringToString = None,
         **kwargs,
     ) -> ApiKey:
+        if name and len(name) > 1024:
+            raise BadRequestException("Invalid API Key name, can be at most 1024 characters.")
+        if value:
+            if len(value) > 128:
+                raise BadRequestException("API Key value exceeds maximum size of 128 characters")
+            elif len(value) < 20:
+                raise BadRequestException("API Key value should be at least 20 characters")
+        if description and len(description) > 125000:
+            raise BadRequestException("Invalid API Key description specified.")
         api_key = call_moto(context)
-
+        if name == "":
+            api_key.pop("name", None)
         #  transform array of stage keys [{'restApiId': '0iscapk09u', 'stageName': 'dev'}] into
         #  array of strings ['0iscapk09u/dev']
         stage_keys = api_key.get("stageKeys", [])
@@ -466,11 +476,19 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
 
     @handler("PutRestApi", expand=False)
     def put_rest_api(self, context: RequestContext, request: PutRestApiRequest) -> RestApi:
+        body_data = request["body"].read()
+        try:
+            openapi_spec = parse_json_or_yaml(to_str(body_data))
+        except Exception:
+            raise BadRequestException("Invalid OpenAPI input.")
         # TODO: take into account the mode: overwrite or merge
         # the default is now `merge`, but we are removing everything
         rest_api = get_moto_rest_api(context, request["restApiId"])
         rest_api, warnings = import_api_from_openapi_spec(
-            rest_api, context=context, request=request
+            rest_api,
+            context=context,
+            open_api_spec=openapi_spec,
+            mode=request.get("mode") or PutMode.merge,
         )
 
         rest_api.root_resource_id = get_moto_rest_api_root_resource(rest_api)
@@ -1502,7 +1520,10 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
         **kwargs,
     ) -> DocumentationPartIds:
         body_data = body.read()
-        openapi_spec = parse_json_or_yaml(to_str(body_data))
+        try:
+            openapi_spec = parse_json_or_yaml(to_str(body_data))
+        except Exception:
+            raise BadRequestException("Unable to build importer with provided input.")
 
         rest_api_container = get_rest_api_container(context, rest_api_id=rest_api_id)
 
@@ -2002,7 +2023,11 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
         body_data = body.read()
 
         # create rest api
-        openapi_spec = parse_json_or_yaml(to_str(body_data))
+        try:
+            openapi_spec = parse_json_or_yaml(to_str(body_data))
+        except Exception:
+            raise BadRequestException("Invalid OpenAPI input.")
+
         create_api_request = CreateRestApiRequest(name=openapi_spec.get("info").get("title"))
         create_api_context = create_custom_context(
             context,
@@ -2043,17 +2068,39 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
         **kwargs,
     ) -> Integration:
         try:
-            response: Integration = call_moto(context)
-        except CommonServiceException as e:
-            # the Exception raised by moto does not have the right message not status code
-            if e.code == "NotFoundException":
-                raise NotFoundException("Invalid Integration identifier specified")
-            raise
+            moto_rest_api = get_moto_rest_api(context, rest_api_id)
+        except NotFoundException:
+            raise NotFoundException("Invalid Resource identifier specified")
+
+        if not (moto_resource := moto_rest_api.resources.get(resource_id)):
+            raise NotFoundException("Invalid Resource identifier specified")
+
+        if not (moto_method := moto_resource.resource_methods.get(http_method)):
+            raise NotFoundException("Invalid Method identifier specified")
+
+        if not moto_method.method_integration:
+            raise NotFoundException("Invalid Integration identifier specified")
+
+        response: Integration = call_moto(context)
 
         if integration_responses := response.get("integrationResponses"):
             for integration_response in integration_responses.values():
                 remove_empty_attributes_from_integration_response(integration_response)
 
+        if response.get("connectionType") == "VPC_LINK":
+            # FIXME: this is hacky to workaround moto not saving the VPC Link `connectionId`
+            # only do this internal check of Moto if the integration is of VPC_LINK type
+            moto_rest_api = get_moto_rest_api(context=context, rest_api_id=rest_api_id)
+            try:
+                method = moto_rest_api.resources[resource_id].resource_methods[http_method]
+                integration = method.method_integration
+                if connection_id := getattr(integration, "connection_id", None):
+                    response["connectionId"] = connection_id
+
+            except (AttributeError, KeyError):
+                # this error should have been caught by `call_moto`
+                pass
+
         return response
 
     def put_integration(
@@ -2108,6 +2155,7 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
         moto_request.setdefault("timeoutInMillis", 29000)
         if integration_type in (IntegrationType.HTTP, IntegrationType.HTTP_PROXY):
             moto_request.setdefault("connectionType", ConnectionType.INTERNET)
+
         response = call_moto_with_request(context, moto_request)
         remove_empty_attributes_from_integration(integration=response)
 
@@ -2115,6 +2163,13 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
         if integration_type == "MOCK":
             response.pop("uri", None)
 
+        # TODO: moto does not save the connection_id
+        elif moto_request.get("connectionType") == "VPC_LINK":
+            connection_id = moto_request.get("connectionId", "")
+            # attach the connection id to the moto object
+            method.method_integration.connection_id = connection_id
+            response["connectionId"] = connection_id
+
         return response
 
     def update_integration(
@@ -2136,6 +2191,7 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
             raise NotFoundException("Invalid Integration identifier specified")
 
         integration = method.method_integration
+        # TODO: validate the patch operations
         patch_api_gateway_entity(integration, patch_operations)
 
         # fix data types
@@ -2144,8 +2200,12 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
         if skip_verification := (integration.tls_config or {}).get("insecureSkipVerification"):
             integration.tls_config["insecureSkipVerification"] = str_to_bool(skip_verification)
 
-        integration_dict: Integration = integration.to_json()
-        return integration_dict
+        response: Integration = integration.to_json()
+
+        if connection_id := getattr(integration, "connection_id", None):
+            response["connectionId"] = connection_id
+
+        return response
 
     def delete_integration(
         self,
@@ -2393,6 +2453,10 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
             for api_key in api_keys:
                 api_key.pop("value")
 
+        if limit is not None:
+            if limit < 1 or limit > 500:
+                limit = None
+
         item_list = PaginatedList(api_keys)
 
         def token_generator(item):
@@ -2417,6 +2481,14 @@ class ApigatewayProvider(ApigatewayApi, ServiceLifecycleHook):
         patch_operations: ListOfPatchOperation = None,
         **kwargs,
     ) -> ApiKey:
+        for patch_op in patch_operations:
+            if patch_op["path"] not in ("/description", "/enabled", "/name", "/customerId"):
+                raise BadRequestException(
+                    f"Invalid patch path  '{patch_op['path']}' specified for op '{patch_op['op']}'. Must be one of: [/description, /enabled, /name, /customerId]"
+                )
+
+            if patch_op["path"] == "/description" and len(patch_op["value"]) > 125000:
+                raise BadRequestException("Invalid API Key description specified.")
         response: ApiKey = call_moto(context)
         if "value" in response:
             response.pop("value", None)
@@ -2977,6 +3049,7 @@ def create_custom_context(
     ctx = create_aws_request_context(
         service_name=context.service.service_name,
         action=action,
+        protocol=context.service.protocol,
         parameters=parameters,
         region=context.region,
     )

localstack/services/apigateway/next_gen/execute_api/integrations/aws.py

@@ -211,6 +211,9 @@ class RestApiAwsIntegration(RestApiIntegration):
             action = parsed_uri["path"]
 
             if target := self.get_action_service_target(service_name, action):
+                # TODO: properly implement the auto-`Content-Type` headers depending on the service protocol
+                #  e.g. `x-amz-json-1.0` for DynamoDB
+                #  this is needed to properly support multi-protocol
                 headers["X-Amz-Target"] = target
 
             query_params["Action"] = action