From 92d346121a37b4228d14b653afaae46b581b0468 Mon Sep 17 00:00:00 2001
From: Ryan Levick <ryan.levick@fermyon.com>
Date: Tue, 24 Sep 2024 19:07:36 +0200
Subject: [PATCH] Fix CI issues

Signed-off-by: Ryan Levick <ryan.levick@fermyon.com>
---
 Cargo.lock                          |  2 +-
 conformance-tests/Cargo.toml        |  2 +-
 conformance-tests/src/main.rs       | 10 +++++-----
 containerd-shim-spin/src/engine.rs  | 13 ++-----------
 containerd-shim-spin/src/trigger.rs |  2 ++
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 040e5d2..f088f6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6696,7 +6696,7 @@ dependencies = [
  "anyhow",
  "conformance-tests",
  "log",
- "nix 0.28.0",
+ "nix 0.29.0",
  "test-environment",
 ]
 
diff --git a/conformance-tests/Cargo.toml b/conformance-tests/Cargo.toml
index 1b8f4e6..9a1e2f5 100644
--- a/conformance-tests/Cargo.toml
+++ b/conformance-tests/Cargo.toml
@@ -11,5 +11,5 @@ homepage.workspace = true
 anyhow = "1.0"
 conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "6ec9e9d95e3b333de85685131337c8864c1af67d" }
 log = "0.4"
-nix = "0.28"
+nix = { version = "0.29", features = ["signal", "process"] }
 test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "6ec9e9d95e3b333de85685131337c8864c1af67d" }
diff --git a/conformance-tests/src/main.rs b/conformance-tests/src/main.rs
index 74387c8..dbb02f3 100644
--- a/conformance-tests/src/main.rs
+++ b/conformance-tests/src/main.rs
@@ -35,11 +35,11 @@ fn run_test(
     ctr_binary: &std::path::Path,
 ) -> anyhow::Result<()> {
     println!("running test: {}", test.name);
-    let mut services = vec!["registry".into()];
+    let mut services = vec!["registry"];
     for precondition in &test.config.preconditions {
         match precondition {
             conformance_tests::config::Precondition::HttpEcho => {
-                services.push("http-echo".into());
+                services.push("http-echo");
             }
             conformance_tests::config::Precondition::KeyValueStore(k) => {
                 if k.label != "default" {
@@ -47,14 +47,14 @@ fn run_test(
                 }
             }
             conformance_tests::config::Precondition::TcpEcho => {
-                services.push("tcp-echo".into());
+                services.push("tcp-echo");
             }
             conformance_tests::config::Precondition::Sqlite => {}
             conformance_tests::config::Precondition::Redis => {
-                services.push("redis".into());
+                services.push("redis");
             }
             conformance_tests::config::Precondition::Mqtt => {
-                services.push("mqtt".into());
+                services.push("mqtt");
             }
         }
     }
diff --git a/containerd-shim-spin/src/engine.rs b/containerd-shim-spin/src/engine.rs
index 32b580c..926e68f 100644
--- a/containerd-shim-spin/src/engine.rs
+++ b/containerd-shim-spin/src/engine.rs
@@ -172,7 +172,6 @@ impl SpinEngine {
             let app = spin_app::App::new("TODO", app.clone());
             let f = match trigger_type.as_str() {
                 HTTP_TRIGGER_TYPE => {
-                    info!(" >>> running spin http trigger");
                     let address_str = env::var(constants::SPIN_HTTP_LISTEN_ADDR_ENV)
                         .unwrap_or_else(|_| constants::SPIN_ADDR_DEFAULT.to_string());
                     let address = parse_addr(&address_str)?;
@@ -183,23 +182,15 @@ impl SpinEngine {
                     };
                     trigger::run::<HttpTrigger>(cli_args, app, &loader).await?
                 }
-                REDIS_TRIGGER_TYPE => {
-                    info!(" >>> running spin redis trigger");
-                    trigger::run::<RedisTrigger>(NoCliArgs, app, &loader).await?
-                }
-                SQS_TRIGGER_TYPE => {
-                    info!(" >>> running spin sqs trigger");
-                    trigger::run::<SqsTrigger>(NoCliArgs, app, &loader).await?
-                }
+                REDIS_TRIGGER_TYPE => trigger::run::<RedisTrigger>(NoCliArgs, app, &loader).await?,
+                SQS_TRIGGER_TYPE => trigger::run::<SqsTrigger>(NoCliArgs, app, &loader).await?,
                 COMMAND_TRIGGER_TYPE => {
-                    info!(" >>> running spin command trigger");
                     let cli_args = trigger_command::CliArgs {
                         guest_args: ctx.args().to_vec(),
                     };
                     trigger::run::<CommandTrigger>(cli_args, app, &loader).await?
                 }
                 MQTT_TRIGGER_TYPE => {
-                    info!(" >>> running spin mqtt trigger");
                     let cli_args = trigger_mqtt::CliArgs { test: false };
                     trigger::run::<MqttTrigger>(cli_args, app, &loader).await?
                 }
diff --git a/containerd-shim-spin/src/trigger.rs b/containerd-shim-spin/src/trigger.rs
index e3570a9..a0495cd 100644
--- a/containerd-shim-spin/src/trigger.rs
+++ b/containerd-shim-spin/src/trigger.rs
@@ -1,5 +1,6 @@
 use std::{collections::HashSet, future::Future, path::Path, pin::Pin};
 
+use log::info;
 use spin_app::{locked::LockedApp, App};
 use spin_runtime_factors::{FactorsBuilder, TriggerFactors};
 use spin_trigger::{
@@ -30,6 +31,7 @@ pub(crate) async fn run<T>(
 where
     T: Trigger<TriggerFactors> + 'static,
 {
+    info!(" >>> running {} trigger", T::TYPE);
     let trigger = T::new(cli_args, &app)?;
     let builder: TriggerAppBuilder<_, FactorsBuilder> = TriggerAppBuilder::new(trigger);