contentctl 5.5.7__tar.gz → 5.5.9__tar.gz

{contentctl-5.5.7 → contentctl-5.5.9}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: contentctl
-Version: 5.5.7
+Version: 5.5.9
 Summary: Splunk Content Control Tool
 License: Apache 2.0
+License-File: LICENSE.md
 Author: STRT
 Author-email: research@splunk.com
 Requires-Python: >=3.11,<3.14
@@ -21,10 +22,10 @@ Requires-Dist: pycvesearch (>=1.2,<2.0)
 Requires-Dist: pydantic (>=2.9.2,<2.10.0)
 Requires-Dist: pygit2 (>=1.15.1,<2.0.0)
 Requires-Dist: questionary (>=2.0.1,<3.0.0)
-Requires-Dist: requests (>=2.32.3,<2.33.0)
+Requires-Dist: requests (>=2.32.4)
 Requires-Dist: rich (>=14.0.0,<15.0.0)
 Requires-Dist: semantic-version (>=2.10.0,<3.0.0)
-Requires-Dist: setuptools (>=69.5.1,<81.0.0)
+Requires-Dist: setuptools (>=80.9.0)
 Requires-Dist: splunk-sdk (>=2.0.2,<3.0.0)
 Requires-Dist: tqdm (>=4.66.5,<5.0.0)
 Requires-Dist: tyro (>=0.9.2,<0.9.23)

{contentctl-5.5.7 → contentctl-5.5.9}/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:
@@ -33,7 +35,7 @@ class Deploy:
                     raise Exception(f"Unsupported stack type: '{config.stack_type}'")
         except Exception as e:
             raise Exception(
-                f"Error installing to stack '{config.splunk_cloud_stack}' (stack_type='{config.stack_type}') via ACS:\n{str(e)}"
+                f"Error installing to stack '{config.splunk_cloud_stack}' (stack_type='{config.stack_type}') via ACS:\n{e!s}"
             )
 
         try:

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/actions/detection_testing/DetectionTestingManager.py

@@ -162,10 +162,10 @@ class DetectionTestingManager(BaseModel):
                     print()
                     print(f"[{error_type}]:")
                     for error in errors[error_type]:
-                        print(f"\t❌ {str(error)}")
+                        print(f"\t❌ {error!s}")
                         if isinstance(error, ExceptionGroup):
                             for suberror in error.exceptions:  # type: ignore
-                                print(f"\t\t❌ {str(suberror)}")  # type: ignore
+                                print(f"\t\t❌ {suberror!s}")  # type: ignore
                     print()
 
         return self.output_dto
@@ -208,7 +208,7 @@ class DetectionTestingManager(BaseModel):
                 except Exception as e:
                     raise Exception(
                         "Failed to pull docker container image "
-                        f"[{self.input_dto.config.container_settings.full_image_path}]: {str(e)}"
+                        f"[{self.input_dto.config.container_settings.full_image_path}]: {e!s}"
                     )
 
         already_staged_container_files = False

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/actions/detection_testing/GitService.py

@@ -99,7 +99,7 @@ class GitService(BaseModel):
                             updated_detections.add(detectionObject)
                         else:
                             raise Exception(
-                                f"Error getting detection object for file {str(decoded_path)}"
+                                f"Error getting detection object for file {decoded_path!s}"
                             )
 
                     elif (
@@ -111,7 +111,7 @@ class GitService(BaseModel):
                             updated_macros.add(macroObject)
                         else:
                             raise Exception(
-                                f"Error getting macro object for file {str(decoded_path)}"
+                                f"Error getting macro object for file {decoded_path!s}"
                             )
 
                     elif (
@@ -125,7 +125,7 @@ class GitService(BaseModel):
                             updated_datasources.add(datasourceObject)
                         else:
                             raise Exception(
-                                f"Error getting data source object for file {str(decoded_path)}"
+                                f"Error getting data source object for file {decoded_path!s}"
                             )
 
                     elif decoded_path.is_relative_to(self.config.path / "lookups"):
@@ -172,7 +172,7 @@ class GitService(BaseModel):
 
                         else:
                             raise Exception(
-                                f"Detected a changed file in the lookups/ directory '{str(decoded_path)}'.\n"
+                                f"Detected a changed file in the lookups/ directory '{decoded_path!s}'.\n"
                                 "Only files ending in .csv, .yml, or .mlmodel are supported in this "
                                 "directory. This file must be removed from the lookups/ directory."
                             )

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/actions/detection_testing/generate_detection_coverage_badge.py

@@ -47,13 +47,13 @@ parser.add_argument(
 try:
     results = parser.parse_args()
 except Exception as e:
-    print(f"Error parsing arguments: {str(e)}")
+    print(f"Error parsing arguments: {e!s}")
     exit(1)
 
 try:
     summary_info = json.loads(results.input_summary_file.read())
 except Exception as e:
-    print(f"Error loading {results.input_summary_file.name} JSON file: {str(e)}")
+    print(f"Error loading {results.input_summary_file.name} JSON file: {e!s}")
     sys.exit(1)
 
 if "summary" not in summary_info:
@@ -75,7 +75,7 @@ try:
         RAW_BADGE_SVG.format(results.badge_string, "{:2.1f}%".format(pass_percent))
     )
 except Exception as e:
-    print(f"Error generating badge: {str(e)}")
+    print(f"Error generating badge: {e!s}")
     sys.exit(1)
 
 

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/actions/detection_testing/infrastructures/DetectionTestingInfrastructure.py

@@ -197,7 +197,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
                     self.check_for_teardown()
 
         except Exception as e:
-            msg = f"[{self.get_name()}]: {str(e)}"
+            msg = f"[{self.get_name()}]: {e!s}"
             self.finish()
             if isinstance(e, ExceptionGroup):
                 raise ExceptionGroup(msg, e.exceptions) from e  # type: ignore
@@ -310,7 +310,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
             return
 
         except Exception as e:
-            raise (Exception(f"Failure creating HEC Endpoint: {str(e)}"))
+            raise (Exception(f"Failure creating HEC Endpoint: {e!s}"))
 
     def get_all_indexes(self) -> None:
         """
@@ -327,7 +327,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
             # Retrieve all available indexes on the splunk instance
             self.all_indexes_on_server = indexes
         except Exception as e:
-            raise (Exception(f"Failure getting indexes: {str(e)}"))
+            raise (Exception(f"Failure getting indexes: {e!s}"))
 
     def get_conn(self) -> client.Service:
         try:
@@ -382,7 +382,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
                 pass
             except Exception as e:
                 self.pbar.write(
-                    f"Error getting API connection (not quitting) '{type(e).__name__}': {str(e)}"
+                    f"Error getting API connection (not quitting) '{type(e).__name__}': {e!s}"
                 )
 
             for _ in range(sleep_seconds):
@@ -402,7 +402,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
                 pass
             else:
                 raise Exception(
-                    f"Error creating index {self.sync_obj.replay_index} - {str(e)}"
+                    f"Error creating index {self.sync_obj.replay_index} - {e!s}"
                 )
 
     def configure_imported_roles(
@@ -426,7 +426,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
             )
             return
         except Exception as e:
-            msg = f"Error configuring roles: {str(e)}"
+            msg = f"Error configuring roles: {e!s}"
             self.pbar.write(msg)
             raise Exception(msg) from e
 
@@ -436,7 +436,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
             self.get_conn().post(endpoint, value=";".join(self.all_indexes_on_server))
         except Exception as e:
             self.pbar.write(
-                f"Error configuring deleteIndexesAllowed with '{self.all_indexes_on_server}': [{str(e)}]"
+                f"Error configuring deleteIndexesAllowed with '{self.all_indexes_on_server}': [{e!s}]"
             )
 
     def wait_for_conf_file(self, app_name: str, conf_file_name: str):
@@ -474,12 +474,12 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
             parser.read(custom_acceleration_datamodels)
             if len(parser.keys()) > 1:
                 self.pbar.write(
-                    f"Read {len(parser) - 1} custom datamodels from {str(custom_acceleration_datamodels)}!"
+                    f"Read {len(parser) - 1} custom datamodels from {custom_acceleration_datamodels!s}!"
                 )
 
         if not cim_acceleration_datamodels.is_file():
             self.pbar.write(
-                f"******************************\nDATAMODEL ACCELERATION FILE {str(cim_acceleration_datamodels)} NOT "
+                f"******************************\nDATAMODEL ACCELERATION FILE {cim_acceleration_datamodels!s} NOT "
                 "FOUND. CIM DATAMODELS NOT ACCELERATED\n******************************\n"
             )
         else:
@@ -499,7 +499,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
 
                 except Exception as e:
                     self.pbar.write(
-                        f"Error creating the conf Datamodel {datamodel_name} key/value {name}/{value}: {str(e)}"
+                        f"Error creating the conf Datamodel {datamodel_name} key/value {name}/{value}: {e!s}"
                     )
 
     def execute(self):
@@ -528,9 +528,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
                 self.finish()
                 return
             except Exception as e:
-                self.pbar.write(
-                    f"Error testing detection: {type(e).__name__}: {str(e)}"
-                )
+                self.pbar.write(f"Error testing detection: {type(e).__name__}: {e!s}")
                 raise e
             finally:
                 self.sync_obj.outputQueue.append(detection)
@@ -1365,7 +1363,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
             except Exception as e:
                 raise (
                     Exception(
-                        f"Trouble deleting data using the search {splunk_search}: {str(e)}"
+                        f"Trouble deleting data using the search {splunk_search}: {e!s}"
                     )
                 )
 
@@ -1440,7 +1438,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
             except Exception as e:
                 raise (
                     Exception(
-                        f"Could not download attack data file [{attack_data_file.data}]:{str(e)}"
+                        f"Could not download attack data file [{attack_data_file.data}]:{e!s}"
                     )
                 )
 
@@ -1514,7 +1512,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
             except Exception as e:
                 raise (
                     Exception(
-                        f"There was an exception sending attack_data to HEC: {str(e)}"
+                        f"There was an exception sending attack_data to HEC: {e!s}"
                     )
                 )
 
@@ -1558,7 +1556,7 @@ class DetectionTestingInfrastructure(BaseModel, abc.ABC):
                         )
                     )
             except Exception as e:
-                raise (Exception(f"There was an exception in the post: {str(e)}"))
+                raise (Exception(f"There was an exception in the post: {e!s}"))
 
     def status(self):
         pass

{contentctl-5.5.7 → contentctl-5.5.9}/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):
@@ -34,7 +35,7 @@ class DetectionTestingInfrastructureContainer(DetectionTestingInfrastructure):
                 self.removeContainer()
                 pass
             except Exception as e:
-                raise (Exception(f"Error removing container: {str(e)}"))
+                raise (Exception(f"Error removing container: {e!s}"))
         super().finish()
 
     def get_name(self) -> str:
@@ -46,7 +47,7 @@ class DetectionTestingInfrastructureContainer(DetectionTestingInfrastructure):
 
             return c
         except Exception as e:
-            raise (Exception(f"Failed to get docker client: {str(e)}"))
+            raise (Exception(f"Failed to get docker client: {e!s}"))
 
     def check_for_teardown(self):
         try:
@@ -56,7 +57,7 @@ class DetectionTestingInfrastructureContainer(DetectionTestingInfrastructure):
         except Exception as e:
             if self.sync_obj.terminate is not True:
                 self.pbar.write(
-                    f"Error: could not get container [{self.get_name()}]: {str(e)}"
+                    f"Error: could not get container [{self.get_name()}]: {e!s}"
                 )
                 self.sync_obj.terminate = True
         else:
@@ -175,6 +176,6 @@ class DetectionTestingInfrastructureContainer(DetectionTestingInfrastructure):
         except Exception as e:
             raise (
                 Exception(
-                    f"Could not remove Docker Container [{self.get_name()}]: {str(e)}"
+                    f"Could not remove Docker Container [{self.get_name()}]: {e!s}"
                 )
             )

{contentctl-5.5.7 → contentctl-5.5.9}/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):

{contentctl-5.5.7 → contentctl-5.5.9}/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

{contentctl-5.5.7 → contentctl-5.5.9}/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"

{contentctl-5.5.7 → contentctl-5.5.9}/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 (
@@ -39,8 +39,8 @@ $(document).ready(function () {
         {% for containerName, data in currentTestingQueue.items() %}
         <tr>
             <td>{{ containerName }}</td>
-            <td>{{ data["name"] }}</td>    
-            <td>{{ data["search"] }}</td>    
+            <td>{{ data["name"] }}</td>
+            <td>{{ data["search"] }}</td>
         </tr>
         {% endfor %}
     </tbody>
@@ -69,7 +69,7 @@ $(document).ready(function () {
             {% else %}
             <td style="font-weight: bold;background-color: #ff9999"><b>False</b></td>
             {% endif %}
-            
+
         </tr>
         {% endfor %}
         {% endfor %}
@@ -118,7 +118,7 @@ class DetectionTestingViewWeb(DetectionTestingView):
         try:
             webbrowser.open(f"http://{self.server.host}:{DEFAULT_WEB_UI_PORT}")
         except Exception as e:
-            print(f"Could not open webbrowser for status page: {str(e)}")
+            print(f"Could not open webbrowser for status page: {e!s}")
 
     def stop(self):
         if self.server.server is None:

{contentctl-5.5.7 → contentctl-5.5.9}/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
 
 

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/actions/release_notes.py

@@ -46,7 +46,7 @@ class ReleaseNotes:
                                     file_path
                                 ).replace(str(repo_path), "")
                                 playbook_link = playbook_link.replace(
-                                    ".yml", "/"
+                                    "yml", "/"
                                 ).lower()
                                 updates.append(
                                     "- "
@@ -155,7 +155,7 @@ class ReleaseNotes:
 
                         except yaml.YAMLError as exc:
                             raise Exception(
-                                f"Error parsing YAML file for release_notes {file_path}: {str(exc)}"
+                                f"Error parsing YAML file for release_notes {file_path}: {exc!s}"
                             )
             else:
                 warnings.append(

{contentctl-5.5.7 → contentctl-5.5.9}/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)
@@ -24,7 +24,7 @@ class Reporting:
                 )
             else:
                 raise Exception(
-                    f"Error writing reporting : '{input_dto.config.getReportingPath()}': {str(e)}"
+                    f"Error writing reporting : '{input_dto.config.getReportingPath()}': {e!s}"
                 )
 
         print("Creating GitHub Badges...")

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/actions/test.py

@@ -18,9 +18,8 @@ from contentctl.actions.detection_testing.views.DetectionTestingViewFile import
 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
 
@@ -151,5 +150,5 @@ class Test:
             return summary.get("success", False)
 
         except Exception as e:
-            print(f"Error determining if whole test was successful: {str(e)}")
+            print(f"Error determining if whole test was successful: {e!s}")
             return False

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/actions/validate.py

@@ -118,7 +118,7 @@ class Validate:
                             )
                     except Exception as e:
                         errors.append(
-                            f"Error processing checking version of TA {supported_TA.name}: {str(e)}"
+                            f"Error processing checking version of TA {supported_TA.name}: {e!s}"
                         )
 
         if len(errors) > 0:

{contentctl-5.5.7 → contentctl-5.5.9}/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(
@@ -36,7 +37,7 @@ def config_from_file(
 
     except Exception as e:
         raise Exception(
-            f"Failed to load contentctl configuration from file '{path}': {str(e)}"
+            f"Failed to load contentctl configuration from file '{path}': {e!s}"
         )
 
     # Apply settings that have been overridden from the ones in the file
@@ -45,7 +46,7 @@ def config_from_file(
     except Exception as e:
         raise Exception(
             f"Failed updating dictionary of values read from file '{path}'"
-            f" with the dictionary of arguments passed: {str(e)}"
+            f" with the dictionary of arguments passed: {e!s}"
         )
 
     # The function below will throw its own descriptive exception if it fails
@@ -78,7 +79,7 @@ def config_from_dict(
     try:
         test_object = configType.model_validate(config)
     except Exception as e:
-        raise Exception(f"Failed to load contentctl configuration from dict:\n{str(e)}")
+        raise Exception(f"Failed to load contentctl configuration from dict:\n{e!s}")
 
     return test_object
 

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/contentctl.py

@@ -206,7 +206,7 @@ def main():
             config_obj = YmlReader().load_file(configFile, add_fields=False)
             t = test.model_validate(config_obj)
     except Exception as e:
-        print(f"Error validating 'contentctl.yml':\n{str(e)}")
+        print(f"Error validating 'contentctl.yml':\n{e!s}")
         sys.exit(1)
 
     # For ease of generating the constructor, we want to allow construction

{contentctl-5.5.7 → contentctl-5.5.9}/contentctl/enrichments/attack_enrichment.py

@@ -183,7 +183,7 @@ class AttackEnrichment(BaseModel):
                 )
 
         except Exception as err:
-            raise Exception(f"Error getting MITRE Enrichment: {str(err)}")
+            raise Exception(f"Error getting MITRE Enrichment: {err!s}")
 
         print("Done!")
         return attack_lookup

{contentctl-5.5.7 → contentctl-5.5.9}/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:
@@ -46,7 +49,7 @@ class CveEnrichment(BaseModel):
                 return CveEnrichment(use_enrichment=True, cve_api_obj=cve_api_obj)
             except Exception as e:
                 raise Exception(
-                    f"Error setting CVE_SEARCH API to: {CVESSEARCH_API_URL}: {str(e)}"
+                    f"Error setting CVE_SEARCH API to: {CVESSEARCH_API_URL}: {e!s}"
                 )
 
         return CveEnrichment(use_enrichment=False, cve_api_obj=None)
@@ -57,14 +60,14 @@ class CveEnrichment(BaseModel):
         if not self.use_enrichment:
             return CveEnrichmentObj(
                 id=cve_id,
-                cvss=Decimal(5.0),
+                cvss=Decimal("5.0"),
                 summary="SUMMARY NOT AVAILABLE! ONLY THE LINK WILL BE USED AT THIS TIME",
             )
         else:
             print("WARNING - Dynamic enrichment not supported at this time.")
             return CveEnrichmentObj(
                 id=cve_id,
-                cvss=Decimal(5.0),
+                cvss=Decimal("5.0"),
                 summary="SUMMARY NOT AVAILABLE! ONLY THE LINK WILL BE USED AT THIS TIME",
             )
         # Depending on needs, we may add dynamic enrichment functionality back to the tool

{contentctl-5.5.7 → contentctl-5.5.9}/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/"
 
@@ -75,7 +76,7 @@ class SplunkAppEnrichment:
             splunk_app_enriched["url"] = ""
         except Exception as e:
             print(
-                f"There was an unknown error enriching the Splunk TA [{splunk_ta}]: {str(e)}"
+                f"There was an unknown error enriching the Splunk TA [{splunk_ta}]: {e!s}"
             )
             splunk_app_enriched["name"] = splunk_ta
             splunk_app_enriched["url"] = ""

{contentctl-5.5.7 → contentctl-5.5.9}/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]