apache-airflow-providers-amazon 9.1.0rc3__tar.gz → 9.2.0__tar.gz

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: apache-airflow-providers-amazon
-Version: 9.1.0rc3
+Version: 9.2.0
 Summary: Provider package apache-airflow-providers-amazon for Apache Airflow
 Keywords: airflow-provider,amazon,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -21,10 +21,10 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: PyAthena>=3.0.10
-Requires-Dist: apache-airflow-providers-common-compat>=1.2.1rc0
-Requires-Dist: apache-airflow-providers-common-sql>=1.3.1rc0
+Requires-Dist: apache-airflow-providers-common-compat>=1.3.0
+Requires-Dist: apache-airflow-providers-common-sql>=1.20.0
 Requires-Dist: apache-airflow-providers-http
-Requires-Dist: apache-airflow>=2.8.0rc0
+Requires-Dist: apache-airflow>=2.9.0
 Requires-Dist: asgiref>=2.3.0
 Requires-Dist: boto3>=1.34.90
 Requires-Dist: botocore>=1.34.90
@@ -35,16 +35,13 @@ Requires-Dist: python3-saml>=1.16.0
 Requires-Dist: redshift_connector>=2.0.918
 Requires-Dist: watchtower>=3.0.0,!=3.3.0,<4
 Requires-Dist: aiobotocore[boto3]>=2.13.0 ; extra == "aiobotocore"
-Requires-Dist: apache-airflow-providers-apache-hive ; extra == "apache.hive"
-Requires-Dist: apache-airflow-providers-cncf-kubernetes>=7.2.0rc0 ; extra == "cncf.kubernetes"
-Requires-Dist: apache-airflow-providers-common-compat ; extra == "common.compat"
-Requires-Dist: apache-airflow-providers-common-sql ; extra == "common.sql"
+Requires-Dist: apache-airflow-providers-apache-hive ; extra == "apache-hive"
+Requires-Dist: apache-airflow-providers-cncf-kubernetes>=7.2.0 ; extra == "cncf-kubernetes"
 Requires-Dist: apache-airflow-providers-exasol ; extra == "exasol"
 Requires-Dist: apache-airflow-providers-ftp ; extra == "ftp"
 Requires-Dist: apache-airflow-providers-google ; extra == "google"
-Requires-Dist: apache-airflow-providers-http ; extra == "http"
 Requires-Dist: apache-airflow-providers-imap ; extra == "imap"
-Requires-Dist: apache-airflow-providers-microsoft-azure ; extra == "microsoft.azure"
+Requires-Dist: apache-airflow-providers-microsoft-azure ; extra == "microsoft-azure"
 Requires-Dist: apache-airflow-providers-mongo ; extra == "mongo"
 Requires-Dist: apache-airflow-providers-openlineage ; extra == "openlineage"
 Requires-Dist: pandas>=2.1.2,<2.2 ; extra == "pandas" and (python_version>="3.9")
@@ -54,23 +51,20 @@ Requires-Dist: s3fs>=2023.10.0 ; extra == "s3fs"
 Requires-Dist: apache-airflow-providers-salesforce ; extra == "salesforce"
 Requires-Dist: apache-airflow-providers-ssh ; extra == "ssh"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.1.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.1.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.2.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.2.0
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
-Project-URL: Twitter, https://twitter.com/ApacheAirflow
+Project-URL: Twitter, https://x.com/ApacheAirflow
 Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 Provides-Extra: aiobotocore
-Provides-Extra: apache.hive
-Provides-Extra: cncf.kubernetes
-Provides-Extra: common.compat
-Provides-Extra: common.sql
+Provides-Extra: apache-hive
+Provides-Extra: cncf-kubernetes
 Provides-Extra: exasol
 Provides-Extra: ftp
 Provides-Extra: google
-Provides-Extra: http
 Provides-Extra: imap
-Provides-Extra: microsoft.azure
+Provides-Extra: microsoft-azure
 Provides-Extra: mongo
 Provides-Extra: openlineage
 Provides-Extra: pandas
@@ -123,7 +117,7 @@ Provides-Extra: ssh
 
 Package ``apache-airflow-providers-amazon``
 
-Release: ``9.1.0.rc3``
+Release: ``9.2.0``
 
 
 Amazon integration (including `Amazon Web Services (AWS) <https://aws.amazon.com/>`__).
@@ -136,7 +130,7 @@ This is a provider package for ``amazon`` provider. All classes for this provide
 are in ``airflow.providers.amazon`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.1.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.2.0/>`_.
 
 Installation
 ------------
@@ -153,9 +147,9 @@ Requirements
 ==========================================  ======================
 PIP package                                 Version required
 ==========================================  ======================
-``apache-airflow``                          ``>=2.8.0``
-``apache-airflow-providers-common-compat``  ``>=1.2.1``
-``apache-airflow-providers-common-sql``     ``>=1.3.1``
+``apache-airflow``                          ``>=2.9.0``
+``apache-airflow-providers-common-compat``  ``>=1.3.0``
+``apache-airflow-providers-common-sql``     ``>=1.20.0``
 ``apache-airflow-providers-http``
 ``boto3``                                   ``>=1.34.90``
 ``botocore``                                ``>=1.34.90``
@@ -202,4 +196,4 @@ Dependent package
 ======================================================================================================================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.1.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.2.0/changelog.html>`_.

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/README.rst

@@ -42,7 +42,7 @@
 
 Package ``apache-airflow-providers-amazon``
 
-Release: ``9.1.0.rc3``
+Release: ``9.2.0``
 
 
 Amazon integration (including `Amazon Web Services (AWS) <https://aws.amazon.com/>`__).
@@ -55,7 +55,7 @@ This is a provider package for ``amazon`` provider. All classes for this provide
 are in ``airflow.providers.amazon`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.1.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.2.0/>`_.
 
 Installation
 ------------
@@ -72,9 +72,9 @@ Requirements
 ==========================================  ======================
 PIP package                                 Version required
 ==========================================  ======================
-``apache-airflow``                          ``>=2.8.0``
-``apache-airflow-providers-common-compat``  ``>=1.2.1``
-``apache-airflow-providers-common-sql``     ``>=1.3.1``
+``apache-airflow``                          ``>=2.9.0``
+``apache-airflow-providers-common-compat``  ``>=1.3.0``
+``apache-airflow-providers-common-sql``     ``>=1.20.0``
 ``apache-airflow-providers-http``
 ``boto3``                                   ``>=1.34.90``
 ``botocore``                                ``>=1.34.90``
@@ -121,4 +121,4 @@ Dependent package
 ======================================================================================================================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.1.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-amazon/9.2.0/changelog.html>`_.

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/__init__.py

@@ -29,11 +29,11 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "9.1.0"
+__version__ = "9.2.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
-    "2.8.0"
+    "2.9.0"
 ):
     raise RuntimeError(
-        f"The package `apache-airflow-providers-amazon:{__version__}` needs Apache Airflow 2.8.0+"
+        f"The package `apache-airflow-providers-amazon:{__version__}` needs Apache Airflow 2.9.0+"
     )

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/auth_manager/avp/facade.py

@@ -17,9 +17,10 @@
 from __future__ import annotations
 
 import json
+from collections.abc import Sequence
 from functools import cached_property
 from pathlib import Path
-from typing import TYPE_CHECKING, Sequence, TypedDict
+from typing import TYPE_CHECKING, TypedDict
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/auth_manager/aws_auth_manager.py

@@ -19,8 +19,9 @@ from __future__ import annotations
 import argparse
 import warnings
 from collections import defaultdict
+from collections.abc import Container, Sequence
 from functools import cached_property
-from typing import TYPE_CHECKING, Container, Sequence, cast
+from typing import TYPE_CHECKING, cast
 
 from flask import session, url_for
 
@@ -80,16 +81,6 @@ class AwsAuthManager(BaseAuthManager):
     """
 
     def __init__(self, appbuilder: AirflowAppBuilder) -> None:
-        from packaging.version import Version
-
-        from airflow.version import version
-
-        # TODO: remove this if block when min_airflow_version is set to higher than 2.9.0
-        if Version(version) < Version("2.9"):
-            raise AirflowOptionalProviderFeatureException(
-                "``AwsAuthManager`` is compatible with Airflow versions >= 2.9."
-            )
-
         super().__init__(appbuilder)
         self._check_avp_schema_version()
 
@@ -430,7 +421,8 @@ class AwsAuthManager(BaseAuthManager):
         ]
 
     def register_views(self) -> None:
-        self.appbuilder.add_view_no_menu(AwsAuthManagerAuthenticationViews())
+        if self.appbuilder:
+            self.appbuilder.add_view_no_menu(AwsAuthManagerAuthenticationViews())
 
     @staticmethod
     def _get_menu_item_request(resource_name: str) -> IsAuthorizedRequest:

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/executors/batch/batch_executor.py

@@ -21,9 +21,10 @@ from __future__ import annotations
 
 import time
 from collections import deque
+from collections.abc import Sequence
 from contextlib import suppress
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, Dict, List, Sequence
+from typing import TYPE_CHECKING, Any
 
 from botocore.exceptions import ClientError, NoCredentialsError
 
@@ -55,8 +56,8 @@ from airflow.providers.amazon.aws.executors.batch.utils import (
 )
 from airflow.utils.state import State
 
-CommandType = List[str]
-ExecutorConfigType = Dict[str, Any]
+CommandType = list[str]
+ExecutorConfigType = dict[str, Any]
 
 INVALID_CREDENTIALS_EXCEPTIONS = [
     "ExpiredTokenException",

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/executors/batch/utils.py

@@ -19,7 +19,7 @@ from __future__ import annotations
 import datetime
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List
+from typing import TYPE_CHECKING, Any
 
 from airflow.providers.amazon.aws.executors.utils.base_config_keys import BaseConfigKeys
 from airflow.utils.state import State
@@ -27,8 +27,8 @@ from airflow.utils.state import State
 if TYPE_CHECKING:
     from airflow.models.taskinstance import TaskInstanceKey
 
-CommandType = List[str]
-ExecutorConfigType = Dict[str, Any]
+CommandType = list[str]
+ExecutorConfigType = dict[str, Any]
 
 CONFIG_GROUP_NAME = "aws_batch_executor"
 

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/executors/ecs/ecs_executor.py

@@ -25,9 +25,10 @@ from __future__ import annotations
 
 import time
 from collections import defaultdict, deque
+from collections.abc import Sequence
 from contextlib import suppress
 from copy import deepcopy
-from typing import TYPE_CHECKING, Sequence
+from typing import TYPE_CHECKING
 
 from botocore.exceptions import ClientError, NoCredentialsError
 

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/executors/ecs/utils.py

@@ -26,7 +26,7 @@ from __future__ import annotations
 import datetime
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable, Dict, List
+from typing import TYPE_CHECKING, Any, Callable
 
 from inflection import camelize
 
@@ -36,9 +36,9 @@ from airflow.utils.state import State
 if TYPE_CHECKING:
     from airflow.models.taskinstance import TaskInstanceKey
 
-CommandType = List[str]
+CommandType = list[str]
 ExecutorConfigFunctionType = Callable[[CommandType], dict]
-ExecutorConfigType = Dict[str, Any]
+ExecutorConfigType = dict[str, Any]
 
 ECS_LAUNCH_TYPE_EC2 = "EC2"
 ECS_LAUNCH_TYPE_FARGATE = "FARGATE"

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/fs/s3.py

@@ -19,7 +19,7 @@ from __future__ import annotations
 import asyncio
 import logging
 from functools import partial
-from typing import TYPE_CHECKING, Any, Callable, Dict
+from typing import TYPE_CHECKING, Any, Callable
 
 import requests
 from botocore import UNSIGNED
@@ -32,7 +32,7 @@ if TYPE_CHECKING:
     from fsspec import AbstractFileSystem
 
 
-Properties = Dict[str, str]
+Properties = dict[str, str]
 
 S3_PROXY_URI = "proxy-uri"
 

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/appflow.py

@@ -16,7 +16,15 @@
 # under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, cast
+
+from mypy_boto3_appflow.type_defs import (
+    DestinationFlowConfigTypeDef,
+    SourceFlowConfigTypeDef,
+    TaskTypeDef,
+    TriggerConfigTypeDef,
+)
 
 from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
 from airflow.providers.amazon.aws.utils.waiter_with_logging import wait
@@ -117,9 +125,11 @@ class AppflowHook(AwsGenericHook["AppflowClient"]):
 
         self.conn.update_flow(
             flowName=response["flowName"],
-            destinationFlowConfigList=response["destinationFlowConfigList"],
-            sourceFlowConfig=response["sourceFlowConfig"],
-            triggerConfig=response["triggerConfig"],
+            destinationFlowConfigList=cast(
+                Sequence[DestinationFlowConfigTypeDef], response["destinationFlowConfigList"]
+            ),
+            sourceFlowConfig=cast(SourceFlowConfigTypeDef, response["sourceFlowConfig"]),
+            triggerConfig=cast(TriggerConfigTypeDef, response["triggerConfig"]),
             description=response.get("description", "Flow description."),
-            tasks=tasks,
+            tasks=cast(Sequence[TaskTypeDef], tasks),
         )

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/athena.py

@@ -25,7 +25,8 @@ This module contains AWS Athena hook.
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Collection
+from collections.abc import Collection
+from typing import TYPE_CHECKING, Any
 
 from airflow.exceptions import AirflowException
 from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/dms.py

@@ -18,7 +18,12 @@
 from __future__ import annotations
 
 import json
+from datetime import datetime
 from enum import Enum
+from typing import Any
+
+from botocore.exceptions import ClientError
+from dateutil import parser
 
 from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
 
@@ -219,3 +224,159 @@ class DmsHook(AwsBaseHook):
             ],
             WithoutSettings=True,
         )
+
+    def describe_replication_configs(self, filters: list[dict] | None = None, **kwargs) -> list[dict]:
+        """
+        Return list of serverless replication configs.
+
+        .. seealso::
+            - :external+boto3:py:meth:`DatabaseMigrationService.Client.describe_replication_configs`
+
+        :param filters: List of filter objects
+        :return: List of replication tasks
+        """
+        filters = filters if filters is not None else []
+
+        try:
+            resp = self.conn.describe_replication_configs(Filters=filters, **kwargs)
+            return resp.get("ReplicationConfigs", [])
+        except Exception as ex:
+            self.log.error("Error while describing replication configs: %s", str(ex))
+            raise ex
+
+    def create_replication_config(
+        self,
+        replication_config_id: str,
+        source_endpoint_arn: str,
+        target_endpoint_arn: str,
+        compute_config: dict[str, Any],
+        replication_type: str,
+        table_mappings: str,
+        additional_config_kwargs: dict[str, Any] | None = None,
+        **kwargs,
+    ):
+        """
+        Create an AWS DMS Serverless configuration that can be used to start an DMS Serverless replication.
+
+        .. seealso::
+            - :external+boto3:py:meth:`DatabaseMigrationService.Client.create_replication_config`
+
+        :param replicationConfigId: Unique identifier used to create a ReplicationConfigArn.
+        :param sourceEndpointArn: ARN of the source endpoint
+        :param targetEndpointArn: ARN of the target endpoint
+        :param computeConfig: Parameters for provisioning an DMS Serverless replication.
+        :param replicationType: type of DMS Serverless replication
+        :param tableMappings: JSON table mappings
+        :param tags: Key-value tag pairs
+        :param resourceId: Unique value or name that you set for a given resource that can be used to construct an Amazon Resource Name (ARN) for that resource.
+        :param supplementalSettings: JSON settings for specifying supplemental data
+        :param replicationSettings: JSON settings for DMS Serverless replications
+
+        :return: ReplicationConfigArn
+
+        """
+        if additional_config_kwargs is None:
+            additional_config_kwargs = {}
+        try:
+            resp = self.conn.create_replication_config(
+                ReplicationConfigIdentifier=replication_config_id,
+                SourceEndpointArn=source_endpoint_arn,
+                TargetEndpointArn=target_endpoint_arn,
+                ComputeConfig=compute_config,
+                ReplicationType=replication_type,
+                TableMappings=table_mappings,
+                **additional_config_kwargs,
+            )
+            arn = resp.get("ReplicationConfig", {}).get("ReplicationConfigArn")
+            self.log.info("Successfully created replication config: %s", arn)
+            return arn
+
+        except ClientError as err:
+            err_str = f"Error: {err.get('Error','').get('Code','')}: {err.get('Error','').get('Message','')}"
+            self.log.error("Error while creating replication config: %s", err_str)
+            raise err
+
+    def describe_replications(self, filters: list[dict[str, Any]] | None = None, **kwargs) -> list[dict]:
+        """
+        Return list of serverless replications.
+
+        .. seealso::
+            - :external+boto3:py:meth:`DatabaseMigrationService.Client.describe_replications`
+
+        :param filters: List of filter objects
+        :return: List of replications
+        """
+        filters = filters if filters is not None else []
+        try:
+            resp = self.conn.describe_replications(Filters=filters, **kwargs)
+            return resp.get("Replications", [])
+        except Exception as ex:
+            self.log.error("Error while describing replications: %s", str(ex))
+            raise ex
+
+    def delete_replication_config(
+        self, replication_config_arn: str, delay: int = 60, max_attempts: int = 120
+    ):
+        """
+        Delete an AWS DMS Serverless configuration.
+
+        .. seealso::
+            - :external+boto3:py:meth:`DatabaseMigrationService.Client.delete_replication_config`
+
+        :param replication_config_arn: ReplicationConfigArn
+        """
+        try:
+            self.log.info("Deleting replication config: %s", replication_config_arn)
+
+            self.conn.delete_replication_config(ReplicationConfigArn=replication_config_arn)
+
+        except ClientError as err:
+            err_str = (
+                f"Error: {err.get('Error', '').get('Code', '')}: {err.get('Error', '').get('Message', '')}"
+            )
+            self.log.error("Error while deleting replication config: %s", err_str)
+            raise err
+
+    def start_replication(
+        self,
+        replication_config_arn: str,
+        start_replication_type: str,
+        cdc_start_time: datetime | str | None = None,
+        cdc_start_pos: str | None = None,
+        cdc_stop_pos: str | None = None,
+    ):
+        additional_args: dict[str, Any] = {}
+
+        if cdc_start_time:
+            additional_args["CdcStartTime"] = (
+                cdc_start_time if isinstance(cdc_start_time, datetime) else parser.parse(cdc_start_time)
+            )
+        if cdc_start_pos:
+            additional_args["CdcStartPosition"] = cdc_start_pos
+        if cdc_stop_pos:
+            additional_args["CdcStopPosition"] = cdc_stop_pos
+
+        try:
+            resp = self.conn.start_replication(
+                ReplicationConfigArn=replication_config_arn,
+                StartReplicationType=start_replication_type,
+                **additional_args,
+            )
+
+            return resp
+        except Exception as ex:
+            self.log.error("Error while starting replication: %s", str(ex))
+            raise ex
+
+    def stop_replication(self, replication_config_arn: str):
+        resp = self.conn.stop_replication(ReplicationConfigArn=replication_config_arn)
+        return resp
+
+    def get_provision_status(self, replication_config_arn: str) -> str:
+        """Get the provisioning status for a serverless replication."""
+        result = self.describe_replications(
+            filters=[{"Name": "replication-config-arn", "Values": [replication_config_arn]}]
+        )
+
+        provision_status = result[0].get("ProvisionData", {}).get("ProvisionState", "")
+        return provision_status

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/dynamodb.py

@@ -19,8 +19,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterable
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterable
+from typing import TYPE_CHECKING
 
 from botocore.exceptions import ClientError
 

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/eks.py

@@ -22,10 +22,11 @@ import base64
 import json
 import sys
 import tempfile
+from collections.abc import Generator
 from contextlib import contextmanager
 from enum import Enum
 from functools import partial
-from typing import Callable, Generator
+from typing import Callable
 
 from botocore.exceptions import ClientError
 from botocore.signers import RequestSigner
@@ -85,8 +86,8 @@ COMMAND = """
                 exit 1
             fi
 
-            expiration_timestamp=$(echo "$output" | grep -oP 'expirationTimestamp:\s*\K[^,]+')
-            token=$(echo "$output" | grep -oP 'token:\s*\K[^,]+')
+            expiration_timestamp=$(echo "$output" | grep -oP 'expirationTimestamp: \\K[^,]+')
+            token=$(echo "$output" | grep -oP 'token: \\K[^,]+')
 
             json_string=$(printf '{{"kind": "ExecCredential","apiVersion": \
                 "client.authentication.k8s.io/v1alpha1","spec": {{}},"status": \

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/glue.py

@@ -282,13 +282,16 @@ class GlueJobHook(AwsBaseHook):
             log_group_error, continuation_tokens.error_stream_continuation
         )
 
-    def job_completion(self, job_name: str, run_id: str, verbose: bool = False) -> dict[str, str]:
+    def job_completion(
+        self, job_name: str, run_id: str, verbose: bool = False, sleep_before_return: int = 0
+    ) -> dict[str, str]:
         """
         Wait until Glue job with job_name finishes; return final state if finished or raises AirflowException.
 
         :param job_name: unique job name per AWS account
         :param run_id: The job-run ID of the predecessor job run
         :param verbose: If True, more Glue Job Run logs show in the Airflow Task Logs.  (default: False)
+        :param sleep_before_return: time in seconds to wait before returning final status.
         :return: Dict of JobRunState and JobRunId
         """
         next_log_tokens = self.LogContinuationTokens()
@@ -296,6 +299,7 @@ class GlueJobHook(AwsBaseHook):
             job_run_state = self.get_job_state(job_name, run_id)
             ret = self._handle_state(job_run_state, job_name, run_id, verbose, next_log_tokens)
             if ret:
+                time.sleep(sleep_before_return)
                 return ret
             else:
                 time.sleep(self.job_poll_interval)

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/kinesis.py

@@ -19,7 +19,7 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from collections.abc import Iterable
 
 from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
 

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/logs.py

@@ -18,7 +18,8 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Any, AsyncGenerator, Generator
+from collections.abc import AsyncGenerator, Generator
+from typing import Any
 
 from botocore.exceptions import ClientError
 

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/redshift_cluster.py

@@ -16,7 +16,8 @@
 # under the License.
 from __future__ import annotations
 
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
 
@@ -93,8 +94,8 @@ class RedshiftHook(AwsBaseHook):
 
     async def cluster_status_async(self, cluster_identifier: str) -> str:
         async with self.async_conn as client:
-            response = await client.describe_clusters(ClusterIdentifier=cluster_identifier)["Clusters"]
-            return response[0]["ClusterStatus"] if response else None
+            response = await client.describe_clusters(ClusterIdentifier=cluster_identifier)
+            return response["Clusters"][0]["ClusterStatus"] if response else None
 
     def delete_cluster(
         self,

{apache_airflow_providers_amazon-9.1.0rc3 → apache_airflow_providers_amazon-9.2.0}/airflow/providers/amazon/aws/hooks/redshift_data.py

@@ -18,9 +18,10 @@
 from __future__ import annotations
 
 import time
+from collections.abc import Iterable
 from dataclasses import dataclass
 from pprint import pformat
-from typing import TYPE_CHECKING, Any, Iterable
+from typing import TYPE_CHECKING, Any
 from uuid import UUID
 
 from pendulum import duration