github-advanced-security[bot] commented on code in PR #44477: URL: https://github.com/apache/airflow/pull/44477#discussion_r1866227874
########## providers/src/airflow/providers/openlineage/utils/spark.py: ########## @@ -0,0 +1,91 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from __future__ import annotations + +import logging +from typing import TYPE_CHECKING + +from airflow.providers.openlineage.plugins.macros import ( + lineage_job_name, + lineage_job_namespace, + lineage_run_id, +) + +if TYPE_CHECKING: + from airflow.utils.context import Context + +log = logging.getLogger(__name__) + + +def _get_parent_job_information_as_spark_properties(context: Context) -> dict: + """ + Retrieve parent job information as Spark properties. + + Args: + context: The context containing task instance information. + + Returns: + Spark properties with the parent job information. + """ + ti = context["ti"] + return { + "spark.openlineage.parentJobNamespace": lineage_job_namespace(), + "spark.openlineage.parentJobName": lineage_job_name(ti), # type: ignore[arg-type] + "spark.openlineage.parentRunId": lineage_run_id(ti), # type: ignore[arg-type] + } + + +def _is_parent_job_information_present_in_spark_properties(properties: dict) -> bool: + """ + Check if any parent job information is present in Spark properties. + + Args: + properties: Spark properties. + + Returns: + True if parent job information is present, False otherwise. + """ + return any(str(key).startswith("spark.openlineage.parent") for key in properties) + + +def inject_parent_job_information_into_spark_properties(properties: dict, context: Context) -> dict: + """ + Inject parent job information into Spark properties if not already present. + + Args: + properties: Spark properties. + context: The context containing task instance information. + + Returns: + Modified Spark properties with OpenLineage parent job information properties injected, if applicable. + """ + if _is_parent_job_information_present_in_spark_properties(properties): + log.info( + "Some OpenLineage properties with parent job information are already present " + "in the Spark job configuration. Skipping the automatic injection of OpenLineage " + "parent job information into Spark job configuration." + ) + return properties + + ol_parent_job_properties = _get_parent_job_information_as_spark_properties(context) + properties = {**properties, **ol_parent_job_properties} + log.debug( + "Successfully injected OpenLineage parent job information into Spark job configuration: %s", + ol_parent_job_properties, Review Comment: ## Clear-text logging of sensitive information This expression logs [sensitive data (secret)](1) as clear text. This expression logs [sensitive data (secret)](2) as clear text. [Show more details](https://github.com/apache/airflow/security/code-scanning/278) ########## providers/src/airflow/providers/common/compat/openlineage/utils/spark.py: ########## @@ -0,0 +1,63 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from __future__ import annotations + +import logging +from typing import TYPE_CHECKING + +log = logging.getLogger(__name__) + +if TYPE_CHECKING: + from airflow.providers.openlineage.utils.spark import inject_parent_job_information_into_spark_properties +else: + try: + from airflow.providers.openlineage.utils.spark import ( + inject_parent_job_information_into_spark_properties, + ) + except ImportError: + + def inject_parent_job_information_into_spark_properties(properties: dict, context) -> dict: + from airflow.providers.openlineage.plugins.macros import ( + lineage_job_name, + lineage_job_namespace, + lineage_run_id, + ) + + if any(str(key).startswith("spark.openlineage.parent") for key in properties): + log.info( + "Some OpenLineage properties with parent job information are already present " + "in the Spark job configuration. Skipping the automatic injection of OpenLineage " + "parent job information into Spark job configuration." + ) + return properties + + ti = context["ti"] + ol_parent_job_properties = { + "spark.openlineage.parentJobNamespace": lineage_job_namespace(), + "spark.openlineage.parentJobName": lineage_job_name(ti), + "spark.openlineage.parentRunId": lineage_run_id(ti), + } + properties = {**properties, **ol_parent_job_properties} + log.debug( + "Successfully injected OpenLineage parent job information into Spark job configuration: %s", + ol_parent_job_properties, Review Comment: ## Clear-text logging of sensitive information This expression logs [sensitive data (secret)](1) as clear text. This expression logs [sensitive data (secret)](2) as clear text. [Show more details](https://github.com/apache/airflow/security/code-scanning/277) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@airflow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
