From d70977a6e8621b3e0bb24488e1b11192abfcdd25 Mon Sep 17 00:00:00 2001
From: Marko Tibold <marko@tibold.nl>
Date: Thu, 9 Sep 2021 10:37:50 +0200
Subject: [PATCH 01/63] Update cli.py

Fix typos
---
 ecs_deploy/cli.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index d60a24a..d6b3acf 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -83,7 +83,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
     Redeploy or modify a service.
 
     \b
-    CLUSTER is the name of your cluster (e.g. 'my-custer') within ECS.
+    CLUSTER is the name of your cluster (e.g. 'my-cluster') within ECS.
     SERVICE is the name of your service (e.g. 'my-app') within ECS.
 
     When not giving any other options, the task definition will not be changed.
@@ -217,7 +217,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
     Update a scheduled task.
 
     \b
-    CLUSTER is the name of your cluster (e.g. 'my-custer') within ECS.
+    CLUSTER is the name of your cluster (e.g. 'my-cluster') within ECS.
     TASK is the name of your task definition (e.g. 'my-task') within ECS.
     RULE is the name of the rule to use the new task definition.
     """
@@ -350,7 +350,7 @@ def scale(cluster, service, desired_count, access_key_id, secret_access_key, reg
     Scale a service up or down.
 
     \b
-    CLUSTER is the name of your cluster (e.g. 'my-custer') within ECS.
+    CLUSTER is the name of your cluster (e.g. 'my-cluster') within ECS.
     SERVICE is the name of your service (e.g. 'my-app') within ECS.
     DESIRED_COUNT is the number of tasks your service should run.
     """
@@ -406,7 +406,7 @@ def run(cluster, task, count, command, env, env_file, s3_env_file, secret, launc
     Run a one-off task.
 
     \b
-    CLUSTER is the name of your cluster (e.g. 'my-custer') within ECS.
+    CLUSTER is the name of your cluster (e.g. 'my-cluster') within ECS.
     TASK is the name of your task definition (e.g. 'my-task') within ECS.
     COUNT is the number of tasks your service should run.
     """

From b285a1facfd62b727538921410285a33fc994869 Mon Sep 17 00:00:00 2001
From: Mark Heiges <mark.heiges@semanticbits.com>
Date: Mon, 10 Jan 2022 10:21:14 -0500
Subject: [PATCH 02/63] add support for runtimePlatform in task definition

---
 ecs_deploy/cli.py |  9 ++++++---
 ecs_deploy/ecs.py | 47 +++++++++++++++++++++++++++++++++--------------
 tests/test_cli.py | 24 ++++++++++++++++++++++++
 tests/test_ecs.py | 13 ++++++++++++-
 4 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index d60a24a..54ce8c7 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -48,6 +48,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('-l', '--log', type=(str, str, str, str), multiple=True, help='Adds or changes a log configuration in the container description (Not available for Fargate): <container> <log driver> <option name> <option value>')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
 @click.option('-x', '--execution-role', type=str, help='Sets the execution\'s role ARN: <execution role ARN>')
+@click.option('--runtime-platform', type=(str, str), multiple=True, help='Overwrites runtimePatform: <cpuArchitecture> <operatingSystemFamily>')
 @click.option('--task', type=str, help='Task definition to be deployed. Can be a task ARN or a task family with optional revision')
 @click.option('--region', required=False, help='AWS region (e.g. eu-central-1)')
 @click.option('--access-key-id', required=False, help='AWS access key id')
@@ -78,7 +79,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
 @click.option('--add-container', type=str, multiple=True, required=False, help='Add a placeholder container in the task definition.')
 @click.option('--remove-container', type=str, multiple=True, required=False, help='Remove a container from the task definition.')
-def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, privileged, essential, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
+def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, privileged, essential, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, runtime_platform, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
     """
     Redeploy or modify a service.
 
@@ -90,7 +91,6 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
     It will just be duplicated, so that all container images will be pulled
     and redeployed.
     """
-
     try:
         client = get_client(access_key_id, secret_access_key, region, profile)
         deployment = DeployAction(client, cluster, service)
@@ -118,6 +118,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
         td.set_log_configurations(log)
         td.set_role_arn(role)
         td.set_execution_role_arn(execution_role)
+        td.set_runtime_platform(runtime_platform)
         td.set_volumes(volume)
 
         slack = SlackNotification(
@@ -289,6 +290,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
 @click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
+@click.option('--runtime-platform', type=(str, str), multiple=True, help='Overwrites runtimePatform: <cpuArchitecture> <operatingSystemFamily>')
 @click.option('--region', help='AWS region (e.g. eu-central-1)')
 @click.option('--access-key-id', help='AWS access key id')
 @click.option('--secret-access-key', help='AWS secret access key')
@@ -299,7 +301,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
 @click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--deregister/--no-deregister', default=True, help='Deregister or keep the old task definition (default: --deregister)')
-def update(task, image, tag, command, env, env_file, s3_env_file, secret, role, region, access_key_id, secret_access_key, profile, diff, exclusive_env, exclusive_s3_env_file, exclusive_secrets, deregister, docker_label, exclusive_docker_labels):
+def update(task, image, tag, command, env, env_file, s3_env_file, secret, role, region, access_key_id, secret_access_key, profile, diff, exclusive_env, exclusive_s3_env_file, exclusive_secrets, runtime_platform, deregister, docker_label, exclusive_docker_labels):
     """
     Update a task definition.
 
@@ -320,6 +322,7 @@ def update(task, image, tag, command, env, env_file, s3_env_file, secret, role,
         td.set_secrets(secret, exclusive_secrets)
         td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
         td.set_role_arn(role)
+        td.set_runtime_platform(runtime_platform)
 
         if diff:
             print_diff(td)
diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index 871c207..5771aca 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -80,7 +80,8 @@ def describe_tasks(self, cluster_name, task_arns):
         return self.boto.describe_tasks(cluster=cluster_name, tasks=task_arns)
 
     def register_task_definition(self, family, containers, volumes, role_arn,
-                                 execution_role_arn, tags, additional_properties):
+                                 execution_role_arn, runtime_platform, tags,
+                                 additional_properties):
         if tags:
             additional_properties['tags'] = tags
 
@@ -90,6 +91,7 @@ def register_task_definition(self, family, containers, volumes, role_arn,
             volumes=volumes,
             taskRoleArn=role_arn,
             executionRoleArn=execution_role_arn,
+            runtimePlatform=runtime_platform,
             **additional_properties
         )
 
@@ -273,7 +275,7 @@ def get_warnings(self, since=None, until=None):
 
 class EcsTaskDefinition(object):
     def __init__(self, containerDefinitions, volumes, family, revision,
-                 status, taskDefinitionArn, requiresAttributes=None,
+                 status, taskDefinitionArn, runtimePlatform=None, requiresAttributes=None,
                  taskRoleArn=None, executionRoleArn=None, compatibilities=None,
                  tags=None, registeredAt=None, deregisteredAt=None, registeredBy=None, **kwargs):
 
@@ -287,6 +289,7 @@ def __init__(self, containerDefinitions, volumes, family, revision,
         self.requires_attributes = requiresAttributes or {}
         self.role_arn = taskRoleArn or u''
         self.execution_role_arn = executionRoleArn or u''
+        self.runtime_platform = runtimePlatform or {}
         self.tags = tags
         self.additional_properties = kwargs
         self._diff = []
@@ -470,6 +473,21 @@ def set_health_checks(self, health_checks_list):
                 self._diff.append(diff)
                 container[u'healthCheck'] = new_health_checks
 
+    def set_runtime_platform(self, runtime_platforms_list):
+        if runtime_platforms_list:
+            runtime_platform = runtime_platforms_list[-1]
+            new_runtime_platform = {}
+            new_runtime_platform["cpuArchitecture"] = runtime_platform[0]
+            new_runtime_platform["operatingSystemFamily"] = runtime_platform[1]
+            diff = EcsTaskDefinitionDiff(
+                container=None,
+                field=u'runtimePlatform',
+                value=new_runtime_platform,
+                old_value=self.runtime_platform
+            )
+            self.runtime_platform = new_runtime_platform
+            self._diff.append(diff)
+
     def set_cpu(self, **cpu):
         self.validate_container_options(**cpu)
         for container in self.containers:
@@ -484,7 +502,7 @@ def set_cpu(self, **cpu):
 
                 self._diff.append(diff)
                 container[u'cpu'] = new_cpu
-    
+
     def set_memory(self, **memory):
         self.validate_container_options(**memory)
         for container in self.containers:
@@ -498,7 +516,7 @@ def set_memory(self, **memory):
                 )
                 self._diff.append(diff)
                 container[u'memory'] = new_memory
-    
+
     def set_memoryreservation(self, **memoryreservation):
         self.validate_container_options(**memoryreservation)
         for container in self.containers:
@@ -519,7 +537,7 @@ def set_privileged(self, **privileged):
             if container[u'name'] in privileged:
                 new_privileged = bool(privileged[container[u'name']])
                 old_privileged = container.get(u'privileged')
-                if not new_privileged == old_privileged: 
+                if not new_privileged == old_privileged:
                     diff = EcsTaskDefinitionDiff(
                         container=container[u'name'],
                         field=u'privileged',
@@ -535,7 +553,7 @@ def set_essential(self, **essential):
             if container[u'name'] in essential:
                 new_essential = bool(essential[container[u'name']])
                 old_essential = container.get(u'essential')
-                if not new_essential == old_essential: 
+                if not new_essential == old_essential:
                     diff = EcsTaskDefinitionDiff(
                         container=container[u'name'],
                         field=u'essential',
@@ -635,16 +653,16 @@ def set_docker_labels(self, dockerlabel_list, exclusive=False):
 
     def apply_docker_labels(self, container, new_dockerlabels, exclusive=False):
         old_dockerlabels = container.get('dockerLabels', {})
-        
+
         if exclusive is True:
             merged = new_dockerlabels
         else:
             merged = old_dockerlabels.copy()
             merged.update(new_dockerlabels)
-        
+
         if old_dockerlabels == merged:
             return
-        
+
         diff = EcsTaskDefinitionDiff(
             container=container[u'name'],
             field=u'dockerLabels',
@@ -652,7 +670,7 @@ def apply_docker_labels(self, container, new_dockerlabels, exclusive=False):
             old_value=old_dockerlabels
         )
         self._diff.append(diff)
-        
+
         container[u'dockerLabels'] = merged.copy()
     def set_s3_env_file(self, s3_env_files, exclusive=False):
         # environmentFiles in task definition https://docs.aws.amazon.com/AmazonECS/latest/developerguide/taskdef-envfiles.html
@@ -751,7 +769,7 @@ def apply_container_secrets(self, container, new_secrets, exclusive=False):
         container[u'secrets'] = [
             {"name": s, "valueFrom": merged[s]} for s in merged
         ]
-    
+
     def set_system_controls(self, system_controls_list, exclusive=False):
         system_controls = defaultdict(list)
         for system_control in system_controls_list:
@@ -760,7 +778,7 @@ def set_system_controls(self, system_controls_list, exclusive=False):
             mapping["namespace"] = system_control[1]
             mapping["value"] = system_control[2]
             system_controls[system_control[0]].append(mapping)
-            
+
         self.validate_container_options(**system_controls)
         for container in self.containers:
             if container[u'name'] in system_controls:
@@ -825,7 +843,7 @@ def set_ulimits(self, ulimits_list, exclusive=False):
             mapping["softLimit"] = int(ulimit[2])
             mapping["hardLimit"] = int(ulimit[3])
             ulimits[ulimit[0]].append(mapping)
-            
+
         self.validate_container_options(**ulimits)
         for container in self.containers:
             if container[u'name'] in ulimits:
@@ -1106,7 +1124,7 @@ def remove_containers(self, containers_list):
 
             containers_not_found = list(containers_ - set(self.container_names))
             # Remaining containers could not be found.
-            for container in containers_not_found: 
+            for container in containers_not_found:
                 logger.warning("Cannot remove container '{container}', not in the task definition.".format(container=container))
 
             if containers:
@@ -1268,6 +1286,7 @@ def update_task_definition(self, task_definition):
             volumes=task_definition.volumes,
             role_arn=task_definition.role_arn,
             execution_role_arn=task_definition.execution_role_arn,
+            runtime_platform=task_definition.runtime_platform,
             tags=task_definition.tags,
             additional_properties=task_definition.additional_properties
         )
diff --git a/tests/test_cli.py b/tests/test_cli.py
index a6b2990..dbddef6 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -350,6 +350,30 @@ def test_deploy_s3_env_file_with_previous_value(get_client, runner):
     assert u'Successfully changed task definition to: test-task:2' in result.output
     assert u'Deployment successful' in result.output
 
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_runtime_platform_with_previous_value(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '--runtime-platform', 'ARM64', 'WINDOWS'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed runtimePlatform to: "{\'cpuArchitecture\': \'ARM64\', \'operatingSystemFamily\': \'WINDOWS\'}" (was: "{\'cpuArchitecture\': \'X86_64\', \'operatingSystemFamily\': \'LINUX\'}")' in result.output
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
+@patch('ecs_deploy.cli.get_client')
+def test_update_previously_empty_runtime_platform_with_value(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_2, '--runtime-platform', 'X86_64', 'WINDOWS'))
+    assert result.exit_code == 0
+    assert not result.exception
+    assert u"Update task definition based on: test-task:2" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed runtimePlatform to: "{\'cpuArchitecture\': \'X86_64\', \'operatingSystemFamily\': \'WINDOWS\'}" (was: "{}")' in result.output
 
 @patch('ecs_deploy.cli.get_client')
 def test_deploy_exclusive_environment(get_client, runner):
diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index e7e0ce8..6ed7815 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -26,6 +26,7 @@
 TASK_DEFINITION_ROLE_ARN_1 = u'arn:test:role:1'
 TASK_DEFINITION_ARN_1 = u'arn:aws:ecs:eu-central-1:123456789012:task-definition/%s:%s' % (TASK_DEFINITION_FAMILY_1,
                                                                                           TASK_DEFINITION_REVISION_1)
+TASK_DEFINITION_RUNTIME_PLATFORM_1 = {u'cpuArchitecture': u'X86_64', u'operatingSystemFamily': u'LINUX'}
 TASK_DEFINITION_VOLUMES_1 = []
 TASK_DEFINITION_CONTAINERS_1 = [
     {u'name': u'webserver', u'image': u'webserver:123', u'command': u'run',
@@ -86,6 +87,7 @@
 
 PAYLOAD_TASK_DEFINITION_1 = {
     u'taskDefinitionArn': TASK_DEFINITION_ARN_1,
+    u'runtimePlatform': deepcopy(TASK_DEFINITION_RUNTIME_PLATFORM_1),
     u'family': TASK_DEFINITION_FAMILY_1,
     u'revision': TASK_DEFINITION_REVISION_1,
     u'taskRoleArn': TASK_DEFINITION_ROLE_ARN_1,
@@ -1088,6 +1090,7 @@ def test_client_register_task_definition(client):
     volumes = [{u'foo': u'bar'}]
     role_arn = 'arn:test:role'
     execution_role_arn = 'arn:test:role'
+    runtime_platform = {u'cpuArchitecture': u'X86_64', u'operatingSystemFamily': u'LINUX'}
     task_definition = EcsTaskDefinition(
         containerDefinitions=containers,
         volumes=volumes,
@@ -1095,6 +1098,7 @@ def test_client_register_task_definition(client):
         revision=1,
         taskRoleArn=role_arn,
         executionRoleArn=execution_role_arn,
+        runtimePlatform=runtime_platform,
         tags={
             'Name': 'test_client_register_task_definition'
         },
@@ -1110,6 +1114,7 @@ def test_client_register_task_definition(client):
         volumes=task_definition.volumes,
         role_arn=task_definition.role_arn,
         execution_role_arn=execution_role_arn,
+        runtime_platform=task_definition.runtime_platform,
         tags=task_definition.tags,
         additional_properties=task_definition.additional_properties
     )
@@ -1120,6 +1125,7 @@ def test_client_register_task_definition(client):
         volumes=volumes,
         taskRoleArn=role_arn,
         executionRoleArn=execution_role_arn,
+        runtimePlatform=runtime_platform,
         tags=task_definition.tags,
         unkownProperty='foobar'
     )
@@ -1130,6 +1136,7 @@ def test_client_register_task_definition_without_tags(client):
     volumes = [{u'foo': u'bar'}]
     role_arn = 'arn:test:role'
     execution_role_arn = 'arn:test:role'
+    runtime_platform = {u'cpuArchitecture': u'X86_64', u'operatingSystemFamily': u'LINUX'}
     task_definition = EcsTaskDefinition(
         containerDefinitions=containers,
         volumes=volumes,
@@ -1137,6 +1144,7 @@ def test_client_register_task_definition_without_tags(client):
         revision=1,
         taskRoleArn=role_arn,
         executionRoleArn=execution_role_arn,
+        runtimePlatform=runtime_platform,
         tags={},
         status='active',
         taskDefinitionArn='arn:task',
@@ -1150,6 +1158,7 @@ def test_client_register_task_definition_without_tags(client):
         volumes=task_definition.volumes,
         role_arn=task_definition.role_arn,
         execution_role_arn=execution_role_arn,
+        runtime_platform=task_definition.runtime_platform,
         tags=task_definition.tags,
         additional_properties=task_definition.additional_properties
     )
@@ -1160,6 +1169,7 @@ def test_client_register_task_definition_without_tags(client):
         volumes=volumes,
         taskRoleArn=role_arn,
         executionRoleArn=execution_role_arn,
+        runtimePlatform=runtime_platform,
         unkownProperty='foobar'
     )
 
@@ -1275,6 +1285,7 @@ def test_update_task_definition(client, task_definition):
         volumes=task_definition.volumes,
         role_arn=task_definition.role_arn,
         execution_role_arn=task_definition.execution_role_arn,
+        runtime_platform=task_definition.runtime_platform,
         tags=task_definition.tags,
         additional_properties={
             u'networkMode': u'host',
@@ -1592,7 +1603,7 @@ def describe_tasks(self, cluster_name, task_arns):
         return deepcopy(RESPONSE_DESCRIBE_TASKS)
 
     def register_task_definition(self, family, containers, volumes, role_arn,
-                                 execution_role_arn, tags, additional_properties):
+                                 execution_role_arn, runtime_platform, tags, additional_properties):
         if not self.access_key_id or not self.secret_access_key:
             raise EcsConnectionError(u'Unable to locate credentials. Configure credentials by running "aws configure".')
         return deepcopy(RESPONSE_TASK_DEFINITION_2)

From 61d89429bd80bac636277e21c0c73295009aaeec Mon Sep 17 00:00:00 2001
From: Mark Heiges <mark.heiges@semanticbits.com>
Date: Tue, 11 Jan 2022 11:18:35 -0500
Subject: [PATCH 03/63] fix typo in runtime-platform help

---
 ecs_deploy/cli.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index 54ce8c7..d30ee96 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -48,7 +48,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('-l', '--log', type=(str, str, str, str), multiple=True, help='Adds or changes a log configuration in the container description (Not available for Fargate): <container> <log driver> <option name> <option value>')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
 @click.option('-x', '--execution-role', type=str, help='Sets the execution\'s role ARN: <execution role ARN>')
-@click.option('--runtime-platform', type=(str, str), multiple=True, help='Overwrites runtimePatform: <cpuArchitecture> <operatingSystemFamily>')
+@click.option('--runtime-platform', type=(str, str), multiple=True, help='Overwrites runtimePlatform: <cpuArchitecture> <operatingSystemFamily>')
 @click.option('--task', type=str, help='Task definition to be deployed. Can be a task ARN or a task family with optional revision')
 @click.option('--region', required=False, help='AWS region (e.g. eu-central-1)')
 @click.option('--access-key-id', required=False, help='AWS access key id')
@@ -290,7 +290,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
 @click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
-@click.option('--runtime-platform', type=(str, str), multiple=True, help='Overwrites runtimePatform: <cpuArchitecture> <operatingSystemFamily>')
+@click.option('--runtime-platform', type=(str, str), multiple=True, help='Overwrites runtimePlatform: <cpuArchitecture> <operatingSystemFamily>')
 @click.option('--region', help='AWS region (e.g. eu-central-1)')
 @click.option('--access-key-id', help='AWS access key id')
 @click.option('--secret-access-key', help='AWS secret access key')

From 281fdc3555db03d9d6c94a81d597dd3c01a0c80d Mon Sep 17 00:00:00 2001
From: Mark Heiges <mark.heiges@semanticbits.com>
Date: Tue, 11 Jan 2022 14:08:55 -0500
Subject: [PATCH 04/63] improve runtime-platform tests

---
 ecs_deploy/ecs.py |  4 ++--
 tests/test_cli.py | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index 5771aca..c122869 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -477,8 +477,8 @@ def set_runtime_platform(self, runtime_platforms_list):
         if runtime_platforms_list:
             runtime_platform = runtime_platforms_list[-1]
             new_runtime_platform = {}
-            new_runtime_platform["cpuArchitecture"] = runtime_platform[0]
-            new_runtime_platform["operatingSystemFamily"] = runtime_platform[1]
+            new_runtime_platform[u'cpuArchitecture'] = runtime_platform[0]
+            new_runtime_platform[u'operatingSystemFamily'] = runtime_platform[1]
             diff = EcsTaskDefinitionDiff(
                 container=None,
                 field=u'runtimePlatform',
diff --git a/tests/test_cli.py b/tests/test_cli.py
index dbddef6..bde060e 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -354,12 +354,15 @@ def test_deploy_s3_env_file_with_previous_value(get_client, runner):
 def test_deploy_runtime_platform_with_previous_value(get_client, runner):
     get_client.return_value = EcsTestClient('acces_key', 'secret_key')
     result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '--runtime-platform', 'ARM64', 'WINDOWS'))
-
+    expected_runtime_platform = {
+      u'cpuArchitecture': u'ARM64',
+      u'operatingSystemFamily': u'WINDOWS'
+    }
     assert result.exit_code == 0
     assert not result.exception
     assert u"Deploying based on task definition: test-task:1" in result.output
     assert u"Updating task definition" in result.output
-    assert u'Changed runtimePlatform to: "{\'cpuArchitecture\': \'ARM64\', \'operatingSystemFamily\': \'WINDOWS\'}" (was: "{\'cpuArchitecture\': \'X86_64\', \'operatingSystemFamily\': \'LINUX\'}")' in result.output
+    assert str(expected_runtime_platform) in result.output
     assert u'Successfully created revision: 2' in result.output
     assert u'Successfully deregistered revision: 1' in result.output
     assert u'Successfully changed task definition to: test-task:2' in result.output
@@ -368,12 +371,18 @@ def test_deploy_runtime_platform_with_previous_value(get_client, runner):
 @patch('ecs_deploy.cli.get_client')
 def test_update_previously_empty_runtime_platform_with_value(get_client, runner):
     get_client.return_value = EcsTestClient('acces_key', 'secret_key')
-    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_2, '--runtime-platform', 'X86_64', 'WINDOWS'))
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_2, '--runtime-platform', 'ARM64', 'WINDOWS'))
     assert result.exit_code == 0
     assert not result.exception
     assert u"Update task definition based on: test-task:2" in result.output
     assert u"Updating task definition" in result.output
-    assert u'Changed runtimePlatform to: "{\'cpuArchitecture\': \'X86_64\', \'operatingSystemFamily\': \'WINDOWS\'}" (was: "{}")' in result.output
+    expected_runtime_platform = {
+      u'cpuArchitecture': u'ARM64',
+      u'operatingSystemFamily': u'WINDOWS'
+    }
+    assert str(expected_runtime_platform) in result.output
+    assert u"Creating new task definition revision" in result.output
+    assert u"Successfully created revision: 2" in result.output
 
 @patch('ecs_deploy.cli.get_client')
 def test_deploy_exclusive_environment(get_client, runner):

From 2f07c9d084d8415b9289feb8de5532b95e32ff7c Mon Sep 17 00:00:00 2001
From: Mark Heiges <mark.heiges@semanticbits.com>
Date: Wed, 12 Jan 2022 10:03:05 -0500
Subject: [PATCH 05/63] improve arity syntax for runtime-platform cli opt

---
 ecs_deploy/cli.py | 4 ++--
 ecs_deploy/ecs.py | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index d30ee96..7e0b8a5 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -48,7 +48,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('-l', '--log', type=(str, str, str, str), multiple=True, help='Adds or changes a log configuration in the container description (Not available for Fargate): <container> <log driver> <option name> <option value>')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
 @click.option('-x', '--execution-role', type=str, help='Sets the execution\'s role ARN: <execution role ARN>')
-@click.option('--runtime-platform', type=(str, str), multiple=True, help='Overwrites runtimePlatform: <cpuArchitecture> <operatingSystemFamily>')
+@click.option('--runtime-platform', type=str, nargs=2, help='Overwrites runtimePlatform: <cpuArchitecture> <operatingSystemFamily>')
 @click.option('--task', type=str, help='Task definition to be deployed. Can be a task ARN or a task family with optional revision')
 @click.option('--region', required=False, help='AWS region (e.g. eu-central-1)')
 @click.option('--access-key-id', required=False, help='AWS access key id')
@@ -290,7 +290,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
 @click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
-@click.option('--runtime-platform', type=(str, str), multiple=True, help='Overwrites runtimePlatform: <cpuArchitecture> <operatingSystemFamily>')
+@click.option('--runtime-platform', type=str, nargs=2, help='Overwrites runtimePlatform: <cpuArchitecture> <operatingSystemFamily>')
 @click.option('--region', help='AWS region (e.g. eu-central-1)')
 @click.option('--access-key-id', help='AWS access key id')
 @click.option('--secret-access-key', help='AWS secret access key')
diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index c122869..cd8e669 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -473,9 +473,8 @@ def set_health_checks(self, health_checks_list):
                 self._diff.append(diff)
                 container[u'healthCheck'] = new_health_checks
 
-    def set_runtime_platform(self, runtime_platforms_list):
-        if runtime_platforms_list:
-            runtime_platform = runtime_platforms_list[-1]
+    def set_runtime_platform(self, runtime_platform):
+        if runtime_platform:
             new_runtime_platform = {}
             new_runtime_platform[u'cpuArchitecture'] = runtime_platform[0]
             new_runtime_platform[u'operatingSystemFamily'] = runtime_platform[1]

From 289c51b0521999d21a946d0d81b12c38e440e6a2 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Fri, 14 Jan 2022 07:21:42 +0100
Subject: [PATCH 06/63] Add line break before printing the "waiting dots" to
 improve rendering in browsers

---
 ecs_deploy/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index 4fdb403..a798261 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -494,7 +494,7 @@ def diff(task, revision_a, revision_b, region, access_key_id, secret_access_key,
 
 def wait_for_finish(action, timeout, title, success_message, failure_message,
                     ignore_warnings, sleep_time=1):
-    click.secho(title, nl=False)
+    click.secho(title)
     waiting_timeout = datetime.now() + timedelta(seconds=timeout)
     service = action.get_service()
     inspected_until = None

From d36a5970f2907ccbe61dbe6d07c67a1e6124241a Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Fri, 14 Jan 2022 07:24:42 +0100
Subject: [PATCH 07/63] Print duration of action after waiting for the result

---
 ecs_deploy/cli.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index a798261..2a00f5f 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -495,6 +495,7 @@ def diff(task, revision_a, revision_b, region, access_key_id, secret_access_key,
 def wait_for_finish(action, timeout, title, success_message, failure_message,
                     ignore_warnings, sleep_time=1):
     click.secho(title)
+    start_timestamp = datetime.now()
     waiting_timeout = datetime.now() + timedelta(seconds=timeout)
     service = action.get_service()
     inspected_until = None
@@ -527,7 +528,8 @@ def wait_for_finish(action, timeout, title, success_message, failure_message,
         timeout=waiting
     )
 
-    click.secho('\n%s\n' % success_message, fg='green')
+    click.secho('\n%s' % success_message, fg='green')
+    click.secho('Duration: %s sec\n' % (datetime.now() - start_timestamp).seconds)
 
 
 def deploy_task_definition(deployment, task_definition, title, success_message,

From fdedebe81f5563e96524860b3515d70de92b77be Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Fri, 14 Jan 2022 07:49:41 +0100
Subject: [PATCH 08/63] Adjust test for printing waiting-dots in separate line

---
 tests/test_cli.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index bde060e..16473c7 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -779,7 +779,8 @@ def test_deploy_with_wait_within_timeout(get_client, runner):
     get_client.return_value = EcsTestClient('acces_key', 'secret_key', wait=2)
     result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '--timeout', '10'))
     assert result.exit_code == 0
-    assert u'Deploying new task definition...' in result.output
+    assert u'Deploying new task definition' in result.output
+    assert u'...' in result.output
 
 
 @patch('ecs_deploy.cli.get_client')

From a84519852cb063ceaac972136ac7b80615bc7048 Mon Sep 17 00:00:00 2001
From: Eric Obeysekare <eric.obeysekare@franklincovey.com>
Date: Thu, 17 Feb 2022 15:56:09 -0500
Subject: [PATCH 09/63] Relax click version constraint

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 1cf7549..dcfda87 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ def readme():
 
 
 dependencies = [
-    'click==7.1.2',
+    'click>=7.1.2, <9',
     'click-log==0.3.2',
     'botocore>=1.17.47',
     'boto3>=1.14.47',

From e41703684408d34e376819fe76caf58ca0c65f4f Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <fabian.fuelling@packmatic.io>
Date: Fri, 11 Mar 2022 16:35:49 +0100
Subject: [PATCH 10/63] Move test requirements to requirements-test.txt and set
 up Github workflow

---
 .github/workflows/python-package.yml | 39 ++++++++++++++++++++++++++++
 requirements-test.txt                |  8 ++++++
 setup.py                             |  8 ------
 3 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/python-package.yml
 create mode 100644 requirements-test.txt

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
new file mode 100644
index 0000000..c912794
--- /dev/null
+++ b/.github/workflows/python-package.yml
@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements-test.txt
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        py-test
diff --git a/requirements-test.txt b/requirements-test.txt
new file mode 100644
index 0000000..456a257
--- /dev/null
+++ b/requirements-test.txt
@@ -0,0 +1,8 @@
+pytest
+pytest-cov
+pytest-mock
+mock
+requests
+boto3
+freezegun
+flake8
diff --git a/setup.py b/setup.py
index dcfda87..72894cc 100644
--- a/setup.py
+++ b/setup.py
@@ -42,14 +42,6 @@ def readme():
             'ecs = ecs_deploy.cli:ecs',
         ],
     },
-    tests_require=[
-        'mock',
-        'pytest',
-        'pytest-flake8',
-        'pytest-mock',
-        'freezegun',
-        'coverage'
-    ],
     classifiers=[
         'Environment :: Console',
         'Intended Audience :: Developers',

From 94debc42d7e8ece50ee5646bc9bc1758ea8ef287 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <fabian.fuelling@packmatic.io>
Date: Fri, 11 Mar 2022 16:47:40 +0100
Subject: [PATCH 11/63] Fix pytest command

---
 .github/workflows/python-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index c912794..5887f15 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -36,4 +36,4 @@ jobs:
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
-        py-test
+        pytest

From 203f29a41914f86d6286a6c9d98367d7ef63c95a Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <fabian.fuelling@packmatic.io>
Date: Fri, 11 Mar 2022 16:49:27 +0100
Subject: [PATCH 12/63] Install package requirements (in addition to test
 requirements)

---
 .github/workflows/python-package.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 5887f15..0484183 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -27,6 +27,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        pip install .
         pip install -r requirements-test.txt
     - name: Lint with flake8
       run: |

From 13587d3fce18a117c1e191b9991908e13214eb3a Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <fabian.fuelling@packmatic.io>
Date: Fri, 11 Mar 2022 16:54:32 +0100
Subject: [PATCH 13/63] Add legacy python versions and Scrutinizer upload

---
 .github/workflows/python-package.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 0484183..c2afcf3 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2
@@ -32,9 +32,11 @@ jobs:
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 ecs_deploy tests --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
+        flake8 ecs_deploy tests --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest --cov ecs_deploy
       run: |
         pytest
+  - name: Upload Scrutinizer coverage
+    uses: sudo-bot/action-scrutinizer@latest

From 5af0c4be50d10e7d881435e288903c566ddf826d Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <fabian.fuelling@packmatic.io>
Date: Fri, 11 Mar 2022 16:55:43 +0100
Subject: [PATCH 14/63] Fix indentation

---
 .github/workflows/python-package.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index c2afcf3..1dd70e8 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -38,5 +38,5 @@ jobs:
     - name: Test with pytest --cov ecs_deploy
       run: |
         pytest
-  - name: Upload Scrutinizer coverage
-    uses: sudo-bot/action-scrutinizer@latest
+    - name: Upload Scrutinizer coverage
+      uses: sudo-bot/action-scrutinizer@latest

From 641560ed9bbb57509e0c58eeed22f3c6bca7b834 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sat, 12 Mar 2022 16:14:22 +0100
Subject: [PATCH 15/63] Remove Scrutinizer integration

---
 .github/workflows/python-package.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 1dd70e8..1067a6c 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -38,5 +38,3 @@ jobs:
     - name: Test with pytest --cov ecs_deploy
       run: |
         pytest
-    - name: Upload Scrutinizer coverage
-      uses: sudo-bot/action-scrutinizer@latest

From b7994f67e23d25f57a27ece8098c26fd344e6772 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sat, 12 Mar 2022 16:18:33 +0100
Subject: [PATCH 16/63] Rename workflow to: Build

---
 .github/workflows/python-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 1067a6c..71d3737 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Python package
+name: Build
 
 on:
   push:

From 53fb1ea02f3682c48afa75dd16a7405a0330fc4d Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sat, 12 Mar 2022 16:20:45 +0100
Subject: [PATCH 17/63] Rename workflow file to build.yml

---
 .github/workflows/{python-package.yml => build.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{python-package.yml => build.yml} (100%)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/build.yml
similarity index 100%
rename from .github/workflows/python-package.yml
rename to .github/workflows/build.yml

From e42d55a939131a4ec138523ea9b9f68bbfa36122 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sat, 12 Mar 2022 16:22:03 +0100
Subject: [PATCH 18/63] Replace Travis and Scrutinizer badges with GitHub
 Actions

---
 README.rst | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 43f8fc6..b6e8e8e 100644
--- a/README.rst
+++ b/README.rst
@@ -4,11 +4,8 @@ ECS Deploy
 .. image:: https://badge.fury.io/py/ecs-deploy.svg
     :target: https://badge.fury.io/py/ecs-deploy
 
-.. image:: https://travis-ci.com/fabfuel/ecs-deploy.svg?branch=develop
-    :target: https://travis-ci.com/github/fabfuel/ecs-deploy
-
-.. image:: https://scrutinizer-ci.com/g/fabfuel/ecs-deploy/badges/coverage.png?b=develop
-    :target: https://scrutinizer-ci.com/g/fabfuel/ecs-deploy
+.. image:: https://github.com/fabfuel/ecs-deploy/actions/workflows/build.yml/badge.svg
+    :target: https://github.com/fabfuel/ecs-deploy/actions/workflows/build.yml
 
 `ecs-deploy` simplifies deployments on Amazon ECS by providing a convinience CLI tool for complex actions, which are executed pretty often.
 

From ff10ffb963c7cca5dd46aa43fd62740c0bf3bdc4 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sat, 12 Mar 2022 16:24:05 +0100
Subject: [PATCH 19/63] Remove Travis config

---
 .travis.yml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a0c7b60..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: python
-python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
-  - "3.7"
-  - "3.8"
-  - "3.9"
-install: pip install tox-travis
-script: tox
-after_script:
-    - pip install scrutinizer-ocular
-    - ocular --data-file ".coverage"

From 24eebc6aa55129c35e4956f47cedf882ba5ff0e2 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Fri, 18 Mar 2022 06:43:38 +0100
Subject: [PATCH 20/63] Add Python 3.11.0-alpha.5 to build workflow

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 71d3737..d9fad53 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha.5"]
 
     steps:
     - uses: actions/checkout@v2

From 84c1b5d527ddced1a1189b1cf0b960dd6cc87585 Mon Sep 17 00:00:00 2001
From: pbthorste <pbthorste@users.noreply.github.com>
Date: Fri, 1 Apr 2022 12:23:09 +0200
Subject: [PATCH 21/63] make task cpu and memory configurable

---
 README.rst        | 20 +++++++++++---------
 ecs_deploy/cli.py | 12 ++++++++++--
 ecs_deploy/ecs.py | 35 +++++++++++++++++++++++++++++++++--
 tests/test_ecs.py | 36 +++++++++++++++++++++++++++++-------
 4 files changed, 83 insertions(+), 20 deletions(-)

diff --git a/README.rst b/README.rst
index b6e8e8e..49f55f0 100644
--- a/README.rst
+++ b/README.rst
@@ -7,7 +7,7 @@ ECS Deploy
 .. image:: https://github.com/fabfuel/ecs-deploy/actions/workflows/build.yml/badge.svg
     :target: https://github.com/fabfuel/ecs-deploy/actions/workflows/build.yml
 
-`ecs-deploy` simplifies deployments on Amazon ECS by providing a convinience CLI tool for complex actions, which are executed pretty often.
+`ecs-deploy` simplifies deployments on Amazon ECS by providing a convenience CLI tool for complex actions, which are executed pretty often.
 
 Key Features
 ------------
@@ -45,7 +45,7 @@ Update a task definition (without running or deploying)::
 Installation
 ------------
 
-The project is availably on PyPI. Simply run::
+The project is available on PyPI. Simply run::
 
     $ pip install ecs-deploy
 
@@ -143,7 +143,7 @@ Deployment
 
 Simple Redeploy
 ===============
-To redeploy a service without any modifications, but pulling the most recent image versions, run the follwing command.
+To redeploy a service without any modifications, but pulling the most recent image versions, run the following command.
 This will duplicate the current task definition and cause the service to redeploy all running tasks.::
 
     $ ecs deploy my-cluster my-service
@@ -295,7 +295,7 @@ To change the command of a specific container, run the following command::
     $ ecs deploy my-cluster my-service --command webserver "nginx"
 
 This will modify the **webserver** container and change its command to "nginx". If you have 
-a command that requries arugments as well, then you can simply specify it like this as you would normally do:
+a command that requires arguments as well, then you can simply specify it like this as you would normally do:
 
     $ ecs deploy my-cluster my-service --command webserver "ngnix -c /etc/ngnix/ngnix.conf"
 
@@ -321,13 +321,15 @@ This will set the task role to "MySpecialEcsTaskRole".
 
 Set CPU and memory reservation
 ==============================
-- Set the `cpu` value for a task definition: :code:`--cpu <container_name> 0`.
-- Set the `memory` value (`hard limit`) for a task definition: :code:`--memory <container_name> 256`.
+- Set the `cpu` value for a task: :code:`--task-cpu 0`.
+- Set the `cpu` value for a task container: :code:`--cpu <container_name> 0`.
+- Set the `memory` value (`hard limit`) for a task: :code:`--task-memory 256`.
+- Set the `memory` value (`hard limit`) for a task container: :code:`--memory <container_name> 256`.
 - Set the `memoryreservation` value (`soft limit`) for a task definition: :code:`--memoryreservation <container_name> 256`.
 
 Set privileged or essential flags
 =================================
-- Set the `privliged` value for a task definition: :code:`--privileged <container_name> True|False`.
+- Set the `privileged` value for a task definition: :code:`--privileged <container_name> True|False`.
 - Set the `essential` value for a task definition: :code:`--essential <container_name> True|False`.
 
 Set logging configuration
@@ -374,7 +376,7 @@ Placeholder Container
 =====================
 - Add placeholder containers: :code:`--add-container <container_name>`.
 - To comply with the minimum requirements for a task definition, a placeholder container is set like this:
-    + The contaienr name is :code:`<container_name>`.
+    + The container name is :code:`<container_name>`.
     + The container image is :code:`PLACEHOLDER`.
     + The container soft limit is :code:`128`.
 - The idea is to set sensible values with the deployment.
@@ -497,7 +499,7 @@ Optionally you can provide additional information for the deployment:
 
 - ``--comment "New feature X"`` - comment to the deployment
 - ``--user john.doe`` - the name of the user who deployed with
-- ``--newrelic-revision 1.0.0`` - explicitly set the revison to use for the deployment
+- ``--newrelic-revision 1.0.0`` - explicitly set the revision to use for the deployment
 
 Note: If neither ``--tag`` nor ``--newrelic-revision`` are provided, the deployment will not be recorded.
 
diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index 2a00f5f..ccc0811 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -34,6 +34,8 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--cpu', type=(str, int), multiple=True, help='Overwrites the cpu value for a container: <container> <cpu>')
 @click.option('--memory', type=(str, int), multiple=True, help='Overwrites the memory value for a container: <container> <memory>')
 @click.option('--memoryreservation', type=(str, int), multiple=True, help='Overwrites the memory reservation value for a container: <container> <memoryreservation>')
+@click.option('--task-cpu', type=int, help='Overwrites the cpu value for a task: <cpu>')
+@click.option('--task-memory', type=int, help='Overwrites the memory value for a task: <memory>')
 @click.option('--privileged', type=(str, bool), multiple=True, help='Overwrites the privileged value for a container: <container> <privileged>')
 @click.option('--essential', type=(str, bool), multiple=True, help='Overwrites the essential value for a container: <container> <essential>')
 @click.option('-e', '--env', type=(str, str, str), multiple=True, help='Adds or changes an environment variable: <container> <name> <value>')
@@ -79,7 +81,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
 @click.option('--add-container', type=str, multiple=True, required=False, help='Add a placeholder container in the task definition.')
 @click.option('--remove-container', type=str, multiple=True, required=False, help='Remove a container from the task definition.')
-def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, privileged, essential, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, runtime_platform, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
+def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, essential, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, runtime_platform, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
     """
     Redeploy or modify a service.
 
@@ -105,6 +107,8 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
         td.set_cpu(**{key: value for (key, value) in cpu})
         td.set_memory(**{key: value for (key, value) in memory})
         td.set_memoryreservation(**{key: value for (key, value) in memoryreservation})
+        td.set_task_cpu(task_cpu)
+        td.set_task_memory(task_memory)
         td.set_privileged(**{key: value for (key, value) in privileged})
         td.set_essential(**{key: value for (key, value) in essential})
         td.set_environment(env, exclusive_env, env_file)
@@ -176,6 +180,8 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--cpu', type=(str, int), multiple=True, help='Overwrites the cpu value for a container: <container> <cpu>')
 @click.option('--memory', type=(str, int), multiple=True, help='Overwrites the memory value for a container: <container> <memory>')
 @click.option('--memoryreservation', type=(str, int), multiple=True, help='Overwrites the memory reservation value for a container: <container> <memoryreservation>')
+@click.option('--task-cpu', type=int, help='Overwrites the cpu value for a task: <cpu>')
+@click.option('--task-memory', type=int, help='Overwrites the memory value for a task: <memory>')
 @click.option('--privileged', type=(str, bool), multiple=True, help='Overwrites the memory reservation value for a container: <container> <memoryreservation>')
 @click.option('-e', '--env', type=(str, str, str), multiple=True, help='Adds or changes an environment variable: <container> <name> <value>')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
@@ -213,7 +219,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--exclusive-ports', is_flag=True, default=False, help='Set the given port mappings exclusively and remove all other pre-existing port mappings from all containers')
 @click.option('--exclusive-mounts', is_flag=True, default=False, help='Set the given mount points exclusively and remove all other pre-existing mount points from all containers')
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
-def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservation, privileged, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, region, access_key_id, secret_access_key, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, profile, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, slack_url, slack_service_match, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, docker_label, exclusive_docker_labels):
+def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, region, access_key_id, secret_access_key, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, profile, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, slack_url, slack_service_match, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, docker_label, exclusive_docker_labels):
     """
     Update a scheduled task.
 
@@ -234,6 +240,8 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
         td.set_cpu(**{key: value for (key, value) in cpu})
         td.set_memory(**{key: value for (key, value) in memory})
         td.set_memoryreservation(**{key: value for (key, value) in memoryreservation})
+        td.set_task_cpu(task_cpu)
+        td.set_task_memory(task_memory)
         td.set_privileged(**{key: value for (key, value) in privileged})
         td.set_environment(env, exclusive_env, env_file)
         td.set_docker_labels(docker_label, exclusive_docker_labels)
diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index cd8e669..0f5d70d 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -81,6 +81,7 @@ def describe_tasks(self, cluster_name, task_arns):
 
     def register_task_definition(self, family, containers, volumes, role_arn,
                                  execution_role_arn, runtime_platform, tags,
+                                 cpu, memory,
                                  additional_properties):
         if tags:
             additional_properties['tags'] = tags
@@ -92,6 +93,8 @@ def register_task_definition(self, family, containers, volumes, role_arn,
             taskRoleArn=role_arn,
             executionRoleArn=execution_role_arn,
             runtimePlatform=runtime_platform,
+            cpu=cpu,
+            memory=memory,
             **additional_properties
         )
 
@@ -275,7 +278,7 @@ def get_warnings(self, since=None, until=None):
 
 class EcsTaskDefinition(object):
     def __init__(self, containerDefinitions, volumes, family, revision,
-                 status, taskDefinitionArn, runtimePlatform=None, requiresAttributes=None,
+                 status, taskDefinitionArn, runtimePlatform=None, cpu=None, memory=None, requiresAttributes=None,
                  taskRoleArn=None, executionRoleArn=None, compatibilities=None,
                  tags=None, registeredAt=None, deregisteredAt=None, registeredBy=None, **kwargs):
 
@@ -290,6 +293,8 @@ def __init__(self, containerDefinitions, volumes, family, revision,
         self.role_arn = taskRoleArn or u''
         self.execution_role_arn = executionRoleArn or u''
         self.runtime_platform = runtimePlatform or {}
+        self.cpu = cpu
+        self.memory = memory
         self.tags = tags
         self.additional_properties = kwargs
         self._diff = []
@@ -502,6 +507,30 @@ def set_cpu(self, **cpu):
                 self._diff.append(diff)
                 container[u'cpu'] = new_cpu
 
+    def set_task_cpu(self, task_cpu):
+        if task_cpu:
+            new_cpu = str(task_cpu)
+            diff = EcsTaskDefinitionDiff(
+                container=None,
+                field=u'cpu',
+                value=new_cpu,
+                old_value=self.cpu
+            )
+            self._diff.append(diff)
+            self.cpu = new_cpu
+
+    def set_task_memory(self, task_memory):
+        if task_memory:
+            new_memory = str(task_memory)
+            diff = EcsTaskDefinitionDiff(
+                container=None,
+                field=u'memory',
+                value=new_memory,
+                old_value=self.memory
+            )
+            self._diff.append(diff)
+            self.memory = new_memory
+
     def set_memory(self, **memory):
         self.validate_container_options(**memory)
         for container in self.containers:
@@ -1287,7 +1316,9 @@ def update_task_definition(self, task_definition):
             execution_role_arn=task_definition.execution_role_arn,
             runtime_platform=task_definition.runtime_platform,
             tags=task_definition.tags,
-            additional_properties=task_definition.additional_properties
+            additional_properties=task_definition.additional_properties,
+            cpu=task_definition.cpu,
+            memory=task_definition.memory
         )
         new_task_definition = EcsTaskDefinition(**response[u'taskDefinition'])
         return new_task_definition
diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index 6ed7815..ab6a22a 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -840,6 +840,16 @@ def test_task_set_mount_points(task_definition):
     assert {'sourceVolume': 'volume', 'containerPath': '/data/path', 'readOnly': False} in task_definition.containers[0]['mountPoints']
     assert {'sourceVolume': 'another_volume', 'containerPath': '/logs/path', 'readOnly': False} in task_definition.containers[0]['mountPoints']
 
+def test_task_set_task_cpu(task_definition):
+    assert task_definition.cpu is None
+    task_definition.set_task_cpu(256)
+    assert task_definition.cpu == '256'
+
+def test_task_set_task_memory(task_definition):
+    assert task_definition.memory is None
+    task_definition.set_task_memory(1024)
+    assert task_definition.memory == '1024'
+
 def test_task_set_mount_points_exclusively(task_definition):
     assert len(task_definition.containers[0]['mountPoints']) == 1
     assert '/container/path' == task_definition.containers[0]['mountPoints'][0]['containerPath']
@@ -1105,7 +1115,9 @@ def test_client_register_task_definition(client):
         status='active',
         taskDefinitionArn='arn:task',
         requiresAttributes={},
-        unkownProperty='foobar'
+        unkownProperty='foobar',
+        cpu=256,
+        memory=1024
     )
 
     client.register_task_definition(
@@ -1116,7 +1128,9 @@ def test_client_register_task_definition(client):
         execution_role_arn=execution_role_arn,
         runtime_platform=task_definition.runtime_platform,
         tags=task_definition.tags,
-        additional_properties=task_definition.additional_properties
+        additional_properties=task_definition.additional_properties,
+        cpu=256,
+        memory=1024
     )
 
     client.boto.register_task_definition.assert_called_once_with(
@@ -1127,7 +1141,9 @@ def test_client_register_task_definition(client):
         executionRoleArn=execution_role_arn,
         runtimePlatform=runtime_platform,
         tags=task_definition.tags,
-        unkownProperty='foobar'
+        unkownProperty='foobar',
+        cpu=256,
+        memory=1024
     )
 
 
@@ -1160,7 +1176,9 @@ def test_client_register_task_definition_without_tags(client):
         execution_role_arn=execution_role_arn,
         runtime_platform=task_definition.runtime_platform,
         tags=task_definition.tags,
-        additional_properties=task_definition.additional_properties
+        additional_properties=task_definition.additional_properties,
+        cpu=256,
+        memory=1024
     )
 
     client.boto.register_task_definition.assert_called_once_with(
@@ -1170,7 +1188,9 @@ def test_client_register_task_definition_without_tags(client):
         taskRoleArn=role_arn,
         executionRoleArn=execution_role_arn,
         runtimePlatform=runtime_platform,
-        unkownProperty='foobar'
+        unkownProperty='foobar',
+        cpu=256,
+        memory=1024
     )
 
 
@@ -1291,7 +1311,9 @@ def test_update_task_definition(client, task_definition):
             u'networkMode': u'host',
             u'placementConstraints': {},
             u'unknownProperty': u'lorem-ipsum'
-        }
+        },
+        cpu=None,
+        memory=None
     )
 
 
@@ -1603,7 +1625,7 @@ def describe_tasks(self, cluster_name, task_arns):
         return deepcopy(RESPONSE_DESCRIBE_TASKS)
 
     def register_task_definition(self, family, containers, volumes, role_arn,
-                                 execution_role_arn, runtime_platform, tags, additional_properties):
+                                 execution_role_arn, runtime_platform, tags, cpu, memory, additional_properties):
         if not self.access_key_id or not self.secret_access_key:
             raise EcsConnectionError(u'Unable to locate credentials. Configure credentials by running "aws configure".')
         return deepcopy(RESPONSE_TASK_DEFINITION_2)

From 4294a5ad79fe4664039a86af5a1ede50ee43be08 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 06:52:46 +0200
Subject: [PATCH 22/63] Add GitHub Action workflow to build Docker image (#202)

---
 .github/workflows/docker.yml | 45 ++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..8806836
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,45 @@
+name: Docker Hub
+
+on:
+  push:
+    branches:
+      - 'develop'
+      - 'master'
+    tags: 
+      - '*.*.*'
+    
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+
+    steps:
+      -
+        name: Checkout 
+        uses: actions/checkout@v2
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: fabfuel
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: fabfuel/ecs-deplos:${{ github.ref_name }}
+      -
+        name: "Build and push (tag: latest)"
+        if: github.ref == 'refs/heads/develop'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: fabfuel/ecs-deplos:latest

From abcd91c9e3600e4fe2e8efee62aaadb716e85f66 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 06:58:51 +0200
Subject: [PATCH 23/63] Fix Docker hub name

---
 .github/workflows/docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8806836..3b6b788 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -33,7 +33,7 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: fabfuel/ecs-deplos:${{ github.ref_name }}
+          tags: fabfuel/ecs-deploy:${{ github.ref_name }}
       -
         name: "Build and push (tag: latest)"
         if: github.ref == 'refs/heads/develop'
@@ -42,4 +42,4 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: fabfuel/ecs-deplos:latest
+          tags: fabfuel/ecs-deploy:latest

From 591b2103394ca37af81c0866120ef958ad0253ba Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 06:59:06 +0200
Subject: [PATCH 24/63] Bump version to 1.12.1

---
 ecs_deploy/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py
index f192018..93bf161 100644
--- a/ecs_deploy/__init__.py
+++ b/ecs_deploy/__init__.py
@@ -1 +1 @@
-VERSION = '1.12.1'
+VERSION = '1.12.2'

From 96d731cc9b31b806197253a1e8321e1d04bbdfd6 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 07:10:38 +0200
Subject: [PATCH 25/63] Bump version to 1.13.0

---
 ecs_deploy/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py
index 93bf161..9fb1be8 100644
--- a/ecs_deploy/__init__.py
+++ b/ecs_deploy/__init__.py
@@ -1 +1 @@
-VERSION = '1.12.2'
+VERSION = '1.13.0'

From 8e76533dab507fcb129ba4a7227062a01b8e7ccc Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 18:02:23 +0200
Subject: [PATCH 26/63] Hotfix: only set "cpu" and "memory" in new task
 definition, if defined (not None)

---
 ecs_deploy/ecs.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index 0f5d70d..bd4fa14 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -86,6 +86,12 @@ def register_task_definition(self, family, containers, volumes, role_arn,
         if tags:
             additional_properties['tags'] = tags
 
+        if cpu:
+            additional_properties['cpu'] = cpu
+
+        if memory:
+            additional_properties['memory'] = memory
+
         return self.boto.register_task_definition(
             family=family,
             containerDefinitions=containers,
@@ -93,8 +99,6 @@ def register_task_definition(self, family, containers, volumes, role_arn,
             taskRoleArn=role_arn,
             executionRoleArn=execution_role_arn,
             runtimePlatform=runtime_platform,
-            cpu=cpu,
-            memory=memory,
             **additional_properties
         )
 

From 914d07569f520c59d0ec5c499b92dc7431f5f388 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 18:04:24 +0200
Subject: [PATCH 27/63] Only set "runtimePlatform" in new task definition, if
 defined (not None)

---
 ecs_deploy/ecs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index bd4fa14..bc0dd77 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -92,13 +92,15 @@ def register_task_definition(self, family, containers, volumes, role_arn,
         if memory:
             additional_properties['memory'] = memory
 
+        if runtimePlatform:
+            additional_properties['runtimePlatform'] = runtimePlatform
+
         return self.boto.register_task_definition(
             family=family,
             containerDefinitions=containers,
             volumes=volumes,
             taskRoleArn=role_arn,
             executionRoleArn=execution_role_arn,
-            runtimePlatform=runtime_platform,
             **additional_properties
         )
 

From 762c8364625f60654158935fa0157eb2d7ad15eb Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 18:05:37 +0200
Subject: [PATCH 28/63] Fix var name runtime_platform

---
 ecs_deploy/ecs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index bc0dd77..3c0bd65 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -92,8 +92,8 @@ def register_task_definition(self, family, containers, volumes, role_arn,
         if memory:
             additional_properties['memory'] = memory
 
-        if runtimePlatform:
-            additional_properties['runtimePlatform'] = runtimePlatform
+        if runtime_platform:
+            additional_properties['runtimePlatform'] = runtime_platform
 
         return self.boto.register_task_definition(
             family=family,

From 5bbcdacbd8c3b095051fdbb43e8be38b5768a4db Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 18:11:08 +0200
Subject: [PATCH 29/63] Add test to ensure, optional parameters are not sent,
 if None

---
 tests/test_ecs.py | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index ab6a22a..83cdd8c 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -1147,6 +1147,50 @@ def test_client_register_task_definition(client):
     )
 
 
+def test_client_register_task_definition_without_optional_values(client):
+    containers = [{u'name': u'foo'}]
+    volumes = [{u'foo': u'bar'}]
+    role_arn = 'arn:test:role'
+    execution_role_arn = 'arn:test:role'
+    runtime_platform = {u'cpuArchitecture': u'X86_64', u'operatingSystemFamily': u'LINUX'}
+    task_definition = EcsTaskDefinition(
+        containerDefinitions=containers,
+        volumes=volumes,
+        family=u'family',
+        revision=1,
+        taskRoleArn=role_arn,
+        executionRoleArn=execution_role_arn,
+        tags={
+            'Name': 'test_client_register_task_definition'
+        },
+        status='active',
+        taskDefinitionArn='arn:task',
+        requiresAttributes={},
+    )
+
+    client.register_task_definition(
+        family=task_definition.family,
+        containers=task_definition.containers,
+        volumes=task_definition.volumes,
+        role_arn=task_definition.role_arn,
+        execution_role_arn=execution_role_arn,
+        tags=task_definition.tags,
+        additional_properties=task_definition.additional_properties,
+        runtime_platform=None,
+        cpu=None,
+        memory=None
+    )
+
+    client.boto.register_task_definition.assert_called_once_with(
+        family=u'family',
+        containerDefinitions=containers,
+        volumes=volumes,
+        taskRoleArn=role_arn,
+        executionRoleArn=execution_role_arn,
+        tags=task_definition.tags,
+    )
+
+
 def test_client_register_task_definition_without_tags(client):
     containers = [{u'name': u'foo'}]
     volumes = [{u'foo': u'bar'}]

From 567d087f5fa7d9468a5fe9953b59b4efbbc2a2b8 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 20 Apr 2022 18:13:02 +0200
Subject: [PATCH 30/63] Bump version to 1.13.1

---
 ecs_deploy/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py
index 9fb1be8..0f5d860 100644
--- a/ecs_deploy/__init__.py
+++ b/ecs_deploy/__init__.py
@@ -1 +1 @@
-VERSION = '1.13.0'
+VERSION = '1.13.1'

From 892b6eb77e708b9fede875577336539a6f3df877 Mon Sep 17 00:00:00 2001
From: Chris Grice <chris.grice@agentsoftware.net>
Date: Thu, 12 May 2022 12:11:26 +0100
Subject: [PATCH 31/63] Add --secrets-env-file option and implementation

---
 ecs_deploy/cli.py |  1 +
 ecs_deploy/ecs.py |  7 ++++++-
 tests/test_ecs.py | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index ccc0811..222f1e5 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -42,6 +42,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load environment variables from .env-file: <container> <env file path>')
 @click.option('--s3-env-file', type=(str, str), multiple=True, required=False, help='Location of .env-file in S3 in ARN format (eg arn:aws:s3:::/bucket_name/object_name): <container> <S3 ARN>')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
+@click.option('--secrets-env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load secrets from .env-file: <container> <env file path>')
 @click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-u', '--ulimit', type=(str, str, int, int), multiple=True, help='Adds or changes a ulimit variable in the container description (Not available for Fargate): <container> <ulimit name> <softlimit value> <hardlimit value>')
 @click.option('--system-control', type=(str, str, str), multiple=True, help='Adds or changes a system control variable in the container description (Not available for Fargate): <container> <namespace> <value>')
diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index 3c0bd65..698a7c3 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -758,9 +758,14 @@ def apply_s3_env_file(self, container, new_s3_env_file, exclusive=False):
             {"value": e, "type": "s3"} for e in merged
         ]
 
-    def set_secrets(self, secrets_list, exclusive=False):
+    def set_secrets(self, secrets_list, exclusive=False, env_file=((None, None),)):
         secrets = defaultdict(dict)
 
+        if None not in env_file[0]:
+            for secret in env_file:
+                l = read_env_file(secret[0], secret[1])
+                secrets_list = l + secrets_list
+
         for secret in secrets_list:
             secrets[secret[0]][secret[1]] = secret[2]
 
diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index 83cdd8c..2f94249 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -745,6 +745,41 @@ def test_task_set_secrets(task_definition):
     assert {'name': 'foo', 'valueFrom': 'baz'} in task_definition.containers[0]['secrets']
     assert {'name': 'some-name', 'valueFrom': 'some-value'} in task_definition.containers[0]['secrets']
 
+def test_task_set_secrets_from_env_file(task_definition):
+    assert len(task_definition.containers[0]['secrets']) == 2
+
+    tmp = tempfile.NamedTemporaryFile(delete=False)
+    tmp.write(b'some-secret-name-from-env-file=some-secret-value-from-env-file')
+    tmp.read()
+
+    task_definition.set_secrets((), env_file=((u'webserver',tmp.name),))
+    os.unlink(tmp.name)
+    tmp.close()
+
+    assert len(task_definition.containers[0]['secrets']) == 3
+
+    assert {"name": "baz", "valueFrom": "qux"} in task_definition.containers[0]['secrets']
+    assert {'name': 'some-secret-name-from-env-file', 'valueFrom': 'some-secret-value-from-env-file'} in task_definition.containers[0]['secrets']
+
+def test_task_set_secrets_from_s_and_env_file(task_definition):
+    assert len(task_definition.containers[0]['secrets']) == 2
+
+    tmp = tempfile.NamedTemporaryFile(delete=False)
+    tmp.write(b'some-secret-name-from-env-file=some-secret-value-from-env-file')
+    tmp.read()
+
+    task_definition.set_secrets(((u'webserver', u'foo', u'baz'), (u'webserver', u'some-name', u'some-value')), env_file=((u'webserver',tmp.name),))
+    os.unlink(tmp.name)
+    tmp.close()
+
+    assert len(task_definition.containers[0]['secrets']) == 5
+
+    assert {"name": "baz", "valueFrom": "qux"} in task_definition.containers[0]['secrets']
+    assert {'name': 'dolor', 'valueFrom': 'sit'} in task_definition.containers[0]['secrets']
+    assert {'name': 'foo', 'valueFrom': 'baz'} in task_definition.containers[0]['secrets']
+    assert {"name": "baz", "valueFrom": "qux"} in task_definition.containers[0]['secrets']
+    assert {'name': 'some-secret-name-from-env-file', 'valueFrom': 'some-secret-value-from-env-file'} in task_definition.containers[0]['secrets']
+
 def test_task_set_system_controls(task_definition):
     assert len(task_definition.containers[0]['systemControls']) == 1
     

From 271e1bcbdb036ba4c45ba68adb078bc6dc3bd026 Mon Sep 17 00:00:00 2001
From: Chris Grice <chris.grice@agentsoftware.net>
Date: Fri, 13 May 2022 12:53:46 +0100
Subject: [PATCH 32/63] Adding new command to README

---
 README.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.rst b/README.rst
index 49f55f0..4bdfeb6 100644
--- a/README.rst
+++ b/README.rst
@@ -258,6 +258,22 @@ Instead of setting environment variables separately, you can pass a .env file pe
 
     $ ecs deploy my-cluster my-service --s3-env-file my-app arn:aws:s3:::my-ecs-environment/my-app.env
 
+Set secrets via .env files
+==============================
+Instead of setting secrets separately, you can pass a .env file per container to set all secrets at once.
+
+This will expect an env file format, but any values will be set as the `valueFrom` parameter in the secrets config.
+This value can be either the path or the full ARN of a secret in the AWS Parameter Store. For example, with a secrets.env
+file like the following:
+
+```
+SOME_SECRET=arn:aws:ssm:<aws region>:<aws account id>:parameter/KEY_OF_SECRET_IN_PARAMETER_STORE
+```
+
+$ ecs deploy my-cluster my-service --secret-env-file webserver env/secrets.env
+
+This will modify the **webserver** container definition and add or overwrite the environment variable `SOME_SECRET` with the value of the `KEY_OF_SECRET_IN_PARAMETER_STORE` in the AWS Parameter Store of the AWS Systems Manager.
+
 
 Set a docker label
 ===================

From 936e20ae6553eff25694955a44bc220b30e04163 Mon Sep 17 00:00:00 2001
From: Chris Grice <chris.grice@agentsoftware.net>
Date: Fri, 13 May 2022 12:53:54 +0100
Subject: [PATCH 33/63] Adding flags to other commands

---
 ecs_deploy/cli.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index 222f1e5..03b1ee6 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -82,7 +82,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
 @click.option('--add-container', type=str, multiple=True, required=False, help='Add a placeholder container in the task definition.')
 @click.option('--remove-container', type=str, multiple=True, required=False, help='Remove a container from the task definition.')
-def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, essential, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, runtime_platform, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
+def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, essential, env, env_file, s3_env_file, secret, secrets_env_file, ulimit, system_control, port, mount, log, role, execution_role, runtime_platform, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
     """
     Redeploy or modify a service.
 
@@ -115,7 +115,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
         td.set_environment(env, exclusive_env, env_file)
         td.set_docker_labels(docker_label, exclusive_docker_labels)
         td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
-        td.set_secrets(secret, exclusive_secrets)
+        td.set_secrets(secret, exclusive_secrets, secrets_env_file)
         td.set_ulimits(ulimit, exclusive_ulimits)
         td.set_system_controls(system_control, exclusive_system_controls)
         td.set_port_mappings(port, exclusive_ports)
@@ -186,6 +186,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--privileged', type=(str, bool), multiple=True, help='Overwrites the memory reservation value for a container: <container> <memoryreservation>')
 @click.option('-e', '--env', type=(str, str, str), multiple=True, help='Adds or changes an environment variable: <container> <name> <value>')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
+@click.option('--secrets-env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load secrets from .env-file: <container> <env file path>')
 @click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-u', '--ulimit', type=(str, str, int, int), multiple=True, help='Adds or changes a ulimit variable in the container description (Not available for Fargate): <container> <ulimit name> <softlimit value> <hardlimit value>')
 @click.option('--system-control', type=(str, str, str), multiple=True, help='Adds or changes a system control variable in the container description (Not available for Fargate): <container> <namespace> <value>')
@@ -220,7 +221,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--exclusive-ports', is_flag=True, default=False, help='Set the given port mappings exclusively and remove all other pre-existing port mappings from all containers')
 @click.option('--exclusive-mounts', is_flag=True, default=False, help='Set the given mount points exclusively and remove all other pre-existing mount points from all containers')
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
-def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, region, access_key_id, secret_access_key, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, profile, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, slack_url, slack_service_match, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, docker_label, exclusive_docker_labels):
+def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, env, env_file, s3_env_file, secret, secrets_env_file, ulimit, system_control, port, mount, log, role, execution_role, region, access_key_id, secret_access_key, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, profile, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, slack_url, slack_service_match, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, docker_label, exclusive_docker_labels):
     """
     Update a scheduled task.
 
@@ -247,7 +248,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
         td.set_environment(env, exclusive_env, env_file)
         td.set_docker_labels(docker_label, exclusive_docker_labels)
         td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
-        td.set_secrets(secret, exclusive_secrets)
+        td.set_secrets(secret, exclusive_secrets, secrets_env_file)
         td.set_ulimits(ulimit, exclusive_ulimits)
         td.set_system_controls(system_control, exclusive_system_controls)
         td.set_port_mappings(port, exclusive_ports)
@@ -297,6 +298,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('--env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load environment variables from .env-file')
 @click.option('--s3-env-file', type=(str, str), multiple=True, required=False, help='Location of .env-file in S3 in ARN format (eg arn:aws:s3:::/bucket_name/object_name')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
+@click.option('--secrets-env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load secrets from .env-file: <container> <env file path>')
 @click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
 @click.option('--runtime-platform', type=str, nargs=2, help='Overwrites runtimePlatform: <cpuArchitecture> <operatingSystemFamily>')
@@ -310,7 +312,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
 @click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--deregister/--no-deregister', default=True, help='Deregister or keep the old task definition (default: --deregister)')
-def update(task, image, tag, command, env, env_file, s3_env_file, secret, role, region, access_key_id, secret_access_key, profile, diff, exclusive_env, exclusive_s3_env_file, exclusive_secrets, runtime_platform, deregister, docker_label, exclusive_docker_labels):
+def update(task, image, tag, command, env, env_file, s3_env_file, secret, secrets_env_file, role, region, access_key_id, secret_access_key, profile, diff, exclusive_env, exclusive_s3_env_file, exclusive_secrets, runtime_platform, deregister, docker_label, exclusive_docker_labels):
     """
     Update a task definition.
 
@@ -328,7 +330,7 @@ def update(task, image, tag, command, env, env_file, s3_env_file, secret, role,
         td.set_commands(**{key: value for (key, value) in command})
         td.set_environment(env, exclusive_env, env_file)
         td.set_docker_labels(docker_label, exclusive_docker_labels)
-        td.set_secrets(secret, exclusive_secrets)
+        td.set_secrets(secret, exclusive_secrets, secrets_env_file)
         td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
         td.set_role_arn(role)
         td.set_runtime_platform(runtime_platform)
@@ -399,6 +401,7 @@ def scale(cluster, service, desired_count, access_key_id, secret_access_key, reg
 @click.option('--env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load environment variables from .env-file')
 @click.option('--s3-env-file', type=(str, str), multiple=True, required=False, help='Location of .env-file in S3 in ARN format (eg arn:aws:s3:::/bucket_name/object_name')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
+@click.option('--secrets-env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load secrets from .env-file: <container> <env file path>')
 @click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('--launchtype', type=click.Choice([LAUNCH_TYPE_EC2, LAUNCH_TYPE_FARGATE]), default=LAUNCH_TYPE_EC2, help='ECS Launch type (default: EC2)')
 @click.option('--subnet', type=str, multiple=True, help='A subnet ID to launch the task within. Required for launch type FARGATE (multiple values possible)')
@@ -410,10 +413,11 @@ def scale(cluster, service, desired_count, access_key_id, secret_access_key, reg
 @click.option('--secret-access-key', help='AWS secret access key')
 @click.option('--profile', help='AWS configuration profile name')
 @click.option('--exclusive-env', is_flag=True, default=False, help='Set the given environment variables exclusively and remove all other pre-existing env variables from all containers')
+@click.option('--exclusive-secrets', is_flag=True, default=False, help='Set the given secrets exclusively and remove all other pre-existing secrets from all containers')
 @click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
 @click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--diff/--no-diff', default=True, help='Print what values were changed in the task definition')
-def run(cluster, task, count, command, env, env_file, s3_env_file, secret, launchtype, subnet, securitygroup, public_ip, platform_version, region, access_key_id, secret_access_key, profile, exclusive_env, exclusive_s3_env_file, diff, docker_label, exclusive_docker_labels):
+def run(cluster, task, count, command, env, env_file, s3_env_file, secret, secrets_env_file, launchtype, subnet, securitygroup, public_ip, platform_version, region, access_key_id, secret_access_key, profile, exclusive_env, exclusive_secrets, exclusive_s3_env_file, diff, docker_label, exclusive_docker_labels):
     """
     Run a one-off task.
 
@@ -431,7 +435,7 @@ def run(cluster, task, count, command, env, env_file, s3_env_file, secret, launc
         td.set_environment(env, exclusive_env, env_file)
         td.set_docker_labels(docker_label, exclusive_docker_labels)
         td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
-        td.set_secrets(secret)
+        td.set_secrets(secret, exclusive_secrets, secrets_env_file)
 
         if diff:
             print_diff(td, 'Using task definition: %s' % task)

From bb03985ab6b2447f03de49cc6b708bd80766f84b Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Thu, 3 Nov 2022 09:55:50 +0100
Subject: [PATCH 34/63] Add --account and --assume-role options to assume a
 role in a different account

---
 ecs_deploy/cli.py |  53 ++++++-----
 ecs_deploy/ecs.py |  28 +++++-
 tests/test_cli.py |   5 +-
 tests/test_ecs.py | 220 +++++++++++++++++++++++++++++++---------------
 4 files changed, 214 insertions(+), 92 deletions(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index 03b1ee6..20465eb 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -7,6 +7,7 @@
 import json
 import getpass
 from datetime import datetime, timedelta
+from botocore.exceptions import ClientError
 from ecs_deploy import VERSION
 from ecs_deploy.ecs import DeployAction, ScaleAction, RunAction, EcsClient, DiffAction, \
     TaskPlacementError, EcsError, UpdateAction, LAUNCH_TYPE_EC2, LAUNCH_TYPE_FARGATE
@@ -20,8 +21,8 @@ def ecs():  # pragma: no cover
     pass
 
 
-def get_client(access_key_id, secret_access_key, region, profile):
-    return EcsClient(access_key_id, secret_access_key, region, profile)
+def get_client(access_key_id, secret_access_key, region, profile, assume_account, assume_role):
+    return EcsClient(access_key_id, secret_access_key, region, profile, assume_account=assume_account, assume_role=assume_role)
 
 
 @click.command()
@@ -57,6 +58,8 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--access-key-id', required=False, help='AWS access key id')
 @click.option('--secret-access-key', required=False, help='AWS secret access key')
 @click.option('--profile', required=False, help='AWS configuration profile name')
+@click.option('--account', help='Target AWS account id to deploy in')
+@click.option('--assume-role', help='AWS Role to assume in target account')
 @click.option('--timeout', required=False, default=300, type=int, help='Amount of seconds to wait for deployment before command fails (default: 300). To disable timeout (fire and forget) set to -1')
 @click.option('--ignore-warnings', is_flag=True, help='Do not fail deployment on warnings (port already in use or insufficient memory/CPU)')
 @click.option('--newrelic-apikey', required=False, help='New Relic API Key for recording the deployment. Can also be defined via environment variable NEW_RELIC_API_KEY')
@@ -82,7 +85,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
 @click.option('--add-container', type=str, multiple=True, required=False, help='Add a placeholder container in the task definition.')
 @click.option('--remove-container', type=str, multiple=True, required=False, help='Remove a container from the task definition.')
-def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, essential, env, env_file, s3_env_file, secret, secrets_env_file, ulimit, system_control, port, mount, log, role, execution_role, runtime_platform, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
+def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, essential, env, env_file, s3_env_file, secret, secrets_env_file, ulimit, system_control, port, mount, log, role, execution_role, runtime_platform, task, region, access_key_id, secret_access_key, profile, account, assume_role, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
     """
     Redeploy or modify a service.
 
@@ -95,7 +98,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
     and redeployed.
     """
     try:
-        client = get_client(access_key_id, secret_access_key, region, profile)
+        client = get_client(access_key_id, secret_access_key, region, profile, account, assume_role)
         deployment = DeployAction(client, cluster, service)
 
         td = get_task_definition(deployment, task)
@@ -166,7 +169,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 
         slack.notify_success(cluster, td.revision, service=service)
 
-    except (EcsError, NewRelicException) as e:
+    except (EcsError, NewRelicException, ClientError) as e:
         click.secho('%s\n' % str(e), fg='red', err=True)
         exit(1)
 
@@ -207,6 +210,8 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--comment', required=False, help='Description/comment for recording the deployment')
 @click.option('--user', required=False, help='User who executes the deployment (used for recording)')
 @click.option('--profile', help='AWS configuration profile name')
+@click.option('--account', help='Target AWS account id to deploy in')
+@click.option('--assume-role', help='AWS Role to assume in target account')
 @click.option('--diff/--no-diff', default=True, help='Print what values were changed in the task definition')
 @click.option('--deregister/--no-deregister', default=True, help='Deregister or keep the old task definition (default: --deregister)')
 @click.option('--rollback/--no-rollback', default=False, help='Rollback to previous revision, if deployment failed (default: --no-rollback)')
@@ -221,7 +226,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--exclusive-ports', is_flag=True, default=False, help='Set the given port mappings exclusively and remove all other pre-existing port mappings from all containers')
 @click.option('--exclusive-mounts', is_flag=True, default=False, help='Set the given mount points exclusively and remove all other pre-existing mount points from all containers')
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
-def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, env, env_file, s3_env_file, secret, secrets_env_file, ulimit, system_control, port, mount, log, role, execution_role, region, access_key_id, secret_access_key, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, profile, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, slack_url, slack_service_match, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, docker_label, exclusive_docker_labels):
+def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservation, task_cpu, task_memory, privileged, env, env_file, s3_env_file, secret, secrets_env_file, ulimit, system_control, port, mount, log, role, execution_role, region, access_key_id, secret_access_key, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, profile, account, assume_role, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, slack_url, slack_service_match, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, docker_label, exclusive_docker_labels):
     """
     Update a scheduled task.
 
@@ -231,7 +236,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
     RULE is the name of the rule to use the new task definition.
     """
     try:
-        client = get_client(access_key_id, secret_access_key, region, profile)
+        client = get_client(access_key_id, secret_access_key, region, profile, account, assume_role)
         action = RunAction(client, cluster)
 
         td = action.get_task_definition(task)
@@ -284,7 +289,7 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
         if deregister:
             deregister_task_definition(action, td)
 
-    except EcsError as e:
+    except (EcsError, ClientError) as e:
         click.secho('%s\n' % str(e), fg='red', err=True)
         exit(1)
 
@@ -306,13 +311,15 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('--access-key-id', help='AWS access key id')
 @click.option('--secret-access-key', help='AWS secret access key')
 @click.option('--profile', help='AWS configuration profile name')
+@click.option('--account', help='Target AWS account id to deploy in')
+@click.option('--assume-role', help='AWS Role to assume in target account')
 @click.option('--diff/--no-diff', default=True, help='Print what values were changed in the task definition')
 @click.option('--exclusive-env', is_flag=True, default=False, help='Set the given environment variables exclusively and remove all other pre-existing env variables from all containers')
 @click.option('--exclusive-secrets', is_flag=True, default=False, help='Set the given secrets exclusively and remove all other pre-existing secrets from all containers')
 @click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
 @click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--deregister/--no-deregister', default=True, help='Deregister or keep the old task definition (default: --deregister)')
-def update(task, image, tag, command, env, env_file, s3_env_file, secret, secrets_env_file, role, region, access_key_id, secret_access_key, profile, diff, exclusive_env, exclusive_s3_env_file, exclusive_secrets, runtime_platform, deregister, docker_label, exclusive_docker_labels):
+def update(task, image, tag, command, env, env_file, s3_env_file, secret, secrets_env_file, role, region, access_key_id, secret_access_key, profile, account, assume_role, diff, exclusive_env, exclusive_s3_env_file, exclusive_secrets, runtime_platform, deregister, docker_label, exclusive_docker_labels):
     """
     Update a task definition.
 
@@ -320,7 +327,7 @@ def update(task, image, tag, command, env, env_file, s3_env_file, secret, secret
     TASK is the name of your task definition family (e.g. 'my-task') within ECS.
     """
     try:
-        client = get_client(access_key_id, secret_access_key, region, profile)
+        client = get_client(access_key_id, secret_access_key, region, profile, account, assume_role)
         action = UpdateAction(client)
 
         td = action.get_task_definition(task)
@@ -343,7 +350,7 @@ def update(task, image, tag, command, env, env_file, s3_env_file, secret, secret
         if deregister:
             deregister_task_definition(action, td)
 
-    except EcsError as e:
+    except (EcsError, ClientError) as e:
         click.secho('%s\n' % str(e), fg='red', err=True)
         exit(1)
 
@@ -356,10 +363,12 @@ def update(task, image, tag, command, env, env_file, s3_env_file, secret, secret
 @click.option('--access-key-id', help='AWS access key id')
 @click.option('--secret-access-key', help='AWS secret access key')
 @click.option('--profile', help='AWS configuration profile name')
+@click.option('--account', help='Target AWS account id to deploy in')
+@click.option('--assume-role', help='AWS Role to assume in target account')
 @click.option('--timeout', default=300, type=int, help='Amount of seconds to wait for deployment before command fails (default: 300). To disable timeout (fire and forget) set to -1')
 @click.option('--ignore-warnings', is_flag=True, help='Do not fail deployment on warnings (port already in use or insufficient memory/CPU)')
 @click.option('--sleep-time', default=1, type=int, help='Amount of seconds to wait between each check of the service (default: 1)')
-def scale(cluster, service, desired_count, access_key_id, secret_access_key, region, profile, timeout, ignore_warnings, sleep_time):
+def scale(cluster, service, desired_count, access_key_id, secret_access_key, region, profile, account, assume_role, timeout, ignore_warnings, sleep_time):
     """
     Scale a service up or down.
 
@@ -369,7 +378,7 @@ def scale(cluster, service, desired_count, access_key_id, secret_access_key, reg
     DESIRED_COUNT is the number of tasks your service should run.
     """
     try:
-        client = get_client(access_key_id, secret_access_key, region, profile)
+        client = get_client(access_key_id, secret_access_key, region, profile, account, assume_role)
         scaling = ScaleAction(client, cluster, service)
         click.secho('Updating service')
         scaling.scale(desired_count)
@@ -387,7 +396,7 @@ def scale(cluster, service, desired_count, access_key_id, secret_access_key, reg
             sleep_time=sleep_time
         )
 
-    except EcsError as e:
+    except (EcsError, ClientError) as e:
         click.secho('%s\n' % str(e), fg='red', err=True)
         exit(1)
 
@@ -412,12 +421,14 @@ def scale(cluster, service, desired_count, access_key_id, secret_access_key, reg
 @click.option('--access-key-id', help='AWS access key id')
 @click.option('--secret-access-key', help='AWS secret access key')
 @click.option('--profile', help='AWS configuration profile name')
+@click.option('--account', help='Target AWS account id to deploy in')
+@click.option('--assume-role', help='AWS Role to assume in target account')
 @click.option('--exclusive-env', is_flag=True, default=False, help='Set the given environment variables exclusively and remove all other pre-existing env variables from all containers')
 @click.option('--exclusive-secrets', is_flag=True, default=False, help='Set the given secrets exclusively and remove all other pre-existing secrets from all containers')
 @click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
 @click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--diff/--no-diff', default=True, help='Print what values were changed in the task definition')
-def run(cluster, task, count, command, env, env_file, s3_env_file, secret, secrets_env_file, launchtype, subnet, securitygroup, public_ip, platform_version, region, access_key_id, secret_access_key, profile, exclusive_env, exclusive_secrets, exclusive_s3_env_file, diff, docker_label, exclusive_docker_labels):
+def run(cluster, task, count, command, env, env_file, s3_env_file, secret, secrets_env_file, launchtype, subnet, securitygroup, public_ip, platform_version, region, access_key_id, secret_access_key, profile, account, assume_role, exclusive_env, exclusive_secrets, exclusive_s3_env_file, diff, docker_label, exclusive_docker_labels):
     """
     Run a one-off task.
 
@@ -427,7 +438,7 @@ def run(cluster, task, count, command, env, env_file, s3_env_file, secret, secre
     COUNT is the number of tasks your service should run.
     """
     try:
-        client = get_client(access_key_id, secret_access_key, region, profile)
+        client = get_client(access_key_id, secret_access_key, region, profile, account, assume_role)
         action = RunAction(client, cluster)
 
         td = action.get_task_definition(task)
@@ -454,7 +465,7 @@ def run(cluster, task, count, command, env, env_file, s3_env_file, secret, secre
             click.secho('- %s' % started_task['taskArn'], fg='green')
         click.secho(' ')
 
-    except EcsError as e:
+    except (EcsError, ClientError) as e:
         click.secho('%s\n' % str(e), fg='red', err=True)
         exit(1)
 
@@ -467,7 +478,9 @@ def run(cluster, task, count, command, env, env_file, s3_env_file, secret, secre
 @click.option('--access-key-id', help='AWS access key id')
 @click.option('--secret-access-key', help='AWS secret access key')
 @click.option('--profile', help='AWS configuration profile name')
-def diff(task, revision_a, revision_b, region, access_key_id, secret_access_key, profile):
+@click.option('--account', help='Target AWS account id to deploy in')
+@click.option('--assume-role', help='AWS Role to assume in target account')
+def diff(task, revision_a, revision_b, region, access_key_id, secret_access_key, profile, account, assume_role):
     """
     Compare two task definition revisions.
 
@@ -477,7 +490,7 @@ def diff(task, revision_a, revision_b, region, access_key_id, secret_access_key,
     """
 
     try:
-        client = get_client(access_key_id, secret_access_key, region, profile)
+        client = get_client(access_key_id, secret_access_key, region, profile, account, assume_role)
         action = DiffAction(client)
 
         td_a = action.get_task_definition('%s:%s' % (task, revision_a))
@@ -500,7 +513,7 @@ def diff(task, revision_a, revision_b, region, access_key_id, secret_access_key,
                 for removed in difference[2]:
                     click.secho('    - %s: %s' % removed, fg='red')
 
-    except EcsError as e:
+    except (EcsError, ClientError) as e:
         click.secho('%s\n' % str(e), fg='red', err=True)
         exit(1)
 
diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index 698a7c3..62f0d8a 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -42,7 +42,14 @@ def read_env_file(container_name, file):
 
 class EcsClient(object):
     def __init__(self, access_key_id=None, secret_access_key=None,
-                 region=None, profile=None, session_token=None):
+                 region=None, profile=None, session_token=None, assume_account=None, assume_role=None):
+
+        if assume_account and assume_role:
+            access_key_id, secret_access_key, session_token = self.assume_role(access_key_id, secret_access_key, region,
+                                                                               profile, session_token, assume_account,
+                                                                               assume_role)
+            profile = None
+
         session = Session(aws_access_key_id=access_key_id,
                           aws_secret_access_key=secret_access_key,
                           aws_session_token=session_token,
@@ -51,6 +58,25 @@ def __init__(self, access_key_id=None, secret_access_key=None,
         self.boto = session.client(u'ecs')
         self.events = session.client(u'events')
 
+    def assume_role(self, access_key_id=None, secret_access_key=None, region=None, profile=None, session_token=None,
+                       assume_account=None, assume_role=None):
+        role_arn = f'arn:aws:iam::{assume_account}:role/{assume_role}'
+        sts_session = Session(aws_access_key_id=access_key_id,
+                              aws_secret_access_key=secret_access_key,
+                              aws_session_token=session_token,
+                              region_name=region,
+                              profile_name=profile)
+        sts = sts_session.client('sts')
+        response = sts.assume_role(
+            RoleArn=role_arn,
+            RoleSessionName='ecsDeploy',
+        )
+        access_key_id = response['Credentials']['AccessKeyId']
+        secret_access_key = response['Credentials']['SecretAccessKey']
+        session_token = response['Credentials']['SessionToken']
+        return access_key_id, secret_access_key, session_token
+
+
     def describe_services(self, cluster_name, service_name):
         return self.boto.describe_services(
             cluster=cluster_name,
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 16473c7..3fdf914 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -22,8 +22,9 @@ def runner():
 @patch.object(EcsClient, '__init__')
 def test_get_client(ecs_client):
     ecs_client.return_value = None
-    client = get_client('access_key_id', 'secret_access_key', 'region', 'profile')
-    ecs_client.assert_called_once_with('access_key_id', 'secret_access_key', 'region', 'profile')
+    client = get_client('access_key_id', 'secret_access_key', 'region', 'profile', 'account', 'role')
+    ecs_client.assert_called_once_with('access_key_id', 'secret_access_key', 'region', 'profile',
+                                       assume_account='account', assume_role='role')
     assert isinstance(client, EcsClient)
 
 
diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index 2f94249..57f4929 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -8,7 +8,7 @@
 from boto3.session import Session
 from botocore.exceptions import ClientError, NoCredentialsError
 from dateutil.tz import tzlocal
-from mock.mock import patch
+from mock.mock import patch, call, Mock
 
 from ecs_deploy.ecs import EcsService, EcsTaskDefinition, \
     UnknownContainerError, EcsTaskDefinitionDiff, EcsClient, \
@@ -30,8 +30,10 @@
 TASK_DEFINITION_VOLUMES_1 = []
 TASK_DEFINITION_CONTAINERS_1 = [
     {u'name': u'webserver', u'image': u'webserver:123', u'command': u'run',
-     u'environment': ({"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
-     u'environmentFiles': [{'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'}, {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'}],
+     u'environment': (
+     {"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
+     u'environmentFiles': [{'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'},
+                           {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'}],
      u'secrets': ({"name": "baz", "valueFrom": "qux"}, {"name": "dolor", "valueFrom": "sit"}),
      u'dockerLabels': {"foo": "bar", "lorem": "ipsum", "empty": ""},
      u'logConfiguration': {},
@@ -54,8 +56,10 @@
 TASK_DEFINITION_VOLUMES_2 = []
 TASK_DEFINITION_CONTAINERS_2 = [
     {u'name': u'webserver', u'image': u'webserver:123', u'command': u'run',
-     u'environment': ({"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
-     u'environmentFiles': [{'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'}, {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'}],
+     u'environment': (
+     {"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
+     u'environmentFiles': [{'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'},
+                           {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'}],
      u'secrets': ({"name": "baz", "valueFrom": "qux"}, {"name": "dolor", "valueFrom": "sit"}),
      u'dockerLabels': {"foo": "bar", "lorem": "ipsum", "empty": ""},
      u'logConfiguration': {},
@@ -69,7 +73,7 @@
      u'systemControls': [{'namespace': 'net.core.somaxconn', 'value': '511'}],
      u'portMappings': [{'containerPort': 8080, 'hostPort': 8080}],
      u'mountPoints': [{'sourceVolume': 'volume', 'containerPath': '/container/path', 'readOnly': False}]},
-    
+
 ]
 
 TASK_DEFINITION_REVISION_3 = 3
@@ -262,7 +266,6 @@
     }
 ]
 
-
 PAYLOAD_DEPLOYMENTS_FAILED_ROLLBACK = [
     {
         u'status': u'PRIMARY',
@@ -538,6 +541,7 @@ def test_task_set_image(task_definition):
         if container[u'name'] == u'application':
             assert container[u'image'] == u'app-image:latest'
 
+
 def test_task_set_cpu(task_definition):
     task_definition.set_cpu(webserver=10, application=0)
     for container in task_definition.containers:
@@ -546,6 +550,7 @@ def test_task_set_cpu(task_definition):
         if container[u'name'] == u'application':
             assert container[u'cpu'] == 0
 
+
 def test_task_set_memory(task_definition):
     task_definition.set_memory(webserver=256, application=128)
     for container in task_definition.containers:
@@ -554,6 +559,7 @@ def test_task_set_memory(task_definition):
         if container[u'name'] == u'application':
             assert container[u'memory'] == 128
 
+
 def test_task_set_memoryreservation(task_definition):
     task_definition.set_memoryreservation(webserver=128, application=64)
     for container in task_definition.containers:
@@ -562,6 +568,7 @@ def test_task_set_memoryreservation(task_definition):
         if container[u'name'] == u'application':
             assert container[u'memoryReservation'] == 64
 
+
 def test_task_set_privileged(task_definition):
     task_definition.set_privileged(webserver=False, application=True)
     for container in task_definition.containers:
@@ -570,14 +577,16 @@ def test_task_set_privileged(task_definition):
         if container[u'name'] == u'application':
             assert container[u'privileged'] == True
 
+
 def test_task_set_log_configurations(task_definition):
     assert len(task_definition.containers[0]['logConfiguration']) == 0
 
-    task_definition.set_log_configurations(((u'webserver', u'awslogs', u'awslogs-group', u'service_logs'), (u'webserver', u'awslogs', u'awslogs-region', u'eu-central-1')))
+    task_definition.set_log_configurations(((u'webserver', u'awslogs', u'awslogs-group', u'service_logs'),
+                                            (u'webserver', u'awslogs', u'awslogs-region', u'eu-central-1')))
 
     assert len(task_definition.containers[0]['logConfiguration']) > 0
 
-    assert('logDriver' in task_definition.containers[0]['logConfiguration'])
+    assert ('logDriver' in task_definition.containers[0]['logConfiguration'])
     assert 'awslogs' == task_definition.containers[0]['logConfiguration']['logDriver']
     assert 'options' in task_definition.containers[0]['logConfiguration']
     assert 'awslogs-group' in task_definition.containers[0]['logConfiguration']['options']
@@ -585,17 +594,19 @@ def test_task_set_log_configurations(task_definition):
     assert 'awslogs-region' in task_definition.containers[0]['logConfiguration']['options']
     assert 'eu-central-1' == task_definition.containers[0]['logConfiguration']['options']['awslogs-region']
 
+
 def test_task_set_log_configurations_no_changes(task_definition):
     assert len(task_definition.containers[0]['logConfiguration']) == 0
 
-    task_definition.set_log_configurations(((u'webserver', u'awslogs', u'awslogs-group', u'service_logs'), (u'webserver', u'awslogs', u'awslogs-region', u'eu-central-1')))
+    task_definition.set_log_configurations(((u'webserver', u'awslogs', u'awslogs-group', u'service_logs'),
+                                            (u'webserver', u'awslogs', u'awslogs-region', u'eu-central-1')))
     # deploy without log configurations does not change the previous configuration
     # needs to be actively changed
     task_definition.set_log_configurations(())
 
     assert len(task_definition.containers[0]['logConfiguration']) > 0
 
-    assert('logDriver' in task_definition.containers[0]['logConfiguration'])
+    assert ('logDriver' in task_definition.containers[0]['logConfiguration'])
     assert 'awslogs' == task_definition.containers[0]['logConfiguration']['logDriver']
     assert 'options' in task_definition.containers[0]['logConfiguration']
     assert 'awslogs-group' in task_definition.containers[0]['logConfiguration']['options']
@@ -603,6 +614,7 @@ def test_task_set_log_configurations_no_changes(task_definition):
     assert 'awslogs-region' in task_definition.containers[0]['logConfiguration']['options']
     assert 'eu-central-1' == task_definition.containers[0]['logConfiguration']['options']['awslogs-region']
 
+
 def test_task_set_environment(task_definition):
     assert len(task_definition.containers[0]['environment']) == 3
 
@@ -614,18 +626,21 @@ def test_task_set_environment(task_definition):
     assert {'name': 'foo', 'value': 'baz'} in task_definition.containers[0]['environment']
     assert {'name': 'some-name', 'value': 'some-value'} in task_definition.containers[0]['environment']
 
+
 def test_read_env_file_wrong_env_format():
     tmp = tempfile.NamedTemporaryFile(delete=False)
     tmp.write(b'#comment\n  \nIncompleteDescription')
     tmp.read()
-    l = read_env_file('webserver',tmp.name)
+    l = read_env_file('webserver', tmp.name)
     os.unlink(tmp.name)
     tmp.close()
     assert l == ()
 
+
 def test_env_file_wrong_file_name():
     with pytest.raises(EcsTaskDefinitionCommandError):
-        read_env_file('webserver','WrongFileName')
+        read_env_file('webserver', 'WrongFileName')
+
 
 def test_task_set_environment_from_e_and_env_file(task_definition):
     assert len(task_definition.containers[0]['environment']) == 3
@@ -634,7 +649,8 @@ def test_task_set_environment_from_e_and_env_file(task_definition):
     tmp.write(b'some-name-from-env-file=some-value-from-env-file')
     tmp.read()
 
-    task_definition.set_environment(((u'webserver', u'foo', u'baz'), (u'webserver', u'some-name', u'some-value')), env_file = ((u'webserver',tmp.name),))
+    task_definition.set_environment(((u'webserver', u'foo', u'baz'), (u'webserver', u'some-name', u'some-value')),
+                                    env_file=((u'webserver', tmp.name),))
     os.unlink(tmp.name)
     tmp.close()
 
@@ -643,7 +659,9 @@ def test_task_set_environment_from_e_and_env_file(task_definition):
     assert {'name': 'lorem', 'value': 'ipsum'} in task_definition.containers[0]['environment']
     assert {'name': 'foo', 'value': 'baz'} in task_definition.containers[0]['environment']
     assert {'name': 'some-name', 'value': 'some-value'} in task_definition.containers[0]['environment']
-    assert {'name': 'some-name-from-env-file', 'value': 'some-value-from-env-file'} in task_definition.containers[0]['environment']
+    assert {'name': 'some-name-from-env-file', 'value': 'some-value-from-env-file'} in task_definition.containers[0][
+        'environment']
+
 
 def test_task_set_environment_from_env_file(task_definition):
     assert len(task_definition.containers[0]['environment']) == 3
@@ -652,21 +670,23 @@ def test_task_set_environment_from_env_file(task_definition):
     tmp.write(b'some-name-from-env-file=some-value-from-env-file')
     tmp.read()
 
-    task_definition.set_environment((), env_file = ((u'webserver',tmp.name),))
+    task_definition.set_environment((), env_file=((u'webserver', tmp.name),))
     os.unlink(tmp.name)
     tmp.close()
 
     assert len(task_definition.containers[0]['environment']) == 4
 
     assert {'name': 'lorem', 'value': 'ipsum'} in task_definition.containers[0]['environment']
-    assert {'name': 'some-name-from-env-file', 'value': 'some-value-from-env-file'} in task_definition.containers[0]['environment']
+    assert {'name': 'some-name-from-env-file', 'value': 'some-value-from-env-file'} in task_definition.containers[0][
+        'environment']
 
 
 def test_task_set_environment_exclusively(task_definition):
     assert len(task_definition.containers[0]['environment']) == 3
     assert len(task_definition.containers[1]['environment']) == 0
 
-    task_definition.set_environment(((u'application', u'foo', u'baz'), (u'application', u'new-var', u'new-value')), exclusive=True)
+    task_definition.set_environment(((u'application', u'foo', u'baz'), (u'application', u'new-var', u'new-value')),
+                                    exclusive=True)
 
     assert len(task_definition.containers[0]['environment']) == 0
     assert len(task_definition.containers[1]['environment']) == 2
@@ -687,11 +707,13 @@ def test_task_set_docker_labels(task_definition):
     assert 'lorem' in task_definition.containers[0]['dockerLabels']
     assert 'some-name' in task_definition.containers[0]['dockerLabels']
 
+
 def test_task_set_docker_label_exclusively(task_definition):
     assert len(task_definition.containers[0]['dockerLabels']) == 3
     assert len(task_definition.containers[1]['dockerLabels']) == 0
 
-    task_definition.set_docker_labels(((u'application', u'foo', u'baz'), (u'application', u'new-var', u'new-value')), exclusive=True)
+    task_definition.set_docker_labels(((u'application', u'foo', u'baz'), (u'application', u'new-var', u'new-value')),
+                                      exclusive=True)
 
     assert len(task_definition.containers[0]['dockerLabels']) == 0
     assert len(task_definition.containers[1]['dockerLabels']) == 2
@@ -700,17 +722,25 @@ def test_task_set_docker_label_exclusively(task_definition):
     assert 'foo' in task_definition.containers[1]['dockerLabels']
     assert 'new-var' in task_definition.containers[1]['dockerLabels']
 
+
 def test_task_set_s3_env_file_multiple_files(task_definition):
     assert len(task_definition.containers[0]['environmentFiles']) == 2
 
-    task_definition.set_s3_env_file(((u'webserver', u'arn:aws:s3:::mycompany.domain.com/app/.env'), (u'webserver', u'arn:aws:s3:::melted.cheese.com/grilled/.env'), (u'proxyserver', u'arn:ars:s3:::pizza/dev/.env')))
+    task_definition.set_s3_env_file(((u'webserver', u'arn:aws:s3:::mycompany.domain.com/app/.env'),
+                                     (u'webserver', u'arn:aws:s3:::melted.cheese.com/grilled/.env'),
+                                     (u'proxyserver', u'arn:ars:s3:::pizza/dev/.env')))
 
     assert len(task_definition.containers[0]['environmentFiles']) == 4
 
-    assert {'value': 'arn:aws:s3:::mycompany.domain.com/app/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
-    assert {'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
-    assert {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
-    assert {'value': 'arn:aws:s3:::melted.cheese.com/grilled/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
+    assert {'value': 'arn:aws:s3:::mycompany.domain.com/app/.env', 'type': 's3'} in task_definition.containers[0][
+        'environmentFiles']
+    assert {'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'} in task_definition.containers[0][
+        'environmentFiles']
+    assert {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'} in task_definition.containers[0][
+        'environmentFiles']
+    assert {'value': 'arn:aws:s3:::melted.cheese.com/grilled/.env', 'type': 's3'} in task_definition.containers[0][
+        'environmentFiles']
+
 
 def test_task_set_s3_env_file_single_file(task_definition):
     assert len(task_definition.containers[0]['environmentFiles']) == 2
@@ -720,6 +750,7 @@ def test_task_set_s3_env_file_single_file(task_definition):
     assert len(task_definition.containers[0]['environmentFiles']) == 3
     # assert {'value': 'arn:aws:s3:::mycompany.domain.com/app/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
 
+
 def test_task_set_s3_env_file_exclusively(task_definition):
     assert len(task_definition.containers[0]['environmentFiles']) == 2
 
@@ -727,12 +758,14 @@ def test_task_set_s3_env_file_exclusively(task_definition):
 
     assert len(task_definition.containers[0]['environmentFiles']) == 1
 
-    assert {'value': 'arn:aws:s3:::mycompany.domain.com/app/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
+    assert {'value': 'arn:aws:s3:::mycompany.domain.com/app/.env', 'type': 's3'} in task_definition.containers[0][
+        'environmentFiles']
+
 
 def test_task_set_secrets_exclusively(task_definition):
     assert len(task_definition.containers[0]['secrets']) == 2
 
-    task_definition.set_secrets(((u'webserver', u'new-secret', u'another-place'), ), exclusive=True)
+    task_definition.set_secrets(((u'webserver', u'new-secret', u'another-place'),), exclusive=True)
 
     assert len(task_definition.containers[0]['secrets']) == 1
     assert {'name': 'new-secret', 'valueFrom': 'another-place'} in task_definition.containers[0]['secrets']
@@ -745,6 +778,7 @@ def test_task_set_secrets(task_definition):
     assert {'name': 'foo', 'valueFrom': 'baz'} in task_definition.containers[0]['secrets']
     assert {'name': 'some-name', 'valueFrom': 'some-value'} in task_definition.containers[0]['secrets']
 
+
 def test_task_set_secrets_from_env_file(task_definition):
     assert len(task_definition.containers[0]['secrets']) == 2
 
@@ -752,14 +786,16 @@ def test_task_set_secrets_from_env_file(task_definition):
     tmp.write(b'some-secret-name-from-env-file=some-secret-value-from-env-file')
     tmp.read()
 
-    task_definition.set_secrets((), env_file=((u'webserver',tmp.name),))
+    task_definition.set_secrets((), env_file=((u'webserver', tmp.name),))
     os.unlink(tmp.name)
     tmp.close()
 
     assert len(task_definition.containers[0]['secrets']) == 3
 
     assert {"name": "baz", "valueFrom": "qux"} in task_definition.containers[0]['secrets']
-    assert {'name': 'some-secret-name-from-env-file', 'valueFrom': 'some-secret-value-from-env-file'} in task_definition.containers[0]['secrets']
+    assert {'name': 'some-secret-name-from-env-file', 'valueFrom': 'some-secret-value-from-env-file'} in \
+           task_definition.containers[0]['secrets']
+
 
 def test_task_set_secrets_from_s_and_env_file(task_definition):
     assert len(task_definition.containers[0]['secrets']) == 2
@@ -768,7 +804,8 @@ def test_task_set_secrets_from_s_and_env_file(task_definition):
     tmp.write(b'some-secret-name-from-env-file=some-secret-value-from-env-file')
     tmp.read()
 
-    task_definition.set_secrets(((u'webserver', u'foo', u'baz'), (u'webserver', u'some-name', u'some-value')), env_file=((u'webserver',tmp.name),))
+    task_definition.set_secrets(((u'webserver', u'foo', u'baz'), (u'webserver', u'some-name', u'some-value')),
+                                env_file=((u'webserver', tmp.name),))
     os.unlink(tmp.name)
     tmp.close()
 
@@ -778,32 +815,37 @@ def test_task_set_secrets_from_s_and_env_file(task_definition):
     assert {'name': 'dolor', 'valueFrom': 'sit'} in task_definition.containers[0]['secrets']
     assert {'name': 'foo', 'valueFrom': 'baz'} in task_definition.containers[0]['secrets']
     assert {"name": "baz", "valueFrom": "qux"} in task_definition.containers[0]['secrets']
-    assert {'name': 'some-secret-name-from-env-file', 'valueFrom': 'some-secret-value-from-env-file'} in task_definition.containers[0]['secrets']
+    assert {'name': 'some-secret-name-from-env-file', 'valueFrom': 'some-secret-value-from-env-file'} in \
+           task_definition.containers[0]['secrets']
+
 
 def test_task_set_system_controls(task_definition):
     assert len(task_definition.containers[0]['systemControls']) == 1
-    
-    task_definition.set_system_controls(((u'webserver', u'net.core.somaxconn', u'511'), (u'webserver',u'net.ipv4.ip_forward', u'1')))
+
+    task_definition.set_system_controls(
+        ((u'webserver', u'net.core.somaxconn', u'511'), (u'webserver', u'net.ipv4.ip_forward', u'1')))
 
     assert len(task_definition.containers[0]['systemControls']) == 2
 
     assert {'namespace': 'net.core.somaxconn', 'value': '511'} in task_definition.containers[0]['systemControls']
     assert {'namespace': 'net.ipv4.ip_forward', 'value': '1'} in task_definition.containers[0]['systemControls']
 
+
 def test_task_set_system_controls_existing_not_set_again(task_definition):
     assert len(task_definition.containers[0]['systemControls']) == 1
-    
-    task_definition.set_system_controls(((u'webserver', u'net.ipv4.ip_forward', u'1'), ))
+
+    task_definition.set_system_controls(((u'webserver', u'net.ipv4.ip_forward', u'1'),))
 
     assert len(task_definition.containers[0]['systemControls']) == 2
 
     assert {'namespace': 'net.core.somaxconn', 'value': '511'} in task_definition.containers[0]['systemControls']
     assert {'namespace': 'net.ipv4.ip_forward', 'value': '1'} in task_definition.containers[0]['systemControls']
 
+
 def test_task_set_system_controlsts_exclusively(task_definition):
     assert len(task_definition.containers[0]['systemControls']) == 1
     assert 'net.core.somaxconn' == task_definition.containers[0]['systemControls'][0]['namespace']
-    
+
     task_definition.set_system_controls(((u'webserver', u'net.ipv4.ip_forward', u'1'),), exclusive=True)
 
     assert len(task_definition.containers[0]['systemControls']) == 1
@@ -811,9 +853,10 @@ def test_task_set_system_controlsts_exclusively(task_definition):
     assert 'net.ipv4.ip_forward' == task_definition.containers[0]['systemControls'][0]['namespace']
     assert {'namespace': 'net.ipv4.ip_forward', 'value': '1'} in task_definition.containers[0]['systemControls']
 
+
 def test_task_set_ulimits(task_definition):
     assert len(task_definition.containers[0]['ulimits']) == 1
-    
+
     task_definition.set_ulimits(((u'webserver', u'memlock', 256, 257), (u'webserver', u'cpu', 80, 85)))
 
     assert len(task_definition.containers[0]['ulimits']) == 2
@@ -821,20 +864,22 @@ def test_task_set_ulimits(task_definition):
     assert {'name': 'memlock', 'softLimit': 256, 'hardLimit': 257} in task_definition.containers[0]['ulimits']
     assert {'name': 'cpu', 'softLimit': 80, 'hardLimit': 85} in task_definition.containers[0]['ulimits']
 
+
 def test_task_set_ulimits_existing_not_set_again(task_definition):
     assert len(task_definition.containers[0]['ulimits']) == 1
-    
-    task_definition.set_ulimits(((u'webserver', u'cpu', 80, 85), ))
+
+    task_definition.set_ulimits(((u'webserver', u'cpu', 80, 85),))
 
     assert len(task_definition.containers[0]['ulimits']) == 2
 
     assert {'name': 'memlock', 'softLimit': 256, 'hardLimit': 256} in task_definition.containers[0]['ulimits']
     assert {'name': 'cpu', 'softLimit': 80, 'hardLimit': 85} in task_definition.containers[0]['ulimits']
 
+
 def test_task_set_ulimits_exclusively(task_definition):
     assert len(task_definition.containers[0]['ulimits']) == 1
     assert 'memlock' == task_definition.containers[0]['ulimits'][0]['name']
-    
+
     task_definition.set_ulimits(((u'webserver', u'cpu', 80, 85),), exclusive=True)
 
     assert len(task_definition.containers[0]['ulimits']) == 1
@@ -842,10 +887,11 @@ def test_task_set_ulimits_exclusively(task_definition):
     assert 'cpu' == task_definition.containers[0]['ulimits'][0]['name']
     assert {'name': 'cpu', 'softLimit': 80, 'hardLimit': 85} in task_definition.containers[0]['ulimits']
 
+
 def test_task_set_port_mappings(task_definition):
     assert len(task_definition.containers[0]['portMappings']) == 1
     assert 8080 == task_definition.containers[0]['portMappings'][0]['containerPort']
-    
+
     task_definition.set_port_mappings(((u'webserver', 8080, 8080), (u'webserver', 81, 80)))
 
     assert len(task_definition.containers[0]['portMappings']) == 2
@@ -853,10 +899,11 @@ def test_task_set_port_mappings(task_definition):
     assert {'containerPort': 8080, 'hostPort': 8080, 'protocol': 'tcp'} in task_definition.containers[0]['portMappings']
     assert {'containerPort': 81, 'hostPort': 80, 'protocol': 'tcp'} in task_definition.containers[0]['portMappings']
 
+
 def test_task_set_port_mappings_exclusively(task_definition):
     assert len(task_definition.containers[0]['portMappings']) == 1
     assert 8080 == task_definition.containers[0]['portMappings'][0]['containerPort']
-    
+
     task_definition.set_port_mappings(((u'webserver', 81, 80),), exclusive=True)
 
     assert len(task_definition.containers[0]['portMappings']) == 1
@@ -864,39 +911,48 @@ def test_task_set_port_mappings_exclusively(task_definition):
     assert 81 == task_definition.containers[0]['portMappings'][0]['containerPort']
     assert {'containerPort': 81, 'hostPort': 80, 'protocol': 'tcp'} in task_definition.containers[0]['portMappings']
 
+
 def test_task_set_mount_points(task_definition):
     assert len(task_definition.containers[0]['mountPoints']) == 1
     assert '/container/path' == task_definition.containers[0]['mountPoints'][0]['containerPath']
-    
-    task_definition.set_mount_points(((u'webserver', u'volume', u'/data/path'), (u'webserver', u'another_volume', u'/logs/path')))
+
+    task_definition.set_mount_points(
+        ((u'webserver', u'volume', u'/data/path'), (u'webserver', u'another_volume', u'/logs/path')))
 
     assert len(task_definition.containers[0]['mountPoints']) == 2
 
-    assert {'sourceVolume': 'volume', 'containerPath': '/data/path', 'readOnly': False} in task_definition.containers[0]['mountPoints']
-    assert {'sourceVolume': 'another_volume', 'containerPath': '/logs/path', 'readOnly': False} in task_definition.containers[0]['mountPoints']
+    assert {'sourceVolume': 'volume', 'containerPath': '/data/path', 'readOnly': False} in \
+           task_definition.containers[0]['mountPoints']
+    assert {'sourceVolume': 'another_volume', 'containerPath': '/logs/path', 'readOnly': False} in \
+           task_definition.containers[0]['mountPoints']
+
 
 def test_task_set_task_cpu(task_definition):
     assert task_definition.cpu is None
     task_definition.set_task_cpu(256)
     assert task_definition.cpu == '256'
 
+
 def test_task_set_task_memory(task_definition):
     assert task_definition.memory is None
     task_definition.set_task_memory(1024)
     assert task_definition.memory == '1024'
 
+
 def test_task_set_mount_points_exclusively(task_definition):
     assert len(task_definition.containers[0]['mountPoints']) == 1
     assert '/container/path' == task_definition.containers[0]['mountPoints'][0]['containerPath']
     assert 'volume' == task_definition.containers[0]['mountPoints'][0]['sourceVolume']
-    
+
     task_definition.set_mount_points(((u'webserver', u'another_volume', u'/logs/path'),), exclusive=True)
 
     assert len(task_definition.containers[0]['mountPoints']) == 1
 
     assert '/logs/path' == task_definition.containers[0]['mountPoints'][0]['containerPath']
     assert 'another_volume' == task_definition.containers[0]['mountPoints'][0]['sourceVolume']
-    assert {'sourceVolume': 'another_volume', 'containerPath': '/logs/path', 'readOnly': False} in task_definition.containers[0]['mountPoints']
+    assert {'sourceVolume': 'another_volume', 'containerPath': '/logs/path', 'readOnly': False} in \
+           task_definition.containers[0]['mountPoints']
+
 
 def test_task_set_image_for_unknown_container(task_definition):
     with pytest.raises(UnknownContainerError):
@@ -920,6 +976,7 @@ def test_task_set_command_with_multiple_arguments(task_definition):
         if container[u'name'] == u'application':
             assert container[u'command'] == [u'run-application', u'arg1', u'arg2']
 
+
 def test_task_set_command_with_empty_argument(task_definition):
     empty_argument = " "
     task_definition.set_commands(webserver=empty_argument + u'run-webserver arg1 arg2')
@@ -927,17 +984,21 @@ def test_task_set_command_with_empty_argument(task_definition):
         if container[u'name'] == u'webserver':
             assert container[u'command'] == [u'run-webserver', u'arg1', u'arg2']
 
+
 def test_task_set_command_as_json_list(task_definition):
-    task_definition.set_commands(webserver=u'["run-webserver", "arg1", "arg2"]', application=u'["run-application", "arg1", "arg2"]')
+    task_definition.set_commands(webserver=u'["run-webserver", "arg1", "arg2"]',
+                                 application=u'["run-application", "arg1", "arg2"]')
     for container in task_definition.containers:
         if container[u'name'] == u'webserver':
             assert container[u'command'] == [u'run-webserver', u'arg1', u'arg2']
         if container[u'name'] == u'application':
             assert container[u'command'] == [u'run-application', u'arg1', u'arg2']
 
+
 def test_task_set_command_as_invalid_json_list(task_definition):
     with pytest.raises(EcsTaskDefinitionCommandError):
-        task_definition.set_commands(webserver=u'["run-webserver, "arg1" arg2"]', application=u'["run-application" "arg1 "arg2"]')
+        task_definition.set_commands(webserver=u'["run-webserver, "arg1" arg2"]',
+                                     application=u'["run-application" "arg1 "arg2"]')
 
 
 def test_task_set_command_for_unknown_container(task_definition):
@@ -949,17 +1010,17 @@ class TestSetHealthChecks:
     @pytest.mark.parametrize(
         'webserver_health_check, application_health_check',
         (
-            (
-                (u'webserver', u'curl -f http://webserver/alive/', 30, 5, 3, 0),
-                (u'application', u'curl -f http://application/alive/', 60, 10, 6, 5)
-            ),
-            (
-                (u'webserver', u'curl -f http://webserver/alive/', 30, 5, 3, 0),
-                (u'application', u'curl -f http://application/alive/', 60, 10, 6, 5)
-            )
+                (
+                        (u'webserver', u'curl -f http://webserver/alive/', 30, 5, 3, 0),
+                        (u'application', u'curl -f http://application/alive/', 60, 10, 6, 5)
+                ),
+                (
+                        (u'webserver', u'curl -f http://webserver/alive/', 30, 5, 3, 0),
+                        (u'application', u'curl -f http://application/alive/', 60, 10, 6, 5)
+                )
         )
     )
-    def test_success(self, webserver_health_check, application_health_check, task_definition):        
+    def test_success(self, webserver_health_check, application_health_check, task_definition):
         task_definition.set_health_checks((
             webserver_health_check,
             application_health_check,
@@ -984,7 +1045,8 @@ def test_success(self, webserver_health_check, application_health_check, task_de
 
     def test_unknown_container(self, task_definition):
         with pytest.raises(UnknownContainerError):
-            task_definition.set_health_checks(((u'foobar', u'curl -f http://application/alive/', 60, 10, 6,  5),))
+            task_definition.set_health_checks(((u'foobar', u'curl -f http://application/alive/', 60, 10, 6, 5),))
+
 
 def test_task_get_overrides(task_definition):
     assert task_definition.get_overrides() == []
@@ -994,7 +1056,7 @@ def test_task_get_overrides_with_command(task_definition):
     task_definition.set_commands(webserver='/usr/bin/python script.py')
     overrides = task_definition.get_overrides()
     assert len(overrides) == 1
-    assert overrides[0]['command'] == ['/usr/bin/python','script.py']
+    assert overrides[0]['command'] == ['/usr/bin/python', 'script.py']
 
 
 def test_task_get_overrides_with_environment(task_definition):
@@ -1010,7 +1072,7 @@ def test_task_get_overrides_with_docker_labels(task_definition):
     overrides = task_definition.get_overrides()
     assert len(overrides) == 1
     assert overrides[0]['name'] == 'webserver'
-    #assert 'foo' in overrides[0]['dockerLabels']
+    # assert 'foo' in overrides[0]['dockerLabels']
     assert overrides[0]['dockerLabels']['foo'] == 'baz'
 
 
@@ -1029,7 +1091,7 @@ def test_task_get_overrides_with_command_environment_and_secrets(task_definition
     overrides = task_definition.get_overrides()
     assert len(overrides) == 1
     assert overrides[0]['name'] == 'webserver'
-    assert overrides[0]['command'] == ['/usr/bin/python','script.py']
+    assert overrides[0]['command'] == ['/usr/bin/python', 'script.py']
     assert dict(name='foo', value='baz') in overrides[0]['environment']
     assert dict(name='bar', valueFrom='qux') in overrides[0]['secrets']
 
@@ -1041,7 +1103,7 @@ def test_task_get_overrides_with_command_secrets_and_environment_for_multiple_co
     overrides = task_definition.get_overrides()
     assert len(overrides) == 2
     assert overrides[0]['name'] == 'application'
-    assert overrides[0]['command'] == ['/usr/bin/python','script.py']
+    assert overrides[0]['command'] == ['/usr/bin/python', 'script.py']
     assert overrides[1]['name'] == 'webserver'
     assert dict(name='foo', value='baz') in overrides[1]['environment']
     assert dict(name='bar', valueFrom='qux') in overrides[1]['secrets']
@@ -1050,7 +1112,7 @@ def test_task_get_overrides_with_command_secrets_and_environment_for_multiple_co
 def test_task_get_overrides_command(task_definition):
     command = task_definition.get_overrides_command('/usr/bin/python script.py')
     assert isinstance(command, list)
-    assert command == ['/usr/bin/python','script.py']
+    assert command == ['/usr/bin/python', 'script.py']
 
 
 def test_task_get_overrides_environment(task_definition):
@@ -1095,6 +1157,23 @@ def test_client_init(mocked_init, mocked_client):
     mocked_client.assert_any_call(u'events')
 
 
+@patch.object(Session, 'client')
+@patch.object(Session, '__init__')
+def test_client_init_assuming_role(session_mock: Mock, mocked_client: Mock):
+    session_mock.return_value = None
+
+    EcsClient(u'access_key_id', u'secret_access_key', u'region', u'profile',
+              assume_account='1234567890', assume_role='DeployRole')
+
+    sts_session = call(aws_access_key_id=u'access_key_id',
+                    aws_secret_access_key=u'secret_access_key',
+                    profile_name=u'profile',
+                    region_name=u'region',
+                    aws_session_token=u'session_token')
+
+    session_mock.assert_has_calls([sts_session])
+
+
 @pytest.fixture
 @patch.object(Session, 'client')
 @patch.object(Session, '__init__')
@@ -1110,7 +1189,8 @@ def test_client_describe_services(client):
 
 def test_client_describe_task_definition(client):
     client.describe_task_definition(u'task_definition_arn')
-    client.boto.describe_task_definition.assert_called_once_with(include=['TAGS'], taskDefinition=u'task_definition_arn')
+    client.boto.describe_task_definition.assert_called_once_with(include=['TAGS'],
+                                                                 taskDefinition=u'task_definition_arn')
 
 
 def test_client_describe_unknown_task_definition(client):
@@ -1325,7 +1405,7 @@ def test_ecs_action_init(client):
 
 def test_ecs_action_init_with_invalid_cluster():
     with pytest.raises(EcsConnectionError) as excinfo:
-        client = EcsTestClient(u'access_key',  u'secret_key')
+        client = EcsTestClient(u'access_key', u'secret_key')
         EcsAction(client, u'invliad-cluster', u'test-service')
     assert str(excinfo.value) == u'An error occurred (ClusterNotFoundException) when calling the DescribeServices ' \
                                  u'operation: Cluster not found.'
@@ -1333,7 +1413,7 @@ def test_ecs_action_init_with_invalid_cluster():
 
 def test_ecs_action_init_with_invalid_service():
     with pytest.raises(EcsConnectionError) as excinfo:
-        client = EcsTestClient(u'access_key',  u'secret_key')
+        client = EcsTestClient(u'access_key', u'secret_key')
         EcsAction(client, u'test-cluster', u'invalid-service')
     assert str(excinfo.value) == u'An error occurred when calling the DescribeServices operation: Service not found.'
 
@@ -1726,7 +1806,8 @@ def run_task(self, cluster, task_definition, count, started_by, overrides,
         if not self.access_key_id or not self.secret_access_key:
             raise EcsConnectionError(u'Unable to locate credentials. Configure credentials by running "aws configure".')
         if cluster == 'unknown-cluster':
-            raise EcsConnectionError(u'An error occurred (ClusterNotFoundException) when calling the RunTask operation: Cluster not found.')
+            raise EcsConnectionError(
+                u'An error occurred (ClusterNotFoundException) when calling the RunTask operation: Cluster not found.')
         if self.deployment_errors:
             error = dict(Error=dict(Code=123, Message="Something went wrong"))
             raise ClientError(error, 'fake_error')
@@ -1736,4 +1817,5 @@ def update_rule(self, cluster, rule, task_definition):
         if not self.access_key_id or not self.secret_access_key:
             raise EcsConnectionError(u'Unable to locate credentials. Configure credentials by running "aws configure".')
         if cluster == 'unknown-cluster':
-            raise EcsConnectionError(u'An error occurred (ClusterNotFoundException) when calling the RunTask operation: Cluster not found.')
+            raise EcsConnectionError(
+                u'An error occurred (ClusterNotFoundException) when calling the RunTask operation: Cluster not found.')

From 829772b7180c4fdbf2f309d4319cc0db4cc8515b Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Thu, 3 Nov 2022 11:10:32 +0100
Subject: [PATCH 35/63] Add tests to cover assuming role

---
 ecs_deploy/ecs.py |  5 +++--
 tests/test_ecs.py | 52 ++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index 62f0d8a..a7e0d15 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -58,8 +58,9 @@ def __init__(self, access_key_id=None, secret_access_key=None,
         self.boto = session.client(u'ecs')
         self.events = session.client(u'events')
 
-    def assume_role(self, access_key_id=None, secret_access_key=None, region=None, profile=None, session_token=None,
-                       assume_account=None, assume_role=None):
+    @staticmethod
+    def assume_role(access_key_id=None, secret_access_key=None, region=None, profile=None, session_token=None,
+                    assume_account=None, assume_role=None):
         role_arn = f'arn:aws:iam::{assume_account}:role/{assume_role}'
         sts_session = Session(aws_access_key_id=access_key_id,
                               aws_secret_access_key=secret_access_key,
diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index 57f4929..0339063 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -31,7 +31,7 @@
 TASK_DEFINITION_CONTAINERS_1 = [
     {u'name': u'webserver', u'image': u'webserver:123', u'command': u'run',
      u'environment': (
-     {"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
+         {"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
      u'environmentFiles': [{'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'},
                            {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'}],
      u'secrets': ({"name": "baz", "valueFrom": "qux"}, {"name": "dolor", "valueFrom": "sit"}),
@@ -57,7 +57,7 @@
 TASK_DEFINITION_CONTAINERS_2 = [
     {u'name': u'webserver', u'image': u'webserver:123', u'command': u'run',
      u'environment': (
-     {"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
+         {"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
      u'environmentFiles': [{'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'},
                            {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'}],
      u'secrets': ({"name": "baz", "valueFrom": "qux"}, {"name": "dolor", "valueFrom": "sit"}),
@@ -1159,19 +1159,51 @@ def test_client_init(mocked_init, mocked_client):
 
 @patch.object(Session, 'client')
 @patch.object(Session, '__init__')
-def test_client_init_assuming_role(session_mock: Mock, mocked_client: Mock):
-    session_mock.return_value = None
+@patch.object(EcsClient, 'assume_role')
+def test_client_init_assuming_role(assume_role_mock: Mock, mocked_init: Mock, mocked_client: Mock):
+    mocked_init.return_value = None
+    assume_role_mock.return_value = 'sts-key', 'sts-secret', 'sts-token'
 
     EcsClient(u'access_key_id', u'secret_access_key', u'region', u'profile',
               assume_account='1234567890', assume_role='DeployRole')
 
-    sts_session = call(aws_access_key_id=u'access_key_id',
-                    aws_secret_access_key=u'secret_access_key',
-                    profile_name=u'profile',
-                    region_name=u'region',
-                    aws_session_token=u'session_token')
+    mocked_init.assert_called_once_with(aws_access_key_id=u'sts-key',
+                                        aws_secret_access_key=u'sts-secret',
+                                        profile_name=None,
+                                        region_name=u'region',
+                                        aws_session_token=u'sts-token')
+    mocked_client.assert_any_call(u'ecs')
+    mocked_client.assert_any_call(u'events')
+
+
+@patch.object(Session, 'client')
+@patch.object(Session, '__init__')
+def test_client_assume_role(session_mock: Mock, mocked_client: Mock):
+    sts = Mock()
+    mocked_client.return_value = sts
+    session_mock.return_value = None
+
+    sts.assume_role.return_value = {
+        'Credentials': {
+            'AccessKeyId': 'sts-key',
+            'SecretAccessKey': 'sts-secret',
+            'SessionToken': 'sts-token',
+        }
+    }
+
+    key, secret, token = EcsClient.assume_role('key', 'secret', 'region', 'profile', 'token', '1234567890', 'MyRole')
+
+    session_mock.assert_called_once_with(aws_access_key_id=u'key',
+                                         aws_secret_access_key=u'secret',
+                                         profile_name=u'profile',
+                                         region_name=u'region',
+                                         aws_session_token=u'token')
+
+    sts.assume_role.assert_called_with(RoleArn='arn:aws:iam::1234567890:role/MyRole', RoleSessionName='ecsDeploy')
 
-    session_mock.assert_has_calls([sts_session])
+    assert key == 'sts-key'
+    assert secret == 'sts-secret'
+    assert token == 'sts-token'
 
 
 @pytest.fixture

From ad1833350b488fa6c3f22a4090c891735053b9db Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Thu, 3 Nov 2022 11:13:42 +0100
Subject: [PATCH 36/63] Replace f-string with old-school string substitution

---
 ecs_deploy/ecs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index a7e0d15..2fb4824 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -61,7 +61,7 @@ def __init__(self, access_key_id=None, secret_access_key=None,
     @staticmethod
     def assume_role(access_key_id=None, secret_access_key=None, region=None, profile=None, session_token=None,
                     assume_account=None, assume_role=None):
-        role_arn = f'arn:aws:iam::{assume_account}:role/{assume_role}'
+        role_arn = 'arn:aws:iam::%s:role/%s' % (assume_account, assume_role)
         sts_session = Session(aws_access_key_id=access_key_id,
                               aws_secret_access_key=secret_access_key,
                               aws_session_token=session_token,

From a4a8171f600d3ab783c430792e91e20a55b0002f Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Thu, 3 Nov 2022 11:15:13 +0100
Subject: [PATCH 37/63] Remove type hints

---
 tests/test_ecs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index 0339063..ac75650 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -1160,7 +1160,7 @@ def test_client_init(mocked_init, mocked_client):
 @patch.object(Session, 'client')
 @patch.object(Session, '__init__')
 @patch.object(EcsClient, 'assume_role')
-def test_client_init_assuming_role(assume_role_mock: Mock, mocked_init: Mock, mocked_client: Mock):
+def test_client_init_assuming_role(assume_role_mock, mocked_init, mocked_client):
     mocked_init.return_value = None
     assume_role_mock.return_value = 'sts-key', 'sts-secret', 'sts-token'
 
@@ -1178,7 +1178,7 @@ def test_client_init_assuming_role(assume_role_mock: Mock, mocked_init: Mock, mo
 
 @patch.object(Session, 'client')
 @patch.object(Session, '__init__')
-def test_client_assume_role(session_mock: Mock, mocked_client: Mock):
+def test_client_assume_role(session_mock, mocked_client):
     sts = Mock()
     mocked_client.return_value = sts
     session_mock.return_value = None

From be4cfc16481f580bd34c8206972490e8f7e1c9e4 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Thu, 3 Nov 2022 11:27:39 +0100
Subject: [PATCH 38/63] Add multi-account info to README

---
 README.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.rst b/README.rst
index 4bdfeb6..ed351e3 100644
--- a/README.rst
+++ b/README.rst
@@ -438,6 +438,21 @@ This instructs ecs-deploy to wait for ECS to finish the deployment for the given
 
 To run a deployment without waiting for the successful or failed result at all, set ``--timeout`` to the value of ``-1``.
 
+
+Multi-Account Setup
+===================
+If you manage different environments of your system in multiple differnt AWS accounts, you can now easily assume a
+deployment role in the target account in which your ECS cluster is running. You only need to provide ``--account``
+with the AWS account id and ``--assume-role`` with the name of the role you want to assume in the target account.
+ecs-deploy automatically assumes this role and deploys inside your target account:
+
+Example::
+
+    $ ecs deploy my-cluster my-service --account 1234567890 --assume-role ecsDeployRole
+
+
+
+
 Scaling
 -------
 

From 4d87a3a5117129f10c2fad83ed9976da0d9718bc Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Thu, 3 Nov 2022 11:31:19 +0100
Subject: [PATCH 39/63] Bump version to 1.14.0

---
 ecs_deploy/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py
index 0f5d860..aa2d19c 100644
--- a/ecs_deploy/__init__.py
+++ b/ecs_deploy/__init__.py
@@ -1 +1 @@
-VERSION = '1.13.1'
+VERSION = '1.14.0'

From cf843925fbd73366c94d3a9df869cf5fdfafae06 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 9 Nov 2022 06:04:12 +0100
Subject: [PATCH 40/63] Add AWS CLI for cross account workflows (unpinned for
 compatibility, there are not direct dependencies to ecs-deploy)

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 72894cc..6b56adf 100644
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,7 @@ def readme():
     'future',
     'requests',
     'dictdiffer==0.8.0',
+    'awscli',
 ]
 
 setup(

From a33827a33fa9616c6e30d9b456ca6f53c0ea5931 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 9 Nov 2022 06:07:12 +0100
Subject: [PATCH 41/63] Bump version to 1.14.1

---
 ecs_deploy/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py
index aa2d19c..2d30b8b 100644
--- a/ecs_deploy/__init__.py
+++ b/ecs_deploy/__init__.py
@@ -1 +1 @@
-VERSION = '1.14.0'
+VERSION = '1.14.1'

From 397b308c98c9a15ce29f6593ce0f16eb6f19e432 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Tue, 9 May 2023 14:44:33 +0200
Subject: [PATCH 42/63] Remove unnecessary backslash

---
 ecs_deploy/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index 20465eb..679fe93 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -645,7 +645,7 @@ def record_deployment(tag, api_key, app_id, region, revision, comment, user):
 
     if not revision or not api_key or not app_id:
         if api_key:
-            click.secho('Missing required parameters for recording New Relic deployment.' \
+            click.secho('Missing required parameters for recording New Relic deployment. '
                         'Please see https://github.com/fabfuel/ecs-deploy#new-relic')
         return False
 

From 68f8c0063264229bc92320f165265fb9107602df Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Tue, 9 May 2023 14:58:42 +0200
Subject: [PATCH 43/63] Use Python3.10 in Docker image and pin requests
 requirement to <2.30.0 to avoid conflict with botocode

---
 .github/workflows/docker.yml | 2 ++
 Dockerfile                   | 2 +-
 setup.py                     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3b6b788..faf18ee 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -32,6 +32,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: fabfuel/ecs-deploy:${{ github.ref_name }}
       -
@@ -41,5 +42,6 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: fabfuel/ecs-deploy:latest
diff --git a/Dockerfile b/Dockerfile
index a282db7..fa3d669 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-alpine3.13
+FROM python:3.10-alpine
 
 ADD . /usr/src/app
 WORKDIR /usr/src/app
diff --git a/setup.py b/setup.py
index 6b56adf..4759f36 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ def readme():
     'botocore>=1.17.47',
     'boto3>=1.14.47',
     'future',
-    'requests',
+    'requests<2.30.0',
     'dictdiffer==0.8.0',
     'awscli',
 ]

From 6a7ca22442f748bc9b2d973841c45a1f2f42a6b1 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sun, 21 May 2023 14:26:02 +0200
Subject: [PATCH 44/63] Use github actions checkout@v3 and setup-python@v4

---
 .github/workflows/build.yml  | 4 ++--
 .github/workflows/docker.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d9fad53..32dfbf8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,9 +19,9 @@ jobs:
         python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha.5"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index faf18ee..a2756dc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       -
         name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Login to Docker Hub
         uses: docker/login-action@v1

From c5e066096c314e4d39583522044fbfeece4119c8 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sun, 21 May 2023 14:29:30 +0200
Subject: [PATCH 45/63] Strip build on Python 3.5 and 3.6 and use 3.11
 (non-alpha)

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32dfbf8..e677564 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha.5"]
+        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v3

From accbce9ccd12dde0d4d0167c0d98f68996567949 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sun, 21 May 2023 14:37:01 +0200
Subject: [PATCH 46/63] Fix test string compare syntax

---
 tests/test_cli.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index 3fdf914..96bff7b 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -1003,8 +1003,11 @@ def test_record_deployment_without_apikey(Deployment):
 @patch('click.secho')
 @patch('ecs_deploy.newrelic.Deployment')
 def test_record_deployment_without_appid(Deployment, secho):
-    result = record_deployment('1.2.3', 'APIKEY',None, None, None, None, None)
-    secho.assert_any_call('Missing required parameters for recording New Relic deployment.Please see https://github.com/fabfuel/ecs-deploy#new-relic')
+    result = record_deployment('1.2.3', 'APIKEY', None, None, None, None, None)
+    secho.assert_any_call(
+        'Missing required parameters for recording New Relic deployment. '
+        'Please see https://github.com/fabfuel/ecs-deploy#new-relic'
+    )
     assert result is False
 
 

From ef1d654fa39e5150d09f1598fa4bd11506af3300 Mon Sep 17 00:00:00 2001
From: zaaom <zaaom@@users.noreply.github.com>
Date: Sat, 15 Jul 2023 20:15:07 +0200
Subject: [PATCH 47/63] drop python 2.7 from ci matrix

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e677564..59d0ae5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v3

From 2bd89766ddbb88ec90f2f6620999f3092173111c Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Fri, 24 Nov 2023 09:48:26 +0100
Subject: [PATCH 48/63] Run tests for Python 3.12

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e677564..fef0ca6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3

From 4a8bd81b533dc009dd31d2a14dca48620d2d4b0d Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Fri, 24 Nov 2023 09:52:02 +0100
Subject: [PATCH 49/63] Use dictdiffer >= 0.9.0

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 4759f36..9dcbac7 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ def readme():
     'boto3>=1.14.47',
     'future',
     'requests<2.30.0',
-    'dictdiffer==0.8.0',
+    'dictdiffer>=0.9.0',
     'awscli',
 ]
 

From 53e47f703992d15e29fd48fafa5000ab47bc22c5 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Fri, 24 Nov 2023 11:08:55 +0100
Subject: [PATCH 50/63] Update dependencies

---
 setup.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 9dcbac7..75129d1 100644
--- a/setup.py
+++ b/setup.py
@@ -14,12 +14,11 @@ def readme():
 dependencies = [
     'click>=7.1.2, <9',
     'click-log==0.3.2',
-    'botocore>=1.17.47',
-    'boto3>=1.14.47',
+    'botocore>=1.32.6',
+    'boto3>=1.29.6',
     'future',
-    'requests<2.30.0',
+    'requests',
     'dictdiffer>=0.9.0',
-    'awscli',
 ]
 
 setup(

From 72aa6049d15fdd7e5eadff9647217440a6ba8059 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Fri, 24 Nov 2023 11:37:24 +0100
Subject: [PATCH 51/63] Restore pinning requests to make compatible with boto

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 75129d1..8d608ab 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ def readme():
     'botocore>=1.32.6',
     'boto3>=1.29.6',
     'future',
-    'requests',
+    'requests<2.30.0',
     'dictdiffer>=0.9.0',
 ]
 

From f4b4c388a9e0787b50f0781d90d6ccc6436bde67 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Sun, 30 Jun 2024 15:58:19 +0200
Subject: [PATCH 52/63] Bump version to 1.15.0

---
 ecs_deploy/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py
index 2d30b8b..4fda84c 100644
--- a/ecs_deploy/__init__.py
+++ b/ecs_deploy/__init__.py
@@ -1 +1 @@
-VERSION = '1.14.1'
+VERSION = '1.15.0'

From 5751736b5e054d3f5956d4639bdaf3ee232f313b Mon Sep 17 00:00:00 2001
From: Rui Chen <rui@chenrui.dev>
Date: Mon, 1 Jul 2024 09:39:20 -0400
Subject: [PATCH 53/63] docs: add homebrew installation note

Signed-off-by: Rui Chen <rui@chenrui.dev>
---
 README.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index ed351e3..d0204d8 100644
--- a/README.rst
+++ b/README.rst
@@ -49,6 +49,9 @@ The project is available on PyPI. Simply run::
 
     $ pip install ecs-deploy
 
+For [Homebrew](https://brew.sh/) users, you can also install [it](https://formulae.brew.sh/formula/ecs-deploy) via brew::
+
+    $ brew install ecs-deploy
 
 Run via Docker
 --------------
@@ -57,7 +60,7 @@ Instead of installing **ecs-deploy** locally, which requires a Python environmen
 Running **ecs-deploy** via Docker is easy as::
 
     docker run fabfuel/ecs-deploy:1.10.2
-    
+
 In this example, the stable version 1.10.2 is executed. Alternatively you can use Docker tags ``master`` or ``latest`` for the latest stable version or Docker tag ``develop`` for the newest development version of **ecs-deploy**.
 
 Please be aware, that when running **ecs-deploy** via Docker, the configuration - as described below - does not apply. You have to provide credentials and the AWS region via the command as attributes or environment variables::
@@ -80,7 +83,7 @@ AWS IAM
 -------
 
 If you are using **ecs-deploy** with a role or user account that does not have full AWS access, such as in a deploy script, you will
-need to use or create an IAM policy with the correct set of permissions in order for your deploys to succeed. One option is to use the 
+need to use or create an IAM policy with the correct set of permissions in order for your deploys to succeed. One option is to use the
 pre-specified ``AmazonECS_FullAccess`` (https://docs.aws.amazon.com/AmazonECS/latest/userguide/security-iam-awsmanpol.html#security-iam-awsmanpol-AmazonECS_FullAccess) policy. If you would prefer to create a role with a more minimal set of permissions,
 the following are required:
 
@@ -93,7 +96,7 @@ the following are required:
 * ``ecs:ListTaskDefinitions``
 * ``ecs:DescribeTaskDefinition``
 * ``ecs:DeregisterTaskDefinition``
- 
+
 If using custom IAM permissions, you will also need to set the ``iam:PassRole`` policy for each IAM role. See here https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_passrole.html for more information.
 
 Note that not every permission is required for every action you can take in **ecs-deploy**. You may be able to adjust permissions based on your specific needs.
@@ -310,7 +313,7 @@ To change the command of a specific container, run the following command::
 
     $ ecs deploy my-cluster my-service --command webserver "nginx"
 
-This will modify the **webserver** container and change its command to "nginx". If you have 
+This will modify the **webserver** container and change its command to "nginx". If you have
 a command that requires arguments as well, then you can simply specify it like this as you would normally do:
 
     $ ecs deploy my-cluster my-service --command webserver "ngnix -c /etc/ngnix/ngnix.conf"

From c241be685b546f11585588ec633006084c368f86 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Mon, 24 Mar 2025 18:57:28 +0100
Subject: [PATCH 54/63] Update python versions to be built

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36135de..7314454 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v3

From 21e5e9b3561bd7f89196ebfbe7723fa33b2cacd5 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Mon, 24 Mar 2025 18:58:30 +0100
Subject: [PATCH 55/63] Fix description_file definition for setuptools issue

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index cc54d9f..86ca2a4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,4 +6,4 @@ testpaths = tests
 flake8-max-line-length = 120
 
 [metadata]
-description-file = README.rst
+description_file = README.rst

From aab15baea36f60d8cfa3ee5e8941d24827949957 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Mon, 24 Mar 2025 19:06:23 +0100
Subject: [PATCH 56/63] Bump version to 1.15.1

---
 ecs_deploy/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py
index 4fda84c..3e4fa76 100644
--- a/ecs_deploy/__init__.py
+++ b/ecs_deploy/__init__.py
@@ -1 +1 @@
-VERSION = '1.15.0'
+VERSION = '1.15.1'

From 0ab04c31bbfc978459ab6c7cb9d805ddc2f8c54f Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 26 Mar 2025 17:32:44 +0100
Subject: [PATCH 57/63] Add release workflow

---
 .github/workflows/release.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..c973afd
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,30 @@
+name: Release
+
+on:
+  push:
+    branches: [ 'feature/pypi' ]
+    tags: *
+
+jobs:
+  pypi:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.12"]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install .
+        pip install build twine
+    - name: Build
+      run: python -m build
+    - name: Upload to PyPI
+      run: twine upload dist/*

From ebe55541182d237b4576637178171a71bfeaddaf Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 26 Mar 2025 17:33:51 +0100
Subject: [PATCH 58/63] Fix syntax error

---
 .github/workflows/release.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c973afd..5ba6f6d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,8 @@ name: Release
 on:
   push:
     branches: [ 'feature/pypi' ]
-    tags: *
+    tags: [ '**' ]
+
 
 jobs:
   pypi:
@@ -11,20 +12,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.12"]
+        python-version: [ "3.12" ]
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install .
-        pip install build twine
-    - name: Build
-      run: python -m build
-    - name: Upload to PyPI
-      run: twine upload dist/*
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install .
+          pip install build twine
+      - name: Build
+        run: python -m build
+      - name: Upload to PyPI
+        run: twine upload dist/*

From e26019573ff10799470a737d9476aef853467f8f Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 26 Mar 2025 17:36:33 +0100
Subject: [PATCH 59/63] Add permissions setup and only run on one python
 version

---
 .github/workflows/release.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5ba6f6d..0f1d747 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,17 +9,18 @@ on:
 jobs:
   pypi:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
     strategy:
       fail-fast: false
-      matrix:
-        python-version: [ "3.12" ]
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.12
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

From fdb2fabd1713c405dd5bb9e18ea027f59d068913 Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 26 Mar 2025 17:40:55 +0100
Subject: [PATCH 60/63] Add secret as env

---
 .github/workflows/release.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0f1d747..640c426 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,4 +29,7 @@ jobs:
       - name: Build
         run: python -m build
       - name: Upload to PyPI
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TWINE_API_KEY }}
         run: twine upload dist/*

From cb8db4d6e7622aee155c6d819f480a5810cb1ccb Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 26 Mar 2025 17:42:18 +0100
Subject: [PATCH 61/63] Skip installing deps

---
 .github/workflows/release.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 640c426..ae530ce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,13 +21,14 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: 3.12
-      - name: Install dependencies
+
+      - name: Install tools
         run: |
-          python -m pip install --upgrade pip
-          pip install .
           pip install build twine
-      - name: Build
+
+      - name: Build project
         run: python -m build
+
       - name: Upload to PyPI
         env:
           TWINE_USERNAME: __token__

From e9e4f42661b7740c0e77ed5797b19b56e496ba9f Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 26 Mar 2025 17:48:23 +0100
Subject: [PATCH 62/63] Release after build

---
 .github/workflows/build.yml   | 4 +++-
 .github/workflows/release.yml | 8 ++++++--
 setup.cfg                     | 3 ---
 setup.py                      | 1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7314454..d3d7853 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,9 +9,11 @@ on:
   pull_request:
     branches: [ develop ]
 
+  workflow_call: {}
+
+
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ae530ce..e9b8a59 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,9 +5,13 @@ on:
     branches: [ 'feature/pypi' ]
     tags: [ '**' ]
 
-
 jobs:
-  pypi:
+  build:
+    uses: ./.github/workflows/build.yml
+
+  release:
+    needs:
+      - build
     runs-on: ubuntu-latest
     permissions:
       id-token: write
diff --git a/setup.cfg b/setup.cfg
index 86ca2a4..17bd5bb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,6 +4,3 @@ universal = 1
 [tool:pytest]
 testpaths = tests
 flake8-max-line-length = 120
-
-[metadata]
-description_file = README.rst
diff --git a/setup.py b/setup.py
index 8d608ab..c7ef00f 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,6 @@ def readme():
         'Operating System :: MacOS',
         'Operating System :: Unix',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ]

From 3a0355fcdccad9bda7d52314100264851664c56d Mon Sep 17 00:00:00 2001
From: Fabian Fuelling <git@fabfuel.de>
Date: Wed, 26 Mar 2025 17:52:19 +0100
Subject: [PATCH 63/63] Bump version to 1.15.2 and clean up workflow

---
 .github/workflows/release.yml | 1 -
 ecs_deploy/__init__.py        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e9b8a59..3f9cd6a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,6 @@ name: Release
 
 on:
   push:
-    branches: [ 'feature/pypi' ]
     tags: [ '**' ]
 
 jobs:
diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py
index 3e4fa76..248bfdd 100644
--- a/ecs_deploy/__init__.py
+++ b/ecs_deploy/__init__.py
@@ -1 +1 @@
-VERSION = '1.15.1'
+VERSION = '1.15.2'