Skip to content

Commit

Permalink
Remove broken deprecated fallback into the Google provider operators (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Taragolis committed Feb 27, 2024
1 parent 413e364 commit 8e42a2e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 29 deletions.
Expand Up @@ -22,7 +22,7 @@
from datetime import date, time
from typing import TYPE_CHECKING, Sequence

from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
from airflow.providers.google.cloud.hooks.cloud_storage_transfer_service import (
ACCESS_KEY_ID,
Expand Down Expand Up @@ -537,37 +537,24 @@ class CloudDataTransferServiceListOperationsOperator(GoogleCloudBaseOperator):

def __init__(
self,
request_filter: dict | None = None,
request_filter: dict,
project_id: str | None = None,
gcp_conn_id: str = "google_cloud_default",
api_version: str = "v1",
google_impersonation_chain: str | Sequence[str] | None = None,
**kwargs,
) -> None:
# To preserve backward compatibility
# TODO: remove one day
if request_filter is None:
if "filter" in kwargs:
request_filter = kwargs["filter"]
AirflowProviderDeprecationWarning(
"Use 'request_filter' instead 'filter' to pass the argument."
)
else:
TypeError("__init__() missing 1 required positional argument: 'request_filter'")

super().__init__(**kwargs)
self.filter = request_filter
self.project_id = project_id
self.gcp_conn_id = gcp_conn_id
self.api_version = api_version
self.google_impersonation_chain = google_impersonation_chain
self._validate_inputs()

def _validate_inputs(self) -> None:
def execute(self, context: Context) -> list[dict]:
if not self.filter:
raise AirflowException("The required parameter 'filter' is empty or None")

def execute(self, context: Context) -> list[dict]:
hook = CloudDataTransferServiceHook(
api_version=self.api_version,
gcp_conn_id=self.gcp_conn_id,
Expand Down
15 changes: 2 additions & 13 deletions airflow/providers/google/cloud/transfers/gcs_to_local.py
Expand Up @@ -18,7 +18,7 @@

from typing import TYPE_CHECKING, Sequence

from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.models.xcom import MAX_XCOM_SIZE
from airflow.providers.google.cloud.hooks.gcs import GCSHook
Expand Down Expand Up @@ -77,27 +77,16 @@ def __init__(
self,
*,
bucket: str,
object_name: str | None = None,
object_name: str,
filename: str | None = None,
store_to_xcom_key: str | None = None,
gcp_conn_id: str = "google_cloud_default",
impersonation_chain: str | Sequence[str] | None = None,
file_encoding: str = "utf-8",
**kwargs,
) -> None:
# To preserve backward compatibility
# TODO: Remove one day
if object_name is None:
object_name = kwargs.get("object")
if object_name is not None:
self.object_name = object_name
AirflowProviderDeprecationWarning("Use 'object_name' instead of 'object'.")
else:
TypeError("__init__() missing 1 required positional argument: 'object_name'")

if filename is not None and store_to_xcom_key is not None:
raise ValueError("Either filename or store_to_xcom_key can be set")

super().__init__(**kwargs)
self.bucket = bucket
self.filename = filename
Expand Down

0 comments on commit 8e42a2e

Please sign in to comment.