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

localstack/services/apigateway/resource_providers/aws_apigateway_restapi.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -17,40 +17,40 @@ from localstack.utils.strings import to_bytes
 
 
 class ApiGatewayRestApiProperties(TypedDict):
-    ApiKeySourceType: Optional[str]
-    BinaryMediaTypes: Optional[list[str]]
-    Body: Optional[dict | str]
-    BodyS3Location: Optional[S3Location]
-    CloneFrom: Optional[str]
-    Description: Optional[str]
-    DisableExecuteApiEndpoint: Optional[bool]
-    EndpointConfiguration: Optional[EndpointConfiguration]
-    FailOnWarnings: Optional[bool]
-    MinimumCompressionSize: Optional[int]
-    Mode: Optional[str]
-    Name: Optional[str]
-    Parameters: Optional[dict | str]
-    Policy: Optional[dict | str]
-    RestApiId: Optional[str]
-    RootResourceId: Optional[str]
-    Tags: Optional[list[Tag]]
+    ApiKeySourceType: str | None
+    BinaryMediaTypes: list[str] | None
+    Body: dict | str | None
+    BodyS3Location: S3Location | None
+    CloneFrom: str | None
+    Description: str | None
+    DisableExecuteApiEndpoint: bool | None
+    EndpointConfiguration: EndpointConfiguration | None
+    FailOnWarnings: bool | None
+    MinimumCompressionSize: int | None
+    Mode: str | None
+    Name: str | None
+    Parameters: dict | str | None
+    Policy: dict | str | None
+    RestApiId: str | None
+    RootResourceId: str | None
+    Tags: list[Tag] | None
 
 
 class S3Location(TypedDict):
-    Bucket: Optional[str]
-    ETag: Optional[str]
-    Key: Optional[str]
-    Version: Optional[str]
+    Bucket: str | None
+    ETag: str | None
+    Key: str | None
+    Version: str | None
 
 
 class EndpointConfiguration(TypedDict):
-    Types: Optional[list[str]]
-    VpcEndpointIds: Optional[list[str]]
+    Types: list[str] | None
+    VpcEndpointIds: list[str] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/apigateway/resource_providers/aws_apigateway_restapi_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class ApiGatewayRestApiProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::ApiGateway::RestApi"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.apigateway.resource_providers.aws_apigateway_restapi import (

localstack/services/apigateway/resource_providers/aws_apigateway_stage.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import copy
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -16,50 +16,50 @@ from localstack.utils.objects import keys_to_lower
 
 
 class ApiGatewayStageProperties(TypedDict):
-    RestApiId: Optional[str]
-    AccessLogSetting: Optional[AccessLogSetting]
-    CacheClusterEnabled: Optional[bool]
-    CacheClusterSize: Optional[str]
-    CanarySetting: Optional[CanarySetting]
-    ClientCertificateId: Optional[str]
-    DeploymentId: Optional[str]
-    Description: Optional[str]
-    DocumentationVersion: Optional[str]
-    MethodSettings: Optional[list[MethodSetting]]
-    StageName: Optional[str]
-    Tags: Optional[list[Tag]]
-    TracingEnabled: Optional[bool]
-    Variables: Optional[dict]
+    RestApiId: str | None
+    AccessLogSetting: AccessLogSetting | None
+    CacheClusterEnabled: bool | None
+    CacheClusterSize: str | None
+    CanarySetting: CanarySetting | None
+    ClientCertificateId: str | None
+    DeploymentId: str | None
+    Description: str | None
+    DocumentationVersion: str | None
+    MethodSettings: list[MethodSetting] | None
+    StageName: str | None
+    Tags: list[Tag] | None
+    TracingEnabled: bool | None
+    Variables: dict | None
 
 
 class AccessLogSetting(TypedDict):
-    DestinationArn: Optional[str]
-    Format: Optional[str]
+    DestinationArn: str | None
+    Format: str | None
 
 
 class CanarySetting(TypedDict):
-    DeploymentId: Optional[str]
-    PercentTraffic: Optional[float]
-    StageVariableOverrides: Optional[dict]
-    UseStageCache: Optional[bool]
+    DeploymentId: str | None
+    PercentTraffic: float | None
+    StageVariableOverrides: dict | None
+    UseStageCache: bool | None
 
 
 class MethodSetting(TypedDict):
-    CacheDataEncrypted: Optional[bool]
-    CacheTtlInSeconds: Optional[int]
-    CachingEnabled: Optional[bool]
-    DataTraceEnabled: Optional[bool]
-    HttpMethod: Optional[str]
-    LoggingLevel: Optional[str]
-    MetricsEnabled: Optional[bool]
-    ResourcePath: Optional[str]
-    ThrottlingBurstLimit: Optional[int]
-    ThrottlingRateLimit: Optional[float]
+    CacheDataEncrypted: bool | None
+    CacheTtlInSeconds: int | None
+    CachingEnabled: bool | None
+    DataTraceEnabled: bool | None
+    HttpMethod: str | None
+    LoggingLevel: str | None
+    MetricsEnabled: bool | None
+    ResourcePath: str | None
+    ThrottlingBurstLimit: int | None
+    ThrottlingRateLimit: float | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/apigateway/resource_providers/aws_apigateway_stage_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class ApiGatewayStageProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::ApiGateway::Stage"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.apigateway.resource_providers.aws_apigateway_stage import (

localstack/services/apigateway/resource_providers/aws_apigateway_usageplan.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -18,35 +18,35 @@ from localstack.utils.strings import first_char_to_lower
 
 
 class ApiGatewayUsagePlanProperties(TypedDict):
-    ApiStages: Optional[list[ApiStage]]
-    Description: Optional[str]
-    Id: Optional[str]
-    Quota: Optional[QuotaSettings]
-    Tags: Optional[list[Tag]]
-    Throttle: Optional[ThrottleSettings]
-    UsagePlanName: Optional[str]
+    ApiStages: list[ApiStage] | None
+    Description: str | None
+    Id: str | None
+    Quota: QuotaSettings | None
+    Tags: list[Tag] | None
+    Throttle: ThrottleSettings | None
+    UsagePlanName: str | None
 
 
 class ApiStage(TypedDict):
-    ApiId: Optional[str]
-    Stage: Optional[str]
-    Throttle: Optional[dict]
+    ApiId: str | None
+    Stage: str | None
+    Throttle: dict | None
 
 
 class QuotaSettings(TypedDict):
-    Limit: Optional[int]
-    Offset: Optional[int]
-    Period: Optional[str]
+    Limit: int | None
+    Offset: int | None
+    Period: str | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 class ThrottleSettings(TypedDict):
-    BurstLimit: Optional[int]
-    RateLimit: Optional[float]
+    BurstLimit: int | None
+    RateLimit: float | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/apigateway/resource_providers/aws_apigateway_usageplan_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class ApiGatewayUsagePlanProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::ApiGateway::UsagePlan"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.apigateway.resource_providers.aws_apigateway_usageplan import (

localstack/services/apigateway/resource_providers/aws_apigateway_usageplankey.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -15,10 +15,10 @@ from localstack.utils.objects import keys_to_lower
 
 
 class ApiGatewayUsagePlanKeyProperties(TypedDict):
-    KeyId: Optional[str]
-    KeyType: Optional[str]
-    UsagePlanId: Optional[str]
-    Id: Optional[str]
+    KeyId: str | None
+    KeyType: str | None
+    UsagePlanId: str | None
+    Id: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/apigateway/resource_providers/aws_apigateway_usageplankey_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class ApiGatewayUsagePlanKeyProviderPlugin(CloudFormationResourceProviderPlugin)
     name = "AWS::ApiGateway::UsagePlanKey"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.apigateway.resource_providers.aws_apigateway_usageplankey import (

localstack/services/cdk/resource_providers/cdk_metadata.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,7 +14,7 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class CDKMetadataProperties(TypedDict):
-    Id: Optional[str]
+    Id: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"
@@ -83,8 +83,9 @@ class CDKMetadataProvider(ResourceProvider[CDKMetadataProperties]):
 
         """
         model = request.desired_state
+        result_model = {**model, "Id": request.previous_state["Id"]}
 
         return ProgressEvent(
             status=OperationStatus.SUCCESS,
-            resource_model=model,
+            resource_model=result_model,
         )

localstack/services/cdk/resource_providers/cdk_metadata_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class LambdaAliasProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::CDK::Metadata"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.cdk.resource_providers.cdk_metadata import CDKMetadataProvider

localstack/services/certificatemanager/resource_providers/aws_certificatemanager_certificate.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,25 +14,25 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class CertificateManagerCertificateProperties(TypedDict):
-    DomainName: Optional[str]
-    CertificateAuthorityArn: Optional[str]
-    CertificateTransparencyLoggingPreference: Optional[str]
-    DomainValidationOptions: Optional[list[DomainValidationOption]]
-    Id: Optional[str]
-    SubjectAlternativeNames: Optional[list[str]]
-    Tags: Optional[list[Tag]]
-    ValidationMethod: Optional[str]
+    DomainName: str | None
+    CertificateAuthorityArn: str | None
+    CertificateTransparencyLoggingPreference: str | None
+    DomainValidationOptions: list[DomainValidationOption] | None
+    Id: str | None
+    SubjectAlternativeNames: list[str] | None
+    Tags: list[Tag] | None
+    ValidationMethod: str | None
 
 
 class DomainValidationOption(TypedDict):
-    DomainName: Optional[str]
-    HostedZoneId: Optional[str]
-    ValidationDomain: Optional[str]
+    DomainName: str | None
+    HostedZoneId: str | None
+    ValidationDomain: str | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/certificatemanager/resource_providers/aws_certificatemanager_certificate_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class CertificateManagerCertificateProviderPlugin(CloudFormationResourceProvider
     name = "AWS::CertificateManager::Certificate"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.certificatemanager.resource_providers.aws_certificatemanager_certificate import (

localstack/services/cloudformation/api_utils.py

@@ -77,9 +77,7 @@ def get_remote_template_body(url: str) -> str:
             result = client.get_object(Bucket=parts[0], Key=parts[2])
             body = to_str(result["Body"].read())
             return body
-        raise RuntimeError(
-            "Unable to fetch template body (code %s) from URL %s" % (status_code, url)
-        )
+        raise RuntimeError(f"Unable to fetch template body (code {status_code}) from URL {url}")
     else:
         raise RuntimeError(
             f"Bad status code from fetching template from url '{url}' ({status_code})",
@@ -112,11 +110,9 @@ def get_template_body(req_data: dict) -> str:
                 result = client.get_object(Bucket=parts[0], Key=parts[2])
                 body = to_str(result["Body"].read())
                 return body
-            raise Exception(
-                "Unable to fetch template body (code %s) from URL %s" % (status_code, url)
-            )
+            raise Exception(f"Unable to fetch template body (code {status_code}) from URL {url}")
         return to_str(response.content)
-    raise Exception("Unable to get template body from input: %s" % req_data)
+    raise Exception(f"Unable to get template body from input: {req_data}")
 
 
 def is_local_service_url(url: str) -> bool:
@@ -127,7 +123,7 @@ def is_local_service_url(url: str) -> bool:
         constants.LOCALHOST_HOSTNAME,
         localstack_host().host,
     )
-    if any(re.match(r"^[^:]+://[^:/]*%s([:/]|$)" % host, url) for host in candidates):
+    if any(re.match(rf"^[^:]+://[^:/]*{host}([:/]|$)", url) for host in candidates):
         return True
     host = url.split("://")[-1].split("/")[0]
     return "localhost" in host

localstack/services/cloudformation/cfn_utils.py

@@ -1,5 +1,5 @@
 import json
-from typing import Callable
+from collections.abc import Callable
 
 from localstack.utils.objects import recurse_object
 
@@ -59,7 +59,7 @@ def convert_types(obj, types):
         def recurse(o, path):
             if isinstance(o, dict):
                 for k, v in dict(o).items():
-                    key_path = "%s%s" % (path or ".", k)
+                    key_path = "{}{}".format(path or ".", k)
                     if key in [k, key_path]:
                         o[k] = type_class(v)
             return o

localstack/services/cloudformation/deployment_utils.py

@@ -2,8 +2,8 @@ import builtins
 import json
 import logging
 import re
+from collections.abc import Callable
 from copy import deepcopy
-from typing import Callable, List
 
 from localstack import config
 from localstack.utils import common
@@ -88,7 +88,7 @@ def params_list_to_dict(param_name, key_attr_name="Key", value_attr_name="Value"
     return do_replace
 
 
-def lambda_keys_to_lower(key=None, skip_children_of: List[str] = None):
+def lambda_keys_to_lower(key=None, skip_children_of: list[str] = None):
     return (
         lambda account_id,
         region_name,
@@ -224,7 +224,7 @@ def fix_boto_parameters_based_on_report(original_params: dict, report: str) -> d
         cast_class = getattr(builtins, valid_class)
         old_value = get_nested(params, param_name)
 
-        if cast_class == bool and str(old_value).lower() in ["true", "false"]:
+        if isinstance(cast_class, bool) and str(old_value).lower() in ["true", "false"]:
             new_value = str(old_value).lower() == "true"
         else:
             new_value = cast_class(old_value)
@@ -252,15 +252,17 @@ def convert_data_types(type_conversions: dict[str, Callable], params: dict) -> d
     attr_names = type_conversions.keys() or []
 
     def cast(_obj, _type):
-        if _type == bool:
-            return _obj in ["True", "true", True]
-        if _type == str:
-            if isinstance(_obj, bool):
-                return str(_obj).lower()
-            return str(_obj)
-        if _type in (int, float):
-            return _type(_obj)
-        return _obj
+        match _type:
+            case builtins.bool:
+                return _obj in ["True", "true", True]
+            case builtins.str:
+                if isinstance(_obj, bool):
+                    return str(_obj).lower()
+                return str(_obj)
+            case builtins.int | builtins.float:
+                return _type(_obj)
+            case _:
+                return _obj
 
     def fix_types(o, **kwargs):
         if isinstance(o, dict):

localstack/services/cloudformation/engine/changes.py

@@ -1,4 +1,4 @@
-from typing import Literal, Optional, TypedDict
+from typing import Literal, TypedDict
 
 Action = str
 
@@ -6,11 +6,11 @@ Action = str
 class ResourceChange(TypedDict):
     Action: Action
     LogicalResourceId: str
-    PhysicalResourceId: Optional[str]
+    PhysicalResourceId: str | None
     ResourceType: str
     Scope: list
     Details: list
-    Replacement: Optional[Literal["False"]]
+    Replacement: Literal["False"] | None
 
 
 class ChangeConfig(TypedDict):

localstack/services/cloudformation/engine/entities.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 from localstack.aws.api.cloudformation import Capability, ChangeSetType, Parameter
 from localstack.services.cloudformation.engine.parameters import (
@@ -14,7 +14,13 @@ from localstack.services.cloudformation.engine.v2.change_set_model import (
 )
 from localstack.utils.aws import arns
 from localstack.utils.collections import select_attributes
-from localstack.utils.id_generator import ExistingIds, ResourceIdentifier, Tags, generate_short_uid
+from localstack.utils.id_generator import (
+    ExistingIds,
+    ResourceIdentifier,
+    Tags,
+    generate_short_uid,
+    generate_uid,
+)
 from localstack.utils.json import clone_safe
 from localstack.utils.objects import recurse_object
 from localstack.utils.strings import long_uid, short_uid
@@ -52,14 +58,14 @@ class StackInstance:
 class CreateChangeSetInput(TypedDict):
     StackName: str
     Capabilities: list[Capability]
-    ChangeSetName: Optional[str]
-    ChangSetType: Optional[ChangeSetType]
+    ChangeSetName: str | None
+    ChangSetType: ChangeSetType | None
     Parameters: list[Parameter]
 
 
 class StackTemplate(TypedDict):
     StackName: str
-    ChangeSetName: Optional[str]
+    ChangeSetName: str | None
     Outputs: dict
     Resources: dict
 
@@ -75,6 +81,11 @@ class StackIdentifier(ResourceIdentifier):
         return generate_short_uid(resource_identifier=self, existing_ids=existing_ids, tags=tags)
 
 
+class StackIdentifierV2(StackIdentifier):
+    def generate(self, existing_ids: ExistingIds = None, tags: Tags = None) -> str:
+        return generate_uid(resource_identifier=self, existing_ids=existing_ids, tags=tags)
+
+
 # TODO: remove metadata (flatten into individual fields)
 class Stack:
     change_sets: list["StackChangeSet"]
@@ -83,9 +94,9 @@ class Stack:
         self,
         account_id: str,
         region_name: str,
-        metadata: Optional[CreateChangeSetInput] = None,
-        template: Optional[StackTemplate] = None,
-        template_body: Optional[str] = None,
+        metadata: CreateChangeSetInput | None = None,
+        template: StackTemplate | None = None,
+        template_body: str | None = None,
     ):
         self.account_id = account_id
         self.region_name = region_name
@@ -93,7 +104,7 @@ class Stack:
         if template is None:
             template = {}
 
-        self.resolved_outputs = list()  # TODO
+        self.resolved_outputs = []  # TODO
         self.resolved_parameters: dict[str, StackParameter] = {}
         self.resolved_conditions: dict[str, bool] = {}
 
@@ -185,7 +196,7 @@ class Stack:
             result.setdefault(attr, [])
         return result
 
-    def set_stack_status(self, status: str, status_reason: Optional[str] = None):
+    def set_stack_status(self, status: str, status_reason: str | None = None):
         self.metadata["StackStatus"] = status
         if "FAILED" in status:
             self.metadata["StackStatusReason"] = status_reason or "Deployment failed"
@@ -360,8 +371,7 @@ class Stack:
         resource = resource_map.get(resource_id)
         if not resource:
             raise Exception(
-                'Unable to find details for resource "%s" in stack "%s"'
-                % (resource_id, self.stack_name)
+                f'Unable to find details for resource "{resource_id}" in stack "{self.stack_name}"'
             )
         return resource
 
@@ -393,7 +403,7 @@ class StackChangeSet(Stack):
             template = {}
         if params is None:
             params = {}
-        super(StackChangeSet, self).__init__(account_id, region_name, params, template)
+        super().__init__(account_id, region_name, params, template)
 
         name = self.metadata["ChangeSetName"]
         if not self.metadata.get("ChangeSetId"):
@@ -428,10 +438,10 @@ class StackChangeSet(Stack):
     # V2 only
     def populate_update_graph(
         self,
-        before_template: Optional[dict],
-        after_template: Optional[dict],
-        before_parameters: Optional[dict],
-        after_parameters: Optional[dict],
+        before_template: dict | None,
+        after_template: dict | None,
+        before_parameters: dict | None,
+        after_parameters: dict | None,
     ) -> None:
         change_set_model = ChangeSetModel(
             before_template=before_template,