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(migrations): fix django migration order dependency #6303

Merged
merged 3 commits into from
Dec 23, 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
2 changes: 1 addition & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12-alpine AS build
FROM python:3.12.8-alpine3.20 AS build

LABEL maintainer="https://github.com/prowler-cloud/api"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class Migration(migrations.Migration):
dependencies = [
("api", "0004_rbac_missing_admin_roles"),
("api", "0002_token_migrations"),
]

operations = [
Expand Down
18 changes: 4 additions & 14 deletions api/src/backend/api/tests/integration/test_authentication.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from unittest.mock import patch

import pytest
from conftest import TEST_PASSWORD, get_api_tokens, get_authorization_header
from django.urls import reverse
from unittest.mock import patch
from rest_framework.test import APIClient


Expand Down Expand Up @@ -99,12 +100,11 @@ def test_refresh_token(create_test_user, tenants_fixture):
assert new_refresh_response.status_code == 200


@patch("api.db_router.MainRouter.admin_db", new="default")
@pytest.mark.django_db
def test_user_me_when_inviting_users(create_test_user, tenants_fixture, roles_fixture):
def test_user_me_when_inviting_users(create_test_user, tenants_fixture):
client = APIClient()

role = roles_fixture[0]

user1_email = "user1@testing.com"
user2_email = "user2@testing.com"

Expand Down Expand Up @@ -135,16 +135,6 @@ def test_user_me_when_inviting_users(create_test_user, tenants_fixture, roles_fi
"data": {
"type": "invitations",
"attributes": {"email": user2_email},
"relationships": {
"roles": {
"data": [
{
"type": "roles",
"id": str(role.id),
}
]
}
},
}
},
format="vnd.api+json",
Expand Down
1 change: 1 addition & 0 deletions api/src/backend/api/tests/integration/test_providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from api.models import Provider


@patch("api.db_router.MainRouter.admin_db", new="default")
@patch("api.v1.views.Task.objects.get")
@patch("api.v1.views.delete_provider_task.delay")
@pytest.mark.django_db
Expand Down
Loading