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

localstack/services/lambda_/resource_providers/aws_lambda_permission.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 (
@@ -15,15 +15,15 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class LambdaPermissionProperties(TypedDict):
-    Action: Optional[str]
-    FunctionName: Optional[str]
-    Principal: Optional[str]
-    EventSourceToken: Optional[str]
-    FunctionUrlAuthType: Optional[str]
-    Id: Optional[str]
-    PrincipalOrgID: Optional[str]
-    SourceAccount: Optional[str]
-    SourceArn: Optional[str]
+    Action: str | None
+    FunctionName: str | None
+    Principal: str | None
+    EventSourceToken: str | None
+    FunctionUrlAuthType: str | None
+    Id: str | None
+    PrincipalOrgID: str | None
+    SourceAccount: str | None
+    SourceArn: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/lambda_/resource_providers/aws_lambda_permission_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 LambdaPermissionProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::Lambda::Permission"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.lambda_.resource_providers.aws_lambda_permission import (

localstack/services/lambda_/resource_providers/aws_lambda_url.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,22 +14,22 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class LambdaUrlProperties(TypedDict):
-    AuthType: Optional[str]
-    TargetFunctionArn: Optional[str]
-    Cors: Optional[Cors]
-    FunctionArn: Optional[str]
-    FunctionUrl: Optional[str]
-    InvokeMode: Optional[str]
-    Qualifier: Optional[str]
+    AuthType: str | None
+    TargetFunctionArn: str | None
+    Cors: Cors | None
+    FunctionArn: str | None
+    FunctionUrl: str | None
+    InvokeMode: str | None
+    Qualifier: str | None
 
 
 class Cors(TypedDict):
-    AllowCredentials: Optional[bool]
-    AllowHeaders: Optional[list[str]]
-    AllowMethods: Optional[list[str]]
-    AllowOrigins: Optional[list[str]]
-    ExposeHeaders: Optional[list[str]]
-    MaxAge: Optional[int]
+    AllowCredentials: bool | None
+    AllowHeaders: list[str] | None
+    AllowMethods: list[str] | None
+    AllowOrigins: list[str] | None
+    ExposeHeaders: list[str] | None
+    MaxAge: int | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"
@@ -67,7 +67,7 @@ class LambdaUrlProvider(ResourceProvider[LambdaUrlProperties]):
         """
         model = request.desired_state
         lambda_client = request.aws_client_factory.lambda_
-        params = util.select_attributes(model, ["Qualifier", "Cors", "AuthType"])
+        params = util.select_attributes(model, ["Qualifier", "Cors", "AuthType", "InvokeMode"])
         params["FunctionName"] = model["TargetFunctionArn"]
 
         response = lambda_client.create_function_url_config(**params)

localstack/services/lambda_/resource_providers/aws_lambda_url_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 LambdaUrlProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::Lambda::Url"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.lambda_.resource_providers.aws_lambda_url import LambdaUrlProvider

localstack/services/lambda_/resource_providers/aws_lambda_version.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,16 +14,16 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class LambdaVersionProperties(TypedDict):
-    FunctionName: Optional[str]
-    CodeSha256: Optional[str]
-    Description: Optional[str]
-    Id: Optional[str]
-    ProvisionedConcurrencyConfig: Optional[ProvisionedConcurrencyConfiguration]
-    Version: Optional[str]
+    FunctionName: str | None
+    CodeSha256: str | None
+    Description: str | None
+    Id: str | None
+    ProvisionedConcurrencyConfig: ProvisionedConcurrencyConfiguration | None
+    Version: str | None
 
 
 class ProvisionedConcurrencyConfiguration(TypedDict):
-    ProvisionedConcurrentExecutions: Optional[int]
+    ProvisionedConcurrentExecutions: int | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/lambda_/resource_providers/aws_lambda_version_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 LambdaVersionProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::Lambda::Version"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.lambda_.resource_providers.aws_lambda_version import (

localstack/services/lambda_/resource_providers/lambda_alias.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,26 +14,26 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class LambdaAliasProperties(TypedDict):
-    FunctionName: Optional[str]
-    FunctionVersion: Optional[str]
-    Name: Optional[str]
-    Description: Optional[str]
-    Id: Optional[str]
-    ProvisionedConcurrencyConfig: Optional[ProvisionedConcurrencyConfiguration]
-    RoutingConfig: Optional[AliasRoutingConfiguration]
+    FunctionName: str | None
+    FunctionVersion: str | None
+    Name: str | None
+    Description: str | None
+    Id: str | None
+    ProvisionedConcurrencyConfig: ProvisionedConcurrencyConfiguration | None
+    RoutingConfig: AliasRoutingConfiguration | None
 
 
 class ProvisionedConcurrencyConfiguration(TypedDict):
-    ProvisionedConcurrentExecutions: Optional[int]
+    ProvisionedConcurrentExecutions: int | None
 
 
 class VersionWeight(TypedDict):
-    FunctionVersion: Optional[str]
-    FunctionWeight: Optional[float]
+    FunctionVersion: str | None
+    FunctionWeight: float | None
 
 
 class AliasRoutingConfiguration(TypedDict):
-    AdditionalVersionWeights: Optional[list[VersionWeight]]
+    AdditionalVersionWeights: list[VersionWeight] | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/lambda_/resource_providers/lambda_alias_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::Lambda::Alias"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.lambda_.resource_providers.lambda_alias import LambdaAliasProvider

localstack/services/lambda_/runtimes.py

@@ -1,7 +1,5 @@
 """This Lambda Runtimes reference defines everything around Lambda runtimes to facilitate adding new runtimes."""
 
-from typing import Optional
-
 from localstack.aws.api.lambda_ import Runtime
 
 # LocalStack Lambda runtimes support policy
@@ -77,7 +75,7 @@ IMAGE_MAPPING: dict[Runtime, str] = {
 #  We currently use them in LocalStack logs as bonus recommendation (DevX).
 # When updating the recommendation,
 # please regenerate all tests with @markers.lambda_runtime_update
-DEPRECATED_RUNTIMES_UPGRADES: dict[Runtime, Optional[Runtime]] = {
+DEPRECATED_RUNTIMES_UPGRADES: dict[Runtime, Runtime | None] = {
     # deprecated Jan 8, 2024 => Feb 8, 2024 => Mar 12, 2024
     Runtime.java8: Runtime.java21,
     # deprecated Jan 8, 2024 => Feb 8, 2024 => Mar 12, 2024

localstack/services/lambda_/urlrouter.py

@@ -5,6 +5,7 @@ import json
 import logging
 from datetime import datetime
 from http import HTTPStatus
+from json import JSONDecodeError
 
 from rolo.request import restore_payload
 
@@ -192,7 +193,18 @@ def lambda_result_to_response(result: InvocationResult):
     )
 
     original_payload = to_str(result.payload)
-    parsed_result = json.loads(original_payload)
+    try:
+        parsed_result = json.loads(original_payload)
+    except JSONDecodeError:
+        # URL router must be able to parse a Streaming Response without necessary defining it in the URL Config
+        # And if the body is a simple string, it should be returned without issues
+        split_index = original_payload.find("\x00" * 8)
+        if split_index == -1:
+            parsed_result = {"body": original_payload}
+        else:
+            metadata = original_payload[:split_index]
+            body_str = original_payload[split_index + 8 :]
+            parsed_result = {**json.loads(metadata), "body": body_str}
 
     # patch to fix whitespaces
     # TODO: check if this is a downstream issue of invocation result serialization
@@ -201,6 +213,7 @@ def lambda_result_to_response(result: InvocationResult):
     if isinstance(parsed_result, str):
         # a string is a special case here and is returned as-is
         response.data = parsed_result
+
     elif isinstance(parsed_result, dict):
         # if it's a dict it might be a proper response
         if isinstance(parsed_result.get("headers"), dict):

localstack/services/logs/models.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 from moto.logs.models import LogsBackend as MotoLogsBackend
 from moto.logs.models import logs_backends as moto_logs_backend
 
@@ -12,7 +10,7 @@ def get_moto_logs_backend(account_id: str, region_name: str) -> MotoLogsBackend:
 
 class LogsStore(BaseStore):
     # maps resource ARN to tags
-    TAGS: Dict[str, Dict[str, str]] = CrossRegionAttribute(default=dict)
+    TAGS: dict[str, dict[str, str]] = CrossRegionAttribute(default=dict)
 
 
 logs_stores = AccountRegionBundle("logs", LogsStore)

localstack/services/logs/provider.py

@@ -3,8 +3,8 @@ import copy
 import io
 import json
 import logging
+from collections.abc import Callable
 from gzip import GzipFile
-from typing import Callable, Dict
 
 from moto.core.utils import unix_time_millis
 from moto.logs.models import LogEvent, LogsBackend
@@ -22,10 +22,13 @@ from localstack.aws.api.logs import (
     InputLogEvents,
     InvalidParameterException,
     KmsKeyId,
+    ListLogGroupsRequest,
+    ListLogGroupsResponse,
     ListTagsForResourceResponse,
     ListTagsLogGroupResponse,
     LogGroupClass,
     LogGroupName,
+    LogGroupSummary,
     LogsApi,
     LogStreamName,
     PutLogEventsResponse,
@@ -43,7 +46,7 @@ from localstack.services.plugins import ServiceLifecycleHook
 from localstack.utils.aws import arns
 from localstack.utils.aws.client_types import ServicePrincipal
 from localstack.utils.bootstrap import is_api_enabled
-from localstack.utils.common import is_number
+from localstack.utils.numbers import is_number
 from localstack.utils.patch import patch
 
 LOG = logging.getLogger(__name__)
@@ -60,8 +63,8 @@ class LogsProvider(LogsApi, ServiceLifecycleHook):
         log_group_name: LogGroupName,
         log_stream_name: LogStreamName,
         log_events: InputLogEvents,
-        sequence_token: SequenceToken = None,
-        entity: Entity = None,
+        sequence_token: SequenceToken | None = None,
+        entity: Entity | None = None,
         **kwargs,
     ) -> PutLogEventsResponse:
         logs_backend = get_moto_logs_backend(context.account_id, context.region)
@@ -97,33 +100,32 @@ class LogsProvider(LogsApi, ServiceLifecycleHook):
     ) -> DescribeLogGroupsResponse:
         region_backend = get_moto_logs_backend(context.account_id, context.region)
 
-        prefix: str = request.get("logGroupNamePrefix", "")
-        pattern: str = request.get("logGroupNamePattern", "")
+        prefix: str | None = request.get("logGroupNamePrefix", "")
+        pattern: str | None = request.get("logGroupNamePattern", "")
 
         if pattern and prefix:
             raise InvalidParameterException(
                 "LogGroup name prefix and LogGroup name pattern are mutually exclusive parameters."
             )
 
-        copy_groups = copy.deepcopy(region_backend.groups)
+        moto_groups = copy.deepcopy(dict(region_backend.groups)).values()
 
         groups = [
-            group.to_describe_dict()
-            for name, group in copy_groups.items()
+            {"logGroupClass": LogGroupClass.STANDARD} | group.to_describe_dict()
+            for group in sorted(moto_groups, key=lambda g: g.name)
             if not (prefix or pattern)
-            or (prefix and name.startswith(prefix))
-            or (pattern and pattern in name)
+            or (prefix and group.name.startswith(prefix))
+            or (pattern and pattern in group.name)
         ]
 
-        groups = sorted(groups, key=lambda x: x["logGroupName"])
         return DescribeLogGroupsResponse(logGroups=groups)
 
     @handler("DescribeLogStreams", expand=False)
     def describe_log_streams(
         self, context: RequestContext, request: DescribeLogStreamsRequest
     ) -> DescribeLogStreamsResponse:
-        log_group_name: str = request.get("logGroupName")
-        log_group_identifier: str = request.get("logGroupIdentifier")
+        log_group_name: str | None = request.get("logGroupName")
+        log_group_identifier: str | None = request.get("logGroupIdentifier")
 
         if log_group_identifier and log_group_name:
             raise CommonServiceException(
@@ -138,13 +140,29 @@ class LogsProvider(LogsApi, ServiceLifecycleHook):
 
         return moto.call_moto_with_request(context, request_copy)
 
+    @handler("ListLogGroups", expand=False)
+    def list_log_groups(
+        self, context: RequestContext, request: ListLogGroupsRequest
+    ) -> ListLogGroupsResponse:
+        pattern: str | None = request.get("logGroupNamePattern")
+        region_backend: LogsBackend = get_moto_logs_backend(context.account_id, context.region)
+        moto_groups = copy.deepcopy(region_backend.groups).values()
+        groups = [
+            LogGroupSummary(
+                logGroupName=group.name, logGroupArn=group.arn, logGroupClass=LogGroupClass.STANDARD
+            )
+            for group in sorted(moto_groups, key=lambda g: g.name)
+            if not pattern or pattern in group.name
+        ]
+        return ListLogGroupsResponse(logGroups=groups)
+
     def create_log_group(
         self,
         context: RequestContext,
         log_group_name: LogGroupName,
-        kms_key_id: KmsKeyId = None,
-        tags: Tags = None,
-        log_group_class: LogGroupClass = None,
+        kms_key_id: KmsKeyId | None = None,
+        tags: Tags | None = None,
+        log_group_class: LogGroupClass | None = None,
         **kwargs,
     ) -> None:
         call_moto(context)
@@ -243,7 +261,7 @@ class LogsProvider(LogsApi, ServiceLifecycleHook):
             )
 
 
-def get_pattern_matcher(pattern: str) -> Callable[[str, Dict], bool]:
+def get_pattern_matcher(pattern: str) -> Callable[[str, dict], bool]:
     """Returns a pattern matcher. Can be patched by plugins to return a more sophisticated pattern matcher."""
     return lambda _pattern, _log_event: True
 
@@ -410,7 +428,7 @@ def moto_put_log_events(self: "MotoLogStream", log_events):
                     Record={"Data": payload_gz_encoded},
                 )
 
-    return "{:056d}".format(self.upload_sequence_token)
+    return f"{self.upload_sequence_token:056d}"
 
 
 @patch(MotoLogStream.filter_log_events)
@@ -442,10 +460,9 @@ def moto_to_describe_dict(target, self):
     # reported race condition in https://github.com/localstack/localstack/issues/8011
     # making copy of "streams" dict here to avoid issues while summing up storedBytes
     copy_streams = copy.deepcopy(self.streams)
-    # parity tests shows that the arn ends with ":*"
-    arn = self.arn if self.arn.endswith(":*") else f"{self.arn}:*"
     log_group = {
-        "arn": arn,
+        "arn": f"{self.arn}:*",
+        "logGroupArn": self.arn,
         "creationTime": self.creation_time,
         "logGroupName": self.name,
         "metricFilterCount": 0,

localstack/services/logs/resource_providers/aws_logs_loggroup.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,17 +14,17 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class LogsLogGroupProperties(TypedDict):
-    Arn: Optional[str]
-    DataProtectionPolicy: Optional[dict]
-    KmsKeyId: Optional[str]
-    LogGroupName: Optional[str]
-    RetentionInDays: Optional[int]
-    Tags: Optional[list[Tag]]
+    Arn: str | None
+    DataProtectionPolicy: dict | None
+    KmsKeyId: str | None
+    LogGroupName: str | None
+    RetentionInDays: int | None
+    Tags: list[Tag] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/logs/resource_providers/aws_logs_loggroup_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 LogsLogGroupProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::Logs::LogGroup"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.logs.resource_providers.aws_logs_loggroup import (

localstack/services/logs/resource_providers/aws_logs_logstream.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,9 +14,9 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class LogsLogStreamProperties(TypedDict):
-    LogGroupName: Optional[str]
-    Id: Optional[str]
-    LogStreamName: Optional[str]
+    LogGroupName: str | None
+    Id: str | None
+    LogStreamName: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/logs/resource_providers/aws_logs_logstream_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 LogsLogStreamProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::Logs::LogStream"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.logs.resource_providers.aws_logs_logstream import (

localstack/services/logs/resource_providers/aws_logs_subscriptionfilter.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,12 +14,12 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class LogsSubscriptionFilterProperties(TypedDict):
-    DestinationArn: Optional[str]
-    FilterPattern: Optional[str]
-    LogGroupName: Optional[str]
-    Distribution: Optional[str]
-    FilterName: Optional[str]
-    RoleArn: Optional[str]
+    DestinationArn: str | None
+    FilterPattern: str | None
+    LogGroupName: str | None
+    Distribution: str | None
+    FilterName: str | None
+    RoleArn: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/logs/resource_providers/aws_logs_subscriptionfilter_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 LogsSubscriptionFilterProviderPlugin(CloudFormationResourceProviderPlugin)
     name = "AWS::Logs::SubscriptionFilter"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.logs.resource_providers.aws_logs_subscriptionfilter import (

localstack/services/moto.py

@@ -1,11 +1,11 @@
 """
-This module provides tools to call moto using moto and botocore internals without going through the moto HTTP server.
+This module provides tools to call Moto service implementations.
 """
 
 import copy
 import sys
+from collections.abc import Callable
 from functools import lru_cache
-from typing import Callable, Optional, Union
 
 import moto.backends as moto_backends
 from moto.core.base_backend import BackendDict
@@ -65,6 +65,7 @@ def call_moto_with_request(
         action=context.operation.name,
         parameters=service_request,
         region=context.region,
+        protocol=context.protocol,
     )
     # we keep the headers from the original request, but override them with the ones created from the `service_request`
     headers = copy.deepcopy(context.request.headers)
@@ -76,7 +77,7 @@ def call_moto_with_request(
 
 def _proxy_moto(
     context: RequestContext, request: ServiceRequest
-) -> Optional[Union[ServiceResponse, Response]]:
+) -> ServiceResponse | Response | None:
     """
     Wraps `call_moto` such that the interface is compliant with a ServiceRequestHandler.
 
@@ -154,7 +155,7 @@ def get_dispatcher(service: str, path: str) -> MotoDispatcher:
     return endpoint
 
 
-@lru_cache()
+@lru_cache
 def get_moto_routing_table(service: str) -> Map:
     """Cached version of load_moto_routing_table."""
     return load_moto_routing_table(service)