feat(models): add database_specific to AffectedRange2 (google#4201)

cuixq · web-flow · commit bdd266f62794 · 2025-10-22T10:48:31.000+11:00
google#4160 adds a `database_specific` field to the affected ranges in proto. This PR aligns the NDB model for this change. This ensures that any database-specific metadata provided in a vulnerability's affected range is correctly persisted in the datastore and included in the API output.
diff --git a/gcp/workers/worker/testdata/ImpactTest_basic.txt b/gcp/workers/worker/testdata/ImpactTest_basic.txt
@@ -5,7 +5,8 @@
                                  'package': {   'ecosystem': 'ecosystem',
                                                 'name': 'project',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'fixed',
                                                                      'value': '8d8242f545e9cec3e6d0d2e3f5bde8be1c659735'},
diff --git a/gcp/workers/worker/testdata/ImpactTest_fixed_range_too_long.txt b/gcp/workers/worker/testdata/ImpactTest_fixed_range_too_long.txt
@@ -5,7 +5,8 @@
                                  'package': {   'ecosystem': 'ecosystem',
                                                 'name': 'project',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'fixed',
                                                                      'value': 'b587c21c36a84e16cfc6b39eb68578d43b5281ad'}],
diff --git a/gcp/workers/worker/testdata/ImpactTest_not_fixed.txt b/gcp/workers/worker/testdata/ImpactTest_not_fixed.txt
@@ -5,7 +5,8 @@
                                  'package': {   'ecosystem': 'ecosystem',
                                                 'name': 'project',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'introduced',
                                                                      'value': 'febfac1940086bc1f6d3dc33fda0a1d1ba336209'}],
diff --git a/gcp/workers/worker/testdata/ImpactTest_range.txt b/gcp/workers/worker/testdata/ImpactTest_range.txt
@@ -5,7 +5,8 @@
                                  'package': {   'ecosystem': 'ecosystem',
                                                 'name': 'project',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'fixed',
                                                                      'value': '36f0bd9549298b44f9ff2496c9dd1326b3a9d0e2'}],
diff --git a/gcp/workers/worker/testdata/ImpactTest_simplify_range.txt b/gcp/workers/worker/testdata/ImpactTest_simplify_range.txt
@@ -5,7 +5,8 @@
                                  'package': {   'ecosystem': 'ecosystem',
                                                 'name': 'project',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'fixed',
                                                                      'value': '8d8242f545e9cec3e6d0d2e3f5bde8be1c659735'},
diff --git a/gcp/workers/worker/testdata/ImpactTest_zero_regression_range.txt b/gcp/workers/worker/testdata/ImpactTest_zero_regression_range.txt
@@ -5,7 +5,8 @@
                                  'package': {   'ecosystem': 'ecosystem',
                                                 'name': 'project',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'fixed',
                                                                      'value': '8d8242f545e9cec3e6d0d2e3f5bde8be1c659735'}],
diff --git a/gcp/workers/worker/testdata/RESTUpdateTest_update_no_introduced.txt b/gcp/workers/worker/testdata/RESTUpdateTest_update_no_introduced.txt
@@ -181,13 +181,15 @@
                                  'package': {   'ecosystem': '',
                                                 'name': '',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '7.7'},
                                                                  {   'type': 'fixed',
                                                                      'value': '7.86.0'}],
                                                    'repo_url': '',
                                                    'type': 'SEMVER'},
-                                               {   'events': [   {   'type': 'introduced',
+                                               {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '546572da0457f37c698c02d0a08d90fdfcbeedec'},
                                                                  {   'type': 'fixed',
                                                                      'value': 'a64e3e59938abd7d667e4470a18072a24d7e9de9'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_dont_index_too_many_git_versions.txt b/gcp/workers/worker/testdata/UpdateTest_dont_index_too_many_git_versions.txt
@@ -5,7 +5,8 @@
                                  'package': {   'ecosystem': '',
                                                 'name': '',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'last_affected',
                                                                      'value': '8d8242f545e9cec3e6d0d2e3f5bde8be1c659735'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_last_affected_git.txt b/gcp/workers/worker/testdata/UpdateTest_last_affected_git.txt
@@ -5,7 +5,8 @@
                                  'package': {   'ecosystem': '',
                                                 'name': '',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'last_affected',
                                                                      'value': '8d8242f545e9cec3e6d0d2e3f5bde8be1c659735'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_normalized_pypi.txt b/gcp/workers/worker/testdata/UpdateTest_normalized_pypi.txt
@@ -5,13 +5,15 @@
                                  'package': {   'ecosystem': 'PyPI',
                                                 'name': 'scrapy',
                                                 'purl': 'pkg:pypi/scrapy'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '1.14.2'},
                                                                  {   'type': 'fixed',
                                                                      'value': '1.31.0'}],
                                                    'repo_url': '',
                                                    'type': 'ECOSYSTEM'},
-                                               {   'events': [   {   'type': 'introduced',
+                                               {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'fixed',
                                                                      'value': '8d8242f545e9cec3e6d0d2e3f5bde8be1c659735'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_ubuntu_severity_type.txt b/gcp/workers/worker/testdata/UpdateTest_ubuntu_severity_type.txt
@@ -184,7 +184,8 @@
                                  'package': {   'ecosystem': 'Ubuntu:Pro:14.04:LTS',
                                                 'name': 'linux',
                                                 'purl': 'pkg:deb/ubuntu/linux@3.13.0-206.257?arch=source&distro=esm-infra-legacy/trusty'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'}],
                                                    'repo_url': '',
                                                    'type': 'ECOSYSTEM'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_update.txt b/gcp/workers/worker/testdata/UpdateTest_update.txt
@@ -7,7 +7,8 @@
                                  'package': {   'ecosystem': 'Go',
                                                 'name': 'blah.com/package',
                                                 'purl': 'pkg:golang/blah.com/package'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'fixed',
                                                                      'value': '8d8242f545e9cec3e6d0d2e3f5bde8be1c659735'},
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_add_fix.txt b/gcp/workers/worker/testdata/UpdateTest_update_add_fix.txt
@@ -7,7 +7,8 @@
                                  'package': {   'ecosystem': 'Go',
                                                 'name': 'blah.com/package',
                                                 'purl': 'pkg:golang/blah.com/package'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': 'eefe8ec3f1f90d0e684890e810f3f21e8500a4cd'},
                                                                  {   'type': 'fixed',
                                                                      'value': '8d8242f545e9cec3e6d0d2e3f5bde8be1c659735'},
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_alpine.txt b/gcp/workers/worker/testdata/UpdateTest_update_alpine.txt
@@ -110,7 +110,8 @@
                                  'package': {   'ecosystem': 'Alpine:v3.12',
                                                 'name': 'mariadb',
                                                 'purl': 'pkg:alpine/mariadb'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '10.4.25-r0'}],
@@ -211,7 +212,8 @@
                                  'package': {   'ecosystem': 'Alpine:v3.13',
                                                 'name': 'mariadb',
                                                 'purl': 'pkg:alpine/mariadb'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '10.5.16-r0'}],
@@ -315,7 +317,8 @@
                                  'package': {   'ecosystem': 'Alpine:v3.14',
                                                 'name': 'mariadb',
                                                 'purl': 'pkg:alpine/mariadb'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '10.5.16-r0'}],
@@ -418,7 +421,8 @@
                                  'package': {   'ecosystem': 'Alpine:v3.15',
                                                 'name': 'mariadb',
                                                 'purl': 'pkg:alpine/mariadb'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '10.6.8-r0'}],
@@ -524,7 +528,8 @@
                                  'package': {   'ecosystem': 'Alpine:v3.16',
                                                 'name': 'mariadb',
                                                 'purl': 'pkg:alpine/mariadb'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '10.6.8-r0'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_bucket_0.txt b/gcp/workers/worker/testdata/UpdateTest_update_bucket_0.txt
@@ -8,7 +8,8 @@
                                  'package': {   'ecosystem': 'Go',
                                                 'name': 'github.com/opencontainers/runc',
                                                 'purl': 'pkg:golang/github.com/opencontainers/runc'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '1.0.0-rc8.0.20190930145003-cad42f6e0932'}],
@@ -23,7 +24,8 @@
                                  'package': {   'ecosystem': 'Go',
                                                 'name': 'github.com/opencontainers/selinux',
                                                 'purl': 'pkg:golang/github.com/opencontainers/selinux'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '1.3.1-0.20190929122143-5215b1806f52'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_bucket_cve.txt b/gcp/workers/worker/testdata/UpdateTest_update_bucket_cve.txt
@@ -78,7 +78,8 @@
                                  'package': {   'ecosystem': '',
                                                 'name': '',
                                                 'purl': None},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '001ef99b0c8194468de960d007e2d82dcebc3bca'},
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_debian.txt b/gcp/workers/worker/testdata/UpdateTest_update_debian.txt
@@ -8,7 +8,8 @@
                                  'package': {   'ecosystem': 'Debian:7',
                                                 'name': 'nginx',
                                                 'purl': 'pkg:deb/debian/nginx?arch=source'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '0'},
                                                                  {   'type': 'fixed',
                                                                      'value': '1.2.1-2.2+wheezy3'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_last_affected.txt b/gcp/workers/worker/testdata/UpdateTest_update_last_affected.txt
@@ -46,7 +46,8 @@
                                  'package': {   'ecosystem': 'PyPI',
                                                 'name': 'grpcio',
                                                 'purl': 'pkg:pypi/grpcio'},
-                                 'ranges': [   {   'events': [   {   'type': 'introduced',
+                                 'ranges': [   {   'database_specific': None,
+                                                   'events': [   {   'type': 'introduced',
                                                                      'value': '1.14.2'},
                                                                  {   'type': 'last_affected',
                                                                      'value': '1.31.0'}],
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_limit.txt b/gcp/workers/worker/testdata/UpdateTest_update_limit.txt
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_maven.txt b/gcp/workers/worker/testdata/UpdateTest_update_maven.txt
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_new.txt b/gcp/workers/worker/testdata/UpdateTest_update_new.txt
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_no_introduced.txt b/gcp/workers/worker/testdata/UpdateTest_update_no_introduced.txt
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_partly_bad_ecosystem_new.txt b/gcp/workers/worker/testdata/UpdateTest_update_partly_bad_ecosystem_new.txt
diff --git a/gcp/workers/worker/testdata/UpdateTest_update_pypi.txt b/gcp/workers/worker/testdata/UpdateTest_update_pypi.txt
diff --git a/osv/models.py b/osv/models.py
