From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 E7152818D for ; Wed, 26 Jul 2023 16:18:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C3FDA7A4 for ; Wed, 26 Jul 2023 16:18:43 +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 ; Wed, 26 Jul 2023 16:18:42 +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 C6D9945A6F for ; Wed, 26 Jul 2023 16:18:41 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 26 Jul 2023 16:18:22 +0200 Message-Id: <20230726141824.813621-3-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230726141824.813621-1-l.wagner@proxmox.com> References: <20230726141824.813621-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.056 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. [lib.rs, error.rs] Subject: [pve-devel] [PATCH v2 proxmox 2/4] router: re-export `HttpError` from `proxmox-http-error` X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2023 14:18:43 -0000 Signed-off-by: Lukas Wagner --- proxmox-router/Cargo.toml | 1 + proxmox-router/src/error.rs | 42 +------------------------------------ proxmox-router/src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/proxmox-router/Cargo.toml b/proxmox-router/Cargo.toml index 34a1985..7d4d32f 100644 --- a/proxmox-router/Cargo.toml +++ b/proxmox-router/Cargo.toml @@ -26,6 +26,7 @@ rustyline = { version = "9", optional = true } libc = { workspace = true, optional = true } proxmox-lang.workspace = true +proxmox-http-error.workspace = true proxmox-schema.workspace = true proxmox-async.workspace = true diff --git a/proxmox-router/src/error.rs b/proxmox-router/src/error.rs index e285cf7..15c5417 100644 --- a/proxmox-router/src/error.rs +++ b/proxmox-router/src/error.rs @@ -1,44 +1,4 @@ -use std::fmt; +pub use proxmox_http_error::{http_bail, http_err, HttpError}; #[doc(hidden)] pub use http::StatusCode; - -/// HTTP error including `StatusCode` and message. -#[derive(Debug)] -pub struct HttpError { - pub code: StatusCode, - pub message: String, -} - -impl std::error::Error for HttpError {} - -impl HttpError { - pub fn new(code: StatusCode, message: String) -> Self { - HttpError { code, message } - } -} - -impl fmt::Display for HttpError { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "{}", self.message) - } -} - -/// Macro to create a HttpError inside a anyhow::Error -#[macro_export] -macro_rules! http_err { - ($status:ident, $($fmt:tt)+) => {{ - ::anyhow::Error::from($crate::HttpError::new( - $crate::error::StatusCode::$status, - format!($($fmt)+) - )) - }}; -} - -/// Bail with an error generated with the `http_err!` macro. -#[macro_export] -macro_rules! http_bail { - ($status:ident, $($fmt:tt)+) => {{ - return Err($crate::http_err!($status, $($fmt)+)); - }}; -} diff --git a/proxmox-router/src/lib.rs b/proxmox-router/src/lib.rs index 7f4f2d9..808836a 100644 --- a/proxmox-router/src/lib.rs +++ b/proxmox-router/src/lib.rs @@ -17,7 +17,7 @@ mod serializable_return; #[doc(inline)] #[cfg(feature = "server")] -pub use error::HttpError; +pub use error::*; pub use permission::*; pub use router::*; -- 2.39.2