fixed empty token issue for public repos

fixed 2G shells support for 2G CLPs

Author: alexazarh

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

@@ -25,7 +25,7 @@ def __init__(self, logger: Logger):
 
     @retry((HTTPError, URLError), delay=1, backoff=2, tries=5)
     def download_repo(self, url: str, token: str, branch: str = "") -> str:
-        headers = {'Authorization': f'token {token}'}
+        headers = {'Authorization': f'token {token}'} if token else None
         self._validate_github_url(url)
         url_data = self._extract_data_from_url(url, branch)
         try:

package/cloudshell/iac/terraform/services/clp_envvar_handler.py

@@ -1,6 +1,5 @@
 import os
 from abc import ABCMeta
-
 from cloudshell.iac.terraform.models.shell_helper import ShellHelperObject
 
 
@@ -13,14 +12,14 @@ def set_env_vars_based_on_clp(self):
 
     @staticmethod
     def does_attribute_match(clp_res_model, clp_attribute, attr_name_to_check) -> bool:
-        if f"{clp_res_model}.{clp_attribute.Name}" == attr_name_to_check or clp_attribute.Name == attr_name_to_check:
+        if f"{clp_res_model}.{clp_attribute.Name}" == attr_name_to_check or clp_attribute.Name == attr_name_to_check \
+                or clp_attribute.Name == f"{clp_res_model}.{attr_name_to_check}":
             return True
         return False
 
 
 class AWSCloudProviderEnvVarHandler(BaseCloudProviderEnvVarHandler):
-    def __init__(self, clp_res_model: str, clp_resource_attributes: list,
-                 shell_helper: ShellHelperObject):
+    def __init__(self, clp_res_model: str, clp_resource_attributes: list, shell_helper: ShellHelperObject):
         BaseCloudProviderEnvVarHandler.__init__(self)
         self._clp_res_model = clp_res_model
         self._clp_resource_attributes = clp_resource_attributes
@@ -49,7 +48,7 @@ def set_env_vars_based_on_clp(self):
 
 
 class AzureCloudProviderEnvVarHandler(BaseCloudProviderEnvVarHandler):
-    def __init__(self, clp_res_model, clp_resource_attributes, shell_helper):
+    def __init__(self, clp_res_model: str, clp_resource_attributes: list, shell_helper: ShellHelperObject):
         BaseCloudProviderEnvVarHandler.__init__(self)
         self._clp_res_model = clp_res_model
         self._clp_resource_attributes = clp_resource_attributes
@@ -68,7 +67,7 @@ def set_env_vars_based_on_clp(self):
 
 
 class GCPCloudProviderEnvVarHandler(BaseCloudProviderEnvVarHandler):
-    def __init__(self, clp_res_model, clp_resource_attributes, shell_helper):
+    def __init__(self, clp_res_model: str, clp_resource_attributes: list, shell_helper: ShellHelperObject):
         BaseCloudProviderEnvVarHandler.__init__(self)
         self._clp_res_model = clp_res_model
         self._clp_resource_attributes = clp_resource_attributes

package/version.txt

@@ -1 +1 @@
-1.2.1
+1.2.2