refactor: extract method

Author: ctron

migration/src/data/migration.rs

@@ -1,6 +1,6 @@
 use crate::{
     async_trait,
-    data::{Document, DocumentProcessor, Handler, Options, Partition},
+    data::{Document, DocumentProcessor, Handler, Options},
 };
 use clap::Parser;
 use futures::executor::block_on;
@@ -32,7 +32,9 @@ fn init_options() -> Options {
 }
 
 impl MigrationWithData {
-    #[allow(clippy::expect_used)]
+    /// Wrap a data migration, turning it into a combined schema/data migration.
+    ///
+    /// **NOTE:** This may panic if the storage configuration is missing.
     pub fn new(migration: Box<dyn MigrationTraitWithData>) -> Self {
         Self {
             storage: STORAGE.clone(),
@@ -55,7 +57,6 @@ pub struct SchemaDataManager<'c> {
     pub manager: &'c SchemaManager<'c>,
     storage: &'c DispatchBackend,
     options: &'c Options,
-    partition: Partition,
 }
 
 impl<'c> SchemaDataManager<'c> {
@@ -64,16 +65,10 @@ impl<'c> SchemaDataManager<'c> {
         storage: &'c DispatchBackend,
         options: &'c Options,
     ) -> Self {
-        let partition = Partition {
-            current: options.current,
-            total: options.total,
-        };
-
         Self {
             manager,
             storage,
             options,
-            partition,
         }
     }
 

migration/src/data/mod.rs

@@ -117,6 +117,15 @@ impl Default for Options {
     }
 }
 
+impl From<&Options> for Partition {
+    fn from(value: &Options) -> Self {
+        Self {
+            current: value.current,
+            total: value.total,
+        }
+    }
+}
+
 pub trait DocumentProcessor {
     fn process<D>(
         &self,
@@ -138,7 +147,7 @@ impl<'c> DocumentProcessor for SchemaManager<'c> {
     where
         D: Document,
     {
-        let partition = Partition::default();
+        let partition: Partition = options.into();
         let db = self.get_connection();
 
         let tx = db.begin().await?;
@@ -147,7 +156,7 @@ impl<'c> DocumentProcessor for SchemaManager<'c> {
 
         stream::iter(
             all.into_iter()
-                .filter(|model| partition.is_selected::<D>(&model)),
+                .filter(|model| partition.is_selected::<D>(model)),
         )
         .map(async |model| {
             let tx = db.begin().await?;
@@ -207,6 +216,18 @@ pub struct Migrations {
     all: Vec<Migration>,
 }
 
+impl Migrations {
+    /// Return only [`Migration::Data`] migrations.
+    pub fn only_data(self) -> Vec<Box<dyn MigrationTraitWithData>> {
+        self.into_iter()
+            .filter_map(|migration| match migration {
+                Migration::Normal(_) => None,
+                Migration::Data(migration) => Some(migration),
+            })
+            .collect()
+    }
+}
+
 impl IntoIterator for Migrations {
     type Item = Migration;
     type IntoIter = std::vec::IntoIter<Self::Item>;

migration/src/data/partition.rs

@@ -1,6 +1,8 @@
 use crate::data::Document;
-use std::hash::{DefaultHasher, Hash, Hasher};
-use std::num::{NonZeroU64, NonZeroUsize};
+use std::{
+    hash::{DefaultHasher, Hash, Hasher},
+    num::NonZeroU64,
+};
 use trustify_entity::sbom;
 
 #[derive(Debug, Copy, Clone)]

migration/src/lib.rs

@@ -64,19 +64,15 @@ impl Migrator {
             .normal(m0001110_sbom_node_checksum_indexes::Migration)
             .normal(m0001120_sbom_external_node_indexes::Migration)
             .normal(m0001130_gover_cmp::Migration)
+            .normal(m0001140_expand_spdx_licenses_function::Migration)
+            .normal(m0001150_case_license_text_sbom_id_function::Migration)
             .data(m0002000_example_data_migration::Migration)
     }
 }
 
 impl MigratorWithData for Migrator {
     fn data_migrations() -> Vec<Box<dyn MigrationTraitWithData>> {
-        Self::migrations()
-            .into_iter()
-            .filter_map(|migration| match migration {
-                Migration::Normal(_) => None,
-                Migration::Data(migration) => Some(migration),
-            })
-            .collect()
+        Self::migrations().only_data()
     }
 }
 

server/src/profile/api.rs

@@ -8,8 +8,7 @@ use crate::{endpoints, profile::spawn_db_check, sample_data};
 use actix_web::web;
 use bytesize::ByteSize;
 use futures::FutureExt;
-use humantime::parse_duration;
-use std::{env, fs::create_dir_all, path::PathBuf, process::ExitCode, sync::Arc, time::Duration};
+use std::{env, process::ExitCode, sync::Arc, time::Duration};
 use tokio_schedule::{Job, every};
 use trustify_auth::{
     auth::AuthConfigArguments,

trustd/src/db.rs

@@ -14,6 +14,7 @@ pub struct Run {
 }
 
 #[derive(clap::Subcommand, Debug, Clone)]
+#[allow(clippy::large_enum_variant)]
 pub enum Command {
     /// Create database
     Create,