fixed gitlab regex bug not identifying multi-digit project repos. added more logging + unit tests for http-request

Author: katzy687

2G-Service/admin-ansible-config-2g/shell-definition.yaml

@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0
 metadata:
   template_name: Admin Ansible Config 2G
   template_author: Quali
-  template_version: 1.0.2
+  template_version: 1.0.3
   template_icon: shell-icon.png
 
 description: >

2G-Service/admin-ansible-config-2g/src/helper_code/gitlab_api_url_validator.py

@@ -13,7 +13,7 @@ def is_base_path_gitlab_api(url):
     ex input - http://192.168.85.62/api/v4/projects/4/repository/files/hello_world.sh/raw?ref=master
     :param str url: the user input url
     """
-    base_path_pattern = "api/v\d/projects/\d/repository/files"
+    base_path_pattern = "api/v\d/projects/\d+/repository/files"
     matching = re.search(base_path_pattern, url)
     if not matching:
         return False
@@ -32,7 +32,7 @@ def validate_full_path_gitlab_url(url):
         raise Exception("Gitlab Base Path validation failed. Should be of form '{}'".format(BASE_PATH_SAMPLE))
 
     # VALIDATE ENTIRE GITLAB URL STRING
-    gitlab_api_pattern = "https?://.+/api/v\d/projects/\d/repository/files/.+/raw\?ref=.+"
+    gitlab_api_pattern = "https?://.+/api/v\d+/projects/\d/repository/files/.+/raw\?ref=.+"
     matching = re.match(gitlab_api_pattern, url)
     if not matching:
         sample_url = "http://<SERVER_IP>/api/4/projects/<PROJECT_ID>/repository/files/<PROJECT_PATH>/raw?ref=<GIT_BRANCH>"

2G-Service/ansible-config-2g/shell-definition.yaml

@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0
 metadata:
   template_name: Ansible Config 2G
   template_author: Quali
-  template_version: 1.0.2
+  template_version: 1.0.3
   template_icon: shell-icon.png
 
 description: >

2G-Service/ansible-config-2g/src/helper_code/gitlab_api_url_validator.py

@@ -13,7 +13,7 @@ def is_base_path_gitlab_api(url):
     ex input - http://192.168.85.62/api/v4/projects/4/repository/files/hello_world.sh/raw?ref=master
     :param str url: the user input url
     """
-    base_path_pattern = "api/v\d/projects/\d/repository/files"
+    base_path_pattern = "api/v\d/projects/\d+/repository/files"
     matching = re.search(base_path_pattern, url)
     if not matching:
         return False
@@ -32,7 +32,7 @@ def validate_full_path_gitlab_url(url):
         raise Exception("Gitlab Base Path validation failed. Should be of form '{}'".format(BASE_PATH_SAMPLE))
 
     # VALIDATE ENTIRE GITLAB URL STRING
-    gitlab_api_pattern = "https?://.+/api/v\d/projects/\d/repository/files/.+/raw\?ref=.+"
+    gitlab_api_pattern = "https?://.+/api/v\d/projects/\d+/repository/files/.+/raw\?ref=.+"
     matching = re.match(gitlab_api_pattern, url)
     if not matching:
         sample_url = "http://<SERVER_IP>/api/4/projects/<PROJECT_ID>/repository/files/<PROJECT_PATH>/raw?ref=<GIT_BRANCH>"