Merge pull request #122 from GetSimpl/Fix/task-defination-create-error

Fix/task defination create error

cloudlift/config/account.py

@@ -7,5 +7,11 @@ def get_account_id(sts_client=None):
 
 def get_user_id(sts_client=None):
     sts_client = sts_client or client('sts')
-    response = client('iam').list_account_aliases()
-    return sts_client.get_caller_identity().get('Arn').split('/')[1], response['AccountAliases'][0]
+    username = ""
+    account = sts_client.get_caller_identity().get('Account')
+    user_id = (sts_client.get_caller_identity()['Arn'].split("/")[0]).split(":")[-1]
+    if user_id == "user":
+        username = sts_client.get_caller_identity().get('Arn').split('/')[1]
+    elif user_id == "assumed-role":
+        username = sts_client.get_caller_identity().get('Arn').split('assumed-role/')[1]
+    return username, account

cloudlift/config/pre_flight.py

@@ -3,7 +3,6 @@
 from cloudlift.exceptions import UnrecoverableException
 from cloudlift.config.logging import log_err
 
-
 def check_sns_topic_exists(topic_name, environment):
     session = boto3.session.Session()
     sns_client = session.client('sns')
@@ -16,3 +15,4 @@ def check_sns_topic_exists(topic_name, environment):
                 "Unable to find SNS topic {topic_name} in {environment} environment".format(**locals()))
         else:
             raise UnrecoverableException(e.response['Error']['Message'])
+

cloudlift/deployment/ecs.py

@@ -319,13 +319,14 @@ def apply_container_environment(self, container, new_environment):
             old_environment
         )
         self._diff.append(diff)
-
         container[u'secrets'] = [
             {
                 "name": e,
                 "valueFrom": merged_environment[e]
             } for e in merged_environment
         ]
+        if container[u'environment'] is not None:
+            container[u'environment'] = []
 
     def validate_container_options(self, **container_options):
         for container_name in container_options:
@@ -422,7 +423,6 @@ def get_task_definition(self, task_definition):
     def update_task_definition(self, task_definition):
         fargate_td = {}
         if task_definition.requires_compatibilities and 'FARGATE' in task_definition.requires_compatibilities:
-
             fargate_td = {
                 'requires_compatibilities': task_definition.requires_compatibilities or [],
                 'cpu' : task_definition.cpu or u'',

cloudlift/version/__init__.py

@@ -1 +1 @@
-VERSION = '1.5.6'
+VERSION = '1.5.7'