diff --git a/airflow/providers/amazon/aws/hooks/rds.py b/airflow/providers/amazon/aws/hooks/rds.py index 588d78c782628..f58b089d7df1f 100644 --- a/airflow/providers/amazon/aws/hooks/rds.py +++ b/airflow/providers/amazon/aws/hooks/rds.py @@ -155,7 +155,7 @@ def get_export_task_state(self, export_task_id: str) -> str: try: response = self.conn.describe_export_tasks(ExportTaskIdentifier=export_task_id) except self.conn.exceptions.ClientError as e: - if e.response["Error"]["Code"] == "ExportTaskNotFoundFault": + if e.response["Error"]["Code"] in ("ExportTaskNotFound", "ExportTaskNotFoundFault"): raise AirflowNotFoundException(e) raise e return response["ExportTasks"][0]["Status"].lower() @@ -196,7 +196,7 @@ def get_event_subscription_state(self, subscription_name: str) -> str: try: response = self.conn.describe_event_subscriptions(SubscriptionName=subscription_name) except self.conn.exceptions.ClientError as e: - if e.response["Error"]["Code"] == "SubscriptionNotFoundFault": + if e.response["Error"]["Code"] in ("SubscriptionNotFoundFault", "SubscriptionNotFound"): raise AirflowNotFoundException(e) raise e return response["EventSubscriptionsList"][0]["Status"].lower() diff --git a/airflow/providers/amazon/provider.yaml b/airflow/providers/amazon/provider.yaml index ffd6b47a43ee0..31699424b37c6 100644 --- a/airflow/providers/amazon/provider.yaml +++ b/airflow/providers/amazon/provider.yaml @@ -139,9 +139,7 @@ additional-extras: devel-dependencies: - aiobotocore>=2.13.0 - aws_xray_sdk>=2.12.0 - # The latest 5.0.12 moto breaks some of our tests https://github.com/apache/airflow/issues/41243 - # Until we fix it, we limit moto to <5.0.12 - - moto[cloudformation,glue]>=5.0.0,<5.0.12 + - moto[cloudformation,glue]>=5.0.0 - mypy-boto3-appflow>=1.34.0 - mypy-boto3-rds>=1.34.90 - mypy-boto3-redshift-data>=1.34.0 diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index 936ecc6dfe1dd..2282045e12022 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -46,7 +46,7 @@ "devel-deps": [ "aiobotocore>=2.13.0", "aws_xray_sdk>=2.12.0", - "moto[cloudformation,glue]>=5.0.0,<5.0.12", + "moto[cloudformation,glue]>=5.0.0", "mypy-boto3-appflow>=1.34.0", "mypy-boto3-rds>=1.34.90", "mypy-boto3-redshift-data>=1.34.0",