Skip to content

Commit

Permalink
refactor: move existing provider to v1 folder
Browse files Browse the repository at this point in the history
  • Loading branch information
maxhoheiser committed May 7, 2024
1 parent e11112c commit e616e95
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 10 deletions.
5 changes: 3 additions & 2 deletions localstack/services/events/event_ruler.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
from functools import cache
from pathlib import Path

from localstack.services.events.packages import event_ruler_package
from localstack.services.events.utils import InvalidEventPatternException
from localstack import config
from localstack.services.events.v1.packages import event_ruler_package
from localstack.services.events.v1.utils import InvalidEventPatternException
from localstack.utils.objects import singleton_factory

THIS_FOLDER = os.path.dirname(os.path.realpath(__file__))
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
from localstack.http import route
from localstack.services.edge import ROUTER
from localstack.services.events.event_ruler import matches_rule
from localstack.services.events.models import EventsStore, events_stores
from localstack.services.events.scheduler import JobScheduler
from localstack.services.events.utils import (
from localstack.services.events.v1.models import EventsStore, events_stores
from localstack.services.events.v1.utils import (
InvalidEventPatternException as InternalInvalidEventPatternException,
)
from localstack.services.events.utils import matches_event
from localstack.services.events.v1.utils import matches_event
from localstack.services.moto import call_moto
from localstack.services.plugins import ServiceLifecycleHook
from localstack.utils.aws.arns import event_bus_arn, parse_arn
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions localstack/services/providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ def ssm():

@aws_provider(api="events", name="default")
def events():
from localstack.services.events.provider import EventsProvider
from localstack.services.events.v1.provider import EventsProvider
from localstack.services.moto import MotoFallbackDispatcher

provider = EventsProvider()
Expand All @@ -347,7 +347,7 @@ def events():

@aws_provider(api="events", name="v1")
def events_v1():
from localstack.services.events.provider import EventsProvider
from localstack.services.events.v1.provider import EventsProvider
from localstack.services.moto import MotoFallbackDispatcher

provider = EventsProvider()
Expand Down
2 changes: 1 addition & 1 deletion tests/aws/services/events/test_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from werkzeug import Request, Response

from localstack import config
from localstack.services.events.provider import _get_events_tmp_dir
from localstack.services.events.v1.provider import _get_events_tmp_dir
from localstack.testing.aws.eventbus_utils import allow_event_rule_to_sqs_queue
from localstack.testing.aws.util import is_aws_cloud
from localstack.testing.pytest import markers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import pytest

from localstack.services.events.provider import TEST_EVENTS_CACHE
from localstack.services.events.v1.provider import TEST_EVENTS_CACHE
from localstack.services.stepfunctions.stepfunctions_utils import await_sfn_execution_result
from localstack.testing.pytest import markers
from localstack.utils import testutil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
SECONDARY_TEST_AWS_ACCESS_KEY_ID,
SECONDARY_TEST_AWS_SECRET_ACCESS_KEY,
)
from localstack.services.events.provider import TEST_EVENTS_CACHE
from localstack.services.events.v1.provider import TEST_EVENTS_CACHE
from localstack.testing.aws.util import is_aws_cloud
from localstack.testing.pytest import markers
from localstack.utils import testutil
Expand Down

0 comments on commit e616e95

Please sign in to comment.