From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <l.wagner@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 951359B2FE
for <pve-devel@lists.proxmox.com>; Wed, 24 May 2023 16:06:15 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 770B22049C
for <pve-devel@lists.proxmox.com>; Wed, 24 May 2023 16:05:45 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Wed, 24 May 2023 16:05:44 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 623AD46E54
for <pve-devel@lists.proxmox.com>; Wed, 24 May 2023 15:57:32 +0200 (CEST)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 24 May 2023 15:56:28 +0200
Message-Id: <20230524135649.934881-22-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230524135649.934881-1-l.wagner@proxmox.com>
References: <20230524135649.934881-1-l.wagner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.150 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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [notify.rs]
Subject: [pve-devel] [PATCH v2 proxmox-perl-rs 21/42] notify: add api for
notification channels
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>
X-List-Received-Date: Wed, 24 May 2023 14:06:15 -0000
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
pve-rs/src/notify.rs | 67 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/pve-rs/src/notify.rs b/pve-rs/src/notify.rs
index a101416..c6483dc 100644
--- a/pve-rs/src/notify.rs
+++ b/pve-rs/src/notify.rs
@@ -5,6 +5,7 @@ mod export {
use serde_json::Value as JSONValue;
use std::sync::Mutex;
+ use proxmox_notify::channel::{ChannelConfig, ChannelConfigUpdater, DeleteableChannelProperty};
use proxmox_notify::{api, api::ApiError, Config, Notification, Severity};
pub struct NotificationConfig {
@@ -92,4 +93,70 @@ mod export {
let config = this.config.lock().unwrap();
api::common::test_endpoint(&config, endpoint)
}
+
+ #[export(serialize_error)]
+ fn get_channels(
+ #[try_from_ref] this: &NotificationConfig,
+ ) -> Result<Vec<ChannelConfig>, ApiError> {
+ let config = this.config.lock().unwrap();
+ api::channel::get_channels(&config)
+ }
+
+ #[export(serialize_error)]
+ fn get_channel(
+ #[try_from_ref] this: &NotificationConfig,
+ id: &str,
+ ) -> Result<ChannelConfig, ApiError> {
+ let config = this.config.lock().unwrap();
+ api::channel::get_channel(&config, id)
+ }
+
+ #[export(serialize_error)]
+ fn add_channel(
+ #[try_from_ref] this: &NotificationConfig,
+ name: String,
+ endpoints: Option<Vec<String>>,
+ comment: Option<String>,
+ ) -> Result<(), ApiError> {
+ let mut config = this.config.lock().unwrap();
+ api::channel::add_channel(
+ &mut config,
+ &ChannelConfig {
+ name,
+ endpoint: endpoints,
+ comment,
+ },
+ )
+ }
+
+ #[export(serialize_error)]
+ fn update_channel(
+ #[try_from_ref] this: &NotificationConfig,
+ name: &str,
+ endpoints: Option<Vec<String>>,
+ comment: Option<String>,
+ delete: Option<Vec<DeleteableChannelProperty>>,
+ digest: Option<&str>,
+ ) -> Result<(), ApiError> {
+ let mut config = this.config.lock().unwrap();
+ api::channel::update_channel(
+ &mut config,
+ name,
+ &ChannelConfigUpdater {
+ endpoint: endpoints,
+ comment,
+ },
+ delete.as_deref(),
+ digest.map(|d| d.as_bytes()),
+ )
+ }
+
+ #[export(serialize_error)]
+ fn delete_channel(
+ #[try_from_ref] this: &NotificationConfig,
+ name: &str,
+ ) -> Result<(), ApiError> {
+ let mut config = this.config.lock().unwrap();
+ api::channel::delete_channel(&mut config, name)
+ }
}
--
2.30.2