update configuration

Author: oleksandr-r-q

package/cloudshell/iac/terraform/constants.py

@@ -42,10 +42,9 @@
 AZURE2G_MODEL = "Microsoft Azure Cloud Provider 2G"
 AWS2G_MODEL = "Amazon AWS Cloud Provider 2G"
 
-GCP1G_MODEL = "Google Cloud Provider"
-# GCP2G_MODEL = "Google Cloud Provider 2G"
+GCP2G_MODEL = "Google Cloud Provider"
 
-CLP_PROVIDER_MODELS = [AWS1G_MODEL, AWS2G_MODEL, AZURE1G_MODEL, AZURE2G_MODEL, GCP1G_MODEL]
+CLP_PROVIDER_MODELS = [AWS1G_MODEL, AWS2G_MODEL, AZURE1G_MODEL, AZURE2G_MODEL, GCP2G_MODEL]
 
 # Misc
 DIRTY_CHARS = r'''

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

@@ -80,11 +80,9 @@ def set_env_vars_based_on_clp(self):
         for attr in self._clp_resource_attributes:
             if self.does_attribute_match(self._clp_res_model, attr, "Google Cloud Provider.Credentials Json Path"):
                 os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = attr.Value
-                self._shell_helper.sandbox_messages.write_message(f"GOOGLE_APPLICATION_CREDENTIALS: {attr.Value}")
                 cred_flag = True
             if self.does_attribute_match(self._clp_res_model, attr, "Google Cloud Provider.project"):
                 os.environ["GOOGLE_PROJECT"] = attr.Value
-                self._shell_helper.sandbox_messages.write_message(f"GOOGLE_PROJECT: {attr.Value}")
                 project_flag = True
         if not cred_flag and not project_flag:
             self._shell_helper.sandbox_messages.write_message("Project ID was not found on GCP Cloud Provider")

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

@@ -3,7 +3,7 @@
 from cloudshell.api.cloudshell_api import ResourceInfo
 
 from cloudshell.iac.terraform.constants import AZURE2G_MODEL, ATTRIBUTE_NAMES, AWS2G_MODEL, CLP_PROVIDER_MODELS, \
-    AWS1G_MODEL, AZURE1G_MODEL, GCP1G_MODEL
+    AWS1G_MODEL, AZURE1G_MODEL, GCP2G_MODEL
 from cloudshell.iac.terraform.models.shell_helper import ShellHelperObject
 from cloudshell.iac.terraform.services.clp_envvar_handler import AWSCloudProviderEnvVarHandler, \
     AzureCloudProviderEnvVarHandler, GCPCloudProviderEnvVarHandler
@@ -53,7 +53,7 @@ def _set_cloud_env_vars(
         elif clp_res_model in [AZURE1G_MODEL, AZURE2G_MODEL]:
             clp_handler = AzureCloudProviderEnvVarHandler(clp_res_model, clp_resource_attributes, shell_helper)
 
-        elif clp_res_model in [GCP1G_MODEL]:
+        elif clp_res_model in [GCP2G_MODEL]:
             clp_handler = GCPCloudProviderEnvVarHandler(clp_res_model, clp_resource_attributes, shell_helper)
 
         if clp_handler:

shells/backends/gcp_tf_backend/src/constants.py

@@ -1,6 +1,5 @@
-GCP1G_MODEL = "Google Cloud Provider"
-# GCP2G_MODEL = "Google Cloud Provider 2G"
-GCP_MODELS = [GCP1G_MODEL]
+GCP2G_MODEL = "Google Cloud Provider"
+GCP_MODELS = [GCP2G_MODEL]
 
 CREDENTIALS_JSON_PATH = 'Credentials Json Path'
 AUTH_URI = 'https://accounts.google.com/o/oauth2/auth'

shells/backends/gcp_tf_backend/src/driver.py

@@ -63,9 +63,8 @@ def get_inventory(self, context):
                 gcp_service = self._can_conntect_to_gcp(context, logger)
                 if not gcp_service:
                     self._raise_and_log(logger, "There was an issue accessing GCP, please check authentication credentials.")
-                # raise ValueError("Can't connect to GCP")
             except Exception as e:
-                logger.exception(f"There was an issue initialization GCP provider resource. {e}")
+                self._raise_and_log(logger, f"There was an issue initialization GCP provider resource. {e}")
             return AutoLoadDetails([], [])
 
     # </editor-fold>
@@ -75,9 +74,9 @@ def _validate_bucket_exists(self, bucket_name: str, context, logger):
             storage_client = storage.Client()
             get_bucket = storage_client.get_bucket(bucket_name)
             if len(str(get_bucket)) < 0:
-                raise ValueError(f"Bucket {bucket_name} not found")
+                self._raise_and_log(logger, f"Bucket {bucket_name} not found")
         except Exception as e:
-            logger.exception(f"There was an issue accessing the bucket {bucket_name}.{e}")
+            self._raise_and_log(logger, f"There was an issue accessing the bucket {bucket_name}.{e}")
 
     def _can_conntect_to_gcp(self, context, logger) -> bool:
         gcp_backend_resource = GcpTfBackend.create_from_context(context)
@@ -99,7 +98,7 @@ def get_backend_data(self, context, tf_state_unique_name: str) -> str:
                 os.environ[GOOGLE_APPLICATION_CREDENTIALS] = gcp_service
                 os.environ["GOOGLE_PROJECT"] = project_id
             except Exception as e:
-                logger.exception("Inputs for Cloud Backend Access missing or incorrect")
+                self._raise_and_log(logger, f"Inputs for Cloud Backend Access missing or incorrect.{e}")
             tf_state_file_string = self._generate_state_file_string(gcp_backend_resource, tf_state_unique_name)
             backend_data = {"tf_state_file_string": tf_state_file_string}
             logger.info(f"Returning backend data for creating provider file :\n{backend_data}")
@@ -119,14 +118,14 @@ def delete_tfstate_file(self, context, tf_state_unique_name: str):
                 """Delete object under folder"""
                 blobs = list(bucket.list_blobs(prefix=tf_state_unique_name))
                 if len(blobs) == 0:
-                    logger.exception(f"Folder {tf_state_unique_name} not exists.")
+                    self._raise_and_log(logger, f"Folder {tf_state_unique_name} not exists.")
                 elif len(blobs) > 1:
-                    logger.exception(f"There are more than 1 Folder {tf_state_unique_name} currenlty {len(blobs)} folders exist.")
+                    self._raise_and_log(logger, f"There are more than 1 Folder {tf_state_unique_name} currenlty {len(blobs)} folders exist.")
                 else:
                     bucket.delete_blobs(blobs)
                     logger.info(f"Folder {tf_state_unique_name} deleted.")
             except Exception as e:
-                logger.exception(f"{tf_state_unique_name} file was not removed from backend provider")
+                self._raise_and_log(logger, f"{tf_state_unique_name} file was not removed from backend provider.{e}")
 
     def _generate_state_file_string(self, gcp_backend_resource: GcpTfBackend, tf_state_unique_name: str):
         tf_state_file_string = f'terraform {{\n\
@@ -146,14 +145,14 @@ def _create_gcp_session(self, context, project_id: str, logger):
         # json_path defines on GCP TF BACKEND RESOURCE
         if json_path:
             if gcp_backend_resource.cloud_provider:
-                logger.exception("Only one method of authentication should be filled")
+                self._raise_and_log(logger, "Only one method of authentication should be filled")
             os.environ[GOOGLE_APPLICATION_CREDENTIALS] = json_path
             os.environ["GOOGLE_PROJECT"] = project_id
         # Keys not defines on GCP TF BACKEND RESOURCE (CLP reference should have been set)
         else:
             # CLP had not been set...
             if not gcp_backend_resource.cloud_provider:
-                logger.exception("At least one method of authentication should be filled")
+                self._raise_and_log(logger, "At least one method of authentication should be filled")
 
             # Check a correct CLP has been reference
             clp_details = api.GetResourceDetails
@@ -178,8 +177,7 @@ def _get_and_validate_clp(self, clp_details, gcp_backend_resource: str, logger)
         clpr_res_fam = clp_details_resource.ResourceFamilyName
         if (clpr_res_fam != 'Cloud Provider' and clpr_res_fam != 'CS_CloudProvider') or \
                 clp_res_model not in GCP_MODELS:
-            logger.error(f"Cloud Provider does not have the expected type: {clpr_res_fam}")
-            raise ValueError(f"Cloud Provider does not have the expected type:{clpr_res_fam}")
+            self._raise_and_log(logger, f"Cloud Provider does not have the expected type:{clpr_res_fam}")
         clp_name = clp_details(clp_details_resource.Name)
         return clp_name