Refactor federate task

Signed-off-by: Keshav Priyadarshi <git@keshav.space>

Author: keshav-space

fedcode/management/commands/tasks.py fedcode/management/commands/federate.pyfedcode/management/commands/tasks.py renamed to fedcode/management/commands/federate.py

@@ -6,38 +6,16 @@
 # See https://github.com/nexB/federatedcode for support or download.
 # See https://aboutcode.org for more information about AboutCode.org OSS projects.
 #
+
 from traceback import format_exc as traceback_format_exc
 
 from django.core.management.base import BaseCommand
-from django.core.management.base import CommandError
 
-from fedcode.importer import Importer
 from fedcode.models import FederateRequest
-from fedcode.models import SyncRequest
 from fedcode.signatures import FEDERATEDCODE_PRIVATE_KEY
 from fedcode.signatures import HttpSignature
 
 
-def sync_task():
-    """
-    sync_task is a task to run the Importer and save the status
-    """
-    for sync_r in SyncRequest.objects.all().order_by("created_at"):
-        if not sync_r.done:
-            try:
-                repo = sync_r.repo
-                repo.git_repo_obj.remotes.origin.pull()
-                importer = Importer(repo, repo.admin)
-                importer.run()
-                sync_r.done = True
-            except Exception as e:
-                sync_r.error_message = (
-                    f"Failed to sync {sync_r.repo!r} {e!r} \n {traceback_format_exc()}"
-                )
-            finally:
-                sync_r.save()
-
-
 def send_fed_req_task():
     """
     send_fed_req_task is a task to send the http signed request to the target and save the status of the request
@@ -57,11 +35,5 @@ def send_fed_req_task():
 
 
 class Command(BaseCommand):
-    def add_arguments(self, parser):
-        parser.add_argument("task", choices=["sync", "federate"])
-
     def handle(self, *args, **options):
-        if options["task"] == "sync":
-            sync_task()
-        elif options["task"] == "federate":
-            send_fed_req_task()
+        send_fed_req_task()

fedcode/pipelines/sync_vulnerablecode.py

@@ -100,7 +100,7 @@ def sync_vulnerabilities(repository, logger):
             yaml_data_a_blob,
             yaml_data_b_blob,
         )
-        break
+
     repository.last_imported_commit = latest_commit_hash
     repository.save()
     logger("The Importer run successfully")

tests/pipelines/test_sync_vulnerablecode.py

@@ -10,12 +10,12 @@
 from django.contrib.auth.models import User
 from fedcode_test_utils import mute_post_save_signal  # NOQA
 
-from fedcode.importer import Importer
 from fedcode.models import Note
 from fedcode.models import Package
 from fedcode.models import Repository
 from fedcode.models import Service
 from fedcode.models import Vulnerability
+from fedcode.pipelines.sync_vulnerablecode import SyncVulnerableCode
 
 
 @pytest.fixture
@@ -45,8 +45,8 @@ def repo(db, service, mute_post_save_signal):
 def test_simple_importer(service, repo, mute_post_save_signal):
     # just add all packages and vulnerabilities
     repo.path = "/home/ziad/vul-sample/repo1"
-    importer = Importer(repo, service)
-    importer.run()
+    importer = SyncVulnerableCode()
+    importer.execute()
 
     assert Note.objects.count() > 1
     assert Vulnerability.objects.count() > 1
@@ -59,8 +59,8 @@ def test_simple_importer(service, repo, mute_post_save_signal):
     last_imported_commit = repo.last_imported_commit
 
     # Run importer again without add any new data
-    importer = Importer(repo, service)
-    importer.run()
+    importer = SyncVulnerableCode()
+    importer.execute()
 
     assert note_n == Note.objects.count()
     assert vul_n == Vulnerability.objects.count()
@@ -70,17 +70,17 @@ def test_simple_importer(service, repo, mute_post_save_signal):
     # Edit last_imported_commit
     repo.last_imported_commit = "c8de84af0a7c11bf151e96142ce711824648ec41"
     repo.save()
-    importer = Importer(repo, service)
-    importer.run()
+    importer = SyncVulnerableCode()
+    importer.execute()
 
 
 @pytest.mark.skip(reason="Need a real git repo to test the importer")
 @pytest.mark.django_db
 def test_complex_importer(service, repo, mute_post_save_signal):
     # repo with 1 commit
     repo.path = "/home/ziad/vul-sample/repo1"
-    importer = Importer(repo, service)
-    importer.run()
+    importer = SyncVulnerableCode()
+    importer.execute()
 
     assert Note.objects.count() > 1
     assert Vulnerability.objects.count() > 1
@@ -95,8 +95,8 @@ def test_complex_importer(service, repo, mute_post_save_signal):
     # Run importer again without add any new data
     # the same repo with 2 commit ( after pull )
     repo.path = "/home/ziad/vul-sample/repo2"
-    importer = Importer(repo, service)
-    importer.run()
+    importer = SyncVulnerableCode()
+    importer.execute()
 
     assert note_n > Note.objects.count()
     assert vul_n > Vulnerability.objects.count()
@@ -105,5 +105,5 @@ def test_complex_importer(service, repo, mute_post_save_signal):
     # Edit last_imported_commit
     repo.last_imported_commit = "9c3ccee39baef6017d9152367402de9909eadd72"
     repo.save()
-    importer = Importer(repo, service)
-    importer.run()
+    importer = SyncVulnerableCode()
+    importer.execute()