Skip to content

Validate EmrAddStepsOperator job flow arguments after rendering #70448

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

Closed
haseebmalik18 wants to merge 1 commit into from
Closed

Validate EmrAddStepsOperator job flow arguments after rendering #70448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 2 deletions providers/amazon/src/airflow/providers/amazon/aws/operators/emr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ def __init__(
),
**kwargs,
):
if not exactly_one(job_flow_id is None, job_flow_name is None):
raise AirflowException("Exactly one of job_flow_id or job_flow_name must be specified.")
super().__init__(**kwargs)
cluster_states = cluster_states or []
steps = steps or []
Expand Down Expand Up @@ -186,6 +184,9 @@ def _inject_openlineage_parent_job_information(self, steps: list[dict], context:
return result

def execute(self, context: Context) -> list[str]:
if not exactly_one(self.job_flow_id is None, self.job_flow_name is None):
raise AirflowException("Exactly one of job_flow_id or job_flow_name must be specified.")

job_flow_id = self.job_flow_id or self.hook.get_cluster_id_by_name(
str(self.job_flow_name), self.cluster_states
)
Expand Down
13 changes: 7 additions & 6 deletions providers/amazon/tests/unit/amazon/aws/operators/test_emr_add_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,15 @@ def test_init(self):
pytest.param(None, None, id="both-none"),
],
)
def test_validate_mutually_exclusive_args(self, job_flow_id, job_flow_name):
def test_validate_mutually_exclusive_args_on_execute(self, job_flow_id, job_flow_name):
operator = EmrAddStepsOperator(
task_id="test_validate_mutually_exclusive_args",
job_flow_id=job_flow_id,
job_flow_name=job_flow_name,
)
error_message = r"Exactly one of job_flow_id or job_flow_name must be specified\."
with pytest.raises(AirflowException, match=error_message):
EmrAddStepsOperator(
task_id="test_validate_mutually_exclusive_args",
job_flow_id=job_flow_id,
job_flow_name=job_flow_name,
)
operator.execute(context=MagicMock())

@pytest.mark.db_test
def test_render_template(self, session, clean_dags_dagruns_and_dagbundles, testing_dag_bundle):
Expand Down
1 change: 0 additions & 1 deletion scripts/ci/prek/validate_operators_init_exemptions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ providers/amazon/src/airflow/providers/amazon/aws/operators/appflow.py::AppflowB
providers/amazon/src/airflow/providers/amazon/aws/operators/dms.py::DmsModifyTaskOperator
providers/amazon/src/airflow/providers/amazon/aws/operators/dms.py::DmsStartReplicationOperator
providers/amazon/src/airflow/providers/amazon/aws/operators/ecs.py::EcsRunTaskOperator
providers/amazon/src/airflow/providers/amazon/aws/operators/emr.py::EmrAddStepsOperator
providers/amazon/src/airflow/providers/amazon/aws/operators/neptune.py::NeptuneStartDbClusterOperator
providers/amazon/src/airflow/providers/amazon/aws/operators/neptune.py::NeptuneStopDbClusterOperator
providers/amazon/src/airflow/providers/amazon/aws/operators/s3.py::S3DeleteObjectsOperator
Expand Down
Loading