Merge ~aluria/charm-openstack-service-checks/+git/charm-openstack-service-checks:bug/1859619 into ~canonical-bootstack/charm-openstack-service-checks:master

[Alvaro Uria]

LP#1859619: Expand allowed host aggregate name convention

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Peter Sabaini (peter-sabaini)]

lgtm +1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision e9f993ef752cbc5b824c12c94be26c04a98aea41

diff --git a/lib/lib_openstack_service_checks.py b/lib/lib_openstack_service_checks.py
index 3e4adea..9d123fb 100644
--- a/lib/lib_openstack_service_checks.py
+++ b/lib/lib_openstack_service_checks.py
@@ -138,7 +138,7 @@ class OSCHelper():
         skipped_aggregates = self.charm_config.get('skipped_host_aggregates')
         # We have to make sure there are no malicious injections in the code
         # as this gets passed to a python script via bash
-        regex = r'(\w+[,\w+]*)'
+        regex = r'([\w_-]+(?:,[\w_-]+)*)'
         sanitized = ",".join(re.findall(regex, skipped_aggregates))
         sanitized = [s for s in sanitized.split(',') if s != ""]
         sanitized = ",".join(sanitized)