From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] api-types: relax NODENAME_SCHEMA
Date: Wed, 12 Jan 2022 14:52:10 +0100 [thread overview]
Message-ID: <20220112135210.1698733-3-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20220112135210.1698733-1-f.gruenbichler@proxmox.com>
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 <f.gruenbichler@proxmox.com>
---
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
next prev parent reply other threads:[~2022-01-12 13:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 13:52 [pbs-devel] [PATCH proxmox-backup 0/2] reduce pbs-api-types deps Fabian Grünbichler
2022-01-12 13:52 ` [pbs-devel] [PATCH proxmox-backup 1/2] api-types: move RsaPubKeyInfo to pbs-client Fabian Grünbichler
2022-01-12 13:52 ` Fabian Grünbichler [this message]
2022-01-14 5:30 ` [pbs-devel] applied-series: [PATCH proxmox-backup 0/2] reduce pbs-api-types deps Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220112135210.1698733-3-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox