fixes per PR comments

Author: dan-amzulescu

.gitignore

@@ -64,3 +64,4 @@ cloudshell_config.yml
 shells/generic_terraform_service/tests/.env
 tests/.env
 shells/backends/azure_tf_backend/tests/.env
+package/tests/integration_tests/int_tests_secrets.env

package/cloudshell/iac/terraform/constants.py

@@ -36,9 +36,14 @@
 TF_WORKING_DIR = "TF_WORKING_DIR"
 
 # CLP models
+AZURE1G_MODEL = "Microsoft Azure"
+AWS1G_MODEL = "AWS EC2"
+
 AZURE2G_MODEL = "Microsoft Azure Cloud Provider 2G"
 AWS2G_MODEL = "Amazon AWS Cloud Provider 2G"
 
+CLP_PROVIDER_MODELS = [AWS1G_MODEL, AWS2G_MODEL, AZURE1G_MODEL, AZURE2G_MODEL]
+
 # Misc
 DIRTY_CHARS = r'''
                 \x1B  # ESC

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

@@ -4,7 +4,7 @@
 
 from cloudshell.api.cloudshell_api import ResourceInfo
 
-from cloudshell.iac.terraform.constants import AZURE2G_MODEL, ATTRIBUTE_NAMES, AWS2G_MODEL
+from cloudshell.iac.terraform.constants import AZURE2G_MODEL, ATTRIBUTE_NAMES, AWS2G_MODEL, CLP_PROVIDER_MODELS
 from cloudshell.iac.terraform.models.shell_helper import ShellHelperObject
 
 
@@ -26,20 +26,11 @@ def initialize_provider(shell_helper: ShellHelperObject):
             raise ValueError(f"{clpr_res_fam} currently not supported")
 
         try:
-            if clp_res_model in ['Microsoft Azure', AZURE2G_MODEL]:
+            if clp_res_model in CLP_PROVIDER_MODELS:
                 ProviderHandler._set_cloud_env_vars(
                     clp_details,
                     clp_res_model,
-                    shell_helper,
-                    ProviderHandler._set_azure_env_vars_based_on_clp
-                )
-
-            elif clp_res_model in ['AWS EC2', AWS2G_MODEL]:
-                ProviderHandler._set_cloud_env_vars(
-                    clp_details,
-                    clp_res_model,
-                    shell_helper,
-                    ProviderHandler._set_aws_env_vars_based_on_clp
+                    shell_helper
                 )
             else:
                 shell_helper.logger.error(f"{clp_res_model} currently not supported")
@@ -54,7 +45,6 @@ def _set_cloud_env_vars(
             clp_details: ResourceInfo,
             clp_res_model: str,
             shell_helper: ShellHelperObject,
-            set_cloud_env_vars_based_on_clp: Callable
     ):
         shell_helper.sandbox_messages.write_message("initializing provider...")
         shell_helper.logger.info("Initializing Environment variables with CloudProvider details")
@@ -64,7 +54,12 @@ def _set_cloud_env_vars(
         if clp_res_model in [AZURE2G_MODEL, AWS2G_MODEL]:
             cloud_attr_name_prefix = clp_res_model + "."
 
-        set_cloud_env_vars_based_on_clp(cloud_attr_name_prefix, clp_resource_attributes, shell_helper)
+        if clp_res_model in ['AWS EC2', AWS2G_MODEL]:
+            ProviderHandler._set_aws_env_vars_based_on_clp(
+                cloud_attr_name_prefix, clp_resource_attributes, shell_helper)
+        elif clp_res_model in ['Microsoft Azure', AZURE2G_MODEL]:
+            ProviderHandler._set_azure_env_vars_based_on_clp(
+                cloud_attr_name_prefix, clp_resource_attributes, shell_helper)
 
     @staticmethod
     def _set_azure_env_vars_based_on_clp(azure_attr_name_prefix, clp_resource_attributes, shell_helper):

shells/backends/aws_tf_backend/shell-definition.yaml

@@ -22,15 +22,15 @@ node_types:
         type: string
         tags: [ setting, user_input ]
       Region Name:
-        description: The region in which the bucket resides
+        description: The region in which the bucket resides (Mendatory)
         type: string
         tags: [ setting, user_input ]
       Access Key:
-        description: AWS access key
+        description: AWS access key (Use only if Cloud Provider not specified - Must be paried with Secret Key)
         type: cloudshell.datatypes.Password
         tags: [ setting, user_input ]
       Secret Key:
-        description: AWS secret key
+        description: AWS secret key (Use only if Cloud Provider not specified - Must be paried with Access Key)
         type: cloudshell.datatypes.Password
         tags: [ setting, user_input ]
       Cloud Provider: