This is an automated email from the ASF dual-hosted git repository. eladkal pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push: new 8a35a6abdc Resolving ECS fargate deprecated warnings (#39834) 8a35a6abdc is described below commit 8a35a6abdcdcc2558048701adce82f2132e05884 Author: Gopal Dirisala <39794726+dir...@users.noreply.github.com> AuthorDate: Sun May 26 17:37:20 2024 +0530 Resolving ECS fargate deprecated warnings (#39834) * Resolving ECS fargate deprecated warnings --- airflow/providers/amazon/aws/operators/ecs.py | 10 +++++----- tests/always/test_example_dags.py | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/airflow/providers/amazon/aws/operators/ecs.py b/airflow/providers/amazon/aws/operators/ecs.py index 8fe6df5812..294291dc0a 100644 --- a/airflow/providers/amazon/aws/operators/ecs.py +++ b/airflow/providers/amazon/aws/operators/ecs.py @@ -141,7 +141,7 @@ class EcsCreateClusterOperator(EcsBaseOperator): waiter_delay=self.waiter_delay, waiter_max_attempts=self.waiter_max_attempts, aws_conn_id=self.aws_conn_id, - region_name=self.region, + region_name=self.region_name, ), method_name="_complete_exec_with_cluster_desc", # timeout is set to ensure that if a trigger dies, the timeout does not restart @@ -218,7 +218,7 @@ class EcsDeleteClusterOperator(EcsBaseOperator): waiter_delay=self.waiter_delay, waiter_max_attempts=self.waiter_max_attempts, aws_conn_id=self.aws_conn_id, - region_name=self.region, + region_name=self.region_name, ), method_name="_complete_exec_with_cluster_desc", # timeout is set to ensure that if a trigger dies, the timeout does not restart @@ -495,7 +495,7 @@ class EcsRunTaskOperator(EcsBaseOperator): self.number_logs_exception = number_logs_exception if self.awslogs_region is None: - self.awslogs_region = self.region + self.awslogs_region = self.region_name self.arn: str | None = None self._started_by: str | None = None @@ -546,7 +546,7 @@ class EcsRunTaskOperator(EcsBaseOperator): waiter_delay=self.waiter_delay, waiter_max_attempts=self.waiter_max_attempts, aws_conn_id=self.aws_conn_id, - region=self.region, + region=self.region_name, log_group=self.awslogs_group, log_stream=self._get_logs_stream_name(), ), @@ -589,7 +589,7 @@ class EcsRunTaskOperator(EcsBaseOperator): self._after_execution() if self._aws_logs_enabled(): # same behavior as non-deferrable mode, return last line of logs of the task. - logs_client = AwsLogsHook(aws_conn_id=self.aws_conn_id, region_name=self.region).conn + logs_client = AwsLogsHook(aws_conn_id=self.aws_conn_id, region_name=self.region_name).conn one_log = logs_client.get_log_events( logGroupName=self.awslogs_group, logStreamName=self._get_logs_stream_name(), diff --git a/tests/always/test_example_dags.py b/tests/always/test_example_dags.py index 43104a884c..fab3bdb7c8 100644 --- a/tests/always/test_example_dags.py +++ b/tests/always/test_example_dags.py @@ -47,7 +47,6 @@ IGNORE_AIRFLOW_PROVIDER_DEPRECATION_WARNING: tuple[str, ...] = ( # Generally, these should be resolved as soon as a parameter or operator is deprecated. # If the deprecation is postponed, the item should be added to this tuple, # and a corresponding Issue should be created on GitHub. - "tests/system/providers/amazon/aws/example_ecs_fargate.py", "tests/system/providers/amazon/aws/example_emr_notebook_execution.py", "tests/system/providers/google/cloud/bigquery/example_bigquery_operations.py", "tests/system/providers/google/cloud/bigquery/example_bigquery_sensors.py",