Merge pull request #750 from lann/simplify-config

Simplify spin-config implementation

Author: lann

Cargo.lock

@@ -6,7 +6,10 @@ authors = [ "Fermyon Engineering <engineering@fermyon.com>" ]
 
 [dependencies]
 anyhow = "1.0"
+async-trait = "0.1"
 serde = { version = "1.0", features = [ "derive" ] }
+spin-engine = { path = "../engine" }
+spin-manifest = { path = "../manifest" }
 thiserror = "1"
 tokio = { version = "1", features = [ "rt-multi-thread" ] }
 

crates/config/Cargo.toml

@@ -1,39 +1,56 @@
 use std::sync::Arc;
 
-use crate::{Error, Key, Resolver, TreePath};
+use spin_engine::host_component::HostComponent;
+use spin_manifest::CoreComponent;
+use wit_bindgen_wasmtime::async_trait;
+
+use crate::{Error, Key, Resolver};
 
 mod wit {
     wit_bindgen_wasmtime::export!({paths: ["../../wit/ephemeral/spin-config.wit"], async: *});
 }
-pub use wit::spin_config::add_to_linker;
-use wit_bindgen_wasmtime::async_trait;
 
-/// A component configuration interface implementation.
-pub struct ComponentConfig {
-    component_root: TreePath,
+pub struct ConfigHostComponent {
     resolver: Arc<Resolver>,
 }
 
-impl ComponentConfig {
-    pub fn new(component_id: impl Into<String>, resolver: Arc<Resolver>) -> crate::Result<Self> {
-        let component_root = TreePath::new(component_id).or_else(|_| {
-            // Temporary mitigation for https://github.com/fermyon/spin/issues/337
-            TreePath::new("invalid.path.issue_337")
-        })?;
-        Ok(Self {
-            component_root,
-            resolver,
+impl ConfigHostComponent {
+    pub fn new(resolver: Resolver) -> Self {
+        Self {
+            resolver: Arc::new(resolver),
+        }
+    }
+}
+
+impl HostComponent for ConfigHostComponent {
+    type State = ComponentConfig;
+
+    fn add_to_linker<T: Send>(
+        linker: &mut wit_bindgen_wasmtime::wasmtime::Linker<spin_engine::RuntimeContext<T>>,
+        state_handle: spin_engine::host_component::HostComponentsStateHandle<Self::State>,
+    ) -> anyhow::Result<()> {
+        wit::spin_config::add_to_linker(linker, move |ctx| state_handle.get_mut(ctx))
+    }
+
+    fn build_state(&self, component: &CoreComponent) -> anyhow::Result<Self::State> {
+        Ok(ComponentConfig {
+            component_id: component.id.clone(),
+            resolver: self.resolver.clone(),
         })
     }
 }
 
+/// A component configuration interface implementation.
+pub struct ComponentConfig {
+    component_id: String,
+    resolver: Arc<Resolver>,
+}
+
 #[async_trait]
 impl wit::spin_config::SpinConfig for ComponentConfig {
     async fn get_config(&mut self, key: &str) -> Result<String, wit::spin_config::Error> {
         let key = Key::new(key)?;
-        let path = &self.component_root + key;
-        // TODO(lann): Make resolve async
-        tokio::task::block_in_place(|| Ok(self.resolver.resolve(&path)?))
+        Ok(self.resolver.resolve(&self.component_id, key).await?)
     }
 }