Merge branch 'hotfix/1.3.1'

ecs_deploy/ecs.py

@@ -45,7 +45,7 @@ def register_task_definition(self, family, containers, volumes, role_arn,
             family=family,
             containerDefinitions=containers,
             volumes=volumes,
-            taskRoleArn=role_arn or u'',
+            taskRoleArn=role_arn,
             **additional_properties
         )
 
@@ -140,16 +140,16 @@ def get_warnings(self, since=None, until=None):
 
 class EcsTaskDefinition(object):
     def __init__(self, containerDefinitions, volumes, family, revision,
-                 taskRoleArn, status, taskDefinitionArn, requiresAttributes,
-                 **kwargs):
+                 status, taskDefinitionArn, requiresAttributes,
+                 taskRoleArn=None, **kwargs):
         self.containers = containerDefinitions
         self.volumes = volumes
         self.family = family
         self.revision = revision
-        self.role_arn = taskRoleArn
-        self.arn = taskDefinitionArn
         self.status = status
+        self.arn = taskDefinitionArn
         self.requires_attributes = requiresAttributes
+        self.role_arn = taskRoleArn or u''
         self.additional_properties = kwargs
         self._diff = []
 

setup.py

@@ -7,9 +7,9 @@
 
 setup(
     name='ecs-deploy',
-    version='1.3.0',
+    version='1.3.1',
     url='https://github.com/fabfuel/ecs-deploy',
-    download_url='https://github.com/fabfuel/ecs-deploy/archive/1.3.0.tar.gz',
+    download_url='https://github.com/fabfuel/ecs-deploy/archive/1.3.1.tar.gz',
     license='BSD',
     author='Fabian Fuelling',
     author_email='[email protected]',

tests/test_ecs.py

@@ -59,7 +59,6 @@
     u'family': TASK_DEFINITION_FAMILY_2,
     u'revision': TASK_DEFINITION_REVISION_2,
     u'volumes': deepcopy(TASK_DEFINITION_VOLUMES_2),
-    u'taskRoleArn': '',
     u'containerDefinitions': deepcopy(TASK_DEFINITION_CONTAINERS_2),
     u'status': u'active',
     u'requiresAttributes': {},