Ruff lint autofixes

ljstella · ljstella · commit aaac5e26dec5 · 2025-01-21T15:49:51.000-06:00
diff --git a/contentctl/actions/build.py b/contentctl/actions/build.py
@@ -1,11 +1,8 @@
-import sys
 import shutil
-import os
 
 from dataclasses import dataclass
 
-from contentctl.objects.enums import SecurityContentType
-from contentctl.input.director import Director, DirectorOutputDto
+from contentctl.input.director import DirectorOutputDto
 from contentctl.output.conf_output import ConfOutput
 from contentctl.output.conf_writer import ConfWriter
 from contentctl.output.api_json_output import ApiJsonOutput
diff --git a/contentctl/actions/deploy_acs.py b/contentctl/actions/deploy_acs.py
@@ -42,10 +42,10 @@ def execute(self, config: deploy_acs, appinspect_token:str) -> None:
             # This likely includes a more verbose response describing the error
             res.raise_for_status()
             print(res.json())
-        except Exception as e:
+        except Exception:
             try:
                 error_text = res.json()
-            except Exception as e:
+            except Exception:
                 error_text = "No error text - request failed"
             formatted_error_text = pprint.pformat(error_text)
             print("While this may not be the cause of your error, ensure that the uid and appid of your Private App does not exist in Splunkbase\n"
diff --git a/contentctl/actions/detection_testing/DetectionTestingManager.py b/contentctl/actions/detection_testing/DetectionTestingManager.py
@@ -3,23 +3,19 @@
 from contentctl.actions.detection_testing.infrastructures.DetectionTestingInfrastructure import DetectionTestingInfrastructure
 from contentctl.actions.detection_testing.infrastructures.DetectionTestingInfrastructureContainer import DetectionTestingInfrastructureContainer
 from contentctl.actions.detection_testing.infrastructures.DetectionTestingInfrastructureServer import DetectionTestingInfrastructureServer
-from urllib.parse import urlparse
-from copy import deepcopy
 import signal
 import datetime
 # from queue import Queue
 from dataclasses import dataclass
 # import threading
-import ctypes
 from contentctl.actions.detection_testing.infrastructures.DetectionTestingInfrastructure import (
-    DetectionTestingInfrastructure,
     DetectionTestingManagerOutputDto,
 )
 from contentctl.actions.detection_testing.views.DetectionTestingView import (
     DetectionTestingView,
 )
 from contentctl.objects.enums import PostTestBehavior
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 from contentctl.objects.detection import Detection
 import concurrent.futures
 import docker
@@ -133,7 +129,7 @@ def create_DetectionTestingInfrastructureObjects(self):
             if (isinstance(self.input_dto.config, test) and isinstance(infrastructure, Container)):
                 try:
                     client = docker.from_env()
-                except Exception as e:
+                except Exception:
                     raise Exception("Unable to connect to docker.  Are you sure that docker is running on this host?")
                 try:
                     
diff --git a/contentctl/actions/detection_testing/infrastructures/DetectionTestingInfrastructureContainer.py b/contentctl/actions/detection_testing/infrastructures/DetectionTestingInfrastructureContainer.py
@@ -141,7 +141,7 @@ def removeContainer(self, removeVolumes: bool = True, forceRemove: bool = True):
             container: docker.models.containers.Container = (
                 self.get_docker_client().containers.get(self.get_name())
             )
-        except Exception as e:
+        except Exception:
             # Container does not exist, no need to try and remove it
             return
         try:
diff --git a/contentctl/actions/detection_testing/views/DetectionTestingViewCLI.py b/contentctl/actions/detection_testing/views/DetectionTestingViewCLI.py
@@ -3,7 +3,6 @@
 )
 
 import time
-import datetime
 import tqdm
 
 
diff --git a/contentctl/actions/initialize_old.py b/contentctl/actions/initialize_old.py
@@ -7,12 +7,8 @@
 import sys
 import questionary
 import os
-from contentctl.objects.enums import LogLevel
 
-import abc
-from pydantic import BaseModel, Field
 
-from contentctl.objects.config import Config
 
 DEFAULT_FOLDERS = ['detections', 'stories', 'lookups', 'macros', 'baselines', 'dist']
 
diff --git a/contentctl/actions/inspect.py b/contentctl/actions/inspect.py
@@ -150,7 +150,7 @@ def inspectAppCLI(self, config: inspect) -> None:
             from splunk_appinspect.main import (
                 validate, MODE_OPTION, APP_PACKAGE_ARGUMENT, OUTPUT_FILE_OPTION,
                 LOG_FILE_OPTION, INCLUDED_TAGS_OPTION, EXCLUDED_TAGS_OPTION,
-                PRECERT_MODE, TEST_MODE)
+                TEST_MODE)
         except Exception as e:
             print(e)
             # print("******WARNING******")
diff --git a/contentctl/actions/new_content.py b/contentctl/actions/new_content.py
@@ -1,4 +1,3 @@
-from dataclasses import dataclass
 import questionary
 from typing import Any
 from contentctl.input.new_content_questions import NewContentQuestions
diff --git a/contentctl/actions/release_notes.py b/contentctl/actions/release_notes.py
@@ -1,4 +1,3 @@
-import os
 from contentctl.objects.config import release_notes
 from git import Repo
 import re
@@ -54,7 +53,7 @@ def create_notes(self,repo_path:pathlib.Path, file_paths:List[pathlib.Path], hea
                                 
 
                             # Check and create detection link
-                            if 'name' in data and 'id' in data and 'detections' in file_path.parts and not 'ssa_detections' in file_path.parts and 'detections/deprecated' not in file_path.parts:
+                            if 'name' in data and 'id' in data and 'detections' in file_path.parts and 'ssa_detections' not in file_path.parts and 'detections/deprecated' not in file_path.parts:
                                 
                                 if data['status'] == "production":
                                     temp_link = "https://research.splunk.com" + str(file_path).replace(str(repo_path),"")
@@ -232,9 +231,9 @@ def printNotes(notes:List[dict[str,Union[List[str], str]]], outfile:Union[pathli
                 with open(outfile,'w') as writer:
                     writer.write(text_blob)
             
-        printNotes(notes, config.releaseNotesFilename(f"release_notes.txt"))
+        printNotes(notes, config.releaseNotesFilename("release_notes.txt"))
 
         print("\n\n### Other Updates\n-\n")
         print("\n## BA Release Notes")
         printNotes(ba_notes, config.releaseNotesFilename("ba_release_notes.txt"))
-        print(f"Release notes completed succesfully")
+        print("Release notes completed succesfully")
diff --git a/contentctl/actions/reporting.py b/contentctl/actions/reporting.py
@@ -1,4 +1,3 @@
-import os
 
 from dataclasses import dataclass
 
diff --git a/contentctl/actions/test.py b/contentctl/actions/test.py
@@ -2,10 +2,8 @@
 from typing import List
 
 from contentctl.objects.config import test_common, Selected, Changes
-from contentctl.objects.enums import DetectionTestingMode, DetectionStatus, AnalyticsType
 from contentctl.objects.detection import Detection
 
-from contentctl.input.director import DirectorOutputDto
 
 from contentctl.actions.detection_testing.DetectionTestingManager import (
     DetectionTestingManager,
diff --git a/contentctl/enrichments/attack_enrichment.py b/contentctl/enrichments/attack_enrichment.py
@@ -1,6 +1,5 @@
 
 from __future__ import annotations
-import sys
 from attackcti import attack_client
 import logging
 from pydantic import BaseModel
diff --git a/contentctl/enrichments/cve_enrichment.py b/contentctl/enrichments/cve_enrichment.py
@@ -1,13 +1,8 @@
 from __future__ import annotations
 from pycvesearch import CVESearch
-import functools
-import os
-import shelve
-import time
-from typing import Annotated, Any, Union, TYPE_CHECKING
+from typing import Annotated, Union, TYPE_CHECKING
 from pydantic import ConfigDict, BaseModel,Field, computed_field
 from decimal import Decimal
-from requests.exceptions import ReadTimeout
 from contentctl.objects.annotated_types import CVE_TYPE
 if TYPE_CHECKING:
     from contentctl.objects.config import validate
diff --git a/contentctl/enrichments/splunk_app_enrichment.py b/contentctl/enrichments/splunk_app_enrichment.py
@@ -1,11 +1,8 @@
 import requests
 import xmltodict
-import json
 import functools
-import pickle
 import shelve
 import os
-import time
 
 SPLUNKBASE_API_URL = "https://apps.splunk.com/api/apps/entriesbyid/"
 
@@ -29,7 +26,7 @@ def requests_get_helper(url:str, force_cached_or_offline:bool = False)->bytes:
             req = requests.get(url)
             req_content = req.content
             cache[url] = req_content
-        except Exception as e:
+        except Exception:
             raise(Exception(f"ERROR - Failed to get Splunk App Enrichment at {SPLUNKBASE_API_URL}"))
     
     if isinstance(cache, shelve.Shelf):
diff --git a/contentctl/helper/link_validator.py b/contentctl/helper/link_validator.py
@@ -1,7 +1,8 @@
 from pydantic import BaseModel, model_validator
 from typing import Union, Callable, Any
 import requests
-import urllib3, urllib3.exceptions
+import urllib3
+import urllib3.exceptions
 import time
 import abc
 
@@ -74,7 +75,7 @@ def check_reference(cls, data:Any)->Any:
                 data['valid'] = False
             return data    
 
-        except Exception as e:
+        except Exception:
             resolution_time = time.time() - start_time
             #print(f"Reference {reference} was not reachable after {resolution_time:.2f} seconds")
             data['status_code'] = 0
diff --git a/contentctl/helper/utils.py b/contentctl/helper/utils.py
@@ -148,7 +148,7 @@ def validate_git_hash(
             # If we get here, it does not exist in the given branch
             raise (Exception("Does not exist in branch"))
 
-        except Exception as e:
+        except Exception:
             if branch_name is None:
                 branch_name = "ANY_BRANCH"
             if ALWAYS_PULL:
diff --git a/contentctl/objects/abstract_security_content_objects/detection_abstract.py b/contentctl/objects/abstract_security_content_objects/detection_abstract.py
@@ -11,7 +11,6 @@
     Field,
     computed_field,
     model_serializer,
-    ConfigDict,
     FilePath
 )
 
diff --git a/contentctl/objects/abstract_security_content_objects/security_content_object_abstract.py b/contentctl/objects/abstract_security_content_objects/security_content_object_abstract.py
@@ -5,7 +5,6 @@
     from contentctl.objects.deployment import Deployment
     from contentctl.objects.security_content_object import SecurityContentObject
     from contentctl.input.director import DirectorOutputDto
-    from contentctl.objects.config import CustomApp
 
 from contentctl.objects.enums import AnalyticsType
 from contentctl.objects.constants import CONTENTCTL_MAX_STANZA_LENGTH
diff --git a/contentctl/objects/data_source.py b/contentctl/objects/data_source.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Optional, Any
-from pydantic import Field, HttpUrl, model_serializer, BaseModel, ConfigDict
+from pydantic import Field, HttpUrl, model_serializer, BaseModel
 from contentctl.objects.security_content_object import SecurityContentObject
 
 
diff --git a/contentctl/objects/deployment.py b/contentctl/objects/deployment.py
@@ -1,5 +1,5 @@
 from __future__ import annotations
-from pydantic import Field, computed_field,ValidationInfo, model_serializer, NonNegativeInt, ConfigDict
+from pydantic import Field, computed_field,ValidationInfo, model_serializer, NonNegativeInt
 from typing import Any
 import uuid
 import datetime
diff --git a/contentctl/objects/lookup.py b/contentctl/objects/lookup.py
@@ -2,7 +2,7 @@
 
 from pydantic import field_validator, ValidationInfo, model_validator, FilePath, model_serializer, Field, NonNegativeInt, computed_field, TypeAdapter
 from enum import StrEnum, auto
-from typing import TYPE_CHECKING, Optional, Any, Union, Literal, Annotated, Self
+from typing import TYPE_CHECKING, Optional, Any, Literal, Annotated, Self
 import re
 import csv
 import abc
diff --git a/contentctl/objects/mitre_attack_enrichment.py b/contentctl/objects/mitre_attack_enrichment.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 from pydantic import BaseModel, Field, ConfigDict, HttpUrl, field_validator
-from typing import List, Annotated
+from typing import List
 from enum import StrEnum
 import datetime
 from contentctl.objects.annotated_types import MITRE_ATTACK_ID_TYPE
diff --git a/contentctl/objects/playbook.py b/contentctl/objects/playbook.py
@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING,Self
+from typing import Self
 from pydantic import model_validator, Field, FilePath
 
 
diff --git a/contentctl/objects/playbook_tags.py b/contentctl/objects/playbook_tags.py
@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING, Optional, List
+from typing import Optional, List
 from pydantic import BaseModel, Field,ConfigDict
 import enum
 from contentctl.objects.detection import Detection
diff --git a/contentctl/objects/story_tags.py b/contentctl/objects/story_tags.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 from pydantic import BaseModel, Field, model_serializer, ConfigDict
-from typing import List,Set,Optional, Annotated
+from typing import List,Set,Optional
 
 from enum import Enum
 
diff --git a/contentctl/objects/unit_test.py b/contentctl/objects/unit_test.py
@@ -2,7 +2,6 @@
 
 from pydantic import Field
 
-from contentctl.objects.unit_test_baseline import UnitTestBaseline
 from contentctl.objects.test_attack_data import TestAttackData
 from contentctl.objects.unit_test_result import UnitTestResult
 from contentctl.objects.base_test import BaseTest, TestType
diff --git a/contentctl/objects/unit_test_result.py b/contentctl/objects/unit_test_result.py
@@ -72,7 +72,7 @@ def set_job_content(
             if self.exception is not None:
                 self.message = f"EXCEPTION: {str(self.exception)}"
             else:
-                self.message = f"ERROR with no more specific message available."
+                self.message = "ERROR with no more specific message available."
             self.sid_link = NO_SID
 
         return self.success
diff --git a/contentctl/output/attack_nav_output.py b/contentctl/output/attack_nav_output.py
@@ -1,4 +1,3 @@
-import os
 from typing import List,Union
 import pathlib
 
diff --git a/contentctl/output/doc_md_output.py b/contentctl/output/doc_md_output.py
@@ -1,10 +1,8 @@
 import os
-import asyncio
 import sys
 
 from pathlib import Path
 
-from contentctl.objects.enums import SecurityContentType
 from contentctl.output.jinja_writer import JinjaWriter
 
 
diff --git a/contentctl/output/svg_output.py b/contentctl/output/svg_output.py
@@ -1,4 +1,3 @@
-import os
 import pathlib
 from typing import List, Any
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ def removeContainer(self, removeVolumes: bool = True, forceRemove: bool = True):`
`141`	`141`	`container: docker.models.containers.Container = (`
`142`	`142`	`self.get_docker_client().containers.get(self.get_name())`
`143`	`143`	`)`
`144`		`- except Exception as e:`
	`144`	`+ except Exception:`
`145`	`145`	`# Container does not exist, no need to try and remove it`
`146`	`146`	`return`
`147`	`147`	`try:`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`)`
`4`	`4`
`5`	`5`	`import time`
`6`		`-import datetime`
`7`	`6`	`import tqdm`
`8`	`7`
`9`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from dataclasses import dataclass`
`2`	`1`	`import questionary`
`3`	`2`	`from typing import Any`
`4`	`3`	`from contentctl.input.new_content_questions import NewContentQuestions`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import os`
`2`	`1`
`3`	`2`	`from dataclasses import dataclass`
`4`	`3`