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

localstack/testing/aws/lambda_utils.py

@@ -4,8 +4,9 @@ import logging
 import os
 import subprocess
 import zipfile
+from collections.abc import Mapping, Sequence
 from pathlib import Path
-from typing import TYPE_CHECKING, Literal, Mapping, Optional, Sequence, overload
+from typing import TYPE_CHECKING, Literal, Optional, overload
 
 from localstack import config
 from localstack.services.lambda_.runtimes import RUNTIMES_AGGREGATED
@@ -176,27 +177,27 @@ class ParametrizedLambda:
     def create_function(
         self,
         *,
-        FunctionName: Optional[str] = None,
-        Role: Optional[str] = None,
+        FunctionName: str | None = None,
+        Role: str | None = None,
         Code: Optional["FunctionCodeTypeDef"] = None,
         Runtime: Optional["RuntimeType"] = None,
-        Handler: Optional[str] = None,
-        Description: Optional[str] = None,
-        Timeout: Optional[int] = None,
-        MemorySize: Optional[int] = None,
-        Publish: Optional[bool] = None,
+        Handler: str | None = None,
+        Description: str | None = None,
+        Timeout: int | None = None,
+        MemorySize: int | None = None,
+        Publish: bool | None = None,
         VpcConfig: Optional["VpcConfigTypeDef"] = None,
         PackageType: Optional["PackageTypeType"] = None,
         DeadLetterConfig: Optional["DeadLetterConfigTypeDef"] = None,
         Environment: Optional["EnvironmentTypeDef"] = None,
-        KMSKeyArn: Optional[str] = None,
+        KMSKeyArn: str | None = None,
         TracingConfig: Optional["TracingConfigTypeDef"] = None,
-        Tags: Optional[Mapping[str, str]] = None,
-        Layers: Optional[Sequence[str]] = None,
-        FileSystemConfigs: Optional[Sequence["FileSystemConfigTypeDef"]] = None,
+        Tags: Mapping[str, str] | None = None,
+        Layers: Sequence[str] | None = None,
+        FileSystemConfigs: Sequence["FileSystemConfigTypeDef"] | None = None,
         ImageConfig: Optional["ImageConfigTypeDef"] = None,
-        CodeSigningConfigArn: Optional[str] = None,
-        Architectures: Optional[Sequence["ArchitectureType"]] = None,
+        CodeSigningConfigArn: str | None = None,
+        Architectures: Sequence["ArchitectureType"] | None = None,
         EphemeralStorage: Optional["EphemeralStorageTypeDef"] = None,
     ) -> "FunctionConfigurationResponseMetadataTypeDef": ...
 

localstack/testing/aws/util.py

@@ -1,6 +1,7 @@
 import functools
 import os
-from typing import Callable, Dict, TypeVar
+from collections.abc import Callable
+from typing import TypeVar
 
 import boto3
 import botocore
@@ -80,7 +81,7 @@ def wait_for_user(keys, region_name: str):
 
 def create_client_with_keys(
     service: str,
-    keys: Dict[str, str],
+    keys: dict[str, str],
     region_name: str,
     client_config: Config = None,
 ):

localstack/testing/pytest/cloudformation/fixtures.py

@@ -1,8 +1,10 @@
 import json
 from collections import defaultdict
-from typing import Callable, Optional, TypedDict
+from collections.abc import Callable, Generator
+from typing import TypedDict
 
 import pytest
+from botocore.exceptions import WaiterError
 
 from localstack.aws.api.cloudformation import DescribeChangeSetOutput, StackEvent
 from localstack.aws.connect import ServiceLevelClientFactory
@@ -11,7 +13,7 @@ from localstack.utils.strings import short_uid
 
 
 class NormalizedEvent(TypedDict):
-    PhysicalResourceId: Optional[str]
+    PhysicalResourceId: str | None
     LogicalResourceId: str
     ResourceType: str
     ResourceStatus: str
@@ -32,23 +34,41 @@ def normalize_event(event: StackEvent) -> NormalizedEvent:
 
 
 @pytest.fixture
-def capture_per_resource_events(
-    aws_client: ServiceLevelClientFactory,
-) -> Callable[[str], PerResourceStackEvents]:
-    def capture(stack_name: str) -> dict:
+def capture_resource_state_changes(aws_client: ServiceLevelClientFactory):
+    def capture(stack_name: str) -> Generator[StackEvent, None, None]:
+        resource_states: dict[str, str] = {}
         events = aws_client.cloudformation.describe_stack_events(StackName=stack_name)[
             "StackEvents"
         ]
-        per_resource_events = defaultdict(list)
         for event in events:
             # TODO: not supported events
             if event.get("ResourceStatus") in {
                 "UPDATE_COMPLETE_CLEANUP_IN_PROGRESS",
-                "DELETE_IN_PROGRESS",
-                "DELETE_COMPLETE",
             }:
                 continue
 
+            resource = event["LogicalResourceId"]
+            status = event["ResourceStatus"]
+            if resource not in resource_states:
+                yield event
+                resource_states[resource] = status
+                continue
+
+            if status != resource_states[resource]:
+                yield event
+                resource_states[resource] = status
+
+    return capture
+
+
+@pytest.fixture
+def capture_per_resource_events(
+    capture_resource_state_changes,
+) -> Callable[[str], PerResourceStackEvents]:
+    def capture(stack_name: str) -> dict:
+        per_resource_events = defaultdict(list)
+        events = capture_resource_state_changes(stack_name)
+        for event in events:
             if logical_resource_id := event.get("LogicalResourceId"):
                 resource_name = (
                     logical_resource_id
@@ -91,8 +111,8 @@ def capture_per_resource_events(
 
 
 def _normalise_describe_change_set_output(value: DescribeChangeSetOutput) -> None:
-    value.get("Changes", list()).sort(
-        key=lambda change: change.get("ResourceChange", dict()).get("LogicalResourceId", str())
+    value.get("Changes", []).sort(
+        key=lambda change: change.get("ResourceChange", {}).get("LogicalResourceId", "")
     )
 
 
@@ -107,8 +127,16 @@ def capture_update_process(aws_client_no_retry, cleanups, capture_per_resource_e
     change_set_name = f"cs-{short_uid()}"
 
     def inner(
-        snapshot, t1: dict | str, t2: dict | str, p1: dict | None = None, p2: dict | None = None
-    ):
+        snapshot,
+        t1: dict | str,
+        t2: dict | str,
+        p1: dict | None = None,
+        p2: dict | None = None,
+        custom_update_step: Callable[[], None] | None = None,
+    ) -> str:
+        """
+        :return: stack id
+        """
         snapshot.add_transformer(snapshot.transform.cloudformation_api())
 
         if isinstance(t1, dict):
@@ -131,6 +159,11 @@ def capture_update_process(aws_client_no_retry, cleanups, capture_per_resource_e
             ChangeSetName=change_set_name,
             TemplateBody=t1,
             ChangeSetType="CREATE",
+            Capabilities=[
+                "CAPABILITY_IAM",
+                "CAPABILITY_NAMED_IAM",
+                "CAPABILITY_AUTO_EXPAND",
+            ],
             Parameters=[{"ParameterKey": k, "ParameterValue": v} for (k, v) in p1.items()],
         )
         snapshot.match("create-change-set-1", change_set_details)
@@ -142,7 +175,7 @@ def capture_update_process(aws_client_no_retry, cleanups, capture_per_resource_e
         cleanups.append(
             lambda: call_safe(
                 aws_client_no_retry.cloudformation.delete_change_set,
-                kwargs=dict(ChangeSetName=change_set_id),
+                kwargs={"ChangeSetName": change_set_id},
             )
         )
 
@@ -173,7 +206,7 @@ def capture_update_process(aws_client_no_retry, cleanups, capture_per_resource_e
         # ensure stack deletion
         cleanups.append(
             lambda: call_safe(
-                aws_client_no_retry.cloudformation.delete_stack, kwargs=dict(StackName=stack_id)
+                aws_client_no_retry.cloudformation.delete_stack, kwargs={"StackName": stack_id}
             )
         )
 
@@ -182,6 +215,10 @@ def capture_update_process(aws_client_no_retry, cleanups, capture_per_resource_e
         ]
         snapshot.match("post-create-1-describe", describe)
 
+        # run any custom steps if present
+        if custom_update_step:
+            custom_update_step()
+
         # update stack
         change_set_details = aws_client_no_retry.cloudformation.create_change_set(
             StackName=stack_name,
@@ -189,13 +226,24 @@ def capture_update_process(aws_client_no_retry, cleanups, capture_per_resource_e
             TemplateBody=t2,
             ChangeSetType="UPDATE",
             Parameters=[{"ParameterKey": k, "ParameterValue": v} for (k, v) in p2.items()],
+            Capabilities=[
+                "CAPABILITY_IAM",
+                "CAPABILITY_NAMED_IAM",
+                "CAPABILITY_AUTO_EXPAND",
+            ],
         )
         snapshot.match("create-change-set-2", change_set_details)
         stack_id = change_set_details["StackId"]
         change_set_id = change_set_details["Id"]
-        aws_client_no_retry.cloudformation.get_waiter("change_set_create_complete").wait(
-            ChangeSetName=change_set_id
-        )
+        try:
+            aws_client_no_retry.cloudformation.get_waiter("change_set_create_complete").wait(
+                ChangeSetName=change_set_id
+            )
+        except WaiterError as e:
+            desc = aws_client_no_retry.cloudformation.describe_change_set(
+                ChangeSetName=change_set_id
+            )
+            raise RuntimeError(f"Change set deployment failed: {desc}") from e
 
         describe_change_set_with_prop_values = (
             aws_client_no_retry.cloudformation.describe_change_set(
@@ -239,4 +287,6 @@ def capture_update_process(aws_client_no_retry, cleanups, capture_per_resource_e
         events = capture_per_resource_events(stack_id)
         snapshot.match("per-resource-events", events)
 
+        return stack_id
+
     yield inner

localstack/testing/pytest/container.py

@@ -2,7 +2,7 @@ import logging
 import os
 import shlex
 import threading
-from typing import Callable, Generator, List, Optional
+from collections.abc import Callable, Generator
 
 import pytest
 
@@ -31,14 +31,14 @@ ENV_TEST_CONTAINER_MOUNT_DEPENDENCIES = "TEST_CONTAINER_MOUNT_DEPENDENCIES"
 
 class ContainerFactory:
     def __init__(self):
-        self._containers: List[Container] = []
+        self._containers: list[Container] = []
 
     def __call__(
         self,
         # convenience properties
         pro: bool = False,
-        publish: Optional[List[int]] = None,
-        configurators: Optional[List[ContainerConfigurator]] = None,
+        publish: list[int] | None = None,
+        configurators: list[ContainerConfigurator] | None = None,
         # ContainerConfig properties
         **kwargs,
     ) -> Container:
@@ -171,7 +171,7 @@ def container_factory() -> Generator[ContainerFactory, None, None]:
 
 @pytest.fixture(scope="session")
 def wait_for_localstack_ready():
-    def _wait_for(container: RunningContainer, timeout: Optional[float] = None):
+    def _wait_for(container: RunningContainer, timeout: float | None = None):
         container.wait_until_ready(timeout)
 
         poll_condition(

localstack/testing/pytest/filters.py

@@ -1,5 +1,3 @@
-from typing import List
-
 import pytest
 from _pytest.config import Config, PytestPluginManager
 from _pytest.config.argparsing import Parser
@@ -13,7 +11,7 @@ def pytest_addoption(parser: Parser, pluginmanager: PytestPluginManager):
 
 
 @pytest.hookimpl
-def pytest_collection_modifyitems(session: Session, config: Config, items: List[Item]):
+def pytest_collection_modifyitems(session: Session, config: Config, items: list[Item]):
     filter_fixtures_option = config.getoption("--filter-fixtures")
     if filter_fixtures_option:
         # TODO: add more sophisticated combinations (=> like pytest -m and -k)