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

Resolve GlueJobTrigger serialization bug causing verbose to always be True #43622

Merged
merged 5 commits into from
Nov 5, 2024
+44 −1
Merged

Resolve GlueJobTrigger serialization bug causing verbose to always be True #43622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06faeae
Add test for glue execute without verbose logging
jimwbaldwin Nov 4, 2024
f7cfb20
Add serialization test for glue trigger
jimwbaldwin Nov 4, 2024
8e798d3
serialize verbose as a bool to keep the value set correctly
jimwbaldwin Nov 5, 2024
528f830
Remove this boolean assert
jimwbaldwin Nov 5, 2024
fc1fc12
Run ruff formatter
jimwbaldwin Nov 5, 2024
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
2 changes: 1 addition & 1 deletion providers/src/airflow/providers/amazon/aws/triggers/glue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def serialize(self) -> tuple[str, dict[str, Any]]:
{
"job_name": self.job_name,
"run_id": self.run_id,
"verbose": str(self.verbose),
"verbose": self.verbose,
"aws_conn_id": self.aws_conn_id,
"job_poll_interval": self.job_poll_interval,
},
Expand Down
25 changes: 25 additions & 0 deletions providers/tests/amazon/aws/operators/test_glue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,31 @@ def test_execute_with_verbose_logging(
)
assert glue.job_name == JOB_NAME

@mock.patch.object(GlueJobHook, "print_job_logs")
@mock.patch.object(GlueJobHook, "get_job_state")
@mock.patch.object(GlueJobHook, "initialize_job")
@mock.patch.object(GlueJobHook, "get_conn")
@mock.patch.object(S3Hook, "load_file")
def test_execute_without_verbose_logging(
self, mock_load_file, mock_get_conn, mock_initialize_job, mock_get_job_state, mock_print_job_logs
):
glue = GlueJobOperator(
task_id=TASK_ID,
job_name=JOB_NAME,
script_location="s3_uri",
s3_bucket="bucket_name",
iam_role_name="role_arn",
verbose=False,
)
mock_initialize_job.return_value = {"JobRunState": "RUNNING", "JobRunId": JOB_RUN_ID}
mock_get_job_state.return_value = "SUCCEEDED"

glue.execute(mock.MagicMock())

mock_initialize_job.assert_called_once_with({}, {})
mock_print_job_logs.assert_not_called()
assert glue.job_name == JOB_NAME

@mock.patch.object(GlueJobHook, "print_job_logs")
@mock.patch.object(GlueJobHook, "job_completion")
@mock.patch.object(GlueJobHook, "initialize_job")
Expand Down
18 changes: 18 additions & 0 deletions providers/tests/amazon/aws/triggers/test_glue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,24 @@ async def test_wait_job_failed(self, get_state_mock: mock.MagicMock):

assert get_state_mock.call_count == 3

def test_serialization(self):
trigger = GlueJobCompleteTrigger(
job_name="job_name",
run_id="JobRunId",
verbose=False,
aws_conn_id="aws_conn_id",
job_poll_interval=0.1,
)
classpath, kwargs = trigger.serialize()
assert classpath == "airflow.providers.amazon.aws.triggers.glue.GlueJobCompleteTrigger"
assert kwargs == {
"job_name": "job_name",
"run_id": "JobRunId",
"verbose": False,
"aws_conn_id": "aws_conn_id",
"job_poll_interval": 0.1,
}


class TestGlueCatalogPartitionSensorTrigger:
@pytest.mark.asyncio
Expand Down