apache-airflow-providers-amazon 9.5.0rc2__py3-none-any.whl → 9.5.0rc3__py3-none-any.whl

airflow/providers/amazon/aws/auth_manager/aws_auth_manager.py

@@ -27,15 +27,6 @@ from fastapi import FastAPI
 
 from airflow.api_fastapi.app import AUTH_MANAGER_FASTAPI_APP_PREFIX
 from airflow.api_fastapi.auth.managers.base_auth_manager import BaseAuthManager
-from airflow.api_fastapi.auth.managers.models.resource_details import (
-    AccessView,
-    BackfillDetails,
-    ConnectionDetails,
-    DagAccessEntity,
-    DagDetails,
-    PoolDetails,
-    VariableDetails,
-)
 from airflow.cli.cli_config import CLICommand, DefaultHelpParser, GroupCommand
 from airflow.configuration import conf
 from airflow.exceptions import AirflowOptionalProviderFeatureException
@@ -59,9 +50,16 @@ if TYPE_CHECKING:
         IsAuthorizedVariableRequest,
     )
     from airflow.api_fastapi.auth.managers.models.resource_details import (
+        AccessView,
         AssetAliasDetails,
         AssetDetails,
+        BackfillDetails,
         ConfigurationDetails,
+        ConnectionDetails,
+        DagAccessEntity,
+        DagDetails,
+        PoolDetails,
+        VariableDetails,
     )
     from airflow.api_fastapi.common.types import MenuItem
 
@@ -256,7 +254,7 @@ class AwsAuthManager(BaseAuthManager[AwsAuthManagerUser]):
             {
                 "method": request["method"],
                 "entity_type": AvpEntities.CONNECTION,
-                "entity_id": cast(ConnectionDetails, request["details"]).conn_id
+                "entity_id": cast("ConnectionDetails", request["details"]).conn_id
                 if request.get("details")
                 else None,
             }
@@ -274,10 +272,10 @@ class AwsAuthManager(BaseAuthManager[AwsAuthManagerUser]):
             {
                 "method": request["method"],
                 "entity_type": AvpEntities.DAG,
-                "entity_id": cast(DagDetails, request["details"]).id if request.get("details") else None,
+                "entity_id": cast("DagDetails", request["details"]).id if request.get("details") else None,
                 "context": {
                     "dag_entity": {
-                        "string": cast(DagAccessEntity, request["access_entity"]).value,
+                        "string": cast("DagAccessEntity", request["access_entity"]).value,
                     },
                 }
                 if request.get("access_entity")
@@ -297,7 +295,7 @@ class AwsAuthManager(BaseAuthManager[AwsAuthManagerUser]):
             {
                 "method": request["method"],
                 "entity_type": AvpEntities.POOL,
-                "entity_id": cast(PoolDetails, request["details"]).name if request.get("details") else None,
+                "entity_id": cast("PoolDetails", request["details"]).name if request.get("details") else None,
             }
             for request in requests
         ]
@@ -313,7 +311,7 @@ class AwsAuthManager(BaseAuthManager[AwsAuthManagerUser]):
             {
                 "method": request["method"],
                 "entity_type": AvpEntities.VARIABLE,
-                "entity_id": cast(VariableDetails, request["details"]).key
+                "entity_id": cast("VariableDetails", request["details"]).key
                 if request.get("details")
                 else None,
             }

airflow/providers/amazon/aws/auth_manager/router/login.py

@@ -83,7 +83,9 @@ def login_callback(request: Request):
     url = conf.get("api", "base_url")
     token = get_auth_manager().generate_jwt(user)
     response = RedirectResponse(url=url, status_code=303)
-    response.set_cookie(COOKIE_NAME_JWT_TOKEN, token, secure=True)
+
+    secure = conf.has_option("api", "ssl_cert")
+    response.set_cookie(COOKIE_NAME_JWT_TOKEN, token, secure=secure)
     return response
 
 

airflow/providers/amazon/aws/executors/ecs/ecs_executor.py

@@ -278,7 +278,7 @@ class AwsEcsExecutor(BaseExecutor):
         if not has_exit_codes:
             return ""
         reasons = [
-            f'{container["container_arn"]} - {container["reason"]}'
+            f"{container['container_arn']} - {container['reason']}"
             for container in containers
             if "reason" in container
         ]

airflow/providers/amazon/aws/hooks/athena_sql.py

@@ -146,10 +146,10 @@ class AthenaSQLHook(AwsBaseHook, DbApiHook):
         creds = self.get_credentials(region_name=conn_params["region_name"])
 
         return URL.create(
-            f'awsathena+{conn_params["driver"]}',
+            f"awsathena+{conn_params['driver']}",
             username=creds.access_key,
             password=creds.secret_key,
-            host=f'athena.{conn_params["region_name"]}.{conn_params["aws_domain"]}',
+            host=f"athena.{conn_params['region_name']}.{conn_params['aws_domain']}",
             port=443,
             database=conn_params["schema_name"],
             query={"aws_session_token": creds.token, **self.conn.extra_dejson},

airflow/providers/amazon/aws/hooks/batch_client.py

@@ -416,8 +416,7 @@ class BatchClientHook(AwsBaseHook):
                 )
         else:
             raise AirflowException(
-                f"AWS Batch job ({job_id}) description error: exceeded status_retries "
-                f"({self.status_retries})"
+                f"AWS Batch job ({job_id}) description error: exceeded status_retries ({self.status_retries})"
             )
 
     @staticmethod

airflow/providers/amazon/aws/hooks/batch_waiters.py

@@ -30,7 +30,7 @@ import json
 import sys
 from copy import deepcopy
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING, Any, Callable
 
 import botocore.client
 import botocore.exceptions
@@ -144,7 +144,12 @@ class BatchWaitersHook(BatchClientHook):
         return self._waiter_model
 
     def get_waiter(
-        self, waiter_name: str, _: dict[str, str] | None = None, deferrable: bool = False, client=None
+        self,
+        waiter_name: str,
+        parameters: dict[str, str] | None = None,
+        config_overrides: dict[str, Any] | None = None,
+        deferrable: bool = False,
+        client=None,
     ) -> botocore.waiter.Waiter:
         """
         Get an AWS Batch service waiter, using the configured ``.waiter_model``.
@@ -175,7 +180,10 @@ class BatchWaitersHook(BatchClientHook):
             the name (including the casing) of the key name in the waiter
             model file (typically this is CamelCasing); see ``.list_waiters``.
 
-        :param _: unused, just here to match the method signature in base_aws
+        :param parameters: unused, just here to match the method signature in base_aws
+        :param config_overrides: unused, just here to match the method signature in base_aws
+        :param deferrable: unused, just here to match the method signature in base_aws
+        :param client: unused, just here to match the method signature in base_aws
 
         :return: a waiter object for the named AWS Batch service
         """

airflow/providers/amazon/aws/hooks/dms.py

@@ -292,7 +292,9 @@ class DmsHook(AwsBaseHook):
             return arn
 
         except ClientError as err:
-            err_str = f"Error: {err.get('Error','').get('Code','')}: {err.get('Error','').get('Message','')}"
+            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
 

airflow/providers/amazon/aws/hooks/redshift_cluster.py

@@ -67,7 +67,7 @@ class RedshiftHook(AwsBaseHook):
             for the cluster that is being created.
         :param params: Remaining AWS Create cluster API params.
         """
-        response = self.get_conn().create_cluster(
+        response = self.conn.create_cluster(
             ClusterIdentifier=cluster_identifier,
             NodeType=node_type,
             MasterUsername=master_username,
@@ -87,9 +87,9 @@ class RedshiftHook(AwsBaseHook):
         :param cluster_identifier: unique identifier of a cluster
         """
         try:
-            response = self.get_conn().describe_clusters(ClusterIdentifier=cluster_identifier)["Clusters"]
+            response = self.conn.describe_clusters(ClusterIdentifier=cluster_identifier)["Clusters"]
             return response[0]["ClusterStatus"] if response else None
-        except self.get_conn().exceptions.ClusterNotFoundFault:
+        except self.conn.exceptions.ClusterNotFoundFault:
             return "cluster_not_found"
 
     async def cluster_status_async(self, cluster_identifier: str) -> str:
@@ -115,7 +115,7 @@ class RedshiftHook(AwsBaseHook):
         """
         final_cluster_snapshot_identifier = final_cluster_snapshot_identifier or ""
 
-        response = self.get_conn().delete_cluster(
+        response = self.conn.delete_cluster(
             ClusterIdentifier=cluster_identifier,
             SkipFinalClusterSnapshot=skip_final_cluster_snapshot,
             FinalClusterSnapshotIdentifier=final_cluster_snapshot_identifier,
@@ -131,7 +131,7 @@ class RedshiftHook(AwsBaseHook):
 
         :param cluster_identifier: unique identifier of a cluster
         """
-        response = self.get_conn().describe_cluster_snapshots(ClusterIdentifier=cluster_identifier)
+        response = self.conn.describe_cluster_snapshots(ClusterIdentifier=cluster_identifier)
         if "Snapshots" not in response:
             return None
         snapshots = response["Snapshots"]
@@ -149,7 +149,7 @@ class RedshiftHook(AwsBaseHook):
         :param cluster_identifier: unique identifier of a cluster
         :param snapshot_identifier: unique identifier for a snapshot of a cluster
         """
-        response = self.get_conn().restore_from_cluster_snapshot(
+        response = self.conn.restore_from_cluster_snapshot(
             ClusterIdentifier=cluster_identifier, SnapshotIdentifier=snapshot_identifier
         )
         return response["Cluster"] if response["Cluster"] else None
@@ -175,7 +175,7 @@ class RedshiftHook(AwsBaseHook):
         """
         if tags is None:
             tags = []
-        response = self.get_conn().create_cluster_snapshot(
+        response = self.conn.create_cluster_snapshot(
             SnapshotIdentifier=snapshot_identifier,
             ClusterIdentifier=cluster_identifier,
             ManualSnapshotRetentionPeriod=retention_period,
@@ -192,11 +192,11 @@ class RedshiftHook(AwsBaseHook):
         :param snapshot_identifier: A unique identifier for the snapshot that you are requesting
         """
         try:
-            response = self.get_conn().describe_cluster_snapshots(
+            response = self.conn.describe_cluster_snapshots(
                 SnapshotIdentifier=snapshot_identifier,
             )
             snapshot = response.get("Snapshots")[0]
             snapshot_status: str = snapshot.get("Status")
             return snapshot_status
-        except self.get_conn().exceptions.ClusterSnapshotNotFoundFault:
+        except self.conn.exceptions.ClusterSnapshotNotFoundFault:
             return None

airflow/providers/amazon/aws/hooks/redshift_data.py

@@ -186,8 +186,7 @@ class RedshiftDataHook(AwsGenericHook["RedshiftDataAPIServiceClient"]):
                 RedshiftDataQueryFailedError if status == FAILED_STATE else RedshiftDataQueryAbortedError
             )
             raise exception_cls(
-                f"Statement {resp['Id']} terminated with status {status}. "
-                f"Response details: {pformat(resp)}"
+                f"Statement {resp['Id']} terminated with status {status}. Response details: {pformat(resp)}"
             )
 
         self.log.info("Query status: %s", status)

airflow/providers/amazon/aws/hooks/sagemaker.py

@@ -131,7 +131,7 @@ def secondary_training_status_message(
     status_strs = []
     for transition in transitions_to_print:
         message = transition["StatusMessage"]
-        time_utc = timezone.convert_to_utc(cast(datetime, job_description["LastModifiedTime"]))
+        time_utc = timezone.convert_to_utc(cast("datetime", job_description["LastModifiedTime"]))
         status_strs.append(f"{time_utc:%Y-%m-%d %H:%M:%S} {transition['Status']} - {message}")
 
     return "\n".join(status_strs)

airflow/providers/amazon/aws/links/athena.py

@@ -25,6 +25,5 @@ class AthenaQueryResultsLink(BaseAwsLink):
     name = "Query Results"
     key = "_athena_query_results"
     format_str = (
-        BASE_AWS_CONSOLE_LINK + "/athena/home?region={region_name}#"
-        "/query-editor/history/{query_execution_id}"
+        BASE_AWS_CONSOLE_LINK + "/athena/home?region={region_name}#/query-editor/history/{query_execution_id}"
     )

airflow/providers/amazon/aws/log/cloudwatch_task_handler.py

@@ -17,20 +17,31 @@
 # under the License.
 from __future__ import annotations
 
+import copy
+import json
+import logging
+import os
 from datetime import date, datetime, timedelta, timezone
 from functools import cached_property
+from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
+import attrs
 import watchtower
 
 from airflow.configuration import conf
 from airflow.providers.amazon.aws.hooks.logs import AwsLogsHook
 from airflow.providers.amazon.aws.utils import datetime_to_epoch_utc_ms
+from airflow.providers.amazon.version_compat import AIRFLOW_V_3_0_PLUS
 from airflow.utils.log.file_task_handler import FileTaskHandler
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 if TYPE_CHECKING:
-    from airflow.models import TaskInstance
+    import structlog.typing
+
+    from airflow.models.taskinstance import TaskInstance
+    from airflow.sdk.types import RuntimeTaskInstanceProtocol as RuntimeTI
+    from airflow.utils.log.file_task_handler import LogMessages, LogSourceInfo
 
 
 def json_serialize_legacy(value: Any) -> str | None:
@@ -62,6 +73,155 @@ def json_serialize(value: Any) -> str | None:
     return watchtower._json_serialize_default(value)
 
 
+@attrs.define(kw_only=True)
+class CloudWatchRemoteLogIO(LoggingMixin):  # noqa: D101
+    base_log_folder: Path = attrs.field(converter=Path)
+    remote_base: str = ""
+    delete_local_copy: bool = True
+
+    log_group_arn: str
+    log_stream_name: str = ""
+    log_group: str = attrs.field(init=False, repr=False)
+    region_name: str = attrs.field(init=False, repr=False)
+
+    @log_group.default
+    def _(self):
+        return self.log_group_arn.split(":")[6]
+
+    @region_name.default
+    def _(self):
+        return self.log_group_arn.split(":")[3]
+
+    @cached_property
+    def hook(self):
+        """Returns AwsLogsHook."""
+        return AwsLogsHook(
+            aws_conn_id=conf.get("logging", "remote_log_conn_id"), region_name=self.region_name
+        )
+
+    @cached_property
+    def handler(self) -> watchtower.CloudWatchLogHandler:
+        _json_serialize = conf.getimport("aws", "cloudwatch_task_handler_json_serializer", fallback=None)
+        return watchtower.CloudWatchLogHandler(
+            log_group_name=self.log_group,
+            log_stream_name=self.log_stream_name,
+            use_queues=True,
+            boto3_client=self.hook.get_conn(),
+            json_serialize_default=_json_serialize or json_serialize_legacy,
+        )
+
+    @cached_property
+    def processors(self) -> tuple[structlog.typing.Processor, ...]:
+        from logging import getLogRecordFactory
+
+        import structlog.stdlib
+
+        logRecordFactory = getLogRecordFactory()
+        # The handler MUST be initted here, before the processor is actually used to log anything.
+        # Otherwise, logging that occurs during the creation of the handler can create infinite loops.
+        _handler = self.handler
+        from airflow.sdk.log import relative_path_from_logger
+
+        def proc(logger: structlog.typing.WrappedLogger, method_name: str, event: structlog.typing.EventDict):
+            if not logger or not (stream_name := relative_path_from_logger(logger)):
+                return event
+            # Only init the handler stream_name once. We cannot do it above when we init the handler because
+            # we don't yet know the log path at that point.
+            if not _handler.log_stream_name:
+                _handler.log_stream_name = stream_name.as_posix().replace(":", "_")
+            name = event.get("logger_name") or event.get("logger", "")
+            level = structlog.stdlib.NAME_TO_LEVEL.get(method_name.lower(), logging.INFO)
+            msg = copy.copy(event)
+            created = None
+            if ts := msg.pop("timestamp", None):
+                try:
+                    created = datetime.fromisoformat(ts)
+                except Exception:
+                    pass
+            record = logRecordFactory(
+                name, level, pathname="", lineno=0, msg=msg, args=(), exc_info=None, func=None, sinfo=None
+            )
+            if created is not None:
+                ct = created.timestamp()
+                record.created = ct
+                record.msecs = int((ct - int(ct)) * 1000) + 0.0  # Copied from stdlib logging
+            _handler.handle(record)
+            return event
+
+        return (proc,)
+
+    def close(self):
+        self.handler.close()
+
+    def upload(self, path: os.PathLike | str, ti: RuntimeTI):
+        # No-op, as we upload via the processor as we go
+        # But we need to give the handler time to finish off its business
+        self.close()
+        return
+
+    def read(self, relative_path, ti: RuntimeTI) -> tuple[LogSourceInfo, LogMessages | None]:
+        logs: LogMessages | None = []
+        messages = [
+            f"Reading remote log from Cloudwatch log_group: {self.log_group} log_stream: {relative_path}"
+        ]
+        try:
+            if AIRFLOW_V_3_0_PLUS:
+                from airflow.utils.log.file_task_handler import StructuredLogMessage
+
+                logs = [
+                    StructuredLogMessage.model_validate(log)
+                    for log in self.get_cloudwatch_logs(relative_path, ti)
+                ]
+            else:
+                logs = [self.get_cloudwatch_logs(relative_path, ti)]  # type: ignore[arg-value]
+        except Exception as e:
+            logs = None
+            messages.append(str(e))
+
+        return messages, logs
+
+    def get_cloudwatch_logs(self, stream_name: str, task_instance: RuntimeTI):
+        """
+        Return all logs from the given log stream.
+
+        :param stream_name: name of the Cloudwatch log stream to get all logs from
+        :param task_instance: the task instance to get logs about
+        :return: string of all logs from the given log stream
+        """
+        stream_name = stream_name.replace(":", "_")
+        # If there is an end_date to the task instance, fetch logs until that date + 30 seconds
+        # 30 seconds is an arbitrary buffer so that we don't miss any logs that were emitted
+        end_time = (
+            None
+            if (end_date := getattr(task_instance, "end_date", None)) is None
+            else datetime_to_epoch_utc_ms(end_date + timedelta(seconds=30))
+        )
+        events = self.hook.get_log_events(
+            log_group=self.log_group,
+            log_stream_name=stream_name,
+            end_time=end_time,
+        )
+        if AIRFLOW_V_3_0_PLUS:
+            return list(self._event_to_dict(e) for e in events)
+        return "\n".join(self._event_to_str(event) for event in events)
+
+    def _event_to_dict(self, event: dict) -> dict:
+        event_dt = datetime.fromtimestamp(event["timestamp"] / 1000.0, tz=timezone.utc).isoformat()
+        message = event["message"]
+        try:
+            message = json.loads(message)
+            message["timestamp"] = event_dt
+            return message
+        except Exception:
+            return {"timestamp": event_dt, "event": message}
+
+    def _event_to_str(self, event: dict) -> str:
+        event_dt = datetime.fromtimestamp(event["timestamp"] / 1000.0, tz=timezone.utc)
+        formatted_event_dt = event_dt.strftime("%Y-%m-%d %H:%M:%S,%f")[:-3]
+        message = event["message"]
+        return f"[{formatted_event_dt}] {message}"
+
+
 class CloudwatchTaskHandler(FileTaskHandler, LoggingMixin):
     """
     CloudwatchTaskHandler is a python log handler that handles and reads task instance logs.
@@ -84,6 +244,11 @@ class CloudwatchTaskHandler(FileTaskHandler, LoggingMixin):
         self.region_name = split_arn[3]
         self.closed = False
 
+        self.io = CloudWatchRemoteLogIO(
+            base_log_folder=base_log_folder,
+            log_group_arn=log_group_arn,
+        )
+
     @cached_property
     def hook(self):
         """Returns AwsLogsHook."""
@@ -97,14 +262,9 @@ class CloudwatchTaskHandler(FileTaskHandler, LoggingMixin):
 
     def set_context(self, ti: TaskInstance, *, identifier: str | None = None):
         super().set_context(ti)
-        _json_serialize = conf.getimport("aws", "cloudwatch_task_handler_json_serializer", fallback=None)
-        self.handler = watchtower.CloudWatchLogHandler(
-            log_group_name=self.log_group,
-            log_stream_name=self._render_filename(ti, ti.try_number),
-            use_queues=not getattr(ti, "is_trigger_log_context", False),
-            boto3_client=self.hook.get_conn(),
-            json_serialize_default=_json_serialize or json_serialize_legacy,
-        )
+        self.io.log_stream_name = self._render_filename(ti, ti.try_number)
+
+        self.handler = self.io.handler
 
     def close(self):
         """Close the handler responsible for the upload of the local log file to Cloudwatch."""
@@ -120,49 +280,9 @@ class CloudwatchTaskHandler(FileTaskHandler, LoggingMixin):
         # Mark closed so we don't double write if close is called twice
         self.closed = True
 
-    def _read(self, task_instance, try_number, metadata=None):
+    def _read_remote_logs(
+        self, task_instance, try_number, metadata=None
+    ) -> tuple[LogSourceInfo, LogMessages]:
         stream_name = self._render_filename(task_instance, try_number)
-        try:
-            return (
-                f"*** Reading remote log from Cloudwatch log_group: {self.log_group} "
-                f"log_stream: {stream_name}.\n"
-                f"{self.get_cloudwatch_logs(stream_name=stream_name, task_instance=task_instance)}\n",
-                {"end_of_log": True},
-            )
-        except Exception as e:
-            log = (
-                f"*** Unable to read remote logs from Cloudwatch (log_group: {self.log_group}, log_stream: "
-                f"{stream_name})\n*** {e}\n\n"
-            )
-            self.log.error(log)
-            local_log, metadata = super()._read(task_instance, try_number, metadata)
-            log += local_log
-            return log, metadata
-
-    def get_cloudwatch_logs(self, stream_name: str, task_instance: TaskInstance) -> str:
-        """
-        Return all logs from the given log stream.
-
-        :param stream_name: name of the Cloudwatch log stream to get all logs from
-        :param task_instance: the task instance to get logs about
-        :return: string of all logs from the given log stream
-        """
-        # If there is an end_date to the task instance, fetch logs until that date + 30 seconds
-        # 30 seconds is an arbitrary buffer so that we don't miss any logs that were emitted
-        end_time = (
-            None
-            if task_instance.end_date is None
-            else datetime_to_epoch_utc_ms(task_instance.end_date + timedelta(seconds=30))
-        )
-        events = self.hook.get_log_events(
-            log_group=self.log_group,
-            log_stream_name=stream_name,
-            end_time=end_time,
-        )
-        return "\n".join(self._event_to_str(event) for event in events)
-
-    def _event_to_str(self, event: dict) -> str:
-        event_dt = datetime.fromtimestamp(event["timestamp"] / 1000.0, tz=timezone.utc)
-        formatted_event_dt = event_dt.strftime("%Y-%m-%d %H:%M:%S,%f")[:-3]
-        message = event["message"]
-        return f"[{formatted_event_dt}] {message}"
+        messages, logs = self.io.read(stream_name, task_instance)
+        return messages, logs or []

airflow/providers/amazon/aws/log/s3_task_handler.py

@@ -24,6 +24,8 @@ import shutil
 from functools import cached_property
 from typing import TYPE_CHECKING
 
+import attrs
+
 from airflow.configuration import conf
 from airflow.providers.amazon.aws.hooks.s3 import S3Hook
 from airflow.providers.amazon.version_compat import AIRFLOW_V_3_0_PLUS
@@ -32,28 +34,34 @@ from airflow.utils.log.logging_mixin import LoggingMixin
 
 if TYPE_CHECKING:
     from airflow.models.taskinstance import TaskInstance
+    from airflow.sdk.types import RuntimeTaskInstanceProtocol as RuntimeTI
+    from airflow.utils.log.file_task_handler import LogMessages, LogSourceInfo
 
 
-class S3TaskHandler(FileTaskHandler, LoggingMixin):
-    """
-    S3TaskHandler is a python log handler that handles and reads task instance logs.
+@attrs.define
+class S3RemoteLogIO(LoggingMixin):  # noqa: D101
+    remote_base: str
+    base_log_folder: pathlib.Path = attrs.field(converter=pathlib.Path)
+    delete_local_copy: bool
 
-    It extends airflow FileTaskHandler and uploads to and reads from S3 remote storage.
-    """
+    processors = ()
 
-    trigger_should_wrap = True
+    def upload(self, path: os.PathLike | str, ti: RuntimeTI):
+        """Upload the given log path to the remote storage."""
+        path = pathlib.Path(path)
+        if path.is_absolute():
+            local_loc = path
+            remote_loc = os.path.join(self.remote_base, path.relative_to(self.base_log_folder))
+        else:
+            local_loc = self.base_log_folder.joinpath(path)
+            remote_loc = os.path.join(self.remote_base, path)
 
-    def __init__(self, base_log_folder: str, s3_log_folder: str, **kwargs):
-        super().__init__(base_log_folder)
-        self.handler: logging.FileHandler | None = None
-        self.remote_base = s3_log_folder
-        self.log_relative_path = ""
-        self._hook = None
-        self.closed = False
-        self.upload_on_close = True
-        self.delete_local_copy = kwargs.get(
-            "delete_local_copy", conf.getboolean("logging", "delete_local_logs")
-        )
+        if local_loc.is_file():
+            # read log and remove old logs to get just the latest additions
+            log = local_loc.read_text()
+            has_uploaded = self.write(log, remote_loc)
+            if has_uploaded and self.delete_local_copy:
+                shutil.rmtree(os.path.dirname(local_loc))
 
     @cached_property
     def hook(self):
@@ -63,73 +71,6 @@ class S3TaskHandler(FileTaskHandler, LoggingMixin):
             transfer_config_args={"use_threads": False},
         )
 
-    def set_context(self, ti: TaskInstance, *, identifier: str | None = None) -> None:
-        super().set_context(ti, identifier=identifier)
-        # Local location and remote location is needed to open and
-        # upload local log file to S3 remote storage.
-        if TYPE_CHECKING:
-            assert self.handler is not None
-
-        full_path = self.handler.baseFilename
-        self.log_relative_path = pathlib.Path(full_path).relative_to(self.local_base).as_posix()
-        is_trigger_log_context = getattr(ti, "is_trigger_log_context", False)
-        self.upload_on_close = is_trigger_log_context or not getattr(ti, "raw", None)
-        # Clear the file first so that duplicate data is not uploaded
-        # when reusing the same path (e.g. with rescheduled sensors)
-        if self.upload_on_close:
-            with open(self.handler.baseFilename, "w"):
-                pass
-
-    def close(self):
-        """Close and upload local log file to remote storage S3."""
-        # When application exit, system shuts down all handlers by
-        # calling close method. Here we check if logger is already
-        # closed to prevent uploading the log to remote storage multiple
-        # times when `logging.shutdown` is called.
-        if self.closed:
-            return
-
-        super().close()
-
-        if not self.upload_on_close:
-            return
-
-        local_loc = os.path.join(self.local_base, self.log_relative_path)
-        remote_loc = os.path.join(self.remote_base, self.log_relative_path)
-        if os.path.exists(local_loc):
-            # read log and remove old logs to get just the latest additions
-            log = pathlib.Path(local_loc).read_text()
-            write_to_s3 = self.s3_write(log, remote_loc)
-            if write_to_s3 and self.delete_local_copy:
-                shutil.rmtree(os.path.dirname(local_loc))
-
-        # Mark closed so we don't double write if close is called twice
-        self.closed = True
-
-    def _read_remote_logs(self, ti, try_number, metadata=None) -> tuple[list[str], list[str]]:
-        # Explicitly getting log relative path is necessary as the given
-        # task instance might be different than task instance passed in
-        # in set_context method.
-        worker_log_rel_path = self._render_filename(ti, try_number)
-
-        logs = []
-        messages = []
-        bucket, prefix = self.hook.parse_s3_url(s3url=os.path.join(self.remote_base, worker_log_rel_path))
-        keys = self.hook.list_keys(bucket_name=bucket, prefix=prefix)
-        if keys:
-            keys = sorted(f"s3://{bucket}/{key}" for key in keys)
-            if AIRFLOW_V_3_0_PLUS:
-                messages = keys
-            else:
-                messages.append("Found logs in s3:")
-                messages.extend(f"  * {key}" for key in keys)
-            for key in keys:
-                logs.append(self.s3_read(key, return_error=True))
-        else:
-            if not AIRFLOW_V_3_0_PLUS:
-                messages.append(f"No logs found on s3 for ti={ti}")
-        return messages, logs
-
     def s3_log_exists(self, remote_log_location: str) -> bool:
         """
         Check if remote_log_location exists in remote storage.
@@ -158,7 +99,7 @@ class S3TaskHandler(FileTaskHandler, LoggingMixin):
                 return msg
         return ""
 
-    def s3_write(
+    def write(
         self,
         log: str,
         remote_log_location: str,
@@ -168,7 +109,7 @@ class S3TaskHandler(FileTaskHandler, LoggingMixin):
         """
         Write the log to the remote_log_location; return `True` or fails silently and return `False`.
 
-        :param log: the log to write to the remote_log_location
+        :param log: the contents to write to the remote_log_location
         :param remote_log_location: the log's location in remote storage
         :param append: if False, any existing log file is overwritten. If True,
             the new log is appended to any existing logs.
@@ -205,3 +146,99 @@ class S3TaskHandler(FileTaskHandler, LoggingMixin):
                     self.log.exception("Could not write logs to %s", remote_log_location)
                     return False
         return True
+
+    def read(self, relative_path: str, ti: RuntimeTI) -> tuple[LogSourceInfo, LogMessages | None]:
+        logs: list[str] = []
+        messages = []
+        bucket, prefix = self.hook.parse_s3_url(s3url=os.path.join(self.remote_base, relative_path))
+        keys = self.hook.list_keys(bucket_name=bucket, prefix=prefix)
+        if keys:
+            keys = sorted(f"s3://{bucket}/{key}" for key in keys)
+            if AIRFLOW_V_3_0_PLUS:
+                messages = keys
+            else:
+                messages.append("Found logs in s3:")
+                messages.extend(f"  * {key}" for key in keys)
+            for key in keys:
+                logs.append(self.s3_read(key, return_error=True))
+            return messages, logs
+        else:
+            return messages, None
+
+
+class S3TaskHandler(FileTaskHandler, LoggingMixin):
+    """
+    S3TaskHandler is a python log handler that handles and reads task instance logs.
+
+    It extends airflow FileTaskHandler and uploads to and reads from S3 remote storage.
+    """
+
+    def __init__(self, base_log_folder: str, s3_log_folder: str, **kwargs):
+        super().__init__(base_log_folder)
+        self.handler: logging.FileHandler | None = None
+        self.remote_base = s3_log_folder
+        self.log_relative_path = ""
+        self._hook = None
+        self.closed = False
+        self.upload_on_close = True
+        self.io = S3RemoteLogIO(
+            remote_base=s3_log_folder,
+            base_log_folder=base_log_folder,
+            delete_local_copy=kwargs.get(
+                "delete_local_copy", conf.getboolean("logging", "delete_local_logs")
+            ),
+        )
+
+    def set_context(self, ti: TaskInstance, *, identifier: str | None = None) -> None:
+        super().set_context(ti, identifier=identifier)
+        # Local location and remote location is needed to open and
+        # upload local log file to S3 remote storage.
+        if TYPE_CHECKING:
+            assert self.handler is not None
+
+        self.ti = ti
+
+        full_path = self.handler.baseFilename
+        self.log_relative_path = pathlib.Path(full_path).relative_to(self.local_base).as_posix()
+        is_trigger_log_context = getattr(ti, "is_trigger_log_context", False)
+        self.upload_on_close = is_trigger_log_context or not getattr(ti, "raw", None)
+        # Clear the file first so that duplicate data is not uploaded
+        # when reusing the same path (e.g. with rescheduled sensors)
+        if self.upload_on_close:
+            with open(self.handler.baseFilename, "w"):
+                pass
+
+    def close(self):
+        """Close and upload local log file to remote storage S3."""
+        # When application exit, system shuts down all handlers by
+        # calling close method. Here we check if logger is already
+        # closed to prevent uploading the log to remote storage multiple
+        # times when `logging.shutdown` is called.
+        if self.closed:
+            return
+
+        super().close()
+
+        if not self.upload_on_close:
+            return
+
+        if hasattr(self, "ti"):
+            self.io.upload(self.log_relative_path, self.ti)
+
+        # Mark closed so we don't double write if close is called twice
+        self.closed = True
+
+    def _read_remote_logs(self, ti, try_number, metadata=None) -> tuple[LogSourceInfo, LogMessages]:
+        # Explicitly getting log relative path is necessary as the given
+        # task instance might be different than task instance passed in
+        # in set_context method.
+        worker_log_rel_path = self._render_filename(ti, try_number)
+
+        messages, logs = self.io.read(worker_log_rel_path, ti)
+
+        if logs is None:
+            logs = []
+            if not AIRFLOW_V_3_0_PLUS:
+                messages.append(f"No logs found on s3 for ti={ti}")
+
+        return messages, logs

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

@@ -254,7 +254,7 @@ class EC2CreateInstanceOperator(AwsBaseOperator[EC2Hook]):
                 region_name=self.region_name,
                 api_type="client_type",
             ) """
-            self.hook.terminate_instances(InstanceIds=instance_ids)
+            self.hook.terminate_instances(instance_ids=instance_ids)
         super().on_kill()
 
 

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

@@ -338,7 +338,7 @@ class EksCreateClusterOperator(BaseOperator):
             fargate_pod_execution_role_arn=self.fargate_pod_execution_role_arn,
             fargate_selectors=self.fargate_selectors,
             create_fargate_profile_kwargs=self.create_fargate_profile_kwargs,
-            subnets=cast(list[str], self.resources_vpc_config.get("subnetIds")),
+            subnets=cast("list[str]", self.resources_vpc_config.get("subnetIds")),
         )
 
     def deferrable_create_cluster_next(self, context: Context, event: dict[str, Any] | None = None) -> None:
@@ -377,7 +377,7 @@ class EksCreateClusterOperator(BaseOperator):
                 fargate_pod_execution_role_arn=self.fargate_pod_execution_role_arn,
                 fargate_selectors=self.fargate_selectors,
                 create_fargate_profile_kwargs=self.create_fargate_profile_kwargs,
-                subnets=cast(list[str], self.resources_vpc_config.get("subnetIds")),
+                subnets=cast("list[str]", self.resources_vpc_config.get("subnetIds")),
             )
             if self.compute == "fargate":
                 self.defer(
@@ -503,7 +503,7 @@ class EksCreateNodegroupOperator(BaseOperator):
             nodegroup_subnets_list: list[str] = []
             if self.nodegroup_subnets != "":
                 try:
-                    nodegroup_subnets_list = cast(list, literal_eval(self.nodegroup_subnets))
+                    nodegroup_subnets_list = cast("list", literal_eval(self.nodegroup_subnets))
                 except ValueError:
                     self.log.warning(
                         "The nodegroup_subnets should be List or string representing "

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

@@ -755,11 +755,18 @@ class RedshiftDeleteClusterOperator(BaseOperator):
                     final_cluster_snapshot_identifier=self.final_cluster_snapshot_identifier,
                 )
                 break
-            except self.redshift_hook.get_conn().exceptions.InvalidClusterStateFault:
+            except self.redshift_hook.conn.exceptions.InvalidClusterStateFault:
                 self._attempts -= 1
 
                 if self._attempts:
-                    self.log.error("Unable to delete cluster. %d attempts remaining.", self._attempts)
+                    current_state = self.redshift_hook.conn.describe_clusters(
+                        ClusterIdentifier=self.cluster_identifier
+                    )["Clusters"][0]["ClusterStatus"]
+                    self.log.error(
+                        "Cluster in %s state, unable to delete. %d attempts remaining.",
+                        current_state,
+                        self._attempts,
+                    )
                     time.sleep(self._attempt_interval)
                 else:
                     raise
@@ -785,7 +792,7 @@ class RedshiftDeleteClusterOperator(BaseOperator):
                 )
 
         elif self.wait_for_completion:
-            waiter = self.redshift_hook.get_conn().get_waiter("cluster_deleted")
+            waiter = self.redshift_hook.conn.get_waiter("cluster_deleted")
             waiter.wait(
                 ClusterIdentifier=self.cluster_identifier,
                 WaiterConfig={"Delay": self.poll_interval, "MaxAttempts": self.max_attempts},

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

@@ -170,7 +170,7 @@ class SageMakerBaseOperator(BaseOperator):
                 timestamp = str(
                     time.time_ns() // 1000000000
                 )  # only keep the relevant datetime (first 10 digits)
-                name = f"{proposed_name[:max_name_len - len(timestamp) - 1]}-{timestamp}"  # we subtract one to make provision for the dash between the truncated name and timestamp
+                name = f"{proposed_name[: max_name_len - len(timestamp) - 1]}-{timestamp}"  # we subtract one to make provision for the dash between the truncated name and timestamp
                 self.log.info("Changed %s name to '%s' to avoid collision.", resource_type, name)
         return name
 
@@ -178,8 +178,7 @@ class SageMakerBaseOperator(BaseOperator):
         """Raise exception if resource type is not 'model' or 'job'."""
         if resource_type not in ("model", "job"):
             raise AirflowException(
-                "Argument resource_type accepts only 'model' and 'job'. "
-                f"Provided value: '{resource_type}'."
+                f"Argument resource_type accepts only 'model' and 'job'. Provided value: '{resource_type}'."
             )
 
     def _check_if_job_exists(self, job_name: str, describe_func: Callable[[str], Any]) -> bool:
@@ -559,8 +558,7 @@ class SageMakerEndpointOperator(SageMakerBaseOperator):
                 self.operation = "update"
                 sagemaker_operation = self.hook.update_endpoint
                 self.log.warning(
-                    "cannot create already existing endpoint %s, "
-                    "updating it with the given config instead",
+                    "cannot create already existing endpoint %s, updating it with the given config instead",
                     endpoint_info["EndpointName"],
                 )
                 if "Tags" in endpoint_info:

airflow/providers/amazon/aws/sensors/glacier.py

@@ -95,5 +95,5 @@ class GlacierJobOperationSensor(AwsBaseSensor[GlacierHook]):
             return False
         else:
             raise AirflowException(
-                f'Sensor failed. Job status: {response["Action"]}, code status: {response["StatusCode"]}'
+                f"Sensor failed. Job status: {response['Action']}, code status: {response['StatusCode']}"
             )

airflow/providers/amazon/aws/sensors/mwaa.py

@@ -150,7 +150,8 @@ class MwaaDagRunSensor(AwsBaseSensor[MwaaHook]):
                     external_dag_run_id=self.external_dag_run_id,
                     success_states=self.success_states,
                     failure_states=self.failure_states,
-                    waiter_delay=self.poke_interval,
+                    # somehow the type of poke_interval is derived as float ??
+                    waiter_delay=self.poke_interval,  # type: ignore[arg-type]
                     waiter_max_attempts=self.max_retries,
                     aws_conn_id=self.aws_conn_id,
                 ),

airflow/providers/amazon/aws/sensors/s3.py

@@ -192,7 +192,7 @@ class S3KeySensor(AwsBaseSensor[S3Hook]):
         self.defer(
             timeout=timedelta(seconds=self.timeout),
             trigger=S3KeyTrigger(
-                bucket_name=cast(str, self.bucket_name),
+                bucket_name=cast("str", self.bucket_name),
                 bucket_key=self.bucket_key,
                 wildcard_match=self.wildcard_match,
                 aws_conn_id=self.aws_conn_id,

airflow/providers/amazon/aws/sensors/step_function.py

@@ -81,5 +81,6 @@ class StepFunctionExecutionSensor(AwsBaseSensor[StepFunctionHook]):
             return False
 
         self.log.info("Doing xcom_push of output")
-        self.xcom_push(context, "output", output)
+
+        context["ti"].xcom_push(key="output", value=output)
         return True

airflow/providers/amazon/aws/transfers/mongo_to_s3.py

@@ -103,7 +103,7 @@ class MongoToS3Operator(BaseOperator):
         if self.is_pipeline:
             results: CommandCursor[Any] | Cursor = MongoHook(self.mongo_conn_id).aggregate(
                 mongo_collection=self.mongo_collection,
-                aggregate_query=cast(list, self.mongo_query),
+                aggregate_query=cast("list", self.mongo_query),
                 mongo_db=self.mongo_db,
                 allowDiskUse=self.allow_disk_use,
             )
@@ -111,7 +111,7 @@ class MongoToS3Operator(BaseOperator):
         else:
             results = MongoHook(self.mongo_conn_id).find(
                 mongo_collection=self.mongo_collection,
-                query=cast(dict, self.mongo_query),
+                query=cast("dict", self.mongo_query),
                 projection=self.mongo_projection,
                 mongo_db=self.mongo_db,
                 find_one=False,

airflow/providers/amazon/aws/transfers/sql_to_s3.py

@@ -223,7 +223,7 @@ class SqlToS3Operator(BaseOperator):
             return
         for group_label in (grouped_df := df.groupby(**self.groupby_kwargs)).groups:
             yield (
-                cast(str, group_label),
+                cast("str", group_label),
                 grouped_df.get_group(group_label)
                 .drop(random_column_name, axis=1, errors="ignore")
                 .reset_index(drop=True),

airflow/providers/amazon/get_provider_info.py

@@ -27,7 +27,7 @@ def get_provider_info():
         "name": "Amazon",
         "description": "Amazon integration (including `Amazon Web Services (AWS) <https://aws.amazon.com/>`__).\n",
         "state": "ready",
-        "source-date-epoch": 1741507721,
+        "source-date-epoch": 1743477760,
         "versions": [
             "9.5.0",
             "9.4.0",
@@ -1410,7 +1410,7 @@ def get_provider_info():
         "devel-dependencies": [
             "aiobotocore>=2.13.0",
             "aws_xray_sdk>=2.12.0",
-            "moto[cloudformation,glue]>=5.0.0",
+            "moto[cloudformation,glue]>=5.1.2",
             "mypy-boto3-appflow>=1.37.0",
             "mypy-boto3-rds>=1.34.90",
             "mypy-boto3-redshift-data>=1.34.0",

{apache_airflow_providers_amazon-9.5.0rc2.dist-info → apache_airflow_providers_amazon-9.5.0rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-amazon
-Version: 9.5.0rc2
+Version: 9.5.0rc3
 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>

{apache_airflow_providers_amazon-9.5.0rc2.dist-info → apache_airflow_providers_amazon-9.5.0rc3.dist-info}/RECORD

@@ -1,13 +1,13 @@
 airflow/providers/amazon/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
 airflow/providers/amazon/__init__.py,sha256=0Bdu1NsCgEgYJqjhW6Wg0pguEwSl-uixdiXZ8wFdE8E,1493
-airflow/providers/amazon/get_provider_info.py,sha256=_iDYbqjwP6HgoGZWSu1EfvVamsLUSghhx2b17aRFNfI,72553
+airflow/providers/amazon/get_provider_info.py,sha256=MMpHbbxpCZ5syMfj84qPtJw_SkXDFjBgnQw6PuuZyN8,72553
 airflow/providers/amazon/version_compat.py,sha256=aHg90_DtgoSnQvILFICexMyNlHlALBdaeWqkX3dFDug,1605
 airflow/providers/amazon/aws/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/amazon/aws/exceptions.py,sha256=uRGNMgXvgdzfphpOTiyj74lQhjzb70J-X8n6fsx5Jog,1864
 airflow/providers/amazon/aws/assets/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/amazon/aws/assets/s3.py,sha256=wNaJiOM90-SCauD4EQneZVXMO54yDRjLPfI8D5o0-fw,1861
 airflow/providers/amazon/aws/auth_manager/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/amazon/aws/auth_manager/aws_auth_manager.py,sha256=V3u5ASC45b6_PkP8fReUVPo2SANI948ShyyYNelVhtk,15082
+airflow/providers/amazon/aws/auth_manager/aws_auth_manager.py,sha256=FJMhIhoyFAxrwHKCWD-ZfoJK7TV85Geus7GMiYPnZ00,15046
 airflow/providers/amazon/aws/auth_manager/constants.py,sha256=Jdluo42InhyNGkYHB_dRtoFMpKanJLJdH0hyR9-5AZg,1050
 airflow/providers/amazon/aws/auth_manager/user.py,sha256=zds3U6gHmwAy1MuxFFPtGTYikMj-RjYVki9-TSdfnbg,2043
 airflow/providers/amazon/aws/auth_manager/avp/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
@@ -18,7 +18,7 @@ airflow/providers/amazon/aws/auth_manager/cli/__init__.py,sha256=9hdXHABrVpkbpjZ
 airflow/providers/amazon/aws/auth_manager/cli/avp_commands.py,sha256=RJRwOnsQnYNB1s-AJuCpfEiKNZapGYPlE7PBLp_DLdA,5477
 airflow/providers/amazon/aws/auth_manager/cli/definition.py,sha256=5Uc5IuEwKnVPtrqoh_hVOPkd2iel002TdJRnchgivXo,2414
 airflow/providers/amazon/aws/auth_manager/router/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/amazon/aws/auth_manager/router/login.py,sha256=ig3XjgpVX2dY6l4PWuUQmMEjqIYIiBDKUkhQ5kA14CQ,5222
+airflow/providers/amazon/aws/auth_manager/router/login.py,sha256=wco9S4OTdMD6EKBN3-rdkgUMBuLcU_C84oJ97OYxhQI,5273
 airflow/providers/amazon/aws/executors/Dockerfile,sha256=VZ-YOR59KSMoztJV_g7v5hUwetKR0Ii4wNNaKqDIfyQ,4275
 airflow/providers/amazon/aws/executors/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/amazon/aws/executors/batch/__init__.py,sha256=TPSNZJ6E3zqN7mvdrMrarqwHeFYN9Efd2jD3hpN7tr0,970
@@ -28,7 +28,7 @@ airflow/providers/amazon/aws/executors/batch/boto_schema.py,sha256=Rqr_uk6Tx6hNV
 airflow/providers/amazon/aws/executors/batch/utils.py,sha256=QXaKyrUMCYr_Oz7Hq5b7A-gppP61fQtaOX7wip1J7ho,5274
 airflow/providers/amazon/aws/executors/ecs/__init__.py,sha256=J_B7TIPPQmn67Y7kzr4pgzcpFRr0wUp6gVsyfz5GKc4,962
 airflow/providers/amazon/aws/executors/ecs/boto_schema.py,sha256=c_2BJu6pC9xjRuPfufqSMYPZVDAbma0JO71JKSBRMSg,3760
-airflow/providers/amazon/aws/executors/ecs/ecs_executor.py,sha256=5N2PwqXrg3YfezJtjQDJbcc94PGxk61ohYTNuuFOn-k,25029
+airflow/providers/amazon/aws/executors/ecs/ecs_executor.py,sha256=Pl_Lj6RBSadEZPiuvIysy4HSJ3oralVHSCaef_xbUm8,25029
 airflow/providers/amazon/aws/executors/ecs/ecs_executor_config.py,sha256=pJwaSJLzsflJxlB-5pveRSzXS1O8ua9Tq7_P63RrQ9I,6003
 airflow/providers/amazon/aws/executors/ecs/utils.py,sha256=wI5dVjQsqgCxq0zOnpXX1ODDG8UW52RTSfSJO3Szaqc,9761
 airflow/providers/amazon/aws/executors/utils/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
@@ -39,17 +39,17 @@ airflow/providers/amazon/aws/fs/s3.py,sha256=dHUcbZ_uJzy0v8G5lDtUHJ-905tXdU9wRwl
 airflow/providers/amazon/aws/hooks/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/amazon/aws/hooks/appflow.py,sha256=-le6RsIMWIqTav7KGknsph9Td42znSm_eIYztxc_RsE,5263
 airflow/providers/amazon/aws/hooks/athena.py,sha256=Ad_HoITQCQdoF0EzG3U0Pl4T8nhyKmesHov74ZcMIyo,13465
-airflow/providers/amazon/aws/hooks/athena_sql.py,sha256=vFIUbMMTem3xvYAUTvW3h1ypjpKVLNck3VbrAlupVLA,6844
+airflow/providers/amazon/aws/hooks/athena_sql.py,sha256=q0LJE4RvBgHGtTx_YkxcPZ8VFoLYDsHQnWJEbVOwEus,6844
 airflow/providers/amazon/aws/hooks/base_aws.py,sha256=ZQ2yNDWv0SEpB_6oFlyCPFU2k6Y_EzfGBwpBUUrDErE,45504
-airflow/providers/amazon/aws/hooks/batch_client.py,sha256=uiYog6GsEyr958OJV-xY51gxcSqpD_MELhVLpjxHTaM,21636
+airflow/providers/amazon/aws/hooks/batch_client.py,sha256=aenPmoiqQcaj0IWL_1RMAbBw5Ku5mon-EwJC-3vpZ48,21616
 airflow/providers/amazon/aws/hooks/batch_waiters.json,sha256=eoN5YDgeTNZ2Xz17TrbKBPhd7z9-6KD3RhaDKXXOvqU,2511
-airflow/providers/amazon/aws/hooks/batch_waiters.py,sha256=VlAf3NYyGsfmOw9S4Ods8VKua3mBWSLHEAr8hHCHdmY,10579
+airflow/providers/amazon/aws/hooks/batch_waiters.py,sha256=93NNCtiTWCOwNRnVJudyuzrZ1EJWp2TRpV5drQjqvMQ,10954
 airflow/providers/amazon/aws/hooks/bedrock.py,sha256=TZHEBOcDyeGSx-QLL8LydiytHEMdUETji_4emJfv4Ng,3343
 airflow/providers/amazon/aws/hooks/chime.py,sha256=XYI3YM5zQP7ogr13WVBKk84762TwJmujFTr4_5ppos8,4406
 airflow/providers/amazon/aws/hooks/cloud_formation.py,sha256=7UVGmlmrT8q8rPcEfgPURZ_n-Sd1qNVHGERAi39iqIs,3436
 airflow/providers/amazon/aws/hooks/comprehend.py,sha256=Xggr7GCReowgTAVWNXboFSGmT4r5YpMBauZVZfUWIzg,2734
 airflow/providers/amazon/aws/hooks/datasync.py,sha256=WhN1YHW0oigOpgwQqvEvzQMqW1gbRfL8-iXWZzH_bEw,13620
-airflow/providers/amazon/aws/hooks/dms.py,sha256=Ki7Ol-BbPyW4q35sJlyycuWRL8gBrPhuhvYgX_AwF94,14384
+airflow/providers/amazon/aws/hooks/dms.py,sha256=5-V65iz8iOONb5TCLpQ5Rkge1TXBsj0BHdAH6qGo6ag,14420
 airflow/providers/amazon/aws/hooks/dynamodb.py,sha256=GpOCcNAzCsyiWXNHpmumd5XmLgUvU3GFZncKc7P-ePk,4019
 airflow/providers/amazon/aws/hooks/ec2.py,sha256=zFNv0gRkhC1zimyr9sSo6lGZoXz2chC2p7AA9p8lgHI,8100
 airflow/providers/amazon/aws/hooks/ecr.py,sha256=vTPUVCEz1x2DHA6-N0bbOcRXxP8JblXq_r0II5wtDyE,4015
@@ -72,11 +72,11 @@ airflow/providers/amazon/aws/hooks/neptune.py,sha256=a3r26msR8U5oCTMHQYqA-2OspVO
 airflow/providers/amazon/aws/hooks/opensearch_serverless.py,sha256=0zFRXXjlbQRCTt5D_q1FCp965FC8LyOhMRk2x6nvsIc,1543
 airflow/providers/amazon/aws/hooks/quicksight.py,sha256=2Am_K-BcoqcfuWwLbWjW1LsbZpGskK2bV-uHT2diu1o,7347
 airflow/providers/amazon/aws/hooks/rds.py,sha256=h7NF3GZ42RKeh70rlg2BQFVpa8vNadS37slj0MsAT3w,15211
-airflow/providers/amazon/aws/hooks/redshift_cluster.py,sha256=5hb3XU4f4QmbBe-RjnPVGbebCzgjIFnVXqdE-s7eL3M,8016
-airflow/providers/amazon/aws/hooks/redshift_data.py,sha256=DSa8iAkSWbPFnMEKZZQ_J_PPowVw97j5QHoVIlwJwqM,11863
+airflow/providers/amazon/aws/hooks/redshift_cluster.py,sha256=hyX_ldjn_gNOehcPV-3M3wzO1HdIdujG8JjrUZmCnNg,7962
+airflow/providers/amazon/aws/hooks/redshift_data.py,sha256=JBNmWA4QfRJeJ8WJAg8K6yzFmgg6aYWP_XaDzsJZPe4,11843
 airflow/providers/amazon/aws/hooks/redshift_sql.py,sha256=qwUHb0kxc_PUTfulCx_uWlKesCMpgAaTQ-3k80NYDfU,11178
 airflow/providers/amazon/aws/hooks/s3.py,sha256=SOeVux_NlGwUU7iKt8GWlVDumqJNyBbHiw4QQzpESW8,61891
-airflow/providers/amazon/aws/hooks/sagemaker.py,sha256=tSVuNHbwMLI_bpbnWV_2p6-XAtqcfl4M0TitQzCKhNk,60500
+airflow/providers/amazon/aws/hooks/sagemaker.py,sha256=zaMPwCSkfaFbIO19-u3vSLVpAvw7g7eKUn81oUhWuIc,60502
 airflow/providers/amazon/aws/hooks/sagemaker_unified_studio.py,sha256=a8nuZFp7CNjgKgGP3IsWpPGnkHEjAWCyNE55WvxmNEw,8002
 airflow/providers/amazon/aws/hooks/secrets_manager.py,sha256=6srh3jUeSGoqyrSj1M6aSOaA9xT5kna0VGUC0kzH-q0,2690
 airflow/providers/amazon/aws/hooks/ses.py,sha256=DuCJwFhtg3D3mu0RSjRrebyUpwBAhrWSr-kdu8VR9qU,4174
@@ -87,7 +87,7 @@ airflow/providers/amazon/aws/hooks/step_function.py,sha256=TSmPPF-CFR76a-K9f2yGt
 airflow/providers/amazon/aws/hooks/sts.py,sha256=6KYyou-tOhbGhRfnGHH95TUi3ENNHkISUJf0nskmuiw,1827
 airflow/providers/amazon/aws/hooks/verified_permissions.py,sha256=-5vLcpBX_V43tY37a5PpeC60DIUAa2AXBe3sSxpqlGY,1799
 airflow/providers/amazon/aws/links/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/amazon/aws/links/athena.py,sha256=bf__mn0W1H0x1EVJBFevf-ap1GDpuiVDuhw4mnEkr9k,1235
+airflow/providers/amazon/aws/links/athena.py,sha256=3fEukB9R59pm_lXKHMTCVG4dPaOmllJ-v-Ri3KDGlc0,1224
 airflow/providers/amazon/aws/links/base_aws.py,sha256=bYhgMtBxGRq0QwaaVndceCOdxCJep56X1FVb7QuXQLw,3372
 airflow/providers/amazon/aws/links/batch.py,sha256=-bnVCTEjgXrLOxvdz2mwmG0wIVAIzlaqvKMq0dJyxqM,1770
 airflow/providers/amazon/aws/links/comprehend.py,sha256=59PtBlRkzXE4B2jbGZ3ip-WEFRStlMkXyWNPFxnTu-M,1636
@@ -100,8 +100,8 @@ airflow/providers/amazon/aws/links/sagemaker.py,sha256=RTQubIIpmjTWEGrJiRI2MyF4C
 airflow/providers/amazon/aws/links/sagemaker_unified_studio.py,sha256=pHbO14OmkqqjrjnZpt2tO3LISdBbitd9E00DV3ucfTI,1202
 airflow/providers/amazon/aws/links/step_function.py,sha256=xSL4vfKLnCn-QboRtruajpH5elRrNfw0XkY7eSfPpE4,2099
 airflow/providers/amazon/aws/log/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/amazon/aws/log/cloudwatch_task_handler.py,sha256=11iFc08HE6bvLWsGCTi0RoiYsSziEXWFEjvCwDJ4liw,6806
-airflow/providers/amazon/aws/log/s3_task_handler.py,sha256=oBBmgQrrpE52EBVxDthon1sDk7_vWbS0BjJ0R1_n3Gc,8501
+airflow/providers/amazon/aws/log/cloudwatch_task_handler.py,sha256=3Fr-brr4KAHUsXvuQog8OiKRH-FBs1MAT24AF6pDaqI,11184
+airflow/providers/amazon/aws/log/s3_task_handler.py,sha256=olDxljlgMuEux_4Mr8WQSQKcMcV_OmURm0hWDDDn5Bc,9666
 airflow/providers/amazon/aws/notifications/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/amazon/aws/notifications/chime.py,sha256=bpaQtR5IG4ZlBmTdlfrHOZQo4WSQYs_HRm4DWDCkFWE,2127
 airflow/providers/amazon/aws/notifications/sns.py,sha256=XracHC3r3BxzUuv-DzFLy6l7K6R_Ps85oJIUS0-Lkt4,3116
@@ -116,9 +116,9 @@ airflow/providers/amazon/aws/operators/cloud_formation.py,sha256=8apqdOR9KpAvtep
 airflow/providers/amazon/aws/operators/comprehend.py,sha256=5eQEJSoOQKcwVPa8Qmp7_VX4-uBsBLziJi35iAg029U,17695
 airflow/providers/amazon/aws/operators/datasync.py,sha256=mpq3-JcF7tqEm3BpwnEd3qemvTVVyWyq40DUaHrpne8,20321
 airflow/providers/amazon/aws/operators/dms.py,sha256=20xp5mn5AM-aNPIQZdsMU6x-16so8o6vKR-JKS6co3o,34746
-airflow/providers/amazon/aws/operators/ec2.py,sha256=mq16s2CJaPpnYWhjNhRK-uAnIYYqy6eeJBB8JOryP-M,19699
+airflow/providers/amazon/aws/operators/ec2.py,sha256=SclBzOLo3GbQe3kw4S3MKf8zLm8IaKNSiGTc_U-OxRo,19700
 airflow/providers/amazon/aws/operators/ecs.py,sha256=wsIpsPkacYIwE-ZUfgZ0fHOso7-RkUpYecxIEOC-Fxw,33277
-airflow/providers/amazon/aws/operators/eks.py,sha256=0NuCVQZNX3D7Ooco_vLGACniJGld-aueUloyCjUsTuc,49218
+airflow/providers/amazon/aws/operators/eks.py,sha256=RzUiiPjyTbV50nfTth4JViglBxMNzqEjuw0PN64AXPA,49224
 airflow/providers/amazon/aws/operators/emr.py,sha256=MtfAOg2WqCiJskkClPkHBBDWIE-3h4FVjOej7t6x3CE,73205
 airflow/providers/amazon/aws/operators/eventbridge.py,sha256=NacTdvRzZZFizSzC3rb0Z7g8dHQWkKQEXGYzFKOp3fc,10421
 airflow/providers/amazon/aws/operators/glacier.py,sha256=6TFC07B0EOmtRxLs7Bok4jwV84po2yVDa-DnlbnAOVg,3681
@@ -131,10 +131,10 @@ airflow/providers/amazon/aws/operators/mwaa.py,sha256=zVJREj9n5kSeY6GkltEAMzILZ5
 airflow/providers/amazon/aws/operators/neptune.py,sha256=3OzRFinRJahs1G3GZfez9cifYvmIEa5hYVDNzRGApxk,14778
 airflow/providers/amazon/aws/operators/quicksight.py,sha256=LNZRW8N4yIXLUgVb0vmJekjG1NFS70yGyeKtinNATMk,4116
 airflow/providers/amazon/aws/operators/rds.py,sha256=ziuipADQzY7JyDHR5-O8YfATyw1rYD-65iezJoPDji4,38583
-airflow/providers/amazon/aws/operators/redshift_cluster.py,sha256=h02aYZ-XxYJIGScYLCsETu6g3BzQQcHhZyOF3MEQ9to,36858
+airflow/providers/amazon/aws/operators/redshift_cluster.py,sha256=dXakMyZV5vvEh0-20FOolMU5xEDugnMrvwwbLvuYc3o,37168
 airflow/providers/amazon/aws/operators/redshift_data.py,sha256=atZty5-rEk-GyhTqyQlwGnW9LznPQ65y_IAYCt3Kyuo,10872
 airflow/providers/amazon/aws/operators/s3.py,sha256=0lhbwRF4RQgKUag6w6Q_kKLeZIrsl8A1p9IOsOxtgoQ,38493
-airflow/providers/amazon/aws/operators/sagemaker.py,sha256=Gj04hUbF_gZLKf5wTtqSG64V4sxqQVNJnazYQa_mw8E,83772
+airflow/providers/amazon/aws/operators/sagemaker.py,sha256=uC3t4UIoGMbD0owdqYkxEetdxJ2lyf1o7CqkiaGAN6c,83731
 airflow/providers/amazon/aws/operators/sagemaker_unified_studio.py,sha256=J-huObn3pZ_fg0gEy-BLsX298CX_n7qWV2YwjfpFnrw,6867
 airflow/providers/amazon/aws/operators/sns.py,sha256=uVcSJBbqy7YCOeiCrMvFFn9F9xTzMRpfrEygqEIhWEM,3757
 airflow/providers/amazon/aws/operators/sqs.py,sha256=o9rH2Pm5DNmccLh5I2wr96hZiuxOPi6YGZ2QluOeVb0,4764
@@ -155,22 +155,22 @@ airflow/providers/amazon/aws/sensors/ec2.py,sha256=wsCf7g1vvIgcVGzj17mgd_4XIttYF
 airflow/providers/amazon/aws/sensors/ecs.py,sha256=0O7N9x5SJNYHdcuQP1QnNJWdZ_-cX7j0ntwnLcFztE4,6863
 airflow/providers/amazon/aws/sensors/eks.py,sha256=beq1AcFgLwI-DfBsvFTbDExrM58cbL-ibjB_8DW-UG8,9658
 airflow/providers/amazon/aws/sensors/emr.py,sha256=4F9x2eRFdlQ3Whucy_3Gjyx_q1Hdfj0yDVnAJgr7kG8,24752
-airflow/providers/amazon/aws/sensors/glacier.py,sha256=yJBWQzY9QwjeCJGfnSd4KcaInXUQPf3nugreAQwmIYg,4078
+airflow/providers/amazon/aws/sensors/glacier.py,sha256=yChjaXawHPGytKp84PvAsdplLGTeE6hLrLgLILCxlNU,4078
 airflow/providers/amazon/aws/sensors/glue.py,sha256=pyx6oaEzB9755vMOeHRYIQ2hWR_7IAFDZ_WOTidu8ww,14267
 airflow/providers/amazon/aws/sensors/glue_catalog_partition.py,sha256=YXvkQRnu5TnM2E8Tfi5B_0STqRUvRE9pgdoluz8oNCw,5831
 airflow/providers/amazon/aws/sensors/glue_crawler.py,sha256=KWU2mXCCqcaVNXL8ZmDJRScLt9u-pQLQubA2fm_75Ls,3415
 airflow/providers/amazon/aws/sensors/kinesis_analytics.py,sha256=TDsQKi5nx10CgMoTSVbYRo4m-PiKFDhyhnO7dQZSnuI,9933
 airflow/providers/amazon/aws/sensors/lambda_function.py,sha256=kO4UyrEMaMYSYbQyBN3F2eoysze_kIYCbMaF4tqiKo0,3287
-airflow/providers/amazon/aws/sensors/mwaa.py,sha256=2yO4Rz1KmydqsacPNOBaSDKkS5oIcsi7Nw5P4HCtGpk,7369
+airflow/providers/amazon/aws/sensors/mwaa.py,sha256=FK6qPOkV6fZKt4-3ayUyr9O8Q-RZVUphL5a3wIcVHVw,7474
 airflow/providers/amazon/aws/sensors/opensearch_serverless.py,sha256=cSaZvCvAC7zhFqBYNympTiQHtgCZ7srC5-TrbS4l2GQ,5508
 airflow/providers/amazon/aws/sensors/quicksight.py,sha256=lm1omzh01BKh0KHU3g2I1yH9LAXtddUDiuIS3uIeOrE,3575
 airflow/providers/amazon/aws/sensors/rds.py,sha256=QUIBZYaWv4Sjt3xLp5scF9uhKDjNnhxLDKewAuCjUmo,6901
 airflow/providers/amazon/aws/sensors/redshift_cluster.py,sha256=K_z_nTuYiECuR8vxPD4EcHhb8-d6dWqUSz6q1Zuy9wc,4088
-airflow/providers/amazon/aws/sensors/s3.py,sha256=ElmwY-NHvqWWg4D20V5LKnrlR1JPll78tJoYRo7OUt4,17328
+airflow/providers/amazon/aws/sensors/s3.py,sha256=LbGXzxycC16QXVmQYeEag3X8_0JgMSnrKbN76BJjhe0,17330
 airflow/providers/amazon/aws/sensors/sagemaker.py,sha256=nR32E1qKl9X61W52fC5FVB6ZQKb4gZVgxoMDimvXYhQ,13661
 airflow/providers/amazon/aws/sensors/sagemaker_unified_studio.py,sha256=9XHmIBjPtYb9QDJuZVOFrDwY1DKYgwW6M7ThEb9YdnI,2893
 airflow/providers/amazon/aws/sensors/sqs.py,sha256=gsHs_cJdK2E_Bd8TN34GC6W4SlHJQTLv72gz_n4uf4o,10690
-airflow/providers/amazon/aws/sensors/step_function.py,sha256=uauhkuYOUPP7PyLF7HwLiKZ5qpSxeC-36ekycp4AiHc,3596
+airflow/providers/amazon/aws/sensors/step_function.py,sha256=gaklKHdfmE-9avKSmyuGYvv9CuSklpjPz4KXZI8wXnY,3607
 airflow/providers/amazon/aws/transfers/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/amazon/aws/transfers/azure_blob_to_s3.py,sha256=4aArk3bVZorDrxp5TXew_zVB4TD3avtGKfjta61Mi40,7248
 airflow/providers/amazon/aws/transfers/base.py,sha256=hA72zMl4E_rXhmQZ1MwhC8AhM5rfmeHqNEOUNZrNDpk,2415
@@ -184,7 +184,7 @@ airflow/providers/amazon/aws/transfers/hive_to_dynamodb.py,sha256=zG9Af5Ztema452
 airflow/providers/amazon/aws/transfers/http_to_s3.py,sha256=J1HjIdGsd4Zl8kk-RJAX6uQPXTotmjLVKed4JoSSPWo,7538
 airflow/providers/amazon/aws/transfers/imap_attachment_to_s3.py,sha256=LAZKq20An7A1m-J_5rqNOaoPcg8xzD3Mkc63oOPG1bk,4563
 airflow/providers/amazon/aws/transfers/local_to_s3.py,sha256=FHMOACqjPeHRV85vAQgSZ6ncSPPj_mML9CyE7O3PIfk,4192
-airflow/providers/amazon/aws/transfers/mongo_to_s3.py,sha256=VgRUftpTdHGUQjJWDWU8d8lUKUq1dtHL72D9L8bAcVA,6047
+airflow/providers/amazon/aws/transfers/mongo_to_s3.py,sha256=09wAN5426QmazvA0kB-HkwJ2d91faQOoe9Hcn1Y1dP8,6051
 airflow/providers/amazon/aws/transfers/redshift_to_s3.py,sha256=rixW1f1rVW4tLOjkqJiJap45eZQtL0ftw2M4kpGewCA,13747
 airflow/providers/amazon/aws/transfers/s3_to_dynamodb.py,sha256=XYwswE5-CT8zwkJPVUBJ87McePsDDZAUmeVGNG2CsmU,11681
 airflow/providers/amazon/aws/transfers/s3_to_ftp.py,sha256=_G-aRJ4JgQUNXUGmfAXeZ2xfAH64vtDISLjTPpWOTGA,2993
@@ -193,7 +193,7 @@ airflow/providers/amazon/aws/transfers/s3_to_sftp.py,sha256=gYT0iG9pbL36ObnjzKm_
 airflow/providers/amazon/aws/transfers/s3_to_sql.py,sha256=shkNpAoNgKJ3fBEBg7ZQaU8zMa5WjZuZV4eihxh2uLQ,4976
 airflow/providers/amazon/aws/transfers/salesforce_to_s3.py,sha256=WbCZUa9gfQB1SjDfUfPw5QO8lZ8Q-vSLriTnpXLhvxs,5713
 airflow/providers/amazon/aws/transfers/sftp_to_s3.py,sha256=-D5AR306Q8710e4dHao75CMGS7InHernCH_aZsE6Je4,4209
-airflow/providers/amazon/aws/transfers/sql_to_s3.py,sha256=vQJ-s9RYMiZQ_qAV87NVTK6mrxtwbrsfKq0sCYSDnfQ,10618
+airflow/providers/amazon/aws/transfers/sql_to_s3.py,sha256=Wq0mqKyCdk7fDAFFV76tQnBzJTQbKAMTy9jP9O8qn38,10620
 airflow/providers/amazon/aws/triggers/README.md,sha256=ax2F0w2CuQSDN4ghJADozrrv5W4OeCDPA8Vzp00BXOU,10919
 airflow/providers/amazon/aws/triggers/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
 airflow/providers/amazon/aws/triggers/athena.py,sha256=62ty40zejcm5Y0d1rTQZuYzSjq3hUkmAs0d_zxM_Kjw,2596
@@ -265,7 +265,7 @@ airflow/providers/amazon/aws/waiters/rds.json,sha256=HNmNQm5J-VaFHzjWb1pE5P7-Ix-
 airflow/providers/amazon/aws/waiters/redshift.json,sha256=jOBotCgbkko1b_CHcGEbhhRvusgt0YSzVuFiZrqVP30,1742
 airflow/providers/amazon/aws/waiters/sagemaker.json,sha256=JPHuQtUFZ1B7EMLfVmCRevNZ9jgpB71LM0dva8ZEO9A,5254
 airflow/providers/amazon/aws/waiters/stepfunctions.json,sha256=GsOH-emGerKGBAUFmI5lpMfNGH4c0ol_PSiea25DCEY,1033
-apache_airflow_providers_amazon-9.5.0rc2.dist-info/entry_points.txt,sha256=vlc0ZzhBkMrav1maTRofgksnAw4SwoQLFX9cmnTgktk,102
-apache_airflow_providers_amazon-9.5.0rc2.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
-apache_airflow_providers_amazon-9.5.0rc2.dist-info/METADATA,sha256=knQ6EiNVlXIPWpxg8D0rK0FFqwQkV0Epn7qXL4r7hik,9802
-apache_airflow_providers_amazon-9.5.0rc2.dist-info/RECORD,,
+apache_airflow_providers_amazon-9.5.0rc3.dist-info/entry_points.txt,sha256=vlc0ZzhBkMrav1maTRofgksnAw4SwoQLFX9cmnTgktk,102
+apache_airflow_providers_amazon-9.5.0rc3.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
+apache_airflow_providers_amazon-9.5.0rc3.dist-info/METADATA,sha256=AgsnEH525W9ia-ldkgPRt1_KRBwrZ2VBOlBFwKJOhK8,9802
+apache_airflow_providers_amazon-9.5.0rc3.dist-info/RECORD,,