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 C85586023E for ; Wed, 12 Jan 2022 14:52:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9E1F924F6 for ; Wed, 12 Jan 2022 14:52:23 +0100 (CET) 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 id 992D824E9 for ; Wed, 12 Jan 2022 14:52:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2B97846C88 for ; Wed, 12 Jan 2022 14:52:22 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Wed, 12 Jan 2022 14:52:10 +0100 Message-Id: <20220112135210.1698733-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220112135210.1698733-1-f.gruenbichler@proxmox.com> References: <20220112135210.1698733-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.223 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pbs-devel] [PATCH proxmox-backup 2/2] api-types: relax NODENAME_SCHEMA X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2022 13:52:53 -0000 there isn't really a concept of 'nodes' in PBS (yet) anyway - and if there ever is, it needs to be handled by the rest-server / specific API endpoints (like in PVE), and not by the schema. this allows dropping proxmox-sys from pbs-api-types (and thus nix and some other transitive deps as well). Signed-off-by: Fabian Grünbichler --- pbs-api-types/Cargo.toml | 3 --- pbs-api-types/src/lib.rs | 11 ++--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pbs-api-types/Cargo.toml b/pbs-api-types/Cargo.toml index 09107ace..e77d8bc4 100644 --- a/pbs-api-types/Cargo.toml +++ b/pbs-api-types/Cargo.toml @@ -18,6 +18,3 @@ proxmox-schema = { version = "1.1", features = [ "api-macro" ] } proxmox-serde = "0.1" proxmox-time = "1.1.1" proxmox-uuid = { version = "1.0.0", features = [ "serde" ] } - -[target.'cfg(not(target_arch="wasm32"))'.dependencies] -proxmox-sys = "0.2" # only needed for nodename()?? diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs index 26bef33d..e3c3df11 100644 --- a/pbs-api-types/src/lib.rs +++ b/pbs-api-types/src/lib.rs @@ -1,7 +1,6 @@ //! Basic API types used by most of the PBS code. use serde::{Deserialize, Serialize}; -use anyhow::bail; pub mod common_regex; pub mod percent_encoding; @@ -199,15 +198,9 @@ pub const DNS_NAME_OR_IP_SCHEMA: Schema = StringSchema::new("DNS name or IP addr .format(&DNS_NAME_OR_IP_FORMAT) .schema(); -#[cfg(not(target_arch="wasm32"))] // this only makes sense for the serever side + pub const NODE_SCHEMA: Schema = StringSchema::new("Node name (or 'localhost')") - .format(&ApiStringFormat::VerifyFn(|node| { - if node == "localhost" || node == proxmox_sys::nodename() { - Ok(()) - } else { - bail!("no such node '{}'", node); - } - })) + .format(&HOSTNAME_FORMAT) .schema(); pub const TIME_ZONE_SCHEMA: Schema = StringSchema::new( -- 2.30.2