From e0c4ceafe48107b7e9cf21f91099ee2b38548bd8 Mon Sep 17 00:00:00 2001 From: Jamie Baldanza Date: Wed, 4 Jun 2025 11:33:23 -0400 Subject: [PATCH 1/7] fix: check if job_id is None --- accelerators/databricks/scripts/extract_doc_content.py | 5 +++++ accelerators/redshift/scripts/extract_doc_content.py | 5 +++++ accelerators/snowflake/scripts/extract_doc_content.py | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/accelerators/databricks/scripts/extract_doc_content.py b/accelerators/databricks/scripts/extract_doc_content.py index f8cf244..95be019 100644 --- a/accelerators/databricks/scripts/extract_doc_content.py +++ b/accelerators/databricks/scripts/extract_doc_content.py @@ -75,6 +75,11 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque export_doc_response: JobCreateResponse = vault_service.export_document_versions(request_string) job_id: int = export_doc_response.job_id + if job_id is None: + log_message(log_level='Error', + message='An error has occured exporting document versions', + exception=export_doc_response.response['errors']) + raise Exception("An error has occured exporting document versions") is_vault_job_finished = False log_message(log_level='Info', diff --git a/accelerators/redshift/scripts/extract_doc_content.py b/accelerators/redshift/scripts/extract_doc_content.py index 80f7a27..bc06784 100644 --- a/accelerators/redshift/scripts/extract_doc_content.py +++ b/accelerators/redshift/scripts/extract_doc_content.py @@ -75,6 +75,11 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque export_doc_response: JobCreateResponse = vault_service.export_document_versions(request_string) job_id: int = export_doc_response.job_id + if job_id is None: + log_message(log_level='Error', + message='An error has occured exporting document versions', + exception=export_doc_response.response['errors']) + raise Exception("An error has occured exporting document versions") is_vault_job_finished = False log_message(log_level='Info', diff --git a/accelerators/snowflake/scripts/extract_doc_content.py b/accelerators/snowflake/scripts/extract_doc_content.py index 854e8df..4eed1b3 100644 --- a/accelerators/snowflake/scripts/extract_doc_content.py +++ b/accelerators/snowflake/scripts/extract_doc_content.py @@ -74,6 +74,11 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque export_doc_response: JobCreateResponse = vault_service.export_document_versions(request_string) job_id: int = export_doc_response.job_id + if job_id is None: + log_message(log_level='Error', + message='An error has occured exporting document versions', + exception=export_doc_response.response['errors']) + raise Exception("An error has occured exporting document versions") is_vault_job_finished = False log_message(log_level='Info', From 7d3c6c0be1f4c41136800c1676d89cf0b86c7fdd Mon Sep 17 00:00:00 2001 From: Jamie Baldanza Date: Wed, 4 Jun 2025 11:39:01 -0400 Subject: [PATCH 2/7] use export_doc_response.errors --- accelerators/databricks/scripts/extract_doc_content.py | 2 +- accelerators/redshift/scripts/extract_doc_content.py | 2 +- accelerators/snowflake/scripts/extract_doc_content.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/accelerators/databricks/scripts/extract_doc_content.py b/accelerators/databricks/scripts/extract_doc_content.py index 95be019..fd8ce34 100644 --- a/accelerators/databricks/scripts/extract_doc_content.py +++ b/accelerators/databricks/scripts/extract_doc_content.py @@ -78,7 +78,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque if job_id is None: log_message(log_level='Error', message='An error has occured exporting document versions', - exception=export_doc_response.response['errors']) + exception=export_doc_response.errors) raise Exception("An error has occured exporting document versions") is_vault_job_finished = False diff --git a/accelerators/redshift/scripts/extract_doc_content.py b/accelerators/redshift/scripts/extract_doc_content.py index bc06784..dacb6f0 100644 --- a/accelerators/redshift/scripts/extract_doc_content.py +++ b/accelerators/redshift/scripts/extract_doc_content.py @@ -78,7 +78,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque if job_id is None: log_message(log_level='Error', message='An error has occured exporting document versions', - exception=export_doc_response.response['errors']) + exception=export_doc_response.errors) raise Exception("An error has occured exporting document versions") is_vault_job_finished = False diff --git a/accelerators/snowflake/scripts/extract_doc_content.py b/accelerators/snowflake/scripts/extract_doc_content.py index 4eed1b3..92261d8 100644 --- a/accelerators/snowflake/scripts/extract_doc_content.py +++ b/accelerators/snowflake/scripts/extract_doc_content.py @@ -72,12 +72,11 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque request_string.append(doc_version_dict) export_doc_response: JobCreateResponse = vault_service.export_document_versions(request_string) - job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error', message='An error has occured exporting document versions', - exception=export_doc_response.response['errors']) + exception=export_doc_response.errors) raise Exception("An error has occured exporting document versions") is_vault_job_finished = False From abb619f2281123a6e3ec1fa939349f8683ab12e5 Mon Sep 17 00:00:00 2001 From: Jamie Baldanza Date: Wed, 4 Jun 2025 11:44:21 -0400 Subject: [PATCH 3/7] export_doc_response.errors is not an exception --- accelerators/databricks/scripts/extract_doc_content.py | 3 +-- accelerators/redshift/scripts/extract_doc_content.py | 3 +-- accelerators/snowflake/scripts/extract_doc_content.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/accelerators/databricks/scripts/extract_doc_content.py b/accelerators/databricks/scripts/extract_doc_content.py index fd8ce34..0ecadea 100644 --- a/accelerators/databricks/scripts/extract_doc_content.py +++ b/accelerators/databricks/scripts/extract_doc_content.py @@ -77,8 +77,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error', - message='An error has occured exporting document versions', - exception=export_doc_response.errors) + message='An error has occured exporting document versions') raise Exception("An error has occured exporting document versions") is_vault_job_finished = False diff --git a/accelerators/redshift/scripts/extract_doc_content.py b/accelerators/redshift/scripts/extract_doc_content.py index dacb6f0..aee6858 100644 --- a/accelerators/redshift/scripts/extract_doc_content.py +++ b/accelerators/redshift/scripts/extract_doc_content.py @@ -77,8 +77,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error', - message='An error has occured exporting document versions', - exception=export_doc_response.errors) + message='An error has occured exporting document versions') raise Exception("An error has occured exporting document versions") is_vault_job_finished = False diff --git a/accelerators/snowflake/scripts/extract_doc_content.py b/accelerators/snowflake/scripts/extract_doc_content.py index 92261d8..dd754c1 100644 --- a/accelerators/snowflake/scripts/extract_doc_content.py +++ b/accelerators/snowflake/scripts/extract_doc_content.py @@ -75,8 +75,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error', - message='An error has occured exporting document versions', - exception=export_doc_response.errors) + message='An error has occured exporting document versions') raise Exception("An error has occured exporting document versions") is_vault_job_finished = False From 705c21cffb22d624ef7433351e6d689952907583 Mon Sep 17 00:00:00 2001 From: Jamie Baldanza Date: Wed, 4 Jun 2025 13:12:07 -0400 Subject: [PATCH 4/7] message=export_doc_response.errors) --- accelerators/databricks/scripts/extract_doc_content.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accelerators/databricks/scripts/extract_doc_content.py b/accelerators/databricks/scripts/extract_doc_content.py index 0ecadea..206afc8 100644 --- a/accelerators/databricks/scripts/extract_doc_content.py +++ b/accelerators/databricks/scripts/extract_doc_content.py @@ -77,7 +77,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error', - message='An error has occured exporting document versions') + message=export_doc_response.errors) raise Exception("An error has occured exporting document versions") is_vault_job_finished = False From 09a0c5933d2d48540e41767100bd13b769bee358 Mon Sep 17 00:00:00 2001 From: Jamie Baldanza Date: Wed, 4 Jun 2025 13:31:07 -0400 Subject: [PATCH 5/7] export_doc_response.errors --- accelerators/redshift/scripts/extract_doc_content.py | 2 +- accelerators/snowflake/scripts/extract_doc_content.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accelerators/redshift/scripts/extract_doc_content.py b/accelerators/redshift/scripts/extract_doc_content.py index aee6858..b6b7e95 100644 --- a/accelerators/redshift/scripts/extract_doc_content.py +++ b/accelerators/redshift/scripts/extract_doc_content.py @@ -77,7 +77,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error', - message='An error has occured exporting document versions') + message=export_doc_response.errors) raise Exception("An error has occured exporting document versions") is_vault_job_finished = False diff --git a/accelerators/snowflake/scripts/extract_doc_content.py b/accelerators/snowflake/scripts/extract_doc_content.py index dd754c1..86da578 100644 --- a/accelerators/snowflake/scripts/extract_doc_content.py +++ b/accelerators/snowflake/scripts/extract_doc_content.py @@ -75,7 +75,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error', - message='An error has occured exporting document versions') + message=export_doc_response.errors) raise Exception("An error has occured exporting document versions") is_vault_job_finished = False From 7604eb28d34cdc0886d00647ee0922f0bc6fe05b Mon Sep 17 00:00:00 2001 From: Jamie Baldanza Date: Wed, 4 Jun 2025 13:32:36 -0400 Subject: [PATCH 6/7] fix spacing --- accelerators/snowflake/scripts/extract_doc_content.py | 1 + 1 file changed, 1 insertion(+) diff --git a/accelerators/snowflake/scripts/extract_doc_content.py b/accelerators/snowflake/scripts/extract_doc_content.py index 86da578..56caeec 100644 --- a/accelerators/snowflake/scripts/extract_doc_content.py +++ b/accelerators/snowflake/scripts/extract_doc_content.py @@ -72,6 +72,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque request_string.append(doc_version_dict) export_doc_response: JobCreateResponse = vault_service.export_document_versions(request_string) + job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error', From 68102605f438bab0d21fb6da791db3f16014a2d6 Mon Sep 17 00:00:00 2001 From: Jamie Baldanza Date: Wed, 4 Jun 2025 13:33:03 -0400 Subject: [PATCH 7/7] fix whitespace --- accelerators/snowflake/scripts/extract_doc_content.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accelerators/snowflake/scripts/extract_doc_content.py b/accelerators/snowflake/scripts/extract_doc_content.py index 56caeec..1dddd40 100644 --- a/accelerators/snowflake/scripts/extract_doc_content.py +++ b/accelerators/snowflake/scripts/extract_doc_content.py @@ -72,7 +72,7 @@ def run(s3_service: AwsS3Service, vault_service: VaultService, convert_to_parque request_string.append(doc_version_dict) export_doc_response: JobCreateResponse = vault_service.export_document_versions(request_string) - + job_id: int = export_doc_response.job_id if job_id is None: log_message(log_level='Error',