fix empty materialization id handling

alekseiloginov · alekseiloginov · commit 3e0cd1ca685a · 2022-04-22T11:21:20.000-04:00
diff --git a/airflow/providers/google/cloud/operators/looker.py b/airflow/providers/google/cloud/operators/looker.py
@@ -84,7 +84,7 @@ def execute(self, context: "Context") -> str:
 
         self.materialization_id = resp.materialization_id
 
-        if self.materialization_id is None:
+        if not self.materialization_id:
             raise AirflowException(
                 f'No `materialization_id` was returned for model: {self.model}, view: {self.view}.'
             )
diff --git a/airflow/providers/google/cloud/sensors/looker.py b/airflow/providers/google/cloud/sensors/looker.py
@@ -53,6 +53,11 @@ def poke(self, context: "Context") -> bool:
 
         self.hook = LookerHook(looker_conn_id=self.looker_conn_id)
 
+        if not self.materialization_id:
+            raise AirflowException(
+                f'Invalid `materialization_id`.'
+            )
+
         # materialization_id is templated var pulling output from start task
         status_dict = self.hook.pdt_build_status(materialization_id=self.materialization_id)
         status = status_dict['status']
diff --git a/tests/providers/google/cloud/operators/test_looker.py b/tests/providers/google/cloud/operators/test_looker.py
@@ -19,6 +19,9 @@
 from unittest import mock
 from unittest.mock import MagicMock
 
+import pytest
+
+from airflow.exceptions import AirflowException
 from airflow.models import DAG, DagBag
 from airflow.providers.google.cloud.operators.looker import LookerStartPdtBuildOperator
 from airflow.utils.timezone import datetime
@@ -146,3 +149,21 @@ def test_on_kill(self, mock_hook):
         task.cancel_on_kill = True
         task.on_kill()
         mock_hook.return_value.stop_pdt_build.assert_called_once_with(materialization_id=TEST_JOB_ID)
+
+    @mock.patch(OPERATOR_PATH.format("LookerHook"))
+    def test_materialization_id_returned_as_empty_str(self, mock_hook):
+        # mock return vals from hook
+        mock_hook.return_value.start_pdt_build.return_value.materialization_id = ""
+        mock_hook.return_value.wait_for_job.return_value = None
+
+        # run task in mock context (asynchronous=False)
+        task = LookerStartPdtBuildOperator(
+            task_id=TASK_ID,
+            looker_conn_id=LOOKER_CONN_ID,
+            model=MODEL,
+            view=VIEW,
+        )
+
+        # check AirflowException is raised
+        with pytest.raises(AirflowException, match="No `materialization_id` was returned"):
+            task.execute(context=self.mock_context)
diff --git a/tests/providers/google/cloud/sensors/test_looker.py b/tests/providers/google/cloud/sensors/test_looker.py
@@ -105,3 +105,15 @@ def test_cancelled(self, mock_hook):
 
         # assert hook.pdt_build_status called once
         mock_hook.return_value.pdt_build_status.assert_called_once_with(materialization_id=TEST_JOB_ID)
+
+    def test_empty_materialization_id(self):
+
+        # run task in mock context
+        sensor = LookerCheckPdtBuildSensor(
+            task_id=TASK_ID,
+            looker_conn_id=LOOKER_CONN_ID,
+            materialization_id="",
+        )
+
+        with pytest.raises(AirflowException, match="Invalid `materialization_id`"):
+            sensor.poke(context={})

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ def execute(self, context: "Context") -> str:`
`84`	`84`
`85`	`85`	`self.materialization_id = resp.materialization_id`
`86`	`86`
`87`		`- if self.materialization_id is None:`
	`87`	`+ if not self.materialization_id:`
`88`	`88`	`raise AirflowException(`
`89`	`89`	f'No `materialization_id` was returned for model: {self.model}, view: {self.view}.'
`90`	`90`	`)`