[pbs-devel] [PATCH proxmox-backup] api types: fix non-capturing group syntax

[pbs-devel] [PATCH proxmox-backup] api types: fix non-capturing group syntax

[Dominik Csapak]

a non capturing group is '(?:)' not '(:?)' so fix that.
None of these regexes are used where would use capturing groups.
DATASTORE_MAP_REGEX and TAPE_RESTORE_SNAPSHOT_REGEX are only used
as api types and BLOCKDEVICE_NAME_REGEX is only used once outside of the
api and there we also don't look at the capturing groups.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 pbs-api-types/src/datastore.rs | 2 +-
 pbs-api-types/src/lib.rs       | 2 +-
 pbs-api-types/src/tape/mod.rs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index 7f8c1f09..73c4890e 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -34,7 +34,7 @@ const_regex! {
     pub SNAPSHOT_PATH_REGEX = concat!(r"^", SNAPSHOT_PATH_REGEX_STR!(), r"$");
     pub GROUP_OR_SNAPSHOT_PATH_REGEX = concat!(r"^", GROUP_OR_SNAPSHOT_PATH_REGEX_STR!(), r"$");
 
-    pub DATASTORE_MAP_REGEX = concat!(r"^(:?", PROXMOX_SAFE_ID_REGEX_STR!(), r"=)?", PROXMOX_SAFE_ID_REGEX_STR!(), r"$");
+    pub DATASTORE_MAP_REGEX = concat!(r"^(?:", PROXMOX_SAFE_ID_REGEX_STR!(), r"=)?", PROXMOX_SAFE_ID_REGEX_STR!(), r"$");
 }
 
 pub const CHUNK_DIGEST_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SHA256_HEX_REGEX);
diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs
index ec8b1f34..2a5c1932 100644
--- a/pbs-api-types/src/lib.rs
+++ b/pbs-api-types/src/lib.rs
@@ -190,7 +190,7 @@ const_regex! {
         "):)?(?:([0-9]{1,5}):)?(", PROXMOX_SAFE_ID_REGEX_STR!(), r")$"
     );
 
-    pub BLOCKDEVICE_NAME_REGEX = r"^(:?(:?h|s|x?v)d[a-z]+)|(:?nvme\d+n\d+)$";
+    pub BLOCKDEVICE_NAME_REGEX = r"^(?:(?:h|s|x?v)d[a-z]+)|(?:nvme\d+n\d+)$";
     pub SUBSCRIPTION_KEY_REGEX = concat!(r"^pbs(?:[cbsp])-[0-9a-f]{10}$");
 }
 
diff --git a/pbs-api-types/src/tape/mod.rs b/pbs-api-types/src/tape/mod.rs
index 747b0bcd..99d7cb74 100644
--- a/pbs-api-types/src/tape/mod.rs
+++ b/pbs-api-types/src/tape/mod.rs
@@ -30,7 +30,7 @@ use proxmox_uuid::Uuid;
 use crate::{BackupType, BACKUP_ID_SCHEMA, FINGERPRINT_SHA256_FORMAT};
 
 const_regex! {
-    pub TAPE_RESTORE_SNAPSHOT_REGEX = concat!(r"^", PROXMOX_SAFE_ID_REGEX_STR!(), r":(:?", BACKUP_NS_PATH_RE!(),")?", SNAPSHOT_PATH_REGEX_STR!(), r"$");
+    pub TAPE_RESTORE_SNAPSHOT_REGEX = concat!(r"^", PROXMOX_SAFE_ID_REGEX_STR!(), r":(?:", BACKUP_NS_PATH_RE!(),")?", SNAPSHOT_PATH_REGEX_STR!(), r"$");
 }
 
 pub const TAPE_RESTORE_SNAPSHOT_FORMAT: ApiStringFormat =
-- 
2.30.2

[pbs-devel] applied: [PATCH proxmox-backup] api types: fix non-capturing group syntax

[Thomas Lamprecht]

Am 30/03/2023 um 09:20 schrieb Dominik Csapak:
> a non capturing group is '(?:)' not '(:?)' so fix that.
> None of these regexes are used where would use capturing groups.
> DATASTORE_MAP_REGEX and TAPE_RESTORE_SNAPSHOT_REGEX are only used
> as api types and BLOCKDEVICE_NAME_REGEX is only used once outside of the
> api and there we also don't look at the capturing groups.
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  pbs-api-types/src/datastore.rs | 2 +-
>  pbs-api-types/src/lib.rs       | 2 +-
>  pbs-api-types/src/tape/mod.rs  | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
>

applied, thanks!

Re: [pbs-devel] [PATCH proxmox-backup] api types: fix non-capturing group syntax

[Thomas Lamprecht]

Am 30/03/2023 um 09:20 schrieb Dominik Csapak:
> a non capturing group is '(?:)' not '(:?)' so fix that.
> None of these regexes are used where would use capturing groups.
> DATASTORE_MAP_REGEX and TAPE_RESTORE_SNAPSHOT_REGEX are only used
> as api types and BLOCKDEVICE_NAME_REGEX is only used once outside of the
> api and there we also don't look at the capturing groups.
> 

argh, noticed this to late to amend but here you missed adding a trailer:

Reported-by: Stefan Sterz <s.sterz@proxmox.com>

> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---