closes #11, dev reqs file is updated, fixed some code styling and added a setup.cfg

Author: frankV

.travis.yml

@@ -13,7 +13,7 @@ branches:
 install:
 - pip install -r requirements-dev.txt
 - pip install coveralls
-script: py.test --cov ecs_deploy.py --cov-report term-missing --pep8
+script: py.test --cov ecs_deploy.py --cov-report term-missing --pep8 --flakes
 after_success:
 - coveralls
 notifications:

ecs_deploy.py

@@ -6,6 +6,7 @@
 """
 
 from __future__ import print_function
+
 import sys
 import time
 import argparse
@@ -22,19 +23,17 @@ def __init__(self):
         try:
             # optional aws credentials overrides
             credentials = {}
-            credentials = self._arg_kwargs(credentials, 'aws_access_key',
-                                           'aws_access_key_id')
-            credentials = self._arg_kwargs(credentials, 'aws_secret_key',
-                                           'aws_secret_access_key')
+            credentials = self._arg_kwargs(credentials, 'aws_access_key', 'aws_access_key_id')
+            credentials = self._arg_kwargs(credentials, 'aws_secret_key', 'aws_secret_access_key')
             credentials = self._arg_kwargs(credentials, 'aws_region', 'region')
+
             # init boto3 ecs client
             self.client = boto3.client('ecs', **credentials)
         except ClientError as err:
             print('Failed to create boto3 client.\n%s' % err)
             sys.exit(1)
 
-        if not (self.args.get('task_definition') or
-                self.args.get('service_name')):
+        if not (self.args.get('task_definition') or self.args.get('service_name')):
             print('Either task-definition or service-name must be provided.')
             sys.exit(1)
 
@@ -43,31 +42,30 @@ def __init__(self):
 
     def _init_parser(self):
         parser = argparse.ArgumentParser(
-            description='AWS ECS Deployment Script',
-            usage='''ecs-deploy.py [<args>]
-            ''')
-
-        # REQUIRED ARGS : AT LEAST ONE
+            description='AWS ECS Deployment Script', usage='ecs-deploy.py [<args>]')
 
         parser.add_argument(
             '-n',
             '--service-name',
-            help='Name of service to deploy (either service-name or \
-                task-definition is required)')
+            help='Name of service to deploy (either service-name or task-definition is required)')
 
         parser.add_argument(
             '-d',
             '--task-definition',
             help='Name of task definition to deploy (either task-definition \
                 or service-name is required)')
 
-        # REQUIRED ARGS : AT LEAST SOMEWHERE
+        # REQUIRED ARGUMENTS
+        parser.add_argument(
+            '-c',
+            '--cluster',
+            required=True,
+            help='Name of ECS cluster')
 
         parser.add_argument(
             '-k',
             '--aws-access-key',
-            help='AWS Access Key ID. May also be set as environment variable \
-                AWS_ACCESS_KEY_ID')
+            help='AWS Access Key ID. May also be set as environment variable AWS_ACCESS_KEY_ID')
 
         parser.add_argument(
             '-s',
@@ -78,11 +76,9 @@ def _init_parser(self):
         parser.add_argument(
             '-r',
             '--region',
-            help='AWS Region Name. May also be set as environment variable \
-                AWS_DEFAULT_REGION')
+            help='AWS Region Name. May also be set as environment variable AWS_DEFAULT_REGION')
 
         # REQUIRED ARGS : MAYBE NOT REQUIRED
-
         parser.add_argument(
             '-p',
             '--profile',
@@ -94,14 +90,6 @@ def _init_parser(self):
             action='store_true',
             help='Use the IAM role associated with this instance')
 
-        # REQUIRED ARGS
-
-        parser.add_argument(
-            '-c',
-            '--cluster',
-            required=True,
-            help='Name of ECS cluster')
-
         parser.add_argument(
             '-i',
             '--image',
@@ -112,7 +100,6 @@ def _init_parser(self):
                 private.registry.com:8000/repo/image:tag')
 
         # OPTIONAL ARGUMENTS
-
         parser.add_argument(
             '-D',
             '--desired-count',
@@ -166,10 +153,8 @@ def _run_parser(self):
         self.task_definition_name = self._task_definition_name()
         self.service_name = self._service_name()
 
-        self.task_definition = \
-            self.client_fn('describe_task_definition')['taskDefinition']
-        self.new_task_definition = \
-            self.client_fn('register_task_definition')['taskDefinition']
+        self.task_definition = self.client_fn('describe_task_definition')['taskDefinition']
+        self.new_task_definition = self.client_fn('register_task_definition')['taskDefinition']
 
         if self.task_definition:
             if not self.client_fn('update_service'):
@@ -181,12 +166,10 @@ def _run_parser(self):
                 updated = False
                 running_tasks = self.client_fn('describe_tasks')['tasks']
                 for task in running_tasks:
-                    if task['taskDefinitionArn'] == \
-                            self.new_task_definition['taskDefinitionArn']:
-                        print('SUCCESS')
+                    if task['taskDefinitionArn'] == self.new_task_definition['taskDefinitionArn']:
                         updated = True
                 if updated or time.time() > timeout:
-                    sys.exit(1)
+                    sys.exit(0)
                 time.sleep(1)
 
         else:
@@ -233,12 +216,10 @@ def client_kwargs(self, fn):
 
         elif fn == 'register_task_definition':
             kwargs['family'] = self.task_definition['family']
-            kwargs['containerDefinitions'] = \
-                self.task_definition['containerDefinitions']
+            kwargs['containerDefinitions'] = self.task_definition['containerDefinitions']
             # optional kwargs from args
             if self.args.get('image'):
-                kwargs['containerDefinitions'][0]['image'] = \
-                    self.args.get('image')
+                kwargs['containerDefinitions'][0]['image'] = self.args.get('image')
 
         elif fn == 'update_service':
             kwargs['cluster'] = self.cluster

requirements-dev.txt

@@ -1,31 +1,41 @@
 apipkg==1.4
-boto==2.42.0
+appdirs==1.4.3
+boto==2.47.0
 boto3==1.4.0
 botocore==1.4.56
-click==6.6
-coverage==4.2
+certifi==2017.4.17
+chardet==3.0.3
+cookies==2.2.1
+coverage==4.4.1
+dicttoxml==1.7.4
 docutils==0.12
 execnet==1.4.1
-Flask==0.11.1
-freezegun==0.3.7
-httpretty==0.8.10
-itsdangerous==0.24
-Jinja2==2.8
+funcsigs==1.0.2
+futures==3.0.5
+idna==2.5
+Jinja2==2.9.6
 jmespath==0.9.0
-MarkupSafe==0.23
+MarkupSafe==1.0
 mock==2.0.0
-moto==0.4.27
-pbr==1.10.0
+moto==1.0.0
+packaging==16.8
+pbr==3.0.1
 pep8==1.7.0
-py==1.4.31
-pytest==3.0.2
+py==1.4.33
+pyaml==16.12.2
+pyflakes==1.5.0
+pyparsing==2.2.0
+pytest==3.1.0
 pytest-cache==1.0
-pytest-cov==2.3.1
+pytest-cov==2.5.1
+pytest-flakes==2.0.0
 pytest-pep8==1.0.6
 python-dateutil==2.5.3
-requests==2.11.1
+pytz==2017.2
+PyYAML==3.12
+requests==2.16.4
 s3transfer==0.1.4
 six==1.10.0
-sure==1.4.0
-Werkzeug==0.11.11
-xmltodict==0.10.2
+urllib3==1.21.1
+Werkzeug==0.12.2
+xmltodict==0.11.0

setup.py

@@ -33,8 +33,7 @@ def run_tests(self):
         import pytest
         from pkg_resources import normalize_path, _namespace_packages
 
-        if sys.version_info >= (3,) and getattr(self.distribution,
-                                                'use_2to3', False):
+        if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
             module = self.test_package_name
             if module in _namespace_packages:
                 del_modules = []

tests/test_script.py

@@ -1,4 +1,3 @@
-import pytest
 import mock
 import boto3
 from moto import mock_ecs
@@ -20,8 +19,7 @@ def setUp(self):
 
         mock_task = self.client.register_task_definition(
             family='mock_task',
-            taskRoleArn='arn:aws:ecs:us-east-1:999999999999:task-definition/ \
-                mock_task:99',
+            taskRoleArn='arn:aws:ecs:us-east-1:999999999999:task-definition/mock_task:99',
             networkMode='none',
             containerDefinitions=[
                 {
@@ -113,14 +111,13 @@ def setUp(self):
                     }
                 },
             ]
-            )
+        )
 
-        mock_service = self.client.create_service(cluster='mock_cluster',
-                                                  serviceName='mock_task' +
-                                                  '-service',
-                                                  taskDefinition='mock_task',
-                                                  desiredCount=1
-                                                  )
+        mock_service = self.client.create_service(
+            cluster='mock_cluster',
+            serviceName='mock_task-service',
+            taskDefinition='mock_task',
+            desiredCount=1)
 
         self.mock_cli.args = {
             'cluster': mock_cluster['cluster']['clusterName'],
@@ -359,11 +356,11 @@ def test_client_kwargs_with_describe_tasks(self):
                 mock_cli.args['cluster']
             assert mock_kwargs['tasks'] == mock_list_tasks_response['taskArns']
 
-    def test_client_kwargs_with_describe_tasks(self):
+    def test_client_kwargs_with_list_services_deux(self):
         mock_cli, client = self.setUp()
         mock_cli.client = client
 
-        with mock.patch.object(client, 'list_services',
-                               return_value={'key': 'value'}) as mock_client:
+        with mock.patch.object(
+                client, 'list_services', return_value={'key': 'value'}) as mock_client:
             mock_cli.client_fn('list_services')
             mock_client.assert_called_once