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.

Sign up for GitHub

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): Migrate only Edge API-enabled projects #4556

Merged
merged 1 commit into from
Aug 29, 2024
Merged

fix(edge-v2): Migrate only Edge API-enabled projects #4556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion api/edge_api/management/commands/migrate_to_edge_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ def handle(self, *args: Any, **options: Any) -> str | None:
edge_v2_migration_status__in=(
EdgeV2MigrationStatus.NOT_STARTED,
EdgeV2MigrationStatus.INCOMPLETE,
)
),
enable_dynamo_db=True,
).values_list("id", flat=True):
try:
migrate_project_environments_to_v2(project_id)
Expand Down
37 changes: 37 additions & 0 deletions api/tests/unit/edge_api/test_unit_edge_api_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ def test_migrate_to_edge_v2__new_projects__dont_migrate(
name="edge_v2_not_started",
organisation=project.organisation,
edge_v2_migration_status=EdgeV2MigrationStatus.NOT_STARTED,
enable_dynamo_db=True,
),
Project(
name="edge_v2_incomplete",
organisation=project.organisation,
edge_v2_migration_status=EdgeV2MigrationStatus.INCOMPLETE,
enable_dynamo_db=True,
),
],
)
Expand All @@ -39,3 +41,38 @@ def test_migrate_to_edge_v2__new_projects__dont_migrate(
)
# the migrated `project` was not redundantly migrated
migrate_project_environments_to_v2_mock.call_count == len(unmigrated_projects)


def test_migrate_to_edge_v2__core_projects__dont_migrate(
mocker: MockerFixture, project: Project
) -> None:
# Given
# unmigrated Core projects are present
Project.objects.bulk_create(
[
Project(
name="core__edge_v2_not_started",
organisation=project.organisation,
edge_v2_migration_status=EdgeV2MigrationStatus.NOT_STARTED,
enable_dynamo_db=False,
),
Project(
name="core__edge_v2_incomplete",
organisation=project.organisation,
edge_v2_migration_status=EdgeV2MigrationStatus.INCOMPLETE,
enable_dynamo_db=False,
),
],
)

migrate_project_environments_to_v2_mock = mocker.patch(
"edge_api.management.commands.migrate_to_edge_v2.migrate_project_environments_to_v2",
autospec=True,
)

# When
call_command("migrate_to_edge_v2")

# Then
# unmigrated Core projects were not migrated
migrate_project_environments_to_v2_mock.assert_not_called()
Loading