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 75ed3bc3f8 [bugfix] fix AWS triggers where deserialization would crash
if region was not specified (#32729)
75ed3bc3f8 is described below
commit 75ed3bc3f80ac03c301535f38544a4923ee6d43f
Author: Raphaël Vandon <[email protected]>
AuthorDate: Thu Jul 20 12:11:24 2023 -0700
[bugfix] fix AWS triggers where deserialization would crash if region was
not specified (#32729)
---
airflow/providers/amazon/aws/triggers/batch.py | 2 +-
airflow/providers/amazon/aws/triggers/ecs.py | 4 ++--
airflow/providers/amazon/aws/triggers/eks.py | 6 +++---
airflow/providers/amazon/aws/triggers/rds.py | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/airflow/providers/amazon/aws/triggers/batch.py
b/airflow/providers/amazon/aws/triggers/batch.py
index 87be139332..8966540a38 100644
--- a/airflow/providers/amazon/aws/triggers/batch.py
+++ b/airflow/providers/amazon/aws/triggers/batch.py
@@ -209,7 +209,7 @@ class BatchJobTrigger(AwsBaseWaiterTrigger):
def __init__(
self,
job_id: str | None,
- region_name: str | None,
+ region_name: str | None = None,
aws_conn_id: str | None = "aws_default",
waiter_delay: int = 5,
waiter_max_attempts: int = 720,
diff --git a/airflow/providers/amazon/aws/triggers/ecs.py
b/airflow/providers/amazon/aws/triggers/ecs.py
index af6f72e771..d0fdfb63b6 100644
--- a/airflow/providers/amazon/aws/triggers/ecs.py
+++ b/airflow/providers/amazon/aws/triggers/ecs.py
@@ -49,7 +49,7 @@ class ClusterActiveTrigger(AwsBaseWaiterTrigger):
waiter_delay: int,
waiter_max_attempts: int,
aws_conn_id: str | None,
- region_name: str | None,
+ region_name: str | None = None,
):
super().__init__(
serialized_fields={"cluster_arn": cluster_arn},
@@ -88,7 +88,7 @@ class ClusterInactiveTrigger(AwsBaseWaiterTrigger):
waiter_delay: int,
waiter_max_attempts: int,
aws_conn_id: str | None,
- region_name: str | None,
+ region_name: str | None = None,
):
super().__init__(
serialized_fields={"cluster_arn": cluster_arn},
diff --git a/airflow/providers/amazon/aws/triggers/eks.py
b/airflow/providers/amazon/aws/triggers/eks.py
index ff99b51200..b5419b76e7 100644
--- a/airflow/providers/amazon/aws/triggers/eks.py
+++ b/airflow/providers/amazon/aws/triggers/eks.py
@@ -47,7 +47,7 @@ class EksCreateClusterTrigger(AwsBaseWaiterTrigger):
waiter_delay: int,
waiter_max_attempts: int,
aws_conn_id: str,
- region_name: str | None,
+ region_name: str | None = None,
):
super().__init__(
serialized_fields={"cluster_name": cluster_name, "region_name":
region_name},
@@ -309,7 +309,7 @@ class EksCreateNodegroupTrigger(AwsBaseWaiterTrigger):
waiter_delay: int,
waiter_max_attempts: int,
aws_conn_id: str,
- region_name: str | None,
+ region_name: str | None = None,
):
super().__init__(
serialized_fields={
@@ -357,7 +357,7 @@ class EksDeleteNodegroupTrigger(AwsBaseWaiterTrigger):
waiter_delay: int,
waiter_max_attempts: int,
aws_conn_id: str,
- region_name: str | None,
+ region_name: str | None = None,
):
super().__init__(
serialized_fields={"cluster_name": cluster_name, "nodegroup_name":
nodegroup_name},
diff --git a/airflow/providers/amazon/aws/triggers/rds.py
b/airflow/providers/amazon/aws/triggers/rds.py
index b8f20b9c9b..82354c1874 100644
--- a/airflow/providers/amazon/aws/triggers/rds.py
+++ b/airflow/providers/amazon/aws/triggers/rds.py
@@ -126,9 +126,9 @@ class RdsDbAvailableTrigger(AwsBaseWaiterTrigger):
waiter_delay: int,
waiter_max_attempts: int,
aws_conn_id: str,
- region_name: str | None,
response: dict[str, Any],
db_type: RdsDbType,
+ region_name: str | None = None,
) -> None:
super().__init__(
serialized_fields={
@@ -172,9 +172,9 @@ class RdsDbDeletedTrigger(AwsBaseWaiterTrigger):
waiter_delay: int,
waiter_max_attempts: int,
aws_conn_id: str,
- region_name: str | None,
response: dict[str, Any],
db_type: RdsDbType,
+ region_name: str | None = None,
) -> None:
super().__init__(
serialized_fields={
@@ -218,9 +218,9 @@ class RdsDbStoppedTrigger(AwsBaseWaiterTrigger):
waiter_delay: int,
waiter_max_attempts: int,
aws_conn_id: str,
- region_name: str | None,
response: dict[str, Any],
db_type: RdsDbType,
+ region_name: str | None = None,
) -> None:
super().__init__(
serialized_fields={
