Skip to content

Commit c84304e

Browse files
committed
Merge branch 'hotfix/1.13.1'
2 parents 7849762 + 567d087 commit c84304e

File tree

3 files changed

+54
-4
lines changed

3 files changed

+54
-4
lines changed

ecs_deploy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = '1.13.0'
1+
VERSION = '1.13.1'

ecs_deploy/ecs.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,21 @@ def register_task_definition(self, family, containers, volumes, role_arn,
8686
if tags:
8787
additional_properties['tags'] = tags
8888

89+
if cpu:
90+
additional_properties['cpu'] = cpu
91+
92+
if memory:
93+
additional_properties['memory'] = memory
94+
95+
if runtime_platform:
96+
additional_properties['runtimePlatform'] = runtime_platform
97+
8998
return self.boto.register_task_definition(
9099
family=family,
91100
containerDefinitions=containers,
92101
volumes=volumes,
93102
taskRoleArn=role_arn,
94103
executionRoleArn=execution_role_arn,
95-
runtimePlatform=runtime_platform,
96-
cpu=cpu,
97-
memory=memory,
98104
**additional_properties
99105
)
100106

tests/test_ecs.py

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,6 +1147,50 @@ def test_client_register_task_definition(client):
11471147
)
11481148

11491149

1150+
def test_client_register_task_definition_without_optional_values(client):
1151+
containers = [{u'name': u'foo'}]
1152+
volumes = [{u'foo': u'bar'}]
1153+
role_arn = 'arn:test:role'
1154+
execution_role_arn = 'arn:test:role'
1155+
runtime_platform = {u'cpuArchitecture': u'X86_64', u'operatingSystemFamily': u'LINUX'}
1156+
task_definition = EcsTaskDefinition(
1157+
containerDefinitions=containers,
1158+
volumes=volumes,
1159+
family=u'family',
1160+
revision=1,
1161+
taskRoleArn=role_arn,
1162+
executionRoleArn=execution_role_arn,
1163+
tags={
1164+
'Name': 'test_client_register_task_definition'
1165+
},
1166+
status='active',
1167+
taskDefinitionArn='arn:task',
1168+
requiresAttributes={},
1169+
)
1170+
1171+
client.register_task_definition(
1172+
family=task_definition.family,
1173+
containers=task_definition.containers,
1174+
volumes=task_definition.volumes,
1175+
role_arn=task_definition.role_arn,
1176+
execution_role_arn=execution_role_arn,
1177+
tags=task_definition.tags,
1178+
additional_properties=task_definition.additional_properties,
1179+
runtime_platform=None,
1180+
cpu=None,
1181+
memory=None
1182+
)
1183+
1184+
client.boto.register_task_definition.assert_called_once_with(
1185+
family=u'family',
1186+
containerDefinitions=containers,
1187+
volumes=volumes,
1188+
taskRoleArn=role_arn,
1189+
executionRoleArn=execution_role_arn,
1190+
tags=task_definition.tags,
1191+
)
1192+
1193+
11501194
def test_client_register_task_definition_without_tags(client):
11511195
containers = [{u'name': u'foo'}]
11521196
volumes = [{u'foo': u'bar'}]

0 commit comments

Comments
 (0)