From 8a808eb903b33d3d4f57afba71d6af19a3170eb5 Mon Sep 17 00:00:00 2001
From: Ryan Levick <ryan.levick@fermyon.com>
Date: Tue, 24 Sep 2024 13:05:32 +0200
Subject: [PATCH] Fix CI

Signed-off-by: Ryan Levick <ryan.levick@fermyon.com>
---
 containerd-shim-spin/Cargo.toml     | 2 +-
 containerd-shim-spin/src/engine.rs  | 5 +++--
 containerd-shim-spin/src/trigger.rs | 4 ++--
 images/spin_dotnet/.gitignore       | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 images/spin_dotnet/.gitignore

diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml
index 05f3edd7..aa5213d4 100644
--- a/containerd-shim-spin/Cargo.toml
+++ b/containerd-shim-spin/Cargo.toml
@@ -23,7 +23,7 @@ spin-trigger = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecf
 ] }
 spin-trigger-http = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" }
 spin-trigger-redis = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" }
-trigger-mqtt = { git = "https://github.com/rylev/spin-trigger-mqtt", rev = "4f6bf7e6783833dc344078d3096b171b43e09f57" }
+trigger-mqtt = { git = "https://github.com/spinkube/spin-trigger-mqtt", rev = "4c76e52dc5d3e7961c7b4d4933543c1adb2778cf" }
 trigger-sqs = { git = "https://github.com/fermyon/spin-trigger-sqs", rev = "71877907ebd822bb1aacf7a20065733b7cd188dc" }
 trigger-command = { git = "https://github.com/fermyon/spin-trigger-command", rev = "db55291552233e04189275a2dd82c07e5fa4fdf2" }
 spin-manifest = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" }
diff --git a/containerd-shim-spin/src/engine.rs b/containerd-shim-spin/src/engine.rs
index ed67a8dd..32b580ca 100644
--- a/containerd-shim-spin/src/engine.rs
+++ b/containerd-shim-spin/src/engine.rs
@@ -153,8 +153,6 @@ impl SpinEngine {
         app: LockedApp,
         app_source: Source,
     ) -> Result<()> {
-        let mut futures_list = Vec::new();
-        let mut trigger_type_map = Vec::new();
         let mut loader = spin_trigger::loader::ComponentLoader::default();
         match app_source {
             Source::Oci => unsafe {
@@ -167,6 +165,9 @@ impl SpinEngine {
             // `spin registry push`
             Source::File(_) => {}
         };
+
+        let mut futures_list = Vec::new();
+        let mut trigger_type_map = Vec::new();
         for trigger_type in trigger_types.iter() {
             let app = spin_app::App::new("TODO", app.clone());
             let f = match trigger_type.as_str() {
diff --git a/containerd-shim-spin/src/trigger.rs b/containerd-shim-spin/src/trigger.rs
index f008a37c..e3570a90 100644
--- a/containerd-shim-spin/src/trigger.rs
+++ b/containerd-shim-spin/src/trigger.rs
@@ -9,12 +9,12 @@ use spin_trigger::{
 };
 use spin_trigger_http::HttpTrigger;
 use spin_trigger_redis::RedisTrigger;
-
-use crate::constants::{RUNTIME_CONFIG_PATH, SPIN_TRIGGER_WORKING_DIR};
 use trigger_command::CommandTrigger;
 use trigger_mqtt::MqttTrigger;
 use trigger_sqs::SqsTrigger;
 
+use crate::constants::{RUNTIME_CONFIG_PATH, SPIN_TRIGGER_WORKING_DIR};
+
 pub(crate) const HTTP_TRIGGER_TYPE: &str = <HttpTrigger as Trigger<TriggerFactors>>::TYPE;
 pub(crate) const REDIS_TRIGGER_TYPE: &str = <RedisTrigger as Trigger<TriggerFactors>>::TYPE;
 pub(crate) const SQS_TRIGGER_TYPE: &str = <SqsTrigger as Trigger<TriggerFactors>>::TYPE;
diff --git a/images/spin_dotnet/.gitignore b/images/spin_dotnet/.gitignore
new file mode 100644
index 00000000..08ab6675
--- /dev/null
+++ b/images/spin_dotnet/.gitignore
@@ -0,0 +1 @@
+obj
\ No newline at end of file