public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v3 1/6] pbs-config: use http proxy schema moved to proxmox-http crate
Date: Thu, 12 Mar 2026 12:42:03 +0100	[thread overview]
Message-ID: <20260312114208.514373-4-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260312114208.514373-1-c.ebner@proxmox.com>

The schema was move there in preparation for moving the node config
to the pbs-config crate. Use it and drop the local one.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 Cargo.toml            |  2 +-
 src/api2/types/mod.rs | 11 -----------
 src/config/node.rs    |  4 +---
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ca0ee1761..542257535 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,7 +64,7 @@ proxmox-config-digest = "1"
 proxmox-daemon = "1"
 proxmox-fuse = "3"
 proxmox-docgen = "1"
-proxmox-http = { version = "1.0.2", features = [ "client", "http-helpers", "websocket" ] } # see below
+proxmox-http = { version = "1.0.2", features = [ "client", "http-helpers", "api-types", "websocket" ] } # see below
 proxmox-human-byte = "1"
 proxmox-io = "1.0.1" # tools and client use "tokio" feature
 proxmox-lang = "1.1"
diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs
index 341936853..40fe7302b 100644
--- a/src/api2/types/mod.rs
+++ b/src/api2/types/mod.rs
@@ -116,14 +116,3 @@ fn test_proxmox_user_id_schema() -> Result<(), anyhow::Error> {
 
     Ok(())
 }
-
-pub const HTTP_PROXY_SCHEMA: Schema =
-    StringSchema::new("HTTP proxy configuration [http://]<host>[:port]")
-        .format(&ApiStringFormat::VerifyFn(|s| {
-            proxmox_http::ProxyConfig::parse_proxy_url(s)?;
-            Ok(())
-        }))
-        .min_length(1)
-        .max_length(128)
-        .type_text("[http://]<host>[:port]")
-        .schema();
diff --git a/src/config/node.rs b/src/config/node.rs
index a79bf5707..c01c6aa7a 100644
--- a/src/config/node.rs
+++ b/src/config/node.rs
@@ -9,14 +9,12 @@ use pbs_api_types::{
     OPENSSL_CIPHERS_TLS_1_3_SCHEMA,
 };
 use proxmox_acme_api::{AcmeConfig, AcmeDomain, ACME_DOMAIN_PROPERTY_SCHEMA};
-use proxmox_http::ProxyConfig;
+use proxmox_http::{ProxyConfig, HTTP_PROXY_SCHEMA};
 use proxmox_schema::{api, ApiStringFormat, ApiType, Updater};
 
 use pbs_buildcfg::configdir;
 use pbs_config::{open_backup_lockfile, BackupLockGuard};
 
-use crate::api2::types::HTTP_PROXY_SCHEMA;
-
 const CONF_FILE: &str = configdir!("/node.cfg");
 const LOCK_FILE: &str = configdir!("/.node.lck");
 
-- 
2.47.3





  parent reply	other threads:[~2026-03-12 11:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-12 11:42 [PATCH proxmox{,-backup} v3 0/8] fix #6716: Add support for http proxy configuration for S3 endpoints Christian Ebner
2026-03-12 11:42 ` [PATCH proxmox v3 1/2] http: move http proxy schema from PBS to crate's api types Christian Ebner
2026-03-12 11:42 ` [PATCH proxmox v3 2/2] pbs-api-types: move over NodeConfig and related api type from PBS Christian Ebner
2026-03-12 11:42 ` Christian Ebner [this message]
2026-03-12 11:42 ` [PATCH proxmox-backup v3 2/6] config: inline NodeConfig::validate() to its only call side Christian Ebner
2026-03-12 11:42 ` [PATCH proxmox-backup v3 3/6] config: use moved NodeConfig definitions in pbs-api-types Christian Ebner
2026-03-12 11:42 ` [PATCH proxmox-backup v3 4/6] tools: drop unused from_property_string() helper Christian Ebner
2026-03-12 11:42 ` [PATCH proxmox-backup v3 5/6] config: move node config into pbs-config, including helper tools Christian Ebner
2026-03-12 11:42 ` [PATCH proxmox-backup v3 6/6] fix #6716: pass node http proxy config to s3 backend Christian Ebner

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=20260312114208.514373-4-c.ebner@proxmox.com \
    --to=c.ebner@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal