localstack-core 4.13.2.dev105__py3-none-any.whl → 4.13.2.dev107__py3-none-any.whl

localstack/services/cloudwatch/alarm_scheduler.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING
 
 from localstack.aws.api.cloudwatch import MetricAlarm, MetricDataQuery, MetricStat, StateValue
 from localstack.aws.connect import connect_to
+from localstack.runtime.shutdown import SHUTDOWN_HANDLERS
 from localstack.utils.aws import arns, aws_stack
 from localstack.utils.scheduler import Scheduler
 
@@ -38,16 +39,26 @@ class AlarmScheduler:
         """
         super().__init__()
         self.scheduler = Scheduler()
-        self.thread = threading.Thread(target=self.scheduler.run, name="cloudwatch-scheduler")
-        self.thread.start()
         self.scheduled_alarms = {}
+        self.thread: threading.Thread | None = None
 
-    def shutdown_scheduler(self) -> None:
+    def start(self) -> None:
+        if not (self.thread and self.thread.is_alive()):
+            LOG.debug("Starting CloudWatch scheduler")
+            self.thread = threading.Thread(target=self.scheduler.run, name="cloudwatch-scheduler")
+            self.thread.start()
+            SHUTDOWN_HANDLERS.register(self.shutdown)
+
+    def shutdown(self) -> None:
         """
-        Shutsdown the scheduler, must be called before application stops
+        Shutdown the scheduler, must be called before application stops
         """
+        LOG.debug("Stopping CloudWatch scheduler")
         self.scheduler.close()
-        self.thread.join(10)
+        self.scheduled_alarms.clear()
+        SHUTDOWN_HANDLERS.unregister(self.shutdown)
+        if self.thread:
+            self.thread.join(10)
 
     def schedule_metric_alarm(self, alarm_arn: str) -> None:
         """(Re-)schedules the alarm, if the alarm is re-scheduled, the running alarm scheduler will be cancelled before

localstack/services/cloudwatch/provider.py

@@ -305,7 +305,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
 
     def __init__(self):
         self.tags = TaggingService()
-        self.alarm_scheduler = None
+        self.alarm_scheduler = AlarmScheduler()
 
     def accept_state_visitor(self, visitor: StateVisitor):
         visitor.visit(cloudwatch_backends)
@@ -314,19 +314,19 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         ROUTER.add(PATH_GET_RAW_METRICS, self.get_raw_metrics)
 
     def on_before_start(self):
-        self.start_alarm_scheduler()
+        self.alarm_scheduler.start()
 
     def on_before_state_reset(self):
-        self.shutdown_alarm_scheduler()
+        self.alarm_scheduler.shutdown()
 
     def on_after_state_reset(self):
-        self.start_alarm_scheduler()
+        self.alarm_scheduler.start()
 
     def on_before_state_load(self):
-        self.shutdown_alarm_scheduler()
+        self.alarm_scheduler.shutdown()
 
     def on_after_state_load(self):
-        self.start_alarm_scheduler()
+        self.alarm_scheduler.start()
 
         def restart_alarms(*args):
             poll_condition(lambda: SERVICE_PLUGINS.is_running("cloudwatch"))
@@ -335,18 +335,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         start_worker_thread(restart_alarms)
 
     def on_before_stop(self):
-        self.shutdown_alarm_scheduler()
-
-    def start_alarm_scheduler(self):
-        if not self.alarm_scheduler:
-            LOG.debug("starting cloudwatch scheduler")
-            self.alarm_scheduler = AlarmScheduler()
-
-    def shutdown_alarm_scheduler(self):
-        if self.alarm_scheduler:
-            LOG.debug("stopping cloudwatch scheduler")
-            self.alarm_scheduler.shutdown_scheduler()
-            self.alarm_scheduler = None
+        self.alarm_scheduler.shutdown()
 
     def delete_alarms(self, context: RequestContext, alarm_names: AlarmNames, **kwargs) -> None:
         moto.call_moto(context)

localstack/services/cloudwatch/provider_v2.py

@@ -148,9 +148,9 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
     """
 
     def __init__(self):
-        self.alarm_scheduler: AlarmScheduler = None
         self.store = None
         self.cloudwatch_database = CloudwatchDatabase()
+        self.alarm_scheduler = AlarmScheduler()
 
     @staticmethod
     def get_store(account_id: str, region: str) -> CloudWatchStore:
@@ -164,21 +164,21 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         ROUTER.add(PATH_GET_RAW_METRICS, self.get_raw_metrics)
 
     def on_before_start(self):
-        self.start_alarm_scheduler()
+        self.alarm_scheduler.start()
 
     def on_before_state_reset(self):
-        self.shutdown_alarm_scheduler()
+        self.alarm_scheduler.shutdown()
         self.cloudwatch_database.clear_tables()
 
     def on_after_state_reset(self):
         self.cloudwatch_database = CloudwatchDatabase()
-        self.start_alarm_scheduler()
+        self.alarm_scheduler.start()
 
     def on_before_state_load(self):
-        self.shutdown_alarm_scheduler()
+        self.alarm_scheduler.shutdown()
 
     def on_after_state_load(self):
-        self.start_alarm_scheduler()
+        self.alarm_scheduler.start()
 
         def restart_alarms(*args):
             poll_condition(lambda: SERVICE_PLUGINS.is_running("cloudwatch"))
@@ -187,18 +187,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         start_worker_thread(restart_alarms)
 
     def on_before_stop(self):
-        self.shutdown_alarm_scheduler()
-
-    def start_alarm_scheduler(self):
-        if not self.alarm_scheduler:
-            LOG.debug("starting cloudwatch scheduler")
-            self.alarm_scheduler = AlarmScheduler()
-
-    def shutdown_alarm_scheduler(self):
-        if self.alarm_scheduler:
-            LOG.debug("stopping cloudwatch scheduler")
-            self.alarm_scheduler.shutdown_scheduler()
-            self.alarm_scheduler = None
+        self.alarm_scheduler.shutdown()
 
     def delete_alarms(self, context: RequestContext, alarm_names: AlarmNames, **kwargs) -> None:
         """

localstack/services/kms/utils.py

@@ -102,13 +102,11 @@ def get_custom_key_material(request: CreateKeyRequest | None) -> bytes | None:
     if not request:
         return None
 
-    custom_key_material = None
     tags = request.get("Tags", [])
     for tag in tags:
         if tag["TagKey"] == TAG_KEY_CUSTOM_KEY_MATERIAL:
-            custom_key_material = base64.b64decode(tag["TagValue"])
-
-    return custom_key_material
+            return base64.b64decode(tag["TagValue"])
+    return None
 
 
 def get_custom_key_id(request: CreateKeyRequest | None) -> bytes | None:
@@ -121,13 +119,11 @@ def get_custom_key_id(request: CreateKeyRequest | None) -> bytes | None:
     if not request:
         return None
 
-    custom_key_id = None
     tags = request.get("Tags", [])
     for tag in tags:
         if tag["TagKey"] == TAG_KEY_CUSTOM_ID:
-            custom_key_id = tag["TagValue"]
-
-    return custom_key_id
+            return tag["TagValue"]
+    return None
 
 
 def execute_dry_run_capable[T](func: Callable[..., T], dry_run: bool, *args, **kwargs) -> T:

localstack/services/route53/provider.py

@@ -27,21 +27,16 @@ from localstack.aws.api.route53 import (
 from localstack.aws.connect import connect_to
 from localstack.services.moto import call_moto
 from localstack.services.plugins import ServiceLifecycleHook
-from localstack.services.route53.models import Route53Store, route53_stores
+from localstack.services.route53.models import route53_stores
 from localstack.state import StateVisitor
 
 
 class Route53Provider(Route53Api, ServiceLifecycleHook):
     def accept_state_visitor(self, visitor: StateVisitor):
-        from localstack.services.route53.models import route53_stores
 
         visitor.visit(route53_backends)
         visitor.visit(route53_stores)
 
-    @staticmethod
-    def get_route53_store(account_id: str, region: str) -> Route53Store:
-        return route53_stores[account_id][region]
-
     # No tag deletion logic to handle in Community. Overwritten in Pro implementation.
     def remove_resource_tags(
         self, context: RequestContext, resource_type: str, resource_id: str

localstack/utils/tagging.py

@@ -75,7 +75,7 @@ class Tags:
     _tags if the resource has been deleted.
 
     This distinction is important to maintain parity with the Resource Groups Tagging API (RGTA) which will tap into
-    supported service's `Tags` dataclass within it's store.
+    supported service's `Tags` dataclass within its store.
     """
 
     _tags: dict[ResourceARN, TagMap] = field(default_factory=dict)

localstack/version.py

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

{localstack_core-4.13.2.dev105.dist-info → localstack_core-4.13.2.dev107.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev105
+Version: 4.13.2.dev107
 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.dev105.dist-info → localstack_core-4.13.2.dev107.dist-info}/RECORD

@@ -4,7 +4,7 @@ localstack/deprecations.py,sha256=g0E-_q3apmHlOET2Gg5_biUtN2b4XygnI5aeeaZm6ZY,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=yXTYdVQOPUeNV3JHThjluWL20XEPTdwUNJCkPzyTKbY,723
+localstack/version.py,sha256=YHdJl32h52phmub-Zgz6ycMdlMvFMGO3M6Skcn62pjg,723
 localstack/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/aws/accounts.py,sha256=102zpGowOxo0S6UGMpfjw14QW7WCLVAGsnFK5xFMLoo,3043
 localstack/aws/app.py,sha256=n9bJCfJRuMz_gLGAH430c3bIQXgUXeWO5NPfcdL2MV8,5145
@@ -337,11 +337,11 @@ localstack/services/cloudformation/v2/provider.py,sha256=1cr_3flqALbY-H40lrVCcIq
 localstack/services/cloudformation/v2/types.py,sha256=jsfvn2z6weqruaDvv6qtSILtFiOTRl9fIjl0vXvl108,1060
 localstack/services/cloudformation/v2/utils.py,sha256=U1-YK7BEfA2lRKuUzDUVQ_dXUXybTHciNZA1G3xuZI8,202
 localstack/services/cloudwatch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-localstack/services/cloudwatch/alarm_scheduler.py,sha256=HPzQgZvDVXIXaEkjJ39L-jBwlOi_-ZlAyJ3D_suWngk,15761
+localstack/services/cloudwatch/alarm_scheduler.py,sha256=6C3LIdgoeiALBSglTILsqxx4jHwlaP81JeS_tVycjiM,16233
 localstack/services/cloudwatch/cloudwatch_database_helper.py,sha256=IK_MgxG3xTkpKbBe-Buv_6wUuHEc3MGQOqMAqHoEOzk,17270
 localstack/services/cloudwatch/models.py,sha256=gy6kNsAjBggpTgzSX-MfUKYnkpkZ2yanNNNcGYSLASw,4063
-localstack/services/cloudwatch/provider.py,sha256=Ss7Mc6XAQhXabUoz_loonp_UcA-VCi5IXCyvqXfn5kw,19701
-localstack/services/cloudwatch/provider_v2.py,sha256=vCpcWVTM6Wilm_Jt_x-3vYaD1eVNX9dDzleJ5D5J3pw,44930
+localstack/services/cloudwatch/provider.py,sha256=YTtjQLKOLaRVbkUOrkAPCk7Tf8gydncrdQhU3UOHjdI,19308
+localstack/services/cloudwatch/provider_v2.py,sha256=fkxU9Wx-fjYTrBp1nBihuKtctN_ImAB4btlGptuHykQ,44521
 localstack/services/cloudwatch/resource_providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/services/cloudwatch/resource_providers/aws_cloudwatch_alarm.py,sha256=T0P5uTDjQO3lNw5w4wcdBgzFthGDjJXUkPtHo1BP13I,5172
 localstack/services/cloudwatch/resource_providers/aws_cloudwatch_alarm.schema.json,sha256=8Nam5WqGfyW85m55UVCwJF17Re4tPOIJY_m6Wq37y8k,3829
@@ -530,7 +530,7 @@ localstack/services/kms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 localstack/services/kms/exceptions.py,sha256=BgmFaOgGcBheRPQyZFFjn7_W8i6ChJXvJoSh_yV-Ti0,535
 localstack/services/kms/models.py,sha256=lglxgXk45R9hYU_r22rtpGZKtDqpC7ExGyAayi2mowc,37239
 localstack/services/kms/provider.py,sha256=z707GU_EAp2Pu6tl9iJePBHc6e_Xznh2Dwmm7nX14nE,75766
-localstack/services/kms/utils.py,sha256=Jrd4lh2HfK0NCyYdyhqlBq3nNnxL5NSOYa_9FAwtl1g,5288
+localstack/services/kms/utils.py,sha256=VNmGwrMwQwF8nUc1D-5i4W0UEHLSCIGpZ0I-0Du5ueY,5182
 localstack/services/kms/resource_providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/services/kms/resource_providers/aws_kms_alias.py,sha256=LsvRlZMrzMlGq1_KcMlxz9RE16tUe7bcqQ3qQYE-vtg,2614
 localstack/services/kms/resource_providers/aws_kms_alias.schema.json,sha256=i3PJRVJ7jnE1PzxitVBFz40dyk8M7O8sRzBSPL-kHsM,1795
@@ -668,7 +668,7 @@ localstack/services/resourcegroupstaggingapi/__init__.py,sha256=47DEQpj8HBSa-_TI
 localstack/services/resourcegroupstaggingapi/provider.py,sha256=E-5Ao3Vxre6mtezoE6s7HBCRKKkSsZ8LMOHvng2hx8o,590
 localstack/services/route53/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/services/route53/models.py,sha256=4pFJA_y_mSvN415rmzThun4xmD51FD8t3SsjZR7a2dM,490
-localstack/services/route53/provider.py,sha256=Mp0yPccJDUvri5tVK6bkE_Fyj2M-n57Teso8vpfBJ7A,5803
+localstack/services/route53/provider.py,sha256=k6txmv9H0wZewIzIxsWJIDqT06Zra5FhlYzy9L0qcrI,5577
 localstack/services/route53/resource_providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/services/route53/resource_providers/aws_route53_healthcheck.py,sha256=BWq8e2R3uU_chO1wfDxErstgLvs3pSKtF6-KByO6Oao,3602
 localstack/services/route53/resource_providers/aws_route53_healthcheck.schema.json,sha256=N1iHZx1lCYI-O-f4_pHaEImDeIgTIzFgaBwfCm-G8JI,6368
@@ -1259,7 +1259,7 @@ localstack/utils/serving.py,sha256=wo1jTiqvuNUacuV0aYv2RfDyRd7lxoshrNQ59wjzx8s,5
 localstack/utils/ssl.py,sha256=RGAca4iIYc0tFYcfsev4ea1wOaWE4GuggghcfB8K5Lo,2510
 localstack/utils/strings.py,sha256=CrEoxX_VS51v0xFxhAArnp6_MUFTOR8vR02sWjVn-Ig,7757
 localstack/utils/sync.py,sha256=Q0IscaZX8wdoR4wI7e9VDVBDgIW3YdrY0Av-BJjgQ68,6598
-localstack/utils/tagging.py,sha256=LX83_qMU4QCuxiMR25knEe2WoTAv3awSd26mcV6UHsA,5375
+localstack/utils/tagging.py,sha256=S8uALmOsLwXGVcOynSpe-z4E7gmFZ-X7kzQr5Vgu1NQ,5374
 localstack/utils/testutil.py,sha256=_YG81sqwl3kFj2kaqbADQUUM61a7TiOGK_1qpxIQnAk,21555
 localstack/utils/threads.py,sha256=6rG43WQnitKkmuAGtIGAzGrRd_sVFQpw1UIRZSSU8JU,5265
 localstack/utils/time.py,sha256=G9GFVkyRNXyqG2SPPARLC-wAcCHXuJLWSqXrnhqNNy8,2260
@@ -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.dev105.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
-localstack_core-4.13.2.dev105.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
-localstack_core-4.13.2.dev105.dist-info/METADATA,sha256=OZqRam24anuzBnbna40ntLlG1u7AWAeJUU4SCwS3AP0,5868
-localstack_core-4.13.2.dev105.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-localstack_core-4.13.2.dev105.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
-localstack_core-4.13.2.dev105.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
-localstack_core-4.13.2.dev105.dist-info/RECORD,,
+localstack_core-4.13.2.dev107.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
+localstack_core-4.13.2.dev107.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
+localstack_core-4.13.2.dev107.dist-info/METADATA,sha256=E2gkToL3bvSW56wNceg0ygNO9g1fdL6w5S2DU-lmMqk,5868
+localstack_core-4.13.2.dev107.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+localstack_core-4.13.2.dev107.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
+localstack_core-4.13.2.dev107.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
+localstack_core-4.13.2.dev107.dist-info/RECORD,,