Merge ~sbparke/juju-lint/+git/juju-lint-1:bug/1950980 into juju-lint:master

[Steven Parker]

Modified regex to handle charm hub applications and updated test

Modification to charm name validation to handle charm hub format
  ch:amd64/bionic/TEST-CHARM12-123

Currently regex only handles blah/charm-name not blah/blah/blah/charm-name

Changed ? to * to handle this in regex

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

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

[Steven Parker (sbparke)]

This is in response to BUG https://bugs.launchpad.net/juju-lint/+bug/1950980

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

Change successfully merged at revision bded6f99e66f2ddcab54767f8184bab727c6d415

diff --git a/jujulint/util.py b/jujulint/util.py
index fc45ee6..283fa4b 100644
--- a/jujulint/util.py
+++ b/jujulint/util.py
@@ -77,7 +77,7 @@ def is_metal(machine, machine_data):
 def extract_charm_name(charm):
     """Extract the charm name using regex."""
     match = re.match(
-        r"^(?:\w+:)?(?:~[\w\.-]+/)?(?:\w+/)?([a-zA-Z0-9-]+?)(?:-\d+)?$", charm
+        r"^(?:\w+:)?(?:~[\w\.-]+/)?(?:\w+/)*([a-zA-Z0-9-]+?)(?:-\d+)?$", charm
     )
     if not match:
         raise InvalidCharmNameError("charm name '{}' is invalid".format(charm))
diff --git a/tests/test_jujulint.py b/tests/test_jujulint.py
index d865c63..d246dfc 100644
--- a/tests/test_jujulint.py
+++ b/tests/test_jujulint.py
@@ -104,6 +104,7 @@ class TestLinter:
             "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"},
+            "test-app-7": {"charm": "ch:amd64/bionic/TEST-CHARM12-123"}
         }
         linter.map_charms(applications)
         for charm in linter.model.charms: