From 032e1bdf7699ca67e247a5e485a5c28b482b1435 Mon Sep 17 00:00:00 2001 From: P4T12ICK Date: Fri, 14 Jan 2022 11:24:49 +0100 Subject: [PATCH] content_changer implemented --- .../tests/application/factory/test_factory.py | 36 ------------------- .../factory/test_object_factory.py | 25 ------------- .../contentctl/tests/domain/__init__.py | 0 .../application/adapter/adapter.py | 0 .../application/builder/baseline_builder.py | 8 ++--- .../application/builder/basic_builder.py | 4 +-- .../application/builder/detection_builder.py | 6 ++-- .../application/builder/director.py | 12 +++---- .../builder/investigation_builder.py | 2 +- .../application/builder/story_builder.py | 4 +-- .../application/factory/factory.py | 18 +++++----- .../application/factory/object_factory.py | 8 ++--- .../application/factory/utils}/__init__.py | 0 .../application/factory/utils/utils.py | 0 .../application/use_cases}/__init__.py | 0 .../application/use_cases/content_changer.py | 4 +-- .../application/use_cases/generate.py | 16 ++++----- .../domain}/__init__.py | 0 .../domain/entities}/__init__.py | 0 .../domain/entities/baseline.py | 8 ++--- .../domain/entities/baseline_tags.py | 0 .../domain/entities/deployment.py | 14 ++++---- .../domain/entities/deployment_email.py | 0 .../domain/entities/deployment_notable.py | 0 .../domain/entities/deployment_phantom.py | 0 .../domain/entities/deployment_rba.py | 0 .../domain/entities/deployment_scheduling.py | 0 .../domain/entities/deployment_slack.py | 0 .../domain/entities/detection.py | 10 +++--- .../domain/entities/detection_tags.py | 0 .../domain/entities/enums}/__init__.py | 0 .../domain/entities/enums/enums.py | 0 .../domain/entities/investigation.py | 8 ++--- .../domain/entities/investigation_tags.py | 0 .../domain/entities/lookup.py | 2 +- .../domain/entities/macro.py | 2 +- .../domain/entities/playbook.py | 4 +-- .../domain/entities/playbook_tags.py | 0 .../entities/security_content_object.py | 2 +- .../domain/entities/story.py | 4 +-- .../domain/entities/story_tags.py | 0 .../tests}/__init__.py | 0 .../tests/application}/__init__.py | 0 .../tests/application/factory/test_factory.py | 36 +++++++++++++++++++ .../factory/test_object_factory.py | 25 +++++++++++++ .../tests/application/use_cases}/__init__.py | 0 .../use_cases/test_content_changer.py | 12 +++---- .../unsigned_image_loaded_by_lsass.yml | 0 ...dential_dump_from_registry_via_reg_exe.yml | 0 .../endpoint/cobalt_strike_named_pipes.yml | 0 .../macros/security_content_ctime.yml | 0 .../macros/security_content_summariesonly.yml | 0 .../test_data_input/macros/sysmon.yml | 0 .../test_data_input/stories/cobalt_strike.yml | 0 .../stories/credential_dumping.yml | 0 .../stories/ransomware_darkside.yml | 0 .../test_data_input/stories/trickbot.yml | 0 ...dential_dump_from_registry_via_reg_exe.yml | 0 .../detections/cobalt_strike_named_pipes.yml | 0 .../application/use_cases/test_generate.py | 2 +- .../tests/domain}/__init__.py | 0 .../adapter/conf_writer.py | 2 +- .../adapter/obj_to_conf_adapter.py | 4 +-- .../adapter/obj_to_yml_adapter.py | 4 +-- .../templates/analyticstories_detections.j2 | 0 .../templates/analyticstories_stories.j2 | 0 .../adapter/templates/collections.j2 | 0 .../es_investigations_investigations.j2 | 0 .../templates/es_investigations_stories.j2 | 0 .../adapter/templates/header.j2 | 0 .../adapter/templates/macros.j2 | 0 .../adapter/templates/macros_detections.j2 | 0 .../adapter/templates/panel.j2 | 0 .../templates/savedsearches_baselines.j2 | 0 .../templates/savedsearches_detections.j2 | 0 .../templates/savedsearches_investigations.j2 | 0 .../adapter/templates/transforms.j2 | 0 .../adapter/templates/workflow_actions.j2 | 0 .../adapter/yml_writer.py | 0 .../security_content_baseline_builder.py | 10 +++--- .../builder/security_content_basic_builder.py | 20 +++++------ .../security_content_detection_builder.py | 22 ++++++------ .../builder/security_content_director.py | 16 ++++----- .../security_content_investigation_builder.py | 8 ++--- .../security_content_object_builder.py | 6 ++-- .../builder/security_content_story_builder.py | 8 ++--- .../builder/yml_reader.py | 0 .../tests/builder/__init__.py | 0 .../adapter/data/conf/savedsearches.conf | 0 .../adapter/data/default/analyticstories.conf | 0 .../adapter/data/default/collections.conf | 0 ...et_parent_process_info___response_task.xml | 0 .../data/default/es_investigations.conf | 0 .../tests/adapter/data/default/macros.conf | 0 .../adapter/data/default/savedsearches.conf | 0 .../adapter/data/default/transforms.conf | 0 .../data/default/workflow_actions.conf | 0 .../default_reference/analyticstories.conf | 0 .../data/default_reference/collections.conf | 0 ...et_parent_process_info___response_task.xml | 0 .../default_reference/es_investigations.conf | 0 .../data/default_reference/macros.conf | 0 .../data/default_reference/savedsearches.conf | 0 .../data/default_reference/transforms.conf | 0 .../default_reference/workflow_actions.conf | 0 .../adapter/data/lookups/attacker_tools.csv | 0 .../adapter/data/lookups/mitre_enrichment.csv | 0 ...dential_dump_from_registry_via_reg_exe.yml | 0 .../tests/adapter/test_obj_to_conf_adapter.py | 16 ++++----- .../tests/adapter/test_obj_to_yml_adapter.py | 4 +-- .../tests/builder}/__init__.py | 0 .../builder/test_data/baseline/baseline.yml | 0 .../builder/test_data/baseline/baseline2.yml | 0 .../deployment/ESCU/00_default_anomaly.yml | 0 .../deployment/ESCU/00_default_baseline.yml | 0 .../ESCU/00_default_correlation.yml | 0 .../deployment/ESCU/00_default_hunting.yml | 0 .../deployment/ESCU/00_default_ttp.yml | 0 .../detect_new_user_aws_console_login.yml | 0 .../builder/test_data/detection/valid.yml | 0 .../test_data/investigation/investigation.yml | 0 .../test_data/lookups/attacker_tools.csv | 0 .../test_data/lookups/mitre_enrichment.csv | 0 .../lookups/previously_seen_aws_regions.yml | 0 .../builder/test_data/macro/powershell.yml | 0 .../macro/security_content_ctime.yml | 0 .../test_data/playbook/example_playbook.yml | 0 .../test_data/story/ransomware_darkside.yml | 0 .../test_security_content_basic_builder.py | 8 ++--- ...test_security_content_detection_builder.py | 14 ++++---- .../builder/test_security_content_director.py | 16 ++++----- ..._security_content_investigation_builder.py | 4 +-- .../test_security_content_object_builder.py | 4 +-- .../test_security_content_story_builder.py | 12 +++---- .../tests/builder/test_yml_reader.py | 2 +- bin/contentctl_project/main/contentctl.py | 12 +++---- 136 files changed, 232 insertions(+), 232 deletions(-) delete mode 100644 bin/contentctl_project/contentctl/contentctl/tests/application/factory/test_factory.py delete mode 100644 bin/contentctl_project/contentctl/contentctl/tests/application/factory/test_object_factory.py delete mode 100644 bin/contentctl_project/contentctl/contentctl/tests/domain/__init__.py rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/adapter/adapter.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/builder/baseline_builder.py (53%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/builder/basic_builder.py (67%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/builder/detection_builder.py (77%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/builder/director.py (69%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/builder/investigation_builder.py (81%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/builder/story_builder.py (80%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/factory/factory.py (85%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/factory/object_factory.py (67%) rename bin/contentctl_project/{contentctl/contentctl/application => contentctl_core/application/factory/utils}/__init__.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/factory/utils/utils.py (100%) rename bin/contentctl_project/{contentctl/contentctl/application/builder => contentctl_core/application/use_cases}/__init__.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/use_cases/content_changer.py (81%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/application/use_cases/generate.py (58%) rename bin/contentctl_project/{contentctl/contentctl/application/factory/utils => contentctl_core/domain}/__init__.py (100%) rename bin/contentctl_project/{contentctl/contentctl/application/use_cases => contentctl_core/domain/entities}/__init__.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/baseline.py (89%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/baseline_tags.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/deployment.py (70%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/deployment_email.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/deployment_notable.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/deployment_phantom.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/deployment_rba.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/deployment_scheduling.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/deployment_slack.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/detection.py (87%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/detection_tags.py (100%) rename bin/contentctl_project/{contentctl/contentctl/domain => contentctl_core/domain/entities/enums}/__init__.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/enums/enums.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/investigation.py (88%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/investigation_tags.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/lookup.py (78%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/macro.py (66%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/playbook.py (67%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/playbook_tags.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/security_content_object.py (50%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/story.py (92%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/domain/entities/story_tags.py (100%) rename bin/contentctl_project/{contentctl/contentctl/domain/entities => contentctl_core/tests}/__init__.py (100%) rename bin/contentctl_project/{contentctl/contentctl/domain/entities/enums => contentctl_core/tests/application}/__init__.py (100%) create mode 100644 bin/contentctl_project/contentctl_core/tests/application/factory/test_factory.py create mode 100644 bin/contentctl_project/contentctl_core/tests/application/factory/test_object_factory.py rename bin/contentctl_project/{contentctl/contentctl/tests => contentctl_core/tests/application/use_cases}/__init__.py (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_content_changer.py (55%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/detections/deprecated/unsigned_image_loaded_by_lsass.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/detections/endpoint/attempted_credential_dump_from_registry_via_reg_exe.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/detections/endpoint/cobalt_strike_named_pipes.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/macros/security_content_ctime.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/macros/security_content_summariesonly.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/macros/sysmon.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/stories/cobalt_strike.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/stories/credential_dumping.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/stories/ransomware_darkside.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_input/stories/trickbot.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_output/detections/attempted_credential_dump_from_registry_via_reg_exe.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_data_output/detections/cobalt_strike_named_pipes.yml (100%) rename bin/contentctl_project/{contentctl/contentctl => contentctl_core}/tests/application/use_cases/test_generate.py (81%) rename bin/contentctl_project/{contentctl/contentctl/tests/application => contentctl_core/tests/domain}/__init__.py (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/conf_writer.py (95%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/obj_to_conf_adapter.py (96%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/obj_to_yml_adapter.py (89%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/analyticstories_detections.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/analyticstories_stories.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/collections.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/es_investigations_investigations.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/es_investigations_stories.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/header.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/macros.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/macros_detections.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/panel.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/savedsearches_baselines.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/savedsearches_detections.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/savedsearches_investigations.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/transforms.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/templates/workflow_actions.j2 (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/adapter/yml_writer.py (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/builder/security_content_baseline_builder.py (80%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/builder/security_content_basic_builder.py (70%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/builder/security_content_detection_builder.py (87%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/builder/security_content_director.py (78%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/builder/security_content_investigation_builder.py (76%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/builder/security_content_object_builder.py (57%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/builder/security_content_story_builder.py (88%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/builder/yml_reader.py (100%) delete mode 100644 bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/__init__.py rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/conf/savedsearches.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default/analyticstories.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default/collections.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default/es_investigations.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default/macros.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default/savedsearches.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default/transforms.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default/workflow_actions.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default_reference/analyticstories.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default_reference/collections.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default_reference/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default_reference/es_investigations.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default_reference/macros.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default_reference/savedsearches.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default_reference/transforms.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/default_reference/workflow_actions.conf (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/lookups/attacker_tools.csv (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/lookups/mitre_enrichment.csv (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/data/yml_file/attempted_credential_dump_from_registry_via_reg_exe.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/test_obj_to_conf_adapter.py (80%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/adapter/test_obj_to_yml_adapter.py (79%) rename bin/contentctl_project/{contentctl/contentctl/tests/application/use_cases => contentctl_infrastructure/tests/builder}/__init__.py (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/baseline/baseline.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/baseline/baseline2.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/deployment/ESCU/00_default_anomaly.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/deployment/ESCU/00_default_baseline.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/deployment/ESCU/00_default_correlation.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/deployment/ESCU/00_default_hunting.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/deployment/ESCU/00_default_ttp.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/detection/deprecated/detect_new_user_aws_console_login.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/detection/valid.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/investigation/investigation.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/lookups/attacker_tools.csv (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/lookups/mitre_enrichment.csv (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/lookups/previously_seen_aws_regions.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/macro/powershell.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/macro/security_content_ctime.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/playbook/example_playbook.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_data/story/ransomware_darkside.yml (100%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_security_content_basic_builder.py (82%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_security_content_detection_builder.py (88%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_security_content_director.py (89%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_security_content_investigation_builder.py (83%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_security_content_object_builder.py (60%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_security_content_story_builder.py (77%) rename bin/contentctl_project/contentctl_infrastructure/{contentctl_infrastructure => }/tests/builder/test_yml_reader.py (72%) diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/factory/test_factory.py b/bin/contentctl_project/contentctl/contentctl/tests/application/factory/test_factory.py deleted file mode 100644 index a2cca5ca15..0000000000 --- a/bin/contentctl_project/contentctl/contentctl/tests/application/factory/test_factory.py +++ /dev/null @@ -1,36 +0,0 @@ -import os -import pytest - -from contentctl.contentctl.application.factory.factory import FactoryInputDto -from contentctl.contentctl.application.factory.factory import FactoryOutputDto -from contentctl.contentctl.application.factory.factory import Factory -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_director import SecurityContentDirector -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_story_builder import SecurityContentStoryBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder - - -@pytest.mark.skip(reason="need to fix the security objects first") -def test_factory_ESCU(): - input_path = os.path.join(os.path.dirname(__file__), '../../../../../../..') - - input_dto = FactoryInputDto( - input_path, - SecurityContentBasicBuilder(), - SecurityContentDetectionBuilder(), - SecurityContentStoryBuilder(), - SecurityContentBaselineBuilder(), - SecurityContentInvestigationBuilder(), - SecurityContentDirector(), - SecurityContentProduct.ESCU - ) - - output_dto = FactoryOutputDto([],[],[],[],[],[],[],[]) - - factory = Factory(output_dto) - factory.execute(input_dto) - - print(len(output_dto.detections)) diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/factory/test_object_factory.py b/bin/contentctl_project/contentctl/contentctl/tests/application/factory/test_object_factory.py deleted file mode 100644 index ca61588c07..0000000000 --- a/bin/contentctl_project/contentctl/contentctl/tests/application/factory/test_object_factory.py +++ /dev/null @@ -1,25 +0,0 @@ -import os - - -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.application.factory.object_factory import ObjectFactoryInputDto -from contentctl.contentctl.application.factory.object_factory import ObjectFactory -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_director import SecurityContentDirector - - -def test_object_factory(): - input_path = os.path.join(os.path.dirname(__file__), '../../../../../../../detections') - - input_dto = ObjectFactoryInputDto( - input_path, - SecurityContentObjectBuilder(), - SecurityContentDirector() - ) - - objects = list() - - factory = ObjectFactory(objects) - factory.execute(input_dto) - - assert len(objects) == 959 \ No newline at end of file diff --git a/bin/contentctl_project/contentctl/contentctl/tests/domain/__init__.py b/bin/contentctl_project/contentctl/contentctl/tests/domain/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bin/contentctl_project/contentctl/contentctl/application/adapter/adapter.py b/bin/contentctl_project/contentctl_core/application/adapter/adapter.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/application/adapter/adapter.py rename to bin/contentctl_project/contentctl_core/application/adapter/adapter.py diff --git a/bin/contentctl_project/contentctl/contentctl/application/builder/baseline_builder.py b/bin/contentctl_project/contentctl_core/application/builder/baseline_builder.py similarity index 53% rename from bin/contentctl_project/contentctl/contentctl/application/builder/baseline_builder.py rename to bin/contentctl_project/contentctl_core/application/builder/baseline_builder.py index 8c194247ef..293cf2400a 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/builder/baseline_builder.py +++ b/bin/contentctl_project/contentctl_core/application/builder/baseline_builder.py @@ -1,9 +1,9 @@ import abc -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.domain.entities.baseline import Baseline -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.baseline import Baseline +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_core.domain.entities.security_content_object import SecurityContentObject class BaselineBuilder(abc.ABC): diff --git a/bin/contentctl_project/contentctl/contentctl/application/builder/basic_builder.py b/bin/contentctl_project/contentctl_core/application/builder/basic_builder.py similarity index 67% rename from bin/contentctl_project/contentctl/contentctl/application/builder/basic_builder.py rename to bin/contentctl_project/contentctl_core/application/builder/basic_builder.py index f5f4b693a1..8cff3e653d 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/builder/basic_builder.py +++ b/bin/contentctl_project/contentctl_core/application/builder/basic_builder.py @@ -1,7 +1,7 @@ import abc -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.enums.enums import SecurityContentType # https://refactoring.guru/design-patterns/builder diff --git a/bin/contentctl_project/contentctl/contentctl/application/builder/detection_builder.py b/bin/contentctl_project/contentctl_core/application/builder/detection_builder.py similarity index 77% rename from bin/contentctl_project/contentctl/contentctl/application/builder/detection_builder.py rename to bin/contentctl_project/contentctl_core/application/builder/detection_builder.py index 891bf835da..0a74407c68 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/builder/detection_builder.py +++ b/bin/contentctl_project/contentctl_core/application/builder/detection_builder.py @@ -1,8 +1,8 @@ import abc -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.enums.enums import SecurityContentType # https://refactoring.guru/design-patterns/builder diff --git a/bin/contentctl_project/contentctl/contentctl/application/builder/director.py b/bin/contentctl_project/contentctl_core/application/builder/director.py similarity index 69% rename from bin/contentctl_project/contentctl/contentctl/application/builder/director.py rename to bin/contentctl_project/contentctl_core/application/builder/director.py index 68e8ff70c2..7915dd9c2d 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/builder/director.py +++ b/bin/contentctl_project/contentctl_core/application/builder/director.py @@ -1,11 +1,11 @@ import abc -from contentctl.contentctl.application.builder.basic_builder import BasicBuilder -from contentctl.contentctl.application.builder.detection_builder import DetectionBuilder -from contentctl.contentctl.application.builder.baseline_builder import BaselineBuilder -from contentctl.contentctl.application.builder.investigation_builder import InvestigationBuilder -from contentctl.contentctl.application.builder.story_builder import StoryBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct +from contentctl_core.application.builder.basic_builder import BasicBuilder +from contentctl_core.application.builder.detection_builder import DetectionBuilder +from contentctl_core.application.builder.baseline_builder import BaselineBuilder +from contentctl_core.application.builder.investigation_builder import InvestigationBuilder +from contentctl_core.application.builder.story_builder import StoryBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct class Director(abc.ABC): diff --git a/bin/contentctl_project/contentctl/contentctl/application/builder/investigation_builder.py b/bin/contentctl_project/contentctl_core/application/builder/investigation_builder.py similarity index 81% rename from bin/contentctl_project/contentctl/contentctl/application/builder/investigation_builder.py rename to bin/contentctl_project/contentctl_core/application/builder/investigation_builder.py index 84c2a64bd9..fbd201bb3e 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/builder/investigation_builder.py +++ b/bin/contentctl_project/contentctl_core/application/builder/investigation_builder.py @@ -1,6 +1,6 @@ import abc -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.security_content_object import SecurityContentObject class InvestigationBuilder(abc.ABC): diff --git a/bin/contentctl_project/contentctl/contentctl/application/builder/story_builder.py b/bin/contentctl_project/contentctl_core/application/builder/story_builder.py similarity index 80% rename from bin/contentctl_project/contentctl/contentctl/application/builder/story_builder.py rename to bin/contentctl_project/contentctl_core/application/builder/story_builder.py index ed1b26fb2e..2ab055d89c 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/builder/story_builder.py +++ b/bin/contentctl_project/contentctl_core/application/builder/story_builder.py @@ -1,7 +1,7 @@ import abc -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.enums.enums import SecurityContentType class StoryBuilder(abc.ABC): diff --git a/bin/contentctl_project/contentctl/contentctl/application/factory/factory.py b/bin/contentctl_project/contentctl_core/application/factory/factory.py similarity index 85% rename from bin/contentctl_project/contentctl/contentctl/application/factory/factory.py rename to bin/contentctl_project/contentctl_core/application/factory/factory.py index d88221736c..b51c3e676f 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/factory/factory.py +++ b/bin/contentctl_project/contentctl_core/application/factory/factory.py @@ -2,15 +2,15 @@ import os from dataclasses import dataclass -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.application.builder.basic_builder import BasicBuilder -from contentctl.contentctl.application.builder.detection_builder import DetectionBuilder -from contentctl.contentctl.application.builder.story_builder import StoryBuilder -from contentctl.contentctl.application.builder.baseline_builder import BaselineBuilder -from contentctl.contentctl.application.builder.investigation_builder import InvestigationBuilder -from contentctl.contentctl.application.builder.director import Director -from contentctl.contentctl.application.factory.utils.utils import Utils +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.application.builder.basic_builder import BasicBuilder +from contentctl_core.application.builder.detection_builder import DetectionBuilder +from contentctl_core.application.builder.story_builder import StoryBuilder +from contentctl_core.application.builder.baseline_builder import BaselineBuilder +from contentctl_core.application.builder.investigation_builder import InvestigationBuilder +from contentctl_core.application.builder.director import Director +from contentctl_core.application.factory.utils.utils import Utils @dataclass(frozen=True) diff --git a/bin/contentctl_project/contentctl/contentctl/application/factory/object_factory.py b/bin/contentctl_project/contentctl_core/application/factory/object_factory.py similarity index 67% rename from bin/contentctl_project/contentctl/contentctl/application/factory/object_factory.py rename to bin/contentctl_project/contentctl_core/application/factory/object_factory.py index b258ffe3df..4efdb0bd13 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/factory/object_factory.py +++ b/bin/contentctl_project/contentctl_core/application/factory/object_factory.py @@ -2,10 +2,10 @@ import os from dataclasses import dataclass -from contentctl.contentctl.application.builder.basic_builder import BasicBuilder -from contentctl.contentctl.application.builder.director import Director -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.application.factory.utils.utils import Utils +from contentctl_core.application.builder.basic_builder import BasicBuilder +from contentctl_core.application.builder.director import Director +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.application.factory.utils.utils import Utils @dataclass(frozen=True) class ObjectFactoryInputDto: diff --git a/bin/contentctl_project/contentctl/contentctl/application/__init__.py b/bin/contentctl_project/contentctl_core/application/factory/utils/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/application/__init__.py rename to bin/contentctl_project/contentctl_core/application/factory/utils/__init__.py diff --git a/bin/contentctl_project/contentctl/contentctl/application/factory/utils/utils.py b/bin/contentctl_project/contentctl_core/application/factory/utils/utils.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/application/factory/utils/utils.py rename to bin/contentctl_project/contentctl_core/application/factory/utils/utils.py diff --git a/bin/contentctl_project/contentctl/contentctl/application/builder/__init__.py b/bin/contentctl_project/contentctl_core/application/use_cases/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/application/builder/__init__.py rename to bin/contentctl_project/contentctl_core/application/use_cases/__init__.py diff --git a/bin/contentctl_project/contentctl/contentctl/application/use_cases/content_changer.py b/bin/contentctl_project/contentctl_core/application/use_cases/content_changer.py similarity index 81% rename from bin/contentctl_project/contentctl/contentctl/application/use_cases/content_changer.py rename to bin/contentctl_project/contentctl_core/application/use_cases/content_changer.py index 1cdef726c3..3cf09a281e 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/use_cases/content_changer.py +++ b/bin/contentctl_project/contentctl_core/application/use_cases/content_changer.py @@ -1,8 +1,8 @@ from dataclasses import dataclass -from contentctl.contentctl.application.factory.object_factory import ObjectFactory, ObjectFactoryInputDto -from contentctl.contentctl.application.adapter.adapter import Adapter +from contentctl_core.application.factory.object_factory import ObjectFactory, ObjectFactoryInputDto +from contentctl_core.application.adapter.adapter import Adapter @dataclass(frozen=True) diff --git a/bin/contentctl_project/contentctl/contentctl/application/use_cases/generate.py b/bin/contentctl_project/contentctl_core/application/use_cases/generate.py similarity index 58% rename from bin/contentctl_project/contentctl/contentctl/application/use_cases/generate.py rename to bin/contentctl_project/contentctl_core/application/use_cases/generate.py index e393b85334..e253da3bda 100644 --- a/bin/contentctl_project/contentctl/contentctl/application/use_cases/generate.py +++ b/bin/contentctl_project/contentctl_core/application/use_cases/generate.py @@ -3,14 +3,14 @@ import os from dataclasses import dataclass -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.domain.entities.detection import Detection -from contentctl.contentctl.application.builder.basic_builder import BasicBuilder -from contentctl.contentctl.application.builder.detection_builder import DetectionBuilder -from contentctl.contentctl.application.builder.story_builder import StoryBuilder -from contentctl.contentctl.application.builder.baseline_builder import BaselineBuilder -from contentctl.contentctl.application.builder.investigation_builder import InvestigationBuilder -from contentctl.contentctl.application.builder.director import Director +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.detection import Detection +from contentctl_core.application.builder.basic_builder import BasicBuilder +from contentctl_core.application.builder.detection_builder import DetectionBuilder +from contentctl_core.application.builder.story_builder import StoryBuilder +from contentctl_core.application.builder.baseline_builder import BaselineBuilder +from contentctl_core.application.builder.investigation_builder import InvestigationBuilder +from contentctl_core.application.builder.director import Director @dataclass(frozen=True) class GenerateInputDto: diff --git a/bin/contentctl_project/contentctl/contentctl/application/factory/utils/__init__.py b/bin/contentctl_project/contentctl_core/domain/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/application/factory/utils/__init__.py rename to bin/contentctl_project/contentctl_core/domain/__init__.py diff --git a/bin/contentctl_project/contentctl/contentctl/application/use_cases/__init__.py b/bin/contentctl_project/contentctl_core/domain/entities/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/application/use_cases/__init__.py rename to bin/contentctl_project/contentctl_core/domain/entities/__init__.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/baseline.py b/bin/contentctl_project/contentctl_core/domain/entities/baseline.py similarity index 89% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/baseline.py rename to bin/contentctl_project/contentctl_core/domain/entities/baseline.py index cb2be62762..ca41f9a242 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/baseline.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/baseline.py @@ -6,10 +6,10 @@ from pydantic import BaseModel, validator, ValidationError from dataclasses import dataclass from datetime import datetime -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.enums.enums import DataModel -from contentctl.contentctl.domain.entities.baseline_tags import BaselineTags -from contentctl.contentctl.domain.entities.deployment import Deployment +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.enums.enums import DataModel +from contentctl_core.domain.entities.baseline_tags import BaselineTags +from contentctl_core.domain.entities.deployment import Deployment class Baseline(BaseModel, SecurityContentObject): diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/baseline_tags.py b/bin/contentctl_project/contentctl_core/domain/entities/baseline_tags.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/baseline_tags.py rename to bin/contentctl_project/contentctl_core/domain/entities/baseline_tags.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/deployment.py b/bin/contentctl_project/contentctl_core/domain/entities/deployment.py similarity index 70% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/deployment.py rename to bin/contentctl_project/contentctl_core/domain/entities/deployment.py index 9616ecc7d3..8868bfd376 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/deployment.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/deployment.py @@ -5,13 +5,13 @@ import string from pydantic import BaseModel, validator, ValidationError from datetime import datetime -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.deployment_scheduling import DeploymentScheduling -from contentctl.contentctl.domain.entities.deployment_email import DeploymentEmail -from contentctl.contentctl.domain.entities.deployment_notable import DeploymentNotable -from contentctl.contentctl.domain.entities.deployment_rba import DeploymentRBA -from contentctl.contentctl.domain.entities.deployment_slack import DeploymentSlack -from contentctl.contentctl.domain.entities.deployment_phantom import DeploymentPhantom +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.deployment_scheduling import DeploymentScheduling +from contentctl_core.domain.entities.deployment_email import DeploymentEmail +from contentctl_core.domain.entities.deployment_notable import DeploymentNotable +from contentctl_core.domain.entities.deployment_rba import DeploymentRBA +from contentctl_core.domain.entities.deployment_slack import DeploymentSlack +from contentctl_core.domain.entities.deployment_phantom import DeploymentPhantom class Deployment(BaseModel, SecurityContentObject): name: str diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_email.py b/bin/contentctl_project/contentctl_core/domain/entities/deployment_email.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_email.py rename to bin/contentctl_project/contentctl_core/domain/entities/deployment_email.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_notable.py b/bin/contentctl_project/contentctl_core/domain/entities/deployment_notable.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_notable.py rename to bin/contentctl_project/contentctl_core/domain/entities/deployment_notable.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_phantom.py b/bin/contentctl_project/contentctl_core/domain/entities/deployment_phantom.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_phantom.py rename to bin/contentctl_project/contentctl_core/domain/entities/deployment_phantom.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_rba.py b/bin/contentctl_project/contentctl_core/domain/entities/deployment_rba.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_rba.py rename to bin/contentctl_project/contentctl_core/domain/entities/deployment_rba.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_scheduling.py b/bin/contentctl_project/contentctl_core/domain/entities/deployment_scheduling.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_scheduling.py rename to bin/contentctl_project/contentctl_core/domain/entities/deployment_scheduling.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_slack.py b/bin/contentctl_project/contentctl_core/domain/entities/deployment_slack.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/deployment_slack.py rename to bin/contentctl_project/contentctl_core/domain/entities/deployment_slack.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/detection.py b/bin/contentctl_project/contentctl_core/domain/entities/detection.py similarity index 87% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/detection.py rename to bin/contentctl_project/contentctl_core/domain/entities/detection.py index cd88aa3026..d3d8f82d02 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/detection.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/detection.py @@ -8,11 +8,11 @@ from pydantic import BaseModel, validator, ValidationError from dataclasses import dataclass from datetime import datetime -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.enums.enums import AnalyticsType -from contentctl.contentctl.domain.entities.enums.enums import DataModel -from contentctl.contentctl.domain.entities.detection_tags import DetectionTags -from contentctl.contentctl.domain.entities.deployment import Deployment +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.enums.enums import AnalyticsType +from contentctl_core.domain.entities.enums.enums import DataModel +from contentctl_core.domain.entities.detection_tags import DetectionTags +from contentctl_core.domain.entities.deployment import Deployment class Detection(BaseModel, SecurityContentObject): name: str diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/detection_tags.py b/bin/contentctl_project/contentctl_core/domain/entities/detection_tags.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/detection_tags.py rename to bin/contentctl_project/contentctl_core/domain/entities/detection_tags.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/__init__.py b/bin/contentctl_project/contentctl_core/domain/entities/enums/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/__init__.py rename to bin/contentctl_project/contentctl_core/domain/entities/enums/__init__.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/enums/enums.py b/bin/contentctl_project/contentctl_core/domain/entities/enums/enums.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/enums/enums.py rename to bin/contentctl_project/contentctl_core/domain/entities/enums/enums.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/investigation.py b/bin/contentctl_project/contentctl_core/domain/entities/investigation.py similarity index 88% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/investigation.py rename to bin/contentctl_project/contentctl_core/domain/entities/investigation.py index bb72522a12..3d36276dba 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/investigation.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/investigation.py @@ -8,10 +8,10 @@ from pydantic import BaseModel, validator, ValidationError from dataclasses import dataclass from datetime import datetime -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.enums.enums import AnalyticsType -from contentctl.contentctl.domain.entities.enums.enums import DataModel -from contentctl.contentctl.domain.entities.investigation_tags import InvestigationTags +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.enums.enums import AnalyticsType +from contentctl_core.domain.entities.enums.enums import DataModel +from contentctl_core.domain.entities.investigation_tags import InvestigationTags class Investigation(BaseModel, SecurityContentObject): diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/investigation_tags.py b/bin/contentctl_project/contentctl_core/domain/entities/investigation_tags.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/investigation_tags.py rename to bin/contentctl_project/contentctl_core/domain/entities/investigation_tags.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/lookup.py b/bin/contentctl_project/contentctl_core/domain/entities/lookup.py similarity index 78% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/lookup.py rename to bin/contentctl_project/contentctl_core/domain/entities/lookup.py index 97d1f7c027..fc5661209a 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/lookup.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/lookup.py @@ -1,6 +1,6 @@ from pydantic import BaseModel, validator, ValidationError -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.security_content_object import SecurityContentObject diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/macro.py b/bin/contentctl_project/contentctl_core/domain/entities/macro.py similarity index 66% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/macro.py rename to bin/contentctl_project/contentctl_core/domain/entities/macro.py index ea07d0269f..80f85f3df3 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/macro.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/macro.py @@ -2,7 +2,7 @@ from pydantic import BaseModel, validator, ValidationError -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.security_content_object import SecurityContentObject diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/playbook.py b/bin/contentctl_project/contentctl_core/domain/entities/playbook.py similarity index 67% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/playbook.py rename to bin/contentctl_project/contentctl_core/domain/entities/playbook.py index 792dc68aa1..b5ee3d7a96 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/playbook.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/playbook.py @@ -4,8 +4,8 @@ import string from pydantic import BaseModel, validator, ValidationError -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.playbook_tags import PlaybookTag +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.playbook_tags import PlaybookTag diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/playbook_tags.py b/bin/contentctl_project/contentctl_core/domain/entities/playbook_tags.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/playbook_tags.py rename to bin/contentctl_project/contentctl_core/domain/entities/playbook_tags.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/security_content_object.py b/bin/contentctl_project/contentctl_core/domain/entities/security_content_object.py similarity index 50% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/security_content_object.py rename to bin/contentctl_project/contentctl_core/domain/entities/security_content_object.py index 55046331e4..4f7071b666 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/security_content_object.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/security_content_object.py @@ -1,6 +1,6 @@ import abc -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.enums.enums import SecurityContentType class SecurityContentObject(abc.ABC): diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/story.py b/bin/contentctl_project/contentctl_core/domain/entities/story.py similarity index 92% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/story.py rename to bin/contentctl_project/contentctl_core/domain/entities/story.py index b56d903240..73dc6e9fd9 100644 --- a/bin/contentctl_project/contentctl/contentctl/domain/entities/story.py +++ b/bin/contentctl_project/contentctl_core/domain/entities/story.py @@ -5,8 +5,8 @@ import requests from pydantic import BaseModel, validator, ValidationError from datetime import datetime -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl.contentctl.domain.entities.story_tags import StoryTags +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.story_tags import StoryTags class Story(BaseModel, SecurityContentObject): name: str diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/story_tags.py b/bin/contentctl_project/contentctl_core/domain/entities/story_tags.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/story_tags.py rename to bin/contentctl_project/contentctl_core/domain/entities/story_tags.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/__init__.py b/bin/contentctl_project/contentctl_core/tests/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/__init__.py rename to bin/contentctl_project/contentctl_core/tests/__init__.py diff --git a/bin/contentctl_project/contentctl/contentctl/domain/entities/enums/__init__.py b/bin/contentctl_project/contentctl_core/tests/application/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/domain/entities/enums/__init__.py rename to bin/contentctl_project/contentctl_core/tests/application/__init__.py diff --git a/bin/contentctl_project/contentctl_core/tests/application/factory/test_factory.py b/bin/contentctl_project/contentctl_core/tests/application/factory/test_factory.py new file mode 100644 index 0000000000..281d1488b8 --- /dev/null +++ b/bin/contentctl_project/contentctl_core/tests/application/factory/test_factory.py @@ -0,0 +1,36 @@ +import os +import pytest + +from contentctl_core.application.factory.factory import FactoryInputDto +from contentctl_core.application.factory.factory import FactoryOutputDto +from contentctl_core.application.factory.factory import Factory +from contentctl_infrastructure.builder.security_content_director import SecurityContentDirector +from contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder +from contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder +from contentctl_infrastructure.builder.security_content_story_builder import SecurityContentStoryBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder +from contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder + + +@pytest.mark.skip(reason="need to fix the security objects first") +def test_factory_ESCU(): + input_path = os.path.join(os.path.dirname(__file__), '../../../../../../..') + + input_dto = FactoryInputDto( + input_path, + SecurityContentBasicBuilder(), + SecurityContentDetectionBuilder(), + SecurityContentStoryBuilder(), + SecurityContentBaselineBuilder(), + SecurityContentInvestigationBuilder(), + SecurityContentDirector(), + SecurityContentProduct.ESCU + ) + + output_dto = FactoryOutputDto([],[],[],[],[],[],[],[]) + + factory = Factory(output_dto) + factory.execute(input_dto) + + print(len(output_dto.detections)) diff --git a/bin/contentctl_project/contentctl_core/tests/application/factory/test_object_factory.py b/bin/contentctl_project/contentctl_core/tests/application/factory/test_object_factory.py new file mode 100644 index 0000000000..ef233d9d62 --- /dev/null +++ b/bin/contentctl_project/contentctl_core/tests/application/factory/test_object_factory.py @@ -0,0 +1,25 @@ +import os + + +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.application.factory.object_factory import ObjectFactoryInputDto +from contentctl_core.application.factory.object_factory import ObjectFactory +from contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder +from contentctl_infrastructure.builder.security_content_director import SecurityContentDirector + + +def test_object_factory(): + input_path = os.path.join(os.path.dirname(__file__), '../../../../../../detections') + + input_dto = ObjectFactoryInputDto( + input_path, + SecurityContentObjectBuilder(), + SecurityContentDirector() + ) + + objects = list() + + factory = ObjectFactory(objects) + factory.execute(input_dto) + + assert len(objects) == 959 \ No newline at end of file diff --git a/bin/contentctl_project/contentctl/contentctl/tests/__init__.py b/bin/contentctl_project/contentctl_core/tests/application/use_cases/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/__init__.py rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/__init__.py diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_content_changer.py b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_content_changer.py similarity index 55% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_content_changer.py rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_content_changer.py index cc13e39520..2d1f2f019f 100644 --- a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_content_changer.py +++ b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_content_changer.py @@ -1,11 +1,11 @@ import os -from contentctl.contentctl.application.use_cases.content_changer import ContentChanger, ContentChangerInputDto -from contentctl.contentctl.application.factory.object_factory import ObjectFactoryInputDto -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_director import SecurityContentDirector -from contentctl_infrastructure.contentctl_infrastructure.adapter.obj_to_yml_adapter import ObjToYmlAdapter -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_core.application.use_cases.content_changer import ContentChanger, ContentChangerInputDto +from contentctl_core.application.factory.object_factory import ObjectFactoryInputDto +from contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder +from contentctl_infrastructure.builder.security_content_director import SecurityContentDirector +from contentctl_infrastructure.adapter.obj_to_yml_adapter import ObjToYmlAdapter +from contentctl_infrastructure.builder.yml_reader import YmlReader def test_content_changer_author_uppercase(): diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/detections/deprecated/unsigned_image_loaded_by_lsass.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/detections/deprecated/unsigned_image_loaded_by_lsass.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/detections/deprecated/unsigned_image_loaded_by_lsass.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/detections/deprecated/unsigned_image_loaded_by_lsass.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/detections/endpoint/attempted_credential_dump_from_registry_via_reg_exe.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/detections/endpoint/attempted_credential_dump_from_registry_via_reg_exe.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/detections/endpoint/attempted_credential_dump_from_registry_via_reg_exe.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/detections/endpoint/attempted_credential_dump_from_registry_via_reg_exe.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/detections/endpoint/cobalt_strike_named_pipes.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/detections/endpoint/cobalt_strike_named_pipes.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/detections/endpoint/cobalt_strike_named_pipes.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/detections/endpoint/cobalt_strike_named_pipes.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/macros/security_content_ctime.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/macros/security_content_ctime.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/macros/security_content_ctime.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/macros/security_content_ctime.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/macros/security_content_summariesonly.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/macros/security_content_summariesonly.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/macros/security_content_summariesonly.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/macros/security_content_summariesonly.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/macros/sysmon.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/macros/sysmon.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/macros/sysmon.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/macros/sysmon.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/stories/cobalt_strike.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/stories/cobalt_strike.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/stories/cobalt_strike.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/stories/cobalt_strike.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/stories/credential_dumping.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/stories/credential_dumping.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/stories/credential_dumping.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/stories/credential_dumping.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/stories/ransomware_darkside.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/stories/ransomware_darkside.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/stories/ransomware_darkside.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/stories/ransomware_darkside.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/stories/trickbot.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/stories/trickbot.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_input/stories/trickbot.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_input/stories/trickbot.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_output/detections/attempted_credential_dump_from_registry_via_reg_exe.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_output/detections/attempted_credential_dump_from_registry_via_reg_exe.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_output/detections/attempted_credential_dump_from_registry_via_reg_exe.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_output/detections/attempted_credential_dump_from_registry_via_reg_exe.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_output/detections/cobalt_strike_named_pipes.yml b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_output/detections/cobalt_strike_named_pipes.yml similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_data_output/detections/cobalt_strike_named_pipes.yml rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_data_output/detections/cobalt_strike_named_pipes.yml diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_generate.py b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_generate.py similarity index 81% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_generate.py rename to bin/contentctl_project/contentctl_core/tests/application/use_cases/test_generate.py index 5afd85192f..420bb49bd4 100644 --- a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/test_generate.py +++ b/bin/contentctl_project/contentctl_core/tests/application/use_cases/test_generate.py @@ -1,7 +1,7 @@ import pytest import os -from contentctl.contentctl.application.use_cases.generate import Generate, GenerateInputDto, GenerateOutputDto, GenerateOutputBoundary +from contentctl_core.application.use_cases.generate import Generate, GenerateInputDto, GenerateOutputDto, GenerateOutputBoundary @pytest.fixture diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/__init__.py b/bin/contentctl_project/contentctl_core/tests/domain/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/__init__.py rename to bin/contentctl_project/contentctl_core/tests/domain/__init__.py diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/conf_writer.py b/bin/contentctl_project/contentctl_infrastructure/adapter/conf_writer.py similarity index 95% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/conf_writer.py rename to bin/contentctl_project/contentctl_infrastructure/adapter/conf_writer.py index fec0fea0dc..a7b574cc49 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/conf_writer.py +++ b/bin/contentctl_project/contentctl_infrastructure/adapter/conf_writer.py @@ -2,7 +2,7 @@ import datetime import os from jinja2 import Environment, FileSystemLoader -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.domain.entities.security_content_object import SecurityContentObject class ConfWriter(): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/obj_to_conf_adapter.py b/bin/contentctl_project/contentctl_infrastructure/adapter/obj_to_conf_adapter.py similarity index 96% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/obj_to_conf_adapter.py rename to bin/contentctl_project/contentctl_infrastructure/adapter/obj_to_conf_adapter.py index 49a1b60f97..7482e6d3dc 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/obj_to_conf_adapter.py +++ b/bin/contentctl_project/contentctl_infrastructure/adapter/obj_to_conf_adapter.py @@ -2,8 +2,8 @@ import os import glob import shutil -from contentctl.contentctl.application.adapter.adapter import Adapter -from contentctl_infrastructure.contentctl_infrastructure.adapter.conf_writer import ConfWriter +from contentctl_core.application.adapter.adapter import Adapter +from contentctl_infrastructure.adapter.conf_writer import ConfWriter class ObjToConfAdapter(Adapter): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/obj_to_yml_adapter.py b/bin/contentctl_project/contentctl_infrastructure/adapter/obj_to_yml_adapter.py similarity index 89% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/obj_to_yml_adapter.py rename to bin/contentctl_project/contentctl_infrastructure/adapter/obj_to_yml_adapter.py index 1245be70c3..551124c15e 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/obj_to_yml_adapter.py +++ b/bin/contentctl_project/contentctl_infrastructure/adapter/obj_to_yml_adapter.py @@ -1,7 +1,7 @@ import os -from contentctl_infrastructure.contentctl_infrastructure.adapter.yml_writer import YmlWriter -from contentctl.contentctl.application.adapter.adapter import Adapter +from contentctl_infrastructure.adapter.yml_writer import YmlWriter +from contentctl_core.application.adapter.adapter import Adapter class ObjToYmlAdapter(Adapter): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/analyticstories_detections.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/analyticstories_detections.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/analyticstories_detections.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/analyticstories_detections.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/analyticstories_stories.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/analyticstories_stories.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/analyticstories_stories.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/analyticstories_stories.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/collections.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/collections.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/collections.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/collections.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/es_investigations_investigations.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/es_investigations_investigations.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/es_investigations_investigations.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/es_investigations_investigations.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/es_investigations_stories.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/es_investigations_stories.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/es_investigations_stories.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/es_investigations_stories.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/header.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/header.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/header.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/header.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/macros.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/macros.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/macros.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/macros.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/macros_detections.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/macros_detections.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/macros_detections.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/macros_detections.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/panel.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/panel.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/panel.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/panel.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/savedsearches_baselines.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/savedsearches_baselines.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/savedsearches_baselines.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/savedsearches_baselines.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/savedsearches_detections.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/savedsearches_detections.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/savedsearches_detections.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/savedsearches_detections.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/savedsearches_investigations.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/savedsearches_investigations.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/savedsearches_investigations.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/savedsearches_investigations.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/transforms.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/transforms.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/transforms.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/transforms.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/workflow_actions.j2 b/bin/contentctl_project/contentctl_infrastructure/adapter/templates/workflow_actions.j2 similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/templates/workflow_actions.j2 rename to bin/contentctl_project/contentctl_infrastructure/adapter/templates/workflow_actions.j2 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/yml_writer.py b/bin/contentctl_project/contentctl_infrastructure/adapter/yml_writer.py similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/adapter/yml_writer.py rename to bin/contentctl_project/contentctl_infrastructure/adapter/yml_writer.py diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_baseline_builder.py b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_baseline_builder.py similarity index 80% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_baseline_builder.py rename to bin/contentctl_project/contentctl_infrastructure/builder/security_content_baseline_builder.py index f10e144fc3..93ad9c4c02 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_baseline_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_baseline_builder.py @@ -2,11 +2,11 @@ import sys from pydantic import ValidationError -from contentctl.contentctl.application.builder.baseline_builder import BaselineBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader -from contentctl.contentctl.domain.entities.baseline import Baseline -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct +from contentctl_core.application.builder.baseline_builder import BaselineBuilder +from contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_core.domain.entities.baseline import Baseline +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct class SecurityContentBaselineBuilder(BaselineBuilder): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_basic_builder.py b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_basic_builder.py similarity index 70% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_basic_builder.py rename to bin/contentctl_project/contentctl_infrastructure/builder/security_content_basic_builder.py index 8d5417009c..f3225f9949 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_basic_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_basic_builder.py @@ -2,16 +2,16 @@ import sys from pydantic import ValidationError -from contentctl.contentctl.application.builder.basic_builder import BasicBuilder -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.domain.entities.deployment import Deployment -from contentctl.contentctl.domain.entities.macro import Macro -from contentctl.contentctl.domain.entities.lookup import Lookup -from contentctl.contentctl.domain.entities.playbook import Playbook -from contentctl.contentctl.domain.entities.baseline import Baseline -from contentctl.contentctl.domain.entities.investigation import Investigation +from contentctl_core.application.builder.basic_builder import BasicBuilder +from contentctl_core.domain.entities.security_content_object import SecurityContentObject +from contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.deployment import Deployment +from contentctl_core.domain.entities.macro import Macro +from contentctl_core.domain.entities.lookup import Lookup +from contentctl_core.domain.entities.playbook import Playbook +from contentctl_core.domain.entities.baseline import Baseline +from contentctl_core.domain.entities.investigation import Investigation class SecurityContentBasicBuilder(BasicBuilder): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_detection_builder.py b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_detection_builder.py similarity index 87% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_detection_builder.py rename to bin/contentctl_project/contentctl_infrastructure/builder/security_content_detection_builder.py index bfac91d165..cba05fe00a 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_detection_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_detection_builder.py @@ -2,17 +2,17 @@ import sys from pydantic import ValidationError -from contentctl.contentctl.application.builder.detection_builder import DetectionBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader -from contentctl.contentctl.domain.entities.detection import Detection -from contentctl.contentctl.domain.entities.story import Story -from contentctl.contentctl.domain.entities.deployment import Deployment -from contentctl.contentctl.domain.entities.macro import Macro -from contentctl.contentctl.domain.entities.lookup import Lookup -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.domain.entities.enums.enums import AnalyticsType -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl.contentctl.domain.entities.security_content_object import SecurityContentObject +from contentctl_core.application.builder.detection_builder import DetectionBuilder +from contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_core.domain.entities.detection import Detection +from contentctl_core.domain.entities.story import Story +from contentctl_core.domain.entities.deployment import Deployment +from contentctl_core.domain.entities.macro import Macro +from contentctl_core.domain.entities.lookup import Lookup +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.enums.enums import AnalyticsType +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_core.domain.entities.security_content_object import SecurityContentObject class SecurityContentDetectionBuilder(DetectionBuilder): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_director.py b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_director.py similarity index 78% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_director.py rename to bin/contentctl_project/contentctl_infrastructure/builder/security_content_director.py index 40c24ed101..db0619f1b9 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_director.py +++ b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_director.py @@ -1,13 +1,13 @@ import os -from contentctl.contentctl.application.builder.director import Director -from contentctl.contentctl.application.builder.basic_builder import BasicBuilder -from contentctl.contentctl.application.builder.detection_builder import DetectionBuilder -from contentctl.contentctl.application.builder.story_builder import StoryBuilder -from contentctl.contentctl.application.builder.investigation_builder import InvestigationBuilder -from contentctl.contentctl.application.builder.baseline_builder import BaselineBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct +from contentctl_core.application.builder.director import Director +from contentctl_core.application.builder.basic_builder import BasicBuilder +from contentctl_core.application.builder.detection_builder import DetectionBuilder +from contentctl_core.application.builder.story_builder import StoryBuilder +from contentctl_core.application.builder.investigation_builder import InvestigationBuilder +from contentctl_core.application.builder.baseline_builder import BaselineBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct class SecurityContentDirector(Director): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_investigation_builder.py b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_investigation_builder.py similarity index 76% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_investigation_builder.py rename to bin/contentctl_project/contentctl_infrastructure/builder/security_content_investigation_builder.py index 8575b6eda6..7d931e96d0 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_investigation_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_investigation_builder.py @@ -3,10 +3,10 @@ import sys from pydantic import ValidationError -from contentctl.contentctl.application.builder.investigation_builder import InvestigationBuilder -from contentctl.contentctl.domain.entities.investigation import Investigation -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType +from contentctl_core.application.builder.investigation_builder import InvestigationBuilder +from contentctl_core.domain.entities.investigation import Investigation +from contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_core.domain.entities.enums.enums import SecurityContentType class SecurityContentInvestigationBuilder(InvestigationBuilder): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_object_builder.py b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_object_builder.py similarity index 57% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_object_builder.py rename to bin/contentctl_project/contentctl_infrastructure/builder/security_content_object_builder.py index 1b861fbe34..0e9f3ce3d8 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_object_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_object_builder.py @@ -1,9 +1,9 @@ -from contentctl.contentctl.application.builder.basic_builder import BasicBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType +from contentctl_core.application.builder.basic_builder import BasicBuilder +from contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_core.domain.entities.enums.enums import SecurityContentType class SecurityContentObjectBuilder(BasicBuilder): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_story_builder.py b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_story_builder.py similarity index 88% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_story_builder.py rename to bin/contentctl_project/contentctl_infrastructure/builder/security_content_story_builder.py index 228dcfdf80..b6060487a8 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/security_content_story_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/builder/security_content_story_builder.py @@ -3,10 +3,10 @@ import sys from pydantic import ValidationError -from contentctl.contentctl.application.builder.story_builder import StoryBuilder -from contentctl.contentctl.domain.entities.story import Story -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_core.application.builder.story_builder import StoryBuilder +from contentctl_core.domain.entities.story import Story +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_infrastructure.builder.yml_reader import YmlReader class SecurityContentStoryBuilder(StoryBuilder): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/yml_reader.py b/bin/contentctl_project/contentctl_infrastructure/builder/yml_reader.py similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/builder/yml_reader.py rename to bin/contentctl_project/contentctl_infrastructure/builder/yml_reader.py diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/__init__.py b/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/conf/savedsearches.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/conf/savedsearches.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/conf/savedsearches.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/conf/savedsearches.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/analyticstories.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/analyticstories.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/analyticstories.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/analyticstories.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/collections.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/collections.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/collections.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/collections.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/es_investigations.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/es_investigations.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/es_investigations.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/es_investigations.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/macros.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/macros.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/macros.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/macros.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/savedsearches.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/savedsearches.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/savedsearches.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/savedsearches.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/transforms.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/transforms.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/transforms.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/transforms.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/workflow_actions.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/workflow_actions.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default/workflow_actions.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default/workflow_actions.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/analyticstories.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/analyticstories.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/analyticstories.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/analyticstories.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/collections.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/collections.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/collections.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/collections.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/data/ui/panels/workbench_panel_get_parent_process_info___response_task.xml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/es_investigations.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/es_investigations.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/es_investigations.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/es_investigations.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/macros.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/macros.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/macros.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/macros.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/savedsearches.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/savedsearches.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/savedsearches.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/savedsearches.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/transforms.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/transforms.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/transforms.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/transforms.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/workflow_actions.conf b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/workflow_actions.conf similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/default_reference/workflow_actions.conf rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/default_reference/workflow_actions.conf diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/lookups/attacker_tools.csv b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/lookups/attacker_tools.csv similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/lookups/attacker_tools.csv rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/lookups/attacker_tools.csv diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/lookups/mitre_enrichment.csv b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/lookups/mitre_enrichment.csv similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/lookups/mitre_enrichment.csv rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/lookups/mitre_enrichment.csv diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/yml_file/attempted_credential_dump_from_registry_via_reg_exe.yml b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/yml_file/attempted_credential_dump_from_registry_via_reg_exe.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/data/yml_file/attempted_credential_dump_from_registry_via_reg_exe.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/data/yml_file/attempted_credential_dump_from_registry_via_reg_exe.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/test_obj_to_conf_adapter.py b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/test_obj_to_conf_adapter.py similarity index 80% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/test_obj_to_conf_adapter.py rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/test_obj_to_conf_adapter.py index a41e90a3f0..a2af94c415 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/test_obj_to_conf_adapter.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/test_obj_to_conf_adapter.py @@ -3,14 +3,14 @@ import datetime import pytest import filecmp -from contentctl_infrastructure.contentctl_infrastructure.adapter.obj_to_conf_adapter import ObjToConfAdapter -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_director import SecurityContentDirector -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_story_builder import SecurityContentStoryBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder +from contentctl_infrastructure.adapter.obj_to_conf_adapter import ObjToConfAdapter +from contentctl_infrastructure.builder.security_content_director import SecurityContentDirector +from contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder +from contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder +from contentctl_infrastructure.builder.security_content_story_builder import SecurityContentStoryBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder +from contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder FAKE_TIME = datetime.datetime(2020, 12, 25, 17, 5, 55) diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/test_obj_to_yml_adapter.py b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/test_obj_to_yml_adapter.py similarity index 79% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/test_obj_to_yml_adapter.py rename to bin/contentctl_project/contentctl_infrastructure/tests/adapter/test_obj_to_yml_adapter.py index 78d3857ba7..714b7422a5 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/adapter/test_obj_to_yml_adapter.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/adapter/test_obj_to_yml_adapter.py @@ -1,8 +1,8 @@ import os import filecmp -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader -from contentctl_infrastructure.contentctl_infrastructure.adapter.obj_to_yml_adapter import ObjToYmlAdapter +from contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_infrastructure.adapter.obj_to_yml_adapter import ObjToYmlAdapter def test_read_and_write_yml(): diff --git a/bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/__init__.py b/bin/contentctl_project/contentctl_infrastructure/tests/builder/__init__.py similarity index 100% rename from bin/contentctl_project/contentctl/contentctl/tests/application/use_cases/__init__.py rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/__init__.py diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/baseline/baseline.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/baseline/baseline.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/baseline/baseline.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/baseline/baseline.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/baseline/baseline2.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/baseline/baseline2.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/baseline/baseline2.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/baseline/baseline2.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_anomaly.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_anomaly.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_anomaly.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_anomaly.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_baseline.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_baseline.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_baseline.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_baseline.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_correlation.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_correlation.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_correlation.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_correlation.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_hunting.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_hunting.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_hunting.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_hunting.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_ttp.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_ttp.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_ttp.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/deployment/ESCU/00_default_ttp.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/detection/deprecated/detect_new_user_aws_console_login.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/detection/deprecated/detect_new_user_aws_console_login.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/detection/deprecated/detect_new_user_aws_console_login.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/detection/deprecated/detect_new_user_aws_console_login.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/detection/valid.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/detection/valid.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/detection/valid.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/detection/valid.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/investigation/investigation.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/investigation/investigation.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/investigation/investigation.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/investigation/investigation.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/lookups/attacker_tools.csv b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/lookups/attacker_tools.csv similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/lookups/attacker_tools.csv rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/lookups/attacker_tools.csv diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/lookups/mitre_enrichment.csv b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/lookups/mitre_enrichment.csv similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/lookups/mitre_enrichment.csv rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/lookups/mitre_enrichment.csv diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/lookups/previously_seen_aws_regions.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/lookups/previously_seen_aws_regions.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/lookups/previously_seen_aws_regions.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/lookups/previously_seen_aws_regions.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/macro/powershell.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/macro/powershell.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/macro/powershell.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/macro/powershell.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/macro/security_content_ctime.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/macro/security_content_ctime.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/macro/security_content_ctime.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/macro/security_content_ctime.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/playbook/example_playbook.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/playbook/example_playbook.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/playbook/example_playbook.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/playbook/example_playbook.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/story/ransomware_darkside.yml b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/story/ransomware_darkside.yml similarity index 100% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_data/story/ransomware_darkside.yml rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_data/story/ransomware_darkside.yml diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_basic_builder.py b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_basic_builder.py similarity index 82% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_basic_builder.py rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_basic_builder.py index 25c9c30a58..8d38f2486b 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_basic_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_basic_builder.py @@ -1,10 +1,10 @@ import pytest import os -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_infrastructure.builder.yml_reader import YmlReader def test_read_deployment(): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_detection_builder.py b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_detection_builder.py similarity index 88% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_detection_builder.py rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_detection_builder.py index 31f9fb2efc..ce17509ef3 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_detection_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_detection_builder.py @@ -1,13 +1,13 @@ import pytest import os -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder +from contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder +from contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder def test_read_detection(): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_director.py b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_director.py similarity index 89% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_director.py rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_director.py index f87adea903..6e35944c70 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_director.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_director.py @@ -1,13 +1,13 @@ import os -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_director import SecurityContentDirector -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_story_builder import SecurityContentStoryBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentProduct -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder +from contentctl_infrastructure.builder.security_content_director import SecurityContentDirector +from contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder +from contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder +from contentctl_infrastructure.builder.security_content_story_builder import SecurityContentStoryBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentProduct +from contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder +from contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder +from contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder def test_construct_deployments(): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_investigation_builder.py b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_investigation_builder.py similarity index 83% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_investigation_builder.py rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_investigation_builder.py index cf11fb4420..c4e4f60ecc 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_investigation_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_investigation_builder.py @@ -1,7 +1,7 @@ import os -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType +from contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentType def test_read_investigation(): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_object_builder.py b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_object_builder.py similarity index 60% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_object_builder.py rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_object_builder.py index a1da15dfd3..c8650734b7 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_object_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_object_builder.py @@ -2,8 +2,8 @@ import os -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType +from contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentType def test_read_detection(): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_story_builder.py b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_story_builder.py similarity index 77% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_story_builder.py rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_story_builder.py index 5f516e4093..db92334902 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_security_content_story_builder.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_security_content_story_builder.py @@ -1,11 +1,11 @@ import os -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_story_builder import SecurityContentStoryBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder -from contentctl.contentctl.domain.entities.enums.enums import SecurityContentType -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder +from contentctl_infrastructure.builder.security_content_story_builder import SecurityContentStoryBuilder +from contentctl_infrastructure.builder.security_content_detection_builder import SecurityContentDetectionBuilder +from contentctl_infrastructure.builder.security_content_basic_builder import SecurityContentBasicBuilder +from contentctl_core.domain.entities.enums.enums import SecurityContentType +from contentctl_infrastructure.builder.security_content_investigation_builder import SecurityContentInvestigationBuilder +from contentctl_infrastructure.builder.security_content_baseline_builder import SecurityContentBaselineBuilder def test_read_story(): diff --git a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_yml_reader.py b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_yml_reader.py similarity index 72% rename from bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_yml_reader.py rename to bin/contentctl_project/contentctl_infrastructure/tests/builder/test_yml_reader.py index 5fc87b7572..1bbb74a617 100644 --- a/bin/contentctl_project/contentctl_infrastructure/contentctl_infrastructure/tests/builder/test_yml_reader.py +++ b/bin/contentctl_project/contentctl_infrastructure/tests/builder/test_yml_reader.py @@ -1,7 +1,7 @@ import pytest import os -from contentctl_infrastructure.contentctl_infrastructure.builder.yml_reader import YmlReader +from contentctl_infrastructure.builder.yml_reader import YmlReader def test_read_detection_file(): diff --git a/bin/contentctl_project/main/contentctl.py b/bin/contentctl_project/main/contentctl.py index 545901c9c4..bc76f4f6da 100644 --- a/bin/contentctl_project/main/contentctl.py +++ b/bin/contentctl_project/main/contentctl.py @@ -2,11 +2,11 @@ import sys import argparse import os -from contentctl.contentctl.application.use_cases.content_changer import ContentChanger, ContentChangerInputDto -from contentctl.contentctl.application.factory.object_factory import ObjectFactoryInputDto -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder -from contentctl_infrastructure.contentctl_infrastructure.builder.security_content_director import SecurityContentDirector -from contentctl_infrastructure.contentctl_infrastructure.adapter.obj_to_yml_adapter import ObjToYmlAdapter +from contentctl_core.application.use_cases.content_changer import ContentChanger, ContentChangerInputDto +from contentctl_core.application.factory.object_factory import ObjectFactoryInputDto +from contentctl_infrastructure.builder.security_content_object_builder import SecurityContentObjectBuilder +from contentctl_infrastructure.builder.security_content_director import SecurityContentDirector +from contentctl_infrastructure.adapter.obj_to_yml_adapter import ObjToYmlAdapter def init(args): @@ -105,7 +105,7 @@ def main(args): content_changer_parser.add_argument("-o", "--output_path", required=True, type=str, help="Path where to store the changed secrity content objects") content_changer_parser.add_argument("-cf", "--change_function", required=True, type=str, - help="Define a change funtion defined in bin/contentctl/contentctl/contentctl/application/use_cases/content_changer.py") + help="Define a change funtion defined in bin/contentctl_core/contentctl/application/use_cases/content_changer.py") content_changer_parser.set_defaults(func=content_changer) # # parse them