Cleaning up (#30)

* Cleaning up

* Removing unused imports
* Black code styling

* Remove unused test reqs, add pytest test runner, exclude tests from package

* Move cli modules to own submodule

* More minor clean up

* Removing github module

Author: kolanos

Diff for: .gitignore

@@ -0,0 +1,96 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+# node.js
+node_modules
+.serverless
+
+.pytest_cache
+.requirements

Diff for: MANIFEST.in

@@ -0,0 +1,2 @@
+include *.md LICENSE
+recursive-include iopipe_cli *.py

Diff for: iopipe_cli/awslambda.py

@@ -1,4 +1,3 @@
-from . import layers
 from . import utils
 
 
@@ -56,7 +55,8 @@ def _add_iopipe(
     if not allow_upgrade and orig_handler == runtime_handler:
         raise (
             UpdateLambdaException(
-                "Already installed. Pass --upgrade (or -u) to allow upgrade or reinstall to latest layer version."
+                "Already installed. Pass --upgrade (or -u) to allow upgrade or "
+                "reinstall to latest layer version."
             )
         )
     if runtime == "provider" or runtime not in utils.RUNTIME_CONFIG.keys():
@@ -147,7 +147,8 @@ def _remove_iopipe(config, region, function_arn, layer_arn):
     # Detect non-IOpipe handler and error if necessary.
     if not utils.is_valid_handler(runtime, orig_handler):
         raise UpdateLambdaException(
-            "IOpipe installation (via layers) not auto-detected for the specified function.\n"
+            "IOpipe installation (via layers) not auto-detected for the specified "
+            "function.\n"
             "Error: Unrecognized handler in deployed function."
         )
 
@@ -166,8 +167,10 @@ def _remove_iopipe(config, region, function_arn, layer_arn):
     env_handler = env_handler or env_alt_handler
     if not env_handler:
         raise UpdateLambdaException(
-            "IOpipe installation (via layers) not auto-detected for the specified function.\n"
-            + "Error: Environment variable IOPIPE_HANDLER or IOPIPE_GENERIC_HANDLER not found."
+            "IOpipe installation (via layers) not auto-detected for the specified "
+            "function.\n"
+            "Error: Environment variable IOPIPE_HANDLER or IOPIPE_GENERIC_HANDLER not "
+            "found."
         )
 
     # Delete IOpipe env vars

Diff for: iopipe_cli/cli.py

@@ -0,0 +1,27 @@
+import click
+
+from .. import utils
+from ..awslambda import MultipleLayersException, UpdateLambdaException
+
+from . import awslambda, stack
+
+
+@click.group(name="cli")
+def cli_group():
+    pass
+
+
+def click_groups(group):
+    awslambda.register(group)
+    stack.register(group)
+
+
+@utils.catch_boto_errors
+def main():
+    try:
+        click_groups(cli_group)
+        cli_group()
+    except MultipleLayersException:
+        utils.error("Multiple layers found. Pass --layer-arn to specify layer ARN")
+    except UpdateLambdaException as e:
+        utils.error(e)

Diff for: iopipe_cli/cli/__init__.py

@@ -1,17 +1,14 @@
-from . import awslambda
-from . import utils
-
-import boto3
-import botocore
 import click
 import itertools
 import json
 import shutil
 
+from .. import awslambda, utils
+
 
 @click.group(name="lambda")
 def lambda_group():
-    None
+    pass
 
 
 def register(group):

Diff for: iopipe_cli/cli_awslambda.py renamed to iopipe_cli/cli/awslambda.py

@@ -1,16 +1,14 @@
-from . import stack
-from . import utils
-
 import click
 import os
 
+from .. import stack, utils
 
-IOPIPE_FF_CLOUDFORMATION = os.environ.get("IOPIPE_FF_CLOUDFORMATION")
+IOPIPE_FF_CLOUDFORMATION = os.getenv("IOPIPE_FF_CLOUDFORMATION")
 
 
 @click.group(name="stack")
 def stack_group():
-    None
+    pass
 
 
 def register(group):

Diff for: iopipe_cli/cli_stack.py renamed to iopipe_cli/cli/stack.py

@@ -1,4 +1,8 @@
-# Copy-pasta from Stackoverflow: https://stackoverflow.com/questions/39997469/how-to-deep-merge-dicts
+# Copy-pasta from Stackoverflow:
+# https://stackoverflow.com/questions/39997469/how-to-deep-merge-dicts
+import collections
+
+
 def combine_dict(map1: dict, map2: dict):
     def update(d: dict, u: dict):
         for k, v in u.items():

Diff for: iopipe_cli/combine_dict.py

@@ -1,11 +1,9 @@
-import json
 import requests
 
 
 def index(region, runtime):
     req = requests.get(
-        "https://%s.layers.iopipe.com/get-layers?CompatibleRuntime=%s"
-        % (region, runtime)
+        f"https://{region}.layers.iopipe.com/get-layers?CompatibleRuntime={runtime}"
     )
-    layers_response = json.loads(req.content)
+    layers_response = req.json()
     return layers_response.get("Layers", [])

Diff for: iopipe_cli/github.py

@@ -1,4 +1,3 @@
-# import boto3
 import requests
 
 
@@ -51,7 +50,7 @@ def _check_blob_magic_bytes(blob, magic, distance):
 
         return _check_blob_magic_bytes(blob, magic, 0)
 
-    eocd_block = check_blob_magic_bytes(reverse(iter(eocd_blob)), 0x06054B50)
+    eocd_block = check_blob_magic_bytes(reversed(iter(eocd_blob)), 0x06054B50)
     if not eocd_block:
         raise Exception("No zip central directory signature found.")
 

Diff for: iopipe_cli/layers.py

@@ -1,11 +1,10 @@
-from . import awslambda
-from . import utils
-from .combine_dict import combine_dict
-
 import boto3
 import itertools
 import json
 
+from . import awslambda, utils
+from .combine_dict import combine_dict
+
 
 def get_stack_ids():
     CloudFormation = boto3.client("cloudformation")
@@ -33,7 +32,8 @@ def map_stack_ids():
 
 def get_template(stackid):
     CloudFormation = boto3.client("cloudformation")
-    # DOC get_template: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/cloudformation.html#CloudFormation.Client.get_template
+    # DOC get_template:
+    # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/cloudformation.html#CloudFormation.Client.get_template
     template_body = CloudFormation.get_template(StackName=stackid)
     #    example_get_template_body = '''
     #    {
@@ -99,5 +99,6 @@ def update_cloudformation_stack(stack_id, function_arn, token):
     # stackid = get_stack_ids(function_arn)
     orig_template = get_template(stack_id)
     template_body = modify_cloudformation(orig_template, function_arn, token)
-    # DOC update_stack: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/cloudformation.html#CloudFormation.Client.update_stack
+    # DOC update_stack:
+    # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/cloudformation.html#CloudFormation.Client.update_stack
     CloudFormation.update_stack(StackName=stack_id, TemplateBody=template_body)

Diff for: iopipe_cli/s3zip.py

@@ -1,13 +1,12 @@
-from . import layers
-
 import boto3
 import botocore
 import click
 import collections
 import jwt
-import os
 import sys
 
+from . import layers
+
 IOPIPE_ARN_PREFIX_TEMPLATE = "arn:aws:lambda:%s:146318645305"
 RUNTIME_CONFIG = {
     "java8": {
@@ -127,7 +126,7 @@ def check_token(ctx, param, value):
     try:
         jwt.decode(value, verify=False)
         return value
-    except:
+    except Exception:
         raise click.BadParameter("token invalid.")
 
 

Diff for: iopipe_cli/stack.py

@@ -0,0 +1,5 @@
+[aliases]
+test=pytest
+
+[flake8]
+max-line-length = 88

Diff for: iopipe_cli/utils.py

@@ -10,33 +10,17 @@
     README = open(os.path.join(os.path.dirname(__file__), "README.md"), "r").read()
 
 setup(
-    name='iopipe-cli',
-    version='0.1.7',
-    python_requires='>=3.3',
+    name="iopipe-cli",
+    version="0.1.7",
+    python_requires=">=3.3",
     description="cli utility for managing and instrumenting serverless applications",
     long_description=README,
     author="IOpipe",
     author_email="[email protected]",
     url="https://github.com/iopipe/iopipe-cli",
-    packages=find_packages(),
-    install_requires=[
-        'click',
-        'boto3',
-        'requests',
-        'pyjwt'
-    ],
-    tests_require=[
-        "coverage==5.0a2",
-        "mock",
-        "more-itertools<6.0.0",
-        "pytest==4.1.0",
-        "pytest-benchmark==3.2.0",
-        "pytest-cov==2.6.1",
-        "requests",
-    ],
-    entry_points={
-        'console_scripts': [
-            'iopipe = iopipe_cli.cli:main',
-        ],
-    }
+    packages=find_packages(exclude=("tests", "tests.*")),
+    install_requires=["click", "boto3", "requests", "pyjwt"],
+    setup_requires=["pytest-runner"],
+    tests_require=["coverage", "pytest", "pytest-cov", "requests"],
+    entry_points={"console_scripts": ["iopipe = iopipe_cli.cli:main"]},
 )