This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push: new 5fc866aebe `CloudRunExecuteJobOperator`: Add project_id to hook.get_job calls (#37201) 5fc866aebe is described below commit 5fc866aebe84caed43562eda1a5743ac60393a05 Author: Freyr Sævarsson <freyr...@gmail.com> AuthorDate: Thu Feb 22 00:30:13 2024 +0000 `CloudRunExecuteJobOperator`: Add project_id to hook.get_job calls (#37201) --- airflow/providers/google/cloud/operators/cloud_run.py | 4 ++-- tests/providers/google/cloud/operators/test_cloud_run.py | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/airflow/providers/google/cloud/operators/cloud_run.py b/airflow/providers/google/cloud/operators/cloud_run.py index 7aab64096f..695ea6708f 100644 --- a/airflow/providers/google/cloud/operators/cloud_run.py +++ b/airflow/providers/google/cloud/operators/cloud_run.py @@ -302,7 +302,7 @@ class CloudRunExecuteJobOperator(GoogleCloudBaseOperator): if not self.deferrable: result: Execution = self._wait_for_operation(self.operation) self._fail_if_execution_failed(result) - job = hook.get_job(job_name=result.job, region=self.region) + job = hook.get_job(job_name=result.job, region=self.region, project_id=self.project_id) return Job.to_dict(job) else: self.defer( @@ -333,7 +333,7 @@ class CloudRunExecuteJobOperator(GoogleCloudBaseOperator): hook: CloudRunHook = CloudRunHook(self.gcp_conn_id, self.impersonation_chain) - job = hook.get_job(job_name=event["job_name"], region=self.region) + job = hook.get_job(job_name=event["job_name"], region=self.region, project_id=self.project_id) return Job.to_dict(job) def _fail_if_execution_failed(self, execution: Execution): diff --git a/tests/providers/google/cloud/operators/test_cloud_run.py b/tests/providers/google/cloud/operators/test_cloud_run.py index 459dd81b27..855190efd1 100644 --- a/tests/providers/google/cloud/operators/test_cloud_run.py +++ b/tests/providers/google/cloud/operators/test_cloud_run.py @@ -102,6 +102,10 @@ class TestCloudRunExecuteJobOperator: operator.execute(context=mock.MagicMock()) + hook_mock.return_value.get_job.assert_called_once_with( + job_name=mock.ANY, region=REGION, project_id=PROJECT_ID + ) + hook_mock.return_value.execute_job.assert_called_once_with( job_name=JOB_NAME, region=REGION, project_id=PROJECT_ID, overrides=None ) @@ -214,6 +218,10 @@ class TestCloudRunExecuteJobOperator: event = {"status": RunJobStatus.SUCCESS.value, "job_name": JOB_NAME} result = operator.execute_complete(mock.MagicMock(), event) + + hook_mock.return_value.get_job.assert_called_once_with( + job_name=mock.ANY, region=REGION, project_id=PROJECT_ID + ) assert result["name"] == JOB_NAME @mock.patch(CLOUD_RUN_HOOK_PATH) @@ -233,6 +241,10 @@ class TestCloudRunExecuteJobOperator: operator.execute(context=mock.MagicMock()) + hook_mock.return_value.get_job.assert_called_once_with( + job_name=mock.ANY, region=REGION, project_id=PROJECT_ID + ) + hook_mock.return_value.execute_job.assert_called_once_with( job_name=JOB_NAME, region=REGION, project_id=PROJECT_ID, overrides=overrides )