Update model field attributes #447

    * purl and dependency_uid are the only required fields on DiscoveredDependency
    * Update migrations
    * Check for created DiscoveredDependency in tests

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

Author: JonoYang

scanpipe/migrations/0019_codebaseresource_package_data_discovereddependency.py renamed to scanpipe/migrations/0019_remove_discoveredpackage_dependencies_and_more.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.0.6 on 2022-07-27 01:11
+# Generated by Django 4.0.6 on 2022-07-30 00:41
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,25 +12,34 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.RemoveField(
+            model_name='discoveredpackage',
+            name='dependencies',
+        ),
         migrations.AddField(
             model_name='codebaseresource',
             name='package_data',
             field=models.JSONField(blank=True, default=list, help_text='List of Package data detected from this CodebaseResource'),
         ),
+        migrations.AlterField(
+            model_name='codebaseresource',
+            name='name',
+            field=models.CharField(blank=True, help_text='File or directory name of this resource with its extension.', max_length=255),
+        ),
         migrations.CreateModel(
             name='DiscoveredDependency',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('purl', models.CharField(help_text='The Package URL of this dependency.', max_length=1024)),
-                ('extracted_requirement', models.CharField(help_text='The version requirements of this dependency.', max_length=64)),
-                ('scope', models.CharField(help_text='The scope of this dependency, how it is used in a project.', max_length=64)),
+                ('extracted_requirement', models.CharField(blank=True, help_text='The version requirements of this dependency.', max_length=64)),
+                ('scope', models.CharField(blank=True, help_text='The scope of this dependency, how it is used in a project.', max_length=64)),
                 ('is_runtime', models.BooleanField(default=False)),
                 ('is_optional', models.BooleanField(default=False)),
                 ('is_resolved', models.BooleanField(default=False)),
                 ('dependency_uid', models.CharField(help_text='The unique identifier of this dependency.', max_length=1024)),
-                ('for_package_uid', models.CharField(help_text='The unique identifier of the package this dependency is for.', max_length=1024)),
+                ('for_package_uid', models.CharField(blank=True, help_text='The unique identifier of the package this dependency is for.', max_length=1024)),
                 ('datafile_path', models.CharField(blank=True, help_text='The relative path to the datafile where this dependency was detected from.', max_length=1024)),
-                ('datasource_id', models.CharField(help_text='The identifier for the datafile handler used to obtain this dependency.', max_length=64)),
+                ('datasource_id', models.CharField(blank=True, help_text='The identifier for the datafile handler used to obtain this dependency.', max_length=64)),
                 ('project', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='scanpipe.project')),
             ],
             options={

scanpipe/migrations/0020_concat_codebaseresource_name_and_extension.py

@@ -1940,10 +1940,12 @@ class DiscoveredDependency(
     )
     extracted_requirement = models.CharField(
         max_length=64,
+        blank=True,
         help_text=_("The version requirements of this dependency."),
     )
     scope = models.CharField(
         max_length=64,
+        blank=True,
         help_text=_("The scope of this dependency, how it is used in a project."),
     )
 
@@ -1957,6 +1959,7 @@ class DiscoveredDependency(
     )
     for_package_uid = models.CharField(
         max_length=1024,
+        blank=True,
         help_text=_("The unique identifier of the package this dependency is for."),
     )
     datafile_path = models.CharField(
@@ -1968,6 +1971,7 @@ class DiscoveredDependency(
     )
     datasource_id = models.CharField(
         max_length=64,
+        blank=True,
         help_text=_(
             "The identifier for the datafile handler used to obtain this dependency."
         ),

scanpipe/migrations/0021_remove_discoveredpackage_dependencies_and_more.py

@@ -302,6 +302,7 @@ def test_scanpipe_scan_package_pipeline_integration_test(self):
 
         self.assertEqual(4, project1.codebaseresources.count())
         self.assertEqual(1, project1.discoveredpackages.count())
+        self.assertEqual(0, project1.discovereddependencys.count())
 
         scancode_file = project1.get_latest_output(filename="scancode")
         expected_file = self.data_location / "is-npm-1.0.0_scan_package.json"
@@ -335,6 +336,7 @@ def test_scanpipe_scan_package_pipeline_integration_test_multiple_packages(self)
 
         self.assertEqual(9, project1.codebaseresources.count())
         self.assertEqual(2, project1.discoveredpackages.count())
+        self.assertEqual(0, project1.discovereddependencys.count())
 
         scancode_file = project1.get_latest_output(filename="scancode")
         expected_file = self.data_location / "multiple-is-npm-1.0.0_scan_package.json"
@@ -386,6 +388,7 @@ def test_scanpipe_docker_pipeline_alpine_integration_test(self):
 
         self.assertEqual(109, project1.codebaseresources.count())
         self.assertEqual(14, project1.discoveredpackages.count())
+        self.assertEqual(0, project1.discovereddependencys.count())
 
         result_file = output.to_json(project1)
         expected_file = self.data_location / "alpine_3_15_4_scan_codebase.json"
@@ -409,6 +412,7 @@ def test_scanpipe_docker_pipeline_rpm_integration_test(self):
 
         self.assertEqual(25, project1.codebaseresources.count())
         self.assertEqual(101, project1.discoveredpackages.count())
+        self.assertEqual(0, project1.discovereddependencys.count())
 
         result_file = output.to_json(project1)
         expected_file = self.data_location / "centos_scan_codebase.json"
@@ -431,6 +435,7 @@ def test_scanpipe_docker_pipeline_debian_integration_test(self):
 
         self.assertEqual(6, project1.codebaseresources.count())
         self.assertEqual(2, project1.discoveredpackages.count())
+        self.assertEqual(0, project1.discovereddependencys.count())
 
         result_file = output.to_json(project1)
         expected_file = self.data_location / "debian_scan_codebase.json"
@@ -495,6 +500,7 @@ def test_scanpipe_load_inventory_pipeline_integration_test(self):
 
         self.assertEqual(18, project1.codebaseresources.count())
         self.assertEqual(2, project1.discoveredpackages.count())
+        self.assertEqual(0, project1.discovereddependencys.count())
 
         result_file = output.to_json(project1)
         expected_file = (