Skip to content

Commit e85a49e

Browse files
committed
update _raise_and_log
1 parent b3438e3 commit e85a49e

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

shells/backends/gcp_tf_backend/src/driver.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def get_inventory(self, context):
6363
try:
6464
gcp_service = self._can_conntect_to_gcp(context, logger)
6565
if not gcp_service:
66-
logger.warning("There was an issue accessing GCP, please check authentication credentials.")
66+
raise RuntimeError("There was an issue accessing GCP, please check authentication credentials.")
6767
except Exception as e:
6868
self._raise_and_log(logger, f"There was an issue initialization GCP provider resource. {e}")
6969
return AutoLoadDetails([], [])
@@ -75,7 +75,7 @@ def _validate_bucket_exists(self, bucket_name: str, context, logger):
7575
storage_client = storage.Client()
7676
get_bucket = storage_client.get_bucket(bucket_name)
7777
if len(str(get_bucket)) < 0:
78-
logger.warning(f"Bucket {bucket_name} not found")
78+
self._raise_and_log(logger, f"Bucket {bucket_name} not found")
7979
except Exception as e:
8080
self._raise_and_log(logger, f"There was an issue accessing the bucket {bucket_name}.{e}")
8181

@@ -119,12 +119,12 @@ def delete_tfstate_file(self, context, tf_state_unique_name: str):
119119
"""Delete object under folder"""
120120
blobs = list(bucket.list_blobs(prefix=tf_state_unique_name))
121121
if len(blobs) == 0:
122-
logger.warning(f"Folder {tf_state_unique_name} not exists.")
122+
self._raise_and_log(logger, f"Folder {tf_state_unique_name} not exists.")
123123
elif len(blobs) > 1:
124-
logger.warning(f"There are more than 1 Folder {tf_state_unique_name} currenlty {len(blobs)} folders exist.")
124+
self._raise_and_log(logger, f"There are more than 1 Folder {tf_state_unique_name} currenlty {len(blobs)} folders exist.")
125125
else:
126126
bucket.delete_blobs(blobs)
127-
logger.warning(f"Folder {tf_state_unique_name} deleted.")
127+
logger.info(f"Folder {tf_state_unique_name} deleted.")
128128
except Exception as e:
129129
self._raise_and_log(logger, f"{tf_state_unique_name} file was not removed from backend provider.{e}")
130130

@@ -139,21 +139,21 @@ def _generate_state_file_string(self, gcp_backend_resource: GcpTfBackend, tf_sta
139139

140140
def _create_gcp_session(self, context, project_id: str, logger):
141141
if not project_id:
142-
logger.warning("Project id must be filled")
142+
self._raise_and_log(logger, "Project id must be filled", error_type=ValueError)
143143
api = CloudShellSessionContext(context).get_api()
144144
gcp_backend_resource = GcpTfBackend.create_from_context(context)
145145
json_path = gcp_backend_resource.credentials_json_path
146146
# json_path defines on GCP TF BACKEND RESOURCE
147147
if json_path:
148148
if gcp_backend_resource.cloud_provider:
149-
logger.warning("Only one method of authentication should be filled")
149+
lself._raise_and_log(logger, "Only one method of authentication should be filled", error_type=ValueError)
150150
os.environ[GOOGLE_APPLICATION_CREDENTIALS] = json_path
151151
os.environ["GOOGLE_PROJECT"] = project_id
152152
# Keys not defines on GCP TF BACKEND RESOURCE (CLP reference should have been set)
153153
else:
154154
# CLP had not been set...
155155
if not gcp_backend_resource.cloud_provider:
156-
logger.warning("At least one method of authentication should be filled")
156+
self._raise_and_log(logger,"At least one method of authentication should be filled", error_type=ValueError)
157157

158158
# Check a correct CLP has been reference
159159
clp_details = api.GetResourceDetails

0 commit comments

Comments
 (0)