Fixing up some old copied KV language

Signed-off-by: itowlson <[email protected]>

Author: itowlson

crates/factor-blobstore/src/lib.rs

@@ -76,7 +76,7 @@ impl Factor for BlobStoreFactor {
             let (state, table) = get_data_with_table(data);
             BlobStoreDispatch::new(
                 state.allowed_containers.clone(),
-                state.store_manager.clone(),
+                state.container_manager.clone(),
                 table,
                 state.containers.clone(),
                 state.incoming_values.clone(),
@@ -97,12 +97,12 @@ impl Factor for BlobStoreFactor {
         &self,
         mut ctx: ConfigureAppContext<T, Self>,
     ) -> anyhow::Result<Self::AppState> {
-        let store_managers = ctx.take_runtime_config().unwrap_or_default();
+        let runtime_config = ctx.take_runtime_config().unwrap_or_default();
 
-        let delegating_manager = DelegatingContainerManager::new(store_managers);
+        let delegating_manager = DelegatingContainerManager::new(runtime_config);
         let container_manager = Arc::new(delegating_manager);
 
-        // Build component -> allowed stores map
+        // Build component -> allowed containers map
         let mut component_allowed_containers = HashMap::new();
         for component in ctx.app().components() {
             let component_id = component.id().to_string();
@@ -114,11 +114,11 @@ impl Factor for BlobStoreFactor {
             for label in &containers {
                 ensure!(
                     container_manager.is_defined(label),
-                    "unknown blob_stores label {label:?} for component {component_id:?}"
+                    "unknown {} label {label:?} for component {component_id:?}",
+                    BLOB_CONTAINERS_KEY.as_ref(),
                 );
             }
             component_allowed_containers.insert(component_id, containers);
-            // TODO: warn (?) on unused store?
         }
 
         Ok(AppState {
@@ -135,11 +135,11 @@ impl Factor for BlobStoreFactor {
         let allowed_containers = app_state
             .component_allowed_containers
             .get(ctx.app_component().id())
-            .expect("component should be in component_stores")
+            .expect("component should be in component_allowed_containers")
             .clone();
         let capacity = u32::MAX;
         Ok(InstanceBuilder {
-            store_manager: app_state.container_manager.clone(),
+            container_manager: app_state.container_manager.clone(),
             allowed_containers,
             containers: Arc::new(RwLock::new(Table::new(capacity))),
             incoming_values: Arc::new(RwLock::new(Table::new(capacity))),
@@ -161,7 +161,7 @@ pub struct AppState {
 
 pub struct InstanceBuilder {
     /// The container manager for the app. This contains *all* container mappings.
-    store_manager: Arc<DelegatingContainerManager>,
+    container_manager: Arc<DelegatingContainerManager>,
     /// The allowed containers for this component instance.
     allowed_containers: HashSet<String>,
     /// There are multiple WASI interfaces in play here. The factor adds each of them

crates/factor-blobstore/src/runtime_config.rs

@@ -4,7 +4,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use crate::ContainerManager;
 
-/// Runtime configuration for all key value stores.
+/// Runtime configuration for all blob containers.
 #[derive(Default, Clone)]
 pub struct RuntimeConfig {
     /// Map of container names to container managers.
@@ -23,7 +23,7 @@ impl RuntimeConfig {
         self.container_managers.insert(label, container_manager);
     }
 
-    /// Returns whether a container manager exists for the store with the given label.
+    /// Returns whether a container manager exists for the given label.
     pub fn has_container_manager(&self, label: &str) -> bool {
         self.container_managers.contains_key(label)
     }

crates/factor-blobstore/src/util.rs

@@ -2,7 +2,7 @@ use crate::{Container, ContainerManager, Error};
 use spin_core::async_trait;
 use std::{collections::HashMap, sync::Arc};
 
-/// A [`ContainerManager`] which delegates to other `ContainerManager`s based on the store label.
+/// A [`ContainerManager`] which delegates to other `ContainerManager`s based on the label.
 pub struct DelegatingContainerManager {
     delegates: HashMap<String, Arc<dyn ContainerManager>>,
 }
@@ -18,12 +18,12 @@ impl DelegatingContainerManager {
 impl ContainerManager for DelegatingContainerManager {
     async fn get(&self, name: &str) -> Result<Arc<dyn Container>, Error> {
         match self.delegates.get(name) {
-            Some(store) => store.get(name).await,
+            Some(cm) => cm.get(name).await,
             None => Err("no such container".to_string()),
         }
     }
 
-    fn is_defined(&self, store_name: &str) -> bool {
-        self.delegates.contains_key(store_name)
+    fn is_defined(&self, label: &str) -> bool {
+        self.delegates.contains_key(label)
     }
 }