chore: improve linting (#303)

Author: ran-isenberg

.github/workflows/serverless-service.yml

@@ -19,8 +19,6 @@ jobs:
       - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
       - name: Check out repository code
         uses: actions/checkout@v3
-      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
-      - uses: actions/checkout@v3
       - name: Set up Python 3.9
         uses: actions/setup-python@v4
         with:

Makefile

@@ -8,7 +8,7 @@ dev:
 
 lint:
 	@echo "Running flake8"
-	flake8 service/* tests/* docs/examples/*
+	flake8 service/* cdk/* tests/* docs/examples/* --exclude patterns='build,cdk.json,cdk.context.json,.yaml'
 
 complex:
 	@echo "Running Radon"

Pipfile.lock

@@ -6,7 +6,6 @@
 from service_stack.constants import get_stack_name
 from service_stack.service_stack import ServiceStack
 
-# pylint: disable=invalid-name
 account = client('sts').get_caller_identity()['Account']
 region = session.Session().region_name
 app = App()

cdk/my_service/app.py

@@ -1,6 +1,5 @@
-import json
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Optional
 
 import aws_cdk.aws_appconfig as appconfig
 from constructs import Construct
@@ -21,12 +20,14 @@ def __init__(self, scope: Construct, id_: str, environment: str, service_name: s
 
         Args:
             scope (Construct): The scope in which to define this construct.
-            id_ (str): The scoped construct ID. Must be unique amongst siblings. If the ID includes a path separator (``/``), then it will be replaced by double dash ``--``.
-            environment (str): environment name. Used for loading the corresponding JSON file to upload under 'configuration/json/{environment}_configuration.json'
+            id_ (str): The scoped construct ID. Must be unique amongst siblings. If the ID includes a path separator (``/``), then it will be
+                        replaced by double dash ``--``.
+            environment (str): environment name. Used for loading the corresponding JSON file to upload under
+                               'configuration/json/{environment}_configuration.json'
             service_name (str): application name.
             configuration_name (str): configuration name
             deployment_strategy_id (str, optional): AWS AppConfig deployment strategy.
-                                                    See https://docs.aws.amazon.com/appconfig/latest/userguide/appconfig-creating-deployment-strategy.html
+                                                See https://docs.aws.amazon.com/appconfig/latest/userguide/appconfig-creating-deployment-strategy.html
                                                     Defaults to DEFAULT_DEPLOYMENT_STRATEGY.
         """
         super().__init__(scope, id_)
@@ -86,5 +87,5 @@ def _get_and_validate_configuration(self, environment: str) -> str:
         conf_filepath = current / (f'json/{environment}_configuration.json')
         configuration_str = conf_filepath.read_text()
         # validate configuration (check feature flags schema structure if exists)
-        parsed_configuration = FeatureFlagsConfiguration.parse_raw(configuration_str)
+        FeatureFlagsConfiguration.parse_raw(configuration_str)
         return configuration_str

cdk/my_service/service_stack/configuration/configuration_construct.py

@@ -1,7 +1,3 @@
-import os
-from pathlib import Path
-
-import boto3
 import my_service.service_stack.constants as constants
 from aws_cdk import CfnOutput, Duration, RemovalPolicy, aws_apigateway
 from aws_cdk import aws_iam as iam
@@ -13,7 +9,6 @@
 
 class ApiConstruct(Construct):
 
-    # pylint: disable=invalid-name, no-value-for-parameter
     def __init__(self, scope: Construct, id_: str) -> None:
         super().__init__(scope, id_)
 

cdk/my_service/service_stack/service_construct.py

@@ -7,12 +7,12 @@
 
 class ServiceStack(Stack):
 
-    # pylint: disable=redefined-builtin
     def __init__(self, scope: Construct, id: str, **kwargs) -> None:
         super().__init__(scope, id, **kwargs)
 
-        # This construct should be deployed in a different repo and have its own pipeline so updates can be decoupled from running the service pipeline and without
-        # redeploying the service lambdas. For the sake of this template example, it is deployed as part of the service stack
+        # This construct should be deployed in a different repo and have its own pipeline so updates can be decoupled
+        # from running the service pipeline and without redeploying the service lambdas. For the sake of this template
+        # example, it is deployed as part of the service stack
         self.dynamic_configuration = ConfigurationStore(self, 'dynamic_conf', ENVIRONMENT, SERVICE_NAME, CONFIGURATION_NAME)
 
         self.lambdas = ApiConstruct(self, 'Service')

cdk/my_service/service_stack/service_stack.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
-from os import getenv, path
+from os import path
 
 from setuptools import find_packages, setup
 
-# pylint: disable=invalid-name
 here = path.abspath(path.dirname(__file__))
 
 setup(
@@ -26,6 +25,6 @@
         'aws-cdk-lib>=2.0.0',
         'constructs>=10.0.0',
         'cdk-nag>2.0.0',
-        'aws-cdk.aws-lambda-python-alpha==2.39.1-alpha.0',
+        'aws-cdk.aws-lambda-python-alpha==2.44.0-alpha.0',
     ],
 )

cdk/setup.py

@@ -1,19 +1,19 @@
 -i https://pypi.org/simple
 attrs==22.1.0; python_version >= '3.5'
 aws-cdk-lib==2.44.0; python_version ~= '3.7'
-aws-cdk.aws-lambda-python-alpha==2.39.1a0; python_version ~= '3.7'
+aws-cdk.aws-lambda-python-alpha==2.44.0a0; python_version ~= '3.7'
+boto3==1.24.83; python_version >= '3.7'
+botocore==1.27.83; python_version >= '3.7'
+cattrs==22.1.0; python_version >= '3.7' and python_version < '4.0'
 -e ./cdk
-boto3==1.24.82; python_version >= '3.7'
-botocore==1.27.82; python_version >= '3.7'
-cattrs==22.1.0; python_version >= '3.7' and python_version < '4'
-cdk-nag==2.18.23; python_version ~= '3.7'
+cdk-nag==2.18.24; python_version ~= '3.7'
 certifi==2022.9.24; python_version >= '3.6'
 cfgv==3.3.1; python_full_version >= '3.6.1'
 charset-normalizer==2.1.1; python_version >= '3.6'
 click==8.1.3; python_version >= '3.7'
 colorama==0.4.5; python_version >= '3.5'
-constructs==10.1.116; python_version ~= '3.7'
-coverage[toml]==6.4.4; python_version >= '3.7'
+constructs==10.1.117; python_version ~= '3.7'
+coverage[toml]==6.5.0; python_version >= '3.7'
 distlib==0.3.6
 exceptiongroup==1.0.0rc9; python_version < '3.11'
 filelock==3.8.0; python_version >= '3.7'
@@ -54,32 +54,32 @@ pyparsing==3.0.9; python_full_version >= '3.6.8'
 pytest==7.1.3
 pytest-cov==4.0.0
 pytest-html==3.1.1
-pytest-metadata==2.0.2; python_version >= '3.7' and python_version < '4'
+pytest-metadata==2.0.2; python_version >= '3.7' and python_version < '4.0'
 pytest-mock==3.9.0
 python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 python-dotenv==0.21.0
 pyyaml==6.0; python_version >= '3.6'
 pyyaml-env-tag==0.1; python_version >= '3.6'
 radon==5.1.0
-requests==2.28.1; python_version >= '3.7' and python_version < '4'
+requests==2.28.1; python_version >= '3.7' and python_version < '4.0'
 s3transfer==0.6.0; python_version >= '3.7'
 -e ./cdk
-setuptools==65.4.0; python_version >= '3.7'
+setuptools==65.4.1; python_version >= '3.7'
 six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 smmap==5.0.0; python_version >= '3.6'
 toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
 tomli==2.0.1; python_version >= '3.7'
 typeguard==2.13.3; python_full_version >= '3.5.3'
 typing-extensions==4.3.0; python_version >= '3.7'
-urllib3==1.26.12; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_full_version < '4.0.0'
+urllib3==1.26.12; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'
 virtualenv==20.16.5; python_version >= '3.6'
 watchdog==2.1.9; python_version >= '3.6'
 xenon==0.9.0
 yapf==0.32.0
 zipp==3.8.1; python_version >= '3.7'
 aws-lambda-powertools==1.29.2
 aws-xray-sdk==2.10.0
-dnspython==2.2.1; python_version >= '3.6' and python_full_version < '4.0.0'
+dnspython==2.2.1; python_version >= '3.6' and python_version < '4'
 email-validator==1.3.0
 fastjsonschema==2.16.2
 pydantic[email]==1.10.2

dev_requirements.txt

@@ -6,7 +6,6 @@
 
 class DynamicConfigurationStack(Stack):
 
-    # pylint: disable=redefined-builtin
     def __init__(self, scope: Construct, id: str, **kwargs) -> None:
         super().__init__(scope, id, **kwargs)