Migrate outbound-pg to new core

Signed-off-by: Lann Martin <lann.martin@fermyon.com>

Author: lann

Cargo.lock

@@ -9,12 +9,10 @@ doctest = false
 [dependencies]
 anyhow = "1.0"
 postgres = { version = "0.19.3" }
-spin-engine = { path = "../engine" }
-spin-manifest = { path = "../manifest" }
+spin-core = { path = "../core" }
 tracing = { version = "0.1", features = [ "log" ] }
 
 [dependencies.wit-bindgen-wasmtime]
 git = "https://github.com/bytecodealliance/wit-bindgen"
 rev = "cb871cfa1ee460b51eb1d144b175b9aab9c50aba"
-features = ["async"]
-
+features = ["async"]

crates/outbound-pg/Cargo.toml

@@ -1,35 +1,27 @@
 use anyhow::anyhow;
-use outbound_pg::*;
 use postgres::{types::ToSql, types::Type, Client, NoTls, Row};
-
-pub use outbound_pg::add_to_linker;
-use spin_engine::{
-    host_component::{HostComponent, HostComponentsStateHandle},
-    RuntimeContext,
-};
-use wit_bindgen_wasmtime::{async_trait, wasmtime::Linker};
+use spin_core::HostComponent;
+use wit_bindgen_wasmtime::async_trait;
 
 wit_bindgen_wasmtime::export!({paths: ["../../wit/ephemeral/outbound-pg.wit"], async: *});
+use outbound_pg::{Column, DbDataType, DbValue, ParameterValue, PgError, RowSet};
 
 /// A simple implementation to support outbound pg connection
 #[derive(Default, Clone)]
 pub struct OutboundPg;
 
 impl HostComponent for OutboundPg {
-    type State = Self;
+    type Data = Self;
 
     fn add_to_linker<T: Send>(
-        linker: &mut Linker<RuntimeContext<T>>,
-        state_handle: HostComponentsStateHandle<Self::State>,
+        linker: &mut spin_core::Linker<T>,
+        get: impl Fn(&mut spin_core::Data<T>) -> &mut Self::Data + Send + Sync + Copy + 'static,
     ) -> anyhow::Result<()> {
-        add_to_linker(linker, move |ctx| state_handle.get_mut(ctx))
+        outbound_pg::add_to_linker(linker, get)
     }
 
-    fn build_state(
-        &self,
-        _component: &spin_manifest::CoreComponent,
-    ) -> anyhow::Result<Self::State> {
-        Ok(Self)
+    fn build_data(&self) -> Self::Data {
+        Default::default()
     }
 }
 

crates/outbound-pg/src/lib.rs

@@ -95,7 +95,7 @@ impl<Executor: TriggerExecutor> TriggerExecutorBuilder<Executor> {
             if !self.disable_default_host_components {
                 // FIXME(lann): migrate host components from prototype
                 // builder.add_host_component(outbound_redis::OutboundRedis::default())?;
-                // builder.add_host_component(outbound_pg::OutboundPg)?;
+                builder.add_host_component(outbound_pg::OutboundPg)?;
                 self.loader.add_dynamic_host_component(
                     &mut builder,
                     outbound_http::OutboundHttpComponent,

crates/trigger-new/src/lib.rs

@@ -129,6 +129,5 @@ pub fn add_default_host_components<T: Default + Send + 'static>(
     builder.add_host_component(outbound_redis::OutboundRedis {
         connections: Arc::new(RwLock::new(HashMap::new())),
     })?;
-    builder.add_host_component(outbound_pg::OutboundPg)?;
     Ok(())
 }