replace unwrap() calls with context()

Author: razvan

rust/olm-deployer/src/data.rs

@@ -1,3 +1,4 @@
+use anyhow::{anyhow, Context};
 use stackable_operator::kube::{api::DynamicObject, ResourceExt};
 
 pub fn container<'a>(
@@ -6,7 +7,13 @@ pub fn container<'a>(
 ) -> anyhow::Result<&'a mut serde_json::Value> {
     let tname = target.name_any();
     let path = "template/spec/containers".split("/");
-    match get_or_create(target.data.pointer_mut("/spec").unwrap(), path)? {
+    match get_or_create(
+        target
+            .data
+            .pointer_mut("/spec")
+            .context(anyhow!("object [{tname}] has no .spec property"))?,
+        path,
+    )? {
         serde_json::Value::Array(containers) => {
             for c in containers {
                 if c.is_object() {
@@ -56,7 +63,8 @@ fn get_or_insert_default_object<'a>(
         serde_json::Value::Object(map) => map,
         x @ serde_json::Value::Null => {
             *x = serde_json::json!({});
-            x.as_object_mut().unwrap()
+            x.as_object_mut()
+                .context(anyhow!("expected an empty map for [{key}] but found null"))?
         }
         x => anyhow::bail!("invalid type {x:?}, expected map"),
     };

rust/olm-deployer/src/main.rs

@@ -201,7 +201,10 @@ async fn get_cluster_role(csv: &str, client: &client::Client) -> Result<ClusterR
     let cluster_role_api = client.get_all_api::<ClusterRole>();
     let result = cluster_role_api.list(&lp).await?.items;
     if !result.is_empty() {
-        Ok(result.first().unwrap().clone())
+        Ok(result
+            .first()
+            .context(anyhow!("ClusterRole object not found for labels {labels}"))?
+            .clone())
     } else {
         bail!("ClusterRole object not found for labels {labels}")
     }

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

@@ -1,6 +1,10 @@
+use anyhow::{anyhow, Context};
 use stackable_operator::{
     k8s_openapi::api::{apps::v1::Deployment, core::v1::Toleration},
-    kube::api::{DynamicObject, GroupVersionKind},
+    kube::{
+        api::{DynamicObject, GroupVersionKind},
+        ResourceExt,
+    },
 };
 
 use crate::data::get_or_create;
@@ -14,13 +18,19 @@ pub(super) fn maybe_copy_tolerations(
     target_gvk: &GroupVersionKind,
 ) -> anyhow::Result<()> {
     if target_gvk.kind == "DaemonSet" {
+        let tname = target.name_any();
         if let Some(tolerations) = deployment_tolerations(source) {
             let path = "template/spec/tolerations".split("/");
-            *get_or_create(target.data.pointer_mut("/spec").unwrap(), path)? =
-                serde_json::json!(tolerations
-                    .iter()
-                    .map(|t| serde_json::json!(t))
-                    .collect::<Vec<serde_json::Value>>());
+            *get_or_create(
+                target
+                    .data
+                    .pointer_mut("/spec")
+                    .context(anyhow!("DaemonSet named [{tname}] has empty .spec"))?,
+                path,
+            )? = serde_json::json!(tolerations
+                .iter()
+                .map(|t| serde_json::json!(t))
+                .collect::<Vec<serde_json::Value>>());
         }
     }