refactor: remove v2 suffix

localstack · May 8, 2024 · 0ed692e · 0ed692e
1 parent f83c319
commit 0ed692e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git 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 → localstack/services/events/models.py b/localstack/services/events/models_v2.py → localstack/services/events/models.py
diff --git a/localstack/services/events/provider_v2.py → localstack/services/events/provider.py b/localstack/services/events/provider_v2.py → 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
@@ -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
@@ -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)