Refactor: Cache SQL Statements, Move Migrations Into Folder Structure, Fix Testfolder Teardown, Remove Unneeded Override Of TypeScript Dependency

Cargo.toml

@@ -95,8 +95,9 @@ zeroize = { version = "1.8.1", features = ["derive"] }
 itertools = "0.14.0"
 rmp-serde = "1.3.0"
 security-framework-sys = { version = "2.14.0", optional = true }
-rusqlite_migration = "2.3.0"
+rusqlite_migration = { version = "2.3.0", features = ["from-directory"] }
 rusqlite = { version = "0.37.0", features = ["bundled"] }
+include_dir = "0.7.4"
 
 [dev-dependencies]
 color-eyre = "0.6.3"

cSpell.json

@@ -29,6 +29,7 @@
         "nmshd",
         "pkcs",
         "pwsh",
+        "qufiwefefwoyn",
         "redb",
         "repr",
         "reqwest",

src/common/crypto/algorithms/encryption.rs

@@ -111,6 +111,7 @@ impl Cipher {
         }
     }
 
+    #[allow(dead_code)] // is used in tests
     pub(crate) fn iv_len(&self) -> usize {
         match self {
             Self::AesCbc128

src/storage/storage_backend/mod.rs

@@ -111,7 +111,7 @@ mod test {
     // This results in the global db map being ineffective for unit tests.
 
     use crate::tests::TestStore;
-    use rstest::rstest;
+    use rstest::{fixture, rstest};
     use std::sync::LazyLock;
     use tempfile::{tempdir_in, TempDir};
 
@@ -123,7 +123,10 @@ mod test {
 
     const TARGET_FOLDER: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/target");
 
-    static TEST_TMP_DIR: LazyLock<TempDir> = LazyLock::new(|| tempdir_in(TARGET_FOLDER).unwrap());
+    #[fixture]
+    fn temp_folder() -> TempDir {
+        tempdir_in(TARGET_FOLDER).unwrap()
+    }
 
     fn random_scoped_key() -> ScopedKey {
         ScopedKey {
@@ -134,24 +137,34 @@ mod test {
         }
     }
 
-    fn create_kv_storage_backend() -> StorageBackendExplicit {
+    fn create_kv_storage_backend() -> (StorageBackendExplicit, Option<TempDir>) {
         let config = TEST_KV_STORE.impl_config();
-        StorageBackendExplicit::new(&config.additional_config).unwrap()
+        (
+            StorageBackendExplicit::new(&config.additional_config).unwrap(),
+            None,
+        )
     }
 
-    fn create_file_storage_backend() -> StorageBackendExplicit {
-        let mut db_dir = TEST_TMP_DIR.path().to_path_buf();
+    fn create_file_storage_backend() -> (StorageBackendExplicit, Option<TempDir>) {
+        let temp_folder = temp_folder();
+
+        let mut db_dir = temp_folder.path().to_path_buf();
         db_dir.push(&nanoid!());
         let additional_configs = vec![AdditionalConfig::FileStoreConfig {
             db_dir: db_dir.to_string_lossy().to_string(),
         }];
-        StorageBackendExplicit::new(&additional_configs).unwrap()
+        (
+            StorageBackendExplicit::new(&additional_configs).unwrap(),
+            Some(temp_folder),
+        )
     }
 
     #[rstest]
     fn test_create_valid_storage_backend(
-        #[values(create_file_storage_backend, create_kv_storage_backend)]
-        create: impl Fn() -> StorageBackendExplicit,
+        #[values(create_file_storage_backend, create_kv_storage_backend)] create: impl Fn() -> (
+            StorageBackendExplicit,
+            Option<TempDir>,
+        ),
     ) {
         let _ = create();
     }
@@ -164,16 +177,18 @@ mod test {
         assert!(matches!(
             error,
             StorageManagerInitializationError::MissingProviderImplConfigOption { .. }
-        ))
+        ));
     }
 
     #[rstest]
     fn test_invalid_creation_conflicting_config() {
+        let temp_folder = temp_folder();
+
         let mut provider_impl = TEST_KV_STORE.impl_config();
         provider_impl
             .additional_config
             .push(AdditionalConfig::FileStoreConfig {
-                db_dir: TEST_TMP_DIR
+                db_dir: temp_folder
                     .path()
                     .join("test_invalid_creation_conflicting_config")
                     .to_string_lossy()
@@ -185,27 +200,34 @@ mod test {
         assert!(matches!(
             error,
             StorageManagerInitializationError::ConflictingProviderImplConfig { .. }
-        ))
+        ));
     }
 
     #[rstest]
     fn test_insert(
-        #[values(create_file_storage_backend, create_kv_storage_backend)]
-        create: impl Fn() -> StorageBackendExplicit,
+        #[values(create_file_storage_backend, create_kv_storage_backend)] create: impl Fn() -> (
+            StorageBackendExplicit,
+            Option<TempDir>,
+        ),
     ) {
-        let storage = create();
+        let (storage, _temp_dir) = create();
 
         let scoped_key = random_scoped_key();
 
         storage.store(scoped_key, b"TEST_DATA").unwrap();
+
+        drop(storage);
+        _temp_dir.map(|d| d.close());
     }
 
     #[rstest]
     fn test_insert_and_get(
-        #[values(create_file_storage_backend, create_kv_storage_backend)]
-        create: impl Fn() -> StorageBackendExplicit,
+        #[values(create_file_storage_backend, create_kv_storage_backend)] create: impl Fn() -> (
+            StorageBackendExplicit,
+            Option<TempDir>,
+        ),
     ) {
-        let storage = create();
+        let (storage, _temp_dir) = create();
 
         let scoped_key = random_scoped_key();
 
@@ -215,14 +237,19 @@ mod test {
         let loaded_data = storage.get(scoped_key).unwrap();
 
         assert_eq!(data, loaded_data);
+
+        drop(storage);
+        _temp_dir.map(|d| d.close());
     }
 
     #[rstest]
     fn test_overwrite(
-        #[values(create_file_storage_backend, create_kv_storage_backend)]
-        create: impl Fn() -> StorageBackendExplicit,
+        #[values(create_file_storage_backend, create_kv_storage_backend)] create: impl Fn() -> (
+            StorageBackendExplicit,
+            Option<TempDir>,
+        ),
     ) {
-        let storage = create();
+        let (storage, _temp_dir) = create();
 
         let scoped_key = random_scoped_key();
 
@@ -235,14 +262,19 @@ mod test {
         storage.store(scoped_key.clone(), &data2).unwrap();
         let loaded_data_2 = storage.get(scoped_key).unwrap();
         assert_eq!(data2, loaded_data_2);
+
+        drop(storage);
+        _temp_dir.map(|d| d.close());
     }
 
     #[rstest]
     fn test_fail_key_not_exists(
-        #[values(create_file_storage_backend, create_kv_storage_backend)]
-        create: impl Fn() -> StorageBackendExplicit,
+        #[values(create_file_storage_backend, create_kv_storage_backend)] create: impl Fn() -> (
+            StorageBackendExplicit,
+            Option<TempDir>,
+        ),
     ) {
-        let storage = create();
+        let (storage, _temp_dir) = create();
 
         let scoped_key = random_scoped_key();
 
@@ -252,15 +284,20 @@ mod test {
             error,
             StorageBackendError::Sqlite(SqliteBackendError::NoKeyError)
                 | StorageBackendError::KvStore(KvStorageBackendError::Get)
-        ))
+        ));
+
+        drop(storage);
+        _temp_dir.map(|d| d.close());
     }
 
     #[rstest]
     fn test_inserted_key_in_keys(
-        #[values(create_file_storage_backend, create_kv_storage_backend)]
-        create: impl Fn() -> StorageBackendExplicit,
+        #[values(create_file_storage_backend, create_kv_storage_backend)] create: impl Fn() -> (
+            StorageBackendExplicit,
+            Option<TempDir>,
+        ),
     ) {
-        let storage = create();
+        let (storage, _temp_dir) = create();
 
         let scoped_key = random_scoped_key();
 
@@ -271,31 +308,41 @@ mod test {
         assert!(keys
             .into_iter()
             .filter_map(|r| r.ok())
-            .contains(&scoped_key))
+            .contains(&scoped_key));
+
+        drop(storage);
+        _temp_dir.map(|d| d.close());
     }
 
     #[rstest]
     fn test_keys_all_ok(
-        #[values(create_file_storage_backend, create_kv_storage_backend)]
-        create: impl Fn() -> StorageBackendExplicit,
+        #[values(create_file_storage_backend, create_kv_storage_backend)] create: impl Fn() -> (
+            StorageBackendExplicit,
+            Option<TempDir>,
+        ),
     ) {
-        let storage = create();
+        let (storage, _temp_dir) = create();
 
         let scoped_key = random_scoped_key();
 
         storage.store(scoped_key.clone(), b"TEST_DATA").unwrap();
 
         let keys = storage.keys();
 
-        assert!(keys.into_iter().all(|result| result.is_ok()))
+        assert!(keys.into_iter().all(|result| result.is_ok()));
+
+        drop(storage);
+        _temp_dir.map(|d| d.close());
     }
 
     #[rstest]
     fn test_delete(
-        #[values(create_file_storage_backend, create_kv_storage_backend)]
-        create: impl Fn() -> StorageBackendExplicit,
+        #[values(create_file_storage_backend, create_kv_storage_backend)] create: impl Fn() -> (
+            StorageBackendExplicit,
+            Option<TempDir>,
+        ),
     ) {
-        let storage = create();
+        let (storage, _temp_dir) = create();
 
         let scoped_key = random_scoped_key();
 
@@ -314,5 +361,8 @@ mod test {
             StorageBackendError::Sqlite(SqliteBackendError::NoKeyError)
                 | StorageBackendError::KvStore(KvStorageBackendError::Get)
         ));
+
+        drop(storage);
+        _temp_dir.map(|d| d.close());
     }
 }

src/storage/storage_backend/sqlite_store/migrations/01-initial/up.sql

@@ -0,0 +1,7 @@
+CREATE TABLE keys (
+    id TEXT PRIMARY KEY,
+    provider TEXT,
+    encryption_key_id TEXT,
+    signature_key_id TEXT,
+    data_blob BLOB
+);