This is an automated email from the ASF dual-hosted git repository.
husseinawala 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 9924e3e694 Use AirflowProviderDeprecationWarning in the deprecated
decorator in Amazon provider (#34488)
9924e3e694 is described below
commit 9924e3e694cd51cba433512008f3566d7440b03f
Author: Hussein Awala <[email protected]>
AuthorDate: Tue Sep 19 23:52:36 2023 +0200
Use AirflowProviderDeprecationWarning in the deprecated decorator in Amazon
provider (#34488)
---
airflow/providers/amazon/aws/sensors/batch.py | 4 ++--
airflow/providers/amazon/aws/sensors/dms.py | 4 ++--
airflow/providers/amazon/aws/sensors/emr.py | 4 ++--
airflow/providers/amazon/aws/sensors/glue_catalog_partition.py | 4 ++--
airflow/providers/amazon/aws/sensors/glue_crawler.py | 4 ++--
airflow/providers/amazon/aws/sensors/redshift_cluster.py | 3 ++-
airflow/providers/amazon/aws/sensors/s3.py | 4 ++--
airflow/providers/amazon/aws/sensors/sagemaker.py | 4 ++--
airflow/providers/amazon/aws/sensors/sqs.py | 4 ++--
airflow/providers/amazon/aws/sensors/step_function.py | 4 ++--
airflow/providers/amazon/aws/triggers/batch.py | 5 +++--
11 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/airflow/providers/amazon/aws/sensors/batch.py
b/airflow/providers/amazon/aws/sensors/batch.py
index 3f31a87bed..cc4f0d0c67 100644
--- a/airflow/providers/amazon/aws/sensors/batch.py
+++ b/airflow/providers/amazon/aws/sensors/batch.py
@@ -23,7 +23,7 @@ from typing import TYPE_CHECKING, Any, Sequence
from deprecated import deprecated
from airflow.configuration import conf
-from airflow.exceptions import AirflowException, AirflowSkipException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning, AirflowSkipException
from airflow.providers.amazon.aws.hooks.batch_client import BatchClientHook
from airflow.providers.amazon.aws.triggers.batch import BatchJobTrigger
from airflow.sensors.base import BaseSensorOperator
@@ -124,7 +124,7 @@ class BatchSensor(BaseSensorOperator):
job_id = event["job_id"]
self.log.info("Batch Job %s complete", job_id)
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> BatchClientHook:
"""Create and return a BatchClientHook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/dms.py
b/airflow/providers/amazon/aws/sensors/dms.py
index ec642e5df8..993459f5f2 100644
--- a/airflow/providers/amazon/aws/sensors/dms.py
+++ b/airflow/providers/amazon/aws/sensors/dms.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Iterable, Sequence
from deprecated import deprecated
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.dms import DmsHook
from airflow.sensors.base import BaseSensorOperator
@@ -62,7 +62,7 @@ class DmsTaskBaseSensor(BaseSensorOperator):
self.target_statuses: Iterable[str] = target_statuses or []
self.termination_statuses: Iterable[str] = termination_statuses or []
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> DmsHook:
"""Get DmsHook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/emr.py
b/airflow/providers/amazon/aws/sensors/emr.py
index 71935e0b9b..2fea750962 100644
--- a/airflow/providers/amazon/aws/sensors/emr.py
+++ b/airflow/providers/amazon/aws/sensors/emr.py
@@ -24,7 +24,7 @@ from typing import TYPE_CHECKING, Any, Iterable, Sequence
from deprecated import deprecated
from airflow.configuration import conf
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.emr import EmrContainerHook, EmrHook,
EmrServerlessHook
from airflow.providers.amazon.aws.links.emr import EmrClusterLink,
EmrLogsLink, get_log_uri
from airflow.providers.amazon.aws.triggers.emr import (
@@ -60,7 +60,7 @@ class EmrBaseSensor(BaseSensorOperator):
self.target_states: Iterable[str] = [] # will be set in subclasses
self.failed_states: Iterable[str] = [] # will be set in subclasses
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> EmrHook:
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/glue_catalog_partition.py
b/airflow/providers/amazon/aws/sensors/glue_catalog_partition.py
index 82c67ea338..91aae93121 100644
--- a/airflow/providers/amazon/aws/sensors/glue_catalog_partition.py
+++ b/airflow/providers/amazon/aws/sensors/glue_catalog_partition.py
@@ -24,7 +24,7 @@ from typing import TYPE_CHECKING, Any, Sequence
from deprecated import deprecated
from airflow.configuration import conf
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.glue_catalog import GlueCatalogHook
from airflow.providers.amazon.aws.triggers.glue import
GlueCatalogPartitionTrigger
from airflow.sensors.base import BaseSensorOperator
@@ -115,7 +115,7 @@ class GlueCatalogPartitionSensor(BaseSensorOperator):
raise AirflowException(f"Trigger error: event is {event}")
self.log.info("Partition exists in the Glue Catalog")
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> GlueCatalogHook:
"""Get the GlueCatalogHook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/glue_crawler.py
b/airflow/providers/amazon/aws/sensors/glue_crawler.py
index 5656569577..c8c49d4079 100644
--- a/airflow/providers/amazon/aws/sensors/glue_crawler.py
+++ b/airflow/providers/amazon/aws/sensors/glue_crawler.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Sequence
from deprecated import deprecated
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.glue_crawler import GlueCrawlerHook
from airflow.sensors.base import BaseSensorOperator
@@ -67,7 +67,7 @@ class GlueCrawlerSensor(BaseSensorOperator):
else:
return False
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> GlueCrawlerHook:
"""Return a new or pre-existing GlueCrawlerHook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/redshift_cluster.py
b/airflow/providers/amazon/aws/sensors/redshift_cluster.py
index 2faa10e3bd..5b649bf78a 100644
--- a/airflow/providers/amazon/aws/sensors/redshift_cluster.py
+++ b/airflow/providers/amazon/aws/sensors/redshift_cluster.py
@@ -21,6 +21,7 @@ from typing import TYPE_CHECKING, Sequence
from deprecated import deprecated
+from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.redshift_cluster import RedshiftHook
from airflow.sensors.base import BaseSensorOperator
@@ -65,7 +66,7 @@ class RedshiftClusterSensor(BaseSensorOperator):
)
return current_status == self.target_status
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> RedshiftHook:
"""Create and return a RedshiftHook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/s3.py
b/airflow/providers/amazon/aws/sensors/s3.py
index da974f473d..654aca5bde 100644
--- a/airflow/providers/amazon/aws/sensors/s3.py
+++ b/airflow/providers/amazon/aws/sensors/s3.py
@@ -31,7 +31,7 @@ from airflow.configuration import conf
if TYPE_CHECKING:
from airflow.utils.context import Context
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.s3 import S3Hook
from airflow.providers.amazon.aws.triggers.s3 import S3KeysUnchangedTrigger,
S3KeyTrigger
from airflow.sensors.base import BaseSensorOperator, poke_mode_only
@@ -179,7 +179,7 @@ class S3KeySensor(BaseSensorOperator):
raise AirflowException(event["message"])
return None
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> S3Hook:
"""Create and return an S3Hook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/sagemaker.py
b/airflow/providers/amazon/aws/sensors/sagemaker.py
index b960d1cd03..56406699ee 100644
--- a/airflow/providers/amazon/aws/sensors/sagemaker.py
+++ b/airflow/providers/amazon/aws/sensors/sagemaker.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Sequence
from deprecated import deprecated
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.sagemaker import LogState,
SageMakerHook
from airflow.sensors.base import BaseSensorOperator
@@ -45,7 +45,7 @@ class SageMakerBaseSensor(BaseSensorOperator):
self.aws_conn_id = aws_conn_id
self.resource_type = resource_type # only used for logs, to say what
kind of resource we are sensing
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> SageMakerHook:
"""Get SageMakerHook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/sqs.py
b/airflow/providers/amazon/aws/sensors/sqs.py
index 0cb3604bb4..33f989d03c 100644
--- a/airflow/providers/amazon/aws/sensors/sqs.py
+++ b/airflow/providers/amazon/aws/sensors/sqs.py
@@ -25,7 +25,7 @@ from deprecated import deprecated
from typing_extensions import Literal
from airflow.configuration import conf
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.sqs import SqsHook
from airflow.providers.amazon.aws.triggers.sqs import SqsSensorTrigger
from airflow.providers.amazon.aws.utils.sqs import process_response
@@ -210,7 +210,7 @@ class SqsSensor(BaseSensorOperator):
else:
return False
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> SqsHook:
"""Create and return an SqsHook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/sensors/step_function.py
b/airflow/providers/amazon/aws/sensors/step_function.py
index b6a48c0033..2b0c3b6073 100644
--- a/airflow/providers/amazon/aws/sensors/step_function.py
+++ b/airflow/providers/amazon/aws/sensors/step_function.py
@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING, Sequence
from deprecated import deprecated
-from airflow.exceptions import AirflowException
+from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.step_function import StepFunctionHook
from airflow.sensors.base import BaseSensorOperator
@@ -85,7 +85,7 @@ class StepFunctionExecutionSensor(BaseSensorOperator):
self.xcom_push(context, "output", output)
return True
- @deprecated(reason="use `hook` property instead.")
+ @deprecated(reason="use `hook` property instead.",
category=AirflowProviderDeprecationWarning)
def get_hook(self) -> StepFunctionHook:
"""Create and return a StepFunctionHook."""
return self.hook
diff --git a/airflow/providers/amazon/aws/triggers/batch.py
b/airflow/providers/amazon/aws/triggers/batch.py
index c1b3770dd5..67d4d26c21 100644
--- a/airflow/providers/amazon/aws/triggers/batch.py
+++ b/airflow/providers/amazon/aws/triggers/batch.py
@@ -24,6 +24,7 @@ from typing import TYPE_CHECKING, Any
from botocore.exceptions import WaiterError
from deprecated import deprecated
+from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.hooks.batch_client import BatchClientHook
from airflow.providers.amazon.aws.triggers.base import AwsBaseWaiterTrigger
from airflow.triggers.base import BaseTrigger, TriggerEvent
@@ -32,7 +33,7 @@ if TYPE_CHECKING:
from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
-@deprecated(reason="use BatchJobTrigger instead")
+@deprecated(reason="use BatchJobTrigger instead",
category=AirflowProviderDeprecationWarning)
class BatchOperatorTrigger(BaseTrigger):
"""
Asynchronously poll the boto3 API and wait for the Batch job to be in the
`SUCCEEDED` state.
@@ -109,7 +110,7 @@ class BatchOperatorTrigger(BaseTrigger):
yield TriggerEvent({"status": "failure", "message": "Job
Failed - max attempts reached."})
-@deprecated(reason="use BatchJobTrigger instead")
+@deprecated(reason="use BatchJobTrigger instead",
category=AirflowProviderDeprecationWarning)
class BatchSensorTrigger(BaseTrigger):
"""
Checks for the status of a submitted job_id to AWS Batch until it reaches
a failure or a success state.
