Skip to content

Commit 359dc58

Browse files
authored
Google provider: Remove bigquery_conn_id, google_cloud_storage_conn_id (#23326)
* `bigquery_conn_id` is removed. Please use `gcp_conn_id`. affected classes: `BigQueryCheckOperator` `BigQueryCreateEmptyDatasetOperator` `BigQueryDeleteDatasetOperator` `BigQueryDeleteTableOperator` `BigQueryExecuteQueryOperator` `BigQueryGetDataOperator` `BigQueryHook` `BigQueryIntervalCheckOperator` `BigQueryTableExistenceSensor` `BigQueryTablePartitionExistenceSensor` `BigQueryToBigQueryOperator` `BigQueryToGCSOperator` `BigQueryUpdateTableSchemaOperator` `BigQueryUpsertTableOperator` `BigQueryValueCheckOperator` `GCSToBigQueryOperator` * `google_cloud_storage_conn_id` is removed. Please use `gcp_conn_id`. affected classes: `ADLSToGCSOperator` `BaseSQLToGCSOperator` `CassandraToGCSOperator` `GCSBucketCreateAclEntryOperator` `GCSCreateBucketOperator` `GCSDeleteObjectsOperator` `GCSHook` `GCSListObjectsOperator` `GCSObjectCreateAclEntryOperator` `GCSToBigQueryOperator` `GCSToGCSOperator` `GCSToLocalFilesystemOperator` `LocalFilesystemToGCSOperator`
1 parent dd7002d commit 359dc58

File tree

19 files changed

+42
-379
lines changed

19 files changed

+42
-379
lines changed

β€Žairflow/providers/google/CHANGELOG.rst

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,41 @@ Breaking changes
8989

9090
* ``CloudDatastoreExportEntitiesOperator`` : Remove ``xcom_push``. Please use ``BaseOperator.do_xcom_push``
9191

92+
* ``bigquery_conn_id`` is removed. Please use ``gcp_conn_id``.
93+
affected classes:
94+
``BigQueryCheckOperator``
95+
``BigQueryCreateEmptyDatasetOperator``
96+
``BigQueryDeleteDatasetOperator``
97+
``BigQueryDeleteTableOperator``
98+
``BigQueryExecuteQueryOperator``
99+
``BigQueryGetDataOperator``
100+
``BigQueryHook``
101+
``BigQueryIntervalCheckOperator``
102+
``BigQueryTableExistenceSensor``
103+
``BigQueryTablePartitionExistenceSensor``
104+
``BigQueryToBigQueryOperator``
105+
``BigQueryToGCSOperator``
106+
``BigQueryUpdateTableSchemaOperator``
107+
``BigQueryUpsertTableOperator``
108+
``BigQueryValueCheckOperator``
109+
``GCSToBigQueryOperator``
110+
111+
* ``google_cloud_storage_conn_id`` is removed. Please use ``gcp_conn_id``.
112+
affected classes:
113+
``ADLSToGCSOperator``
114+
``BaseSQLToGCSOperator``
115+
``CassandraToGCSOperator``
116+
``GCSBucketCreateAclEntryOperator``
117+
``GCSCreateBucketOperator``
118+
``GCSDeleteObjectsOperator``
119+
``GCSHook``
120+
``GCSListObjectsOperator``
121+
``GCSObjectCreateAclEntryOperator``
122+
``GCSToBigQueryOperator``
123+
``GCSToGCSOperator``
124+
``GCSToLocalFilesystemOperator``
125+
``LocalFilesystemToGCSOperator``
126+
92127
* ``BigQueryHook.create_empty_table`` Remove ``num_retries``. Please use ``retry``.
93128

94129
* ``BigQueryHook.run_grant_dataset_view_access`` Remove ``source_project``. Please use ``project_id``.

β€Žairflow/providers/google/cloud/hooks/bigquery.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class BigQueryHook(GoogleBaseHook, DbApiHook):
6969
:param delegate_to: This performs a task on one host with reference to other hosts.
7070
:param use_legacy_sql: This specifies whether to use legacy SQL dialect.
7171
:param location: The location of the BigQuery resource.
72-
:param bigquery_conn_id: The Airflow connection used for BigQuery credentials.
7372
:param api_resource_configs: This contains params configuration applied for Google BigQuery jobs.
7473
:param impersonation_chain: This is the optional service account to impersonate using short term
7574
credentials.
@@ -87,21 +86,10 @@ def __init__(
8786
delegate_to: Optional[str] = None,
8887
use_legacy_sql: bool = True,
8988
location: Optional[str] = None,
90-
bigquery_conn_id: Optional[str] = None,
9189
api_resource_configs: Optional[Dict] = None,
9290
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
9391
labels: Optional[Dict] = None,
9492
) -> None:
95-
# To preserve backward compatibility
96-
# TODO: remove one day
97-
if bigquery_conn_id:
98-
warnings.warn(
99-
"The bigquery_conn_id parameter has been deprecated. You should pass "
100-
"the gcp_conn_id parameter.",
101-
DeprecationWarning,
102-
stacklevel=2,
103-
)
104-
gcp_conn_id = bigquery_conn_id
10593
super().__init__(
10694
gcp_conn_id=gcp_conn_id,
10795
delegate_to=delegate_to,

β€Žairflow/providers/google/cloud/hooks/gcs.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import os
2323
import shutil
2424
import time
25-
import warnings
2625
from contextlib import contextmanager
2726
from datetime import datetime
2827
from functools import partial
@@ -133,19 +132,8 @@ def __init__(
133132
self,
134133
gcp_conn_id: str = "google_cloud_default",
135134
delegate_to: Optional[str] = None,
136-
google_cloud_storage_conn_id: Optional[str] = None,
137135
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
138136
) -> None:
139-
# To preserve backward compatibility
140-
# TODO: remove one day
141-
if google_cloud_storage_conn_id:
142-
warnings.warn(
143-
"The google_cloud_storage_conn_id parameter has been deprecated. You should pass "
144-
"the gcp_conn_id parameter.",
145-
DeprecationWarning,
146-
stacklevel=2,
147-
)
148-
gcp_conn_id = google_cloud_storage_conn_id
149137
super().__init__(
150138
gcp_conn_id=gcp_conn_id,
151139
delegate_to=delegate_to,

0 commit comments

Comments
 (0)