diff --git a/contentctl/actions/inspect.py b/contentctl/actions/inspect.py deleted file mode 100644 index cc21a305..00000000 --- a/contentctl/actions/inspect.py +++ /dev/null @@ -1,42 +0,0 @@ -import os - -from dataclasses import dataclass -import pathlib -import splunk_appinspect - -@dataclass(frozen=True) -class InspectInputDto: - path: pathlib.Path - - -class Inspect: - - def execute(self, input_dto: InspectInputDto) -> None: - ''' - director_output_dto = DirectorOutputDto([],[],[],[],[],[],[],[]) - director = Director(director_output_dto) - director.execute(input_dto.director_input_dto) - - #svg_output = SvgOutput() - #svg_output.writeObjects(director_output_dto.detections, input_dto.output_path) - - attack_nav_output = AttackNavOutput() - attack_nav_output.writeObjects( - director_output_dto.detections, - os.path.join(input_dto.director_input_dto.input_path, "reporting") - ) - ''' - if not input_dto.path.is_file(): - raise Exception(f'Error inspecting {input_dto.path}: The file does not exist') - - - import subprocess - my_args = ["splunk-appinspect", "inspect", "dist/ESCU.tar.gz"] - print(my_args) - subprocess.run(args=my_args) - - - try: - print(f'Inspection of {input_dto.path} successful') - except Exception as e: - raise Exception(f'Error inspecting {input_dto.path}: {str(e)}') \ No newline at end of file diff --git a/contentctl/contentctl.py b/contentctl/contentctl.py index f4162525..183c27ff 100644 --- a/contentctl/contentctl.py +++ b/contentctl/contentctl.py @@ -17,7 +17,6 @@ from contentctl.actions.new_content import NewContentInputDto, NewContent from contentctl.actions.doc_gen import DocGenInputDto, DocGen from contentctl.actions.initialize import Initialize, InitializeInputDto -from contentctl.actions.inspect import InspectInputDto, Inspect from contentctl.actions.api_deploy import API_Deploy, API_DeployInputDto from contentctl.input.director import DirectorInputDto @@ -116,14 +115,6 @@ def build(args, config:Union[Config,None]=None) -> DirectorOutputDto: return generate.execute(generate_input_dto) -def inspect(args) -> None: - config=start(args) - app_path = pathlib.Path(config.build.path_root)/f"{config.build.name}.tar.gz" - input_dto = InspectInputDto(path=app_path) - i = Inspect() - i.execute(input_dto=input_dto) - - def api_deploy(args) -> None: config = start(args) deploy_input_dto = API_DeployInputDto(path=pathlib.Path(args.path), config=config) @@ -339,15 +330,7 @@ def main(): reporting_parser.set_defaults(func=reporting) - inspect_parser.add_argument( - "-ap", - "--app_path", - required=False, - type=str, - default=None, - help="path to the Splunk app to be inspected", - ) - inspect_parser.set_defaults(func=inspect) + api_deploy_parser.set_defaults(func=api_deploy) diff --git a/contentctl/output/conf_output.py b/contentctl/output/conf_output.py index 4c2282dd..aaac72d3 100644 --- a/contentctl/output/conf_output.py +++ b/contentctl/output/conf_output.py @@ -178,7 +178,6 @@ def inspectApp(self)-> None: LOG_FILE_OPTION, INCLUDED_TAGS_OPTION, EXCLUDED_TAGS_OPTION, PRECERT_MODE, TEST_MODE) except Exception as e: - import sys print("******WARNING******") if sys.version_info.major == 3 and sys.version_info.minor == 9: print("The package splunk-appinspect was not installed due to a current issue with the library on Python3.10+. "