add dummy import to warm up content_type cache

Author: valentijnscholten

unittests/dojo_test_case.py

@@ -97,6 +97,7 @@ def system_settings(
         enable_jira_web_hook=False,
         disable_jira_webhook_secret=False,
         jira_webhook_secret=None,
+        enable_github=False,
         enable_product_tag_inehritance=False,
         enable_product_grade=True,
         enable_webhooks_notifications=True,
@@ -106,6 +107,7 @@ def system_settings(
         ss.enable_jira_web_hook = enable_jira_web_hook
         ss.disable_jira_webhook_secret = disable_jira_webhook_secret
         ss.jira_webhook_secret = jira_webhook_secret
+        ss.enable_github = enable_github
         ss.enable_product_tag_inheritance = enable_product_tag_inehritance
         ss.enable_product_grade = enable_product_grade
         ss.enable_webhooks_notifications = enable_webhooks_notifications

unittests/test_importers_performance.py

@@ -18,13 +18,17 @@
 STACK_HAWK_SUBSET_FILENAME = get_unit_tests_scans_path("stackhawk") / "stackhawk_many_vul_without_duplicated_findings_subset.json"
 STACK_HAWK_SCAN_TYPE = "StackHawk HawkScan"
 
+NPM_AUDIT_NO_VULN_FILENAME = get_unit_tests_scans_path("npm_audit") / "no_vuln.json"
+NPM_AUDIT_SCAN_TYPE = "NPM Audit Scan"
+
 
 class TestDojoImporterPerformance(DojoTestCase):
 
     def setUp(self):
         super().setUp()
         self.system_settings(enable_webhooks_notifications=False)
         self.system_settings(enable_product_grade=False)
+        self.system_settings(enable_github=False)
 
     @contextmanager
     def assertNumAsyncTask(self, num):
@@ -66,6 +70,30 @@ def import_reimport_performance(self, expected_num_queries1, expected_num_async_
         lead, _ = User.objects.get_or_create(username="admin")
         environment, _ = Development_Environment.objects.get_or_create(name="Development")
 
+        # first we do a bogus import to make sure any caches are loaded.
+        # without this the number of queries will be higher as the audit log will load content_type ids from the db
+
+        engagement_dummy, _created = Engagement.objects.get_or_create(
+            name="Test Create Dummy Engagement",
+            product=product,
+            target_start=timezone.now(),
+            target_end=timezone.now(),
+        )
+        import_options = {
+            "user": lead,
+            "lead": lead,
+            "scan_date": None,
+            "environment": environment,
+            "minimum_severity": "Info",
+            "active": True,
+            "verified": True,
+            "sync": True,
+            "scan_type": NPM_AUDIT_SCAN_TYPE,
+            "engagement": engagement_dummy,
+        }
+        importer = DefaultImporter(**import_options)
+        test, _, _len_new_findings, _len_closed_findings, _, _, _ = importer.process_scan(NPM_AUDIT_NO_VULN_FILENAME.open(encoding="utf-8"))
+
         # first import the subset which missed one finding and a couple of endpoints on some of the findings
         with (
             self.subTest("import1"), impersonate(Dojo_User.objects.get(username="admin")),
@@ -132,7 +160,7 @@ def import_reimport_performance(self, expected_num_queries1, expected_num_async_
 
     def test_import_reimport_reimport_performance(self):
         self.import_reimport_performance(
-            expected_num_queries1=603,
+            expected_num_queries1=605,
             expected_num_async_tasks1=15,
             expected_num_queries2=489,
             expected_num_async_tasks2=23,
@@ -169,7 +197,7 @@ def test_import_reimport_reimport_performance_no_async_with_product_grading(self
         """
         self.system_settings(enable_product_grade=True)
         self.import_reimport_performance(
-            expected_num_queries1=673,
+            expected_num_queries1=675,
             expected_num_async_tasks1=25,
             expected_num_queries2=544,
             expected_num_async_tasks2=30,