PR feedback

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

Author: rylev

containerd-shim-spin/src/engine.rs

@@ -174,9 +174,9 @@ impl SpinEngine {
                     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 listen_address = parse_addr(&address_str)?;
+                    let address = parse_addr(&address_str)?;
                     let cli_args = spin_trigger_http::CliArgs {
-                        address: listen_address,
+                        address,
                         tls_cert: None,
                         tls_key: None,
                     };

containerd-shim-spin/src/trigger.rs

@@ -3,7 +3,7 @@ use std::{collections::HashSet, future::Future, path::Path, pin::Pin};
 use spin_app::{locked::LockedApp, App};
 use spin_runtime_factors::{FactorsBuilder, TriggerFactors};
 use spin_trigger::{
-    cli::{FactorsConfig, RuntimeFactorsBuilder, TriggerAppBuilder},
+    cli::{FactorsConfig, TriggerAppBuilder},
     loader::ComponentLoader,
     Trigger,
 };
@@ -22,13 +22,14 @@ pub(crate) const MQTT_TRIGGER_TYPE: &str = <MqttTrigger as Trigger<TriggerFactor
 pub(crate) const COMMAND_TRIGGER_TYPE: &str = <CommandTrigger as Trigger<TriggerFactors>>::TYPE;
 
 /// Run the trigger with the given CLI args, [`App`] and [`ComponentLoader`].
-pub(crate) async fn run<
-    T: Trigger<<FactorsBuilder as RuntimeFactorsBuilder>::Factors> + 'static,
->(
+pub(crate) async fn run<T>(
     cli_args: T::CliArgs,
     app: App,
     loader: &ComponentLoader,
-) -> anyhow::Result<Pin<Box<dyn Future<Output = anyhow::Result<()>>>>> {
+) -> anyhow::Result<Pin<Box<dyn Future<Output = anyhow::Result<()>>>>>
+where
+    T: Trigger<TriggerFactors> + 'static,
+{
     let trigger = T::new(cli_args, &app)?;
     let builder: TriggerAppBuilder<_, FactorsBuilder> = TriggerAppBuilder::new(trigger);