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

localstack/testing/pytest/stepfunctions/utils.py

@@ -1,6 +1,7 @@
 import json
 import logging
-from typing import Callable, Final, Optional
+from collections.abc import Callable
+from typing import Final
 
 from botocore.exceptions import ClientError
 from jsonpath_ng.ext import parse
@@ -189,7 +190,7 @@ def await_state_machine_version_listed(
 def await_on_execution_events(
     stepfunctions_client, execution_arn: str, check_func: Callable[[HistoryEventList], bool]
 ) -> HistoryEventList:
-    events: HistoryEventList = list()
+    events: HistoryEventList = []
 
     def _run_check():
         nonlocal events
@@ -342,7 +343,7 @@ def is_execution_logs_list_complete(
 
 def _await_on_execution_log_stream_created(target_aws_client, log_group_name: str) -> str:
     logs_client = target_aws_client.logs
-    log_stream_name = str()
+    log_stream_name = ""
 
     def _run_check():
         nonlocal log_stream_name
@@ -376,7 +377,7 @@ def await_on_execution_logs(
     log_stream_name = _await_on_execution_log_stream_created(target_aws_client, log_group_name)
 
     logs_client = target_aws_client.logs
-    events: HistoryEventList = list()
+    events: HistoryEventList = []
 
     def _run_check():
         nonlocal events
@@ -402,8 +403,8 @@ def create_state_machine_with_iam_role(
     create_state_machine,
     snapshot,
     definition: Definition,
-    logging_configuration: Optional[LoggingConfiguration] = None,
-    state_machine_name: Optional[str] = None,
+    logging_configuration: LoggingConfiguration | None = None,
+    state_machine_name: str | None = None,
     state_machine_type: StateMachineType = StateMachineType.STANDARD,
 ):
     snf_role_arn = create_state_machine_iam_role(target_aws_client=target_aws_client)
@@ -889,7 +890,7 @@ def create_and_record_events(
         stepfunctions_client=target_aws_client.stepfunctions, execution_arn=execution_arn
     )
 
-    stepfunctions_events = list()
+    stepfunctions_events = []
 
     def _get_events():
         received = target_aws_client.sqs.receive_message(QueueUrl=queue_url)
@@ -905,7 +906,7 @@ def create_and_record_events(
 
 
 def record_sqs_events(target_aws_client, queue_url, sfn_snapshot, num_events):
-    stepfunctions_events = list()
+    stepfunctions_events = []
 
     def _get_events():
         received = target_aws_client.sqs.receive_message(QueueUrl=queue_url)
@@ -916,7 +917,7 @@ def record_sqs_events(target_aws_client, queue_url, sfn_snapshot, num_events):
         return len(stepfunctions_events) == num_events
 
     poll_condition(_get_events, timeout=60)
-    stepfunctions_events.sort(key=lambda e: json.dumps(e.get("detail", dict())))
+    stepfunctions_events.sort(key=lambda e: json.dumps(e.get("detail", {})))
     sfn_snapshot.match("stepfunctions_events", stepfunctions_events)
 
 
@@ -931,7 +932,7 @@ class SfnNoneRecursiveParallelTransformer:
     @staticmethod
     def _normalise_events(events: list[dict]) -> None:
         start_idx = None
-        sublist = list()
+        sublist = []
         in_sublist = False
         for i, event in enumerate(events):
             event_type = event.get("type")

localstack/testing/pytest/util.py

@@ -1,7 +1,7 @@
 import os
 import pwd
+from collections.abc import Callable
 from multiprocessing import Process, ProcessError
-from typing import Callable
 
 
 def run_as_os_user(target: Callable, uid: str | int, gid: str | int = None):

localstack/testing/pytest/validation_tracking.py

@@ -9,7 +9,6 @@ import datetime
 import json
 import os
 from pathlib import Path
-from typing import Dict, Optional
 
 import pytest
 from pluggy import Result
@@ -17,7 +16,7 @@ from pytest import StashKey, TestReport
 
 from localstack.testing.aws.util import is_aws_cloud
 
-durations_key = StashKey[Dict[str, float]]()
+durations_key = StashKey[dict[str, float]]()
 """
 Stores phase durations on the test node between execution phases.
 See https://docs.pytest.org/en/latest/reference/reference.html#pytest.Stash
@@ -28,14 +27,14 @@ Stores information from call execution phase about whether the test failed.
 """
 
 
-def find_validation_data_for_item(item: pytest.Item) -> Optional[dict]:
+def find_validation_data_for_item(item: pytest.Item) -> dict | None:
     base_path = os.path.join(item.fspath.dirname, item.fspath.purebasename)
     snapshot_path = f"{base_path}.validation.json"
 
     if not os.path.exists(snapshot_path):
         return None
 
-    with open(snapshot_path, "r") as fd:
+    with open(snapshot_path) as fd:
         file_content = json.load(fd)
         return file_content.get(item.nodeid)
 

localstack/testing/scenario/provisioning.py

@@ -1,9 +1,10 @@
 import json
 import logging
 import warnings
-from contextlib import contextmanager
+from collections.abc import Callable
+from contextlib import AbstractContextManager, contextmanager
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable, ContextManager, Optional
+from typing import TYPE_CHECKING
 
 import aws_cdk as cdk
 from botocore.exceptions import ClientError, WaiterError
@@ -77,9 +78,9 @@ class InfraProvisioner:
         self,
         aws_client: ServiceLevelClientFactory,
         namespace: str,
-        base_path: Optional[str] = None,
-        force_synth: Optional[bool] = False,
-        persist_output: Optional[bool] = False,
+        base_path: str | None = None,
+        force_synth: bool | None = False,
+        persist_output: bool | None = False,
     ):
         """
         :param namespace: repo-unique identifier for this CDK app.
@@ -108,8 +109,8 @@ class InfraProvisioner:
 
     @contextmanager
     def provisioner(
-        self, skip_deployment: Optional[bool] = False, skip_teardown: Optional[bool] = False
-    ) -> ContextManager["InfraProvisioner"]:
+        self, skip_deployment: bool | None = False, skip_teardown: bool | None = False
+    ) -> AbstractContextManager["InfraProvisioner"]:
         """
         :param skip_deployment: Set to True to skip stack creation and re-use existing stack without modifications.
             Also skips custom setup steps.
@@ -136,7 +137,7 @@ class InfraProvisioner:
             else:
                 LOG.debug("Skipping teardown. Resources and stacks are not deleted.")
 
-    def provision(self, skip_deployment: Optional[bool] = False):
+    def provision(self, skip_deployment: bool | None = False):
         """
         Execute all previously added custom provisioning steps and deploy added CDK stacks via CloudFormation.
 
@@ -299,7 +300,7 @@ class InfraProvisioner:
     def add_cdk_stack(
         self,
         cdk_stack: cdk.Stack,
-        autoclean_buckets: Optional[bool] = True,
+        autoclean_buckets: bool | None = True,
     ):
         """
         Register a CDK stack to be deployed in a later `InfraProvisioner.provision` call.
@@ -318,7 +319,7 @@ class InfraProvisioner:
                 is_env_true("TEST_CDK_FORCE_SYNTH") or self.force_synth
             )  # EXPERIMENTAL / API subject to change
             if not template_path.exists() or should_update_template:
-                with open(template_path, "wt") as fd:
+                with open(template_path, "w") as fd:
                     template_json = cdk.assertions.Template.from_stack(cdk_stack).to_json()
                     json.dump(template_json, fd, indent=2)
                     # add trailing newline for linter and Git compliance

localstack/testing/snapshots/transformer_utility.py

@@ -3,7 +3,7 @@ import logging
 import re
 from datetime import datetime
 from json import JSONDecodeError
-from typing import Optional, Pattern
+from re import Pattern
 
 from localstack_snapshot.snapshots.transformer import (
     PATTERN_ISO8601,
@@ -45,12 +45,16 @@ PATTERN_KEY_ARN = re.compile(
     r"arn:(aws[a-zA-Z-]*)?:([a-zA-Z0-9-_.]+)?:([^:]+)?:(\d{12})?:key/[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
 )
 
+PATTERN_MRK_KEY_ARN = re.compile(
+    r"arn:(aws[a-zA-Z-]*)?:([a-zA-Z0-9-_.]+)?:([^:]+)?:(\d{12})?:key/mrk-[a-fA-F0-9]{32}"
+)
+
 
 # TODO: split into generic/aws and put into lib
 class TransformerUtility:
     @staticmethod
     def key_value(
-        key: str, value_replacement: Optional[str] = None, reference_replacement: bool = True
+        key: str, value_replacement: str | None = None, reference_replacement: bool = True
     ):
         """Creates a new KeyValueBasedTransformer. If the key matches, the value will be replaced.
 
@@ -500,7 +504,7 @@ class TransformerUtility:
                 replacement="<stream-name>",
             ),
             TransformerUtility.key_value(
-                "ContinuationSequenceNumber", "<continuation_sequence_number>"
+                "ContinuationSequenceNumber", "continuation_sequence_number"
             ),
         ]
 
@@ -573,6 +577,7 @@ class TransformerUtility:
             TransformerUtility.key_value("CiphertextBlob", reference_replacement=False),
             TransformerUtility.key_value("Plaintext", reference_replacement=False),
             RegexTransformer(PATTERN_KEY_ARN, replacement="<key-arn>"),
+            RegexTransformer(PATTERN_MRK_KEY_ARN, replacement="<mrk-key-arn>"),
         ]
 
     @staticmethod

localstack/testing/testselection/matching.py

@@ -2,7 +2,7 @@ import fnmatch
 import pathlib
 import re
 from collections import defaultdict
-from typing import Callable, Iterable, Optional
+from collections.abc import Callable, Iterable
 
 from localstack.aws.scaffold import is_keyword
 
@@ -117,7 +117,7 @@ class Matchers:
 
 def generic_service_test_matching_rule(
     changed_file_path: str,
-    api_dependencies: Optional[dict[str, Iterable[str]]] = None,
+    api_dependencies: dict[str, Iterable[str]] | None = None,
     search_patterns: Iterable[str] = DEFAULT_SEARCH_PATTERNS,
     test_dirs: Iterable[str] = ("tests/aws/services",),
 ) -> set[str]:

localstack/testing/testselection/opt_out.py

@@ -1,5 +1,5 @@
 import fnmatch
-from typing import Iterable
+from collections.abc import Iterable
 
 OPT_OUT = []
 

localstack/testing/testselection/scripts/filter_by_test_selection.py

@@ -24,7 +24,7 @@ def main():
         sys.exit(1)
 
     testselection_file_path = sys.argv[1]
-    with open(testselection_file_path, "r") as file:
+    with open(testselection_file_path) as file:
         selected_tests = [line.strip() for line in file.readlines() if line.strip()]
         test_files = [line.strip() for line in sys.stdin]
         filter_test_files(test_files, selected_tests)

localstack/testing/testselection/scripts/generate_test_selection.py

@@ -10,8 +10,8 @@ Optionally set the GITHUB_API_TOKEN environment variable to use the GitHub API.
 import argparse
 import os
 import sys
+from collections.abc import Iterable
 from pathlib import Path
-from typing import Iterable
 
 from localstack.testing.testselection.git import (
     find_merge_base,

localstack/testing/testselection/testselection.py

@@ -1,10 +1,10 @@
-from typing import Iterable, Optional
+from collections.abc import Iterable
 
 from localstack.testing.testselection.matching import MATCHING_RULES, MatchingRule
 
 
 def get_affected_tests_from_changes(
-    changed_files: Iterable[str], matching_rules: Optional[list[MatchingRule]] = None
+    changed_files: Iterable[str], matching_rules: list[MatchingRule] | None = None
 ) -> list[str]:
     """
     Generate test selectors based on the changed files and matching rules to apply to.

localstack/utils/analytics/cli.py

@@ -1,7 +1,6 @@
 import datetime
 import functools
 from multiprocessing import Process
-from typing import List
 
 import click
 
@@ -15,7 +14,7 @@ from .publisher import AnalyticsClientPublisher
 ANALYTICS_API_RESPONSE_TIMEOUT_SECS = 0.5
 
 
-def _publish_cmd_as_analytics_event(command_name: str, params: List[str]):
+def _publish_cmd_as_analytics_event(command_name: str, params: list[str]):
     event = Event(
         name="cli_cmd",
         payload={"cmd": command_name, "params": params},
@@ -28,7 +27,7 @@ def _publish_cmd_as_analytics_event(command_name: str, params: List[str]):
     publisher.publish([event])
 
 
-def _get_parent_commands(ctx: click.Context) -> List[str]:
+def _get_parent_commands(ctx: click.Context) -> list[str]:
     parent_commands = []
     parent = ctx.parent
     while parent is not None:

localstack/utils/analytics/client.py

@@ -3,7 +3,7 @@ Client for the analytics backend.
 """
 
 import logging
-from typing import Any, Dict, List
+from typing import Any
 
 import requests
 
@@ -18,10 +18,10 @@ LOG = logging.getLogger(__name__)
 
 
 class SessionResponse:
-    response: Dict[str, Any]
+    response: dict[str, Any]
     status: int
 
-    def __init__(self, response: Dict[str, Any], status: int = 200):
+    def __init__(self, response: dict[str, Any], status: int = 200):
         self.response = response
         self.status = status
 
@@ -70,7 +70,7 @@ class AnalyticsClient:
         )
 
     # TODO: naming seems confusing since this doesn't actually append, but directly sends all passed events via HTTP
-    def append_events(self, events: List[Event]):
+    def append_events(self, events: list[Event]):
         # TODO: add compression to append_events
         #  it would maybe be useful to compress analytics data, but it's unclear how that will
         #  affect performance and what the benefit is. need to measure first.
@@ -104,7 +104,7 @@ class AnalyticsClient:
         # TODO: Add response type to analytics client
         return response
 
-    def _create_headers(self) -> Dict[str, str]:
+    def _create_headers(self) -> dict[str, str]:
         return {
             "User-Agent": "localstack/" + constants.VERSION,
             "Localstack-Session-ID": self.localstack_session_id,

localstack/utils/analytics/events.py

@@ -1,8 +1,8 @@
 import abc
 import dataclasses
-from typing import Any, Dict, Union
+from typing import Any
 
-EventPayload = Union[Dict[str, Any], Any]  # FIXME: better typing
+EventPayload = dict[str, Any] | Any  # FIXME: better typing
 
 
 @dataclasses.dataclass

localstack/utils/analytics/metadata.py

@@ -2,7 +2,6 @@ import dataclasses
 import logging
 import os
 import platform
-from typing import Optional
 
 from localstack import config
 from localstack.constants import VERSION
@@ -41,7 +40,7 @@ class ClientMetadata:
             k = "*" * len(k)
         d["api_key"] = k
 
-        return "ClientMetadata(%s)" % d
+        return f"ClientMetadata({d})"
 
 
 def get_version_string() -> str:
@@ -148,7 +147,10 @@ def is_license_activated() -> bool:
 
         return licensingv2.get_licensed_environment().activated
     except Exception:
-        LOG.exception("Could not determine license activation status")
+        LOG.error(
+            "Could not determine license activation status",
+            exc_info=LOG.isEnabledFor(logging.DEBUG),
+        )
         return False
 
 
@@ -198,7 +200,7 @@ def _generate_machine_id() -> str:
     return f"gen_{long_uid()[:12]}"
 
 
-def get_api_key_or_auth_token() -> Optional[str]:
+def get_api_key_or_auth_token() -> str | None:
     # TODO: this is duplicated code from ext, but should probably migrate that to localstack
     auth_token = os.environ.get("LOCALSTACK_AUTH_TOKEN", "").strip("'\" ")
     if auth_token:

localstack/utils/analytics/metrics/counter.py

@@ -1,7 +1,7 @@
 import threading
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import Any, Optional, Union
+from typing import Any
 
 from localstack import config
 
@@ -38,7 +38,7 @@ class LabeledCounterPayload:
     value: int
     type: str
     schema_version: int
-    labels: dict[str, Union[str, float]]
+    labels: dict[str, str | float]
 
     def as_dict(self) -> dict[str, Any]:
         payload_dict = {
@@ -66,7 +66,7 @@ class ThreadSafeCounter:
     _count: int
 
     def __init__(self):
-        super(ThreadSafeCounter, self).__init__()
+        super().__init__()
         self._mutex = threading.Lock()
         self._count = 0
 
@@ -113,11 +113,11 @@ class Counter(Metric, ThreadSafeCounter):
     def collect(self) -> list[CounterPayload]:
         """Collects the metric unless events are disabled."""
         if config.DISABLE_EVENTS:
-            return list()
+            return []
 
         if self._count == 0:
             # Return an empty list if the count is 0, as there are no metrics to send to the analytics backend.
-            return list()
+            return []
 
         return [
             CounterPayload(
@@ -140,15 +140,11 @@ class LabeledCounter(Metric):
 
     _type: str
     _labels: list[str]
-    _label_values: tuple[Optional[Union[str, float]], ...]
-    _counters_by_label_values: defaultdict[
-        tuple[Optional[Union[str, float]], ...], ThreadSafeCounter
-    ]
+    _label_values: tuple[str | float | None, ...]
+    _counters_by_label_values: defaultdict[tuple[str | float | None, ...], ThreadSafeCounter]
 
     def __init__(self, namespace: str, name: str, labels: list[str], schema_version: int = 1):
-        super(LabeledCounter, self).__init__(
-            namespace=namespace, name=name, schema_version=schema_version
-        )
+        super().__init__(namespace=namespace, name=name, schema_version=schema_version)
 
         if not labels:
             raise ValueError("At least one label is required; the labels list cannot be empty.")
@@ -164,7 +160,7 @@ class LabeledCounter(Metric):
         self._counters_by_label_values = defaultdict(ThreadSafeCounter)
         MetricRegistry().register(self)
 
-    def labels(self, **kwargs: Union[str, float, None]) -> ThreadSafeCounter:
+    def labels(self, **kwargs: str | float | None) -> ThreadSafeCounter:
         """
         Create a scoped counter instance with specific label values.
 
@@ -184,7 +180,7 @@ class LabeledCounter(Metric):
 
     def collect(self) -> list[LabeledCounterPayload]:
         if config.DISABLE_EVENTS:
-            return list()
+            return []
 
         payload = []
         num_labels = len(self._labels)
@@ -200,10 +196,7 @@ class LabeledCounter(Metric):
                 )
 
             # Create labels dictionary
-            labels_dict = {
-                label_name: label_value
-                for label_name, label_value in zip(self._labels, label_values)
-            }
+            labels_dict = dict(zip(self._labels, label_values, strict=False))
 
             payload.append(
                 LabeledCounterPayload(

localstack/utils/analytics/metrics/registry.py

@@ -43,7 +43,7 @@ class MetricRegistry:
     Provides methods for retrieving and collecting metrics.
     """
 
-    _instance: "MetricRegistry" = None
+    _instance: MetricRegistry = None
     _mutex: threading.Lock = threading.Lock()
 
     def __new__(cls):
@@ -57,7 +57,7 @@ class MetricRegistry:
 
     def __init__(self):
         if not hasattr(self, "_registry"):
-            self._registry = dict()
+            self._registry = {}
 
     @property
     def registry(self) -> dict[MetricRegistryKey, Metric]:

localstack/utils/analytics/publisher.py

@@ -4,7 +4,6 @@ import logging
 import threading
 import time
 from queue import Full, Queue
-from typing import List, Optional
 
 from localstack import config
 from localstack.utils.threads import start_thread, start_worker_thread
@@ -21,7 +20,7 @@ class Publisher(abc.ABC):
     A publisher takes a batch of events and publishes them to a destination.
     """
 
-    def publish(self, events: List[Event]):
+    def publish(self, events: list[Event]):
         raise NotImplementedError
 
     def close(self):
@@ -35,7 +34,7 @@ class AnalyticsClientPublisher(Publisher):
         super().__init__()
         self.client = client or AnalyticsClient()
 
-    def publish(self, events: List[Event]):
+    def publish(self, events: list[Event]):
         self.client.append_events(events)
 
     def close(self):
@@ -47,7 +46,7 @@ class Printer(Publisher):
     Publisher that prints serialized events to stdout.
     """
 
-    def publish(self, events: List[Event]):
+    def publish(self, events: list[Event]):
         for event in events:
             print(event.asdict())
 
@@ -93,7 +92,7 @@ class PublisherBuffer(EventHandler):
         self._stopping.set()
         self._command_queue.put(self._cmd_stop)
 
-    def close_sync(self, timeout: Optional[float] = None):
+    def close_sync(self, timeout: float | None = None):
         self.close()
         return self._stopped.wait(timeout)
 

localstack/utils/analytics/service_providers.py

@@ -0,0 +1,19 @@
+from localstack.runtime import hooks
+
+
+@hooks.on_runtime_ready()
+def publish_provider_assignment():
+    """
+    Publishes the service provider assignment to the analytics service.
+    """
+
+    from localstack.config import SERVICE_PROVIDER_CONFIG
+    from localstack.services.plugins import SERVICE_PLUGINS
+    from localstack.utils.analytics import log
+
+    provider_assignment = {
+        service: f"localstack.aws.provider/{service}:{SERVICE_PROVIDER_CONFIG[service]}"
+        for service in SERVICE_PLUGINS.list_available()
+    }
+
+    log.event("ls_service_provider_assignment", provider_assignment)

localstack/utils/analytics/service_request_aggregator.py

@@ -2,7 +2,7 @@ import datetime
 import logging
 import threading
 from collections import Counter
-from typing import Dict, List, NamedTuple, Optional
+from typing import NamedTuple
 
 from localstack import config
 from localstack.runtime.shutdown import SHUTDOWN_HANDLERS
@@ -20,7 +20,7 @@ class ServiceRequestInfo(NamedTuple):
     service: str
     operation: str
     status_code: int
-    err_type: Optional[str] = None
+    err_type: str | None = None
 
 
 class ServiceRequestAggregator:
@@ -110,7 +110,7 @@ class ServiceRequestAggregator:
             "api_calls": self._aggregate_api_calls(self.counter),
         }
 
-    def _aggregate_api_calls(self, counter) -> List:
+    def _aggregate_api_calls(self, counter) -> list:
         aggregations = []
         for api_call_info, count in counter.items():
             doc = api_call_info._asdict()
@@ -121,5 +121,5 @@ class ServiceRequestAggregator:
             aggregations.append(doc)
         return aggregations
 
-    def _emit_payload(self, analytics_payload: Dict):
+    def _emit_payload(self, analytics_payload: dict):
         analytics.log.event(EVENT_NAME, analytics_payload)