TC-2174 OSV Python ecosystem management (review fixes)

Signed-off-by: mrizzi <[email protected]>
trustification · Jan 29, 2025 · c350d71 · c350d71 · github-actions · Jan 29, 2025
1 parent ec29b52
commit c350d71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/migration/src/m0000850_python_version.rs b/migration/src/m0000850_python_version.rs
@@ -9,13 +9,13 @@ impl MigrationTrait for Migration {
     async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
         let db = manager.get_connection();
 
-        db.execute_unprepared(
-            &Query::update()
-                .table(VersionScheme::Table)
-                .value(VersionScheme::Id, "python")
-                .and_where(Expr::col(VersionScheme::Id).eq("pypi"))
-                .to_owned()
-                .to_string(PostgresQueryBuilder),
+        db.execute(
+            db.get_database_backend().build(
+                Query::update()
+                    .table(VersionScheme::Table)
+                    .value(VersionScheme::Id, "python")
+                    .and_where(Expr::col(VersionScheme::Id).eq("pypi")),
+            ),
         )
         .await?;
 

diff --git a/modules/ingestor/src/service/advisory/osv/loader.rs b/modules/ingestor/src/service/advisory/osv/loader.rs
@@ -173,17 +173,7 @@ impl<'g> OsvLoader<'g> {
                                 )
                                 .await?;
                             }
-                            (RangeType::Ecosystem, Ecosystem::PyPI) => {
-                                create_package_status(
-                                    &advisory_vuln,
-                                    &purl,
-                                    range,
-                                    &VersionScheme::Python,
-                                    &tx,
-                                )
-                                .await?;
-                            }
-                            (RangeType::Ecosystem, Ecosystem::Python) => {
+                            (RangeType::Ecosystem, Ecosystem::PyPI | Ecosystem::Python) => {
                                 create_package_status(
                                     &advisory_vuln,
                                     &purl,