Skip to content

Commit 7c4073c

Browse files
amoghrajeshjason810496
authored andcommitted
Consume AirflowOptionalProviderFeatureException from compat sdk in providers (apache#60335)
* Consume AirflowOptionalProviderFeatureException from compat sdk in providers * fixing static checks * fixing static checks
1 parent 815fdb9 commit 7c4073c

71 files changed

Lines changed: 172 additions & 128 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@
2727
from airflow.api_fastapi.app import AUTH_MANAGER_FASTAPI_APP_PREFIX
2828
from airflow.api_fastapi.auth.managers.base_auth_manager import BaseAuthManager
2929
from airflow.cli.cli_config import CLICommand
30-
from airflow.exceptions import AirflowOptionalProviderFeatureException
3130
from airflow.providers.amazon.aws.auth_manager.avp.entities import AvpEntities
3231
from airflow.providers.amazon.aws.auth_manager.avp.facade import (
3332
AwsAuthManagerAmazonVerifiedPermissionsFacade,
3433
IsAuthorizedRequest,
3534
)
3635
from airflow.providers.amazon.aws.auth_manager.user import AwsAuthManagerUser
3736
from airflow.providers.amazon.version_compat import AIRFLOW_V_3_0_PLUS
38-
from airflow.providers.common.compat.sdk import conf
37+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException, conf
3938

4039
if TYPE_CHECKING:
4140
from airflow.api_fastapi.auth.managers.base_auth_manager import ResourceMethod

providers/amazon/src/airflow/providers/amazon/aws/auth_manager/cli/avp_commands.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222

2323
import boto3
2424

25-
from airflow.exceptions import AirflowOptionalProviderFeatureException
2625
from airflow.providers.amazon.aws.auth_manager.constants import CONF_REGION_NAME_KEY, CONF_SECTION_NAME
27-
from airflow.providers.common.compat.sdk import conf
26+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException, conf
2827
from airflow.utils import cli as cli_utils
2928

3029
try:

providers/amazon/src/airflow/providers/amazon/aws/auth_manager/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717
from __future__ import annotations
1818

19-
from airflow.exceptions import AirflowOptionalProviderFeatureException
19+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException
2020

2121
try:
2222
from airflow.api_fastapi.auth.managers.models.base_user import BaseUser

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def _get_conn_params(self) -> dict[str, str | None]:
156156

157157
def get_uri(self) -> str:
158158
"""Overridden to use the Athena dialect as driver name."""
159-
from airflow.exceptions import AirflowOptionalProviderFeatureException
159+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException
160160

161161
if URL is None:
162162
raise AirflowOptionalProviderFeatureException(

providers/amazon/src/airflow/providers/amazon/aws/hooks/redshift_sql.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
except ImportError:
3030
URL = create_engine = None # type: ignore[assignment,misc]
3131

32-
from airflow.exceptions import AirflowOptionalProviderFeatureException
3332
from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
34-
from airflow.providers.common.compat.sdk import AirflowException
33+
from airflow.providers.common.compat.sdk import AirflowException, AirflowOptionalProviderFeatureException
3534
from airflow.providers.common.sql.hooks.sql import DbApiHook
3635

3736
if TYPE_CHECKING:

providers/amazon/src/airflow/providers/amazon/aws/queues/sqs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import re
2020
from typing import TYPE_CHECKING
2121

22-
from airflow.exceptions import AirflowOptionalProviderFeatureException
2322
from airflow.providers.amazon.aws.triggers.sqs import SqsSensorTrigger
23+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException
2424

2525
try:
2626
from airflow.providers.common.messaging.providers.base_provider import BaseMessageQueueProvider

providers/amazon/src/airflow/providers/amazon/aws/transfers/azure_blob_to_s3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
try:
2929
from airflow.providers.microsoft.azure.hooks.wasb import WasbHook
3030
except ModuleNotFoundError as e:
31-
from airflow.exceptions import AirflowOptionalProviderFeatureException
31+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException
3232

3333
raise AirflowOptionalProviderFeatureException(e)
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def _fix_dtypes(df: pd.DataFrame, file_format: FILE_FORMAT) -> None:
183183
import numpy as np
184184
import pandas as pd
185185
except ImportError as e:
186-
from airflow.exceptions import AirflowOptionalProviderFeatureException
186+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException
187187

188188
raise AirflowOptionalProviderFeatureException(e)
189189

providers/amazon/tests/unit/amazon/aws/hooks/test_hooks_signature.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
import pytest
2525

26-
from airflow.exceptions import AirflowOptionalProviderFeatureException
2726
from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
27+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException
2828

2929
BASE_AWS_HOOKS = ["AwsGenericHook", "AwsBaseHook"]
3030
ALLOWED_THICK_HOOKS_PARAMETERS: dict[str, set[str]] = {

providers/apache/beam/src/airflow/providers/apache/beam/hooks/beam.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ def start_go_pipeline(
378378
try:
379379
from airflow.providers.google.go_module_utils import init_module, install_dependencies
380380
except ImportError:
381-
from airflow.exceptions import AirflowOptionalProviderFeatureException
381+
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException
382382

383383
raise AirflowOptionalProviderFeatureException(
384384
"Failed to import apache-airflow-google-provider. To start a go pipeline, please install the"

0 commit comments

Comments
 (0)