PR feedback

Signed-off-by: Ryan Levick <[email protected]>

crates/factor-key-value/src/lib.rs

@@ -25,7 +25,7 @@ pub struct KeyValueFactor {
 impl KeyValueFactor {
     /// Create a new KeyValueFactor.  
     ///  
-    /// The `default_label_resolver` is used to resolver store managers for labels that
+    /// The `default_label_resolver` is used to resolve store managers for labels that
     /// are not defined in the runtime configuration.
     pub fn new(default_label_resolver: impl DefaultLabelResolver + 'static) -> Self {
         Self {

crates/factor-key-value/src/runtime_config.rs

@@ -8,7 +8,14 @@ use spin_key_value::StoreManager;
 #[derive(Default)]
 pub struct RuntimeConfig {
     /// Map of store names to store managers.
-    pub store_managers: HashMap<String, Arc<dyn StoreManager>>,
+    store_managers: HashMap<String, Arc<dyn StoreManager>>,
+}
+
+impl RuntimeConfig {
+    /// Adds a store manager for the store with the given label to the runtime configuration.
+    pub fn add_store_manager(&mut self, label: String, store_manager: Arc<dyn StoreManager>) {
+        self.store_managers.insert(label, store_manager);
+    }
 }
 
 impl IntoIterator for RuntimeConfig {

crates/factor-key-value/src/runtime_config/spin.rs

@@ -92,18 +92,14 @@ impl RuntimeConfigResolver {
         let Some(table) = table.as_ref().and_then(|t| t.get("key_value_store")) else {
             return Ok(None);
         };
-        let mut store_configs = HashMap::new();
-        for (label, config) in table
-            .as_table()
-            .context("expected a 'key_value_store' to contain toml table")?
-        {
-            let config: StoreConfig = config.clone().try_into()?;
+        let table: HashMap<String, StoreConfig> = table.clone().try_into()?;
+
+        let mut runtime_config = RuntimeConfig::default();
+        for (label, config) in table {
             let store_manager = self.store_manager_from_config(config)?;
-            store_configs.insert(label.clone(), store_manager);
+            runtime_config.add_store_manager(label.clone(), store_manager);
         }
-        Ok(Some(RuntimeConfig {
-            store_managers: store_configs,
-        }))
+        Ok(Some(runtime_config))
     }
 
     /// Given a [`StoreConfig`], returns a store manager.