You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2022/08/05 17:46:29 UTC
[airflow] branch main updated: Remove deprecated modules (#25543)
This is an automated email from the ASF dual-hosted git repository.
potiuk 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 029e3ae96f Remove deprecated modules (#25543)
029e3ae96f is described below
commit 029e3ae96f50074e9b524f0b820573741432f44a
Author: Vincent <97...@users.noreply.github.com>
AuthorDate: Fri Aug 5 13:46:19 2022 -0400
Remove deprecated modules (#25543)
---
.../contrib/operators/emr_add_steps_operator.py | 11 +-
.../operators/emr_create_job_flow_operator.py | 11 +-
.../operators/emr_terminate_job_flow_operator.py | 11 +-
.../contrib/operators/s3_copy_object_operator.py | 11 +-
.../operators/s3_delete_objects_operator.py | 11 +-
airflow/contrib/operators/s3_list_operator.py | 11 +-
.../contrib/operators/sagemaker_base_operator.py | 11 +-
.../sagemaker_endpoint_config_operator.py | 14 +-
.../operators/sagemaker_endpoint_operator.py | 11 +-
.../contrib/operators/sagemaker_model_operator.py | 11 +-
.../operators/sagemaker_training_operator.py | 11 +-
.../operators/sagemaker_transform_operator.py | 11 +-
.../contrib/operators/sagemaker_tuning_operator.py | 11 +-
airflow/contrib/sensors/emr_base_sensor.py | 9 +-
airflow/contrib/sensors/emr_job_flow_sensor.py | 11 +-
airflow/contrib/sensors/emr_step_sensor.py | 9 +-
airflow/contrib/sensors/sagemaker_base_sensor.py | 11 +-
.../contrib/sensors/sagemaker_endpoint_sensor.py | 11 +-
.../contrib/sensors/sagemaker_transform_sensor.py | 11 +-
airflow/contrib/sensors/sagemaker_tuning_sensor.py | 11 +-
airflow/providers/amazon/aws/hooks/aws_dynamodb.py | 28 ---
.../providers/amazon/aws/hooks/emr_containers.py | 44 ----
airflow/providers/amazon/aws/hooks/redshift.py | 31 ---
.../amazon/aws/operators/dms_create_task.py | 29 ---
.../amazon/aws/operators/dms_delete_task.py | 29 ---
.../amazon/aws/operators/dms_describe_tasks.py | 29 ---
.../amazon/aws/operators/dms_start_task.py | 29 ---
.../amazon/aws/operators/dms_stop_task.py | 29 ---
.../amazon/aws/operators/ec2_start_instance.py | 29 ---
.../amazon/aws/operators/ec2_stop_instance.py | 29 ---
.../amazon/aws/operators/emr_add_steps.py | 29 ---
.../amazon/aws/operators/emr_containers.py | 44 ----
.../amazon/aws/operators/emr_create_job_flow.py | 31 ---
.../amazon/aws/operators/emr_modify_cluster.py | 29 ---
.../amazon/aws/operators/emr_terminate_job_flow.py | 29 ---
airflow/providers/amazon/aws/operators/redshift.py | 33 ---
.../providers/amazon/aws/operators/s3_bucket.py | 28 ---
.../amazon/aws/operators/s3_bucket_tagging.py | 32 ---
.../amazon/aws/operators/s3_copy_object.py | 28 ---
.../amazon/aws/operators/s3_delete_objects.py | 28 ---
.../amazon/aws/operators/s3_file_transform.py | 28 ---
airflow/providers/amazon/aws/operators/s3_list.py | 28 ---
.../amazon/aws/operators/s3_list_prefixes.py | 28 ---
.../amazon/aws/operators/sagemaker_base.py | 29 ---
.../amazon/aws/operators/sagemaker_endpoint.py | 29 ---
.../aws/operators/sagemaker_endpoint_config.py | 29 ---
.../amazon/aws/operators/sagemaker_model.py | 29 ---
.../amazon/aws/operators/sagemaker_processing.py | 29 ---
.../amazon/aws/operators/sagemaker_training.py | 29 ---
.../amazon/aws/operators/sagemaker_transform.py | 29 ---
.../amazon/aws/operators/sagemaker_tuning.py | 29 ---
.../step_function_get_execution_output.py | 30 ---
.../aws/operators/step_function_start_execution.py | 28 ---
airflow/providers/amazon/aws/sensors/dms_task.py | 29 ---
.../amazon/aws/sensors/ec2_instance_state.py | 28 ---
airflow/providers/amazon/aws/sensors/emr_base.py | 29 ---
.../providers/amazon/aws/sensors/emr_containers.py | 45 ----
.../providers/amazon/aws/sensors/emr_job_flow.py | 29 ---
airflow/providers/amazon/aws/sensors/emr_step.py | 30 ---
airflow/providers/amazon/aws/sensors/redshift.py | 30 ---
airflow/providers/amazon/aws/sensors/s3_key.py | 28 ---
.../amazon/aws/sensors/s3_keys_unchanged.py | 28 ---
airflow/providers/amazon/aws/sensors/s3_prefix.py | 28 ---
.../providers/amazon/aws/sensors/sagemaker_base.py | 29 ---
.../amazon/aws/sensors/sagemaker_endpoint.py | 29 ---
.../amazon/aws/sensors/sagemaker_training.py | 29 ---
.../amazon/aws/sensors/sagemaker_transform.py | 29 ---
.../amazon/aws/sensors/sagemaker_tuning.py | 29 ---
.../amazon/aws/sensors/step_function_execution.py | 28 ---
.../providers/amazon/aws/transfers/mysql_to_s3.py | 72 -------
airflow/providers/amazon/provider.yaml | 57 +----
.../providers/google/cloud/transfers/s3_to_gcs.py | 2 +-
airflow/sensors/s3_key_sensor.py | 2 +-
airflow/sensors/s3_prefix_sensor.py | 2 +-
.../operators/lambda.rst | 2 +-
docs/apache-airflow/concepts/operators.rst | 2 +-
tests/always/test_project_structure.py | 25 ---
tests/deprecated_classes.py | 234 +--------------------
.../amazon/aws/hooks/test_redshift_sql.py | 2 +-
.../amazon/aws/operators/test_redshift_cluster.py | 26 +--
.../amazon/aws/transfers/test_mysql_to_s3.py | 118 -----------
.../amazon/aws/transfers/test_s3_to_redshift.py | 14 +-
82 files changed, 186 insertions(+), 2059 deletions(-)
diff --git a/airflow/contrib/operators/emr_add_steps_operator.py b/airflow/contrib/operators/emr_add_steps_operator.py
index e53f284e44..f82939e8cd 100644
--- a/airflow/contrib/operators/emr_add_steps_operator.py
+++ b/airflow/contrib/operators/emr_add_steps_operator.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr_add_steps`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr`."""
import warnings
-from airflow.providers.amazon.aws.operators.emr_add_steps import EmrAddStepsOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.emr import EmrAddStepsOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.emr_add_steps import ( # type: ignore[no-redef] # noqa
+ EmrAddStepsOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr_add_steps`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/emr_create_job_flow_operator.py b/airflow/contrib/operators/emr_create_job_flow_operator.py
index 16f1ce7f61..4d8753f8de 100644
--- a/airflow/contrib/operators/emr_create_job_flow_operator.py
+++ b/airflow/contrib/operators/emr_create_job_flow_operator.py
@@ -16,14 +16,19 @@
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr_create_job_flow`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr`."""
import warnings
-from airflow.providers.amazon.aws.operators.emr_create_job_flow import EmrCreateJobFlowOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.emr import EmrCreateJobFlowOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.emr_create_job_flow import ( # type: ignore[no-redef] # noqa
+ EmrCreateJobFlowOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr_create_job_flow`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/emr_terminate_job_flow_operator.py b/airflow/contrib/operators/emr_terminate_job_flow_operator.py
index 7c73bc32dc..a00bf80578 100644
--- a/airflow/contrib/operators/emr_terminate_job_flow_operator.py
+++ b/airflow/contrib/operators/emr_terminate_job_flow_operator.py
@@ -17,15 +17,20 @@
# under the License.
"""
This module is deprecated.
-Please use :mod:`airflow.providers.amazon.aws.operators.emr_terminate_job_flow`.
+Please use :mod:`airflow.providers.amazon.aws.operators.emr`.
"""
import warnings
-from airflow.providers.amazon.aws.operators.emr_terminate_job_flow import EmrTerminateJobFlowOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.emr import EmrTerminateJobFlowOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.emr_terminate_job_flow import ( # type: ignore[no-redef] # noqa
+ EmrTerminateJobFlowOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr_terminate_job_flow`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/s3_copy_object_operator.py b/airflow/contrib/operators/s3_copy_object_operator.py
index cbe9c63440..6da42b2e1c 100644
--- a/airflow/contrib/operators/s3_copy_object_operator.py
+++ b/airflow/contrib/operators/s3_copy_object_operator.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3_copy_object`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
import warnings
-from airflow.providers.amazon.aws.operators.s3_copy_object import S3CopyObjectOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.s3 import S3CopyObjectOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.s3_copy_object import ( # type: ignore[no-redef] # noqa
+ S3CopyObjectOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3_copy_object`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/s3_delete_objects_operator.py b/airflow/contrib/operators/s3_delete_objects_operator.py
index a0ab210324..5c830d89da 100644
--- a/airflow/contrib/operators/s3_delete_objects_operator.py
+++ b/airflow/contrib/operators/s3_delete_objects_operator.py
@@ -17,15 +17,20 @@
# under the License.
"""
This module is deprecated.
-Please use :mod:`airflow.providers.amazon.aws.operators.s3_delete_objects`.
+Please use :mod:`airflow.providers.amazon.aws.operators.s3`.
"""
import warnings
-from airflow.providers.amazon.aws.operators.s3_delete_objects import S3DeleteObjectsOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.s3 import S3DeleteObjectsOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.s3_delete_objects import ( # type: ignore[no-redef] # noqa
+ S3DeleteObjectsOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3_delete_objects`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/s3_list_operator.py b/airflow/contrib/operators/s3_list_operator.py
index 172b94cb11..1f622a0947 100644
--- a/airflow/contrib/operators/s3_list_operator.py
+++ b/airflow/contrib/operators/s3_list_operator.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3_list`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
import warnings
-from airflow.providers.amazon.aws.operators.s3_list import S3ListOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.s3 import S3ListOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.s3_list import ( # type: ignore[no-redef] # noqa
+ S3ListOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3_list`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/sagemaker_base_operator.py b/airflow/contrib/operators/sagemaker_base_operator.py
index 4c2c8f6baf..c23519b3b5 100644
--- a/airflow/contrib/operators/sagemaker_base_operator.py
+++ b/airflow/contrib/operators/sagemaker_base_operator.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker_base`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.operators.sagemaker_base import SageMakerBaseOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.sagemaker import SageMakerBaseOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.sagemaker_base import ( # type: ignore[no-redef] # noqa
+ SageMakerBaseOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker_base`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/sagemaker_endpoint_config_operator.py b/airflow/contrib/operators/sagemaker_endpoint_config_operator.py
index 43945b2227..0416cd45d8 100644
--- a/airflow/contrib/operators/sagemaker_endpoint_config_operator.py
+++ b/airflow/contrib/operators/sagemaker_endpoint_config_operator.py
@@ -17,18 +17,20 @@
# under the License.
"""
This module is deprecated.
-Please use `airflow.providers.amazon.aws.operators.sagemaker_endpoint_config`.
+Please use `airflow.providers.amazon.aws.operators.sagemaker`.
"""
import warnings
-from airflow.providers.amazon.aws.operators.sagemaker_endpoint_config import ( # noqa
- SageMakerEndpointConfigOperator,
-)
+try:
+ from airflow.providers.amazon.aws.operators.sagemaker import SageMakerEndpointConfigOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.sagemaker_endpoint_config import ( # type: ignore[no-redef] # noqa
+ SageMakerEndpointConfigOperator,
+ )
warnings.warn(
- "This module is deprecated. "
- "Please use `airflow.providers.amazon.aws.operators.sagemaker_endpoint_config`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/sagemaker_endpoint_operator.py b/airflow/contrib/operators/sagemaker_endpoint_operator.py
index fe175a67b2..398f06c5fa 100644
--- a/airflow/contrib/operators/sagemaker_endpoint_operator.py
+++ b/airflow/contrib/operators/sagemaker_endpoint_operator.py
@@ -17,15 +17,20 @@
# under the License.
"""
This module is deprecated.
-Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker_endpoint`.
+Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`.
"""
import warnings
-from airflow.providers.amazon.aws.operators.sagemaker_endpoint import SageMakerEndpointOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.sagemaker import SageMakerEndpointOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.sagemaker_endpoint import ( # type: ignore[no-redef] # noqa
+ SageMakerEndpointOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker_endpoint`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/sagemaker_model_operator.py b/airflow/contrib/operators/sagemaker_model_operator.py
index 9a00348560..240c9ce495 100644
--- a/airflow/contrib/operators/sagemaker_model_operator.py
+++ b/airflow/contrib/operators/sagemaker_model_operator.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker_model`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.operators.sagemaker_model import SageMakerModelOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.sagemaker import SageMakerModelOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.sagemaker_model import ( # type: ignore[no-redef] # noqa
+ SageMakerModelOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker_model`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/sagemaker_training_operator.py b/airflow/contrib/operators/sagemaker_training_operator.py
index d3749c6857..5b283f260a 100644
--- a/airflow/contrib/operators/sagemaker_training_operator.py
+++ b/airflow/contrib/operators/sagemaker_training_operator.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker_training`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.operators.sagemaker_training import SageMakerTrainingOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.sagemaker import SageMakerTrainingOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.sagemaker_training import ( # type: ignore[no-redef] # noqa
+ SageMakerTrainingOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker_training`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/sagemaker_transform_operator.py b/airflow/contrib/operators/sagemaker_transform_operator.py
index 93cf7070db..07dbfab5e7 100644
--- a/airflow/contrib/operators/sagemaker_transform_operator.py
+++ b/airflow/contrib/operators/sagemaker_transform_operator.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker_transform`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.operators.sagemaker_transform import SageMakerTransformOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.sagemaker import SageMakerTransformOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.sagemaker_transform import ( # type: ignore[no-redef] # noqa
+ SageMakerTransformOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker_transform`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/operators/sagemaker_tuning_operator.py b/airflow/contrib/operators/sagemaker_tuning_operator.py
index 05760a7456..293e6cbb03 100644
--- a/airflow/contrib/operators/sagemaker_tuning_operator.py
+++ b/airflow/contrib/operators/sagemaker_tuning_operator.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker_tuning`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.operators.sagemaker_tuning import SageMakerTuningOperator # noqa
+try:
+ from airflow.providers.amazon.aws.operators.sagemaker import SageMakerTuningOperator
+except ImportError:
+ from airflow.providers.amazon.aws.operators.sagemaker_tuning import ( # type: ignore[no-redef] # noqa
+ SageMakerTuningOperator,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker_tuning`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/sensors/emr_base_sensor.py b/airflow/contrib/sensors/emr_base_sensor.py
index 08d0efed81..d100e95ca2 100644
--- a/airflow/contrib/sensors/emr_base_sensor.py
+++ b/airflow/contrib/sensors/emr_base_sensor.py
@@ -15,14 +15,17 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr_base`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr`."""
import warnings
-from airflow.providers.amazon.aws.sensors.emr_base import EmrBaseSensor # noqa
+try:
+ from airflow.providers.amazon.aws.sensors.emr import EmrBaseSensor
+except ImportError:
+ from airflow.providers.amazon.aws.sensors.emr_base import EmrBaseSensor # type: ignore[no-redef] # noqa
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr_base`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/sensors/emr_job_flow_sensor.py b/airflow/contrib/sensors/emr_job_flow_sensor.py
index 429052a4ec..8c2365ec99 100644
--- a/airflow/contrib/sensors/emr_job_flow_sensor.py
+++ b/airflow/contrib/sensors/emr_job_flow_sensor.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr_job_flow`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr`."""
import warnings
-from airflow.providers.amazon.aws.sensors.emr_job_flow import EmrJobFlowSensor # noqa
+try:
+ from airflow.providers.amazon.aws.sensors.emr import EmrJobFlowSensor
+except ImportError:
+ from airflow.providers.amazon.aws.sensors.emr_job_flow import ( # type: ignore[no-redef] # noqa
+ EmrJobFlowSensor,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr_job_flow`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/sensors/emr_step_sensor.py b/airflow/contrib/sensors/emr_step_sensor.py
index 9d4ac9b166..2dd2e70406 100644
--- a/airflow/contrib/sensors/emr_step_sensor.py
+++ b/airflow/contrib/sensors/emr_step_sensor.py
@@ -15,14 +15,17 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr_step`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr`."""
import warnings
-from airflow.providers.amazon.aws.sensors.emr_step import EmrStepSensor # noqa
+try:
+ from airflow.providers.amazon.aws.sensors.emr import EmrStepSensor
+except ImportError:
+ from airflow.providers.amazon.aws.sensors.emr_step import EmrStepSensor # type: ignore[no-redef] # noqa
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr_step`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/sensors/sagemaker_base_sensor.py b/airflow/contrib/sensors/sagemaker_base_sensor.py
index 86e3233027..14ce0d88e5 100644
--- a/airflow/contrib/sensors/sagemaker_base_sensor.py
+++ b/airflow/contrib/sensors/sagemaker_base_sensor.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker_base`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.sensors.sagemaker_base import SageMakerBaseSensor # noqa
+try:
+ from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerBaseSensor
+except ImportError:
+ from airflow.providers.amazon.aws.sensors.sagemaker_base import ( # type: ignore[no-redef] # noqa
+ SageMakerBaseSensor,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker_base`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/sensors/sagemaker_endpoint_sensor.py b/airflow/contrib/sensors/sagemaker_endpoint_sensor.py
index 5107d6f542..e5a146a06c 100644
--- a/airflow/contrib/sensors/sagemaker_endpoint_sensor.py
+++ b/airflow/contrib/sensors/sagemaker_endpoint_sensor.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker_endpoint`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.sensors.sagemaker_endpoint import SageMakerEndpointSensor # noqa
+try:
+ from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerEndpointSensor
+except ImportError:
+ from airflow.providers.amazon.aws.sensors.sagemaker_endpoint import ( # type: ignore[no-redef] # noqa
+ SageMakerEndpointSensor,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker_endpoint`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/sensors/sagemaker_transform_sensor.py b/airflow/contrib/sensors/sagemaker_transform_sensor.py
index 29fd18f8ba..51723947ef 100644
--- a/airflow/contrib/sensors/sagemaker_transform_sensor.py
+++ b/airflow/contrib/sensors/sagemaker_transform_sensor.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker_transform`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.sensors.sagemaker_transform import SageMakerTransformSensor # noqa
+try:
+ from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerTransformSensor
+except ImportError:
+ from airflow.providers.amazon.aws.sensors.sagemaker_transform import ( # type: ignore[no-redef] # noqa
+ SageMakerTransformSensor,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker_transform`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/contrib/sensors/sagemaker_tuning_sensor.py b/airflow/contrib/sensors/sagemaker_tuning_sensor.py
index 7079e4ccb7..da6701f00d 100644
--- a/airflow/contrib/sensors/sagemaker_tuning_sensor.py
+++ b/airflow/contrib/sensors/sagemaker_tuning_sensor.py
@@ -15,14 +15,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker_tuning`."""
+"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
import warnings
-from airflow.providers.amazon.aws.sensors.sagemaker_tuning import SageMakerTuningSensor # noqa
+try:
+ from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerTuningSensor
+except ImportError:
+ from airflow.providers.amazon.aws.sensors.sagemaker_tuning import ( # type: ignore[no-redef] # noqa
+ SageMakerTuningSensor,
+ )
warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker_tuning`.",
+ "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
DeprecationWarning,
stacklevel=2,
)
diff --git a/airflow/providers/amazon/aws/hooks/aws_dynamodb.py b/airflow/providers/amazon/aws/hooks/aws_dynamodb.py
deleted file mode 100644
index dedb80073e..0000000000
--- a/airflow/providers/amazon/aws/hooks/aws_dynamodb.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.hooks.dynamodb`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.hooks.dynamodb import AwsDynamoDBHook # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.hooks.dynamodb`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/hooks/emr_containers.py b/airflow/providers/amazon/aws/hooks/emr_containers.py
deleted file mode 100644
index 1e3b7a0ea4..0000000000
--- a/airflow/providers/amazon/aws/hooks/emr_containers.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.hooks.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.hooks.emr import EmrContainerHook
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.hooks.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
-
-
-class EMRContainerHook(EmrContainerHook):
- """
- This class is deprecated.
- Please use :class:`airflow.providers.amazon.aws.hooks.emr.EmrContainerHook`.
- """
-
- def __init__(self, **kwargs):
- warnings.warn(
- """This class is deprecated.
- Please use `airflow.providers.amazon.aws.hooks.emr.EmrContainerHook`.""",
- DeprecationWarning,
- stacklevel=2,
- )
- super().__init__(**kwargs)
diff --git a/airflow/providers/amazon/aws/hooks/redshift.py b/airflow/providers/amazon/aws/hooks/redshift.py
deleted file mode 100644
index 1766564d27..0000000000
--- a/airflow/providers/amazon/aws/hooks/redshift.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""Interact with AWS Redshift clusters."""
-import warnings
-
-from airflow.providers.amazon.aws.hooks.redshift_cluster import RedshiftHook
-from airflow.providers.amazon.aws.hooks.redshift_sql import RedshiftSQLHook
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.hooks.redshift_cluster` "
- "or `airflow.providers.amazon.aws.hooks.redshift_sql` as appropriate.",
- DeprecationWarning,
- stacklevel=2,
-)
-
-__all__ = ["RedshiftHook", "RedshiftSQLHook"]
diff --git a/airflow/providers/amazon/aws/operators/dms_create_task.py b/airflow/providers/amazon/aws/operators/dms_create_task.py
deleted file mode 100644
index 0443772dc6..0000000000
--- a/airflow/providers/amazon/aws/operators/dms_create_task.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.dms`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.dms import DmsCreateTaskOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.dms`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/dms_delete_task.py b/airflow/providers/amazon/aws/operators/dms_delete_task.py
deleted file mode 100644
index ddb929efce..0000000000
--- a/airflow/providers/amazon/aws/operators/dms_delete_task.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.dms`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.dms import DmsDeleteTaskOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.dms`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/dms_describe_tasks.py b/airflow/providers/amazon/aws/operators/dms_describe_tasks.py
deleted file mode 100644
index 022c028c89..0000000000
--- a/airflow/providers/amazon/aws/operators/dms_describe_tasks.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.dms`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.dms import DmsDescribeTasksOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.dms`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/dms_start_task.py b/airflow/providers/amazon/aws/operators/dms_start_task.py
deleted file mode 100644
index ba78ea60be..0000000000
--- a/airflow/providers/amazon/aws/operators/dms_start_task.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.dms`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.dms import DmsStartTaskOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.dms`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/dms_stop_task.py b/airflow/providers/amazon/aws/operators/dms_stop_task.py
deleted file mode 100644
index c4ad5f3a4a..0000000000
--- a/airflow/providers/amazon/aws/operators/dms_stop_task.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.dms`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.dms import DmsStopTaskOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.dms`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/ec2_start_instance.py b/airflow/providers/amazon/aws/operators/ec2_start_instance.py
deleted file mode 100644
index c2c25e5708..0000000000
--- a/airflow/providers/amazon/aws/operators/ec2_start_instance.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.ec2`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.ec2 import EC2StartInstanceOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.ec2`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/ec2_stop_instance.py b/airflow/providers/amazon/aws/operators/ec2_stop_instance.py
deleted file mode 100644
index ddafa21c5b..0000000000
--- a/airflow/providers/amazon/aws/operators/ec2_stop_instance.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.ec2`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.ec2 import EC2StopInstanceOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.ec2`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/emr_add_steps.py b/airflow/providers/amazon/aws/operators/emr_add_steps.py
deleted file mode 100644
index c99be43e8c..0000000000
--- a/airflow/providers/amazon/aws/operators/emr_add_steps.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.emr import EmrAddStepsOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/emr_containers.py b/airflow/providers/amazon/aws/operators/emr_containers.py
deleted file mode 100644
index 6e81b0bdde..0000000000
--- a/airflow/providers/amazon/aws/operators/emr_containers.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.emr import EmrContainerOperator
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
-
-
-class EMRContainerOperator(EmrContainerOperator):
- """
- This class is deprecated.
- Please use :class:`airflow.providers.amazon.aws.operators.emr.EmrContainerOperator`.
- """
-
- def __init__(self, **kwargs):
- warnings.warn(
- """This class is deprecated.
- Please use `airflow.providers.amazon.aws.operators.emr.EmrContainerOperator`.""",
- DeprecationWarning,
- stacklevel=2,
- )
- super().__init__(**kwargs)
diff --git a/airflow/providers/amazon/aws/operators/emr_create_job_flow.py b/airflow/providers/amazon/aws/operators/emr_create_job_flow.py
deleted file mode 100644
index 18c052fa2c..0000000000
--- a/airflow/providers/amazon/aws/operators/emr_create_job_flow.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.emr import EmrClusterLink, EmrCreateJobFlowOperator
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
-
-__all__ = ["EmrClusterLink", "EmrCreateJobFlowOperator"]
diff --git a/airflow/providers/amazon/aws/operators/emr_modify_cluster.py b/airflow/providers/amazon/aws/operators/emr_modify_cluster.py
deleted file mode 100644
index 71b44d5364..0000000000
--- a/airflow/providers/amazon/aws/operators/emr_modify_cluster.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.emr import EmrClusterLink, EmrModifyClusterOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/emr_terminate_job_flow.py b/airflow/providers/amazon/aws/operators/emr_terminate_job_flow.py
deleted file mode 100644
index f924393a44..0000000000
--- a/airflow/providers/amazon/aws/operators/emr_terminate_job_flow.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.emr import EmrTerminateJobFlowOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/redshift.py b/airflow/providers/amazon/aws/operators/redshift.py
deleted file mode 100644
index efcf44a797..0000000000
--- a/airflow/providers/amazon/aws/operators/redshift.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-import warnings
-
-from airflow.providers.amazon.aws.operators.redshift_cluster import (
- RedshiftPauseClusterOperator,
- RedshiftResumeClusterOperator,
-)
-from airflow.providers.amazon.aws.operators.redshift_sql import RedshiftSQLOperator
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.redshift_sql` "
- "or `airflow.providers.amazon.aws.operators.redshift_cluster` as appropriate.",
- DeprecationWarning,
- stacklevel=2,
-)
-
-__all__ = ["RedshiftSQLOperator", "RedshiftPauseClusterOperator", "RedshiftResumeClusterOperator"]
diff --git a/airflow/providers/amazon/aws/operators/s3_bucket.py b/airflow/providers/amazon/aws/operators/s3_bucket.py
deleted file mode 100644
index e5806fa780..0000000000
--- a/airflow/providers/amazon/aws/operators/s3_bucket.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.s3 import S3CreateBucketOperator, S3DeleteBucketOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/s3_bucket_tagging.py b/airflow/providers/amazon/aws/operators/s3_bucket_tagging.py
deleted file mode 100644
index fb21441264..0000000000
--- a/airflow/providers/amazon/aws/operators/s3_bucket_tagging.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.s3 import ( # noqa
- S3DeleteBucketTaggingOperator,
- S3GetBucketTaggingOperator,
- S3PutBucketTaggingOperator,
-)
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/s3_copy_object.py b/airflow/providers/amazon/aws/operators/s3_copy_object.py
deleted file mode 100644
index 298f8d2172..0000000000
--- a/airflow/providers/amazon/aws/operators/s3_copy_object.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.s3 import S3CopyObjectOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/s3_delete_objects.py b/airflow/providers/amazon/aws/operators/s3_delete_objects.py
deleted file mode 100644
index 35d86893eb..0000000000
--- a/airflow/providers/amazon/aws/operators/s3_delete_objects.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.s3 import S3DeleteObjectsOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/s3_file_transform.py b/airflow/providers/amazon/aws/operators/s3_file_transform.py
deleted file mode 100644
index 4400b202bb..0000000000
--- a/airflow/providers/amazon/aws/operators/s3_file_transform.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.s3 import S3FileTransformOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/s3_list.py b/airflow/providers/amazon/aws/operators/s3_list.py
deleted file mode 100644
index c114a0b814..0000000000
--- a/airflow/providers/amazon/aws/operators/s3_list.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.s3 import S3ListOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/s3_list_prefixes.py b/airflow/providers/amazon/aws/operators/s3_list_prefixes.py
deleted file mode 100644
index 5e94f0c17f..0000000000
--- a/airflow/providers/amazon/aws/operators/s3_list_prefixes.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.s3 import S3ListPrefixesOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/sagemaker_base.py b/airflow/providers/amazon/aws/operators/sagemaker_base.py
deleted file mode 100644
index 22e44d71c8..0000000000
--- a/airflow/providers/amazon/aws/operators/sagemaker_base.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.sagemaker import SageMakerBaseOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/sagemaker_endpoint.py b/airflow/providers/amazon/aws/operators/sagemaker_endpoint.py
deleted file mode 100644
index 5351431f00..0000000000
--- a/airflow/providers/amazon/aws/operators/sagemaker_endpoint.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.sagemaker import SageMakerEndpointOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/sagemaker_endpoint_config.py b/airflow/providers/amazon/aws/operators/sagemaker_endpoint_config.py
deleted file mode 100644
index 737e5b6c7d..0000000000
--- a/airflow/providers/amazon/aws/operators/sagemaker_endpoint_config.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.sagemaker import SageMakerEndpointConfigOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/sagemaker_model.py b/airflow/providers/amazon/aws/operators/sagemaker_model.py
deleted file mode 100644
index fffe8d96e4..0000000000
--- a/airflow/providers/amazon/aws/operators/sagemaker_model.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.sagemaker import SageMakerModelOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/sagemaker_processing.py b/airflow/providers/amazon/aws/operators/sagemaker_processing.py
deleted file mode 100644
index b3a4be8fa2..0000000000
--- a/airflow/providers/amazon/aws/operators/sagemaker_processing.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.sagemaker import SageMakerProcessingOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/sagemaker_training.py b/airflow/providers/amazon/aws/operators/sagemaker_training.py
deleted file mode 100644
index 40f13b45e9..0000000000
--- a/airflow/providers/amazon/aws/operators/sagemaker_training.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.sagemaker import SageMakerTrainingOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/sagemaker_transform.py b/airflow/providers/amazon/aws/operators/sagemaker_transform.py
deleted file mode 100644
index 1e833edebc..0000000000
--- a/airflow/providers/amazon/aws/operators/sagemaker_transform.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.sagemaker import SageMakerTransformOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/sagemaker_tuning.py b/airflow/providers/amazon/aws/operators/sagemaker_tuning.py
deleted file mode 100644
index 18a8263a4f..0000000000
--- a/airflow/providers/amazon/aws/operators/sagemaker_tuning.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.sagemaker import SageMakerTuningOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/step_function_get_execution_output.py b/airflow/providers/amazon/aws/operators/step_function_get_execution_output.py
deleted file mode 100644
index 2b047241ae..0000000000
--- a/airflow/providers/amazon/aws/operators/step_function_get_execution_output.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.step_function`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.step_function import ( # noqa
- StepFunctionGetExecutionOutputOperator,
-)
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.step_function`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/operators/step_function_start_execution.py b/airflow/providers/amazon/aws/operators/step_function_start_execution.py
deleted file mode 100644
index 10a847ffc9..0000000000
--- a/airflow/providers/amazon/aws/operators/step_function_start_execution.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.operators.step_function`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.operators.step_function import StepFunctionStartExecutionOperator # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.operators.step_function`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/dms_task.py b/airflow/providers/amazon/aws/sensors/dms_task.py
deleted file mode 100644
index 26a06c5812..0000000000
--- a/airflow/providers/amazon/aws/sensors/dms_task.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.dms`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.dms import DmsTaskBaseSensor, DmsTaskCompletedSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.dms`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/ec2_instance_state.py b/airflow/providers/amazon/aws/sensors/ec2_instance_state.py
deleted file mode 100644
index d166b69d20..0000000000
--- a/airflow/providers/amazon/aws/sensors/ec2_instance_state.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.ec2`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.ec2 import EC2InstanceStateSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.ec2`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/emr_base.py b/airflow/providers/amazon/aws/sensors/emr_base.py
deleted file mode 100644
index 89991d7fa0..0000000000
--- a/airflow/providers/amazon/aws/sensors/emr_base.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.emr import EmrBaseSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/emr_containers.py b/airflow/providers/amazon/aws/sensors/emr_containers.py
deleted file mode 100644
index 6cfa9adb7d..0000000000
--- a/airflow/providers/amazon/aws/sensors/emr_containers.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.emr import EmrBaseSensor, EmrContainerSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
-
-
-class EMRContainerSensor(EmrContainerSensor):
- """
- This class is deprecated.
- Please use :class:`airflow.providers.amazon.aws.sensors.emr.EmrContainerSensor`.
- """
-
- def __init__(self, **kwargs):
- warnings.warn(
- """This class is deprecated.
- Please use `airflow.providers.amazon.aws.sensors.emr.EmrContainerSensor`.""",
- DeprecationWarning,
- stacklevel=2,
- )
- super().__init__(**kwargs)
diff --git a/airflow/providers/amazon/aws/sensors/emr_job_flow.py b/airflow/providers/amazon/aws/sensors/emr_job_flow.py
deleted file mode 100644
index 31b6dabb4a..0000000000
--- a/airflow/providers/amazon/aws/sensors/emr_job_flow.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.emr import EmrJobFlowSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/emr_step.py b/airflow/providers/amazon/aws/sensors/emr_step.py
deleted file mode 100644
index aca7161908..0000000000
--- a/airflow/providers/amazon/aws/sensors/emr_step.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.emr`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.emr import EmrJobFlowSensor, EmrStepSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.emr`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/redshift.py b/airflow/providers/amazon/aws/sensors/redshift.py
deleted file mode 100644
index 6a73e7ddba..0000000000
--- a/airflow/providers/amazon/aws/sensors/redshift.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-import warnings
-
-from airflow.providers.amazon.aws.sensors.redshift_cluster import RedshiftClusterSensor
-
-AwsRedshiftClusterSensor = RedshiftClusterSensor
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.redshift_cluster`.",
- DeprecationWarning,
- stacklevel=2,
-)
-
-__all__ = ["AwsRedshiftClusterSensor", "RedshiftClusterSensor"]
diff --git a/airflow/providers/amazon/aws/sensors/s3_key.py b/airflow/providers/amazon/aws/sensors/s3_key.py
deleted file mode 100644
index deff11d00d..0000000000
--- a/airflow/providers/amazon/aws/sensors/s3_key.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.s3 import S3KeySensor, S3KeySizeSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/s3_keys_unchanged.py b/airflow/providers/amazon/aws/sensors/s3_keys_unchanged.py
deleted file mode 100644
index 792d29c46c..0000000000
--- a/airflow/providers/amazon/aws/sensors/s3_keys_unchanged.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.s3 import S3KeysUnchangedSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/s3_prefix.py b/airflow/providers/amazon/aws/sensors/s3_prefix.py
deleted file mode 100644
index 3990e8774a..0000000000
--- a/airflow/providers/amazon/aws/sensors/s3_prefix.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.s3`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.s3 import S3PrefixSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/sagemaker_base.py b/airflow/providers/amazon/aws/sensors/sagemaker_base.py
deleted file mode 100644
index 102c410d27..0000000000
--- a/airflow/providers/amazon/aws/sensors/sagemaker_base.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerBaseSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/sagemaker_endpoint.py b/airflow/providers/amazon/aws/sensors/sagemaker_endpoint.py
deleted file mode 100644
index 00ed844238..0000000000
--- a/airflow/providers/amazon/aws/sensors/sagemaker_endpoint.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerEndpointSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/sagemaker_training.py b/airflow/providers/amazon/aws/sensors/sagemaker_training.py
deleted file mode 100644
index d194996495..0000000000
--- a/airflow/providers/amazon/aws/sensors/sagemaker_training.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerTrainingSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/sagemaker_transform.py b/airflow/providers/amazon/aws/sensors/sagemaker_transform.py
deleted file mode 100644
index 7a48f3e7de..0000000000
--- a/airflow/providers/amazon/aws/sensors/sagemaker_transform.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerTransformSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/sagemaker_tuning.py b/airflow/providers/amazon/aws/sensors/sagemaker_tuning.py
deleted file mode 100644
index d5f0d90555..0000000000
--- a/airflow/providers/amazon/aws/sensors/sagemaker_tuning.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.sagemaker`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.sagemaker import SageMakerTuningSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.sagemaker`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/sensors/step_function_execution.py b/airflow/providers/amazon/aws/sensors/step_function_execution.py
deleted file mode 100644
index 267343cd1d..0000000000
--- a/airflow/providers/amazon/aws/sensors/step_function_execution.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""This module is deprecated. Please use :mod:`airflow.providers.amazon.aws.sensors.step_function`."""
-
-import warnings
-
-from airflow.providers.amazon.aws.sensors.step_function import StepFunctionExecutionSensor # noqa
-
-warnings.warn(
- "This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.step_function`.",
- DeprecationWarning,
- stacklevel=2,
-)
diff --git a/airflow/providers/amazon/aws/transfers/mysql_to_s3.py b/airflow/providers/amazon/aws/transfers/mysql_to_s3.py
deleted file mode 100644
index dc3d84ecb3..0000000000
--- a/airflow/providers/amazon/aws/transfers/mysql_to_s3.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-import warnings
-from typing import Optional
-
-from airflow.exceptions import AirflowException
-from airflow.providers.amazon.aws.transfers.sql_to_s3 import SqlToS3Operator
-
-warnings.warn(
- "This module is deprecated. Please use airflow.providers.amazon.aws.transfers.sql_to_s3`.",
- DeprecationWarning,
- stacklevel=2,
-)
-
-
-class MySQLToS3Operator(SqlToS3Operator):
- """
- This class is deprecated.
- Please use `airflow.providers.amazon.aws.transfers.sql_to_s3.SqlToS3Operator`.
- """
-
- template_fields_renderers = {
- "pd_csv_kwargs": "json",
- }
-
- def __init__(
- self,
- *,
- mysql_conn_id: str = 'mysql_default',
- pd_csv_kwargs: Optional[dict] = None,
- index: bool = False,
- header: bool = False,
- **kwargs,
- ) -> None:
- warnings.warn(
- """
- MySQLToS3Operator is deprecated.
- Please use `airflow.providers.amazon.aws.transfers.sql_to_s3.SqlToS3Operator`.
- """,
- DeprecationWarning,
- stacklevel=2,
- )
-
- pd_kwargs = kwargs.get('pd_kwargs', {})
- if kwargs.get('file_format', "csv") == "csv":
- if "path_or_buf" in pd_kwargs:
- raise AirflowException('The argument path_or_buf is not allowed, please remove it')
- if "index" not in pd_kwargs:
- pd_kwargs["index"] = index
- if "header" not in pd_kwargs:
- pd_kwargs["header"] = header
- kwargs["pd_kwargs"] = {**kwargs.get('pd_kwargs', {}), **pd_kwargs}
- elif pd_csv_kwargs is not None:
- raise TypeError("pd_csv_kwargs may not be specified when file_format='parquet'")
-
- super().__init__(sql_conn_id=mysql_conn_id, **kwargs)
diff --git a/airflow/providers/amazon/provider.yaml b/airflow/providers/amazon/provider.yaml
index 3fa76b6397..af9a7f4694 100644
--- a/airflow/providers/amazon/provider.yaml
+++ b/airflow/providers/amazon/provider.yaml
@@ -257,15 +257,8 @@ operators:
- integration-name: AWS Database Migration Service
python-modules:
- airflow.providers.amazon.aws.operators.dms
- - airflow.providers.amazon.aws.operators.dms_create_task
- - airflow.providers.amazon.aws.operators.dms_delete_task
- - airflow.providers.amazon.aws.operators.dms_describe_tasks
- - airflow.providers.amazon.aws.operators.dms_start_task
- - airflow.providers.amazon.aws.operators.dms_stop_task
- integration-name: Amazon EC2
python-modules:
- - airflow.providers.amazon.aws.operators.ec2_start_instance
- - airflow.providers.amazon.aws.operators.ec2_stop_instance
- airflow.providers.amazon.aws.operators.ec2
- integration-name: Amazon ECS
python-modules:
@@ -276,14 +269,9 @@ operators:
- integration-name: Amazon EMR
python-modules:
- airflow.providers.amazon.aws.operators.emr
- - airflow.providers.amazon.aws.operators.emr_add_steps
- - airflow.providers.amazon.aws.operators.emr_create_job_flow
- - airflow.providers.amazon.aws.operators.emr_modify_cluster
- - airflow.providers.amazon.aws.operators.emr_terminate_job_flow
- integration-name: Amazon EMR on EKS
python-modules:
- airflow.providers.amazon.aws.operators.emr
- - airflow.providers.amazon.aws.operators.emr_containers
- integration-name: Amazon Glacier
python-modules:
- airflow.providers.amazon.aws.operators.glacier
@@ -297,25 +285,10 @@ operators:
- airflow.providers.amazon.aws.operators.lambda_function
- integration-name: Amazon Simple Storage Service (S3)
python-modules:
- - airflow.providers.amazon.aws.operators.s3_bucket
- - airflow.providers.amazon.aws.operators.s3_bucket_tagging
- - airflow.providers.amazon.aws.operators.s3_copy_object
- - airflow.providers.amazon.aws.operators.s3_delete_objects
- - airflow.providers.amazon.aws.operators.s3_file_transform
- - airflow.providers.amazon.aws.operators.s3_list
- - airflow.providers.amazon.aws.operators.s3_list_prefixes
- airflow.providers.amazon.aws.operators.s3
- integration-name: Amazon SageMaker
python-modules:
- airflow.providers.amazon.aws.operators.sagemaker
- - airflow.providers.amazon.aws.operators.sagemaker_base
- - airflow.providers.amazon.aws.operators.sagemaker_endpoint
- - airflow.providers.amazon.aws.operators.sagemaker_endpoint_config
- - airflow.providers.amazon.aws.operators.sagemaker_model
- - airflow.providers.amazon.aws.operators.sagemaker_processing
- - airflow.providers.amazon.aws.operators.sagemaker_training
- - airflow.providers.amazon.aws.operators.sagemaker_transform
- - airflow.providers.amazon.aws.operators.sagemaker_tuning
- integration-name: Amazon Simple Notification Service (SNS)
python-modules:
- airflow.providers.amazon.aws.operators.sns
@@ -324,15 +297,12 @@ operators:
- airflow.providers.amazon.aws.operators.sqs
- integration-name: AWS Step Functions
python-modules:
- - airflow.providers.amazon.aws.operators.step_function_get_execution_output
- - airflow.providers.amazon.aws.operators.step_function_start_execution
- airflow.providers.amazon.aws.operators.step_function
- integration-name: Amazon RDS
python-modules:
- airflow.providers.amazon.aws.operators.rds
- integration-name: Amazon Redshift
python-modules:
- - airflow.providers.amazon.aws.operators.redshift
- airflow.providers.amazon.aws.operators.redshift_sql
- airflow.providers.amazon.aws.operators.redshift_cluster
- airflow.providers.amazon.aws.operators.redshift_data
@@ -355,11 +325,9 @@ sensors:
- airflow.providers.amazon.aws.sensors.cloud_formation
- integration-name: AWS Database Migration Service
python-modules:
- - airflow.providers.amazon.aws.sensors.dms_task
- airflow.providers.amazon.aws.sensors.dms
- integration-name: Amazon EC2
python-modules:
- - airflow.providers.amazon.aws.sensors.ec2_instance_state
- airflow.providers.amazon.aws.sensors.ec2
- integration-name: Amazon Elastic Kubernetes Service (EKS)
python-modules:
@@ -367,13 +335,9 @@ sensors:
- integration-name: Amazon EMR
python-modules:
- airflow.providers.amazon.aws.sensors.emr
- - airflow.providers.amazon.aws.sensors.emr_base
- - airflow.providers.amazon.aws.sensors.emr_job_flow
- - airflow.providers.amazon.aws.sensors.emr_step
- integration-name: Amazon EMR on EKS
python-modules:
- airflow.providers.amazon.aws.sensors.emr
- - airflow.providers.amazon.aws.sensors.emr_containers
- integration-name: Amazon Glacier
python-modules:
- airflow.providers.amazon.aws.sensors.glacier
@@ -387,28 +351,18 @@ sensors:
- airflow.providers.amazon.aws.sensors.rds
- integration-name: Amazon Redshift
python-modules:
- - airflow.providers.amazon.aws.sensors.redshift
- airflow.providers.amazon.aws.sensors.redshift_cluster
- integration-name: Amazon Simple Storage Service (S3)
python-modules:
- - airflow.providers.amazon.aws.sensors.s3_key
- - airflow.providers.amazon.aws.sensors.s3_keys_unchanged
- - airflow.providers.amazon.aws.sensors.s3_prefix
- airflow.providers.amazon.aws.sensors.s3
- integration-name: Amazon SageMaker
python-modules:
- airflow.providers.amazon.aws.sensors.sagemaker
- - airflow.providers.amazon.aws.sensors.sagemaker_base
- - airflow.providers.amazon.aws.sensors.sagemaker_endpoint
- - airflow.providers.amazon.aws.sensors.sagemaker_training
- - airflow.providers.amazon.aws.sensors.sagemaker_transform
- - airflow.providers.amazon.aws.sensors.sagemaker_tuning
- integration-name: Amazon Simple Queue Service (SQS)
python-modules:
- airflow.providers.amazon.aws.sensors.sqs
- integration-name: AWS Step Functions
python-modules:
- - airflow.providers.amazon.aws.sensors.step_function_execution
- airflow.providers.amazon.aws.sensors.step_function
- integration-name: Amazon QuickSight
python-modules:
@@ -421,7 +375,6 @@ hooks:
- integration-name: Amazon DynamoDB
python-modules:
- airflow.providers.amazon.aws.hooks.dynamodb
- - airflow.providers.amazon.aws.hooks.aws_dynamodb
- integration-name: Amazon Web Services
python-modules:
- airflow.providers.amazon.aws.hooks.base_aws
@@ -452,7 +405,7 @@ hooks:
- airflow.providers.amazon.aws.hooks.emr
- integration-name: Amazon EMR on EKS
python-modules:
- - airflow.providers.amazon.aws.hooks.emr_containers
+ - airflow.providers.amazon.aws.hooks.emr
- integration-name: Amazon Glacier
python-modules:
- airflow.providers.amazon.aws.hooks.glacier
@@ -475,7 +428,6 @@ hooks:
- airflow.providers.amazon.aws.hooks.rds
- integration-name: Amazon Redshift
python-modules:
- - airflow.providers.amazon.aws.hooks.redshift
- airflow.providers.amazon.aws.hooks.redshift_sql
- airflow.providers.amazon.aws.hooks.redshift_cluster
- airflow.providers.amazon.aws.hooks.redshift_data
@@ -539,10 +491,6 @@ transfers:
target-integration-name: Amazon Simple Storage Service (S3)
how-to-guide: /docs/apache-airflow-providers-amazon/operators/transfer/mongo_to_s3.rst
python-module: airflow.providers.amazon.aws.transfers.mongo_to_s3
- - source-integration-name: MySQL
- target-integration-name: Amazon Simple Storage Service (S3)
- how-to-guide: /docs/apache-airflow-providers-amazon/operators/transfer/sql_to_s3.rst
- python-module: airflow.providers.amazon.aws.transfers.mysql_to_s3
- source-integration-name: Amazon Redshift
target-integration-name: Amazon Simple Storage Service (S3)
how-to-guide: /docs/apache-airflow-providers-amazon/operators/transfer/redshift_to_s3.rst
@@ -590,7 +538,6 @@ extra-links:
- airflow.providers.amazon.aws.links.batch.BatchJobQueueLink
- airflow.providers.amazon.aws.links.emr.EmrClusterLink
- airflow.providers.amazon.aws.links.logs.CloudWatchEventsLink
- - airflow.providers.amazon.aws.operators.emr_create_job_flow.EmrClusterLink
connection-types:
- hook-class-name: airflow.providers.amazon.aws.hooks.s3.S3Hook
@@ -601,7 +548,7 @@ connection-types:
connection-type: emr
- hook-class-name: airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook
connection-type: redshift
- - hook-class-name: airflow.providers.amazon.aws.hooks.redshift.RedshiftDataHook
+ - hook-class-name: airflow.providers.amazon.aws.hooks.redshift_data.RedshiftDataHook
connection-type: aws
secrets-backends:
diff --git a/airflow/providers/google/cloud/transfers/s3_to_gcs.py b/airflow/providers/google/cloud/transfers/s3_to_gcs.py
index d86e63018a..82c039508e 100644
--- a/airflow/providers/google/cloud/transfers/s3_to_gcs.py
+++ b/airflow/providers/google/cloud/transfers/s3_to_gcs.py
@@ -25,7 +25,7 @@ from airflow.providers.google.cloud.hooks.gcs import GCSHook, _parse_gcs_url, gc
try:
from airflow.providers.amazon.aws.operators.s3 import S3ListOperator
except ImportError:
- from airflow.providers.amazon.aws.operators.s3_list import S3ListOperator
+ from airflow.providers.amazon.aws.operators.s3_list import S3ListOperator # type: ignore[no-redef]
if TYPE_CHECKING:
from airflow.utils.context import Context
diff --git a/airflow/sensors/s3_key_sensor.py b/airflow/sensors/s3_key_sensor.py
index d0f7c40b6d..e802f744f6 100644
--- a/airflow/sensors/s3_key_sensor.py
+++ b/airflow/sensors/s3_key_sensor.py
@@ -19,7 +19,7 @@
import warnings
-from airflow.providers.amazon.aws.sensors.s3_key import S3KeySensor # noqa
+from airflow.providers.amazon.aws.sensors.s3 import S3KeySensor # noqa
warnings.warn(
"This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.s3_key`.",
diff --git a/airflow/sensors/s3_prefix_sensor.py b/airflow/sensors/s3_prefix_sensor.py
index d5ea72b37d..3990e8774a 100644
--- a/airflow/sensors/s3_prefix_sensor.py
+++ b/airflow/sensors/s3_prefix_sensor.py
@@ -19,7 +19,7 @@
import warnings
-from airflow.providers.amazon.aws.sensors.s3_prefix import S3PrefixSensor # noqa
+from airflow.providers.amazon.aws.sensors.s3 import S3PrefixSensor # noqa
warnings.warn(
"This module is deprecated. Please use `airflow.providers.amazon.aws.sensors.s3`.",
diff --git a/docs/apache-airflow-providers-amazon/operators/lambda.rst b/docs/apache-airflow-providers-amazon/operators/lambda.rst
index 53bbeaec34..8f8f29bd1c 100644
--- a/docs/apache-airflow-providers-amazon/operators/lambda.rst
+++ b/docs/apache-airflow-providers-amazon/operators/lambda.rst
@@ -39,7 +39,7 @@ Invoke an AWS Lambda function
=============================
To invoke an AWS lambda function you can use
-:class:`~airflow.providers.amazon.aws.operators.aws_lambda.AwsLambdaInvokeFunctionOperator`.
+:class:`~airflow.providers.amazon.aws.operators.lambda_function.AwsLambdaInvokeFunctionOperator`.
.. exampleinclude:: /../../tests/system/providers/amazon/aws/example_lambda.py
diff --git a/docs/apache-airflow/concepts/operators.rst b/docs/apache-airflow/concepts/operators.rst
index 00aa5f4156..935ae9e0eb 100644
--- a/docs/apache-airflow/concepts/operators.rst
+++ b/docs/apache-airflow/concepts/operators.rst
@@ -44,7 +44,7 @@ If the operator you need isn't installed with Airflow by default, you can probab
- :class:`~airflow.providers.jdbc.operators.jdbc.JdbcOperator`
- :class:`~airflow.providers.docker.operators.docker.DockerOperator`
- :class:`~airflow.providers.apache.hive.operators.hive.HiveOperator`
-- :class:`~airflow.providers.amazon.aws.operators.s3_file_transform.S3FileTransformOperator`
+- :class:`~airflow.providers.amazon.aws.operators.s3.S3FileTransformOperator`
- :class:`~airflow.providers.mysql.transfers.presto_to_mysql.PrestoToMySqlOperator`
- :class:`~airflow.providers.slack.operators.slack.SlackAPIOperator`
diff --git a/tests/always/test_project_structure.py b/tests/always/test_project_structure.py
index 71a652b96f..845aca579c 100644
--- a/tests/always/test_project_structure.py
+++ b/tests/always/test_project_structure.py
@@ -57,14 +57,6 @@ class TestProjectStructure(unittest.TestCase):
"""
Assert every module in /airflow/providers has a corresponding test_ file in tests/airflow/providers.
"""
- # Deprecated modules that don't have corresponded test
- expected_missing_providers_modules = {
- (
- 'airflow/providers/amazon/aws/hooks/aws_dynamodb.py',
- 'tests/providers/amazon/aws/hooks/test_aws_dynamodb.py',
- )
- }
-
# TODO: Should we extend this test to cover other directories?
modules_files = glob.glob(f"{ROOT_FOLDER}/airflow/providers/**/*.py", recursive=True)
@@ -98,22 +90,8 @@ class TestProjectStructure(unittest.TestCase):
missing_tests_files = expected_test_files - expected_test_files.intersection(current_test_files)
with self.subTest("Detect missing tests in providers module"):
- expected_missing_test_modules = {pair[1] for pair in expected_missing_providers_modules}
- missing_tests_files = missing_tests_files - set(expected_missing_test_modules)
assert set() == missing_tests_files
- with self.subTest("Verify removed deprecated module also removed from deprecated list"):
- expected_missing_modules = {pair[0] for pair in expected_missing_providers_modules}
- removed_deprecated_module = expected_missing_modules - modules_files
- if removed_deprecated_module:
- self.fail(
- "You've removed a deprecated module:\n"
- f"{removed_deprecated_module}"
- "\n"
- "Thank you very much.\n"
- "Can you remove it from the list of expected missing modules tests, please?"
- )
-
def get_imports_from_file(filepath: str):
with open(filepath) as py_file:
@@ -452,21 +430,18 @@ class TestAmazonProviderProjectStructure(ExampleCoverageTest):
'airflow.providers.amazon.aws.operators.eks.EKSDeleteFargateProfileOperator',
'airflow.providers.amazon.aws.operators.eks.EKSDeleteNodegroupOperator',
'airflow.providers.amazon.aws.operators.eks.EKSPodOperator',
- 'airflow.providers.amazon.aws.operators.emr_containers.EMRContainerOperator',
'airflow.providers.amazon.aws.operators.glue.AwsGlueJobOperator',
'airflow.providers.amazon.aws.operators.glue_crawler.AwsGlueCrawlerOperator',
'airflow.providers.amazon.aws.operators.sqs.SQSPublishOperator',
'airflow.providers.amazon.aws.sensors.eks.EKSClusterStateSensor',
'airflow.providers.amazon.aws.sensors.eks.EKSFargateProfileStateSensor',
'airflow.providers.amazon.aws.sensors.eks.EKSNodegroupStateSensor',
- 'airflow.providers.amazon.aws.sensors.emr_containers.EMRContainerSensor',
'airflow.providers.amazon.aws.sensors.glue.AwsGlueJobSensor',
'airflow.providers.amazon.aws.sensors.glue_catalog_partition.AwsGlueCatalogPartitionSensor',
'airflow.providers.amazon.aws.sensors.glue_crawler.AwsGlueCrawlerSensor',
'airflow.providers.amazon.aws.sensors.s3.S3KeySizeSensor',
'airflow.providers.amazon.aws.sensors.s3.S3PrefixSensor',
'airflow.providers.amazon.aws.sensors.sqs.SQSSensor',
- 'airflow.providers.amazon.aws.transfers.mysql_to_s3.MySQLToS3Operator',
}
diff --git a/tests/deprecated_classes.py b/tests/deprecated_classes.py
index 36ac69a2b9..d64c068b77 100644
--- a/tests/deprecated_classes.py
+++ b/tests/deprecated_classes.py
@@ -247,10 +247,6 @@ HOOKS = [
'airflow.providers.amazon.aws.hooks.logs.AwsLogsHook',
'airflow.contrib.hooks.aws_logs_hook.AwsLogsHook',
),
- (
- 'airflow.providers.amazon.aws.hooks.emr.EmrContainerHook',
- 'airflow.providers.amazon.aws.hooks.emr_containers.EMRContainerHook',
- ),
(
'airflow.providers.amazon.aws.hooks.emr.EmrHook',
'airflow.contrib.hooks.emr_hook.EmrHook',
@@ -975,26 +971,6 @@ OPERATORS = [
"airflow.providers.amazon.aws.operators.batch.BatchOperator",
"airflow.contrib.operators.awsbatch_operator.AWSBatchOperator",
),
- (
- "airflow.providers.amazon.aws.operators.dms.DmsCreateTaskOperator",
- "airflow.providers.amazon.aws.operators.dms_create_task.DmsCreateTaskOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.dms.DmsDeleteTaskOperator",
- "airflow.providers.amazon.aws.operators.dms_delete_task.DmsDeleteTaskOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.dms.DmsDescribeTasksOperator",
- "airflow.providers.amazon.aws.operators.dms_describe_tasks.DmsDescribeTasksOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.dms.DmsStartTaskOperator",
- "airflow.providers.amazon.aws.operators.dms_start_task.DmsStartTaskOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.dms.DmsStopTaskOperator",
- "airflow.providers.amazon.aws.operators.dms_stop_task.DmsStopTaskOperator",
- ),
(
"airflow.providers.amazon.aws.operators.sqs.SqsPublishOperator",
"airflow.contrib.operators.aws_sqs_publish_operator.SQSPublishOperator",
@@ -1064,104 +1040,8 @@ OPERATORS = [
'airflow.contrib.operators.ecs_operator.ECSOperator',
),
(
- 'airflow.providers.amazon.aws.operators.emr.EmrAddStepsOperator',
- 'airflow.contrib.operators.emr_add_steps_operator.EmrAddStepsOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.emr.EmrCreateJobFlowOperator',
- 'airflow.contrib.operators.emr_create_job_flow_operator.EmrCreateJobFlowOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.emr.EmrTerminateJobFlowOperator',
- 'airflow.contrib.operators.emr_terminate_job_flow_operator.EmrTerminateJobFlowOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.emr.EmrAddStepsOperator',
- 'airflow.providers.amazon.aws.operators.emr_add_steps.EmrAddStepsOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.emr.EmrContainerOperator',
- 'airflow.providers.amazon.aws.operators.emr_containers.EMRContainerOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.emr.EmrCreateJobFlowOperator',
- 'airflow.providers.amazon.aws.operators.emr_create_job_flow.EmrCreateJobFlowOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.emr.EmrClusterLink',
- 'airflow.providers.amazon.aws.operators.emr_modify_cluster.EmrClusterLink',
- ),
- (
- 'airflow.providers.amazon.aws.operators.emr.EmrModifyClusterOperator',
- 'airflow.providers.amazon.aws.operators.emr_modify_cluster.EmrModifyClusterOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.emr.EmrTerminateJobFlowOperator',
- 'airflow.providers.amazon.aws.operators.emr_terminate_job_flow.EmrTerminateJobFlowOperator',
- ),
- (
- "airflow.providers.amazon.aws.sensors.emr.EmrBaseSensor",
- "airflow.providers.amazon.aws.sensors.emr_base.EmrBaseSensor",
- ),
- (
- "airflow.providers.amazon.aws.sensors.emr.EmrContainerSensor",
- "airflow.providers.amazon.aws.sensors.emr_containers.EMRContainerSensor",
- ),
- (
- "airflow.providers.amazon.aws.sensors.emr.EmrJobFlowSensor",
- "airflow.providers.amazon.aws.sensors.emr_job_flow.EmrJobFlowSensor",
- ),
- (
- "airflow.providers.amazon.aws.sensors.emr.EmrStepSensor",
- "airflow.providers.amazon.aws.sensors.emr_step.EmrStepSensor",
- ),
- (
- 'airflow.providers.amazon.aws.operators.s3.S3CopyObjectOperator',
- 'airflow.contrib.operators.s3_copy_object_operator.S3CopyObjectOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.s3.S3DeleteObjectsOperator',
- 'airflow.contrib.operators.s3_delete_objects_operator.S3DeleteObjectsOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.s3.S3ListOperator',
- 'airflow.contrib.operators.s3_list_operator.S3ListOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.s3.S3FileTransformOperator',
- 'airflow.operators.s3_file_transform_operator.S3FileTransformOperator',
- ),
- (
- "airflow.providers.amazon.aws.operators.lambda_function.AwsLambdaInvokeFunctionOperator",
- "airflow.providers.amazon.aws.operators.aws_lambda.AwsLambdaInvokeFunctionOperator",
- ),
- (
- 'airflow.providers.amazon.aws.operators.sagemaker.SageMakerBaseOperator',
- 'airflow.providers.amazon.aws.operators.sagemaker_base.SageMakerBaseOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.sagemaker.SageMakerEndpointConfigOperator',
- 'airflow.providers.amazon.aws.operators.sagemaker_endpoint_config.SageMakerEndpointConfigOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.sagemaker.SageMakerEndpointOperator',
- 'airflow.providers.amazon.aws.operators.sagemaker_endpoint.SageMakerEndpointOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.sagemaker.SageMakerModelOperator',
- 'airflow.providers.amazon.aws.operators.sagemaker_model.SageMakerModelOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.sagemaker.SageMakerTrainingOperator',
- 'airflow.providers.amazon.aws.operators.sagemaker_training.SageMakerTrainingOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.sagemaker.SageMakerTransformOperator',
- 'airflow.providers.amazon.aws.operators.sagemaker_transform.SageMakerTransformOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.sagemaker.SageMakerTuningOperator',
- 'airflow.providers.amazon.aws.operators.sagemaker_tuning.SageMakerTuningOperator',
+ 'airflow.providers.amazon.aws.operators.lambda_function.AwsLambdaInvokeFunctionOperator',
+ 'airflow.providers.amazon.aws.operators.aws_lambda.AwsLambdaInvokeFunctionOperator',
),
(
'airflow.providers.amazon.aws.operators.sagemaker.SageMakerBaseOperator',
@@ -1443,54 +1323,6 @@ OPERATORS = [
"airflow.operators.empty.EmptyOperator",
"airflow.operators.dummy.DummyOperator",
),
- (
- "airflow.providers.amazon.aws.operators.ec2.EC2StartInstanceOperator",
- "airflow.providers.amazon.aws.operators.ec2_start_instance.EC2StartInstanceOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.ec2.EC2StopInstanceOperator",
- "airflow.providers.amazon.aws.operators.ec2_stop_instance.EC2StopInstanceOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3FileTransformOperator",
- "airflow.providers.amazon.aws.operators.s3_file_transform.S3FileTransformOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3ListOperator",
- "airflow.providers.amazon.aws.operators.s3_list.S3ListOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3CreateBucketOperator",
- "airflow.providers.amazon.aws.operators.s3_bucket.S3CreateBucketOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3DeleteBucketOperator",
- "airflow.providers.amazon.aws.operators.s3_bucket.S3DeleteBucketOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3GetBucketTaggingOperator",
- "airflow.providers.amazon.aws.operators.s3_bucket_tagging.S3GetBucketTaggingOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3PutBucketTaggingOperator",
- "airflow.providers.amazon.aws.operators.s3_bucket_tagging.S3PutBucketTaggingOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3DeleteBucketTaggingOperator",
- "airflow.providers.amazon.aws.operators.s3_bucket_tagging.S3DeleteBucketTaggingOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3CopyObjectOperator",
- "airflow.providers.amazon.aws.operators.s3_copy_object.S3CopyObjectOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3DeleteObjectsOperator",
- "airflow.providers.amazon.aws.operators.s3_delete_objects.S3DeleteObjectsOperator",
- ),
- (
- "airflow.providers.amazon.aws.operators.s3.S3ListPrefixesOperator",
- "airflow.providers.amazon.aws.operators.s3_list_prefixes.S3ListPrefixesOperator",
- ),
]
SECRETS = [
@@ -1574,14 +1406,6 @@ SENSORS = [
"airflow.providers.amazon.aws.sensors.athena.AthenaSensor",
"airflow.contrib.sensors.aws_athena_sensor.AthenaSensor",
),
- (
- "airflow.providers.amazon.aws.sensors.dms.DmsTaskBaseSensor",
- "airflow.providers.amazon.aws.sensors.dms_task.DmsTaskBaseSensor",
- ),
- (
- "airflow.providers.amazon.aws.sensors.dms.DmsTaskCompletedSensor",
- "airflow.providers.amazon.aws.sensors.dms_task.DmsTaskCompletedSensor",
- ),
(
"airflow.providers.amazon.aws.sensors.sqs.SqsSensor",
"airflow.contrib.sensors.aws_sqs_sensor.SQSSensor",
@@ -1646,22 +1470,6 @@ SENSORS = [
'airflow.providers.amazon.aws.sensors.emr.EmrStepSensor',
'airflow.contrib.sensors.emr_step_sensor.EmrStepSensor',
),
- (
- 'airflow.providers.amazon.aws.sensors.sagemaker.SageMakerBaseSensor',
- 'airflow.providers.amazon.aws.sensors.sagemaker_base.SageMakerBaseSensor',
- ),
- (
- 'airflow.providers.amazon.aws.sensors.sagemaker.SageMakerEndpointSensor',
- 'airflow.providers.amazon.aws.sensors.sagemaker_endpoint.SageMakerEndpointSensor',
- ),
- (
- 'airflow.providers.amazon.aws.sensors.sagemaker.SageMakerTransformSensor',
- 'airflow.providers.amazon.aws.sensors.sagemaker_transform.SageMakerTransformSensor',
- ),
- (
- 'airflow.providers.amazon.aws.sensors.sagemaker.SageMakerTuningSensor',
- 'airflow.providers.amazon.aws.sensors.sagemaker_tuning.SageMakerTuningSensor',
- ),
(
'airflow.providers.amazon.aws.sensors.sagemaker.SageMakerBaseSensor',
'airflow.contrib.sensors.sagemaker_base_sensor.SageMakerBaseSensor',
@@ -1678,16 +1486,6 @@ SENSORS = [
'airflow.providers.amazon.aws.sensors.sagemaker.SageMakerTuningSensor',
'airflow.contrib.sensors.sagemaker_tuning_sensor.SageMakerTuningSensor',
),
- (
- 'airflow.providers.amazon.aws.operators.step_function.StepFunctionStartExecutionOperator',
- 'airflow.providers.amazon.aws.operators.step_function_start_execution'
- '.StepFunctionStartExecutionOperator',
- ),
- (
- 'airflow.providers.amazon.aws.operators.step_function.StepFunctionGetExecutionOutputOperator',
- 'airflow.providers.amazon.aws.operators.step_function_get_execution_output'
- '.StepFunctionGetExecutionOutputOperator',
- ),
(
'airflow.providers.amazon.aws.sensors.s3.S3KeySensor',
'airflow.sensors.s3_key_sensor.S3KeySensor',
@@ -1696,10 +1494,6 @@ SENSORS = [
'airflow.providers.amazon.aws.sensors.s3.S3PrefixSensor',
'airflow.sensors.s3_prefix_sensor.S3PrefixSensor',
),
- (
- 'airflow.providers.amazon.aws.sensors.step_function.StepFunctionExecutionSensor',
- 'airflow.providers.amazon.aws.sensors.step_function_execution.StepFunctionExecutionSensor',
- ),
(
'airflow.sensors.bash.BashSensor',
'airflow.contrib.sensors.bash_sensor.BashSensor',
@@ -1768,30 +1562,6 @@ SENSORS = [
'airflow.providers.sftp.sensors.sftp.SFTPSensor',
'airflow.contrib.sensors.sftp_sensor.SFTPSensor',
),
- (
- 'airflow.providers.amazon.aws.sensors.ec2.EC2InstanceStateSensor',
- 'airflow.providers.amazon.aws.sensors.ec2_instance_state.EC2InstanceStateSensor',
- ),
- (
- 'airflow.providers.amazon.aws.sensors.s3.S3KeySensor',
- 'airflow.providers.amazon.aws.sensors.s3_key.S3KeySensor',
- ),
- (
- 'airflow.providers.amazon.aws.sensors.s3.S3KeySizeSensor',
- 'airflow.providers.amazon.aws.sensors.s3_key.S3KeySizeSensor',
- ),
- (
- 'airflow.providers.amazon.aws.sensors.s3.S3KeysUnchangedSensor',
- 'airflow.providers.amazon.aws.sensors.s3_keys_unchanged.S3KeysUnchangedSensor',
- ),
- (
- "airflow.providers.amazon.aws.sensors.s3.S3PrefixSensor",
- "airflow.providers.amazon.aws.sensors.s3_prefix.S3PrefixSensor",
- ),
- (
- "airflow.providers.amazon.aws.sensors.redshift_cluster.RedshiftClusterSensor",
- "airflow.providers.amazon.aws.sensors.redshift.RedshiftClusterSensor",
- ),
]
TRANSFERS = [
diff --git a/tests/providers/amazon/aws/hooks/test_redshift_sql.py b/tests/providers/amazon/aws/hooks/test_redshift_sql.py
index e4754e7c24..235ab0d00a 100644
--- a/tests/providers/amazon/aws/hooks/test_redshift_sql.py
+++ b/tests/providers/amazon/aws/hooks/test_redshift_sql.py
@@ -82,7 +82,7 @@ class TestRedshiftSQLHookConn(unittest.TestCase):
@mock.patch('airflow.providers.amazon.aws.hooks.redshift_sql.redshift_connector.connect')
def test_get_conn_overrides_correctly(self, conn_params, conn_extra, expected_call_args, mock_connect):
with mock.patch(
- 'airflow.providers.amazon.aws.hooks.redshift.RedshiftSQLHook.conn',
+ 'airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook.conn',
Connection(conn_type='redshift', extra=conn_extra, **conn_params),
):
self.db_hook.get_conn()
diff --git a/tests/providers/amazon/aws/operators/test_redshift_cluster.py b/tests/providers/amazon/aws/operators/test_redshift_cluster.py
index 2ec6897687..309fb21422 100644
--- a/tests/providers/amazon/aws/operators/test_redshift_cluster.py
+++ b/tests/providers/amazon/aws/operators/test_redshift_cluster.py
@@ -40,7 +40,7 @@ class TestRedshiftCreateClusterOperator:
assert redshift_operator.master_username == "adminuser"
assert redshift_operator.master_user_password == "Test123$"
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.get_conn")
def test_create_single_node_cluster(self, mock_get_conn):
redshift_operator = RedshiftCreateClusterOperator(
task_id="task_test",
@@ -68,7 +68,7 @@ class TestRedshiftCreateClusterOperator:
**params,
)
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.get_conn")
def test_create_multi_node_cluster(self, mock_get_conn):
redshift_operator = RedshiftCreateClusterOperator(
task_id="task_test",
@@ -108,8 +108,8 @@ class TestResumeClusterOperator:
assert redshift_operator.cluster_identifier == "test_cluster"
assert redshift_operator.aws_conn_id == "aws_conn_test"
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.cluster_status")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.cluster_status")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.get_conn")
def test_resume_cluster_is_called_when_cluster_is_paused(self, mock_get_conn, mock_cluster_status):
mock_cluster_status.return_value = 'paused'
redshift_operator = RedshiftResumeClusterOperator(
@@ -118,8 +118,8 @@ class TestResumeClusterOperator:
redshift_operator.execute(None)
mock_get_conn.return_value.resume_cluster.assert_called_once_with(ClusterIdentifier='test_cluster')
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.cluster_status")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.cluster_status")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.get_conn")
def test_resume_cluster_not_called_when_cluster_is_not_paused(self, mock_get_conn, mock_cluster_status):
mock_cluster_status.return_value = 'available'
redshift_operator = RedshiftResumeClusterOperator(
@@ -138,8 +138,8 @@ class TestPauseClusterOperator:
assert redshift_operator.cluster_identifier == "test_cluster"
assert redshift_operator.aws_conn_id == "aws_conn_test"
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.cluster_status")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.cluster_status")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.get_conn")
def test_pause_cluster_is_called_when_cluster_is_available(self, mock_get_conn, mock_cluster_status):
mock_cluster_status.return_value = 'available'
redshift_operator = RedshiftPauseClusterOperator(
@@ -148,8 +148,8 @@ class TestPauseClusterOperator:
redshift_operator.execute(None)
mock_get_conn.return_value.pause_cluster.assert_called_once_with(ClusterIdentifier='test_cluster')
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.cluster_status")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.cluster_status")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.get_conn")
def test_pause_cluster_not_called_when_cluster_is_not_available(self, mock_get_conn, mock_cluster_status):
mock_cluster_status.return_value = 'paused'
redshift_operator = RedshiftPauseClusterOperator(
@@ -160,8 +160,8 @@ class TestPauseClusterOperator:
class TestDeleteClusterOperator:
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.cluster_status")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.cluster_status")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.get_conn")
def test_delete_cluster_with_wait_for_completion(self, mock_get_conn, mock_cluster_status):
mock_cluster_status.return_value = 'cluster_not_found'
redshift_operator = RedshiftDeleteClusterOperator(
@@ -174,7 +174,7 @@ class TestDeleteClusterOperator:
FinalClusterSnapshotIdentifier='',
)
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftHook.get_conn")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_cluster.RedshiftHook.get_conn")
def test_delete_cluster_without_wait_for_completion(self, mock_get_conn):
redshift_operator = RedshiftDeleteClusterOperator(
task_id="task_test",
diff --git a/tests/providers/amazon/aws/transfers/test_mysql_to_s3.py b/tests/providers/amazon/aws/transfers/test_mysql_to_s3.py
deleted file mode 100644
index a31cf2969d..0000000000
--- a/tests/providers/amazon/aws/transfers/test_mysql_to_s3.py
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-import unittest
-from tempfile import NamedTemporaryFile
-from unittest import mock
-
-import pandas as pd
-import pytest
-
-pytestmark = pytest.mark.filterwarnings("ignore::DeprecationWarning")
-
-
-class TestMySqlToS3Operator(unittest.TestCase):
- @mock.patch("airflow.providers.amazon.aws.transfers.sql_to_s3.NamedTemporaryFile")
- @mock.patch("airflow.providers.amazon.aws.transfers.sql_to_s3.S3Hook")
- def test_execute_csv(self, mock_s3_hook, temp_mock):
- from airflow.providers.amazon.aws.transfers.mysql_to_s3 import MySQLToS3Operator
-
- query = "query"
- s3_bucket = "bucket"
- s3_key = "key"
-
- mock_dbapi_hook = mock.Mock()
- test_df = pd.DataFrame({'a': '1', 'b': '2'}, index=[0, 1])
- get_pandas_df_mock = mock_dbapi_hook.return_value.get_pandas_df
- get_pandas_df_mock.return_value = test_df
- with NamedTemporaryFile() as f:
- temp_mock.return_value.__enter__.return_value.name = f.name
-
- op = MySQLToS3Operator(
- query=query,
- s3_bucket=s3_bucket,
- s3_key=s3_key,
- mysql_conn_id="mysql_conn_id",
- aws_conn_id="aws_conn_id",
- task_id="task_id",
- index=True,
- replace=True,
- header=True,
- pd_csv_kwargs={'index': False, 'header': False},
- dag=None,
- )
- op._get_hook = mock_dbapi_hook
- op.execute(None)
- mock_s3_hook.assert_called_once_with(aws_conn_id="aws_conn_id", verify=None)
-
- get_pandas_df_mock.assert_called_once_with(sql=query, parameters=None)
-
- temp_mock.assert_called_once_with(mode='r+', suffix=".csv")
- mock_s3_hook.return_value.load_file.assert_called_once_with(
- filename=f.name,
- key=s3_key,
- bucket_name=s3_bucket,
- replace=True,
- )
-
- @mock.patch("airflow.providers.amazon.aws.transfers.sql_to_s3.NamedTemporaryFile")
- @mock.patch("airflow.providers.amazon.aws.transfers.sql_to_s3.S3Hook")
- def test_execute_parquet(self, mock_s3_hook, temp_mock):
- from airflow.providers.amazon.aws.transfers.mysql_to_s3 import MySQLToS3Operator
-
- query = "query"
- s3_bucket = "bucket"
- s3_key = "key"
-
- mock_dbapi_hook = mock.Mock()
-
- test_df = pd.DataFrame({'a': '1', 'b': '2'}, index=[0, 1])
- get_pandas_df_mock = mock_dbapi_hook.return_value.get_pandas_df
- get_pandas_df_mock.return_value = test_df
- with NamedTemporaryFile() as f:
- temp_mock.return_value.__enter__.return_value.name = f.name
-
- op = MySQLToS3Operator(
- query=query,
- s3_bucket=s3_bucket,
- s3_key=s3_key,
- mysql_conn_id="mysql_conn_id",
- aws_conn_id="aws_conn_id",
- task_id="task_id",
- file_format="parquet",
- replace=False,
- dag=None,
- )
- op._get_hook = mock_dbapi_hook
- op.execute(None)
- mock_s3_hook.assert_called_once_with(aws_conn_id="aws_conn_id", verify=None)
-
- get_pandas_df_mock.assert_called_once_with(sql=query, parameters=None)
-
- temp_mock.assert_called_once_with(mode='rb+', suffix=".parquet")
- mock_s3_hook.return_value.load_file.assert_called_once_with(
- filename=f.name, key=s3_key, bucket_name=s3_bucket, replace=False
- )
-
- def test_fix_dtypes(self):
- from airflow.providers.amazon.aws.transfers.mysql_to_s3 import MySQLToS3Operator
-
- op = MySQLToS3Operator(query="query", s3_bucket="s3_bucket", s3_key="s3_key", task_id="task_id")
- dirty_df = pd.DataFrame({"strings": ["a", "b", "c"], "ints": [1, 2, None]})
- op._fix_dtypes(df=dirty_df)
- assert dirty_df["ints"].dtype.kind == "i"
diff --git a/tests/providers/amazon/aws/transfers/test_s3_to_redshift.py b/tests/providers/amazon/aws/transfers/test_s3_to_redshift.py
index 007ed87fd5..e1267626da 100644
--- a/tests/providers/amazon/aws/transfers/test_s3_to_redshift.py
+++ b/tests/providers/amazon/aws/transfers/test_s3_to_redshift.py
@@ -33,7 +33,7 @@ class TestS3ToRedshiftTransfer(unittest.TestCase):
@mock.patch("airflow.providers.amazon.aws.hooks.s3.S3Hook.get_connection")
@mock.patch("airflow.models.connection.Connection")
@mock.patch("boto3.session.Session")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftSQLHook.run")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook.run")
def test_execute(self, mock_run, mock_session, mock_connection, mock_hook):
access_key = "aws_access_key_id"
secret_key = "aws_secret_access_key"
@@ -78,7 +78,7 @@ class TestS3ToRedshiftTransfer(unittest.TestCase):
@mock.patch("airflow.providers.amazon.aws.hooks.s3.S3Hook.get_connection")
@mock.patch("airflow.models.connection.Connection")
@mock.patch("boto3.session.Session")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftSQLHook.run")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook.run")
def test_execute_with_column_list(self, mock_run, mock_session, mock_connection, mock_hook):
access_key = "aws_access_key_id"
secret_key = "aws_secret_access_key"
@@ -125,7 +125,7 @@ class TestS3ToRedshiftTransfer(unittest.TestCase):
@mock.patch("airflow.providers.amazon.aws.hooks.s3.S3Hook.get_connection")
@mock.patch("airflow.models.connection.Connection")
@mock.patch("boto3.session.Session")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftSQLHook.run")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook.run")
def test_deprecated_truncate(self, mock_run, mock_session, mock_connection, mock_hook):
access_key = "aws_access_key_id"
secret_key = "aws_secret_access_key"
@@ -177,7 +177,7 @@ class TestS3ToRedshiftTransfer(unittest.TestCase):
@mock.patch("airflow.providers.amazon.aws.hooks.s3.S3Hook.get_connection")
@mock.patch("airflow.models.connection.Connection")
@mock.patch("boto3.session.Session")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftSQLHook.run")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook.run")
def test_replace(self, mock_run, mock_session, mock_connection, mock_hook):
access_key = "aws_access_key_id"
secret_key = "aws_secret_access_key"
@@ -229,7 +229,7 @@ class TestS3ToRedshiftTransfer(unittest.TestCase):
@mock.patch("airflow.providers.amazon.aws.hooks.s3.S3Hook.get_connection")
@mock.patch("airflow.models.connection.Connection")
@mock.patch("boto3.session.Session")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftSQLHook.run")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook.run")
def test_upsert(self, mock_run, mock_session, mock_connection, mock_hook):
access_key = "aws_access_key_id"
secret_key = "aws_secret_access_key"
@@ -284,7 +284,7 @@ class TestS3ToRedshiftTransfer(unittest.TestCase):
@mock.patch("airflow.providers.amazon.aws.hooks.s3.S3Hook.get_connection")
@mock.patch("airflow.models.connection.Connection")
@mock.patch("boto3.session.Session")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftSQLHook.run")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook.run")
def test_execute_sts_token(self, mock_run, mock_session, mock_connection, mock_hook):
access_key = "ASIA_aws_access_key_id"
secret_key = "aws_secret_access_key"
@@ -331,7 +331,7 @@ class TestS3ToRedshiftTransfer(unittest.TestCase):
@mock.patch("airflow.providers.amazon.aws.hooks.s3.S3Hook.get_connection")
@mock.patch("airflow.models.connection.Connection")
@mock.patch("boto3.session.Session")
- @mock.patch("airflow.providers.amazon.aws.hooks.redshift.RedshiftSQLHook.run")
+ @mock.patch("airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook.run")
def test_execute_role_arn(self, mock_run, mock_session, mock_connection, mock_hook):
access_key = "ASIA_aws_access_key_id"
secret_key = "aws_secret_access_key"