From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 7C4151FF164
for <inbox@lore.proxmox.com>; Fri, 23 May 2025 15:33:23 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 4075A1BDEE;
Fri, 23 May 2025 15:32:40 +0200 (CEST)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 23 May 2025 15:31:57 +0200
Message-Id: <20250523133158.306128-1-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.39.5
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.230 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH proxmox master 1/2] notify: migrate to
handlebars 5
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.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