bug fixes

Author: dan-amzulescu

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

@@ -1,8 +1,6 @@
 import os
 from abc import ABCMeta
 
-# from cloudshell.api.cloudshell_api import ResourceAttribute
-
 from cloudshell.iac.terraform.models.shell_helper import ShellHelperObject
 
 
@@ -14,13 +12,10 @@ def set_env_vars_based_on_clp(self):
         raise NotImplementedError()
 
     @staticmethod
-    def get_attribute_value(clp_res_model, clp_attribute, attr_name_to_check, shell_helper, decrypt=False) -> str:
+    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 decrypt:
-                return shell_helper.api.DecryptPassword(clp_attribute.Value).Value
-            else:
-                return clp_attribute.Value
-        return ""
+            return True
+        return False
 
 
 class AWSCloudProviderEnvVarHandler(BaseCloudProviderEnvVarHandler):
@@ -31,17 +26,17 @@ def __init__(self, clp_res_model: str, clp_resource_attributes: list,
         self._clp_resource_attributes = clp_resource_attributes
         self._shell_helper = shell_helper
 
-    def set_aws_env_vars_based_on_clp(self):
+    def set_env_vars_based_on_clp(self):
         dec_access_key = ""
         dec_secret_key = ""
         region_flag = False
 
         for attr in self._clp_resource_attributes:
-            dec_access_key = self.get_attribute_value(
-                self._clp_res_model, attr, "AWS Access Key ID", self._shell_helper, True)
-            dec_secret_key = self.get_attribute_value(
-                self._clp_res_model, attr, "AWS Secret Access Key", self._shell_helper, True)
-            if self.get_attribute_value(self._clp_res_model, attr, self._shell_helper, "Region"):
+            if self.does_attribute_match(self._clp_res_model, attr, "AWS Access Key ID"):
+                dec_access_key = self._shell_helper.api.DecryptPassword(attr.Value).Value
+            if self.does_attribute_match(self._clp_res_model, attr, "AWS Secret Access Key"):
+                dec_secret_key = self._shell_helper.api.DecryptPassword(attr.Value).Value
+            if self.does_attribute_match(self._clp_res_model, attr, "Region"):
                 os.environ["AWS_DEFAULT_REGION"] = attr.Value
                 region_flag = True
         if not region_flag:
@@ -60,17 +55,17 @@ def __init__(self, clp_res_model, clp_resource_attributes, shell_helper):
         self._clp_resource_attributes = clp_resource_attributes
         self._shell_helper = shell_helper
 
-    def _set_azure_env_vars_based_on_clp(self):
+    def set_env_vars_based_on_clp(self):
         for attr in self._clp_resource_attributes:
-            attr_val = self.get_attribute_value(self._clp_res_model, attr, self._shell_helper, "Azure Subscription ID")
+            attr_val = self.does_attribute_match(self._clp_res_model, attr, self._shell_helper, "Azure Subscription ID")
             if attr_val:
                 os.environ["ARM_SUBSCRIPTION_ID"] = attr_val
-            attr_val = self.get_attribute_value(self._clp_res_model, attr, self._shell_helper, "Azure Tenant ID")
+            attr_val = self.does_attribute_match(self._clp_res_model, attr, self._shell_helper, "Azure Tenant ID")
             if attr_val:
                 os.environ["Azure Tenant ID"] = attr_val
-            attr_val = self.get_attribute_value(self._clp_res_model, attr, self._shell_helper, "Azure Application ID")
+            attr_val = self.does_attribute_match(self._clp_res_model, attr, self._shell_helper, "Azure Application ID")
             if attr_val:
                 os.environ["ARM_CLIENT_ID"] = attr_val
-            attr_val = self.get_attribute_value(self._clp_res_model, attr, self._shell_helper, "Azure Application Key", True)
+            attr_val = self.does_attribute_match(self._clp_res_model, attr, self._shell_helper, "Azure Application Key", True)
             if attr_val:
                 os.environ["ARM_CLIENT_SECRET"] = attr_val

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

@@ -13,8 +13,7 @@ class ProviderHandler(object):
     def __init__(self, logger: Logger):
         self.logger = logger
 
-    @staticmethod
-    def initialize_provider(shell_helper: ShellHelperObject):
+    def initialize_provider(self, shell_helper: ShellHelperObject):
         clp_resource_name = shell_helper.attr_handler.get_attribute(ATTRIBUTE_NAMES.CLOUD_PROVIDER)
         if not clp_resource_name:
             return
@@ -28,11 +27,7 @@ def initialize_provider(shell_helper: ShellHelperObject):
 
         try:
             if clp_res_model in CLP_PROVIDER_MODELS:
-                ProviderHandler._set_cloud_env_vars(
-                    clp_details,
-                    clp_res_model,
-                    shell_helper
-                )
+                self._set_cloud_env_vars(clp_details, clp_res_model, shell_helper)
             else:
                 shell_helper.logger.error(f"{clp_res_model} currently not supported")
                 raise ValueError(f"{clp_res_model} currently not supported")

package/cloudshell/iac/terraform/terraform_shell.py

@@ -20,6 +20,7 @@ def __init__(self, driver_context: ResourceCommandContext,
         self._tf_service = ObjectFactory.create_tf_service(driver_context)
         self._logger = logger
         self._config = config or TerraformShellConfig()
+        self._provider_handler = ProviderHandler(self._logger)
 
     def execute_terraform(self):
         # initialize a logger if logger wasn't passed during init
@@ -36,7 +37,7 @@ def _execute_procedure(self, sandbox_data_handler: SandboxDataHandler, shell_hel
             tf_proc_executer = ObjectFactory.create_tf_proc_executer(self._config, sandbox_data_handler,
                                                                      shell_helper, tf_working_dir)
             if tf_proc_executer.can_execute_run():
-                ProviderHandler.initialize_provider(shell_helper)
+                self._provider_handler.initialize_provider(shell_helper)
                 tf_proc_executer.init_terraform()
                 tf_proc_executer.tag_terraform()
                 tf_proc_executer.plan_terraform()
@@ -67,7 +68,7 @@ def _destroy_procedure(self, sandbox_data_handler: SandboxDataHandler, shell_hel
             self._handle_error_output(shell_helper, "Destroy failed due to missing local directory")
 
         try:
-            ProviderHandler.initialize_provider(shell_helper)
+            self._provider_handler.initialize_provider(shell_helper)
             tf_proc_executer = ObjectFactory.create_tf_proc_executer(self._config, sandbox_data_handler,
                                                                      shell_helper, tf_working_dir)
             if tf_proc_executer.can_destroy_run():