Merge branch 'hotfix/1.4.3'

fabfuel · Nov 30, 2017 · 616b9b3 · 616b9b3
2 parents 2858943 + 952ec72
commit 616b9b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
@@ -141,7 +141,7 @@ def get_warnings(self, since=None, until=None):
 class EcsTaskDefinition(object):
     def __init__(self, containerDefinitions, volumes, family, revision,
                  status, taskDefinitionArn, requiresAttributes=None,
-                 taskRoleArn=None, **kwargs):
+                 taskRoleArn=None, compatibilities=None, **kwargs):
         self.containers = containerDefinitions
         self.volumes = volumes
         self.family = family
@@ -153,6 +153,11 @@ def __init__(self, containerDefinitions, volumes, family, revision,
         self.additional_properties = kwargs
         self._diff = []
 
+        # the compatibilities parameter is returned from the ECS API, when
+        # describing a task, but may not be included, when registering a new
+        # task definition. Just storing it for now.
+        self.compatibilities = compatibilities
+
     @property
     def container_names(self):
         for container in self.containers:

diff --git a/tests/test_ecs.py b/tests/test_ecs.py
@@ -52,6 +52,7 @@
     u'networkMode': u'host',
     u'placementConstraints': {},
     u'unknownProperty': u'lorem-ipsum',
+    u'compatibilities': [u'EC2'],
 }
 
 PAYLOAD_TASK_DEFINITION_2 = {
@@ -62,6 +63,7 @@
     u'containerDefinitions': deepcopy(TASK_DEFINITION_CONTAINERS_2),
     u'status': u'active',
     u'unknownProperty': u'lorem-ipsum',
+    u'compatibilities': [u'EC2'],
 }
 
 TASK_ARN_1 = u'arn:aws:ecs:eu-central-1:123456789012:task/12345678-1234-1234-1234-123456789011'