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

Jump to bottom

Respect soft_fail parameter in QuickSightSensor #34555

Merged
merged 3 commits into from
Sep 22, 2023
Merged

Respect soft_fail parameter in QuickSightSensor #34555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c93d7d7
Respect soft_fail parameter in QuickSightSensor
utkarsharma2 Sep 22, 2023
6294e29
Merge branch 'main' into soft_fail_QuickSight
utkarsharma2 Sep 22, 2023
e2cfba9
Fix context manager
utkarsharma2 Sep 22, 2023
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
7 changes: 5 additions & 2 deletions airflow/providers/amazon/aws/sensors/quicksight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from functools import cached_property
from typing import TYPE_CHECKING, Sequence

from airflow.exceptions import AirflowException
from airflow.exceptions import AirflowException, AirflowSkipException
from airflow.providers.amazon.aws.hooks.quicksight import QuickSightHook
from airflow.providers.amazon.aws.hooks.sts import StsHook
from airflow.sensors.base import BaseSensorOperator
Expand Down Expand Up @@ -78,7 +78,10 @@ def poke(self, context: Context) -> bool:
self.log.info("QuickSight Status: %s", quicksight_ingestion_state)
if quicksight_ingestion_state in self.errored_statuses:
error = self.quicksight_hook.get_error_info(aws_account_id, self.data_set_id, self.ingestion_id)
raise AirflowException(f"The QuickSight Ingestion failed. Error info: {error}")
message = f"The QuickSight Ingestion failed. Error info: {error}"
if self.soft_fail:
raise AirflowSkipException(message)
raise AirflowException(message)
return quicksight_ingestion_state == self.success_status

@cached_property
Expand Down
17 changes: 16 additions & 1 deletion tests/providers/amazon/aws/sensors/test_quicksight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from moto import mock_sts
from moto.core import DEFAULT_ACCOUNT_ID

from airflow.exceptions import AirflowException
from airflow.exceptions import AirflowException, AirflowSkipException
from airflow.providers.amazon.aws.hooks.quicksight import QuickSightHook
from airflow.providers.amazon.aws.sensors.quicksight import QuickSightSensor

Expand Down Expand Up @@ -71,3 +71,18 @@ def test_poke_initialized(self, mock_get_status):
mock_get_status.return_value = "INITIALIZED"
assert self.sensor.poke({}) is False
mock_get_status.assert_called_once_with(DEFAULT_ACCOUNT_ID, DATA_SET_ID, INGESTION_ID)

@pytest.mark.parametrize(
"soft_fail, expected_exception", ((False, AirflowException), (True, AirflowSkipException))
)
@mock.patch("airflow.providers.amazon.aws.hooks.sts.StsHook.get_account_number")
@mock.patch("airflow.providers.amazon.aws.hooks.quicksight.QuickSightHook.get_status")
@mock.patch("airflow.providers.amazon.aws.hooks.quicksight.QuickSightHook.get_error_info")
def test_fail_poke(self, get_error_info, get_status, _, soft_fail, expected_exception):
self.sensor.soft_fail = soft_fail
error = "expected error"
message = f"The QuickSight Ingestion failed. Error info: {error}"
with pytest.raises(expected_exception, match=message):
get_status.return_value = "FAILED"
get_error_info.return_value = message
self.sensor.poke(context={})