localstack-core 4.11.2.dev14__py3-none-any.whl → 4.12.1.dev25__py3-none-any.whl

localstack/utils/container_utils/container_client.py

@@ -15,6 +15,7 @@ from typing import (
     Literal,
     NamedTuple,
     Protocol,
+    TypeAlias,
     TypedDict,
 )
 
@@ -357,7 +358,13 @@ SimpleVolumeBind = tuple[str, str]
 
 
 @dataclasses.dataclass
-class BindMount:
+class Mount:
+    def to_str(self) -> str:
+        return str(self)
+
+
+@dataclasses.dataclass
+class BindMount(Mount):
     """Represents a --volume argument run/create command. When using VolumeBind to bind-mount a file or directory
     that does not yet exist on the Docker host, -v creates the endpoint for you. It is always created as a directory.
     """
@@ -402,7 +409,7 @@ class BindMount:
 
 
 @dataclasses.dataclass
-class VolumeDirMount:
+class VolumeDirMount(Mount):
     volume_path: str
     """
     Absolute path inside /var/lib/localstack to mount into the container
@@ -439,24 +446,25 @@ class VolumeDirMount:
         }
 
 
+VolumeMappingSpecification: TypeAlias = SimpleVolumeBind | Mount
+
+
 class VolumeMappings:
-    mappings: list[SimpleVolumeBind | BindMount]
+    mappings: list[VolumeMappingSpecification]
 
-    def __init__(self, mappings: list[SimpleVolumeBind | BindMount | VolumeDirMount] = None):
+    def __init__(
+        self,
+        mappings: list[VolumeMappingSpecification] = None,
+    ):
         self.mappings = mappings if mappings is not None else []
 
-    def add(self, mapping: SimpleVolumeBind | BindMount | VolumeDirMount):
+    def add(self, mapping: VolumeMappingSpecification):
         self.append(mapping)
 
-    def append(
-        self,
-        mapping: SimpleVolumeBind | BindMount | VolumeDirMount,
-    ):
+    def append(self, mapping: VolumeMappingSpecification):
         self.mappings.append(mapping)
 
-    def find_target_mapping(
-        self, container_dir: str
-    ) -> SimpleVolumeBind | BindMount | VolumeDirMount | None:
+    def find_target_mapping(self, container_dir: str) -> VolumeMappingSpecification | None:
         """
         Looks through the volumes and returns the one where the container dir matches ``container_dir``.
         Returns None if there is no volume mapping to the given container directory.
@@ -1510,7 +1518,8 @@ class Util:
     ) -> dict[str, dict[str, str]]:
         """Converts a List of (host_path, container_path) tuples to a Dict suitable as volume argument for docker sdk"""
 
-        def _map_to_dict(paths: SimpleVolumeBind | BindMount | VolumeDirMount):
+        def _map_to_dict(paths: VolumeMappingSpecification):
+            # TODO: move this logic to the `Mount` base class
             if isinstance(paths, (BindMount, VolumeDirMount)):
                 return paths.to_docker_sdk_parameters()
             else:

localstack/utils/container_utils/docker_cmd_client.py

@@ -12,7 +12,6 @@ from localstack import config
 from localstack.utils.collections import ensure_list
 from localstack.utils.container_utils.container_client import (
     AccessDenied,
-    BindMount,
     CancellableStream,
     ContainerClient,
     ContainerException,
@@ -21,16 +20,16 @@ from localstack.utils.container_utils.container_client import (
     DockerNotAvailable,
     DockerPlatform,
     LogConfig,
+    Mount,
     NoSuchContainer,
     NoSuchImage,
     NoSuchNetwork,
     NoSuchObject,
     PortMappings,
     RegistryConnectionError,
-    SimpleVolumeBind,
     Ulimit,
     Util,
-    VolumeDirMount,
+    VolumeMappingSpecification,
 )
 from localstack.utils.run import run
 from localstack.utils.strings import first_char_to_upper, to_str
@@ -810,7 +809,7 @@ class CmdDockerClient(ContainerClient):
         tty: bool = False,
         detach: bool = False,
         command: list[str] | str | None = None,
-        volumes: list[SimpleVolumeBind] | None = None,
+        volumes: list[VolumeMappingSpecification] | None = None,
         ports: PortMappings | None = None,
         exposed_ports: list[str] | None = None,
         env_vars: dict[str, str] | None = None,
@@ -900,7 +899,7 @@ class CmdDockerClient(ContainerClient):
         return cmd, env_file
 
     @staticmethod
-    def _map_to_volume_param(volume: SimpleVolumeBind | BindMount | VolumeDirMount) -> str:
+    def _map_to_volume_param(volume: VolumeMappingSpecification) -> str:
         """
         Maps the mount volume, to a parameter for the -v docker cli argument.
 
@@ -911,7 +910,8 @@ class CmdDockerClient(ContainerClient):
         :param volume: Either a SimpleVolumeBind, in essence a tuple (host_dir, container_dir), or a VolumeBind object
         :return: String which is passable as parameter to the docker cli -v option
         """
-        if isinstance(volume, (BindMount, VolumeDirMount)):
+        # TODO: move this logic to the VolumeMappingSpecification type
+        if isinstance(volume, Mount):
             return volume.to_str()
         else:
             return f"{volume[0]}:{volume[1]}"

localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.11.2.dev14'
-__version_tuple__ = version_tuple = (4, 11, 2, 'dev14')
+__version__ = version = '4.12.1.dev25'
+__version_tuple__ = version_tuple = (4, 12, 1, 'dev25')
 
 __commit_id__ = commit_id = None

{localstack_core-4.11.2.dev14.dist-info → localstack_core-4.12.1.dev25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.11.2.dev14
+Version: 4.12.1.dev25
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0
@@ -30,8 +30,8 @@ Requires-Dist: rich>=12.3.0
 Requires-Dist: requests>=2.20.0
 Requires-Dist: semver>=2.10
 Provides-Extra: base-runtime
-Requires-Dist: boto3==1.42.0; extra == "base-runtime"
-Requires-Dist: botocore==1.41.6; extra == "base-runtime"
+Requires-Dist: boto3==1.42.9; extra == "base-runtime"
+Requires-Dist: botocore==1.42.9; extra == "base-runtime"
 Requires-Dist: awscrt!=0.27.1,>=0.13.14; extra == "base-runtime"
 Requires-Dist: cbor2>=5.5.0; extra == "base-runtime"
 Requires-Dist: dnspython>=1.16.0; extra == "base-runtime"
@@ -53,11 +53,11 @@ Requires-Dist: xmltodict>=0.13.0; extra == "base-runtime"
 Requires-Dist: rolo>=0.7; extra == "base-runtime"
 Provides-Extra: runtime
 Requires-Dist: localstack-core[base-runtime]; extra == "runtime"
-Requires-Dist: awscli==1.43.6; extra == "runtime"
+Requires-Dist: awscli==1.43.15; extra == "runtime"
 Requires-Dist: airspeed-ext>=0.6.3; extra == "runtime"
 Requires-Dist: antlr4-python3-runtime==4.13.2; extra == "runtime"
 Requires-Dist: apispec>=5.1.1; extra == "runtime"
-Requires-Dist: aws-sam-translator>=1.15.1; extra == "runtime"
+Requires-Dist: aws-sam-translator>=1.105.0; extra == "runtime"
 Requires-Dist: crontab>=0.22.6; extra == "runtime"
 Requires-Dist: cryptography>=41.0.5; extra == "runtime"
 Requires-Dist: jinja2>=3.1.6; extra == "runtime"
@@ -100,5 +100,5 @@ Requires-Dist: rstr>=3.2.0; extra == "dev"
 Requires-Dist: mypy; 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,iotanalytics,iotwireless,kafka,kinesis,kinesisanalyticsv2,kms,lakeformation,lambda,logs,managedblockchain,mediaconvert,mediastore,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"
+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"
 Dynamic: license-file