Bump minimal rust version

Signed-off-by: Kate Goldenring <[email protected]>

images/spin/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} rust:1.79 AS build
+FROM --platform=${BUILDPLATFORM} rust:1.81 AS build
 WORKDIR /opt/build
 COPY . .
 RUN rustup target add wasm32-wasi && cargo build --target wasm32-wasi --release

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.79.0"
+channel = "1.81.0"
 components = ["clippy", "rustfmt"]
 targets = ["wasm32-wasi", "wasm32-unknown-unknown"]
 profile = "default"

tests/src/integration_test.rs

@@ -94,7 +94,7 @@ mod test {
             anyhow::bail!("kubectl is not installed");
         }
 
-        let forward_port = port_forward_redis(redis_port).await?;
+        let forward_port = port_forward_svc(redis_port, "redis").await?;
 
         let client = redis::Client::open(format!("redis://localhost:{}", forward_port))?;
         let mut con = client.get_multiplexed_async_connection().await?;
@@ -145,13 +145,14 @@ mod test {
             anyhow::bail!("kubectl is not installed");
         }
 
-        let forward_port = port_forward_redis(redis_port).await?;
+        let forward_port = port_forward_svc(redis_port, "redis").await?;
 
         let client = redis::Client::open(format!("redis://localhost:{}", forward_port))
             .context("connecting to redis")?;
         let mut con = client.get_multiplexed_async_connection().await?;
 
-        con.publish("testchannel", "some-payload").await?;
+        con.publish::<_, _, ()>("testchannel", "some-payload")
+            .await?;
 
         let one_sec = time::Duration::from_secs(1);
         thread::sleep(one_sec);
@@ -175,7 +176,7 @@ mod test {
         }
 
         // Port forward the emqx mqtt broker
-        let forward_port = port_forward_emqx(mqtt_port).await?;
+        let forward_port = port_forward_svc(mqtt_port, "emqx").await?;
 
         // Publish a message to the emqx broker
         let mut mqttoptions = rumqttc::MqttOptions::new("123", "127.0.0.1", forward_port);
@@ -219,20 +220,6 @@ mod test {
         Ok(())
     }
 
-    async fn port_forward_emqx(emqx_port: u16) -> Result<u16> {
-        let port = get_random_port()?;
-
-        println!(" >>> kubectl portforward emqx {}:{} ", port, emqx_port);
-
-        Command::new("kubectl")
-            .arg("port-forward")
-            .arg("emqx")
-            .arg(format!("{}:{}", port, emqx_port))
-            .spawn()?;
-        tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
-        Ok(port)
-    }
-
     #[tokio::test]
     async fn spin_static_assets_test() -> Result<()> {
         let host_port = 8082;
@@ -270,15 +257,18 @@ mod test {
         }
     }
 
-    async fn port_forward_redis(redis_port: u16) -> Result<u16> {
+    async fn port_forward_svc(svc_port: u16, svc_name: &str) -> Result<u16> {
         let port = get_random_port()?;
 
-        println!(" >>> kubectl portforward redis {}:{} ", port, redis_port);
+        println!(
+            " >>> kubectl portforward svc {} {}:{} ",
+            svc_name, port, svc_port
+        );
 
         Command::new("kubectl")
             .arg("port-forward")
-            .arg("redis")
-            .arg(format!("{}:{}", port, redis_port))
+            .arg(svc_name)
+            .arg(format!("{}:{}", port, svc_port))
             .spawn()?;
         tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
         Ok(port)