From 0ed692e41b628aa884d47dabe0e0be4edd9dc1e5 Mon Sep 17 00:00:00 2001
From: Maximilian Hoheiser <max.hoheiser@gmail.com>
Date: Fri, 26 Apr 2024 14:37:16 +0200
Subject: [PATCH] refactor: remove v2 suffix

---
 localstack/services/events/event_bus.py                    | 2 +-
 localstack/services/events/{models_v2.py => models.py}     | 0
 localstack/services/events/{provider_v2.py => provider.py} | 4 ++--
 localstack/services/events/rule.py                         | 6 +-----
 localstack/services/providers.py                           | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)
 rename localstack/services/events/{models_v2.py => models.py} (100%)
 rename localstack/services/events/{provider_v2.py => provider.py} (99%)

diff --git a/localstack/services/events/event_bus.py b/localstack/services/events/event_bus.py
index c014461be20c5f..348246c6164490 100644
--- a/localstack/services/events/event_bus.py
+++ b/localstack/services/events/event_bus.py
@@ -1,7 +1,7 @@
 from typing import Optional
 
 from localstack.aws.api.events import Arn, EventBusName, TagList
-from localstack.services.events.models_v2 import EventBus, RuleDict
+from localstack.services.events.models import EventBus, RuleDict
 
 
 class EventBusService:
diff --git a/localstack/services/events/models_v2.py b/localstack/services/events/models.py
similarity index 100%
rename from localstack/services/events/models_v2.py
rename to localstack/services/events/models.py
diff --git a/localstack/services/events/provider_v2.py b/localstack/services/events/provider.py
similarity index 99%
rename from localstack/services/events/provider_v2.py
rename to localstack/services/events/provider.py
index 2c8544b09ee0e4..3af580f16b5e31 100644
--- a/localstack/services/events/provider_v2.py
+++ b/localstack/services/events/provider.py
@@ -55,7 +55,7 @@
 from localstack.aws.api.events import Rule as ApiTypeRule
 from localstack.services.events.event_bus import EventBusService, EventBusServiceDict
 from localstack.services.events.event_ruler import matches_rule
-from localstack.services.events.models_v2 import (
+from localstack.services.events.models import (
     EventBus,
     EventBusDict,
     EventsStore,
@@ -67,7 +67,7 @@
 )
 from localstack.services.events.rule import RuleService, RuleServiceDict
 from localstack.services.events.target import TargetSender, TargetSenderDict, TargetSenderFactory
-from localstack.services.events.utils import (
+from localstack.services.events.v1.utils import (
     InvalidEventPatternException as InternalInvalidEventPatternException,
 )
 from localstack.services.plugins import ServiceLifecycleHook
diff --git a/localstack/services/events/rule.py b/localstack/services/events/rule.py
index 61011ccec62861..4298f9c4622e8e 100644
--- a/localstack/services/events/rule.py
+++ b/localstack/services/events/rule.py
@@ -19,11 +19,7 @@
     TargetIdList,
     TargetList,
 )
-from localstack.services.events.models_v2 import (
-    Rule,
-    TargetDict,
-    ValidationException,
-)
+from localstack.services.events.models import Rule, TargetDict, ValidationException
 
 TARGET_ID_REGEX = re.compile(r"^[\.\-_A-Za-z0-9]+$")
 TARGET_ARN_REGEX = re.compile(r"arn:[\d\w:\-/]*")
diff --git a/localstack/services/providers.py b/localstack/services/providers.py
index 86095fcb0b0955..26104206278222 100644
--- a/localstack/services/providers.py
+++ b/localstack/services/providers.py
@@ -356,7 +356,7 @@ def events_v1():
 
 @aws_provider(api="events", name="v2")
 def events_v2():
-    from localstack.services.events.provider_v2 import EventsProvider
+    from localstack.services.events.provider import EventsProvider
 
     provider = EventsProvider()
     return Service.for_provider(provider)