Add archive restructuring

dfangl · dfangl · commit 75f7a0183ede · 2024-11-22T12:00:35.000+01:00
diff --git a/localstack-core/localstack/services/events/archive.py b/localstack-core/localstack/services/events/archive.py
@@ -1,6 +1,7 @@
 import json
 import logging
 from datetime import datetime, timezone
+from typing import Self
 
 from botocore.client import BaseClient
 
@@ -42,33 +43,42 @@ class ArchiveService:
     rule_name: RuleName
     target_id: TargetId
 
-    def __init__(
-        self,
+    def __init__(self, archive: Archive):
+        self.archive = archive
+        self.set_state(ArchiveState.CREATING)
+        self.set_creation_time()
+        self.client: BaseClient = self._initialize_client()
+        self.event_bus_name: EventBusName = extract_event_bus_name(archive.event_source_arn)
+        self.set_state(ArchiveState.ENABLED)
+        self.rule_name = f"Events-Archive-{self.archive_name}"
+        self.target_id = f"Events-Archive-{self.archive_name}"
+
+    @classmethod
+    def create_archive_service(
+        cls,
         archive_name: ArchiveName,
         region: str,
         account_id: str,
         event_source_arn: Arn,
         description: ArchiveDescription,
         event_pattern: EventPattern,
         retention_days: RetentionDays,
-    ):
-        self.archive = Archive(
-            archive_name,
-            region,
-            account_id,
-            event_source_arn,
-            description,
-            event_pattern,
-            retention_days,
+    ) -> Self:
+        return cls(
+            Archive(
+                archive_name,
+                region,
+                account_id,
+                event_source_arn,
+                description,
+                event_pattern,
+                retention_days,
+            )
         )
-        self.set_state(ArchiveState.CREATING)
-        self.set_creation_time()
-        self.client: BaseClient = self._initialize_client()
-        self.event_bus_name: EventBusName = extract_event_bus_name(event_source_arn)
 
-        self.rule_name: RuleName = self._create_archive_rule()
-        self.target_id: TargetId = self._create_archive_target()
-        self.set_state(ArchiveState.ENABLED)
+    def register_archive_rule_and_targets(self):
+        self._create_archive_rule()
+        self._create_archive_target()
 
     def __getattr__(self, name):
         return getattr(self.archive, name)
@@ -133,8 +143,7 @@ def _initialize_client(self) -> BaseClient:
 
     def _create_archive_rule(
         self,
-    ) -> RuleName:
-        rule_name = f"Events-Archive-{self.name}"
+    ):
         default_event_pattern = {
             "replay-name": [{"exists": False}],
         }
@@ -144,25 +153,22 @@ def _create_archive_rule(
         else:
             updated_event_pattern = default_event_pattern
         self.client.put_rule(
-            Name=rule_name,
+            Name=self.rule_name,
             EventBusName=self.event_bus_name,
             EventPattern=json.dumps(updated_event_pattern),
         )
-        return rule_name
 
     def _create_archive_target(
         self,
-    ) -> TargetId:
+    ):
         """Creates a target for the archive rule. The target is required for accessing parameters
         from the provider during sending of events to the target but it is not invoked
         because events are put to the archive directly to not overload the gateway"""
-        target_id = f"Events-Archive-{self.name}"
         self.client.put_targets(
             Rule=self.rule_name,
             EventBusName=self.event_bus_name,
-            Targets=[{"Id": target_id, "Arn": self.arn}],
+            Targets=[{"Id": self.target_id, "Arn": self.arn}],
         )
-        return target_id
 
     def _normalize_datetime(self, dt: datetime) -> datetime:
         return dt.replace(second=0, microsecond=0)
diff --git a/localstack-core/localstack/services/events/provider.py b/localstack-core/localstack/services/events/provider.py
@@ -1559,6 +1559,7 @@ def start_replay(
             re_formatted_event_to_replay = replay_service.re_format_events_from_archive(
                 events_to_replay, replay_name
             )
+            # TODO should this really be run synchronously within the request?
             self._process_entries(context, re_formatted_event_to_replay)
         replay_service.finish()
 
@@ -1733,7 +1734,7 @@ def create_archive_service(
         event_pattern: EventPattern,
         retention_days: RetentionDays,
     ) -> ArchiveService:
-        archive_service = ArchiveService(
+        archive_service = ArchiveService.create_archive_service(
             archive_name,
             region,
             account_id,
@@ -1742,6 +1743,7 @@ def create_archive_service(
             event_pattern,
             retention_days,
         )
+        archive_service.register_archive_rule_and_targets()
         self._archive_service_store[archive_service.arn] = archive_service
         return archive_service
 
