Merge pull request #2751 from fermyon/no-more-2

Cargo.toml

@@ -62,8 +62,8 @@ spin-telemetry = { path = "crates/telemetry", features = [
   "tracing-log-compat",
 ] }
 spin-templates = { path = "crates/templates" }
-spin-trigger2 = { path = "crates/trigger2" }
-spin-trigger-http2 = { path = "crates/trigger-http2" }
+spin-trigger = { path = "crates/trigger" }
+spin-trigger-http = { path = "crates/trigger-http" }
 spin-trigger-redis = { path = "crates/trigger-redis" }
 
 tempfile = "3.8.0"
@@ -113,9 +113,9 @@ wit-component = "0.19.0"
 # TODO(factors): default = ["llm"]
 all-tests = ["extern-dependencies-tests"]
 extern-dependencies-tests = []
-llm = ["spin-trigger-http2/llm"]
-llm-metal = ["llm", "spin-trigger-http2/llm-metal"]
-llm-cublas = ["llm", "spin-trigger-http2/llm-cublas"]
+llm = ["spin-trigger-http/llm"]
+llm-metal = ["llm", "spin-trigger-http/llm-metal"]
+llm-cublas = ["llm", "spin-trigger-http/llm-cublas"]
 
 [workspace]
 members = [

crates/trigger-http2/Cargo.toml → crates/trigger-http/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "spin-trigger-http2"
+name = "spin-trigger-http"
 version = { workspace = true }
 authors = { workspace = true }
 edition = { workspace = true }
@@ -8,9 +8,9 @@ edition = { workspace = true }
 doctest = false
 
 [features]
-llm = ["spin-trigger2/llm"]
-llm-metal = ["spin-trigger2/llm-metal"]
-llm-cublas = ["spin-trigger2/llm-cublas"]
+llm = ["spin-trigger/llm"]
+llm-metal = ["spin-trigger/llm-metal"]
+llm-cublas = ["spin-trigger/llm-cublas"]
 
 [dependencies]
 anyhow = "1.0"
@@ -36,7 +36,7 @@ spin-factor-wasi = { path = "../factor-wasi" }
 spin-http = { path = "../http" }
 spin-outbound-networking = { path = "../outbound-networking" }
 spin-telemetry = { path = "../telemetry" }
-spin-trigger2 = { path = "../trigger2" }
+spin-trigger = { path = "../trigger" }
 spin-world = { path = "../world" }
 terminal = { path = "../terminal" }
 tls-listener = { version = "0.10.0", features = ["rustls"] }

crates/trigger-http2/src/lib.rs → crates/trigger-http/src/lib.rs

@@ -20,7 +20,7 @@ use anyhow::{bail, Context};
 use clap::Args;
 use serde::Deserialize;
 use spin_app::App;
-use spin_trigger2::Trigger;
+use spin_trigger::Trigger;
 use wasmtime_wasi_http::bindings::wasi::http::types::ErrorCode;
 
 pub use server::HttpServer;
@@ -29,8 +29,8 @@ pub use tls::TlsConfig;
 
 pub(crate) use wasmtime_wasi_http::body::HyperIncomingBody as Body;
 
-pub(crate) type TriggerApp = spin_trigger2::TriggerApp<HttpTrigger>;
-pub(crate) type TriggerInstanceBuilder<'a> = spin_trigger2::TriggerInstanceBuilder<'a, HttpTrigger>;
+pub(crate) type TriggerApp = spin_trigger::TriggerApp<HttpTrigger>;
+pub(crate) type TriggerInstanceBuilder<'a> = spin_trigger::TriggerInstanceBuilder<'a, HttpTrigger>;
 
 #[derive(Args)]
 pub struct CliArgs {

crates/trigger-redis/Cargo.toml

@@ -14,7 +14,7 @@ futures = "0.3"
 serde = "1.0.188"
 spin-factor-variables = { path = "../factor-variables" }
 spin-telemetry = { path = "../telemetry" }
-spin-trigger2 = { path = "../trigger2" }
+spin-trigger = { path = "../trigger" }
 spin-world = { path = "../world" }
 redis = { version = "0.26.1", features = ["tokio-comp"] }
 tracing = { workspace = true }

crates/trigger-redis/src/lib.rs

@@ -5,7 +5,7 @@ use futures::{StreamExt, TryFutureExt};
 use redis::{Client, Msg};
 use serde::Deserialize;
 use spin_factor_variables::VariablesFactor;
-use spin_trigger2::{cli::NoCliArgs, App, Trigger, TriggerApp};
+use spin_trigger::{cli::NoCliArgs, App, Trigger, TriggerApp};
 use spin_world::exports::fermyon::spin::inbound_redis;
 use tracing::{instrument, Level};
 
@@ -41,7 +41,7 @@ impl Trigger for RedisTrigger {
         Ok(Self)
     }
 
-    async fn run(self, trigger_app: spin_trigger2::TriggerApp<Self>) -> anyhow::Result<()> {
+    async fn run(self, trigger_app: spin_trigger::TriggerApp<Self>) -> anyhow::Result<()> {
         let app_variables = trigger_app
             .configured_app()
             .app_state::<VariablesFactor>()

crates/trigger2/Cargo.toml → crates/trigger/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "spin-trigger2"
+name = "spin-trigger"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true

run-factors-tests.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 # TODO(factors): Remove after enabling CI for factors branch
 
-cargo test -p '*factor*' -p spin-trigger2 -p spin-trigger-http2
+cargo test -p '*factor*' -p spin-trigger -p spin-trigger-http

src/bin/spin.rs

@@ -15,9 +15,9 @@ use spin_cli::commands::{
     watch::WatchCommand,
 };
 use spin_cli::{build_info::*, subprocess::ExitStatusError};
-use spin_trigger2::cli::help::HelpArgsOnlyTrigger;
-use spin_trigger2::cli::FactorsTriggerCommand;
-use spin_trigger_http2::HttpTrigger;
+use spin_trigger::cli::help::HelpArgsOnlyTrigger;
+use spin_trigger::cli::FactorsTriggerCommand;
+use spin_trigger_http::HttpTrigger;
 use spin_trigger_redis::RedisTrigger;
 
 #[tokio::main]

src/commands/up.rs

@@ -15,7 +15,7 @@ use spin_app::locked::LockedApp;
 use spin_common::ui::quoted_path;
 use spin_loader::FilesMountStrategy;
 use spin_oci::OciLoader;
-use spin_trigger2::cli::{LaunchMetadata, SPIN_LOCAL_APP_DIR, SPIN_LOCKED_URL, SPIN_WORKING_DIR};
+use spin_trigger::cli::{LaunchMetadata, SPIN_LOCAL_APP_DIR, SPIN_LOCKED_URL, SPIN_WORKING_DIR};
 use tempfile::TempDir;
 
 use crate::opts::*;

tests/testing-framework/Cargo.toml

@@ -18,8 +18,8 @@ spin-app = { path = "../../crates/app" }
 spin-factors-executor = { path = "../../crates/factors-executor" }
 spin-http = { path = "../../crates/http" }
 spin-loader = { path = "../../crates/loader" }
-spin-trigger2 = { path = "../../crates/trigger2" }
-spin-trigger-http2 = { path = "../../crates/trigger-http2" }
+spin-trigger = { path = "../../crates/trigger" }
+spin-trigger-http = { path = "../../crates/trigger-http" }
 toml = "0.8.6"
 tokio = "1.23"
 wasmtime-wasi-http = { workspace = true }

tests/testing-framework/src/runtimes/in_process_spin.rs

@@ -3,8 +3,8 @@
 use std::{path::PathBuf, sync::Arc};
 
 use anyhow::Context as _;
-use spin_trigger2::cli::{TriggerAppBuilder, TriggerAppOptions};
-use spin_trigger_http2::{HttpServer, HttpTrigger};
+use spin_trigger::cli::{TriggerAppBuilder, TriggerAppOptions};
+use spin_trigger_http::{HttpServer, HttpTrigger};
 use test_environment::{
     http::{Request, Response},
     services::ServicesConfig,