refactor: isort for package import

connaisseur/__main__.py

@@ -5,13 +5,12 @@
 from logging.config import dictConfig
 
 from cheroot.server import HTTPServer
-from cheroot.wsgi import Server
 from cheroot.ssl.builtin import BuiltinSSLAdapter
+from cheroot.wsgi import Server
 
 from connaisseur.flask_application import APP
 from connaisseur.logging_wrapper import ConnaisseurLoggingWrapper
 
-
 if __name__ == "__main__":
     LOG_LEVEL = os.environ.get("LOG_LEVEL", "INFO")
 

connaisseur/alert.py

@@ -7,14 +7,14 @@
 import requests
 from jinja2 import StrictUndefined, Template
 
-from connaisseur.util import safe_json_open, validate_schema
+from connaisseur.admission_request import AdmissionRequest
 from connaisseur.exceptions import (
     AlertSendingError,
     ConfigurationError,
     InvalidConfigurationFormatError,
     InvalidImageFormatError,
 )
-from connaisseur.admission_request import AdmissionRequest
+from connaisseur.util import safe_json_open, validate_schema
 
 
 class AlertingConfiguration:

connaisseur/config.py

@@ -1,6 +1,7 @@
 import collections
 import fnmatch
 import os
+
 import yaml
 
 from connaisseur.exceptions import (

connaisseur/constants.py

@@ -0,0 +1 @@
+SHA256 = "sha256"

connaisseur/flask_application.py

@@ -4,7 +4,7 @@
 import traceback
 
 from flask import Flask, jsonify, request
-from prometheus_flask_exporter import PrometheusMetrics, NO_PREFIX
+from prometheus_flask_exporter import NO_PREFIX, PrometheusMetrics
 
 import connaisseur.constants as const
 from connaisseur.admission_request import AdmissionRequest
@@ -17,7 +17,6 @@
 )
 from connaisseur.util import get_admission_review
 
-
 APP = Flask(__name__)
 """
 Flask application that admits the request send to the k8s cluster, validates it and

connaisseur/kube_api.py

@@ -1,4 +1,5 @@
 import os
+
 import requests
 
 

connaisseur/util.py

@@ -5,7 +5,7 @@
 from typing import Optional
 
 import yaml
-from jsonschema import FormatChecker, validate, ValidationError
+from jsonschema import FormatChecker, ValidationError, validate
 
 from connaisseur.exceptions import PathTraversalError
 

connaisseur/validators/cosign/cosign_validator.py

@@ -4,21 +4,20 @@
 import os
 import re
 import subprocess  # nosec
-
 from concurrent.futures import ThreadPoolExecutor
 
 import connaisseur.constants as const
 from connaisseur.exceptions import (
     CosignError,
     CosignTimeout,
-    NotFoundException,
     InvalidFormatException,
+    NotFoundException,
     UnexpectedCosignData,
     ValidationError,
     WrongKeyError,
 )
 from connaisseur.image import Image
-from connaisseur.trust_root import KMSKey, TrustRoot, ECDSAKey
+from connaisseur.trust_root import ECDSAKey, KMSKey, TrustRoot
 from connaisseur.util import safe_path_func  # nosec
 from connaisseur.validators.interface import ValidatorInterface
 
@@ -163,7 +162,10 @@ def __get_cosign_validated_digests(self, image: str, trust_root: dict):
                         digest = sig_data["critical"]["image"].get(
                             "docker-manifest-digest", ""
                         )
-                        if re.match(rf"{const.SHA256}:[0-9A-Fa-f]{{64}}", digest) is None:
+                        if (
+                            re.match(rf"{const.SHA256}:[0-9A-Fa-f]{{64}}", digest)
+                            is None
+                        ):
                             msg = "Digest '{digest}' does not match expected digest pattern."
                             raise InvalidFormatException(message=msg, digest=digest)
                     except Exception as err:

connaisseur/validators/notaryv1/key_store.py

@@ -1,6 +1,6 @@
+import connaisseur.constants as const
 from connaisseur.exceptions import NotFoundException
 from connaisseur.trust_root import TrustRoot
-import connaisseur.constants as const
 
 
 class KeyStore:

connaisseur/validators/notaryv1/trust_data.py

@@ -15,7 +15,7 @@
     ValidationError,
     WrongKeyError,
 )
-from connaisseur.trust_root import TrustRoot, ECDSAKey
+from connaisseur.trust_root import ECDSAKey, TrustRoot
 from connaisseur.util import validate_schema
 from connaisseur.validators.notaryv1.key_store import KeyStore
 

connaisseur/workload_object.py

@@ -2,7 +2,6 @@
 from connaisseur.exceptions import ParentNotFoundError, UnknownAPIVersionError
 from connaisseur.image import Image
 
-
 SUPPORTED_API_VERSIONS = {
     "Pod": ["v1"],
     "Deployment": ["apps/v1", "apps/v1beta1", "apps/v1beta2"],

scripts/changelogger.py

@@ -1,10 +1,11 @@
 import argparse
 import base64
-import requests
 import subprocess
 import sys
 import time
 
+import requests
+
 sep = "@@__CHGLOG__@@"
 delim = "@@__CHGLOG_DELIMITER__@@"
 ha = "%H"

setup.py

@@ -1,3 +1,3 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 setup(name="connaisseur", packages=find_packages())

tests/conftest.py

@@ -1,21 +1,22 @@
+import json
 import os
 import re
-import json
+from contextlib import contextmanager
+
 import pytest
 import requests
 from aioresponses import CallbackResult
-import connaisseur.kube_api
-import connaisseur.config as co
+
 import connaisseur.admission_request as admreq
 import connaisseur.alert as alert
-from connaisseur.trust_root import TrustRoot
-import connaisseur.validators.notaryv1.trust_data as td
+import connaisseur.config as co
+import connaisseur.kube_api
+import connaisseur.util as util
 import connaisseur.validators.notaryv1.key_store as ks
 import connaisseur.validators.notaryv1.notary as no
 import connaisseur.validators.notaryv1.notaryv1_validator as nv1
-import connaisseur.util as util
-from contextlib import contextmanager
-
+import connaisseur.validators.notaryv1.trust_data as td
+from connaisseur.trust_root import TrustRoot
 
 """
 This file is used for sharing fixtures across all other test files.

tests/integration/alerting/app/alert_checker.py

@@ -1,6 +1,7 @@
-from flask import Flask, request
 import json
 
+from flask import Flask, request
+
 APP = Flask(__name__)
 
 endpoint_hits = {}

tests/test_admission_request.py

@@ -1,8 +1,9 @@
 import pytest
-from . import conftest as fix
+
 import connaisseur.admission_request as admreq
 import connaisseur.exceptions as exc
 
+from . import conftest as fix
 
 static_adm_req = [
     {

tests/test_alert.py

@@ -1,12 +1,14 @@
-import pytest
-from datetime import datetime, timedelta
 import json
+from datetime import datetime, timedelta
+
+import pytest
 
-from . import conftest as fix
 import connaisseur.alert as alert
 from connaisseur.admission_request import AdmissionRequest
 from connaisseur.exceptions import AlertSendingError, ConfigurationError
 
+from . import conftest as fix
+
 with open(
     "tests/data/sample_admission_requests/ad_request_deployments.json", "r"
 ) as readfile:

tests/test_config.py

@@ -1,10 +1,12 @@
 import pytest
-from . import conftest as fix
+
 import connaisseur.config as co
 import connaisseur.exceptions as exc
 import connaisseur.validators as vals
 from connaisseur.image import Image
 
+from . import conftest as fix
+
 
 @pytest.fixture(autouse=True)
 def mock_config_path(monkeypatch):

tests/test_exceptions.py

@@ -1,5 +1,7 @@
 import os
+
 import pytest
+
 import connaisseur.exceptions as exc
 
 

tests/test_flask_application.py

@@ -1,14 +1,17 @@
 import re
+
 import pytest
 from aioresponses import aioresponses
-from . import conftest as fix
+
 import connaisseur.alert as alert
 import connaisseur.config as co
 import connaisseur.exceptions as exc
 from connaisseur.admission_request import AdmissionRequest
 from connaisseur.image import Image
 from connaisseur.validators.static.static_validator import StaticValidator
 
+from . import conftest as fix
+
 
 @pytest.fixture(autouse=True)
 def m_config(monkeypatch, sample_nv1):

tests/test_image.py

@@ -1,7 +1,9 @@
 import pytest
-from . import conftest as fix
-import connaisseur.image as img
+
 import connaisseur.exceptions as exc
+import connaisseur.image as img
+
+from . import conftest as fix
 
 
 @pytest.mark.parametrize(

tests/test_kube_api.py

@@ -1,7 +1,9 @@
 import pytest
-from . import conftest as fix
+
 import connaisseur.kube_api as k_api
 
+from . import conftest as fix
+
 
 @pytest.mark.parametrize(
     "url, response",

tests/test_logging_wrapper.py

@@ -1,10 +1,11 @@
-import pytest
 import time
 
-from . import conftest as fix
+import pytest
 
 import connaisseur.logging_wrapper as lw
 
+from . import conftest as fix
+
 
 @pytest.fixture
 def mock_time(monkeypatch):

tests/test_trust_root.py

@@ -1,8 +1,9 @@
 import pytest
-from . import conftest as fix
+
 import connaisseur.exceptions as exc
 import connaisseur.trust_root as trust_root
 
+from . import conftest as fix
 
 sample_ecdsa = "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEOXYta5TgdCwXTCnLU09W5T4M4r9f\nQQrqJuADP6U7g5r9ICgPSmZuRHP/1AYUfOQW3baveKsT969EfELKj1lfCA==\n-----END PUBLIC KEY-----"
 sample_rsa = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs5pC7R5OTSTUMJHUniPk\nrLfmGDAUxZtRlvIE+pGPCD6cUXH22advkK87xwpupjxdVYuKTFnWHUIyFJwjI3vu\nsievezcAr0E/xxyeo49tWog9kFoooK3qmXjpETC8OpvNROZ0K3qhlm9PZkGo3gSJ\n/B4rMU/d+jkCI8eiUPpdVQOczdBoD5nzQAF1mfmffWGsbKY+d8/l77Vset0GXExR\nzUtnglMhREyHNpDeQUg5OEn+kuGLlTzIxpIF+MlbzP3+xmNEzH2iafr0ae2g5kX2\n880priXpxG8GXW2ybZmPvchclnvFu4ZfZcM10FpgYJFvR/9iofFeAka9u5z6VZcc\nmQIDAQAB\n-----END PUBLIC KEY-----"

tests/test_util.py

@@ -1,7 +1,9 @@
 import pytest
-from . import conftest as fix
-import connaisseur.util as ut
+
 import connaisseur.exceptions as exc
+import connaisseur.util as ut
+
+from . import conftest as fix
 
 
 @pytest.mark.parametrize(

tests/test_workload_object.py

@@ -1,9 +1,10 @@
 import pytest
-from . import conftest as fix
-import connaisseur.workload_object as wl
+
 import connaisseur.exceptions as exc
+import connaisseur.workload_object as wl
 from connaisseur.image import Image
 
+from . import conftest as fix
 
 static_k8s = [
     {

tests/validators/cosign/test_cosign_validator.py

@@ -1,12 +1,15 @@
+import subprocess
+
 import pytest
 import pytest_subprocess
-import subprocess
-from ... import conftest as fix
-from connaisseur.image import Image
-import connaisseur.validators.cosign.cosign_validator as co
+
 import connaisseur.exceptions as exc
+import connaisseur.validators.cosign.cosign_validator as co
+from connaisseur.image import Image
 from connaisseur.trust_root import TrustRoot
 
+from ... import conftest as fix
+
 example_key = (
     "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE6uuXb"
     "ZhEfTYb4Mnb/LdrtXKTIIbzNBp8mwriocbaxXxzqu"

tests/validators/notaryv1/test_keystore.py

@@ -1,10 +1,13 @@
 import base64
-from connaisseur.trust_root import TrustRoot
+
 import pytest
-from ... import conftest as fix
+
+import connaisseur.exceptions as exc
 import connaisseur.validators.notaryv1.key_store as ks
+from connaisseur.trust_root import TrustRoot
 from connaisseur.validators.notaryv1.trust_data import TrustData
-import connaisseur.exceptions as exc
+
+from ... import conftest as fix
 
 sample_key = (
     "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtR5kwrDK22SyCu"

tests/validators/notaryv1/test_notary.py

@@ -1,15 +1,18 @@
-from requests.models import HTTPError
-import yaml
-import pytest
 import re
-from aioresponses import aioresponses
+
+import pytest
+import yaml
 from aiohttp.client_exceptions import ClientResponseError
-from ... import conftest as fix
-import connaisseur.validators.notaryv1.notary as notary
+from aioresponses import aioresponses
+from requests.models import HTTPError
+
 import connaisseur.exceptions as exc
 import connaisseur.util
+import connaisseur.validators.notaryv1.notary as notary
 from connaisseur.image import Image
 
+from ... import conftest as fix
+
 
 @pytest.fixture
 def sample_notaries():