Merge pull request #2 from skrater/master

Send executionRoleArn in register_task_definition

ecs_deploy.py

@@ -44,6 +44,7 @@ def __init__(self):
         # run script
         self._run_parser()
 
+
     def _init_parser(self):
         parser = argparse.ArgumentParser(
             description='AWS ECS Deployment Script',
@@ -168,6 +169,7 @@ def _init_parser(self):
         args = parser.parse_args(sys.argv[1:])
         return vars(args)
 
+
     def _run_parser(self):
         self.cluster = self.args.get('cluster')
         self.task_definition_name = self._task_definition_name()
@@ -213,11 +215,13 @@ def _run_parser(self):
         else:
             sys.exit(1)
 
+
     def _int_or_none(self, value):
         if type(value) == str and value.isdigit():
             return int(value)
         return None
 
+
     def _task_definition_name(self):
         if self.args.get('task_definition'):
             return self.args.get('task_definition')
@@ -227,6 +231,7 @@ def _task_definition_name(self):
         arn = service['services'][0]['taskDefinition']
         return arn.split('/')[1].split(':')[0]
 
+
     def _service_name(self):
         if self.args.get('service_name'):
             return self.args.get('service_name')
@@ -237,13 +242,15 @@ def _service_name(self):
                    in s][0]
         return service.split('/')[1].split(':')[0]
 
+
     def _arg_kwargs(self, kwargs, arg_name, alt_name=None):
         # add specified arg to kwargs if it exists, return kwargs
         if self.args.get(arg_name):
             kwarg_name = alt_name or arg_name
             kwargs[kwarg_name] = self.args.get(arg_name)
         return kwargs
 
+
     def client_kwargs(self, fn):
         kwargs = {}
 
@@ -259,8 +266,10 @@ def client_kwargs(self, fn):
 
         elif fn == 'register_task_definition':
             kwargs['family'] = self.task_definition['family']
-            kwargs['containerDefinitions'] = \
-                self.task_definition['containerDefinitions']
+            kwargs['containerDefinitions'] = self.task_definition['containerDefinitions']
+
+            if 'executionRoleArn' in self.task_definition:
+                kwargs['executionRoleArn'] = self.task_definition['executionRoleArn']
 
             # optional kwargs from args
             for ci in self.args.get('container_image'):
@@ -309,6 +318,7 @@ def client_kwargs(self, fn):
 
         return kwargs
 
+
     def client_fn(self, fn):
         try:
             kwargs = self.client_kwargs(fn)