Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

refactor(storage_import_tinymcp): simplify secret access in tinymcp storage import

Steven Enamakel494f5b40ffde
diff --git a/crates/openhuman-core/src/modules/storage_import_tinymcp.rs b/crates/openhuman-core/src/modules/storage_import_tinymcp.rs
index ded4d39f36..d813910848 100644
--- a/crates/openhuman-core/src/modules/storage_import_tinymcp.rs
+++ b/crates/openhuman-core/src/modules/storage_import_tinymcp.rs
@@ -79,10 +79,8 @@ pub(crate) async fn import_legacy(ctx: &DispatchCtx, data_dir: &Path) -> Result<
let scoped = backend
.for_scope(&scope)
.map_err(|error| anyhow!("open the module scope: {:?}", error.kind()))?;
- let keys = crate::storage::secrets::keys()
- .map_err(|error| anyhow!("no key provider for module secrets: {:?}", error.kind()))?;
let secrets = scoped.secrets();
- import_into(ctx, &scoped, &secrets, data_dir).await
+ import_into(ctx, &scoped, secrets.as_ref(), data_dir).await
}
async fn import_into(
diff --git a/crates/openhuman-core/src/modules/storage_import_tinymcp_tests.rs b/crates/openhuman-core/src/modules/storage_import_tinymcp_tests.rs
index 9e716c84b3..22ab5d4822 100644
--- a/crates/openhuman-core/src/modules/storage_import_tinymcp_tests.rs
+++ b/crates/openhuman-core/src/modules/storage_import_tinymcp_tests.rs
@@ -1,7 +1,7 @@
use super::*;
-use tinystoragedrivers::secrets::DerivedKeys;
-use tinystoragedrivers::{MemoryStorage, Scope, StorageBackend};
-use zeroize::Zeroizing;
+use crate::storage::{Scope, Storage};
+use tinystoragedrivers_testkit::memory_storage;
+use tinystoragedrivers_api::SecretStore;
/// The first-generation schema: no `transport`, `deployment_url`, `enabled` or
/// `catalog_managed` column, which older installs never gained.
@@ -53,20 +53,13 @@ fn legacy_dir() -> tempfile::TempDir {
}
struct Rig {
- scoped: ScopedStorage,
- secrets: DocumentSecrets,
+ scoped: Storage,
}
fn rig() -> Rig {
- let backend = MemoryStorage::new();
- let scoped = backend
- .for_scope(&Scope::new("module:tinymcp@local").unwrap())
- .unwrap();
- let secrets = DocumentSecrets::new(
- &scoped,
- Arc::new(DerivedKeys::new(Zeroizing::new([3u8; 32]))),
- );
- Rig { scoped, secrets }
+ Rig {
+ scoped: memory_storage(&Scope::new("module:tinymcp@local").unwrap()),
+ }
}
fn digest(path: &Path) -> Vec<u8> {
@@ -80,7 +73,7 @@ async fn servers_env_and_audit_rows_move_into_the_modules_storage() {
let outcome = import_into(
&DispatchCtx::host_default(),
&rig.scoped,
- &rig.secrets,
+ rig.scoped.secrets().as_ref(),
legacy.path(),
)
.await
@@ -149,7 +142,7 @@ async fn the_import_runs_once_and_never_resurrects_a_deleted_server() {
import_into(
&DispatchCtx::host_default(),
&rig.scoped,
- &rig.secrets,
+ rig.scoped.secrets().as_ref(),
legacy.path(),
)
.await
@@ -163,7 +156,7 @@ async fn the_import_runs_once_and_never_resurrects_a_deleted_server() {
let again = import_into(
&DispatchCtx::host_default(),
&rig.scoped,
- &rig.secrets,
+ rig.scoped.secrets().as_ref(),
legacy.path(),
)
.await
@@ -214,7 +207,8 @@ async fn a_record_the_module_already_wrote_is_not_overwritten() {
)
.await
.unwrap();
- rig.secrets
+ rig.scoped
+ .secrets()
.set("mcp_client_env/srv-1", b"{\"API_KEY\":\"rotated\"}")
.await
.unwrap();
@@ -222,7 +216,7 @@ async fn a_record_the_module_already_wrote_is_not_overwritten() {
let outcome = import_into(
&DispatchCtx::host_default(),
&rig.scoped,
- &rig.secrets,
+ rig.scoped.secrets().as_ref(),
legacy.path(),
)
.await
@@ -238,7 +232,8 @@ async fn a_record_the_module_already_wrote_is_not_overwritten() {
let kept = docs.get(SERVERS, "srv-1").await.unwrap().unwrap();
assert_eq!(kept.doc["newer"], true);
let secret = rig
- .secrets
+ .scoped
+ .secrets()
.get("mcp_client_env/srv-1")
.await
.unwrap()
@@ -254,7 +249,7 @@ async fn a_data_dir_with_no_legacy_files_is_a_no_op() {
import_into(
&DispatchCtx::host_default(),
&rig.scoped,
- &rig.secrets,
+ rig.scoped.secrets().as_ref(),
empty.path()
)
.await
@@ -277,7 +272,7 @@ async fn an_unreadable_file_writes_no_marker_so_the_next_start_retries() {
assert!(import_into(
&DispatchCtx::host_default(),
&rig.scoped,
- &rig.secrets,
+ rig.scoped.secrets().as_ref(),
dir.path()
)
.await