Skip to content

Commit d4c4f9e

Browse files
potiukpotiuk
authored
Fix mypy errors for google.cloud_build (#20234)
Part of #19891
1 parent daeeb7d commit d4c4f9e

File tree

3 files changed

+44
-38
lines changed

3 files changed

+44
-38
lines changed

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def cancel_build(
9898
project_id: str = PROVIDE_PROJECT_ID,
9999
retry: Optional[Retry] = None,
100100
timeout: Optional[float] = None,
101-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
101+
metadata: Sequence[Tuple[str, str]] = (),
102102
) -> Build:
103103
"""
104104
Cancels a build in progress.
@@ -124,9 +124,11 @@ def cancel_build(
124124
self.log.info("Start cancelling build: %s.", id_)
125125

126126
build = client.cancel_build(
127-
request={'project_id': project_id, 'id': id_}, retry=retry, timeout=timeout, metadata=metadata
127+
request={'project_id': project_id, 'id': id_},
128+
retry=retry,
129+
timeout=timeout,
130+
metadata=metadata,
128131
)
129-
130132
self.log.info("Build has been cancelled: %s.", id_)
131133

132134
return build
@@ -139,7 +141,7 @@ def create_build(
139141
wait: bool = True,
140142
retry: Optional[Retry] = None,
141143
timeout: Optional[float] = None,
142-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
144+
metadata: Sequence[Tuple[str, str]] = (),
143145
) -> Build:
144146
"""
145147
Starts a build with the specified configuration.
@@ -192,7 +194,7 @@ def create_build_trigger(
192194
project_id: str = PROVIDE_PROJECT_ID,
193195
retry: Optional[Retry] = None,
194196
timeout: Optional[float] = None,
195-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
197+
metadata: Sequence[Tuple[str, str]] = (),
196198
) -> BuildTrigger:
197199
"""
198200
Creates a new BuildTrigger.
@@ -236,7 +238,7 @@ def delete_build_trigger(
236238
project_id: str = PROVIDE_PROJECT_ID,
237239
retry: Optional[Retry] = None,
238240
timeout: Optional[float] = None,
239-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
241+
metadata: Sequence[Tuple[str, str]] = (),
240242
) -> None:
241243
"""
242244
Deletes a BuildTrigger by its project ID and trigger ID.
@@ -275,7 +277,7 @@ def get_build(
275277
project_id: str = PROVIDE_PROJECT_ID,
276278
retry: Optional[Retry] = None,
277279
timeout: Optional[float] = None,
278-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
280+
metadata: Sequence[Tuple[str, str]] = (),
279281
) -> Build:
280282
"""
281283
Returns information about a previously requested build.
@@ -301,7 +303,10 @@ def get_build(
301303
self.log.info("Start retrieving build: %s.", id_)
302304

303305
build = client.get_build(
304-
request={'project_id': project_id, 'id': id_}, retry=retry, timeout=timeout, metadata=metadata
306+
request={'project_id': project_id, 'id': id_},
307+
retry=retry,
308+
timeout=timeout,
309+
metadata=metadata,
305310
)
306311

307312
self.log.info("Build has been retrieved: %s.", id_)
@@ -315,7 +320,7 @@ def get_build_trigger(
315320
project_id: str = PROVIDE_PROJECT_ID,
316321
retry: Optional[Retry] = None,
317322
timeout: Optional[float] = None,
318-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
323+
metadata: Sequence[Tuple[str, str]] = (),
319324
) -> BuildTrigger:
320325
"""
321326
Returns information about a BuildTrigger.
@@ -360,7 +365,7 @@ def list_build_triggers(
360365
page_token: Optional[str] = None,
361366
retry: Optional[Retry] = None,
362367
timeout: Optional[float] = None,
363-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
368+
metadata: Sequence[Tuple[str, str]] = (),
364369
) -> List[BuildTrigger]:
365370
"""
366371
Lists existing BuildTriggers.
@@ -417,7 +422,7 @@ def list_builds(
417422
filter_: Optional[str] = None,
418423
retry: Optional[Retry] = None,
419424
timeout: Optional[float] = None,
420-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
425+
metadata: Sequence[Tuple[str, str]] = (),
421426
) -> List[Build]:
422427
"""
423428
Lists previously requested builds.
@@ -475,7 +480,7 @@ def retry_build(
475480
wait: bool = True,
476481
retry: Optional[Retry] = None,
477482
timeout: Optional[float] = None,
478-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
483+
metadata: Sequence[Tuple[str, str]] = (),
479484
) -> Build:
480485
"""
481486
Creates a new build based on the specified build. This method creates a new build
@@ -504,7 +509,10 @@ def retry_build(
504509
self.log.info("Start retrying build: %s.", id_)
505510

506511
operation = client.retry_build(
507-
request={'project_id': project_id, 'id': id_}, retry=retry, timeout=timeout, metadata=metadata
512+
request={'project_id': project_id, 'id': id_},
513+
retry=retry,
514+
timeout=timeout,
515+
metadata=metadata,
508516
)
509517

510518
id_ = self._get_build_id_from_operation(Operation)
@@ -527,7 +535,7 @@ def run_build_trigger(
527535
wait: bool = True,
528536
retry: Optional[Retry] = None,
529537
timeout: Optional[float] = None,
530-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
538+
metadata: Sequence[Tuple[str, str]] = (),
531539
) -> Build:
532540
"""
533541
Runs a BuildTrigger at a particular source revision.
@@ -583,7 +591,7 @@ def update_build_trigger(
583591
project_id: str,
584592
retry: Optional[Retry] = None,
585593
timeout: Optional[float] = None,
586-
metadata: Optional[Sequence[Tuple[str, str]]] = None,
594+
metadata: Sequence[Tuple[str, str]] = (),
587595
) -> BuildTrigger:
588596
"""
589597
Updates a BuildTrigger by its project ID and trigger ID.

‎airflow/providers/google/cloud/operators/cloud_build.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -909,8 +909,6 @@ class BuildProcessor:
909909
"""
910910

911911
def __init__(self, build: Union[Dict, Build]) -> None:
912-
if isinstance(build, Build):
913-
self.build = Build(build)
914912
self.build = deepcopy(build)
915913

916914
def _verify_source(self) -> None:
@@ -1012,7 +1010,7 @@ def _convert_storage_url_to_dict(storage_url: str) -> Dict[str, Any]:
10121010
"gs://bucket-name/object-name.tar.gz#24565443"
10131011
)
10141012

1015-
source_dict = {
1013+
source_dict: Dict[str, Any] = {
10161014
"bucket": url_parts.hostname,
10171015
"object_": url_parts.path[1:],
10181016
}

‎tests/providers/google/cloud/hooks/test_cloud_build.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def test_cancel_build(self, get_conn):
7979
self.hook.cancel_build(id_=BUILD_ID, project_id=PROJECT_ID)
8080

8181
get_conn.return_value.cancel_build.assert_called_once_with(
82-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
82+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
8383
)
8484

8585
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -94,13 +94,13 @@ def test_create_build_with_wait(self, get_conn, wait_time, mock_get_id_from_oper
9494
self.hook.create_build(build=BUILD, project_id=PROJECT_ID)
9595

9696
get_conn.return_value.create_build.assert_called_once_with(
97-
request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=None
97+
request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=()
9898
)
9999

100100
get_conn.return_value.create_build.return_value.result.assert_called_once_with()
101101

102102
get_conn.return_value.get_build.assert_called_once_with(
103-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
103+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
104104
)
105105

106106
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -112,11 +112,11 @@ def test_create_build_without_wait(self, get_conn, mock_get_id_from_operation):
112112
self.hook.create_build(build=BUILD, project_id=PROJECT_ID, wait=False)
113113

114114
get_conn.return_value.create_build.assert_called_once_with(
115-
request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=None
115+
request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=()
116116
)
117117

118118
get_conn.return_value.get_build.assert_called_once_with(
119-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
119+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
120120
)
121121

122122
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -127,7 +127,7 @@ def test_create_build_trigger(self, get_conn):
127127
request={'project_id': PROJECT_ID, 'trigger': BUILD_TRIGGER},
128128
retry=None,
129129
timeout=None,
130-
metadata=None,
130+
metadata=(),
131131
)
132132

133133
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -138,15 +138,15 @@ def test_delete_build_trigger(self, get_conn):
138138
request={'project_id': PROJECT_ID, 'trigger_id': TRIGGER_ID},
139139
retry=None,
140140
timeout=None,
141-
metadata=None,
141+
metadata=(),
142142
)
143143

144144
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
145145
def test_get_build(self, get_conn):
146146
self.hook.get_build(id_=BUILD_ID, project_id=PROJECT_ID)
147147

148148
get_conn.return_value.get_build.assert_called_once_with(
149-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
149+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
150150
)
151151

152152
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -157,7 +157,7 @@ def test_get_build_trigger(self, get_conn):
157157
request={'project_id': PROJECT_ID, 'trigger_id': TRIGGER_ID},
158158
retry=None,
159159
timeout=None,
160-
metadata=None,
160+
metadata=(),
161161
)
162162

163163
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -168,7 +168,7 @@ def test_list_build_triggers(self, get_conn):
168168
request={'parent': PARENT, 'project_id': PROJECT_ID, 'page_size': None, 'page_token': None},
169169
retry=None,
170170
timeout=None,
171-
metadata=None,
171+
metadata=(),
172172
)
173173

174174
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -185,7 +185,7 @@ def test_list_builds(self, get_conn):
185185
},
186186
retry=None,
187187
timeout=None,
188-
metadata=None,
188+
metadata=(),
189189
)
190190

191191
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -200,13 +200,13 @@ def test_retry_build_with_wait(self, get_conn, wait_time, mock_get_id_from_opera
200200
self.hook.retry_build(id_=BUILD_ID, project_id=PROJECT_ID)
201201

202202
get_conn.return_value.retry_build.assert_called_once_with(
203-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
203+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
204204
)
205205

206206
get_conn.return_value.retry_build.return_value.result.assert_called_once_with()
207207

208208
get_conn.return_value.get_build.assert_called_once_with(
209-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
209+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
210210
)
211211

212212
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -218,11 +218,11 @@ def test_retry_build_without_wait(self, get_conn, mock_get_id_from_operation):
218218
self.hook.retry_build(id_=BUILD_ID, project_id=PROJECT_ID, wait=False)
219219

220220
get_conn.return_value.retry_build.assert_called_once_with(
221-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
221+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
222222
)
223223

224224
get_conn.return_value.get_build.assert_called_once_with(
225-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
225+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
226226
)
227227

228228
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -246,13 +246,13 @@ def test_run_build_trigger_with_wait(self, get_conn, wait_time, mock_get_id_from
246246
},
247247
retry=None,
248248
timeout=None,
249-
metadata=None,
249+
metadata=(),
250250
)
251251

252252
get_conn.return_value.run_build_trigger.return_value.result.assert_called_once_with()
253253

254254
get_conn.return_value.get_build.assert_called_once_with(
255-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
255+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
256256
)
257257

258258
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -273,11 +273,11 @@ def test_run_build_trigger_without_wait(self, get_conn, mock_get_id_from_operati
273273
},
274274
retry=None,
275275
timeout=None,
276-
metadata=None,
276+
metadata=(),
277277
)
278278

279279
get_conn.return_value.get_build.assert_called_once_with(
280-
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
280+
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
281281
)
282282

283283
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -288,5 +288,5 @@ def test_update_build_trigger(self, get_conn):
288288
request={'project_id': PROJECT_ID, 'trigger_id': TRIGGER_ID, 'trigger': BUILD_TRIGGER},
289289
retry=None,
290290
timeout=None,
291-
metadata=None,
291+
metadata=(),
292292
)

0 commit comments

Comments
 (0)