This is an automated email from the ASF dual-hosted git repository. vincbeck 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 8823fcdd2f9 Pass the region_name from the GlueJobOperator / GlueJobSensor to the Trigger (#52904) 8823fcdd2f9 is described below commit 8823fcdd2f9f2d09cb4aa4e9963781b453d5daa8 Author: Dominik <105610163+dominik...@users.noreply.github.com> AuthorDate: Mon Jul 7 16:06:18 2025 +0200 Pass the region_name from the GlueJobOperator / GlueJobSensor to the Trigger (#52904) * Passed the aws_region from the operator / sensor to the trigger * Added tests, to ensure that params are passed to the GlueJobTrigger --- .../airflow/providers/amazon/aws/operators/glue.py | 1 + .../airflow/providers/amazon/aws/sensors/glue.py | 1 + .../tests/unit/amazon/aws/operators/test_glue.py | 5 +++++ .../tests/unit/amazon/aws/sensors/test_glue.py | 25 ++++++++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/providers/amazon/src/airflow/providers/amazon/aws/operators/glue.py b/providers/amazon/src/airflow/providers/amazon/aws/operators/glue.py index 95dd2954b8b..5c75a43d52b 100644 --- a/providers/amazon/src/airflow/providers/amazon/aws/operators/glue.py +++ b/providers/amazon/src/airflow/providers/amazon/aws/operators/glue.py @@ -249,6 +249,7 @@ class GlueJobOperator(AwsBaseOperator[GlueJobHook]): aws_conn_id=self.aws_conn_id, waiter_delay=self.waiter_delay, waiter_max_attempts=self.waiter_max_attempts, + region_name=self.region_name, ), method_name="execute_complete", ) diff --git a/providers/amazon/src/airflow/providers/amazon/aws/sensors/glue.py b/providers/amazon/src/airflow/providers/amazon/aws/sensors/glue.py index 6437d5513cd..afc7e4728c8 100644 --- a/providers/amazon/src/airflow/providers/amazon/aws/sensors/glue.py +++ b/providers/amazon/src/airflow/providers/amazon/aws/sensors/glue.py @@ -105,6 +105,7 @@ class GlueJobSensor(AwsBaseSensor[GlueJobHook]): aws_conn_id=self.aws_conn_id, waiter_delay=int(self.poke_interval), waiter_max_attempts=self.max_retries, + region_name=self.region_name, ), method_name="execute_complete", ) diff --git a/providers/amazon/tests/unit/amazon/aws/operators/test_glue.py b/providers/amazon/tests/unit/amazon/aws/operators/test_glue.py index 7a0210cf130..1b33269e007 100644 --- a/providers/amazon/tests/unit/amazon/aws/operators/test_glue.py +++ b/providers/amazon/tests/unit/amazon/aws/operators/test_glue.py @@ -155,6 +155,11 @@ class TestGlueJobOperator: assert defer.value.trigger.job_name == JOB_NAME assert defer.value.trigger.run_id == JOB_RUN_ID + assert defer.value.trigger.region_name == "us-west-2" + assert not defer.value.trigger.verbose + assert defer.value.trigger.waiter_delay == 60 + assert defer.value.trigger.attempts == 75 + assert defer.value.trigger.aws_conn_id == "aws_default" @mock.patch.object(GlueJobHook, "print_job_logs") @mock.patch.object(GlueJobHook, "get_job_state") diff --git a/providers/amazon/tests/unit/amazon/aws/sensors/test_glue.py b/providers/amazon/tests/unit/amazon/aws/sensors/test_glue.py index ef57439523b..289d4052687 100644 --- a/providers/amazon/tests/unit/amazon/aws/sensors/test_glue.py +++ b/providers/amazon/tests/unit/amazon/aws/sensors/test_glue.py @@ -215,3 +215,28 @@ class TestGlueJobSensor: assert sensor.poke_interval == 10 assert sensor.aws_conn_id == "custom_conn" assert sensor.max_retries == 20 + + def test_defferable_params_passed_to_trigger(self): + job_name = "job_name" + job_run_id = "job_run_id" + sensor = GlueJobSensor( + task_id="test_glue_job_sensor", + job_name=job_name, + run_id=job_run_id, + verbose=True, + deferrable=True, + poke_interval=10, + region_name="us-west-2", + aws_conn_id="custom_conn", + max_retries=20, + ) + with pytest.raises(TaskDeferred) as defer: + sensor.execute({}) + + assert defer.value.trigger.job_name == job_name + assert defer.value.trigger.run_id == job_run_id + assert defer.value.trigger.region_name == "us-west-2" + assert defer.value.trigger.verbose + assert defer.value.trigger.waiter_delay == 10 + assert defer.value.trigger.attempts == 20 + assert defer.value.trigger.aws_conn_id == "custom_conn"