Merge ~chris.sanders/juju-lint/+git/csanders:1814135 into juju-lint:master

[Chris Sanders]

Handle hyphen in charm user names

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

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

[Joel Sing (jsing)]

review: Needs Fixing

[Chris Sanders (chris.sanders)]

Updates applied, resubmitting

review: Needs Resubmitting

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision dbd758bdbd6ac6fcf1b409a231c2fa7c9eb898d7

diff --git a/jujulint.py b/jujulint.py
index 5aae9ff..a3d1e0f 100755
--- a/jujulint.py
+++ b/jujulint.py
@@ -36,6 +36,10 @@ import attr
 #  - info mode, e.g. num of machines, version (e.g. look at ceph), architecture
 
 
+class InvalidCharmNameError(Exception):
+    pass
+
+
 @attrs
 class ModelInfo(object):
     # Info obtained from juju status data
@@ -265,8 +269,10 @@ def results(model):
 def map_charms(applications, model):
     for app in applications:
         charm = applications[app]["charm"]
-        match = re.search(r'^(\w+:)?(~\w+/)?(\w+/)?([a-zA-Z0-9-]+?)(-\d+)?$', charm)
-        charm = match.group(4)
+        match = re.match(r'^(?:\w+:)?(?:~[\w-]+/)?(?:\w+/)?([a-zA-Z0-9-]+?)(?:-\d+)?$', charm)
+        if not match:
+            raise InvalidCharmNameError("charm name '{}' is invalid".format(charm))
+        charm = match.group(1)
         model.charms.add(charm)
         model.app_to_charm[app] = charm
 
diff --git a/tests/test_jujulint.py b/tests/test_jujulint.py
index 187adc5..acf5cdc 100644
--- a/tests/test_jujulint.py
+++ b/tests/test_jujulint.py
@@ -23,7 +23,11 @@ class TestJujuLint(unittest.TestCase):
                         'test-app-3': {'charm': "cs:TEST-CHARM12-123"},
                         'test-app-4': {'charm': "local:SERIES/TEST-CHARM12"},
                         'test-app-5': {'charm': "local:TEST-CHARM12"},
+                        'test-app-6': {'charm': "cs:~TEST-CHARMERS/TEST-CHARM12-123"},
                         }
         jujulint.map_charms(applications, model)
         for charm in model.charms:
             self.assertEqual("TEST-CHARM12", charm)
+        applications = {'test-app1': {'charm': "cs:invalid-charm$"}, }
+        with self.assertRaises(jujulint.InvalidCharmNameError):
+            jujulint.map_charms(applications, model)