Consolidate migrations #447

    * Update DiscoveredDependency ordering
    * Update daglib test expectations

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

scanpipe/migrations/0022_rename_dependencies_discoveredpackage_dependencies_data_and_more.py

@@ -44,4 +44,50 @@ class Migration(migrations.Migration):
             model_name='discovereddependency',
             constraint=models.UniqueConstraint(condition=models.Q(('dependency_uid', ''), _negated=True), fields=('project', 'dependency_uid'), name='scanpipe_discovereddependency_unique_dependency_uid_within_project'),
         ),
+        migrations.AddField(
+            model_name='discovereddependency',
+            name='name',
+            field=models.CharField(blank=True, help_text='Name of the package.', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='discovereddependency',
+            name='namespace',
+            field=models.CharField(blank=True, help_text='Package name prefix, such as Maven groupid, Docker image owner, GitHub user or organization, etc.', max_length=255),
+        ),
+        migrations.AddField(
+            model_name='discovereddependency',
+            name='qualifiers',
+            field=models.CharField(blank=True, help_text='Extra qualifying data for a package such as the name of an OS, architecture, distro, etc.', max_length=1024),
+        ),
+        migrations.AddField(
+            model_name='discovereddependency',
+            name='subpath',
+            field=models.CharField(blank=True, help_text='Extra subpath within a package, relative to the package root.', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='discovereddependency',
+            name='type',
+            field=models.CharField(blank=True, help_text='A short code to identify the type of this package. For example: gem for a Rubygem, docker for a container, pypi for a Python Wheel or Egg, maven for a Maven Jar, deb for a Debian package, etc.', max_length=16),
+        ),
+        migrations.AddField(
+            model_name='discovereddependency',
+            name='version',
+            field=models.CharField(blank=True, help_text='Version of the package.', max_length=100),
+        ),
+        migrations.AlterModelOptions(
+            name="discovereddependency",
+            options={
+                "ordering": [
+                    "-is_runtime",
+                    "-is_resolved",
+                    "is_optional",
+                    "dependency_uid",
+                    "for_package",
+                    "datafile_resource",
+                    "datasource_id",
+                ],
+                "verbose_name": "discovered dependency",
+                "verbose_name_plural": "discovered dependencies",
+            },
+        ),
     ]

scanpipe/migrations/0023_migrate_dependencies.py

@@ -1,8 +1,7 @@
 # Generated by Django 4.0.6 on 2022-08-12 23:13
 
+from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.db import migrations
-from django.db.models import F, Q
-from django.db.models.functions import Concat
 
 
 def migrate_dependencies_to_discovereddependencies(apps, schema_editor):
@@ -19,19 +18,17 @@ def migrate_dependencies_to_discovereddependencies(apps, schema_editor):
             dependency_data.pop("extra_data", None)
             dependency_data.pop("resolved_package", None)
 
-            for_package = None
             for_package_uid = dependency_data.get("for_package_uid")
-            p = project.discoveredpackages.filter(package_uid=for_package_uid)
-            if p.exists():
-                for_package = project.discoveredpackages.get(
-                    package_uid=for_package_uid
-                )
+            try:
+                for_package = project.discoveredpackages.get(package_uid=for_package_uid)
+            except (ObjectDoesNotExist, MultipleObjectsReturned):
+                for_package = None
 
-            datafile_resource = None
             datafile_path = dependency_data.get("datafile_path")
-            datafile = project.codebaseresources.filter(path=datafile_path)
-            if datafile.exists():
+            try:
                 datafile_resource = project.codebaseresources.get(path=datafile_path)
+            except (ObjectDoesNotExist, MultipleObjectsReturned):
+                datafile_resource = None
 
             DiscoveredDependency.objects.create(
                 project=project,

scanpipe/migrations/0026_migrate_dependency_uid_to_purl_fields.py renamed to scanpipe/migrations/0024_migrate_dependency_uid_to_purl_fields.py

@@ -23,7 +23,7 @@ def migrate_dependency_uids_to_purl_fields(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('scanpipe', '0025_discovereddependency_name_and_more'),
+        ('scanpipe', '0023_migrate_dependencies'),
     ]
 
     operations = [

scanpipe/migrations/0024_remove_discoveredpackage_dependencies_data.py

@@ -6,10 +6,14 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('scanpipe', '0026_migrate_dependency_uid_to_purl_fields'),
+        ('scanpipe', '0024_migrate_dependency_uid_to_purl_fields'),
     ]
 
     operations = [
+        migrations.RemoveField(
+            model_name='discoveredpackage',
+            name='dependencies_data',
+        ),
         migrations.RemoveField(
             model_name='discovereddependency',
             name='purl',

scanpipe/migrations/0025_discovereddependency_name_and_more.py

@@ -2026,6 +2026,7 @@ class Meta:
             "dependency_uid",
             "for_package",
             "datafile_resource",
+            "datasource_id",
         ]
         constraints = [
             models.UniqueConstraint(

scanpipe/migrations/0027_remove_discovereddependency_purl.py renamed to scanpipe/migrations/0025_remove_discovereddependency_purl_and_more.py

@@ -191,8 +191,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/networkx?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
-      "datasource_id": "pypi_wheel"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
+      "datasource_id": "pypi_wheel_metadata"
     },
     {
       "purl": "pkg:pypi/networkx",
@@ -204,8 +204,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/networkx?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/[email protected]?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
-      "datasource_id": "pypi_wheel_metadata"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
+      "datasource_id": "pypi_wheel"
     }
   ],
   "files": [