all lists on lists.proxmox.com
 help / color / mirror / Atom feed
* [pbs-devel] [RFC PATCH] fix #3039: use the same ID regex for info and api
@ 2020-11-02 12:08 Dominik Csapak
  2020-11-03  5:38 ` [pbs-devel] applied: " Dietmar Maurer
  0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2020-11-02 12:08 UTC (permalink / raw)
  To: pbs-devel

in the api we use PROXMOX_SAFE_ID_REGEX for backup ids, but here
(where we use it to list them) we use a local regex

since the first is a superset of the one used here, simply extend
the local one

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
i mean we *could* refactor that regex to a place where we could
use it from both places (tools? proxmox crate?), but is it worth it for
the 3 character changes?

 src/backup/backup_info.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backup/backup_info.rs b/src/backup/backup_info.rs
index 3ace44dc..c5d245e9 100644
--- a/src/backup/backup_info.rs
+++ b/src/backup/backup_info.rs
@@ -9,7 +9,7 @@ use lazy_static::lazy_static;
 
 use super::manifest::MANIFEST_BLOB_NAME;
 
-macro_rules! BACKUP_ID_RE { () => (r"[A-Za-z0-9][A-Za-z0-9_-]+") }
+macro_rules! BACKUP_ID_RE { () => (r"[A-Za-z0-9_][A-Za-z0-9._\-]*") }
 macro_rules! BACKUP_TYPE_RE { () => (r"(?:host|vm|ct)") }
 macro_rules! BACKUP_TIME_RE { () => (r"[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z") }
 
-- 
2.20.1





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [pbs-devel] applied: [RFC PATCH] fix #3039: use the same ID regex for info and api
  2020-11-02 12:08 [pbs-devel] [RFC PATCH] fix #3039: use the same ID regex for info and api Dominik Csapak
@ 2020-11-03  5:38 ` Dietmar Maurer
  0 siblings, 0 replies; 2+ messages in thread
From: Dietmar Maurer @ 2020-11-03  5:38 UTC (permalink / raw)
  To: Proxmox Backup Server development discussion, Dominik Csapak

aplied

> i mean we *could* refactor that regex to a place where we could
> use it from both places (tools? proxmox crate?), but is it worth it for
> the 3 character changes?

I applied a cleanup on top to share the regex.




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-11-03  5:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-02 12:08 [pbs-devel] [RFC PATCH] fix #3039: use the same ID regex for info and api Dominik Csapak
2020-11-03  5:38 ` [pbs-devel] applied: " Dietmar Maurer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal