yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-27 00:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support delete temporary credentials files of Google Cloud (#12590)

Browse Source 
Co-authored-by: Vanshika Kabra <vanshikakabra@Vanshikas-MacBook-Pro.local>
This commit is contained in:
vanshika18 2023-07-27 23:24:55 +05:30 committed by GitHub
parent f192185151
commit 3111f91a06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ingestion/src/metadata/ingestion/source/database/bigquery/metadata.py
View File

@ -54,13 +54,13 @@ from metadata.generated.schema.security.credentials.gcpValues import (
from metadata.generated.schema.type.tagLabel import TagLabel
from metadata.ingestion.api.source import InvalidSourceException
from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
from metadata.ingestion.source.connections import get_connection
from metadata.ingestion.source.database.bigquery.queries import (
BIGQUERY_SCHEMA_DESCRIPTION,
)
from metadata.ingestion.source.database.column_type_parser import create_sqlalchemy_type
from metadata.ingestion.source.database.common_db_source import CommonDbSourceService
from metadata.utils import fqn
from metadata.utils.credentials import GOOGLE_CREDENTIALS
from metadata.utils.filters import filter_by_database
from metadata.utils.logger import ingestion_logger
from metadata.utils.sqlalchemy_utils import is_complex_type
@ -317,7 +317,6 @@ class BigquerySource(CommonDbSourceService):
self.service_connection.credentials.gcpConfig.projectId = SingleProjectId(
__root__=database_name
)
self.engine = get_connection(self.service_connection)
self.inspector = inspect(self.engine)
def get_database_names(self) -> Iterable[str]:
@ -430,6 +429,12 @@ class BigquerySource(CommonDbSourceService):
if self.temp_credentials:
os.unlink(self.temp_credentials)
os.environ.pop("GOOGLE_CLOUD_PROJECT", "")
if isinstance(
self.service_connection.credentials.gcpConfig, GcpCredentialsValues
) and (GOOGLE_CREDENTIALS in os.environ):
tmp_credentials_file = os.environ[GOOGLE_CREDENTIALS]
os.remove(tmp_credentials_file)
del os.environ[GOOGLE_CREDENTIALS]
def get_source_url(
self,

10
ingestion/src/metadata/utils/credentials.py
View File

@ -67,8 +67,15 @@ def create_credential_tmp_file(credentials: dict) -> str:
with tempfile.NamedTemporaryFile(delete=False) as temp_file:
cred_json = json.dumps(credentials, indent=4, separators=(",", ": "))
temp_file.write(cred_json.encode())
# Get the path of the temporary file
temp_file_path = temp_file.name
return temp_file.name
# The temporary file will be automatically closed when exiting the "with" block,
# but we can explicitly close it here to free up resources immediately.
temp_file.close()
# Return the path of the temporary file
return temp_file_path
def build_google_credentials_dict(gcp_values: GcpCredentialsValues) -> Dict[str, str]:
@ -121,6 +128,7 @@ def set_google_credentials(gcp_credentials: GCPCredentials) -> None:
"Overriding default projectid, using the current environment permissions authenticated via gcloud SDK."
)
return
credentials_dict = build_google_credentials_dict(gcp_credentials.gcpConfig)
tmp_credentials_file = create_credential_tmp_file(credentials=credentials_dict)
os.environ[GOOGLE_CREDENTIALS] = tmp_credentials_file