fix new lints

ljstella · ljstella · commit 9d96a56b763e · 2025-07-17T13:52:33.000-05:00
diff --git a/contentctl/actions/deploy_acs.py b/contentctl/actions/deploy_acs.py
@@ -1,7 +1,9 @@
-from contentctl.objects.config import deploy_acs, StackType
-from requests import post
 import pprint
 
+from requests import post
+
+from contentctl.objects.config import StackType, deploy_acs
+
 
 class Deploy:
     def execute(self, config: deploy_acs, appinspect_token: str) -> None:
diff --git a/contentctl/actions/detection_testing/infrastructures/DetectionTestingInfrastructureContainer.py b/contentctl/actions/detection_testing/infrastructures/DetectionTestingInfrastructureContainer.py
@@ -1,11 +1,12 @@
+import docker
+import docker.models.containers
+import docker.models.resource
+import docker.types
+
 from contentctl.actions.detection_testing.infrastructures.DetectionTestingInfrastructure import (
     DetectionTestingInfrastructure,
 )
 from contentctl.objects.config import test
-import docker.models.resource
-import docker.models.containers
-import docker
-import docker.types
 
 
 class DetectionTestingInfrastructureContainer(DetectionTestingInfrastructure):
diff --git a/contentctl/actions/detection_testing/progress_bar.py b/contentctl/actions/detection_testing/progress_bar.py
@@ -1,7 +1,8 @@
+import datetime
 import time
 from enum import StrEnum
+
 from tqdm import tqdm
-import datetime
 
 
 class TestReportingType(StrEnum):
diff --git a/contentctl/actions/detection_testing/views/DetectionTestingViewCLI.py b/contentctl/actions/detection_testing/views/DetectionTestingViewCLI.py
@@ -1,10 +1,11 @@
+import time
+
+import tqdm
+
 from contentctl.actions.detection_testing.views.DetectionTestingView import (
     DetectionTestingView,
 )
 
-import time
-import tqdm
-
 
 class DetectionTestingViewCLI(DetectionTestingView, arbitrary_types_allowed=True):
     pbar: tqdm.tqdm = None
diff --git a/contentctl/actions/detection_testing/views/DetectionTestingViewFile.py b/contentctl/actions/detection_testing/views/DetectionTestingViewFile.py
@@ -1,8 +1,10 @@
+import pathlib
+
+import yaml
+
 from contentctl.actions.detection_testing.views.DetectionTestingView import (
     DetectionTestingView,
 )
-import pathlib
-import yaml
 
 OUTPUT_FOLDER = "test_results"
 OUTPUT_FILENAME = "summary.yml"
diff --git a/contentctl/actions/detection_testing/views/DetectionTestingViewWeb.py b/contentctl/actions/detection_testing/views/DetectionTestingViewWeb.py
@@ -1,9 +1,9 @@
+import webbrowser
 from threading import Thread
+from wsgiref.simple_server import WSGIRequestHandler, make_server
 
-from bottle import template, Bottle, ServerAdapter
-from wsgiref.simple_server import make_server, WSGIRequestHandler
 import jinja2
-import webbrowser
+from bottle import Bottle, ServerAdapter, template
 from pydantic import ConfigDict
 
 from contentctl.actions.detection_testing.views.DetectionTestingView import (
diff --git a/contentctl/actions/doc_gen.py b/contentctl/actions/doc_gen.py
@@ -1,8 +1,7 @@
 import os
-
 from dataclasses import dataclass
 
-from contentctl.input.director import DirectorInputDto, Director, DirectorOutputDto
+from contentctl.input.director import Director, DirectorInputDto, DirectorOutputDto
 from contentctl.output.doc_md_output import DocMdOutput
 
 
diff --git a/contentctl/actions/reporting.py b/contentctl/actions/reporting.py
@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 
 from contentctl.input.director import DirectorOutputDto
-from contentctl.output.svg_output import SvgOutput
-from contentctl.output.attack_nav_output import AttackNavOutput
 from contentctl.objects.config import report
+from contentctl.output.attack_nav_output import AttackNavOutput
+from contentctl.output.svg_output import SvgOutput
 
 
 @dataclass(frozen=True)
diff --git a/contentctl/actions/test.py b/contentctl/actions/test.py
@@ -18,9 +18,8 @@
 from contentctl.actions.detection_testing.views.DetectionTestingViewWeb import (
     DetectionTestingViewWeb,
 )
-from contentctl.objects.config import Changes, Selected
+from contentctl.objects.config import Changes, Selected, test_servers
 from contentctl.objects.config import test as test_
-from contentctl.objects.config import test_servers
 from contentctl.objects.detection import Detection
 from contentctl.objects.integration_test import IntegrationTest
 
diff --git a/contentctl/api.py b/contentctl/api.py
@@ -1,9 +1,10 @@
 from pathlib import Path
-from typing import Any, Union, Type
+from typing import Any, Type, Union
+
+from contentctl.input.director import DirectorOutputDto
 from contentctl.input.yml_reader import YmlReader
-from contentctl.objects.config import test_common, test, test_servers
+from contentctl.objects.config import test, test_common, test_servers
 from contentctl.objects.security_content_object import SecurityContentObject
-from contentctl.input.director import DirectorOutputDto
 
 
 def config_from_file(
diff --git a/contentctl/enrichments/cve_enrichment.py b/contentctl/enrichments/cve_enrichment.py
@@ -1,8 +1,11 @@
 from __future__ import annotations
-from pycvesearch import CVESearch
-from typing import Annotated, Union, TYPE_CHECKING
-from pydantic import ConfigDict, BaseModel, Field, computed_field
+
 from decimal import Decimal
+from typing import TYPE_CHECKING, Annotated, Union
+
+from pycvesearch import CVESearch
+from pydantic import BaseModel, ConfigDict, Field, computed_field
+
 from contentctl.objects.annotated_types import CVE_TYPE
 
 if TYPE_CHECKING:
diff --git a/contentctl/enrichments/splunk_app_enrichment.py b/contentctl/enrichments/splunk_app_enrichment.py
@@ -1,8 +1,9 @@
-import requests
-import xmltodict
 import functools
-import shelve
 import os
+import shelve
+
+import requests
+import xmltodict
 
 SPLUNKBASE_API_URL = "https://apps.splunk.com/api/apps/entriesbyid/"
 
diff --git a/contentctl/helper/link_validator.py b/contentctl/helper/link_validator.py
@@ -1,13 +1,13 @@
-from pydantic import BaseModel, model_validator
-from typing import Union, Callable, Any
-import requests
-import urllib3
-import urllib3.exceptions
-import time
 import abc
-
 import os
 import shelve
+import time
+from typing import Any, Callable, Union
+
+import requests
+import urllib3
+import urllib3.exceptions
+from pydantic import BaseModel, model_validator
 
 DEFAULT_USER_AGENT_STRING = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Safari/537.36"
 ALLOWED_HTTP_CODES = [200]
diff --git a/contentctl/helper/splunk_app.py b/contentctl/helper/splunk_app.py
@@ -1,7 +1,7 @@
 import json
-from typing import Optional, Collection
-from pathlib import Path
 import xml.etree.ElementTree as ET
+from pathlib import Path
+from typing import Collection, Optional
 from urllib.parse import urlencode
 
 import requests
diff --git a/contentctl/input/new_content_questions.py b/contentctl/input/new_content_questions.py
@@ -1,4 +1,5 @@
 from typing import Any
+
 from contentctl.objects.enums import DataSource
 
 
diff --git a/contentctl/objects/alert_action.py b/contentctl/objects/alert_action.py
@@ -1,12 +1,14 @@
 from __future__ import annotations
-from pydantic import BaseModel, model_serializer, ConfigDict
+
 from typing import Optional
 
+from pydantic import BaseModel, ConfigDict, model_serializer
+
 from contentctl.objects.deployment_email import DeploymentEmail
 from contentctl.objects.deployment_notable import DeploymentNotable
+from contentctl.objects.deployment_phantom import DeploymentPhantom
 from contentctl.objects.deployment_rba import DeploymentRBA
 from contentctl.objects.deployment_slack import DeploymentSlack
-from contentctl.objects.deployment_phantom import DeploymentPhantom
 
 
 class AlertAction(BaseModel):
diff --git a/contentctl/objects/atomic.py b/contentctl/objects/atomic.py
@@ -1,16 +1,19 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from contentctl.objects.config import validate
 
-from contentctl.input.yml_reader import YmlReader
-from pydantic import BaseModel, model_validator, ConfigDict, FilePath, UUID4
 import dataclasses
-from typing import List, Optional, Dict, Union, Self
 import pathlib
-from enum import StrEnum, auto
 import uuid
+from enum import StrEnum, auto
+from typing import Dict, List, Optional, Self, Union
+
+from pydantic import UUID4, BaseModel, ConfigDict, FilePath, model_validator
+
+from contentctl.input.yml_reader import YmlReader
 
 
 class SupportedPlatform(StrEnum):
diff --git a/contentctl/objects/base_test.py b/contentctl/objects/base_test.py
@@ -1,6 +1,6 @@
+from abc import ABC, abstractmethod
 from enum import StrEnum
 from typing import Union
-from abc import ABC, abstractmethod
 
 from pydantic import BaseModel, ConfigDict
 
diff --git a/contentctl/objects/base_test_result.py b/contentctl/objects/base_test_result.py
@@ -1,7 +1,7 @@
-from typing import Union, Any
 from enum import StrEnum
+from typing import Any, Union
 
-from pydantic import ConfigDict, BaseModel
+from pydantic import BaseModel, ConfigDict
 from splunklib.data import Record  # type: ignore
 
 from contentctl.helper.utils import Utils
diff --git a/contentctl/objects/baseline_tags.py b/contentctl/objects/baseline_tags.py
@@ -1,18 +1,19 @@
 from __future__ import annotations
+
+from typing import Any, List, Union
+
 from pydantic import (
     BaseModel,
+    ConfigDict,
     Field,
-    field_validator,
     ValidationInfo,
+    field_validator,
     model_serializer,
-    ConfigDict,
 )
-from typing import List, Any, Union
 
-from contentctl.objects.story import Story
 from contentctl.objects.detection import Detection
-from contentctl.objects.enums import SecurityContentProductName
-from contentctl.objects.enums import SecurityDomain
+from contentctl.objects.enums import SecurityContentProductName, SecurityDomain
+from contentctl.objects.story import Story
 
 
 class BaselineTags(BaseModel):
diff --git a/contentctl/objects/deployment_email.py b/contentctl/objects/deployment_email.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from pydantic import BaseModel, ConfigDict
 
 
diff --git a/contentctl/objects/deployment_notable.py b/contentctl/objects/deployment_notable.py
@@ -1,7 +1,9 @@
 from __future__ import annotations
-from pydantic import BaseModel, ConfigDict
+
 from typing import List
 
+from pydantic import BaseModel, ConfigDict
+
 
 class DeploymentNotable(BaseModel):
     model_config = ConfigDict(extra="forbid")
diff --git a/contentctl/objects/deployment_phantom.py b/contentctl/objects/deployment_phantom.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from pydantic import BaseModel, ConfigDict
 
 
diff --git a/contentctl/objects/deployment_rba.py b/contentctl/objects/deployment_rba.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from pydantic import BaseModel, ConfigDict
 
 
diff --git a/contentctl/objects/deployment_scheduling.py b/contentctl/objects/deployment_scheduling.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from pydantic import BaseModel, ConfigDict
 
 
diff --git a/contentctl/objects/deployment_slack.py b/contentctl/objects/deployment_slack.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from pydantic import BaseModel, ConfigDict
 
 
diff --git a/contentctl/objects/detection_stanza.py b/contentctl/objects/detection_stanza.py
@@ -1,6 +1,6 @@
-from typing import ClassVar
 import hashlib
 from functools import cached_property
+from typing import ClassVar
 
 from pydantic import BaseModel, Field, computed_field
 
diff --git a/contentctl/objects/integration_test.py b/contentctl/objects/integration_test.py
@@ -1,9 +1,9 @@
 from pydantic import Field
 
 from contentctl.objects.base_test import BaseTest, TestType
-from contentctl.objects.unit_test import UnitTest
-from contentctl.objects.integration_test_result import IntegrationTestResult
 from contentctl.objects.base_test_result import TestResultStatus
+from contentctl.objects.integration_test_result import IntegrationTestResult
+from contentctl.objects.unit_test import UnitTest
 
 
 class IntegrationTest(BaseTest):
diff --git a/contentctl/objects/investigation_tags.py b/contentctl/objects/investigation_tags.py
@@ -1,18 +1,21 @@
 from __future__ import annotations
+
 from typing import List
+
 from pydantic import (
     BaseModel,
+    ConfigDict,
     Field,
-    field_validator,
     ValidationInfo,
+    field_validator,
     model_serializer,
-    ConfigDict,
 )
-from contentctl.objects.story import Story
+
 from contentctl.objects.enums import (
     SecurityContentInvestigationProductName,
     SecurityDomain,
 )
+from contentctl.objects.story import Story
 
 
 class InvestigationTags(BaseModel):
diff --git a/contentctl/objects/manual_test.py b/contentctl/objects/manual_test.py
@@ -2,10 +2,10 @@
 
 from pydantic import Field
 
-from contentctl.objects.test_attack_data import TestAttackData
-from contentctl.objects.manual_test_result import ManualTestResult
 from contentctl.objects.base_test import BaseTest, TestType
 from contentctl.objects.base_test_result import TestResultStatus
+from contentctl.objects.manual_test_result import ManualTestResult
+from contentctl.objects.test_attack_data import TestAttackData
 
 
 class ManualTest(BaseTest):
diff --git a/contentctl/objects/playbook_tags.py b/contentctl/objects/playbook_tags.py
@@ -1,7 +1,10 @@
 from __future__ import annotations
-from typing import Optional, List
-from pydantic import BaseModel, Field, ConfigDict
+
 import enum
+from typing import List, Optional
+
+from pydantic import BaseModel, ConfigDict, Field
+
 from contentctl.objects.detection import Detection
 
 
diff --git a/contentctl/objects/risk_analysis_action.py b/contentctl/objects/risk_analysis_action.py
@@ -1,5 +1,5 @@
-from typing import Any
 import json
+from typing import Any
 
 from pydantic import BaseModel, field_validator
 
diff --git a/contentctl/objects/savedsearches_conf.py b/contentctl/objects/savedsearches_conf.py
diff --git a/contentctl/objects/test_group.py b/contentctl/objects/test_group.py
diff --git a/contentctl/objects/throttling.py b/contentctl/objects/throttling.py
diff --git a/contentctl/objects/unit_test.py b/contentctl/objects/unit_test.py
diff --git a/contentctl/objects/unit_test_baseline.py b/contentctl/objects/unit_test_baseline.py
diff --git a/contentctl/objects/unit_test_result.py b/contentctl/objects/unit_test_result.py
diff --git a/contentctl/output/doc_md_output.py b/contentctl/output/doc_md_output.py
diff --git a/contentctl/output/jinja_writer.py b/contentctl/output/jinja_writer.py
diff --git a/contentctl/output/yml_writer.py b/contentctl/output/yml_writer.py
