localstack-core 4.13.2.dev78__py3-none-any.whl → 4.13.2.dev79__py3-none-any.whl

localstack/services/lambda_/invocation/models.py

@@ -26,7 +26,7 @@ class LambdaStore(BaseStore):
     capacity_providers: dict[str, CapacityProvider] = LocalAttribute(default=dict)
 
     # maps resource ARNs for EventSourceMappings and CodeSigningConfiguration to tags
-    TAGS = LocalAttribute(default=TaggingService)
+    TAGS: TaggingService = LocalAttribute(default=TaggingService)
 
 
 lambda_stores = AccountRegionBundle("lambda", LambdaStore)

localstack/services/lambda_/provider.py

@@ -1624,9 +1624,12 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
                 "$LATEST version cannot be deleted without deleting the function.", Type="User"
             )
 
+        unqualified_function_arn = api_utils.unqualified_lambda_arn(
+            function_name=function_name, region=region, account=account_id
+        )
         if function_name not in store.functions:
             e = ResourceNotFoundException(
-                f"Function not found: {api_utils.unqualified_lambda_arn(function_name=function_name, region=region, account=account_id)}",
+                f"Function not found: {unqualified_function_arn}",
                 Type="User",
             )
             raise e
@@ -1643,6 +1646,7 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
                 destroy_code_if_not_used(code=version.config.code, function=function)
         else:
             # delete the whole function
+            self._remove_all_tags(unqualified_function_arn)
             # TODO: introduce locking for safe deletion: We could create a new version at the API layer before
             #  the old version gets cleaned up in the internal lambda service.
             function = store.functions.pop(function_name)
@@ -2468,6 +2472,10 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
             raise ResourceNotFoundException(
                 "The resource you requested does not exist.", Type="User"
             )
+        # the full deletion of the ESM is happening asynchronously, but we delete the Tags instantly
+        # this behavior is similar to ``get_event_source_mapping`` which will raise right after deletion, but it is not
+        # always the case in AWS. Add more testing and align behavior with ``get_event_source_mapping``.
+        self._remove_all_tags(event_source_mapping["EventSourceMappingArn"])
         esm_worker.delete()
         return {**esm, "State": EsmState.DELETING}
 
@@ -4380,27 +4388,67 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
     # =======================================
     # ===============  TAGS   ===============
     # =======================================
-    # only Function, Event Source Mapping, and Code Signing Config (not currently supported by LocalStack) ARNs an are available for tagging in AWS
+    # only Function, Event Source Mapping, and Code Signing Config (not currently supported by LocalStack) ARNs
+    # are available for tagging in AWS
 
-    def _get_tags(self, resource: TaggableResource) -> dict[str, str]:
-        state = self.fetch_lambda_store_for_tagging(resource)
-        lambda_adapted_tags = {
-            tag["Key"]: tag["Value"]
-            for tag in state.TAGS.list_tags_for_resource(resource).get("Tags")
-        }
-        return lambda_adapted_tags
+    def _update_resource_tags(
+        self, resource_arn: str, account_id: str, region: str, tags: dict[str, str]
+    ) -> None:
+        tagger_service = lambda_stores[account_id][region].TAGS
+        tag_svc_adapted_tags = [{"Key": key, "Value": value} for key, value in tags.items()]
+        tagger_service.tag_resource(resource_arn, tag_svc_adapted_tags)
+
+    def _list_resource_tags(
+        self, resource_arn: str, account_id: str, region: str
+    ) -> dict[str, str]:
+        tagger_service = lambda_stores[account_id][region].TAGS
+        return tagger_service.tags.get(resource_arn, {})
+
+    def _remove_resource_tags(
+        self, resource_arn: str, account_id: str, region: str, keys: TagKeyList
+    ) -> None:
+        tagger_service = lambda_stores[account_id][region].TAGS
+        tagger_service.untag_resource(resource_arn, keys)
 
-    def _store_tags(self, resource: TaggableResource, tags: dict[str, str]):
-        state = self.fetch_lambda_store_for_tagging(resource)
-        if len(state.TAGS.tags.get(resource, {}) | tags) > LAMBDA_TAG_LIMIT_PER_RESOURCE:
+    def _remove_all_resource_tags(self, resource_arn: str, account_id: str, region: str) -> None:
+        tagger_service = lambda_stores[account_id][region].TAGS
+        return tagger_service.tags.pop(resource_arn, None)
+
+    def _get_tags(self, resource: TaggableResource) -> dict[str, str]:
+        account_id, region = self._get_account_id_and_region_for_taggable_resource(resource)
+        tags = self._list_resource_tags(resource_arn=resource, account_id=account_id, region=region)
+        return tags
+
+    def _store_tags(self, resource: TaggableResource, tags: dict[str, str]) -> None:
+        account_id, region = self._get_account_id_and_region_for_taggable_resource(resource)
+        existing_tags = self._list_resource_tags(
+            resource_arn=resource, account_id=account_id, region=region
+        )
+        if len({**existing_tags, **tags}) > LAMBDA_TAG_LIMIT_PER_RESOURCE:
+            # note: we cannot use | on `ImmutableDict` and regular `dict`
             raise InvalidParameterValueException(
                 "Number of tags exceeds resource tag limit.", Type="User"
             )
+        self._update_resource_tags(
+            resource_arn=resource,
+            account_id=account_id,
+            region=region,
+            tags=tags,
+        )
 
-        tag_svc_adapted_tags = [{"Key": key, "Value": value} for key, value in tags.items()]
-        state.TAGS.tag_resource(resource, tag_svc_adapted_tags)
+    def _remove_tags(self, resource: TaggableResource, keys: TagKeyList) -> None:
+        account_id, region = self._get_account_id_and_region_for_taggable_resource(resource)
+        self._remove_resource_tags(
+            resource_arn=resource, account_id=account_id, region=region, keys=keys
+        )
+
+    def _remove_all_tags(self, resource: TaggableResource) -> None:
+        account_id, region = self._get_account_id_and_region_for_taggable_resource(resource)
+        self._remove_all_resource_tags(resource_arn=resource, account_id=account_id, region=region)
 
-    def fetch_lambda_store_for_tagging(self, resource: TaggableResource) -> LambdaStore:
+    def _get_account_id_and_region_for_taggable_resource(
+        self, resource: TaggableResource
+    ) -> tuple[str, str]:
         """
         Takes a resource ARN for a TaggableResource (Lambda Function, Event Source Mapping, Code Signing Config, or Capacity Provider) and returns a corresponding
         LambdaStore for its region and account.
@@ -4461,7 +4509,7 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
             _raise_validation_exception()
 
         # If no exceptions are raised, assume ARN and referenced resource is valid for tag operations
-        return lambda_stores[account_id][region]
+        return account_id, region
 
     def tag_resource(
         self, context: RequestContext, resource: TaggableResource, tags: Tags, **kwargs
@@ -4498,8 +4546,7 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
                 "1 validation error detected: Value null at 'tagKeys' failed to satisfy constraint: Member must not be null"
             )  # should probably be generalized a bit
 
-        state = self.fetch_lambda_store_for_tagging(resource)
-        state.TAGS.untag_resource(resource, tag_keys)
+        self._remove_tags(resource, tag_keys)
 
         if (resource_id := extract_resource_from_arn(resource)) and resource_id.startswith(
             "function"

localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.13.2.dev78'
-__version_tuple__ = version_tuple = (4, 13, 2, 'dev78')
+__version__ = version = '4.13.2.dev79'
+__version_tuple__ = version_tuple = (4, 13, 2, 'dev79')
 
 __commit_id__ = commit_id = None

{localstack_core-4.13.2.dev78.dist-info → localstack_core-4.13.2.dev79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev78
+Version: 4.13.2.dev79
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack_core-4.13.2.dev78.dist-info → localstack_core-4.13.2.dev79.dist-info}/RECORD

@@ -4,7 +4,7 @@ localstack/deprecations.py,sha256=-3IYgCd6LEC3PjO7hbr3Dg-p0PIS6phjmv1qZnj1uo0,15
 localstack/openapi.yaml,sha256=jFUzv-NKkJttxb8HRrmKiNYOmJD-zVfPxG3DDMrRwfg,30865
 localstack/plugins.py,sha256=BIJC9dlo0WbP7lLKkCiGtd_2q5oeqiHZohvoRTcejXM,2457
 localstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-localstack/version.py,sha256=4F3b4oTPGdcwXYqCECPfPyPgNIPqH79AoCRWohk-iMU,721
+localstack/version.py,sha256=a6KrbLgLbP6GRt_axBHHz-6HpRow3Ze3L01TImlrJYE,721
 localstack/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/aws/accounts.py,sha256=102zpGowOxo0S6UGMpfjw14QW7WCLVAGsnFK5xFMLoo,3043
 localstack/aws/app.py,sha256=n9bJCfJRuMz_gLGAH430c3bIQXgUXeWO5NPfcdL2MV8,5145
@@ -548,7 +548,7 @@ localstack/services/lambda_/ldm.py,sha256=a5EJ5BFQbImAOgCcLBY20R-wQPL0UuLqG5mNhn
 localstack/services/lambda_/networking.py,sha256=H9fq1aYThqXZkOi0fCoJrHI9rm19qgUVxFe3vYloN08,938
 localstack/services/lambda_/packages.py,sha256=z81Gm3FdyH6ml_iRmJLRKCxj9jFWR11BAI6rvoIXMrY,3976
 localstack/services/lambda_/plugins.py,sha256=eZsdzZqgEG9EZpd3W8TUdoydTpPXl6JBzJgDx_qeFUU,1275
-localstack/services/lambda_/provider.py,sha256=AfnsOUK41KYxS1D6wyC2NsqT75WD1BMVhug9ALdIljc,203684
+localstack/services/lambda_/provider.py,sha256=reDMdVrV-nbMgpCihmdtXxdeRKmYjyRMsCD0xRQ3MPA,206016
 localstack/services/lambda_/provider_utils.py,sha256=T0f16GVXgB1LvUrR6Sy-hq3r3n1b-pPvGNfpim3nOVw,3176
 localstack/services/lambda_/runtimes.py,sha256=05pz5fPQyn3JyQOtMMhd-Z5SCO65TzqJI7UhDySInsA,9253
 localstack/services/lambda_/urlrouter.py,sha256=LNIXNbAKbGdkbfZsKCVrbdtkc0uZzqdYjLpF1jAoCIA,8960
@@ -585,7 +585,7 @@ localstack/services/lambda_/invocation/lambda_models.py,sha256=Bbks7_AGK3Y4keCG3
 localstack/services/lambda_/invocation/lambda_service.py,sha256=sRG-JV84SPIf4QLia3sETZO9eAdrIAWb1w-WpbYmKw8,34073
 localstack/services/lambda_/invocation/logs.py,sha256=TD2oSyKAizn5_KHbnav1Rh_hITKxLV8RSrHR7lYgOUM,3798
 localstack/services/lambda_/invocation/metrics.py,sha256=IOzQguI3v8xl47FP6jMZYL3g9k-NIZEkvldAImdXljQ,1134
-localstack/services/lambda_/invocation/models.py,sha256=dxQKlaAAXvbX3-gTAotTRiTSmSI0aHoA5tbWB1q9j1U,1273
+localstack/services/lambda_/invocation/models.py,sha256=Z-WcatCB5Scxsp30-h-9Rj4fAY3kPM0iGqmT_ZFMxpQ,1289
 localstack/services/lambda_/invocation/plugins.py,sha256=axAnRqpDyPvqh95s21FX7CcYZ5Or6QPJ3LykXu4tpyc,402
 localstack/services/lambda_/invocation/runtime_executor.py,sha256=C6zQeEq7Z8W3RYW07nZb2KMnTW65SlIy-kkSC-pIOG8,4191
 localstack/services/lambda_/invocation/version_manager.py,sha256=kyNMcedZ0IniBjDyhnOuBatWRl6mK5V_HT39WRDvVlM,14935
@@ -1311,10 +1311,10 @@ localstack/utils/server/tcp_proxy.py,sha256=y2NJAmvftTiAYsLU_8qe4W5LGqwUw21i90Pu
 localstack/utils/xray/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/utils/xray/trace_header.py,sha256=ahXk9eonq7LpeENwlqUEPj3jDOCiVRixhntQuxNor-Q,6209
 localstack/utils/xray/traceid.py,sha256=GKO-R2sMMjlrH2UaLPXlQlZ6flbE7ZKb6IZMtMu_M5U,1110
-localstack_core-4.13.2.dev78.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
-localstack_core-4.13.2.dev78.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
-localstack_core-4.13.2.dev78.dist-info/METADATA,sha256=GLVAxUqY2yBoaXW8gmQX5mdqxKk3c1ehIghy56D68JU,5867
-localstack_core-4.13.2.dev78.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-localstack_core-4.13.2.dev78.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
-localstack_core-4.13.2.dev78.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
-localstack_core-4.13.2.dev78.dist-info/RECORD,,
+localstack_core-4.13.2.dev79.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
+localstack_core-4.13.2.dev79.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
+localstack_core-4.13.2.dev79.dist-info/METADATA,sha256=rvkvbqx71QziMwPZ0N6cvaldmcSCtpyYsfvfDEkNXXM,5867
+localstack_core-4.13.2.dev79.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+localstack_core-4.13.2.dev79.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
+localstack_core-4.13.2.dev79.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
+localstack_core-4.13.2.dev79.dist-info/RECORD,,