apache-airflow-providers-amazon 8.29.0rc1__py3-none-any.whl → 9.0.0__py3-none-any.whl

airflow/providers/amazon/aws/operators/eks.py

@@ -19,17 +19,15 @@
 from __future__ import annotations
 
 import logging
-import warnings
 from ast import literal_eval
 from datetime import timedelta
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, List, Sequence, cast
 
 from botocore.exceptions import ClientError, WaiterError
-from deprecated import deprecated
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.models import BaseOperator
 from airflow.providers.amazon.aws.hooks.eks import EksHook
 from airflow.providers.amazon.aws.triggers.eks import (
@@ -267,17 +265,6 @@ class EksCreateClusterOperator(BaseOperator):
     def hook(self) -> EksHook:
         return EksHook(aws_conn_id=self.aws_conn_id, region_name=self.region)
 
-    @property
-    @deprecated(
-        reason=(
-            "`eks_hook` property is deprecated and will be removed in the future. "
-            "Please use `hook` property instead."
-        ),
-        category=AirflowProviderDeprecationWarning,
-    )
-    def eks_hook(self):
-        return self.hook
-
     def execute(self, context: Context):
         if self.compute:
             if self.compute not in SUPPORTED_COMPUTE_VALUES:
@@ -397,7 +384,7 @@ class EksCreateClusterOperator(BaseOperator):
                         waiter_delay=self.waiter_delay,
                         waiter_max_attempts=self.waiter_max_attempts,
                         aws_conn_id=self.aws_conn_id,
-                        region=self.region,
+                        region_name=self.region,
                     ),
                     method_name="execute_complete",
                     timeout=timedelta(seconds=self.waiter_max_attempts * self.waiter_delay),
@@ -656,7 +643,7 @@ class EksCreateFargateProfileOperator(BaseOperator):
                     aws_conn_id=self.aws_conn_id,
                     waiter_delay=self.waiter_delay,
                     waiter_max_attempts=self.waiter_max_attempts,
-                    region=self.region,
+                    region_name=self.region,
                 ),
                 method_name="execute_complete",
                 # timeout is set to ensure that if a trigger dies, the timeout does not restart
@@ -968,7 +955,7 @@ class EksDeleteFargateProfileOperator(BaseOperator):
                     aws_conn_id=self.aws_conn_id,
                     waiter_delay=self.waiter_delay,
                     waiter_max_attempts=self.waiter_max_attempts,
-                    region=self.region,
+                    region_name=self.region,
                 ),
                 method_name="execute_complete",
                 # timeout is set to ensure that if a trigger dies, the timeout does not restart
@@ -1016,11 +1003,6 @@ class EksPodOperator(KubernetesPodOperator):
         If "delete_pod", the pod will be deleted regardless its state; if "delete_succeeded_pod",
         only succeeded pod will be deleted. You can set to "keep_pod" to keep the pod.
         Current default is `keep_pod`, but this will be changed in the next major release of this provider.
-    :param is_delete_operator_pod: What to do when the pod reaches its final
-        state, or the execution is interrupted. If True, delete the
-        pod; if False, leave the pod. Current default is False, but this will be
-        changed in the next major release of this provider.
-        Deprecated - use `on_finish_action` instead.
 
     """
 
@@ -1043,37 +1025,16 @@ class EksPodOperator(KubernetesPodOperator):
         # file is stored locally in the worker and not in the cluster.
         in_cluster: bool = False,
         namespace: str = DEFAULT_NAMESPACE_NAME,
-        pod_context: str | None = None,
         pod_name: str | None = None,
-        pod_username: str | None = None,
         aws_conn_id: str | None = DEFAULT_CONN_ID,
         region: str | None = None,
         on_finish_action: str | None = None,
-        is_delete_operator_pod: bool | None = None,
         **kwargs,
     ) -> None:
-        if is_delete_operator_pod is not None:
-            warnings.warn(
-                "`is_delete_operator_pod` parameter is deprecated, please use `on_finish_action`",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            kwargs["on_finish_action"] = (
-                OnFinishAction.DELETE_POD if is_delete_operator_pod else OnFinishAction.KEEP_POD
-            )
+        if on_finish_action is not None:
+            kwargs["on_finish_action"] = OnFinishAction(on_finish_action)
         else:
-            if on_finish_action is not None:
-                kwargs["on_finish_action"] = OnFinishAction(on_finish_action)
-            else:
-                warnings.warn(
-                    f"You have not set parameter `on_finish_action` in class {self.__class__.__name__}. "
-                    "Currently the default for this parameter is `keep_pod` but in a future release"
-                    " the default will be changed to `delete_pod`. To ensure pods are not deleted in"
-                    " the future you will need to set `on_finish_action=keep_pod` explicitly.",
-                    AirflowProviderDeprecationWarning,
-                    stacklevel=2,
-                )
-                kwargs["on_finish_action"] = OnFinishAction.KEEP_POD
+            kwargs["on_finish_action"] = OnFinishAction.DELETE_POD
 
         self.cluster_name = cluster_name
         self.in_cluster = in_cluster

airflow/providers/amazon/aws/operators/emr.py

@@ -18,14 +18,13 @@
 from __future__ import annotations
 
 import ast
-import warnings
 from datetime import timedelta
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Sequence
 from uuid import uuid4
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.models import BaseOperator
 from airflow.providers.amazon.aws.hooks.emr import EmrContainerHook, EmrHook, EmrServerlessHook
 from airflow.providers.amazon.aws.links.emr import (
@@ -227,11 +226,6 @@ class EmrStartNotebookExecutionOperator(BaseOperator):
     :param tags: Optional list of key value pair to associate with the notebook execution.
     :param waiter_max_attempts: Maximum number of tries before failing.
     :param waiter_delay: Number of seconds between polling the state of the notebook.
-
-    :param waiter_countdown: Total amount of time the operator will wait for the notebook to stop.
-        Defaults to 25 * 60 seconds. (Deprecated.  Please use waiter_max_attempts.)
-    :param waiter_check_interval_seconds: Number of seconds between polling the state of the notebook.
-        Defaults to 60 seconds. (Deprecated.  Please use waiter_delay.)
     """
 
     template_fields: Sequence[str] = (
@@ -261,35 +255,10 @@ class EmrStartNotebookExecutionOperator(BaseOperator):
         tags: list | None = None,
         wait_for_completion: bool = False,
         aws_conn_id: str | None = "aws_default",
-        # TODO: waiter_max_attempts and waiter_delay should default to None when the other two are deprecated.
         waiter_max_attempts: int | None = None,
         waiter_delay: int | None = None,
-        waiter_countdown: int | None = None,
-        waiter_check_interval_seconds: int | None = None,
         **kwargs: Any,
     ):
-        if waiter_check_interval_seconds:
-            warnings.warn(
-                "The parameter `waiter_check_interval_seconds` has been deprecated to "
-                "standardize naming conventions.  Please `use waiter_delay instead`.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-        else:
-            waiter_check_interval_seconds = 60
-        if waiter_countdown:
-            warnings.warn(
-                "The parameter waiter_countdown has been deprecated to standardize "
-                "naming conventions.  Please use waiter_max_attempts instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            # waiter_countdown defaults to never timing out, which is not supported
-            # by boto waiters, so we will set it here to "a very long time" for now.
-            waiter_max_attempts = (waiter_countdown or 999) // waiter_check_interval_seconds
-
         super().__init__(**kwargs)
         self.editor_id = editor_id
         self.relative_path = relative_path
@@ -302,7 +271,7 @@ class EmrStartNotebookExecutionOperator(BaseOperator):
         self.cluster_id = cluster_id
         self.aws_conn_id = aws_conn_id
         self.waiter_max_attempts = waiter_max_attempts or 25
-        self.waiter_delay = waiter_delay or waiter_check_interval_seconds or 60
+        self.waiter_delay = waiter_delay or 60
         self.master_instance_security_group_id = master_instance_security_group_id
 
     def execute(self, context: Context):
@@ -371,11 +340,6 @@ class EmrStopNotebookExecutionOperator(BaseOperator):
         maintained on each worker node).
     :param waiter_max_attempts: Maximum number of tries before failing.
     :param waiter_delay: Number of seconds between polling the state of the notebook.
-
-    :param waiter_countdown: Total amount of time the operator will wait for the notebook to stop.
-        Defaults to 25 * 60 seconds. (Deprecated.  Please use waiter_max_attempts.)
-    :param waiter_check_interval_seconds: Number of seconds between polling the state of the notebook.
-        Defaults to 60 seconds. (Deprecated.  Please use waiter_delay.)
     """
 
     template_fields: Sequence[str] = (
@@ -389,41 +353,16 @@ class EmrStopNotebookExecutionOperator(BaseOperator):
         notebook_execution_id: str,
         wait_for_completion: bool = False,
         aws_conn_id: str | None = "aws_default",
-        # TODO: waiter_max_attempts and waiter_delay should default to None when the other two are deprecated.
         waiter_max_attempts: int | None = None,
         waiter_delay: int | None = None,
-        waiter_countdown: int | None = None,
-        waiter_check_interval_seconds: int | None = None,
         **kwargs: Any,
     ):
-        if waiter_check_interval_seconds:
-            warnings.warn(
-                "The parameter `waiter_check_interval_seconds` has been deprecated to "
-                "standardize naming conventions.  Please `use waiter_delay instead`.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-        else:
-            waiter_check_interval_seconds = 60
-        if waiter_countdown:
-            warnings.warn(
-                "The parameter waiter_countdown has been deprecated to standardize "
-                "naming conventions.  Please use waiter_max_attempts instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            # waiter_countdown defaults to never timing out, which is not supported
-            # by boto waiters, so we will set it here to "a very long time" for now.
-            waiter_max_attempts = (waiter_countdown or 999) // waiter_check_interval_seconds
-
         super().__init__(**kwargs)
         self.notebook_execution_id = notebook_execution_id
         self.wait_for_completion = wait_for_completion
         self.aws_conn_id = aws_conn_id
         self.waiter_max_attempts = waiter_max_attempts or 25
-        self.waiter_delay = waiter_delay or waiter_check_interval_seconds or 60
+        self.waiter_delay = waiter_delay or 60
 
     def execute(self, context: Context) -> None:
         emr_hook = EmrHook(aws_conn_id=self.aws_conn_id)
@@ -518,7 +457,6 @@ class EmrContainerOperator(BaseOperator):
     :param aws_conn_id: The Airflow connection used for AWS credentials.
     :param wait_for_completion: Whether or not to wait in the operator for the job to complete.
     :param poll_interval: Time (in seconds) to wait between two consecutive calls to check query status on EMR
-    :param max_tries: Deprecated - use max_polling_attempts instead.
     :param max_polling_attempts: Maximum number of times to wait for the job run to finish.
         Defaults to None, which will poll until the job is *not* in a pending, submitted, or running state.
     :param job_retry_max_attempts: Maximum number of times to retry when the EMR job fails.
@@ -551,7 +489,6 @@ class EmrContainerOperator(BaseOperator):
         aws_conn_id: str | None = "aws_default",
         wait_for_completion: bool = True,
         poll_interval: int = 30,
-        max_tries: int | None = None,
         tags: dict | None = None,
         max_polling_attempts: int | None = None,
         job_retry_max_attempts: int | None = None,
@@ -575,18 +512,6 @@ class EmrContainerOperator(BaseOperator):
         self.job_id: str | None = None
         self.deferrable = deferrable
 
-        if max_tries:
-            warnings.warn(
-                f"Parameter `{self.__class__.__name__}.max_tries` is deprecated and will be removed "
-                "in a future release.  Please use method `max_polling_attempts` instead.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            if max_polling_attempts and max_polling_attempts != max_tries:
-                raise ValueError("max_polling_attempts must be the same value as max_tries")
-            else:
-                self.max_polling_attempts = max_tries
-
     @cached_property
     def hook(self) -> EmrContainerHook:
         """Create and return an EmrContainerHook."""
@@ -715,11 +640,6 @@ class EmrCreateJobFlowOperator(BaseOperator):
         completion (True)
     :param waiter_max_attempts: Maximum number of tries before failing.
     :param waiter_delay: Number of seconds between polling the state of the notebook.
-
-    :param waiter_countdown: Max. seconds to wait for jobflow completion (only in combination with
-        wait_for_completion=True, None = no limit) (Deprecated.  Please use waiter_max_attempts.)
-    :param waiter_check_interval_seconds: Number of seconds between polling the jobflow state. Defaults to 60
-        seconds. (Deprecated.  Please use waiter_delay.)
     :param deferrable: If True, the operator will wait asynchronously for the crawl to complete.
         This implies waiting for completion. This mode requires aiobotocore module to be installed.
         (default: False)
@@ -748,33 +668,9 @@ class EmrCreateJobFlowOperator(BaseOperator):
         wait_for_completion: bool = False,
         waiter_max_attempts: int | None = None,
         waiter_delay: int | None = None,
-        waiter_countdown: int | None = None,
-        waiter_check_interval_seconds: int | None = None,
         deferrable: bool = conf.getboolean("operators", "default_deferrable", fallback=False),
         **kwargs: Any,
     ):
-        if waiter_check_interval_seconds:
-            warnings.warn(
-                "The parameter `waiter_check_interval_seconds` has been deprecated to "
-                "standardize naming conventions.  Please `use waiter_delay instead`.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-        else:
-            waiter_check_interval_seconds = 60
-        if waiter_countdown:
-            warnings.warn(
-                "The parameter waiter_countdown has been deprecated to standardize "
-                "naming conventions.  Please use waiter_max_attempts instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            # waiter_countdown defaults to never timing out, which is not supported
-            # by boto waiters, so we will set it here to "a very long time" for now.
-            waiter_max_attempts = (waiter_countdown or 999) // waiter_check_interval_seconds
-
         super().__init__(**kwargs)
         self.aws_conn_id = aws_conn_id
         self.emr_conn_id = emr_conn_id
@@ -782,7 +678,7 @@ class EmrCreateJobFlowOperator(BaseOperator):
         self.region_name = region_name
         self.wait_for_completion = wait_for_completion
         self.waiter_max_attempts = waiter_max_attempts or 60
-        self.waiter_delay = waiter_delay or waiter_check_interval_seconds or 60
+        self.waiter_delay = waiter_delay or 60
         self.deferrable = deferrable
 
     @cached_property
@@ -1054,10 +950,6 @@ class EmrServerlessCreateApplicationOperator(BaseOperator):
         running Airflow in a distributed manner and aws_conn_id is None or
         empty, then default boto3 configuration would be used (and must be
         maintained on each worker node).
-    :param waiter_countdown: (deprecated) Total amount of time, in seconds, the operator will wait for
-        the application to start. Defaults to 25 minutes.
-    :param waiter_check_interval_seconds: (deprecated) Number of seconds between polling the state
-        of the application. Defaults to 60 seconds.
     :waiter_max_attempts: Number of times the waiter should poll the application to check the state.
         If not set, the waiter will use its default value.
     :param waiter_delay: Number of seconds between polling the state of the application.
@@ -1074,38 +966,14 @@ class EmrServerlessCreateApplicationOperator(BaseOperator):
         config: dict | None = None,
         wait_for_completion: bool = True,
         aws_conn_id: str | None = "aws_default",
-        waiter_countdown: int | ArgNotSet = NOTSET,
-        waiter_check_interval_seconds: int | ArgNotSet = NOTSET,
         waiter_max_attempts: int | ArgNotSet = NOTSET,
         waiter_delay: int | ArgNotSet = NOTSET,
         deferrable: bool = conf.getboolean("operators", "default_deferrable", fallback=False),
         **kwargs,
     ):
-        if waiter_check_interval_seconds is NOTSET:
-            waiter_delay = 60 if waiter_delay is NOTSET else waiter_delay
-        else:
-            waiter_delay = waiter_check_interval_seconds if waiter_delay is NOTSET else waiter_delay
-            warnings.warn(
-                "The parameter waiter_check_interval_seconds has been deprecated to standardize "
-                "naming conventions.  Please use waiter_delay instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-        if waiter_countdown is NOTSET:
-            waiter_max_attempts = 25 if waiter_max_attempts is NOTSET else waiter_max_attempts
-        else:
-            if waiter_max_attempts is NOTSET:
-                # ignoring mypy because it doesn't like ArgNotSet as an operand, but neither variables
-                # are of type ArgNotSet at this point.
-                waiter_max_attempts = waiter_countdown // waiter_delay  # type: ignore[operator]
-            warnings.warn(
-                "The parameter waiter_countdown has been deprecated to standardize "
-                "naming conventions.  Please use waiter_max_attempts instead. In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
+        waiter_delay = 60 if waiter_delay is NOTSET else waiter_delay
+        waiter_max_attempts = 25 if waiter_max_attempts is NOTSET else waiter_max_attempts
+
         self.aws_conn_id = aws_conn_id
         self.release_label = release_label
         self.job_type = job_type
@@ -1228,10 +1096,6 @@ class EmrServerlessStartJobOperator(BaseOperator):
         empty, then default boto3 configuration would be used (and must be
         maintained on each worker node).
     :param name: Name for the EMR Serverless job. If not provided, a default name will be assigned.
-    :param waiter_countdown: (deprecated) Total amount of time, in seconds, the operator will wait for
-        the job finish. Defaults to 25 minutes.
-    :param waiter_check_interval_seconds: (deprecated) Number of seconds between polling the state of the job.
-        Defaults to 60 seconds.
     :waiter_max_attempts: Number of times the waiter should poll the application to check the state.
         If not set, the waiter will use its default value.
     :param waiter_delay: Number of seconds between polling the state of the job run.
@@ -1276,39 +1140,15 @@ class EmrServerlessStartJobOperator(BaseOperator):
         wait_for_completion: bool = True,
         aws_conn_id: str | None = "aws_default",
         name: str | None = None,
-        waiter_countdown: int | ArgNotSet = NOTSET,
-        waiter_check_interval_seconds: int | ArgNotSet = NOTSET,
         waiter_max_attempts: int | ArgNotSet = NOTSET,
         waiter_delay: int | ArgNotSet = NOTSET,
         deferrable: bool = conf.getboolean("operators", "default_deferrable", fallback=False),
         enable_application_ui_links: bool = False,
         **kwargs,
     ):
-        if waiter_check_interval_seconds is NOTSET:
-            waiter_delay = 60 if waiter_delay is NOTSET else waiter_delay
-        else:
-            waiter_delay = waiter_check_interval_seconds if waiter_delay is NOTSET else waiter_delay
-            warnings.warn(
-                "The parameter waiter_check_interval_seconds has been deprecated to standardize "
-                "naming conventions.  Please use waiter_delay instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-        if waiter_countdown is NOTSET:
-            waiter_max_attempts = 25 if waiter_max_attempts is NOTSET else waiter_max_attempts
-        else:
-            if waiter_max_attempts is NOTSET:
-                # ignoring mypy because it doesn't like ArgNotSet as an operand, but neither variables
-                # are of type ArgNotSet at this point.
-                waiter_max_attempts = waiter_countdown // waiter_delay  # type: ignore[operator]
-            warnings.warn(
-                "The parameter waiter_countdown has been deprecated to standardize "
-                "naming conventions.  Please use waiter_max_attempts instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
+        waiter_delay = 60 if waiter_delay is NOTSET else waiter_delay
+        waiter_max_attempts = 25 if waiter_max_attempts is NOTSET else waiter_max_attempts
+
         self.aws_conn_id = aws_conn_id
         self.application_id = application_id
         self.execution_role_arn = execution_role_arn
@@ -1566,10 +1406,6 @@ class EmrServerlessStopApplicationOperator(BaseOperator):
         running Airflow in a distributed manner and aws_conn_id is None or
         empty, then default boto3 configuration would be used (and must be
         maintained on each worker node).
-    :param waiter_countdown: (deprecated) Total amount of time, in seconds, the operator will wait for
-        the application be stopped. Defaults to 5 minutes.
-    :param waiter_check_interval_seconds: (deprecated) Number of seconds between polling the state of the
-        application. Defaults to 60 seconds.
     :param force_stop: If set to True, any job for that app that is not in a terminal state will be cancelled.
         Otherwise, trying to stop an app with running jobs will return an error.
         If you want to wait for the jobs to finish gracefully, use
@@ -1590,39 +1426,15 @@ class EmrServerlessStopApplicationOperator(BaseOperator):
         application_id: str,
         wait_for_completion: bool = True,
         aws_conn_id: str | None = "aws_default",
-        waiter_countdown: int | ArgNotSet = NOTSET,
-        waiter_check_interval_seconds: int | ArgNotSet = NOTSET,
         waiter_max_attempts: int | ArgNotSet = NOTSET,
         waiter_delay: int | ArgNotSet = NOTSET,
         force_stop: bool = False,
         deferrable: bool = conf.getboolean("operators", "default_deferrable", fallback=False),
         **kwargs,
     ):
-        if waiter_check_interval_seconds is NOTSET:
-            waiter_delay = 60 if waiter_delay is NOTSET else waiter_delay
-        else:
-            waiter_delay = waiter_check_interval_seconds if waiter_delay is NOTSET else waiter_delay
-            warnings.warn(
-                "The parameter waiter_check_interval_seconds has been deprecated to standardize "
-                "naming conventions.  Please use waiter_delay instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-        if waiter_countdown is NOTSET:
-            waiter_max_attempts = 25 if waiter_max_attempts is NOTSET else waiter_max_attempts
-        else:
-            if waiter_max_attempts is NOTSET:
-                # ignoring mypy because it doesn't like ArgNotSet as an operand, but neither variables
-                # are of type ArgNotSet at this point.
-                waiter_max_attempts = waiter_countdown // waiter_delay  # type: ignore[operator]
-            warnings.warn(
-                "The parameter waiter_countdown has been deprecated to standardize "
-                "naming conventions.  Please use waiter_max_attempts instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
+        waiter_delay = 60 if waiter_delay is NOTSET else waiter_delay
+        waiter_max_attempts = 25 if waiter_max_attempts is NOTSET else waiter_max_attempts
+
         self.aws_conn_id = aws_conn_id
         self.application_id = application_id
         self.wait_for_completion = False if deferrable else wait_for_completion
@@ -1734,10 +1546,6 @@ class EmrServerlessDeleteApplicationOperator(EmrServerlessStopApplicationOperato
         running Airflow in a distributed manner and aws_conn_id is None or
         empty, then default boto3 configuration would be used (and must be
         maintained on each worker node).
-    :param waiter_countdown: (deprecated) Total amount of time, in seconds, the operator will wait for each
-        step of first,the application to be stopped, and then deleted. Defaults to 25 minutes.
-    :param waiter_check_interval_seconds: (deprecated) Number of seconds between polling the state
-        of the application. Defaults to 60 seconds.
     :waiter_max_attempts: Number of times the waiter should poll the application to check the state.
         Defaults to 25.
     :param waiter_delay: Number of seconds between polling the state of the application.
@@ -1758,39 +1566,15 @@ class EmrServerlessDeleteApplicationOperator(EmrServerlessStopApplicationOperato
         application_id: str,
         wait_for_completion: bool = True,
         aws_conn_id: str | None = "aws_default",
-        waiter_countdown: int | ArgNotSet = NOTSET,
-        waiter_check_interval_seconds: int | ArgNotSet = NOTSET,
         waiter_max_attempts: int | ArgNotSet = NOTSET,
         waiter_delay: int | ArgNotSet = NOTSET,
         force_stop: bool = False,
         deferrable: bool = conf.getboolean("operators", "default_deferrable", fallback=False),
         **kwargs,
     ):
-        if waiter_check_interval_seconds is NOTSET:
-            waiter_delay = 60 if waiter_delay is NOTSET else waiter_delay
-        else:
-            waiter_delay = waiter_check_interval_seconds if waiter_delay is NOTSET else waiter_delay
-            warnings.warn(
-                "The parameter waiter_check_interval_seconds has been deprecated to standardize "
-                "naming conventions.  Please use waiter_delay instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-        if waiter_countdown is NOTSET:
-            waiter_max_attempts = 25 if waiter_max_attempts is NOTSET else waiter_max_attempts
-        else:
-            if waiter_max_attempts is NOTSET:
-                # ignoring mypy because it doesn't like ArgNotSet as an operand, but neither variables
-                # are of type ArgNotSet at this point.
-                waiter_max_attempts = waiter_countdown // waiter_delay  # type: ignore[operator]
-            warnings.warn(
-                "The parameter waiter_countdown has been deprecated to standardize "
-                "naming conventions.  Please use waiter_max_attempts instead.  In the "
-                "future this will default to None and defer to the waiter's default value.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
+        waiter_delay = 60 if waiter_delay is NOTSET else waiter_delay
+        waiter_max_attempts = 25 if waiter_max_attempts is NOTSET else waiter_max_attempts
+
         self.wait_for_delete_completion = wait_for_completion
         # super stops the app
         super().__init__(

airflow/providers/amazon/aws/operators/glue_databrew.py

@@ -17,11 +17,10 @@
 # under the License.
 from __future__ import annotations
 
-import warnings
 from typing import TYPE_CHECKING, Any, Sequence
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.providers.amazon.aws.hooks.glue_databrew import GlueDataBrewHook
 from airflow.providers.amazon.aws.operators.base_aws import AwsBaseOperator
 from airflow.providers.amazon.aws.triggers.glue_databrew import GlueDataBrewJobCompleteTrigger
@@ -49,7 +48,6 @@ class GlueDataBrewStartJobOperator(AwsBaseOperator[GlueDataBrewHook]):
     :param deferrable: If True, the operator will wait asynchronously for the job to complete.
         This implies waiting for completion. This mode requires aiobotocore module to be installed.
         (default: False)
-    :param delay: Time in seconds to wait between status checks. (Deprecated).
     :param waiter_delay: Time in seconds to wait between status checks. Default is 30.
     :param waiter_max_attempts: Maximum number of attempts to check for job completion. (default: 60)
     :return: dictionary with key run_id and value of the resulting job's run_id.
@@ -92,13 +90,6 @@ class GlueDataBrewStartJobOperator(AwsBaseOperator[GlueDataBrewHook]):
         self.waiter_delay = waiter_delay
         self.waiter_max_attempts = waiter_max_attempts
         self.deferrable = deferrable
-        if delay is not None:
-            warnings.warn(
-                "please use `waiter_delay` instead of delay.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            self.waiter_delay = delay
 
     def execute(self, context: Context):
         job = self.hook.conn.start_job_run(Name=self.job_name)

airflow/providers/amazon/aws/operators/rds.py

@@ -18,13 +18,12 @@
 from __future__ import annotations
 
 import json
-import warnings
 from datetime import timedelta
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Sequence
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.models import BaseOperator
 from airflow.providers.amazon.aws.hooks.rds import RdsHook
 from airflow.providers.amazon.aws.triggers.rds import (
@@ -55,30 +54,17 @@ class RdsBaseOperator(BaseOperator):
         *args,
         aws_conn_id: str | None = "aws_conn_id",
         region_name: str | None = None,
-        hook_params: dict | None = None,
         **kwargs,
     ):
-        if hook_params is not None:
-            warnings.warn(
-                "The parameter hook_params is deprecated and will be removed. "
-                "Note that it is also incompatible with deferrable mode. "
-                "You can use the region_name parameter to specify the region. "
-                "If you were using hook_params for other purposes, please get in touch either on "
-                "airflow slack, or by opening a github issue on the project. "
-                "You can mention https://github.com/apache/airflow/pull/32352",
-                AirflowProviderDeprecationWarning,
-                stacklevel=3,  # 2 is in the operator's init, 3 is in the user code creating the operator
-            )
-        self.hook_params = hook_params or {}
         self.aws_conn_id = aws_conn_id
-        self.region_name = region_name or self.hook_params.pop("region_name", None)
+        self.region_name = region_name
         super().__init__(*args, **kwargs)
 
         self._await_interval = 60  # seconds
 
     @cached_property
     def hook(self) -> RdsHook:
-        return RdsHook(aws_conn_id=self.aws_conn_id, region_name=self.region_name, **self.hook_params)
+        return RdsHook(aws_conn_id=self.aws_conn_id, region_name=self.region_name)
 
     def execute(self, context: Context) -> str:
         """Different implementations for snapshots, tasks and events."""