Merge pull request #1876 from fermyon/share-host-components

No need for 'legacy host components

Author: rylev

crates/key-value/src/host_component.rs

@@ -47,7 +47,8 @@ impl HostComponent for KeyValueComponent {
         linker: &mut spin_core::Linker<T>,
         get: impl Fn(&mut spin_core::Data<T>) -> &mut Self::Data + Send + Sync + Copy + 'static,
     ) -> anyhow::Result<()> {
-        super::key_value::add_to_linker(linker, get)
+        super::key_value::add_to_linker(linker, get)?;
+        spin_world::v1::key_value::add_to_linker(linker, get)
     }
 
     fn build_data(&self) -> Self::Data {
@@ -102,36 +103,3 @@ impl DynamicHostComponent for KeyValueComponent {
         }
     }
 }
-
-pub struct LegacyKeyValueComponent(KeyValueComponent);
-
-impl LegacyKeyValueComponent {
-    pub fn new(new: KeyValueComponent) -> Self {
-        Self(new)
-    }
-}
-
-impl HostComponent for LegacyKeyValueComponent {
-    type Data = KeyValueDispatch;
-
-    fn add_to_linker<T: Send>(
-        linker: &mut spin_core::Linker<T>,
-        get: impl Fn(&mut spin_core::Data<T>) -> &mut Self::Data + Send + Sync + Copy + 'static,
-    ) -> anyhow::Result<()> {
-        spin_world::v1::key_value::add_to_linker(linker, get)
-    }
-
-    fn build_data(&self) -> Self::Data {
-        self.0.build_data()
-    }
-}
-
-impl DynamicHostComponent for LegacyKeyValueComponent {
-    fn update_data(&self, data: &mut Self::Data, component: &AppComponent) -> anyhow::Result<()> {
-        self.0.update_data(data, component)
-    }
-
-    fn validate_app(&self, app: &spin_app::App) -> anyhow::Result<()> {
-        self.0.validate_app(app)
-    }
-}

crates/key-value/src/lib.rs

@@ -9,7 +9,7 @@ mod host_component;
 pub mod table;
 mod util;
 
-pub use host_component::{manager, KeyValueComponent, LegacyKeyValueComponent};
+pub use host_component::{manager, KeyValueComponent};
 pub use util::{CachingStoreManager, DelegatingStoreManager, EmptyStoreManager};
 
 pub const KEY_VALUE_STORES_KEY: MetadataKey<Vec<String>> = MetadataKey::new("key_value_stores");

crates/sqlite/src/host_component.rs

@@ -31,7 +31,8 @@ impl HostComponent for SqliteComponent {
         linker: &mut spin_core::Linker<T>,
         get: impl Fn(&mut spin_core::Data<T>) -> &mut Self::Data + Send + Sync + Copy + 'static,
     ) -> anyhow::Result<()> {
-        sqlite::add_to_linker(linker, get)
+        sqlite::add_to_linker(linker, get)?;
+        spin_world::v1::sqlite::add_to_linker(linker, get)
     }
 
     fn build_data(&self) -> Self::Data {
@@ -98,36 +99,3 @@ impl DynamicHostComponent for SqliteComponent {
         }
     }
 }
-
-pub struct LegacySqliteComponent(SqliteComponent);
-
-impl LegacySqliteComponent {
-    pub fn new(new: SqliteComponent) -> Self {
-        Self(new)
-    }
-}
-
-impl HostComponent for LegacySqliteComponent {
-    type Data = super::SqliteDispatch;
-
-    fn add_to_linker<T: Send>(
-        linker: &mut spin_core::Linker<T>,
-        get: impl Fn(&mut spin_core::Data<T>) -> &mut Self::Data + Send + Sync + Copy + 'static,
-    ) -> anyhow::Result<()> {
-        spin_world::v1::sqlite::add_to_linker(linker, get)
-    }
-
-    fn build_data(&self) -> Self::Data {
-        self.0.build_data()
-    }
-}
-
-impl DynamicHostComponent for LegacySqliteComponent {
-    fn update_data(&self, data: &mut Self::Data, component: &AppComponent) -> anyhow::Result<()> {
-        self.0.update_data(data, component)
-    }
-
-    fn validate_app(&self, app: &spin_app::App) -> anyhow::Result<()> {
-        self.0.validate_app(app)
-    }
-}

crates/sqlite/src/lib.rs

@@ -6,7 +6,7 @@ use spin_key_value::table;
 use spin_world::v2::sqlite;
 use std::{collections::HashSet, sync::Arc};
 
-pub use host_component::{LegacySqliteComponent, SqliteComponent};
+pub use host_component::SqliteComponent;
 
 pub const DATABASES_KEY: MetadataKey<HashSet<String>> = MetadataKey::new("databases");
 

crates/trigger/src/lib.rs

@@ -128,23 +128,11 @@ impl<Executor: TriggerExecutor> TriggerExecutorBuilder<Executor> {
                     )
                     .await?,
                 )?;
-                self.loader.add_dynamic_host_component(
-                    &mut builder,
-                    runtime_config::key_value::build_legacy_key_value_component(
-                        &runtime_config,
-                        &init_data.kv,
-                    )
-                    .await?,
-                )?;
                 self.loader.add_dynamic_host_component(
                     &mut builder,
                     runtime_config::sqlite::build_component(&runtime_config, &init_data.sqlite)
                         .await?,
                 )?;
-                self.loader.add_dynamic_host_component(
-                    &mut builder,
-                    runtime_config::sqlite::build_legacy_component(&runtime_config).await?,
-                )?;
                 self.loader.add_dynamic_host_component(
                     &mut builder,
                     outbound_http::OutboundHttpComponent,

crates/trigger/src/runtime_config/key_value.rs

@@ -4,8 +4,8 @@ use crate::{runtime_config::RuntimeConfig, TriggerHooks};
 use anyhow::{bail, Context, Result};
 use serde::Deserialize;
 use spin_key_value::{
-    CachingStoreManager, DelegatingStoreManager, KeyValueComponent, LegacyKeyValueComponent,
-    StoreManager, KEY_VALUE_STORES_KEY,
+    CachingStoreManager, DelegatingStoreManager, KeyValueComponent, StoreManager,
+    KEY_VALUE_STORES_KEY,
 };
 use spin_key_value_azure::KeyValueAzureCosmos;
 use spin_key_value_sqlite::{DatabaseLocation, KeyValueSqlite};
@@ -54,14 +54,6 @@ pub async fn build_key_value_component(
     })))
 }
 
-pub async fn build_legacy_key_value_component(
-    runtime_config: &RuntimeConfig,
-    init_data: &[(String, String)],
-) -> Result<LegacyKeyValueComponent> {
-    let new = build_key_value_component(runtime_config, init_data).await?;
-    Ok(LegacyKeyValueComponent::new(new))
-}
-
 // Holds deserialized options from a `[key_value_store.<name>]` runtime config section.
 #[derive(Clone, Debug, Deserialize)]
 #[serde(rename_all = "snake_case", tag = "type")]

crates/trigger/src/runtime_config/sqlite.rs

@@ -2,9 +2,7 @@ use std::{collections::HashMap, path::PathBuf, sync::Arc};
 
 use crate::{runtime_config::RuntimeConfig, TriggerHooks};
 use anyhow::Context;
-use spin_sqlite::{
-    Connection, ConnectionsStore, LegacySqliteComponent, SqliteComponent, DATABASES_KEY,
-};
+use spin_sqlite::{Connection, ConnectionsStore, SqliteComponent, DATABASES_KEY};
 
 use super::RuntimeConfigOpts;
 
@@ -25,13 +23,6 @@ pub(crate) async fn build_component(
     Ok(SqliteComponent::new(move |_| connections_store.clone()))
 }
 
-pub(crate) async fn build_legacy_component(
-    runtime_config: &RuntimeConfig,
-) -> anyhow::Result<LegacySqliteComponent> {
-    let component = build_component(runtime_config, &[]).await?;
-    Ok(LegacySqliteComponent::new(component))
-}
-
 /// A `ConnectionStore` based on a `HashMap`
 struct SimpleConnectionsStore(HashMap<String, Arc<dyn Connection>>);