From ba88aa1668538b7b7fdd7f1a5f13478642d6d4ae Mon Sep 17 00:00:00 2001 From: Abhishek Pandey Date: Wed, 1 Jun 2022 13:52:55 +0530 Subject: [PATCH] Issue 4660: Bigquery ADC FIx (#5241) * fixed-bigquery-adc --- ingestion/src/metadata/utils/credentials.py | 9 ++++++++- .../json/schema/security/credentials/gcsCredentials.json | 5 +---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ingestion/src/metadata/utils/credentials.py b/ingestion/src/metadata/utils/credentials.py index 91ac2ce9d9e..36171c76691 100644 --- a/ingestion/src/metadata/utils/credentials.py +++ b/ingestion/src/metadata/utils/credentials.py @@ -20,6 +20,9 @@ from metadata.generated.schema.security.credentials.gcsCredentials import ( GCSCredentialsPath, GCSValues, ) +from metadata.utils.logger import utils_logger + +logger = utils_logger() GOOGLE_CREDENTIALS = "GOOGLE_APPLICATION_CREDENTIALS" @@ -54,7 +57,11 @@ def set_google_credentials(gcs_credentials: GCSCredentials) -> None: if isinstance(gcs_credentials.gcsConfig, GCSCredentialsPath): os.environ[GOOGLE_CREDENTIALS] = str(gcs_credentials.gcsConfig.__root__) return - + if gcs_credentials.gcsConfig.projectId is None: + logger.info( + "No credentials available, using the current environment permissions authenticated via gcloud SDK ." + ) + return if isinstance(gcs_credentials.gcsConfig, GCSValues): credentials_dict = { "type": gcs_credentials.gcsConfig.type, diff --git a/openmetadata-core/src/main/resources/json/schema/security/credentials/gcsCredentials.json b/openmetadata-core/src/main/resources/json/schema/security/credentials/gcsCredentials.json index 6296489d997..30f46f87e04 100644 --- a/openmetadata-core/src/main/resources/json/schema/security/credentials/gcsCredentials.json +++ b/openmetadata-core/src/main/resources/json/schema/security/credentials/gcsCredentials.json @@ -91,8 +91,5 @@ ] } }, - "additionalProperties": false, - "required": [ - "gcsConfig" - ] + "additionalProperties": false }