style(controller): flake8 upgrade

Author: duanhongyi

rootfs/api/authentication.py

@@ -1,8 +1,12 @@
+import logging
 from django.contrib.auth.models import AnonymousUser
 from rest_framework import authentication
 from rest_framework.authentication import TokenAuthentication
 
 
+logger = logging.getLogger(__name__)
+
+
 class AnonymousAuthentication(authentication.BaseAuthentication):
 
     def authenticate(self, request):
@@ -20,5 +24,6 @@ def authenticate(self, request):
         """
         try:
             return TokenAuthentication.authenticate(TokenAuthentication(), request)
-        except:
+        except Exception as e:
+            logger.debug(e)
             return AnonymousUser(), None

rootfs/api/management/commands/load_db_state_to_k8s.py

@@ -1,10 +1,14 @@
+import logging
 from django.core.management.base import BaseCommand
 from django.shortcuts import get_object_or_404
 
 from api.models import Key, App, Domain, Certificate, Service
 from api.exceptions import DryccException, AlreadyExists
 
 
+logger = logging.getLogger(__name__)
+
+
 class Command(BaseCommand):
     """Management command for publishing Drycc platform state from the database
     to k8s.
@@ -33,10 +37,12 @@ def handle(self, *args, **options):
             try:
                 application.deploy(rel)
             except AlreadyExists as error:
+                logger.debug(error)
                 print('WARNING: {} has a deployment in progress. '
                       'Skipping deployment...'.format(application))
                 continue
             except DryccException as error:
+                logger.exception(error)
                 print('ERROR: There was a problem deploying {} '
                       'due to {}'.format(application, str(error)))
 

rootfs/api/models/app.py

@@ -896,7 +896,7 @@ def list_pods(self, *args, **kwargs):
             data.sort(key=lambda x: x['started'], reverse=True)
             return data
         except KubeHTTPException as e:
-            pass
+            logger.debug(e)
         except Exception as e:
             err = '(list pods): {}'.format(e)
             self.log(err, logging.ERROR)

rootfs/api/models/config.py

@@ -1,3 +1,4 @@
+import logging
 from django.conf import settings
 from django.db import models
 from jsonfield import JSONField
@@ -8,6 +9,9 @@
 from api.exceptions import DryccException, UnprocessableEntity
 
 
+logger = logging.getLogger(__name__)
+
+
 class Config(UuidAuditedModel):
     """
     Set of configuration values applied as environment variables
@@ -100,6 +104,7 @@ def set_tags(self, previous_config):
                     tags = json.loads(settings.DRYCC_DEFAULT_CONFIG_TAGS)
                     self.tags = tags
                 except json.JSONDecodeError as e:
+                    logger.exception(e)
                     return
             else:
                 return

rootfs/api/models/resource.py

@@ -139,6 +139,7 @@ def attach_update(self, *args, **kwargs):
             data = self._scheduler.svcat.get_instance(
                 self.app.id, self.name).json()
         except KubeException as e:
+            logger.debug(e)
             self.DryccException("resource {} does not exist".format(self.name))
         try:
             version = data["metadata"]["resourceVersion"]

rootfs/api/serializers.py

@@ -3,6 +3,7 @@
 """
 
 import json
+import logging
 import jmespath
 import re
 import jsonschema
@@ -21,6 +22,9 @@
 # https://docs-v2.readthedocs.io/en/latest/using-workflow/process-types-and-the-procfile/#declaring-process-types
 from api.exceptions import DryccException
 
+
+logger = logging.getLogger(__name__)
+
 PROCTYPE_MATCH = re.compile(r'^(?P<type>[a-z0-9]+(\-[a-z0-9]+)*)$')
 PROCTYPE_MISMATCH_MSG = "Process types can only contain lowercase alphanumeric characters"
 MEMLIMIT_MATCH = re.compile(r'^(?P<mem>([1-9][0-9]*[mgMG]))$', re.IGNORECASE)
@@ -536,6 +540,7 @@ def validate_path_pattern(value):
             try:
                 re.compile(pattern)
             except re.error as e:
+                logger.exception(e)
                 raise serializers.ValidationError(
                     "Service value should be valid regex (or set of regex split by comma)")
 
@@ -592,13 +597,16 @@ def validate_whitelist(data):
         for address in data:
             try:
                 ipaddress.ip_address(address)
-            except:
+            except Exception as e:
+                logger.exception(e)
                 try:
                     ipaddress.ip_network(address)
-                except:
+                except Exception as e:
+                    logger.exception(e)
                     try:
                         ipaddress.ip_interface(address)
-                    except:
+                    except Exception as e:
+                        logger.exception(e)
                         raise serializers.ValidationError(
                            "The address {} is not valid".format(address))
 

rootfs/dev_requirements.txt

@@ -1,16 +1,16 @@
 # test module
 # test
 # Run "make test-unit" for the % of code exercised during tests
-coverage==4.4.1
+coverage==5.3
 
 # Run "make test-style" to check python syntax and style
-flake8==3.4.1
+flake8==3.8.3
 
 # code coverage report at https://codecov.io/github/drycc/controller
-codecov==2.0.9
+codecov==2.1.9
 
 # mock out python-requests, mostly k8s
-requests-mock==1.5.2
+requests-mock==1.8.0
 
 # tail a log and pipe into tbgrep to find all tracebacks
 tbgrep==0.3.0

rootfs/scheduler/__init__.py

@@ -86,7 +86,7 @@ def version(self):
 
         data = response.json()
         parsed_version = parse(
-            re.sub("[^0-9\.]", '', str('{}.{}'.format(data['major'], data['minor']))))
+            re.sub(r"[^0-9\.]", '', str('{}.{}'.format(data['major'], data['minor']))))
         return Version('{}'.format(parsed_version))
 
     @staticmethod

rootfs/scheduler/mock.py

@@ -626,7 +626,7 @@ def prepare_query_filters(query):
     filters = {'labels': {}, 'fields': {}}
     if query:
         # set based regex - does not support only field
-        labelRegex = re.compile('^(?P<label>.*) (?P<matcher>notin|in)\s?\((?P<values>.*)\)$')
+        labelRegex = re.compile(r'^(?P<label>.*) (?P<matcher>notin|in)\s?\((?P<values>.*)\)$')
 
         queries = parse_qs(query)
         if 'labelSelector' in queries:

rootfs/scheduler/resources/pod.py

@@ -623,7 +623,7 @@ def _handle_long_image_pulling(self, reason, pod):
         if getattr(self, '_handle_long_image_pulling_applied', False):
             return 0
 
-        if reason is not 'Pulling':
+        if reason != 'Pulling':
             return 0
 
         # last event should be Pulling in this case