Update codebase based on previous changes

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

Author: rylev

crates/factors-executor/src/lib.rs

@@ -315,7 +315,7 @@ mod tests {
         let executor = Arc::new(FactorsExecutor::new(engine_builder, env.factors)?);
 
         let factors_app = executor
-            .load_app(app, Default::default(), &mut DummyComponentLoader)
+            .load_app(app, Default::default(), &DummyComponentLoader)
             .await?;
 
         let mut instance_builder = factors_app.prepare("empty")?;

crates/trigger-http/src/wasi.rs

@@ -53,7 +53,7 @@ impl HttpExecutor for WasiHttpExecutor {
             }));
 
         let mut wasi_http = spin_factor_outbound_http::OutboundHttpFactor::get_wasi_http_impl(
-            store.data_mut().factors_instance_state(),
+            store.data_mut().factors_instance_state_mut(),
         )
         .context("missing OutboundHttpFactor")?;
 

crates/trigger/src/cli.rs

@@ -4,8 +4,8 @@ mod sqlite_statements;
 mod stdio;
 mod summary;
 
-use std::future::Future;
 use std::path::PathBuf;
+use std::{future::Future, sync::Arc};
 
 use anyhow::{Context, Result};
 use clap::{Args, IntoApp, Parser};
@@ -345,7 +345,7 @@ impl<T: Trigger<B::Factors>, B: RuntimeFactorsBuilder> TriggerAppBuilder<T, B> {
         #[async_trait]
         impl ComponentLoader for SimpleComponentLoader {
             async fn load_component(
-                &mut self,
+                &self,
                 engine: &spin_core::wasmtime::Engine,
                 component: &spin_factors::AppComponent,
             ) -> anyhow::Result<spin_core::Component> {
@@ -373,11 +373,12 @@ impl<T: Trigger<B::Factors>, B: RuntimeFactorsBuilder> TriggerAppBuilder<T, B> {
 
         let mut executor = FactorsExecutor::new(core_engine_builder, factors)?;
         B::configure_app(&mut executor, &runtime_config, &common_options, &options)?;
+        let executor = Arc::new(executor);
 
         let configured_app = {
             let _sloth_guard = warn_if_wasm_build_slothful();
             executor
-                .load_app(app, runtime_config.into(), SimpleComponentLoader)
+                .load_app(app, runtime_config.into(), &SimpleComponentLoader)
                 .await?
         };
 

crates/trigger/src/cli/initial_kv_setter.rs

@@ -20,7 +20,7 @@ const DEFAULT_KEY_VALUE_STORE_LABEL: &str = "default";
 #[async_trait]
 impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for InitialKvSetterHook {
     async fn configure_app(
-        &mut self,
+        &self,
         configured_app: &spin_factors::ConfiguredApp<F>,
     ) -> anyhow::Result<()> {
         if self.kv_pairs.is_empty() {

crates/trigger/src/cli/sqlite_statements.rs

@@ -31,6 +31,7 @@ impl SqlStatementExecutorHook {
         let get_database = |label| async move {
             sqlite
                 .get_connection(label)
+                .await
                 .transpose()
                 .with_context(|| format!("failed connect to database with label '{label}'"))
         };
@@ -70,7 +71,7 @@ where
     F: RuntimeFactors,
 {
     async fn configure_app(
-        &mut self,
+        &self,
         configured_app: &spin_factors::ConfiguredApp<F>,
     ) -> anyhow::Result<()> {
         let Some(sqlite) = configured_app.app_state::<SqliteFactor>().ok() else {
@@ -175,8 +176,13 @@ mod tests {
         }
     }
 
+    #[async_trait]
     impl ConnectionCreator for MockCreator {
-        fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error> {
+        async fn create_connection(
+            &self,
+            label: &str,
+        ) -> Result<Box<dyn Connection + 'static>, v2::Error> {
+            let _ = label;
             Ok(Box::new(MockConnection {
                 tx: self.tx.clone(),
             }))

crates/trigger/src/cli/stdio.rs

@@ -91,7 +91,7 @@ impl StdioLoggingExecutorHooks {
 #[async_trait]
 impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for StdioLoggingExecutorHooks {
     async fn configure_app(
-        &mut self,
+        &self,
         configured_app: &spin_factors::ConfiguredApp<F>,
     ) -> anyhow::Result<()> {
         self.validate_follows(configured_app.app())?;

crates/trigger/src/cli/summary.rs

@@ -10,7 +10,7 @@ pub struct KeyValueDefaultStoreSummaryHook;
 #[async_trait]
 impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for KeyValueDefaultStoreSummaryHook {
     async fn configure_app(
-        &mut self,
+        &self,
         configured_app: &spin_factors::ConfiguredApp<F>,
     ) -> anyhow::Result<()> {
         let Ok(kv_app_state) = configured_app.app_state::<KeyValueFactor>() else {
@@ -33,7 +33,7 @@ pub struct SqliteDefaultStoreSummaryHook;
 #[async_trait]
 impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for SqliteDefaultStoreSummaryHook {
     async fn configure_app(
-        &mut self,
+        &self,
         configured_app: &spin_factors::ConfiguredApp<F>,
     ) -> anyhow::Result<()> {
         let Ok(sqlite_app_state) = configured_app.app_state::<SqliteFactor>() else {
@@ -45,6 +45,7 @@ impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for SqliteDefaultStoreSummaryHook
         }
         if let Some(default_database_summary) = sqlite_app_state
             .get_connection("default")
+            .await
             .and_then(Result::ok)
             .and_then(|conn| conn.summary())
         {