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 [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 5C6CF1FF164
for <inbox@lore.proxmox.com>; Fri, 23 May 2025 15:33:31 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B2D421BE51;
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:58 +0200
Message-Id: <20250523133158.306128-2-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250523133158.306128-1-l.wagner@proxmox.com>
References: <20250523133158.306128-1-l.wagner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.020 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
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 2/2] notify: stop using
deprecated functions from handlebars
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>
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
proxmox-notify/src/endpoints/webhook.rs | 8 ++---
proxmox-notify/src/renderer/html.rs | 7 ++--
proxmox-notify/src/renderer/mod.rs | 43 +++++++++---------------
proxmox-notify/src/renderer/plaintext.rs | 7 ++--
4 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/proxmox-notify/src/endpoints/webhook.rs b/proxmox-notify/src/endpoints/webhook.rs
index e6947730..a210b94c 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, RenderErrorReason,
+ RenderErrorReason,
};
use http::Request;
use percent_encoding::AsciiSet;
@@ -430,7 +430,7 @@ fn handlebars_percent_encode(
let param0 = h
.param(0)
.and_then(|v| v.value().as_str())
- .ok_or_else(|| HandlebarsRenderError::new("url-encode: missing parameter"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("url-encode", 0))?;
// See https://developer.mozilla.org/en-US/docs/Glossary/Percent-encoding
const FRAGMENT: &AsciiSet = &percent_encoding::CONTROLS
@@ -471,7 +471,7 @@ fn handlebars_json(
let param0 = h
.param(0)
.map(|v| v.value())
- .ok_or_else(|| HandlebarsRenderError::new("json: missing parameter"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("json", 0))?;
let json =
serde_json::to_string(param0).map_err(|err| RenderErrorReason::NestedError(err.into()))?;
@@ -490,7 +490,7 @@ fn handlebars_escape(
let text = h
.param(0)
.and_then(|v| v.value().as_str())
- .ok_or_else(|| HandlebarsRenderError::new("escape: missing text parameter"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("escape", 0))?;
let val = Value::String(text.to_string());
let json =
diff --git a/proxmox-notify/src/renderer/html.rs b/proxmox-notify/src/renderer/html.rs
index e84fd73a..16394531 100644
--- a/proxmox-notify/src/renderer/html.rs
+++ b/proxmox-notify/src/renderer/html.rs
@@ -1,6 +1,5 @@
use handlebars::{
- Context, Handlebars, Helper, HelperResult, Output, RenderContext,
- RenderError as HandlebarsRenderError, RenderErrorReason,
+ Context, Handlebars, Helper, HelperResult, Output, RenderContext, RenderErrorReason,
};
use serde_json::Value;
@@ -16,7 +15,7 @@ fn render_html_table(
) -> HelperResult {
let param = h
.param(0)
- .ok_or_else(|| HandlebarsRenderError::new("parameter not found"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("table", 0))?;
let value = param.value();
@@ -68,7 +67,7 @@ fn render_object(
) -> HelperResult {
let param = h
.param(0)
- .ok_or_else(|| HandlebarsRenderError::new("parameter not found"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("object", 0))?;
let value = param.value();
diff --git a/proxmox-notify/src/renderer/mod.rs b/proxmox-notify/src/renderer/mod.rs
index bff76ed1..17c56bc8 100644
--- a/proxmox-notify/src/renderer/mod.rs
+++ b/proxmox-notify/src/renderer/mod.rs
@@ -3,8 +3,7 @@
use std::{fmt::Display, time::Duration};
use handlebars::{
- Context, Handlebars, Helper, HelperDef, HelperResult, Output, RenderContext,
- RenderError as HandlebarsRenderError,
+ Context, Handlebars, Helper, HelperDef, HelperResult, Output, RenderContext, RenderErrorReason,
};
use serde::{Deserialize, Serialize};
use serde_json::Value;
@@ -84,11 +83,11 @@ fn handlebars_relative_percentage_helper(
let param0 = h
.param(0)
.and_then(|v| v.value().as_f64())
- .ok_or_else(|| HandlebarsRenderError::new("relative-percentage: param0 not found"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("relative-percentage", 0))?;
let param1 = h
.param(1)
.and_then(|v| v.value().as_f64())
- .ok_or_else(|| HandlebarsRenderError::new("relative-percentage: param1 not found"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("relative-percentage", 1))?;
if param1 == 0.0 {
out.write("-")?;
@@ -149,36 +148,24 @@ impl ValueRenderFunction {
}
fn register_helpers(handlebars: &mut Handlebars) {
- ValueRenderFunction::HumanBytes.register_handlebars_helper(handlebars);
- ValueRenderFunction::Duration.register_handlebars_helper(handlebars);
- ValueRenderFunction::Timestamp.register_handlebars_helper(handlebars);
+ ValueRenderFunction::HumanBytes.register_handlebars_helper("human-bytes", handlebars);
+ ValueRenderFunction::Duration.register_handlebars_helper("duration", handlebars);
+ ValueRenderFunction::Timestamp.register_handlebars_helper("timestamp", handlebars);
}
- fn register_handlebars_helper(&'static self, handlebars: &mut Handlebars) {
- // Use serde to get own kebab-case representation that is later used
- // to register the helper, e.g. HumanBytes -> human-bytes
- let tag = serde_json::to_string(self)
- .expect("serde failed to serialize ValueRenderFunction enum");
-
- // But as it's a string value, the generated string is quoted,
- // so remove leading/trailing double quotes
- let tag = tag
- .strip_prefix('\"')
- .and_then(|t| t.strip_suffix('\"'))
- .expect("serde serialized string representation was not contained in double quotes");
-
+ fn register_handlebars_helper(&'static self, name: &'static str, handlebars: &mut Handlebars) {
handlebars.register_helper(
- tag,
+ name,
Box::new(
- |h: &Helper,
- _r: &Handlebars,
- _: &Context,
- _rc: &mut RenderContext,
- out: &mut dyn Output|
- -> HelperResult {
+ move |h: &Helper,
+ _r: &Handlebars,
+ _: &Context,
+ _rc: &mut RenderContext,
+ out: &mut dyn Output|
+ -> HelperResult {
let param = h
.param(0)
- .ok_or(HandlebarsRenderError::new("parameter not found"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex(name, 0))?;
let value = param.value();
out.write(&self.render(value))?;
diff --git a/proxmox-notify/src/renderer/plaintext.rs b/proxmox-notify/src/renderer/plaintext.rs
index 104f12d9..3433b99f 100644
--- a/proxmox-notify/src/renderer/plaintext.rs
+++ b/proxmox-notify/src/renderer/plaintext.rs
@@ -1,8 +1,7 @@
use std::collections::HashMap;
use handlebars::{
- Context, Handlebars, Helper, HelperResult, Output, RenderContext,
- RenderError as HandlebarsRenderError, RenderErrorReason,
+ Context, Handlebars, Helper, HelperResult, Output, RenderContext, RenderErrorReason,
};
use serde_json::Value;
@@ -42,7 +41,7 @@ fn render_plaintext_table(
) -> HelperResult {
let param = h
.param(0)
- .ok_or_else(|| HandlebarsRenderError::new("parameter not found"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("table", 0))?;
let value = param.value();
let table: Table = serde_json::from_value(value.clone())
.map_err(|err| RenderErrorReason::NestedError(err.into()))?;
@@ -85,7 +84,7 @@ fn render_object(
) -> HelperResult {
let param = h
.param(0)
- .ok_or_else(|| HandlebarsRenderError::new("parameter not found"))?;
+ .ok_or_else(|| RenderErrorReason::ParamNotFoundForIndex("object", 0))?;
let value = param.value();
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel