[pve-devel] [PATCH proxmox master 1/2] notify: migrate to handlebars 5

[Lukas Wagner <l.wagner@proxmox.com>]

No major changes were needed, just some minor changes on how we have to
handle errors in helpers.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 proxmox-notify/src/endpoints/webhook.rs  |  8 +++++---
 proxmox-notify/src/renderer/html.rs      | 10 +++++++---
 proxmox-notify/src/renderer/plaintext.rs | 10 +++++++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/proxmox-notify/src/endpoints/webhook.rs b/proxmox-notify/src/endpoints/webhook.rs
index eada590e..e6947730 100644
--- a/proxmox-notify/src/endpoints/webhook.rs
+++ b/proxmox-notify/src/endpoints/webhook.rs
@@ -11,7 +11,7 @@ use std::time::Duration;
 
 use handlebars::{
     Context as HandlebarsContext, Handlebars, Helper, HelperResult, Output, RenderContext,
-    RenderError as HandlebarsRenderError,
+    RenderError as HandlebarsRenderError, RenderErrorReason,
 };
 use http::Request;
 use percent_encoding::AsciiSet;
@@ -473,7 +473,8 @@ fn handlebars_json(
         .map(|v| v.value())
         .ok_or_else(|| HandlebarsRenderError::new("json: missing parameter"))?;
 
-    let json = serde_json::to_string(param0)?;
+    let json =
+        serde_json::to_string(param0).map_err(|err| RenderErrorReason::NestedError(err.into()))?;
     out.write(&json)?;
 
     Ok(())
@@ -492,7 +493,8 @@ fn handlebars_escape(
         .ok_or_else(|| HandlebarsRenderError::new("escape: missing text parameter"))?;
 
     let val = Value::String(text.to_string());
-    let json = serde_json::to_string(&val)?;
+    let json =
+        serde_json::to_string(&val).map_err(|err| RenderErrorReason::NestedError(err.into()))?;
     out.write(&json[1..json.len() - 1])?;
 
     Ok(())
diff --git a/proxmox-notify/src/renderer/html.rs b/proxmox-notify/src/renderer/html.rs
index 77545f77..e84fd73a 100644
--- a/proxmox-notify/src/renderer/html.rs
+++ b/proxmox-notify/src/renderer/html.rs
@@ -1,6 +1,6 @@
 use handlebars::{
     Context, Handlebars, Helper, HelperResult, Output, RenderContext,
-    RenderError as HandlebarsRenderError,
+    RenderError as HandlebarsRenderError, RenderErrorReason,
 };
 use serde_json::Value;
 
@@ -20,7 +20,8 @@ fn render_html_table(
 
     let value = param.value();
 
-    let table: Table = serde_json::from_value(value.clone())?;
+    let table: Table = serde_json::from_value(value.clone())
+        .map_err(|err| RenderErrorReason::NestedError(err.into()))?;
 
     out.write("<table style=\"border: 1px solid\";border-style=\"collapse\">\n")?;
 
@@ -72,7 +73,10 @@ fn render_object(
     let value = param.value();
 
     out.write("\n<pre>")?;
-    out.write(&serde_json::to_string_pretty(&value)?)?;
+    out.write(
+        &serde_json::to_string_pretty(&value)
+            .map_err(|err| RenderErrorReason::NestedError(err.into()))?,
+    )?;
     out.write("\n</pre>\n")?;
 
     Ok(())
diff --git a/proxmox-notify/src/renderer/plaintext.rs b/proxmox-notify/src/renderer/plaintext.rs
index 59e917a3..104f12d9 100644
--- a/proxmox-notify/src/renderer/plaintext.rs
+++ b/proxmox-notify/src/renderer/plaintext.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use handlebars::{
     Context, Handlebars, Helper, HelperResult, Output, RenderContext,
-    RenderError as HandlebarsRenderError,
+    RenderError as HandlebarsRenderError, RenderErrorReason,
 };
 use serde_json::Value;
 
@@ -44,7 +44,8 @@ fn render_plaintext_table(
         .param(0)
         .ok_or_else(|| HandlebarsRenderError::new("parameter not found"))?;
     let value = param.value();
-    let table: Table = serde_json::from_value(value.clone())?;
+    let table: Table = serde_json::from_value(value.clone())
+        .map_err(|err| RenderErrorReason::NestedError(err.into()))?;
     let widths = optimal_column_widths(&table);
 
     // Write header
@@ -89,7 +90,10 @@ fn render_object(
     let value = param.value();
 
     out.write("\n")?;
-    out.write(&serde_json::to_string_pretty(&value)?)?;
+    out.write(
+        &serde_json::to_string_pretty(&value)
+            .map_err(|err| RenderErrorReason::NestedError(err.into()))?,
+    )?;
     out.write("\n")?;
 
     Ok(())
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel