Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug where CloudBuildRunBuildTriggerOperator fail to find build id. #22419

Merged
merged 3 commits into from
Mar 23, 2022
Merged

Fixed bug where CloudBuildRunBuildTriggerOperator fail to find build id. #22419

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e0cffd
CloudBuildRunBuildTriggerOperator: 'property' object has no attribut…
Mar 22, 2022
0718a93
Fixed bug where retry cloud build jobs and run cloud build triggers w…
Mar 23, 2022
f64c2cd
Merge branch 'main' into Fix-CloudBuildRunBuildTriggerOperator-proper…
stephenoken Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions airflow/providers/google/cloud/hooks/cloud_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def create_build(
metadata=metadata,
)

id_ = self._get_build_id_from_operation(Operation)
id_ = self._get_build_id_from_operation(operation)

if not wait:
return self.get_build(id_=id_, project_id=project_id)
Expand Down Expand Up @@ -460,7 +460,7 @@ def retry_build(
metadata=metadata,
)

id_ = self._get_build_id_from_operation(Operation)
id_ = self._get_build_id_from_operation(operation)

if not wait:
return self.get_build(id_=id_, project_id=project_id)
Expand Down Expand Up @@ -510,7 +510,7 @@ def run_build_trigger(
metadata=metadata,
)

id_ = self._get_build_id_from_operation(Operation)
id_ = self._get_build_id_from_operation(operation)

if not wait:
return self.get_build(id_=id_, project_id=project_id)
Expand Down
18 changes: 15 additions & 3 deletions tests/providers/google/cloud/hooks/test_cloud_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,18 @@ def test_create_build_without_wait(self, get_conn, mock_get_id_from_operation):

self.hook.create_build(build=BUILD, project_id=PROJECT_ID, wait=False)

get_conn.return_value.create_build.assert_called_once_with(
mock_operation = get_conn.return_value.create_build

mock_operation.assert_called_once_with(
request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=()
)

get_conn.return_value.get_build.assert_called_once_with(
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
)

mock_get_id_from_operation.assert_called_once_with(mock_operation())

@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
def test_create_build_trigger(self, get_conn):
self.hook.create_build_trigger(trigger=BUILD_TRIGGER, project_id=PROJECT_ID)
Expand Down Expand Up @@ -194,7 +198,9 @@ def test_retry_build_with_wait(self, get_conn, wait_time, mock_get_id_from_opera

self.hook.retry_build(id_=BUILD_ID, project_id=PROJECT_ID)

get_conn.return_value.retry_build.assert_called_once_with(
mock_operation = get_conn.return_value.retry_build

mock_operation.assert_called_once_with(
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
)

Expand All @@ -204,6 +210,8 @@ def test_retry_build_with_wait(self, get_conn, wait_time, mock_get_id_from_opera
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
)

mock_get_id_from_operation.assert_called_once_with(mock_operation())

@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
def test_retry_build_without_wait(self, get_conn, mock_get_id_from_operation):
Expand Down Expand Up @@ -233,7 +241,9 @@ def test_run_build_trigger_with_wait(self, get_conn, wait_time, mock_get_id_from
trigger_id=TRIGGER_ID, source=REPO_SOURCE['repo_source'], project_id=PROJECT_ID
)

get_conn.return_value.run_build_trigger.assert_called_once_with(
mock_operation = get_conn.return_value.run_build_trigger

mock_operation.assert_called_once_with(
request={
'project_id': PROJECT_ID,
'trigger_id': TRIGGER_ID,
Expand All @@ -250,6 +260,8 @@ def test_run_build_trigger_with_wait(self, get_conn, wait_time, mock_get_id_from
request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
)

mock_get_id_from_operation.assert_called_once_with(mock_operation())

@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
def test_run_build_trigger_without_wait(self, get_conn, mock_get_id_from_operation):
Expand Down