From 22d136d1ea2ac438cfa0eebcafa733f153ffb861 Mon Sep 17 00:00:00 2001
From: Ryan Levick <ryan.levick@fermyon.com>
Date: Fri, 23 Aug 2024 10:55:02 +0200
Subject: [PATCH] It's just trigger and http-trigger - no 2 for you

Signed-off-by: Ryan Levick <ryan.levick@fermyon.com>
---
 Cargo.lock                                    | 84 +++++++++----------
 Cargo.toml                                    | 10 +--
 .../Cargo.toml                                | 10 +--
 .../src/headers.rs                            |  0
 .../src/instrument.rs                         |  0
 .../src/lib.rs                                |  6 +-
 .../src/outbound_http.rs                      |  0
 .../src/server.rs                             |  0
 .../src/spin.rs                               |  0
 .../src/tls.rs                                |  0
 .../src/wagi.rs                               |  0
 .../src/wasi.rs                               |  0
 .../testdata/invalid-cert.pem                 |  0
 .../testdata/invalid-private-key.pem          |  0
 .../testdata/valid-cert.pem                   |  0
 .../testdata/valid-private-key.pem            |  0
 crates/trigger-redis/Cargo.toml               |  2 +-
 crates/trigger-redis/src/lib.rs               |  4 +-
 crates/{trigger2 => trigger}/Cargo.toml       |  2 +-
 crates/{trigger2 => trigger}/src/cli.rs       |  0
 .../src/cli/launch_metadata.rs                |  0
 crates/{trigger2 => trigger}/src/factors.rs   |  0
 crates/{trigger2 => trigger}/src/lib.rs       |  0
 crates/{trigger2 => trigger}/src/stdio.rs     |  0
 run-factors-tests.sh                          |  2 +-
 src/bin/spin.rs                               |  6 +-
 src/commands/up.rs                            |  2 +-
 tests/testing-framework/Cargo.toml            |  4 +-
 .../src/runtimes/in_process_spin.rs           |  4 +-
 29 files changed, 68 insertions(+), 68 deletions(-)
 rename crates/{trigger-http2 => trigger-http}/Cargo.toml (88%)
 rename crates/{trigger-http2 => trigger-http}/src/headers.rs (100%)
 rename crates/{trigger-http2 => trigger-http}/src/instrument.rs (100%)
 rename crates/{trigger-http2 => trigger-http}/src/lib.rs (96%)
 rename crates/{trigger-http2 => trigger-http}/src/outbound_http.rs (100%)
 rename crates/{trigger-http2 => trigger-http}/src/server.rs (100%)
 rename crates/{trigger-http2 => trigger-http}/src/spin.rs (100%)
 rename crates/{trigger-http2 => trigger-http}/src/tls.rs (100%)
 rename crates/{trigger-http2 => trigger-http}/src/wagi.rs (100%)
 rename crates/{trigger-http2 => trigger-http}/src/wasi.rs (100%)
 rename crates/{trigger-http2 => trigger-http}/testdata/invalid-cert.pem (100%)
 rename crates/{trigger-http2 => trigger-http}/testdata/invalid-private-key.pem (100%)
 rename crates/{trigger-http2 => trigger-http}/testdata/valid-cert.pem (100%)
 rename crates/{trigger-http2 => trigger-http}/testdata/valid-private-key.pem (100%)
 rename crates/{trigger2 => trigger}/Cargo.toml (98%)
 rename crates/{trigger2 => trigger}/src/cli.rs (100%)
 rename crates/{trigger2 => trigger}/src/cli/launch_metadata.rs (100%)
 rename crates/{trigger2 => trigger}/src/factors.rs (100%)
 rename crates/{trigger2 => trigger}/src/lib.rs (100%)
 rename crates/{trigger2 => trigger}/src/stdio.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index b5da52fe9..52fa76a10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7236,9 +7236,9 @@ dependencies = [
  "spin-plugins",
  "spin-telemetry",
  "spin-templates",
- "spin-trigger-http2",
+ "spin-trigger",
+ "spin-trigger-http",
  "spin-trigger-redis",
- "spin-trigger2",
  "subprocess",
  "tempfile",
  "terminal",
@@ -8043,7 +8043,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "spin-trigger-http2"
+name = "spin-trigger"
+version = "2.8.0-pre0"
+dependencies = [
+ "anyhow",
+ "clap 3.2.25",
+ "ctrlc",
+ "futures",
+ "sanitize-filename",
+ "serde 1.0.197",
+ "serde_json",
+ "spin-app",
+ "spin-common",
+ "spin-componentize",
+ "spin-core",
+ "spin-factor-key-value",
+ "spin-factor-llm",
+ "spin-factor-outbound-http",
+ "spin-factor-outbound-mqtt",
+ "spin-factor-outbound-mysql",
+ "spin-factor-outbound-networking",
+ "spin-factor-outbound-pg",
+ "spin-factor-outbound-redis",
+ "spin-factor-sqlite",
+ "spin-factor-variables",
+ "spin-factor-wasi",
+ "spin-factors",
+ "spin-factors-executor",
+ "spin-runtime-config",
+ "spin-telemetry",
+ "terminal",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "spin-trigger-http"
 version = "2.8.0-pre0"
 dependencies = [
  "anyhow",
@@ -8069,7 +8104,7 @@ dependencies = [
  "spin-http",
  "spin-outbound-networking",
  "spin-telemetry",
- "spin-trigger2",
+ "spin-trigger",
  "spin-world",
  "terminal",
  "tls-listener",
@@ -8094,47 +8129,12 @@ dependencies = [
  "serde 1.0.197",
  "spin-factor-variables",
  "spin-telemetry",
- "spin-trigger2",
+ "spin-trigger",
  "spin-world",
  "tokio",
  "tracing",
 ]
 
-[[package]]
-name = "spin-trigger2"
-version = "2.8.0-pre0"
-dependencies = [
- "anyhow",
- "clap 3.2.25",
- "ctrlc",
- "futures",
- "sanitize-filename",
- "serde 1.0.197",
- "serde_json",
- "spin-app",
- "spin-common",
- "spin-componentize",
- "spin-core",
- "spin-factor-key-value",
- "spin-factor-llm",
- "spin-factor-outbound-http",
- "spin-factor-outbound-mqtt",
- "spin-factor-outbound-mysql",
- "spin-factor-outbound-networking",
- "spin-factor-outbound-pg",
- "spin-factor-outbound-redis",
- "spin-factor-sqlite",
- "spin-factor-variables",
- "spin-factor-wasi",
- "spin-factors",
- "spin-factors-executor",
- "spin-runtime-config",
- "spin-telemetry",
- "terminal",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "spin-world"
 version = "2.8.0-pre0"
@@ -8483,8 +8483,8 @@ dependencies = [
  "spin-factors-executor",
  "spin-http",
  "spin-loader",
- "spin-trigger-http2",
- "spin-trigger2",
+ "spin-trigger",
+ "spin-trigger-http",
  "temp-dir",
  "test-environment",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index 664d92b06..089e4f1af 100644
--- a/Cargo.toml
+++ b/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 = [
diff --git a/crates/trigger-http2/Cargo.toml b/crates/trigger-http/Cargo.toml
similarity index 88%
rename from crates/trigger-http2/Cargo.toml
rename to crates/trigger-http/Cargo.toml
index d79b7b520..65030acc6 100644
--- a/crates/trigger-http2/Cargo.toml
+++ b/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"] }
diff --git a/crates/trigger-http2/src/headers.rs b/crates/trigger-http/src/headers.rs
similarity index 100%
rename from crates/trigger-http2/src/headers.rs
rename to crates/trigger-http/src/headers.rs
diff --git a/crates/trigger-http2/src/instrument.rs b/crates/trigger-http/src/instrument.rs
similarity index 100%
rename from crates/trigger-http2/src/instrument.rs
rename to crates/trigger-http/src/instrument.rs
diff --git a/crates/trigger-http2/src/lib.rs b/crates/trigger-http/src/lib.rs
similarity index 96%
rename from crates/trigger-http2/src/lib.rs
rename to crates/trigger-http/src/lib.rs
index 705c522f2..636bff940 100644
--- a/crates/trigger-http2/src/lib.rs
+++ b/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 {
diff --git a/crates/trigger-http2/src/outbound_http.rs b/crates/trigger-http/src/outbound_http.rs
similarity index 100%
rename from crates/trigger-http2/src/outbound_http.rs
rename to crates/trigger-http/src/outbound_http.rs
diff --git a/crates/trigger-http2/src/server.rs b/crates/trigger-http/src/server.rs
similarity index 100%
rename from crates/trigger-http2/src/server.rs
rename to crates/trigger-http/src/server.rs
diff --git a/crates/trigger-http2/src/spin.rs b/crates/trigger-http/src/spin.rs
similarity index 100%
rename from crates/trigger-http2/src/spin.rs
rename to crates/trigger-http/src/spin.rs
diff --git a/crates/trigger-http2/src/tls.rs b/crates/trigger-http/src/tls.rs
similarity index 100%
rename from crates/trigger-http2/src/tls.rs
rename to crates/trigger-http/src/tls.rs
diff --git a/crates/trigger-http2/src/wagi.rs b/crates/trigger-http/src/wagi.rs
similarity index 100%
rename from crates/trigger-http2/src/wagi.rs
rename to crates/trigger-http/src/wagi.rs
diff --git a/crates/trigger-http2/src/wasi.rs b/crates/trigger-http/src/wasi.rs
similarity index 100%
rename from crates/trigger-http2/src/wasi.rs
rename to crates/trigger-http/src/wasi.rs
diff --git a/crates/trigger-http2/testdata/invalid-cert.pem b/crates/trigger-http/testdata/invalid-cert.pem
similarity index 100%
rename from crates/trigger-http2/testdata/invalid-cert.pem
rename to crates/trigger-http/testdata/invalid-cert.pem
diff --git a/crates/trigger-http2/testdata/invalid-private-key.pem b/crates/trigger-http/testdata/invalid-private-key.pem
similarity index 100%
rename from crates/trigger-http2/testdata/invalid-private-key.pem
rename to crates/trigger-http/testdata/invalid-private-key.pem
diff --git a/crates/trigger-http2/testdata/valid-cert.pem b/crates/trigger-http/testdata/valid-cert.pem
similarity index 100%
rename from crates/trigger-http2/testdata/valid-cert.pem
rename to crates/trigger-http/testdata/valid-cert.pem
diff --git a/crates/trigger-http2/testdata/valid-private-key.pem b/crates/trigger-http/testdata/valid-private-key.pem
similarity index 100%
rename from crates/trigger-http2/testdata/valid-private-key.pem
rename to crates/trigger-http/testdata/valid-private-key.pem
diff --git a/crates/trigger-redis/Cargo.toml b/crates/trigger-redis/Cargo.toml
index c2cba3a57..0ace95427 100644
--- a/crates/trigger-redis/Cargo.toml
+++ b/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 }
diff --git a/crates/trigger-redis/src/lib.rs b/crates/trigger-redis/src/lib.rs
index d0d3fbbda..5932b8939 100644
--- a/crates/trigger-redis/src/lib.rs
+++ b/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>()
diff --git a/crates/trigger2/Cargo.toml b/crates/trigger/Cargo.toml
similarity index 98%
rename from crates/trigger2/Cargo.toml
rename to crates/trigger/Cargo.toml
index 565ee436b..733a33530 100644
--- a/crates/trigger2/Cargo.toml
+++ b/crates/trigger/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "spin-trigger2"
+name = "spin-trigger"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
diff --git a/crates/trigger2/src/cli.rs b/crates/trigger/src/cli.rs
similarity index 100%
rename from crates/trigger2/src/cli.rs
rename to crates/trigger/src/cli.rs
diff --git a/crates/trigger2/src/cli/launch_metadata.rs b/crates/trigger/src/cli/launch_metadata.rs
similarity index 100%
rename from crates/trigger2/src/cli/launch_metadata.rs
rename to crates/trigger/src/cli/launch_metadata.rs
diff --git a/crates/trigger2/src/factors.rs b/crates/trigger/src/factors.rs
similarity index 100%
rename from crates/trigger2/src/factors.rs
rename to crates/trigger/src/factors.rs
diff --git a/crates/trigger2/src/lib.rs b/crates/trigger/src/lib.rs
similarity index 100%
rename from crates/trigger2/src/lib.rs
rename to crates/trigger/src/lib.rs
diff --git a/crates/trigger2/src/stdio.rs b/crates/trigger/src/stdio.rs
similarity index 100%
rename from crates/trigger2/src/stdio.rs
rename to crates/trigger/src/stdio.rs
diff --git a/run-factors-tests.sh b/run-factors-tests.sh
index 3b9ca4e42..26fe7b4b7 100755
--- a/run-factors-tests.sh
+++ b/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
diff --git a/src/bin/spin.rs b/src/bin/spin.rs
index 3cce1b3ca..0834f1380 100644
--- a/src/bin/spin.rs
+++ b/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]
diff --git a/src/commands/up.rs b/src/commands/up.rs
index 1b8afd106..87f5d61cf 100644
--- a/src/commands/up.rs
+++ b/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::*;
diff --git a/tests/testing-framework/Cargo.toml b/tests/testing-framework/Cargo.toml
index 2118f93b3..8448faaef 100644
--- a/tests/testing-framework/Cargo.toml
+++ b/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 }
diff --git a/tests/testing-framework/src/runtimes/in_process_spin.rs b/tests/testing-framework/src/runtimes/in_process_spin.rs
index 7580842a2..35a8ce9af 100644
--- a/tests/testing-framework/src/runtimes/in_process_spin.rs
+++ b/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,