Disable ruff split-on-trailing-comma and update ruff (minvws#2544)

Co-authored-by: ammar92 <[email protected]>
Co-authored-by: Jan Klopper <[email protected]>

boefjes/boefjes/api.py

@@ -13,12 +13,7 @@
 from boefjes.clients.bytes_client import BytesAPIClient
 from boefjes.clients.scheduler_client import SchedulerAPIClient, TaskStatus
 from boefjes.config import settings
-from boefjes.job_handler import (
-    _find_ooi_in_past,
-    get_environment_settings,
-    get_octopoes_api_connector,
-    serialize_ooi,
-)
+from boefjes.job_handler import _find_ooi_in_past, get_environment_settings, get_octopoes_api_connector, serialize_ooi
 from boefjes.job_models import BoefjeMeta
 from boefjes.katalogus.local_repository import LocalPluginRepository, get_local_repository
 from boefjes.plugins.models import _default_mime_types

boefjes/boefjes/job_handler.py

@@ -13,12 +13,7 @@
 from boefjes.clients.bytes_client import BytesAPIClient
 from boefjes.config import settings
 from boefjes.docker_boefjes_runner import DockerBoefjesRunner
-from boefjes.job_models import (
-    BoefjeMeta,
-    NormalizerMeta,
-    NormalizerPlainOOI,
-    NormalizerScanProfile,
-)
+from boefjes.job_models import BoefjeMeta, NormalizerMeta, NormalizerPlainOOI, NormalizerScanProfile
 from boefjes.katalogus.local_repository import LocalPluginRepository
 from boefjes.plugins.models import _default_mime_types
 from boefjes.runtime_interfaces import BoefjeJobRunner, Handler, NormalizerJobRunner

boefjes/boefjes/katalogus/dependencies/plugins.py

@@ -8,14 +8,8 @@
 from jsonschema.validators import validate
 from sqlalchemy.orm import Session
 
-from boefjes.katalogus.clients import (
-    PluginRepositoryClient,
-    PluginRepositoryClientInterface,
-)
-from boefjes.katalogus.local_repository import (
-    LocalPluginRepository,
-    get_local_repository,
-)
+from boefjes.katalogus.clients import PluginRepositoryClient, PluginRepositoryClientInterface
+from boefjes.katalogus.local_repository import LocalPluginRepository, get_local_repository
 from boefjes.katalogus.models import RESERVED_LOCAL_ID, PluginType, Repository
 from boefjes.katalogus.storage.interfaces import (
     NotFound,

boefjes/boefjes/katalogus/routers/organisations.py

@@ -2,10 +2,7 @@
 
 from boefjes.katalogus.dependencies.organisations import get_organisations_store
 from boefjes.katalogus.models import Organisation
-from boefjes.katalogus.storage.interfaces import (
-    OrganisationNotFound,
-    OrganisationStorage,
-)
+from boefjes.katalogus.storage.interfaces import OrganisationNotFound, OrganisationStorage
 from boefjes.sql.db import ObjectNotFoundException
 
 router = APIRouter(prefix="/organisations", tags=["organisations"])

boefjes/boefjes/katalogus/storage/diskcache.py

@@ -3,10 +3,7 @@
 from diskcache import Cache
 
 from boefjes.katalogus.models import Organisation, Repository
-from boefjes.katalogus.storage.interfaces import (
-    OrganisationStorage,
-    RepositoryStorage,
-)
+from boefjes.katalogus.storage.interfaces import OrganisationStorage, RepositoryStorage
 
 # todo: improve duplicate code
 

boefjes/boefjes/katalogus/tests/test_organisations.py

@@ -4,9 +4,7 @@
 from fastapi.testclient import TestClient
 
 from boefjes.katalogus.api import app
-from boefjes.katalogus.dependencies.organisations import (
-    get_organisations_store,
-)
+from boefjes.katalogus.dependencies.organisations import get_organisations_store
 from boefjes.katalogus.models import Organisation
 from boefjes.katalogus.storage.memory import OrganisationStorageMemory
 

boefjes/boefjes/katalogus/tests/test_plugin_service.py

@@ -6,11 +6,7 @@
 from boefjes.katalogus.local_repository import LocalPluginRepository
 from boefjes.katalogus.models import RESERVED_LOCAL_ID, Bit, Boefje, Normalizer, Repository
 from boefjes.katalogus.storage.interfaces import SettingsNotConformingToSchema
-from boefjes.katalogus.storage.memory import (
-    PluginStatesStorageMemory,
-    RepositoryStorageMemory,
-    SettingsStorageMemory,
-)
+from boefjes.katalogus.storage.memory import PluginStatesStorageMemory, RepositoryStorageMemory, SettingsStorageMemory
 
 
 def get_plugin_seed():

boefjes/boefjes/plugins/kat_binaryedge/containers/normalize.py

@@ -5,14 +5,7 @@
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI, Reference
 from octopoes.models.ooi.findings import Finding, KATFindingType
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.software import Software, SoftwareInstance
 
 

boefjes/boefjes/plugins/kat_binaryedge/databases/normalize.py

@@ -5,14 +5,7 @@
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI, Reference
 from octopoes.models.ooi.findings import Finding, KATFindingType
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.software import Software, SoftwareInstance
 
 

boefjes/boefjes/plugins/kat_binaryedge/http_web/normalize.py

@@ -5,14 +5,7 @@
 from boefjes.job_models import NormalizerMeta
 from boefjes.plugins.kat_binaryedge.services.normalize import get_name_from_cpe
 from octopoes.models import OOI, Reference
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.software import Software, SoftwareInstance
 
 

boefjes/boefjes/plugins/kat_binaryedge/message_queues/normalize.py

@@ -5,14 +5,7 @@
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI, Reference
 from octopoes.models.ooi.findings import Finding, KATFindingType
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.software import Software
 
 

boefjes/boefjes/plugins/kat_binaryedge/protocols/normalize.py

@@ -5,14 +5,7 @@
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI, Reference
 from octopoes.models.ooi.findings import Finding, KATFindingType
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 
 
 def run(normalizer_meta: NormalizerMeta, raw: bytes | str) -> Iterable[OOI]:

boefjes/boefjes/plugins/kat_binaryedge/remote_desktop/normalize.py

@@ -5,14 +5,7 @@
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI, Reference
 from octopoes.models.ooi.findings import Finding, KATFindingType
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.service import IPService, Service
 
 

boefjes/boefjes/plugins/kat_binaryedge/service_identification/normalize.py

@@ -6,14 +6,7 @@
 from boefjes.plugins.kat_binaryedge.services.normalize import get_name_from_cpe
 from octopoes.models import OOI, Reference
 from octopoes.models.ooi.findings import Finding, KATFindingType
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.service import IPService, Service
 from octopoes.models.ooi.software import Software, SoftwareInstance
 

boefjes/boefjes/plugins/kat_binaryedge/services/normalize.py

@@ -4,14 +4,7 @@
 
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI, Reference
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.software import Software, SoftwareInstance
 
 

boefjes/boefjes/plugins/kat_censys/normalize.py

@@ -6,20 +6,10 @@
 from octopoes.models import OOI, Reference
 from octopoes.models.ooi.certificate import X509Certificate
 from octopoes.models.ooi.dns.zone import Hostname
-from octopoes.models.ooi.network import (
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.service import IPService, Service
 from octopoes.models.ooi.software import Software, SoftwareInstance
-from octopoes.models.ooi.web import (
-    HTTPHeader,
-    HTTPResource,
-    IPAddressHTTPURL,
-    Website,
-)
+from octopoes.models.ooi.web import HTTPHeader, HTTPResource, IPAddressHTTPURL, Website
 
 
 def run(normalizer_meta: NormalizerMeta, raw: bytes | str) -> Iterable[OOI]:

boefjes/boefjes/plugins/kat_dns_zone/normalize.py

@@ -6,9 +6,7 @@
 
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI
-from octopoes.models.ooi.dns.records import (
-    DNSSOARecord,
-)
+from octopoes.models.ooi.dns.records import DNSSOARecord
 from octopoes.models.ooi.dns.zone import DNSZone, Hostname
 from octopoes.models.ooi.network import Network
 

boefjes/boefjes/plugins/kat_masscan/normalize.py

@@ -5,14 +5,7 @@
 
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI, Reference
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 
 
 def get_ip_ports_and_service(ip_with_ports: dict, network: Network, netblock: Reference) -> Iterator[OOI]:

boefjes/boefjes/plugins/kat_nmap_tcp/normalize.py

@@ -6,14 +6,7 @@
 
 from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI, Reference
-from octopoes.models.ooi.network import (
-    IPAddressV4,
-    IPAddressV6,
-    IPPort,
-    Network,
-    PortState,
-    Protocol,
-)
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, PortState, Protocol
 from octopoes.models.ooi.service import IPService, Service
 
 

boefjes/boefjes/plugins/kat_snyk/normalize.py

@@ -5,12 +5,7 @@
 from boefjes.job_models import NormalizerMeta
 from boefjes.plugins.kat_snyk import check_version
 from octopoes.models import OOI, Reference
-from octopoes.models.ooi.findings import (
-    CVEFindingType,
-    Finding,
-    KATFindingType,
-    SnykFindingType,
-)
+from octopoes.models.ooi.findings import CVEFindingType, Finding, KATFindingType, SnykFindingType
 
 logger = logging.getLogger(__name__)
 

boefjes/boefjes/sql/db_models.py

@@ -1,12 +1,4 @@
-from sqlalchemy import (
-    Boolean,
-    Column,
-    ForeignKey,
-    Integer,
-    String,
-    Table,
-    UniqueConstraint,
-)
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, Table, UniqueConstraint
 from sqlalchemy.orm import relationship
 
 from boefjes.sql.db import SQL_BASE

boefjes/boefjes/sql/organisation_storage.py

@@ -4,10 +4,7 @@
 
 from boefjes.config import Settings, settings
 from boefjes.katalogus.models import Organisation, Repository
-from boefjes.katalogus.storage.interfaces import (
-    OrganisationNotFound,
-    OrganisationStorage,
-)
+from boefjes.katalogus.storage.interfaces import OrganisationNotFound, OrganisationStorage
 from boefjes.sql.db import ObjectNotFoundException
 from boefjes.sql.db_models import OrganisationInDB, RepositoryInDB
 from boefjes.sql.repository_storage import SQLRepositoryStorage

boefjes/tests/test_cve_finding_types.py

@@ -3,9 +3,7 @@
 from boefjes.job_models import NormalizerMeta
 from boefjes.plugins.kat_cve_finding_types.normalize import run
 from octopoes.models.ooi.findings import RiskLevelSeverity
-from octopoes.models.types import (
-    CVEFindingType,
-)
+from octopoes.models.types import CVEFindingType
 from tests.loading import get_dummy_data
 
 

boefjes/tests/test_snyk.py

@@ -5,11 +5,7 @@
 from boefjes.plugins.kat_snyk.main import run as run_boefje
 from boefjes.plugins.kat_snyk.normalize import run
 from octopoes.models.ooi.findings import SnykFindingType
-from octopoes.models.types import (
-    CVEFindingType,
-    Finding,
-    Software,
-)
+from octopoes.models.types import CVEFindingType, Finding, Software
 from tests.loading import get_dummy_data
 
 

bytes/bytes/timestamping/hashing.py

@@ -4,11 +4,7 @@
 
 from pydantic import AwareDatetime
 
-from bytes.models import (
-    HashingAlgorithm,
-    RawData,
-    SecureHash,
-)
+from bytes.models import HashingAlgorithm, RawData, SecureHash
 
 logger = logging.getLogger(__name__)
 

bytes/tests/loading.py

@@ -5,15 +5,7 @@
 from uuid import UUID
 
 from bytes.config import BASE_DIR
-from bytes.models import (
-    Boefje,
-    BoefjeMeta,
-    MimeType,
-    Normalizer,
-    NormalizerMeta,
-    RawData,
-    RawDataMeta,
-)
+from bytes.models import Boefje, BoefjeMeta, MimeType, Normalizer, NormalizerMeta, RawData, RawDataMeta
 
 
 def load_stub(relative_path: str) -> dict[str, Any]:

octopoes/octopoes/api/router.py

@@ -19,14 +19,7 @@
 )
 from octopoes.core.app import bootstrap_octopoes, get_xtdb_client
 from octopoes.core.service import OctopoesService
-from octopoes.models import (
-    OOI,
-    Reference,
-    ScanLevel,
-    ScanProfile,
-    ScanProfileBase,
-    ScanProfileType,
-)
+from octopoes.models import OOI, Reference, ScanLevel, ScanProfile, ScanProfileBase, ScanProfileType
 from octopoes.models.exception import ObjectNotFoundException
 from octopoes.models.explanation import InheritanceSection
 from octopoes.models.ooi.findings import Finding, RiskLevelSeverity