Merge ~sombrafam/ua-reviewkit:fix-regex-parsing into ua-reviewkit:master

[Erlon R. Cruz]

[Jorge Niedbalski (niedbalski)]

can you can you put an example of the regex you want to cover?

review: Needs Information

[Edward Hope-Morley (hopem)]

If you could add an example that matches that regex to https://git.launchpad.net/ua-reviewkit/tree/juju/example-pass-bundle.yaml that's be great.

review: Needs Fixing

[Erlon R. Cruz (sombrafam)]

Done, also added 2 more edge cases to the regex.

[Edward Hope-Morley (hopem)]

Looks good, im getting pep8 errors though:

$ pep8 juju/ua-bundle-check.py
juju/ua-bundle-check.py:221:26: E231 missing whitespace after ','
juju/ua-bundle-check.py:221:36: E231 missing whitespace after ','
juju/ua-bundle-check.py:570:26: E231 missing whitespace after ','
juju/ua-bundle-check.py:570:36: E231 missing whitespace after ','

Can you fix those?

[Erlon R. Cruz (sombrafam)]

Done

[Erlon R. Cruz (sombrafam)]

> Done

diff --git a/juju/example-pass-bundle.yaml b/juju/example-pass-bundle.yaml
index e1394a4..d9a02e7 100644
--- a/juju/example-pass-bundle.yaml
+++ b/juju/example-pass-bundle.yaml
@@ -8,11 +8,26 @@ applications:
       innodb-buffer-pool-size: 6G
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute-492
-    num_units: 1 
+    num_units: 1
     options:
-      cpu-model: Skylake-Server-IBRS 
+      cpu-model: Skylake-Server-IBRS
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server-367
     num_units: 3
     options:
       cluster-partition-handling: "ignore"
+  elasticsearch:
+    charm: /home/ubuntu/charms/elasticsearch
+    num_units: 3
+    options:
+      es-heap-size: 6
+  kubernetes:
+    charm: ./charms/kubernetes
+    num_units: 3
+    options:
+      es-heap-size: 6
+  nova-cloud-controller:
+    charm: ~/charms/nova-cloud-controller
+    num_units: 3
+    options:
+      es-heap-size: 6
diff --git a/juju/ua-bundle-check.py b/juju/ua-bundle-check.py
index 9342729..1d88db2 100755
--- a/juju/ua-bundle-check.py
+++ b/juju/ua-bundle-check.py
@@ -39,7 +39,8 @@ UA Juju bundle config verification
 """
 HEADER_TEMPLATE += "=" * 80
 # e.g. cs:barbican-vault-123 or ./barbican-vault
-CHARM_REGEX_TEMPLATE = "^cs:(~.+/)?{}[-]?[0-9]*$|^[\/\.]*{}$"
+CHARM_REGEX_TEMPLATE = "^cs:(~.+/)?{}[-]?[0-9]*$|" \
+                       "^[\/\.]*{}$|^(\.?|~)(/[^/ ]*)+/?{}$"
 
 
 class Logger(object):
@@ -216,8 +217,8 @@ class LocalAssertionHelpers(AssertionBase):
         regex_str = value
         for app in self.bundle_apps:
             charm = self.bundle_apps[app].get('charm')
-            r = re.compile(CHARM_REGEX_TEMPLATE.format(regex_str,
-                                                       regex_str)).match(charm)
+            r = re.compile(CHARM_REGEX_TEMPLATE.format(
+                regex_str, regex_str, regex_str)).match(charm)
             if r:
                 ret.reason = ("charm {} found in bundle - skipping check".
                               format(charm))
@@ -565,8 +566,8 @@ class UABundleChecker(object):
         for app in self.bundle_apps:
             regex_str = self.charm_regex
             charm = self.bundle_apps[app].get('charm')
-            r = re.compile(CHARM_REGEX_TEMPLATE.format(regex_str,
-                                                       regex_str)).match(charm)
+            r = re.compile(CHARM_REGEX_TEMPLATE.format(
+                regex_str, regex_str, regex_str)).match(charm)
             if r:
                 self.charm_name = r[0]
                 self.applications.append(app)