From 6762db70d6faac25f2f32e65a4b87ab393815066 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 13 Jun 2019 07:30:42 +0200 Subject: [PATCH] src/api2/types.rs: define CHUNK_DIGEST_SCHEMA --- src/api2/backup.rs | 7 +++---- src/api2/types.rs | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/api2/backup.rs b/src/api2/backup.rs index 5a1146f7..1f53d2c9 100644 --- a/src/api2/backup.rs +++ b/src/api2/backup.rs @@ -16,6 +16,7 @@ use crate::api_schema::router::*; use crate::api_schema::*; use crate::server::WorkerTask; use crate::backup::*; +use crate::api2::types::*; mod environment; use environment::*; @@ -291,8 +292,7 @@ pub fn api_method_dynamic_append() -> ApiMethod { .maximum(256) ) .required("digest-list", ArraySchema::new( - "Chunk digest list.", - StringSchema::new("Chunk digest.").into()) + "Chunk digest list.", CHUNK_DIGEST_SCHEMA.clone()) ) .required("offset-list", ArraySchema::new( "Chunk offset list.", @@ -344,8 +344,7 @@ pub fn api_method_fixed_append() -> ApiMethod { .maximum(256) ) .required("digest-list", ArraySchema::new( - "Chunk digest list.", - StringSchema::new("Chunk digest.").into()) + "Chunk digest list.", CHUNK_DIGEST_SCHEMA.clone()) ) .required("offset-list", ArraySchema::new( "Chunk offset list.", diff --git a/src/api2/types.rs b/src/api2/types.rs index b5f8738d..8da88e0d 100644 --- a/src/api2/types.rs +++ b/src/api2/types.rs @@ -27,6 +27,13 @@ lazy_static!{ StringSchema::new("Prevent changes if current configuration file has different SHA256 digest. This can be used to prevent concurrent modifications.") .format(PVE_CONFIG_DIGEST_FORMAT.clone()).into(); + pub static ref CHUNK_DIGEST_FORMAT: Arc = + ApiStringFormat::Pattern(&common_regex::SHA256_HEX_REGEX).into(); + + pub static ref CHUNK_DIGEST_SCHEMA: Arc = + StringSchema::new("Chunk digest (SHA256).") + .format(CHUNK_DIGEST_FORMAT.clone()).into(); + pub static ref NODE_SCHEMA: Arc = Arc::new( StringSchema::new("Node name (or 'localhost')") .format(