Enforce Import Ordering (Isort)

.git-blame-ignore-revs

@@ -1,2 +1,4 @@
 # Nov. 2020 commit that mass-reformatted using Black
 5bbbe6b9744f2fb806198ae5d6f0cfe3b367fd9d
+# Jul. 2021 commit that mass-reformatted using isort
+80820a86360f149fb8a71466c1c10bfc84c0513a

.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile=black

anchore_engine/analyzers/abstract.py

@@ -1,5 +1,6 @@
-from abc import ABC, abstractmethod
 import os
+from abc import ABC, abstractmethod
+
 from anchore_engine.analyzers import utils as analyzer_utils
 
 

anchore_engine/analyzers/binary.py

@@ -1,12 +1,13 @@
-import sys
+import collections
+import json
 import os
 import re
-import json
+import sys
 import tarfile
-import collections
 
 import anchore_engine.utils
 from anchore_engine.subsys import logger
+
 from . import utils
 
 binary_package_el = {

anchore_engine/analyzers/manager.py

@@ -1,16 +1,15 @@
+import collections
 import os
 import re
 import time
-import collections
+
+from pkg_resources import resource_filename
 
 import anchore_engine.utils
+from anchore_engine.analyzers import binary, hints, syft, utils
 from anchore_engine.analyzers.hints import HintsTypeError
-from anchore_engine.subsys import logger
 from anchore_engine.configuration.localconfig import analyzer_paths
-from pkg_resources import resource_filename
-from anchore_engine.analyzers import syft, hints
-from anchore_engine.analyzers import binary
-from anchore_engine.analyzers import utils
+from anchore_engine.subsys import logger
 
 
 def run(

anchore_engine/analyzers/modules/01_analyzer_meta.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 
-import sys
+import json
 import os
 import shutil
-import json
+import sys
+
 import anchore_engine.analyzers.utils
 
 analyzer_name = "analyzer_meta"

anchore_engine/analyzers/modules/02_layers.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-import sys
+import json
 import os
 import re
-import json
+import sys
 
 import anchore_engine.analyzers.utils
 

anchore_engine/analyzers/modules/13_retrieve_files.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
 import base64
-import sys
+import json
 import os
 import re
-import json
+import sys
 import tarfile
 
 import anchore_engine.analyzers.utils

anchore_engine/analyzers/modules/13_secret_content_search.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
 import base64
-import sys
+import json
 import os
 import re
-import json
+import sys
 import tarfile
 
 import anchore_engine.analyzers.utils

anchore_engine/analyzers/modules/20_file_list.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-import sys
+import json
 import os
 import re
-import json
-import subprocess
 import stat
+import subprocess
+import sys
 
 import anchore_engine.analyzers.utils
 

anchore_engine/analyzers/modules/30_file_checksums.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-import sys
+import hashlib
 import os
 import re
+import sys
 import time
-import hashlib
 
 import anchore_engine.analyzers.utils
 

anchore_engine/analyzers/modules/32_golang_packages.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-import sys
+import json
 import os
 import re
-import json
+import sys
 import traceback
 
 import anchore_engine.analyzers.utils

anchore_engine/analyzers/modules/40_file_suids.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-import sys
-import os
 import json
+import os
 import stat
+import sys
 
 import anchore_engine.analyzers.utils
 

anchore_engine/analyzers/modules/50_malware_scan.py

@@ -3,8 +3,9 @@
 import json
 import os
 import sys
-from anchore_engine.analyzers.abstract import Analyzer
+
 from anchore_engine.analyzers import malware
+from anchore_engine.analyzers.abstract import Analyzer
 
 
 class MalwareAnalyzer(Analyzer):

anchore_engine/analyzers/syft/__init__.py

@@ -1,9 +1,10 @@
 import collections
 
-from anchore_engine.analyzers.utils import defaultdict_to_dict, content_hints, dig
+from anchore_engine.analyzers.utils import content_hints, defaultdict_to_dict, dig
 from anchore_engine.clients.syft_wrapper import run_syft
-from .handlers import modules_by_artifact_type, modules_by_engine_type
+
 from ...subsys import logger
+from .handlers import modules_by_artifact_type, modules_by_engine_type
 
 
 def filter_relationships(relationships, **kwargs):

anchore_engine/analyzers/syft/handlers/__init__.py

@@ -1,10 +1,4 @@
-from . import alpine
-from . import gem
-from . import java
-from . import npm
-from . import python
-from . import rpm
-from . import debian
+from . import alpine, debian, gem, java, npm, python, rpm
 
 # This is a mapping of **syft** artifact types to modules to transform syft output into engine-compliant output.
 # Each module has two functions: translate_and_save_entry & save_entry

anchore_engine/apis/__init__.py

@@ -5,9 +5,10 @@
 import hashlib
 import json
 
-from .context import ApiRequestContextProxy
 from anchore_engine.subsys import logger
 
+from .context import ApiRequestContextProxy
+
 
 def do_request_prep(request, default_params=None):
     if default_params is None:

anchore_engine/apis/authorization.py

@@ -3,26 +3,29 @@
 
 """
 import enum
+import functools
 import json
-from abc import abstractmethod, ABC
-import anchore_engine
+from abc import ABC, abstractmethod
 from collections import namedtuple
-from anchore_engine.subsys import logger
+from threading import RLock
+
+import pkg_resources
 from connexion import request as request_proxy
 from flask import Response
-from anchore_engine.apis.context import ApiRequestContextProxy
-from yosai.core import Yosai, exceptions as auth_exceptions, UsernamePasswordToken
-from yosai.core.authc.authc import token_info
+from yosai.core import UsernamePasswordToken, Yosai
+from yosai.core import exceptions as auth_exceptions
 from yosai.core.authc.abcs import AuthenticationToken
-from anchore_engine.db import session_scope, AccountTypes, AccountStates
-import pkg_resources
-import functools
-from anchore_engine.common.helpers import make_response_error
-from anchore_engine.apis.authentication import idp_factory, IdentityContext
+from yosai.core.authc.authc import token_info
+
+import anchore_engine
+from anchore_engine.apis.authentication import IdentityContext, idp_factory
+from anchore_engine.apis.context import ApiRequestContextProxy
 from anchore_engine.apis.exceptions import AnchoreApiError
-from threading import RLock
-from anchore_engine.subsys.auth.realms import UsernamePasswordRealm, ExternalAuthorizer
+from anchore_engine.common.helpers import make_response_error
 from anchore_engine.configuration import localconfig
+from anchore_engine.db import AccountStates, AccountTypes, session_scope
+from anchore_engine.subsys import logger
+from anchore_engine.subsys.auth.realms import ExternalAuthorizer, UsernamePasswordRealm
 from anchore_engine.subsys.auth.stores.verifier import JwtToken
 
 # Global authorizer configured

anchore_engine/apis/context.py

@@ -1,4 +1,6 @@
-from flask import g as request_globals, request
+from flask import g as request_globals
+from flask import request
+
 from anchore_engine.apis.authentication import IdentityContext
 
 

anchore_engine/apis/oauth.py

@@ -1,19 +1,20 @@
 import copy
-from yosai.core.authc.authc import UsernamePasswordToken
 import time
-from anchore_engine.configuration import localconfig
-from anchore_engine.subsys import logger
-from anchore_engine.db import session_scope, get_session
-from anchore_engine.db.entities.identity import OAuth2Client, OAuth2Token
+
 from authlib.integrations.flask_oauth2.authorization_server import AuthorizationServer
 from authlib.oauth2.rfc6749 import grants
+from yosai.core.authc.authc import UsernamePasswordToken
+
 from anchore_engine.apis.authorization import get_authorizer
 from anchore_engine.auth.oauth import token_manager
+from anchore_engine.configuration import localconfig
 from anchore_engine.configuration.localconfig import (
-    OauthNotConfiguredError,
     InvalidOauthConfigurationError,
+    OauthNotConfiguredError,
 )
-
+from anchore_engine.db import get_session, session_scope
+from anchore_engine.db.entities.identity import OAuth2Client, OAuth2Token
+from anchore_engine.subsys import logger
 
 # System uses an anonymous client, so that users do not have to register specific clients
 # This could be extended in the future to add client registration and auth support in OAuth2 flows

anchore_engine/auth/aws_ecr.py

@@ -1,16 +1,17 @@
-import re
-import os
-import pytz
+import base64
+import datetime
 import json
+import os
+import re
 import time
-import base64
+from urllib.parse import urlparse
+
 import boto3
-import datetime
+import pytz
 
+import anchore_engine.configuration.localconfig
 from anchore_engine import utils
 from anchore_engine.subsys import logger
-import anchore_engine.configuration.localconfig
-from urllib.parse import urlparse
 
 
 def parse_registry_url(registry_url):

anchore_engine/auth/common.py

@@ -1,5 +1,6 @@
-import time
 import json
+import time
+
 from anchore_engine.subsys import logger
 
 

anchore_engine/auth/oauth.py

@@ -5,15 +5,16 @@
 import copy
 import datetime
 import uuid
-from authlib.jose import jwt
-from authlib.jose import JWTClaims
+
+from authlib.jose import JWTClaims, jwt
+
 from anchore_engine.configuration import localconfig
 from anchore_engine.configuration.localconfig import (
-    OauthNotConfiguredError,
     InvalidOauthConfigurationError,
+    OauthNotConfiguredError,
 )
-from anchore_engine.utils import ensure_bytes
 from anchore_engine.subsys import logger
+from anchore_engine.utils import ensure_bytes
 
 ANCHORE_ISSUER = "anchore-engine"
 ANCHORE_AUDIENCE = "anchore-engine"

anchore_engine/clients/docker_registry.py

@@ -1,17 +1,17 @@
 import json
 import re
-import time
 import shlex
+import time
 
 import requests
 
-import anchore_engine.configuration.localconfig
 import anchore_engine.auth.common
-from anchore_engine.subsys import logger
+import anchore_engine.configuration.localconfig
 from anchore_engine.clients.skopeo_wrapper import (
     get_image_manifest_skopeo,
     get_repo_tags_skopeo,
 )
+from anchore_engine.subsys import logger
 
 
 def get_image_manifest_docker_registry(

anchore_engine/clients/grype_wrapper.py

@@ -11,7 +11,7 @@
 
 import sqlalchemy
 from readerwriterlock import rwlock
-from sqlalchemy import Column, ForeignKey, Integer, String, func, and_
+from sqlalchemy import Column, ForeignKey, Integer, String, and_, func
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship, sessionmaker