From bf0014a47f977900bc6eeea66dcd7103e2dd55e7 Mon Sep 17 00:00:00 2001 From: Niko Oliveira Date: Thu, 1 Feb 2024 15:11:24 -0800 Subject: [PATCH] Use exiting recursive dict merge helper --- .../amazon/aws/executors/ecs/ecs_executor.py | 4 ++-- airflow/providers/amazon/aws/executors/ecs/utils.py | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/airflow/providers/amazon/aws/executors/ecs/ecs_executor.py b/airflow/providers/amazon/aws/executors/ecs/ecs_executor.py index 4152db12e589bd..acc91eddf5660c 100644 --- a/airflow/providers/amazon/aws/executors/ecs/ecs_executor.py +++ b/airflow/providers/amazon/aws/executors/ecs/ecs_executor.py @@ -41,11 +41,11 @@ EcsExecutorException, EcsQueuedTask, EcsTaskCollection, - _deep_update, ) from airflow.providers.amazon.aws.executors.utils.exponential_backoff_retry import exponential_backoff_retry from airflow.providers.amazon.aws.hooks.ecs import EcsHook from airflow.utils import timezone +from airflow.utils.helpers import merge_dicts from airflow.utils.state import State if TYPE_CHECKING: @@ -408,7 +408,7 @@ def _run_task_kwargs( One last chance to modify Boto3's "run_task" kwarg params before it gets passed into the Boto3 client. """ run_task_kwargs = deepcopy(self.run_task_kwargs) - run_task_kwargs = _deep_update(run_task_kwargs, exec_config) + run_task_kwargs = merge_dicts(run_task_kwargs, exec_config) container_override = self.get_container(run_task_kwargs["overrides"]["containerOverrides"]) container_override["command"] = cmd diff --git a/airflow/providers/amazon/aws/executors/ecs/utils.py b/airflow/providers/amazon/aws/executors/ecs/utils.py index 7d69d0a9a00b1f..7913bdf22719c4 100644 --- a/airflow/providers/amazon/aws/executors/ecs/utils.py +++ b/airflow/providers/amazon/aws/executors/ecs/utils.py @@ -264,16 +264,3 @@ def camelize_dict_keys(nested_dict) -> dict: else: result[new_key] = nested_dict[key] return result - - -def _deep_update(dest_dict: dict, source_dict: dict) -> dict: - """Deep updates dest_dict with the values from source_dict.""" - for key, value in source_dict.items(): - if key in dest_dict and isinstance(dest_dict[key], dict) and isinstance(value, dict): - # Recursively update nested dictionaries - _deep_update(dest_dict[key], value) - else: - # Update or add key-value pairs - dest_dict[key] = value - - return dest_dict