Skip to content

Commit

Permalink
Use airflow.exceptions.AirflowException in providers (#34511)
Browse files Browse the repository at this point in the history
* Use airflow.exceptions.AirflowException in providers

* Use airflow.exceptions.AirflowException in providers system tests

* Use airflow.exceptions.AirflowException in providers tests
  • Loading branch information
Taragolis committed Sep 21, 2023
1 parent fc0dd62 commit 659d94f
Show file tree
Hide file tree
Showing 82 changed files with 83 additions and 88 deletions.
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/hooks/quicksight.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from botocore.exceptions import ClientError

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
from airflow.providers.amazon.aws.hooks.sts import StsHook

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/operators/athena.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
from functools import cached_property
from typing import TYPE_CHECKING, Any, Sequence

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.amazon.aws.hooks.athena import AthenaHook
from airflow.providers.amazon.aws.triggers.athena import AthenaTrigger
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/operators/eventbridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from functools import cached_property
from typing import TYPE_CHECKING, Sequence

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.amazon.aws.hooks.eventbridge import EventBridgeHook
from airflow.utils.helpers import prune_dict
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/operators/glue.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
from functools import cached_property
from typing import TYPE_CHECKING, Sequence

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.amazon.aws.hooks.glue import GlueJobHook
from airflow.providers.amazon.aws.hooks.s3 import S3Hook
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/operators/glue_crawler.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
from functools import cached_property
from typing import TYPE_CHECKING, Sequence

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.triggers.glue_crawler import GlueCrawlerCompleteTrigger

if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/operators/lambda_function.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
from functools import cached_property
from typing import TYPE_CHECKING, Any, Sequence

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.amazon.aws.hooks.lambda_function import LambdaHook
from airflow.providers.amazon.aws.triggers.lambda_function import LambdaCreateFunctionCompleteTrigger
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/triggers/ecs.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from botocore.exceptions import ClientError, WaiterError

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.ecs import EcsHook
from airflow.providers.amazon.aws.hooks.logs import AwsLogsHook
from airflow.providers.amazon.aws.triggers.base import AwsBaseWaiterTrigger
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/triggers/sagemaker.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

from botocore.exceptions import WaiterError

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.sagemaker import SageMakerHook
from airflow.providers.amazon.aws.utils.waiter_with_logging import async_wait
from airflow.triggers.base import BaseTrigger, TriggerEvent
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/apache/beam/operators/beam.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
from functools import partial
from typing import IO, TYPE_CHECKING, Any, Callable, Sequence

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.apache.beam.hooks.beam import BeamHook, BeamRunnerType
from airflow.providers.apache.beam.triggers.beam import BeamPipelineTrigger
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/apache/hdfs/hooks/hdfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.
from __future__ import annotations

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.hooks.base import BaseHook

_EXCEPTION_MESSAGE = """The old HDFS Hooks have been removed in 4.0.0 version of the apache.hdfs provider.
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/apache/kafka/triggers/await_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from asgiref.sync import sync_to_async

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.apache.kafka.hooks.consume import KafkaConsumerHook
from airflow.triggers.base import BaseTrigger, TriggerEvent
from airflow.utils.module_loading import import_string
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/arangodb/hooks/arangodb.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

from arango import AQLQueryExecuteError, ArangoClient as ArangoDBClient

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.hooks.base import BaseHook

if TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from kubernetes.client import ApiException
from kubernetes.watch import Watch

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.cncf.kubernetes.hooks.kubernetes import KubernetesHook, _load_body_to_dict

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/cncf/kubernetes/template_rendering.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from jinja2 import TemplateAssertionError, UndefinedError
from kubernetes.client.api_client import ApiClient

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.cncf.kubernetes.kube_config import KubeConfig
from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import (
create_pod_id,
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/common/sql/hooks/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from packaging.version import Version
from sqlalchemy import create_engine

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.hooks.base import BaseHook
from airflow.version import version

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/github/operators/github.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

from github import GithubException

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.github.hooks.github import GithubHook

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/github/sensors/github.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

from github import GithubException

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.github.hooks.github import GithubHook
from airflow.sensors.base import BaseSensorOperator

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/hooks/ads.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from google.ads.googleads.errors import GoogleAdsException
from google.auth.exceptions import GoogleAuthError

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.hooks.base import BaseHook
from airflow.providers.google.common.hooks.base_google import get_field

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/hooks/automl.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
PredictResponse,
)

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID, GoogleBaseHook

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/hooks/cloud_composer.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
ImageVersionsClient,
)

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/hooks/compute_ssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from googleapiclient.errors import HttpError
from paramiko.ssh_exception import SSHException

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.compute import ComputeEngineHook
from airflow.providers.google.cloud.hooks.os_login import OSLoginHook
from airflow.providers.ssh.hooks.ssh import SSHHook
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/hooks/datacatalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
TagTemplateField,
)

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID, GoogleBaseHook

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/hooks/dataform.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
WriteFileResponse,
)

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook

if TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from google.cloud.aiplatform import BatchPredictionJob, Model, explain
from google.cloud.aiplatform_v1 import JobServiceClient

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook

if TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
)
from google.cloud.aiplatform_v1 import JobServiceClient, PipelineServiceClient

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/hooks/vertex_ai/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.aiplatform_v1 import DatasetServiceClient

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.aiplatform_v1 import EndpointServiceClient

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook

if TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from google.cloud.aiplatform import CustomJob, HyperparameterTuningJob, gapic, hyperparameter_tuning
from google.cloud.aiplatform_v1 import JobServiceClient, types

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook

if TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
from google.cloud.aiplatform_v1 import ModelServiceClient

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import GoogleBaseHook

if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/operators/bigquery_dts.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
TransferState,
)

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.bigquery_dts import BiqQueryDataTransferServiceHook, get_object_id
from airflow.providers.google.cloud.links.bigquery_dts import BigQueryDataTransferConfigLink
from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/operators/cloud_composer.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
from google.cloud.orchestration.airflow.service_v1 import ImageVersion
from google.cloud.orchestration.airflow.service_v1.types import Environment

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.cloud_composer import CloudComposerHook
from airflow.providers.google.cloud.links.base import BaseGoogleLink
from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator
Expand Down
3 changes: 1 addition & 2 deletions airflow/providers/google/cloud/operators/dataflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
from functools import cached_property
from typing import TYPE_CHECKING, Any, Sequence

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
from airflow.providers.apache.beam.hooks.beam import BeamHook, BeamRunnerType
from airflow.providers.google.cloud.hooks.dataflow import (
DEFAULT_DATAFLOW_LOCATION,
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/operators/datafusion.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
from google.api_core.retry import exponential_sleep_generator
from googleapiclient.errors import HttpError

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.datafusion import SUCCESS_STATES, DataFusionHook, PipelineStates
from airflow.providers.google.cloud.links.datafusion import (
DataFusionInstanceLink,
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/operators/datapipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from typing import TYPE_CHECKING, Sequence

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.datapipeline import DEFAULT_DATAPIPELINE_LOCATION, DataPipelineHook
from airflow.providers.google.cloud.operators.cloud_base import GoogleCloudBaseOperator

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/operators/dataplex.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from time import sleep
from typing import TYPE_CHECKING, Any, Sequence

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.triggers.dataplex import DataplexDataQualityJobTrigger

if TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from google.cloud.metastore_v1.types.metastore import DatabaseDumpSpec, Restore
from googleapiclient.errors import HttpError

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator, BaseOperatorLink
from airflow.models.xcom import XCom
from airflow.providers.google.cloud.hooks.dataproc_metastore import DataprocMetastoreHook
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from typing import TYPE_CHECKING, Sequence

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.dataproc_metastore import DataprocMetastoreHook
from airflow.providers.google.cloud.hooks.gcs import parse_json_from_gcs
from airflow.sensors.base import BaseSensorOperator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
from tempfile import NamedTemporaryFile
from typing import TYPE_CHECKING, Sequence

from airflow import AirflowException
from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
from airflow.models import BaseOperator
from airflow.providers.google.cloud.hooks.gcs import GCSHook, _parse_gcs_url, gcs_object_is_directory
from airflow.providers.microsoft.azure.hooks.fileshare import AzureFileShareHook
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
from google.api_core.exceptions import Conflict
from google.cloud.bigquery import DEFAULT_RETRY, UnknownJob

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.google.cloud.hooks.bigquery import BigQueryHook, BigQueryJob
from airflow.providers.google.cloud.links.bigquery import BigQueryTableLink
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
)
from google.cloud.bigquery.table import EncryptionConfiguration, Table, TableReference

from airflow import AirflowException
from airflow.configuration import conf
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.google.cloud.hooks.bigquery import BigQueryHook, BigQueryJob
from airflow.providers.google.cloud.hooks.gcs import GCSHook
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/triggers/cloud_composer.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import asyncio
from typing import Any, Sequence

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.cloud_composer import CloudComposerAsyncHook
from airflow.triggers.base import BaseTrigger, TriggerEvent

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from google.api_core.exceptions import GoogleAPIError
from google.cloud.storage_transfer_v1.types import TransferOperation

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.cloud_storage_transfer_service import (
CloudDataTransferServiceAsyncHook,
)
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/triggers/dataproc.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from google.api_core.exceptions import NotFound
from google.cloud.dataproc_v1 import Batch, ClusterStatus, JobStatus

from airflow import AirflowException
from airflow.exceptions import AirflowException
from airflow.providers.google.cloud.hooks.dataproc import DataprocAsyncHook
from airflow.triggers.base import BaseTrigger, TriggerEvent

Expand Down
Loading

0 comments on commit 659d94f

Please sign in to comment.