From 52a7c2084f08a4c152026f87fb0e1ce1a5dc0a6b Mon Sep 17 00:00:00 2001 From: Alexander Shishenko Date: Thu, 30 Jan 2025 01:14:44 +0300 Subject: [PATCH] Fix project selection in credentials env --- notifico-core/src/credentials/env.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/notifico-core/src/credentials/env.rs b/notifico-core/src/credentials/env.rs index 6a098f1..3f5f0a8 100644 --- a/notifico-core/src/credentials/env.rs +++ b/notifico-core/src/credentials/env.rs @@ -30,15 +30,15 @@ impl EnvCredentialStorage { pub fn new() -> Self { let mut storage = HashMap::new(); - let re = Regex::new("^NOTIFICO_CRED_(?:([[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12})_)?(.+)$").unwrap(); + let re = Regex::new("^NOTIFICO_CRED_(?:([[:xdigit:]]{8}_[[:xdigit:]]{4}_[[:xdigit:]]{4}_[[:xdigit:]]{4}_[[:xdigit:]]{12})_)?(.+)$").unwrap(); for (name, value) in std::env::vars() { let Some(captures) = re.captures(&name) else { continue; }; - let project = captures - .get(1) - .map_or_else(Uuid::nil, |m| Uuid::parse_str(m.as_str()).unwrap()); + let project = captures.get(1).map_or_else(Uuid::nil, |m| { + Uuid::parse_str(&m.as_str().replace("_", "-")).unwrap() + }); let name = captures.get(2).unwrap().as_str(); let credential = RawCredential::from_str(&value).unwrap();