Skip to content

Update ecs_task_id on reattaching #22879

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
fshehadeh wants to merge 2 commits into from
Closed

Update ecs_task_id on reattaching #22879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c32eaf
Updated ecs_task_id on reattaching
fshehadeh Apr 9, 2022
271f509
Update test_ecs.py
fshehadeh Apr 14, 2022
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
1 change: 1 addition & 0 deletions airflow/providers/amazon/aws/operators/ecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ def _try_reattach_task(self, context):
)
if previous_task_arn in running_tasks:
self.arn = previous_task_arn
self.ecs_task_id = self.arn.split("/")[-1]

@o-nikolas o-nikolas Apr 18, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit: When I had coded this (before I knew you were working on it 😆) I extracted setting the arn/task_id into a helper method, because this code is now duplicated in two spots. Not a huge deal, since ARNs are fairly stable, but worth considering. Approving

self.log.info("Reattaching previously launched task: %s", self.arn)
else:
self.log.info("No active previously launched task found to reattach")
Expand Down
3 changes: 3 additions & 0 deletions tests/providers/amazon/aws/operators/test_ecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ def test_execute_without_failures(
wait_mock.assert_called_once_with()
check_mock.assert_called_once_with()
assert self.ecs.arn == 'arn:aws:ecs:us-east-1:012345678910:task/d8c67b3c-ac87-4ffe-a847-4785bc3a8b55'
assert self.ecs.ecs_task_id == 'd8c67b3c-ac87-4ffe-a847-4785bc3a8b55'

def test_execute_with_failures(self):
client_mock = self.aws_hook_mock.return_value.get_conn.return_value
Expand Down Expand Up @@ -478,6 +479,7 @@ def test_reattach_successful(
check_mock.assert_called_once_with()
xcom_del_mock.assert_called_once()
assert self.ecs.arn == 'arn:aws:ecs:us-east-1:012345678910:task/d8c67b3c-ac87-4ffe-a847-4785bc3a8b55'
assert self.ecs.ecs_task_id == 'd8c67b3c-ac87-4ffe-a847-4785bc3a8b55'

@parameterized.expand(
[
Expand Down Expand Up @@ -526,6 +528,7 @@ def test_reattach_save_task_arn_xcom(
check_mock.assert_called_once_with()
xcom_del_mock.assert_called_once()
assert self.ecs.arn == 'arn:aws:ecs:us-east-1:012345678910:task/d8c67b3c-ac87-4ffe-a847-4785bc3a8b55'
assert self.ecs.ecs_task_id == 'd8c67b3c-ac87-4ffe-a847-4785bc3a8b55'

def test_execute_xcom_with_log(self):
self.ecs.do_xcom_push = True
Expand Down