Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Edge V2-enabled environments are not rebuilt on feature version publish #4132

Merged
merged 1 commit into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions api/environments/tasks.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
from audit.models import AuditLog
from environments.dynamodb import (
DynamoEnvironmentWrapper,
DynamoIdentityWrapper,
)
from environments.dynamodb import DynamoIdentityWrapper
from environments.models import (
Environment,
environment_v2_wrapper,
Expand All @@ -17,11 +14,8 @@


@register_task_handler(priority=TaskPriority.HIGH)
def rebuild_environment_document(environment_id: int):
wrapper = DynamoEnvironmentWrapper()
if wrapper.is_enabled:
environment = Environment.objects.get(id=environment_id)
wrapper.write_environment(environment)
def rebuild_environment_document(environment_id: int) -> None:
Environment.write_environments_to_dynamodb(environment_id=environment_id)


@register_task_handler(priority=TaskPriority.HIGHEST)
Expand Down
15 changes: 10 additions & 5 deletions api/tests/unit/environments/test_unit_environments_tasks.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
from pytest_mock import MockerFixture

from audit.models import AuditLog
from environments.models import Environment
from environments.tasks import (
delete_environment_from_dynamo,
process_environment_update,
rebuild_environment_document,
)


def test_rebuild_environment_document(environment, mocker):
def test_rebuild_environment_document(
environment: Environment,
mocker: MockerFixture,
) -> None:
# Given
mock_dynamo_wrapper = mocker.MagicMock(is_enabled=True)
mocker.patch(
"environments.tasks.DynamoEnvironmentWrapper", return_value=mock_dynamo_wrapper
mock_write_environments_to_dynamodb = mocker.patch(
"environments.tasks.Environment.write_environments_to_dynamodb",
)

# When
rebuild_environment_document(environment_id=environment.id)

# Then
mock_dynamo_wrapper.write_environment.assert_called_once_with(environment)
mock_write_environments_to_dynamodb.assert_called_once_with(
environment_id=environment.id
)


def test_process_environment_update_with_environment_audit_log(environment, mocker):
Expand Down
Loading