add validation that tf url is populated

Author: katzy687

package/cloudshell/iac/terraform/downloaders/downloader.py

@@ -14,6 +14,9 @@ def __init__(self, shell_helper: ShellHelperObject):
 
     def download_terraform_module(self) -> str:
         url = self._shell_helper.attr_handler.get_attribute(ATTRIBUTE_NAMES.GIT_TERRAFORM_MODULE_URL)
+        if not url:
+            raise ValueError(f"Must populate attribute '{ATTRIBUTE_NAMES.GIT_TERRAFORM_MODULE_URL}'")
+
         token_enc = self._shell_helper.attr_handler.get_attribute(ATTRIBUTE_NAMES.GIT_TOKEN)
         token = self._shell_helper.api.DecryptPassword(token_enc).Value
         branch = self._shell_helper.attr_handler.get_attribute(ATTRIBUTE_NAMES.BRANCH)

package/cloudshell/iac/terraform/downloaders/gitlab_downloader.py

@@ -28,18 +28,18 @@ class GitLabApiUrlData(CommonGitLabUrlData):
     api_endpoint: str
 
 
-def extract_data_from_natural_url(url) -> GitLabNaturalUrlData:
+def extract_data_from_raw_url(url) -> GitLabNaturalUrlData:
     """
     Take api style url and extract data
-    Sample Natural url: "http://192.168.85.26/quali_natti/terraformstuff/-/tree/test-branch/rds"
+    Sample Raw Browser url: "http://192.168.85.26/quali_natti/terraformstuff/-/tree/test-branch/rds"
     """
 
     pattern = (r'^(?P<protocol>https?)://(?P<domain>[^/]+)/(?P<user>[^/]+)/(?P<project>[^/]+)/'
                r'(-/tree/(?P<branch>[^/]+))?(?P<path>/.*)?$')
 
     match = re.match(pattern, url)
     if not match:
-        raise ValueError(f"No GitLab Natural URL match found for url '{url}'")
+        raise ValueError(f"No GitLab URL Data found in RAW url '{url}'")
 
     groups = match.groupdict()
     return GitLabNaturalUrlData(protocol=groups['protocol'],
@@ -62,7 +62,7 @@ def extract_data_from_api_url(url) -> GitLabApiUrlData:
 
     match = re.match(pattern, url)
     if not match:
-        raise ValueError(f"No GitLab API URL match found for url '{url}'")
+        raise ValueError(f"No GitLab url data found in API url '{url}'")
 
     groups = match.groupdict()
     return GitLabApiUrlData(protocol=groups['protocol'],
@@ -101,7 +101,7 @@ def download_repo(self, url: str, token: str, branch: str = "") -> str:
         if is_api_url:
             url_data = extract_data_from_api_url(url)
         else:
-            url_data = extract_data_from_natural_url(url)
+            url_data = extract_data_from_raw_url(url)
         is_https = True if url_data.protocol == "https" else False
         api_handler = GitlabApiHandler(host=url_data.domain, token=token, is_https=is_https)
         project_id = url_data.project_id if is_api_url else api_handler.get_project_id_from_name(url_data.project_name)

package/tests/integration_tests/test_gitlab_downloader.py

@@ -20,7 +20,7 @@ def test_api_url_download(self):
         self.working_dir = working_dir
         assert working_dir
 
-    def test_natural_url_download(self):
+    def test_raw_url_download(self):
         working_dir = self.downloader.download_repo(url=self.gitlab_vars.natural_url,
                                                     token=self.gitlab_vars.token,
                                                     branch=self.gitlab_vars.branch)

package/tests/unit_tests/test_gitlab_url_extractor.py

@@ -6,8 +6,8 @@ class TestGitlabDownloader(unittest.TestCase):
     NATURAL_URL = "http://192.168.85.26/quali_natti/terraformstuff/-/tree/test-branch/rds"
     API_URL = "http://192.168.85.26/api/v4/projects/2/repository/archive.zip?path=rds"
 
-    def test_natural_url(self):
-        url_data = gitlab_downloader.extract_data_from_natural_url(self.NATURAL_URL)
+    def test_raw_url(self):
+        url_data = gitlab_downloader.extract_data_from_raw_url(self.NATURAL_URL)
         assert url_data
 
     def test_api_url_extract(self):
@@ -21,4 +21,4 @@ def test_api_validate(self):
     def test_raises(self):
         url_arg = ""
         self.assertRaises(ValueError, gitlab_downloader.extract_data_from_api_url, url_arg)
-        self.assertRaises(ValueError, gitlab_downloader.extract_data_from_natural_url, url_arg)
+        self.assertRaises(ValueError, gitlab_downloader.extract_data_from_raw_url, url_arg)