localstack-core 4.13.2.dev46__tar.gz → 4.13.2.dev48__tar.gz

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev46
+Version: 4.13.2.dev48
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0
@@ -97,6 +97,7 @@ Requires-Dist: pypandoc; extra == "dev"
 Requires-Dist: ruff>=0.3.3; extra == "dev"
 Requires-Dist: rstr>=3.2.0; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Requires-Dist: watchdog>=6; extra == "dev"
 Provides-Extra: typehint
 Requires-Dist: localstack-core[dev]; extra == "typehint"
 Requires-Dist: boto3-stubs[acm,acm-pca,amplify,apigateway,apigatewayv2,appconfig,appconfigdata,application-autoscaling,appsync,athena,autoscaling,backup,batch,ce,cloudcontrol,cloudformation,cloudfront,cloudtrail,cloudwatch,codebuild,codecommit,codeconnections,codedeploy,codepipeline,codestar-connections,cognito-identity,cognito-idp,dms,docdb,dynamodb,dynamodbstreams,ec2,ecr,ecs,efs,eks,elasticache,elasticbeanstalk,elbv2,emr,emr-serverless,es,events,firehose,fis,glacier,glue,iam,identitystore,iot,iot-data,iotwireless,kafka,kinesis,kinesisanalyticsv2,kms,lakeformation,lambda,logs,managedblockchain,mediaconvert,mq,mwaa,neptune,opensearch,organizations,pi,pinpoint,pipes,rds,rds-data,redshift,redshift-data,resource-groups,resourcegroupstaggingapi,route53,route53resolver,s3,s3control,sagemaker,sagemaker-runtime,secretsmanager,serverlessrepo,servicediscovery,ses,sesv2,sns,sqs,ssm,sso-admin,stepfunctions,sts,timestream-query,timestream-write,transcribe,verifiedpermissions,wafv2,xray]; extra == "typehint"

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/localstack-core/localstack/dev/run/__main__.py

@@ -7,6 +7,16 @@ from rich.rule import Rule
 
 from localstack import config
 from localstack.cli import console
+from localstack.dev.run.configurators import (
+    ConfigEnvironmentConfigurator,
+    DependencyMountConfigurator,
+    EntryPointMountConfigurator,
+    ImageConfigurator,
+    PortConfigurator,
+    SourceVolumeMountConfigurator,
+)
+from localstack.dev.run.paths import HOST_PATH_MAPPINGS, HostPaths
+from localstack.dev.run.watcher import collect_watch_directories, start_file_watcher
 from localstack.runtime import hooks
 from localstack.utils.bootstrap import Container, ContainerConfigurators
 from localstack.utils.container_utils.container_client import (
@@ -19,16 +29,6 @@ from localstack.utils.files import cache_dir
 from localstack.utils.run import run_interactive
 from localstack.utils.strings import short_uid
 
-from .configurators import (
-    ConfigEnvironmentConfigurator,
-    DependencyMountConfigurator,
-    EntryPointMountConfigurator,
-    ImageConfigurator,
-    PortConfigurator,
-    SourceVolumeMountConfigurator,
-)
-from .paths import HOST_PATH_MAPPINGS, HostPaths
-
 
 @click.command("run")
 @click.option(
@@ -68,6 +68,12 @@ from .paths import HOST_PATH_MAPPINGS, HostPaths
     default=True,
     help="Mount source files from localstack and localstack-pro. Use --local-packages for optional dependencies such as moto.",
 )
+@click.option(
+    "--live-reload/--no-live-reload",
+    is_flag=True,
+    default=False,
+    help="Watch mounted source directories for .py file changes and automatically restart the container runtime.",
+)
 @click.option(
     "--mount-dependencies/--no-mount-dependencies",
     is_flag=True,
@@ -130,6 +136,7 @@ def run(
     develop: bool = False,
     randomize: bool = False,
     mount_source: bool = True,
+    live_reload: bool = False,
     mount_dependencies: bool = False,
     mount_entrypoints: bool = False,
     mount_docker_socket: bool = True,
@@ -179,6 +186,11 @@ def run(
 
         python -m localstack.dev.run --entrypoint /bin/bash -- echo "hello"
 
+    Use the --live-reload flag to restart LocalStack on code changes. Beware: this will remove any state
+    that you had in your LocalStack instance. Consider using PERSISTENCE to keep resources:
+
+        python -m localstack.dev.run --live-reload
+
     You can import and expose debugpy:
 
         python -m localstack.dev.run --develop
@@ -339,10 +351,18 @@ def run(
 
     rule = Rule(f"Interactive session with {container_id[:12]} 💻")
     console.print(rule)
+    stop_live_reload_watcher = None
     try:
+        if live_reload and mount_source:
+            if watch_dirs := collect_watch_directories(host_paths, pro, local_packages):
+                stop_live_reload_watcher = start_file_watcher(watch_dirs, docker, container_id)
+
         cmd = [*docker._docker_cmd(), "start", "--interactive", "--attach", container_id]
         run_interactive(cmd)
     finally:
+        if stop_live_reload_watcher is not None:
+            stop_live_reload_watcher.set()
+
         if container_config.remove:
             try:
                 if docker.is_container_running(container_id):

localstack_core-4.13.2.dev48/localstack-core/localstack/dev/run/watcher.py

@@ -0,0 +1,128 @@
+"""File watcher that monitors source directories and signals container restart on changes."""
+
+import os
+import threading
+import time
+from pathlib import Path
+
+from watchdog.events import FileSystemEvent, FileSystemEventHandler
+from watchdog.observers import Observer
+
+from localstack.cli import console
+from localstack.dev.run.paths import HOST_PATH_MAPPINGS, HostPaths
+from localstack.utils.container_utils.container_client import ContainerClient
+from localstack.utils.threads import TMP_THREADS, FuncThread
+
+DEBOUNCE_WINDOW = 0.5
+
+
+class ChangeHandler(FileSystemEventHandler):
+    """Handles file system events for .py files, debouncing and signalling the container."""
+
+    def __init__(
+        self,
+        directories: list[Path],
+        docker: ContainerClient,
+        container_id: str,
+    ):
+        super().__init__()
+        self._directories = directories
+        self._docker = docker
+        self._container_id = container_id
+        self._last_signal_time = 0.0
+        self._lock = threading.Lock()
+
+    def _relative_path(self, path: str) -> str:
+        for d in self._directories:
+            try:
+                return os.path.relpath(path, d.parent)
+            except ValueError:
+                pass
+        return path
+
+    def on_any_event(self, event: FileSystemEvent):
+        if event.is_directory:
+            return
+        src = event.src_path
+        if not src.endswith(".py") or "__pycache__" in src:
+            return
+
+        with self._lock:
+            now = time.monotonic()
+            if now - self._last_signal_time < DEBOUNCE_WINDOW:
+                return
+            self._last_signal_time = now
+
+        console.print("Live reload: sending restart signal to container")
+        _signal_container_restart(self._docker, self._container_id)
+
+
+def _signal_container_restart(docker: ContainerClient, container_id: str):
+    """Send SIGUSR1 to PID 1 inside the container to trigger supervisor restart."""
+    try:
+        docker.exec_in_container(container_id, ["kill", "-USR1", "1"])
+    except Exception as e:
+        console.print(f"Live reload: failed to signal container: {e}")
+
+
+def start_file_watcher(
+    directories: list[Path],
+    docker: ContainerClient,
+    container_id: str,
+) -> threading.Event:
+    """Start a watchdog observer that watches directories for .py changes and signals the container.
+
+    Returns a stop_event that the caller can set to shut down the watcher.
+    """
+    console.print(
+        f"Live reload: watching {len(directories)} "
+        f"director{'y' if len(directories) == 1 else 'ies'} for .py changes"
+    )
+    for d in directories:
+        console.print(f"  {d}")
+
+    handler = ChangeHandler(directories, docker, container_id)
+    observer = Observer()
+    for d in directories:
+        observer.schedule(handler, str(d), recursive=True)
+    observer.daemon = True
+    observer.start()
+
+    stop_event = threading.Event()
+
+    def _shutdown_when_signalled():
+        stop_event.wait()
+        observer.stop()
+
+    shutdown_thread = FuncThread(
+        func=_shutdown_when_signalled,
+        name="live-reload-shutdown",
+    )
+    shutdown_thread.start()
+    TMP_THREADS.append(shutdown_thread)
+
+    return stop_event
+
+
+def collect_watch_directories(
+    host_paths: HostPaths, pro: bool, chosen_packages: list[str] | None
+) -> list[Path]:
+    """Collect host-side source directories that are bind-mounted into the container."""
+    dirs: list[Path] = []
+
+    source = host_paths.aws_community_package_dir
+    if source.exists():
+        dirs.append(source)
+
+    if pro:
+        source = host_paths.aws_pro_package_dir
+        if source.exists():
+            dirs.append(source)
+
+    for package_name in chosen_packages or []:
+        extractor = HOST_PATH_MAPPINGS[package_name]
+        path = extractor(host_paths)
+        if path.exists():
+            dirs.append(path)
+
+    return dirs

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/localstack-core/localstack/services/cloudformation/analytics.py

@@ -1,12 +1,17 @@
 import enum
+import traceback
 from typing import Self
 
 from localstack.aws.api.cloudformation import ChangeAction
+from localstack.utils.analytics import log
 from localstack.utils.analytics.metrics import LabeledCounter
 
 COUNTER_NAMESPACE = "cloudformation"
 COUNTER_VERSION = 2
 
+FAILURE_ANALYTICS_NAMESPACE = "cfn_stack_deploy_failures"
+FAILURE_ANALYTICS_VERSION = 1
+
 
 class ActionOptions(enum.StrEnum):
     """
@@ -65,3 +70,22 @@ def track_resource_operation(
         missing=missing,
         action=ActionOptions.from_action(action),
     ).increment()
+
+
+def emit_stack_failure(reason: str, exception: Exception | None = None) -> None:
+    """
+    Capture the stack failure reason in telemetry
+    """
+
+    payload = {
+        "reason": reason,
+        "version": FAILURE_ANALYTICS_VERSION,
+    }
+    if exception:
+        tb = "".join(traceback.format_exception(exception))
+        payload["tb"] = tb
+
+    log.event(
+        FAILURE_ANALYTICS_NAMESPACE,
+        payload,
+    )

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_executor.py

@@ -16,7 +16,10 @@ from localstack.aws.api.cloudformation import (
     StackStatus,
 )
 from localstack.constants import INTERNAL_AWS_SECRET_ACCESS_KEY
-from localstack.services.cloudformation.analytics import track_resource_operation
+from localstack.services.cloudformation.analytics import (
+    emit_stack_failure,
+    track_resource_operation,
+)
 from localstack.services.cloudformation.deployment_utils import log_not_available_message
 from localstack.services.cloudformation.engine.v2.change_set_model import (
     NodeDependsOn,
@@ -543,6 +546,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                     OperationStatus.FAILED,
                     resource_model={},
                     message=f"Resource provider operation failed: {reason}",
+                    custom_context={"exception": e},
                 )
         elif should_ignore_unsupported_resource_type(
             resource_type=resource_type, change_set_type=self._change_set.change_set_type
@@ -618,6 +622,10 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 )
                 resolved_resource["ResourceStatus"] = ResourceStatus(f"{status_from_action}_FAILED")
                 resolved_resource["ResourceStatusReason"] = reason
+
+                exception = event.custom_context.get("exception")
+                emit_stack_failure(reason, exception=exception)
+
             case other:
                 raise NotImplementedError(f"Event status '{other}' not handled")
 

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/localstack-core/localstack/services/cloudformation/resource_provider.py

@@ -548,6 +548,7 @@ class ResourceProviderExecutor:
                         status=OperationStatus.FAILED,
                         resource_model={},
                         message=f"Failed to delete resource with id {request.logical_resource_id} of type {request.resource_type}",
+                        custom_context={"exception": e},
                     )
             case "Remove":
                 try:
@@ -561,6 +562,7 @@ class ResourceProviderExecutor:
                         status=OperationStatus.FAILED,
                         resource_model={},
                         message=f"Failed to delete resource with id {request.logical_resource_id} of type {request.resource_type}",
+                        custom_context={"exception": e},
                     )
             case _:
                 raise NotImplementedError(change_type)  # TODO: change error type

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/localstack-core/localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.13.2.dev46'
-__version_tuple__ = version_tuple = (4, 13, 2, 'dev46')
+__version__ = version = '4.13.2.dev48'
+__version_tuple__ = version_tuple = (4, 13, 2, 'dev48')
 
-__commit_id__ = commit_id = 'gbc82f221e'
+__commit_id__ = commit_id = 'g9ac61400d'

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/localstack-core/localstack_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev46
+Version: 4.13.2.dev48
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0
@@ -97,6 +97,7 @@ Requires-Dist: pypandoc; extra == "dev"
 Requires-Dist: ruff>=0.3.3; extra == "dev"
 Requires-Dist: rstr>=3.2.0; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Requires-Dist: watchdog>=6; extra == "dev"
 Provides-Extra: typehint
 Requires-Dist: localstack-core[dev]; extra == "typehint"
 Requires-Dist: boto3-stubs[acm,acm-pca,amplify,apigateway,apigatewayv2,appconfig,appconfigdata,application-autoscaling,appsync,athena,autoscaling,backup,batch,ce,cloudcontrol,cloudformation,cloudfront,cloudtrail,cloudwatch,codebuild,codecommit,codeconnections,codedeploy,codepipeline,codestar-connections,cognito-identity,cognito-idp,dms,docdb,dynamodb,dynamodbstreams,ec2,ecr,ecs,efs,eks,elasticache,elasticbeanstalk,elbv2,emr,emr-serverless,es,events,firehose,fis,glacier,glue,iam,identitystore,iot,iot-data,iotwireless,kafka,kinesis,kinesisanalyticsv2,kms,lakeformation,lambda,logs,managedblockchain,mediaconvert,mq,mwaa,neptune,opensearch,organizations,pi,pinpoint,pipes,rds,rds-data,redshift,redshift-data,resource-groups,resourcegroupstaggingapi,route53,route53resolver,s3,s3control,sagemaker,sagemaker-runtime,secretsmanager,serverlessrepo,servicediscovery,ses,sesv2,sns,sqs,ssm,sso-admin,stepfunctions,sts,timestream-query,timestream-write,transcribe,verifiedpermissions,wafv2,xray]; extra == "typehint"

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/localstack-core/localstack_core.egg-info/SOURCES.txt

@@ -146,6 +146,7 @@ localstack-core/localstack/dev/run/__init__.py
 localstack-core/localstack/dev/run/__main__.py
 localstack-core/localstack/dev/run/configurators.py
 localstack-core/localstack/dev/run/paths.py
+localstack-core/localstack/dev/run/watcher.py
 localstack-core/localstack/dns/__init__.py
 localstack-core/localstack/dns/models.py
 localstack-core/localstack/dns/plugins.py

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/localstack-core/localstack_core.egg-info/requires.txt

@@ -49,6 +49,7 @@ pypandoc
 ruff>=0.3.3
 rstr>=3.2.0
 mypy
+watchdog>=6
 
 [runtime]
 localstack-core[base-runtime]

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/pyproject.toml

@@ -138,6 +138,7 @@ dev = [
     "ruff>=0.3.3",
     "rstr>=3.2.0",
     "mypy",
+    "watchdog>=6",
 ]
 
 # not strictly necessary for development, but provides type hint support for a better developer experience

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/requirements-dev.txt

@@ -503,6 +503,8 @@ urllib3==2.6.3
     #   responses
 virtualenv==20.36.1
     # via pre-commit
+watchdog==6.0.0
+    # via localstack-core (pyproject.toml)
 websocket-client==1.9.0
     # via localstack-core
 werkzeug==3.1.5

{localstack_core-4.13.2.dev46 → localstack_core-4.13.2.dev48}/requirements-typehint.txt

@@ -707,6 +707,8 @@ urllib3==2.6.3
     #   responses
 virtualenv==20.36.1
     # via pre-commit
+watchdog==6.0.0
+    # via localstack-core
 websocket-client==1.9.0
     # via localstack-core
 werkzeug==3.1.5