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 broken migration 0197 #9606

Merged
merged 3 commits into from
Feb 22, 2024
Merged

Fix broken migration 0197 #9606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dc7715
Fix broken migration 0179
kiblik Feb 21, 2024
7d95b85
Fix on other places
kiblik Feb 21, 2024
012412c
fix dicts
kiblik Feb 21, 2024
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 dojo/db_migrations/0187_nessus_to_tenable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def migrate_nessus_findings_to_tenable(apps, schema_editor):
finding_model = apps.get_model('dojo', 'Finding')
test_type_model = apps.get_model('dojo', 'Test_Type')
# Get or create Tenable Test Type and fetch the nessus and nessus WAS test types
tenable_test_type, _ = test_type_model.objects.get_or_create(name="Tenable Scan", active=True)
tenable_test_type, _ = test_type_model.objects.get_or_create(name="Tenable Scan", defaults={"active": True})
nessus_test_type = test_type_model.objects.filter(name="Nessus Scan").first()
nessus_was_test_type = test_type_model.objects.filter(name="Nessus WAS Scan").first()
# Get all the findings found by Nessus and Nessus WAS
Expand Down
4 changes: 2 additions & 2 deletions dojo/db_migrations/0197_parser_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def migrate_openvas_parsers(apps, schema_editor):
finding_model = apps.get_model('dojo', 'Finding')
test_type_model = apps.get_model('dojo', 'Test_Type')
# Get or create OpenVAS Test Type and fetch the OpenVAS XML and OpenVAS CSV test types
openvas_test_type, _ = test_type_model.objects.get_or_create(name="OpenVAS Parser", active=True)
openvas_test_type, _ = test_type_model.objects.get_or_create(name="OpenVAS Parser", defaults={"active": True})
openvascsv_test_type = test_type_model.objects.filter(name="OpenVAS CSV").first()
openvasxml_test_type = test_type_model.objects.filter(name="OpenVAS XML").first()
# Get all the findings found by Nessus and Nessus WAS
Expand All @@ -73,7 +73,7 @@ def migrate_clairklar_parsers(apps, schema_editor):
finding_model = apps.get_model('dojo', 'Finding')
test_type_model = apps.get_model('dojo', 'Test_Type')
# Get or create Clair Scan Test Type and fetch the Clair Klar Scan test types
clair_test_type, _ = test_type_model.objects.get_or_create(name="Clair Scan", active=True)
clair_test_type, _ = test_type_model.objects.get_or_create(name="Clair Scan", defaults={"active": True})
clairklar_test_type = test_type_model.objects.filter(name="Clair Klar Scan").first()
# Get all the findings found by Clair Klar Scan
findings = finding_model.objects.filter(test__scan_type__in=CLAIRKLAR_REFERENCES)
Expand Down
2 changes: 1 addition & 1 deletion dojo/db_migrations/0199_whitesource_to_mend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def migrate_whitesource_findings_to_mend(apps, schema_editor):
finding_model = apps.get_model('dojo', 'Finding')
test_type_model = apps.get_model('dojo', 'Test_Type')
# Get or create Mend Test Type and fetch the whitesource test types
mend_test_type, _ = test_type_model.objects.get_or_create(name="Mend Scan", active=True)
mend_test_type, _ = test_type_model.objects.get_or_create(name="Mend Scan", defaults={"active": True})
whitesource_test_type = test_type_model.objects.filter(name="Whitesource Scan").first()
# Get all the findings found by whitesource
findings = finding_model.objects.filter(test__scan_type__in=WHITESOURCE_REFERENCES)
Expand Down
Loading