From ba0a511cf2938cea9036d91baca184b5d7e615e5 Mon Sep 17 00:00:00 2001 From: asthLucas Date: Thu, 1 Oct 2020 09:59:59 -0300 Subject: [PATCH 1/5] Allows GitLab SSH URL on pack actions --- st2common/st2common/util/pack_management.py | 5 ++--- st2common/tests/unit/test_pack_management.py | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/st2common/st2common/util/pack_management.py b/st2common/st2common/util/pack_management.py index c2e7095a49..5099771add 100644 --- a/st2common/st2common/util/pack_management.py +++ b/st2common/st2common/util/pack_management.py @@ -394,12 +394,11 @@ def get_repo_url(pack, proxy_config=None): def eval_repo_url(repo_url): """ - Allow passing short GitHub style URLs. + Allow passing short GitHub or GitLab SSH style URLs. """ if not repo_url: raise Exception('No valid repo_url provided or could be inferred.') - - if repo_url.startswith("file://"): + if repo_url.startswith("gitlab@") or repo_url.startswith("file://"): return repo_url else: if len(repo_url.split('/')) == 2 and 'git@' not in repo_url: diff --git a/st2common/tests/unit/test_pack_management.py b/st2common/tests/unit/test_pack_management.py index 536a2d1eaa..abc0498489 100644 --- a/st2common/tests/unit/test_pack_management.py +++ b/st2common/tests/unit/test_pack_management.py @@ -45,6 +45,9 @@ def test_eval_repo(self): result = eval_repo_url('git@github.com:StackStorm/st2contrib.git') self.assertEqual(result, 'git@github.com:StackStorm/st2contrib.git') + result = eval_repo_url('gitlab@gitlab.com:StackStorm/st2contrib.git') + self.assertEqual(result, 'gitlab@gitlab.com:StackStorm/st2contrib.git') + repo_url = 'https://github.com/StackStorm/st2contrib.git' result = eval_repo_url(repo_url) self.assertEqual(result, repo_url) From 3bf1134ef28bec7840ae96a12a9bb4ea254c99f7 Mon Sep 17 00:00:00 2001 From: asthLucas Date: Fri, 2 Oct 2020 11:47:38 -0300 Subject: [PATCH 2/5] Update CHANGELOG.rst --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 43d317b942..308edc90ba 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -31,6 +31,8 @@ Added Contributed by @amanda11 +* Added support for GitLab SSH URLs on pack install and download actions. (improvement) #5050 + Contributed by @asthLucas Changed ~~~~~~~ From 37ac0d0f8011913ecf98529dadf7a601441c3465 Mon Sep 17 00:00:00 2001 From: Eugen Cusmaunsa Date: Mon, 16 Nov 2020 15:46:46 +0000 Subject: [PATCH 3/5] Update development changelog for the #5050 --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 62411bc00c..eb40baf274 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,11 @@ Changelog in development -------------- +Added +~~~~~ +* Added support for GitLab SSH URLs on pack install and download actions. (improvement) #5050 + Contributed by @asthLucas + Changed ~~~~~~~~~ * Improve the st2-self-check script to echo to stderr and exit if it isn't run with a From 6cd0c8601fec0ad5cb9407b903e43858ef941abb Mon Sep 17 00:00:00 2001 From: Eugen Cusmaunsa Date: Mon, 16 Nov 2020 15:54:29 +0000 Subject: [PATCH 4/5] Update development changelog for the #5050 --- CHANGELOG.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index eb40baf274..a691c3e002 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -44,9 +44,6 @@ Added Contributed by @amanda11 -* Added support for GitLab SSH URLs on pack install and download actions. (improvement) #5050 - Contributed by @asthLucas - Changed ~~~~~~~ * Switch to MongoDB ``4.0`` as the default version starting with all supported OS's in st2 From ca982b8dfc46b414f14c5d1e020dd7a2d3edef35 Mon Sep 17 00:00:00 2001 From: Amanda McGuinness Date: Tue, 19 Jan 2021 20:04:04 +0000 Subject: [PATCH 5/5] Update CHANGELOG.rst --- CHANGELOG.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8b7189d3e6..595cc2a0a2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,6 @@ Added * Added support for GitLab SSH URLs on pack install and download actions. (improvement) #5050 Contributed by @asthLucas -======= * Added st2-rbac-backend pip requirements for RBAC integration. (new feature) #5086 Contributed by @hnanchahal