This is an automated email from the ASF dual-hosted git repository.
vincbeck pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 945b7949328 Fix deprecated provider lookup in Amazon AWS hooks (#74480)
945b7949328 is described below
commit 945b7949328a4a8188b1322540a7e915de0103a2
Author: Weston King-Leatham <[email protected]>
AuthorDate: Wed Oct 14 03:14:59 2026 -0400
Fix deprecated provider lookup in Amazon AWS hooks (#74480)
---
.../amazon/src/airflow/providers/amazon/aws/hooks/base_aws.py | 7 ++++++-
providers/amazon/tests/unit/amazon/aws/hooks/test_base_aws.py | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/providers/amazon/src/airflow/providers/amazon/aws/hooks/base_aws.py
b/providers/amazon/src/airflow/providers/amazon/aws/hooks/base_aws.py
index b10c083eddb..f048851c228 100644
--- a/providers/amazon/src/airflow/providers/amazon/aws/hooks/base_aws.py
+++ b/providers/amazon/src/airflow/providers/amazon/aws/hooks/base_aws.py
@@ -56,7 +56,6 @@ from airflow.providers.amazon.aws.utils.connection_wrapper
import AwsConnectionW
from airflow.providers.amazon.aws.utils.identifiers import generate_uuid
from airflow.providers.amazon.aws.utils.suppress import return_on_error
from airflow.providers.common.compat.sdk import AirflowException,
AirflowNotFoundException, BaseHook, conf
-from airflow.providers_manager import ProvidersManager
from airflow.utils.helpers import exactly_one
from airflow.utils.log.logging_mixin import LoggingMixin
@@ -78,7 +77,13 @@ if TYPE_CHECKING:
from airflow.models.connection import Connection
from airflow.sdk.execution_time.secrets_masker import mask_secret
+ from airflow.sdk.providers_manager_runtime import
ProvidersManagerTaskRuntime as ProvidersManager
else:
+ try:
+ from airflow.sdk.providers_manager_runtime import
ProvidersManagerTaskRuntime as ProvidersManager
+ except ImportError:
+ from airflow.providers_manager import ProvidersManager
+
try:
from airflow.sdk.log import mask_secret
except ImportError:
diff --git a/providers/amazon/tests/unit/amazon/aws/hooks/test_base_aws.py
b/providers/amazon/tests/unit/amazon/aws/hooks/test_base_aws.py
index a7119b0ef64..427c6ac7b80 100644
--- a/providers/amazon/tests/unit/amazon/aws/hooks/test_base_aws.py
+++ b/providers/amazon/tests/unit/amazon/aws/hooks/test_base_aws.py
@@ -39,6 +39,7 @@ from moto import mock_aws
from moto.core import DEFAULT_ACCOUNT_ID
from airflow.models.connection import Connection
+from airflow.providers.amazon import __version__ as amazon_provider_version
from airflow.providers.amazon.aws.executors.ecs.ecs_executor import
AwsEcsExecutor
from airflow.providers.amazon.aws.hooks.base_aws import (
AwsBaseHook,
@@ -345,6 +346,10 @@ class TestSessionFactory:
class TestAwsBaseHook:
+ @pytest.mark.filterwarnings("error:ProvidersManager.hooks is deprecated")
+ def test_get_provider_version_without_deprecated_hooks(self):
+ assert AwsBaseHook._get_provider_version() == amazon_provider_version
+
@mock_aws
def test_get_client_type_set_in_class_attribute(self):
client = boto3.client("emr", region_name="us-east-1")
