From ad53c509ba4fc249ef0f2e707b7971944f18c140 Mon Sep 17 00:00:00 2001 From: Ayush Shah Date: Tue, 4 Oct 2022 19:58:17 +0530 Subject: [PATCH] Fix Bigquery ADC diff projectid (#7935) --- ingestion/src/metadata/utils/source_connections.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ingestion/src/metadata/utils/source_connections.py b/ingestion/src/metadata/utils/source_connections.py index 0cfae556a10..5c4908645a6 100644 --- a/ingestion/src/metadata/utils/source_connections.py +++ b/ingestion/src/metadata/utils/source_connections.py @@ -358,18 +358,16 @@ def _(connection: BigQueryConnection): _, project_id = auth.default() if isinstance(connection.credentials.gcsConfig, GCSValues): - has_project_id = hasattr(connection.credentials.gcsConfig, "projectId") - if not project_id: - if has_project_id: - project_id = connection.credentials.gcsConfig.projectId + return f"{connection.scheme.value}://{connection.credentials.gcsConfig.projectId or ''}" else: - if has_project_id and not hasattr( - connection.credentials.gcsConfig, "privateKey" + if ( + not connection.credentials.gcsConfig.privateKey + and connection.credentials.gcsConfig.projectId ): # Setting environment variable based on project id given by user / set in ADC project_id = connection.credentials.gcsConfig.projectId - os.environ["GOOGLE_CLOUD_PROJECT"] = project_id + os.environ["GOOGLE_CLOUD_PROJECT"] = project_id return f"{connection.scheme.value}://{project_id}" return f"{connection.scheme.value}://"