mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Improved handling of role_version in repo_url_to_role_name
This commit is contained in:
parent
1803976a40
commit
4803e923ff
2 changed files with 4 additions and 1 deletions
|
@ -356,6 +356,8 @@ def repo_url_to_role_name(repo_url):
|
|||
trailing_path = repo_url.split('/')[-1]
|
||||
if trailing_path.endswith('.git'):
|
||||
trailing_path = trailing_path[:-4]
|
||||
if ',' in trailing_path:
|
||||
trailing_path = trailing_path.split(',')[0]
|
||||
return trailing_path
|
||||
|
||||
def json_loads(data):
|
||||
|
|
|
@ -780,6 +780,7 @@ class TestUtils(unittest.TestCase):
|
|||
|
||||
def test_repo_url_to_role_name(self):
|
||||
tests = [("http://git.example.com/repos/repo.git", "repo"),
|
||||
("ssh://git@git.example.com:repos/role-name", "role-name")]
|
||||
("ssh://git@git.example.com:repos/role-name", "role-name"),
|
||||
("ssh://git@git.example.com:repos/role-name,v0.1", "role-name")]
|
||||
for (url, result) in tests:
|
||||
self.assertEqual(ansible.utils.repo_url_to_role_name(url), result)
|
||||
|
|
Loading…
Reference in a new issue