chore: Bump Rust edition to 2024 (#392)

chore: bump rustls-webpki for security vulnerability and fix Rust 2024 compatibility issues

Author: Saul-STFC

Cargo.lock

@@ -6,7 +6,7 @@ resolver = "2"
 version = "0.0.0-dev"
 authors = ["Stackable GmbH <info@stackable.tech>"]
 license = "OSL-3.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/stackabletech/listener-operator"
 
 [workspace.dependencies]

Cargo.nix

@@ -19,33 +19,33 @@ pub(super) fn maybe_copy_env(
     target_gvk: &GroupVersionKind,
 ) -> anyhow::Result<()> {
     let target_kind_set = ["DaemonSet", "Deployment"];
-    if target_kind_set.contains(&target_gvk.kind.as_str()) {
-        if let Some(env) = deployer_env_var(source) {
-            for container in containers(target)? {
-                match container {
-                    serde_json::Value::Object(c) => {
-                        let json_env = env
-                            .iter()
-                            .map(|e| serde_json::json!(e))
-                            .collect::<Vec<serde_json::Value>>();
-
-                        match c.get_mut("env") {
-                            Some(env) => match env {
-                                v @ serde_json::Value::Null => {
-                                    *v = serde_json::json!(json_env);
-                                }
-                                serde_json::Value::Array(container_env) => {
-                                    container_env.extend_from_slice(&json_env)
-                                }
-                                _ => anyhow::bail!("env is not null or an array"),
-                            },
-                            None => {
-                                c.insert("env".to_string(), serde_json::json!(json_env));
+    if target_kind_set.contains(&target_gvk.kind.as_str())
+        && let Some(env) = deployer_env_var(source)
+    {
+        for container in containers(target)? {
+            match container {
+                serde_json::Value::Object(c) => {
+                    let json_env = env
+                        .iter()
+                        .map(|e| serde_json::json!(e))
+                        .collect::<Vec<serde_json::Value>>();
+
+                    match c.get_mut("env") {
+                        Some(env) => match env {
+                            v @ serde_json::Value::Null => {
+                                *v = serde_json::json!(json_env);
                             }
+                            serde_json::Value::Array(container_env) => {
+                                container_env.extend_from_slice(&json_env)
+                            }
+                            _ => anyhow::bail!("env is not null or an array"),
+                        },
+                        None => {
+                            c.insert("env".to_string(), serde_json::json!(json_env));
                         }
                     }
-                    _ => anyhow::bail!("no containers found in object {}", target.name_any()),
                 }
+                _ => anyhow::bail!("no containers found in object {}", target.name_any()),
             }
         }
     }

Cargo.toml

@@ -154,7 +154,7 @@ async fn main() -> Result<()> {
                             env::maybe_copy_env(&deployment, &mut obj, &gvk)?;
                             resources::maybe_copy_resources(&deployment, &mut obj, &gvk)?;
                             // ---------- apply
-                            apply(&api, obj, &gvk.kind).await?
+                            apply(&api, obj, &gvk.kind).await?;
                         }
                     }
                 }

rust/olm-deployer/src/env/mod.rs

@@ -19,15 +19,15 @@ pub(super) fn maybe_copy_resources(
     target_gvk: &GroupVersionKind,
 ) -> anyhow::Result<()> {
     let target_kind_set = ["DaemonSet", "Deployment"];
-    if target_kind_set.contains(&target_gvk.kind.as_str()) {
-        if let Some(res) = deployment_resources(source) {
-            for container in containers(target)? {
-                match container {
-                    serde_json::Value::Object(c) => {
-                        c.insert("resources".to_string(), serde_json::json!(res));
-                    }
-                    _ => anyhow::bail!("no containers found in object {}", target.name_any()),
+    if target_kind_set.contains(&target_gvk.kind.as_str())
+        && let Some(res) = deployment_resources(source)
+    {
+        for container in containers(target)? {
+            match container {
+                serde_json::Value::Object(c) => {
+                    c.insert("resources".to_string(), serde_json::json!(res));
                 }
+                _ => anyhow::bail!("no containers found in object {}", target.name_any()),
             }
         }
     }