diff --git a/contentctl/actions/detection_testing/GitHubService.py b/contentctl/actions/detection_testing/GitHubService.py index 886a3e05..eb9bcf95 100644 --- a/contentctl/actions/detection_testing/GitHubService.py +++ b/contentctl/actions/detection_testing/GitHubService.py @@ -49,6 +49,7 @@ def get_all_content(self, director: DirectorOutputDto) -> DirectorOutputDto: self.get_macros(director), self.get_lookups(director), [], + [] ) def get_stories(self, director: DirectorOutputDto) -> list[Story]: diff --git a/contentctl/actions/generate.py b/contentctl/actions/generate.py index b4d18c1e..ed363380 100644 --- a/contentctl/actions/generate.py +++ b/contentctl/actions/generate.py @@ -58,3 +58,5 @@ def execute(self, input_dto: GenerateInputDto) -> DirectorOutputDto: api_json_output.writeObjects(director_output_dto.lookups, input_dto.director_input_dto.config.build_api.output_path, SecurityContentType.lookups) api_json_output.writeObjects(director_output_dto.macros, input_dto.director_input_dto.config.build_api.output_path, SecurityContentType.macros) api_json_output.writeObjects(director_output_dto.deployments, input_dto.director_input_dto.config.build_api.output_path, SecurityContentType.deployments) + + return director_output_dto \ No newline at end of file diff --git a/contentctl/contentctl.py b/contentctl/contentctl.py index 4d97379e..f097b034 100644 --- a/contentctl/contentctl.py +++ b/contentctl/contentctl.py @@ -190,21 +190,21 @@ def test(args: argparse.Namespace): test = Test() - try: + #try: - result = test.execute(test_input_dto) - # This return code is important. Even if testing - # fully completes, if everything does not pass then - # we want to return a nonzero status code - if result: - sys.exit(0) - else: - sys.exit(1) - - except Exception as e: - print(f"Error running contentctl test: {str(e)}") + result = test.execute(test_input_dto) + # This return code is important. Even if testing + # fully completes, if everything does not pass then + # we want to return a nonzero status code + if result: + sys.exit(0) + else: sys.exit(1) + # except Exception as e: + # print(f"Error running contentctl test: {str(e)}") + # sys.exit(1) + def validate(args) -> None: config = start(args)