Skip to content

Commit 3db4ade

Browse files
turbaszekturbaszek
authored
[AIRFLOW-6924] Fix Google DLP operators return types (#7546)
1 parent fae99e1 commit 3db4ade

File tree

4 files changed

+223
-163
lines changed

4 files changed

+223
-163
lines changed

‎airflow/providers/google/cloud/example_dags/example_dlp.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040

4141
GCP_PROJECT = os.environ.get("GCP_PROJECT_ID", "example-project")
42-
TEMPLATE_ID = "dlp-inspect-8034856"
42+
TEMPLATE_ID = "dlp-inspect-838746"
4343
ITEM = ContentItem(
4444
table={
4545
"headers": [{"name": "column1"}],

‎airflow/providers/google/cloud/hooks/dlp.py‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ def get_conn(self) -> DlpServiceClient:
7575
self._client = DlpServiceClient(credentials=self._get_credentials(), client_info=self.client_info)
7676
return self._client
7777

78-
@CloudBaseHook.catch_http_exception
7978
@CloudBaseHook.fallback_to_default_project_id
8079
def cancel_dlp_job(
8180
self,
@@ -113,7 +112,6 @@ def cancel_dlp_job(
113112
name = DlpServiceClient.dlp_job_path(project_id, dlp_job_id)
114113
client.cancel_dlp_job(name=name, retry=retry, timeout=timeout, metadata=metadata)
115114

116-
@CloudBaseHook.catch_http_exception
117115
def create_deidentify_template(
118116
self,
119117
organization_id: Optional[str] = None,
@@ -171,7 +169,6 @@ def create_deidentify_template(
171169
metadata=metadata,
172170
)
173171

174-
@CloudBaseHook.catch_http_exception
175172
@CloudBaseHook.fallback_to_default_project_id
176173
def create_dlp_job(
177174
self,
@@ -254,7 +251,6 @@ def create_dlp_job(
254251
)
255252
return job
256253

257-
@CloudBaseHook.catch_http_exception
258254
def create_inspect_template(
259255
self,
260256
organization_id: Optional[str] = None,
@@ -313,7 +309,6 @@ def create_inspect_template(
313309
metadata=metadata,
314310
)
315311

316-
@CloudBaseHook.catch_http_exception
317312
@CloudBaseHook.fallback_to_default_project_id
318313
def create_job_trigger(
319314
self,
@@ -360,7 +355,6 @@ def create_job_trigger(
360355
metadata=metadata,
361356
)
362357

363-
@CloudBaseHook.catch_http_exception
364358
def create_stored_info_type(
365359
self,
366360
organization_id: Optional[str] = None,
@@ -418,7 +412,6 @@ def create_stored_info_type(
418412
metadata=metadata,
419413
)
420414

421-
@CloudBaseHook.catch_http_exception
422415
@CloudBaseHook.fallback_to_default_project_id
423416
def deidentify_content(
424417
self,
@@ -483,7 +476,6 @@ def deidentify_content(
483476
metadata=metadata,
484477
)
485478

486-
@CloudBaseHook.catch_http_exception
487479
def delete_deidentify_template(
488480
self, template_id, organization_id=None, project_id=None, retry=None, timeout=None, metadata=None
489481
) -> None:
@@ -527,7 +519,6 @@ def delete_deidentify_template(
527519

528520
client.delete_deidentify_template(name=name, retry=retry, timeout=timeout, metadata=metadata)
529521

530-
@CloudBaseHook.catch_http_exception
531522
@CloudBaseHook.fallback_to_default_project_id
532523
def delete_dlp_job(
533524
self,
@@ -566,7 +557,6 @@ def delete_dlp_job(
566557
name = DlpServiceClient.dlp_job_path(project_id, dlp_job_id)
567558
client.delete_dlp_job(name=name, retry=retry, timeout=timeout, metadata=metadata)
568559

569-
@CloudBaseHook.catch_http_exception
570560
def delete_inspect_template(
571561
self,
572562
template_id: str,
@@ -616,7 +606,6 @@ def delete_inspect_template(
616606

617607
client.delete_inspect_template(name=name, retry=retry, timeout=timeout, metadata=metadata)
618608

619-
@CloudBaseHook.catch_http_exception
620609
@CloudBaseHook.fallback_to_default_project_id
621610
def delete_job_trigger(
622611
self,
@@ -654,7 +643,6 @@ def delete_job_trigger(
654643
name = DlpServiceClient.project_job_trigger_path(project_id, job_trigger_id)
655644
client.delete_job_trigger(name=name, retry=retry, timeout=timeout, metadata=metadata)
656645

657-
@CloudBaseHook.catch_http_exception
658646
def delete_stored_info_type(
659647
self,
660648
stored_info_type_id: str,
@@ -704,7 +692,6 @@ def delete_stored_info_type(
704692

705693
client.delete_stored_info_type(name=name, retry=retry, timeout=timeout, metadata=metadata)
706694

707-
@CloudBaseHook.catch_http_exception
708695
def get_deidentify_template(
709696
self,
710697
template_id: str,
@@ -755,7 +742,6 @@ def get_deidentify_template(
755742

756743
return client.get_deidentify_template(name=name, retry=retry, timeout=timeout, metadata=metadata)
757744

758-
@CloudBaseHook.catch_http_exception
759745
@CloudBaseHook.fallback_to_default_project_id
760746
def get_dlp_job(
761747
self,
@@ -794,7 +780,6 @@ def get_dlp_job(
794780
name = DlpServiceClient.dlp_job_path(project_id, dlp_job_id)
795781
return client.get_dlp_job(name=name, retry=retry, timeout=timeout, metadata=metadata)
796782

797-
@CloudBaseHook.catch_http_exception
798783
def get_inspect_template(
799784
self,
800785
template_id: str,
@@ -845,7 +830,6 @@ def get_inspect_template(
845830

846831
return client.get_inspect_template(name=name, retry=retry, timeout=timeout, metadata=metadata)
847832

848-
@CloudBaseHook.catch_http_exception
849833
@CloudBaseHook.fallback_to_default_project_id
850834
def get_job_trigger(
851835
self,
@@ -884,7 +868,6 @@ def get_job_trigger(
884868
name = DlpServiceClient.project_job_trigger_path(project_id, job_trigger_id)
885869
return client.get_job_trigger(name=name, retry=retry, timeout=timeout, metadata=metadata)
886870

887-
@CloudBaseHook.catch_http_exception
888871
def get_stored_info_type(
889872
self,
890873
stored_info_type_id: str,
@@ -935,7 +918,6 @@ def get_stored_info_type(
935918

936919
return client.get_stored_info_type(name=name, retry=retry, timeout=timeout, metadata=metadata)
937920

938-
@CloudBaseHook.catch_http_exception
939921
@CloudBaseHook.fallback_to_default_project_id
940922
def inspect_content(
941923
self,
@@ -988,7 +970,6 @@ def inspect_content(
988970
metadata=metadata,
989971
)
990972

991-
@CloudBaseHook.catch_http_exception
992973
def list_deidentify_templates(
993974
self,
994975
organization_id: Optional[str] = None,
@@ -1050,7 +1031,6 @@ def list_deidentify_templates(
10501031

10511032
return list(results)
10521033

1053-
@CloudBaseHook.catch_http_exception
10541034
@CloudBaseHook.fallback_to_default_project_id
10551035
def list_dlp_jobs(
10561036
self,
@@ -1107,7 +1087,6 @@ def list_dlp_jobs(
11071087
)
11081088
return list(results)
11091089

1110-
@CloudBaseHook.catch_http_exception
11111090
def list_info_types(
11121091
self,
11131092
language_code: Optional[str] = None,
@@ -1147,7 +1126,6 @@ def list_info_types(
11471126
metadata=metadata,
11481127
)
11491128

1150-
@CloudBaseHook.catch_http_exception
11511129
def list_inspect_templates(
11521130
self,
11531131
organization_id: Optional[str] = None,
@@ -1208,7 +1186,6 @@ def list_inspect_templates(
12081186
)
12091187
return list(results)
12101188

1211-
@CloudBaseHook.catch_http_exception
12121189
@CloudBaseHook.fallback_to_default_project_id
12131190
def list_job_triggers(
12141191
self,
@@ -1261,7 +1238,6 @@ def list_job_triggers(
12611238
)
12621239
return list(results)
12631240

1264-
@CloudBaseHook.catch_http_exception
12651241
def list_stored_info_types(
12661242
self,
12671243
organization_id: Optional[str] = None,
@@ -1322,7 +1298,6 @@ def list_stored_info_types(
13221298
)
13231299
return list(results)
13241300

1325-
@CloudBaseHook.catch_http_exception
13261301
@CloudBaseHook.fallback_to_default_project_id
13271302
def redact_image(
13281303
self,
@@ -1383,7 +1358,6 @@ def redact_image(
13831358
metadata=metadata,
13841359
)
13851360

1386-
@CloudBaseHook.catch_http_exception
13871361
@CloudBaseHook.fallback_to_default_project_id
13881362
def reidentify_content(
13891363
self,
@@ -1445,7 +1419,6 @@ def reidentify_content(
14451419
metadata=metadata,
14461420
)
14471421

1448-
@CloudBaseHook.catch_http_exception
14491422
def update_deidentify_template(
14501423
self,
14511424
template_id: str,
@@ -1509,7 +1482,6 @@ def update_deidentify_template(
15091482
metadata=metadata,
15101483
)
15111484

1512-
@CloudBaseHook.catch_http_exception
15131485
def update_inspect_template(
15141486
self,
15151487
template_id: str,
@@ -1572,7 +1544,6 @@ def update_inspect_template(
15721544
metadata=metadata,
15731545
)
15741546

1575-
@CloudBaseHook.catch_http_exception
15761547
@CloudBaseHook.fallback_to_default_project_id
15771548
def update_job_trigger(
15781549
self,
@@ -1624,7 +1595,6 @@ def update_job_trigger(
16241595
metadata=metadata,
16251596
)
16261597

1627-
@CloudBaseHook.catch_http_exception
16281598
def update_stored_info_type(
16291599
self,
16301600
stored_info_type_id: str,

0 commit comments

Comments
 (0)