Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion airflow/providers/amazon/aws/operators/emr.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,13 @@ def execute(self, context: Context) -> list[str]:
# steps may arrive as a string representing a list
# e.g. if we used XCom or a file then: steps="[{ step1 }, { step2 }]"
steps = self.steps
wait_for_completion = self.wait_for_completion
if isinstance(steps, str):
steps = ast.literal_eval(steps)

return emr_hook.add_job_flow_steps(job_flow_id=job_flow_id, steps=steps, wait_for_completion=True)
return emr_hook.add_job_flow_steps(
job_flow_id=job_flow_id, steps=steps, wait_for_completion=wait_for_completion
)


class EmrStartNotebookExecutionOperator(BaseOperator):
Expand Down
18 changes: 18 additions & 0 deletions tests/providers/amazon/aws/operators/test_emr_add_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,21 @@ def test_init_with_nonexistent_cluster_name(self):
with pytest.raises(AirflowException) as ctx:
operator.execute(self.mock_context)
assert str(ctx.value) == f"No cluster found for name: {cluster_name}"

@patch("airflow.providers.amazon.aws.hooks.emr.EmrHook.add_job_flow_steps")
def test_wait_for_completion(self, mock_add_job_flow_steps):
job_flow_id = "j-8989898989"
operator = EmrAddStepsOperator(
task_id="test_task",
job_flow_id=job_flow_id,
aws_conn_id="aws_default",
dag=DAG("test_dag_id", default_args=self.args),
wait_for_completion=False,
)
operator.execute(self.mock_context)

mock_add_job_flow_steps.assert_called_once_with(
job_flow_id=job_flow_id,
steps=[],
wait_for_completion=False,
)