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

feat: Copy existing task definition tags #139

Merged
merged 12 commits into from
Sep 17, 2020
Merged

feat: Copy existing task definition tags #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0427f97
Add include TAGS in describe_task_definition
nitrocode Aug 6, 2020
9f66bb7
Update ecs.py
nitrocode Aug 6, 2020
59cd05c
Merge branch 'develop' into patch-1
nitrocode Aug 29, 2020
d0d9162
Added tags to register and update_task_definition
nitrocode Aug 29, 2020
2bfbd09
Add tags to EcsTaskDefinition
nitrocode Aug 29, 2020
c23d0fa
Add tags to EcsTaskDefinition
nitrocode Aug 29, 2020
01ba8dd
tags returned outside of taskDefinition key
nitrocode Aug 29, 2020
0771a96
Tags can be empty
nitrocode Aug 29, 2020
8e4d64a
Update test_update_task_definition to expect tags
nitrocode Aug 29, 2020
8c156af
Update test_ecs.py
nitrocode Aug 29, 2020
f6c84b7
Update test_ecs.py
nitrocode Aug 29, 2020
39a4f90
Add non-None tags to test
nitrocode Aug 30, 2020
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
13 changes: 10 additions & 3 deletions ecs_deploy/ecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ def describe_services(self, cluster_name, service_name):
def describe_task_definition(self, task_definition_arn):
try:
return self.boto.describe_task_definition(
taskDefinition=task_definition_arn
taskDefinition=task_definition_arn,
include=[
'TAGS',
]
)
except ClientError:
raise UnknownTaskDefinitionError(
Expand All @@ -57,13 +60,14 @@ def describe_tasks(self, cluster_name, task_arns):
return self.boto.describe_tasks(cluster=cluster_name, tasks=task_arns)

def register_task_definition(self, family, containers, volumes, role_arn,
execution_role_arn, additional_properties):
execution_role_arn, tags, additional_properties):
return self.boto.register_task_definition(
family=family,
containerDefinitions=containers,
volumes=volumes,
taskRoleArn=role_arn,
executionRoleArn=execution_role_arn,
tags=tags,
**additional_properties
)

Expand Down Expand Up @@ -202,7 +206,7 @@ class EcsTaskDefinition(object):
def __init__(self, containerDefinitions, volumes, family, revision,
status, taskDefinitionArn, requiresAttributes=None,
taskRoleArn=None, executionRoleArn=None, compatibilities=None,
**kwargs):
tags=None, **kwargs):
self.containers = containerDefinitions
self.volumes = volumes
self.family = family
Expand All @@ -212,6 +216,7 @@ def __init__(self, containerDefinitions, volumes, family, revision,
self.requires_attributes = requiresAttributes or {}
self.role_arn = taskRoleArn or u''
self.execution_role_arn = executionRoleArn or u''
self.tags = tags
self.additional_properties = kwargs
self._diff = []

Expand Down Expand Up @@ -585,6 +590,7 @@ def get_task_definition(self, task_definition):
)

task_definition = EcsTaskDefinition(
tags=task_definition_payload.get('tags', None),
**task_definition_payload[u'taskDefinition']
)
return task_definition
Expand All @@ -596,6 +602,7 @@ def update_task_definition(self, task_definition):
volumes=task_definition.volumes,
role_arn=task_definition.role_arn,
execution_role_arn=task_definition.execution_role_arn,
tags=task_definition.tags,
additional_properties=task_definition.additional_properties
)
new_task_definition = EcsTaskDefinition(**response[u'taskDefinition'])
Expand Down
10 changes: 8 additions & 2 deletions tests/test_ecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ def test_client_describe_services(client):

def test_client_describe_task_definition(client):
client.describe_task_definition(u'task_definition_arn')
client.boto.describe_task_definition.assert_called_once_with(taskDefinition=u'task_definition_arn')
client.boto.describe_task_definition.assert_called_once_with(include=['TAGS'], taskDefinition=u'task_definition_arn')


def test_client_describe_unknown_task_definition(client):
Expand Down Expand Up @@ -575,6 +575,9 @@ def test_client_register_task_definition(client):
revision=1,
taskRoleArn=role_arn,
executionRoleArn=execution_role_arn,
tags={
'Name': 'test_client_register_task_definition'
},
status='active',
taskDefinitionArn='arn:task',
requiresAttributes={},
Expand All @@ -587,6 +590,7 @@ def test_client_register_task_definition(client):
volumes=task_definition.volumes,
role_arn=task_definition.role_arn,
execution_role_arn=execution_role_arn,
tags=task_definition.tags,
additional_properties=task_definition.additional_properties
)

Expand All @@ -596,6 +600,7 @@ def test_client_register_task_definition(client):
volumes=volumes,
taskRoleArn=role_arn,
executionRoleArn=execution_role_arn,
tags=task_definition.tags,
unkownProperty='foobar'
)

Expand Down Expand Up @@ -711,6 +716,7 @@ def test_update_task_definition(client, task_definition):
volumes=task_definition.volumes,
role_arn=task_definition.role_arn,
execution_role_arn=task_definition.execution_role_arn,
tags=task_definition.tags,
additional_properties={
u'networkMode': u'host',
u'placementConstraints': {},
Expand Down Expand Up @@ -943,7 +949,7 @@ def describe_tasks(self, cluster_name, task_arns):
return deepcopy(RESPONSE_DESCRIBE_TASKS)

def register_task_definition(self, family, containers, volumes, role_arn,
execution_role_arn, additional_properties):
execution_role_arn, tags, additional_properties):
if not self.access_key_id or not self.secret_access_key:
raise EcsConnectionError(u'Unable to locate credentials. Configure credentials by running "aws configure".')
return deepcopy(RESPONSE_TASK_DEFINITION_2)
Expand Down