From 9dc0211341fa697489783af14b93df07c9231c65 Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Thu, 1 Oct 2020 12:39:45 +0300 Subject: [PATCH] Moved scoutsuit submodule directory, because island might want to call it's method to check for setup --- .gitmodules | 2 +- monkey/common/cloud/scoutsuite | 1 + .../system_info/collectors/scoutsuite_collector/scoutsuite | 1 - .../collectors/scoutsuite_collector/scoutsuite_api.py | 5 ++--- monkey/infection_monkey/telemetry/scoutsuite_telem.py | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) create mode 160000 monkey/common/cloud/scoutsuite delete mode 160000 monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite diff --git a/.gitmodules b/.gitmodules index 6f784049d..b169cc5ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ path = docs/themes/learn url = https://github.com/guardicode/hugo-theme-learn.git [submodule "monkey/infection_monkey/system_info/collectors/scoutsuite"] - path = monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite + path = monkey/common/cloud/scoutsuite url = https://github.com/ShayNehmad/ScoutSuite.git diff --git a/monkey/common/cloud/scoutsuite b/monkey/common/cloud/scoutsuite new file mode 160000 index 000000000..6d7178d7a --- /dev/null +++ b/monkey/common/cloud/scoutsuite @@ -0,0 +1 @@ +Subproject commit 6d7178d7a1249024bea0ec20985f73aa35ab4809 diff --git a/monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite b/monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite deleted file mode 160000 index e5f9760a8..000000000 --- a/monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5f9760a822cc8856a1be3da691c511ad32ad7dd diff --git a/monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite_api.py b/monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite_api.py index 9feec3c3d..3235f7d34 100644 --- a/monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite_api.py +++ b/monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite_api.py @@ -2,8 +2,7 @@ import pkgutil import sys from pathlib import PurePath -_scoutsuite_api_package = pkgutil.get_loader('infection_monkey.system_info.collectors.' - 'scoutsuite_collector.scoutsuite.ScoutSuite.__main__') +_scoutsuite_api_package = pkgutil.get_loader('common.cloud.scoutsuite.ScoutSuite.__main__') def _add_scoutsuite_to_python_path(): @@ -13,7 +12,7 @@ def _add_scoutsuite_to_python_path(): _add_scoutsuite_to_python_path() -import infection_monkey.system_info.collectors.scoutsuite_collector.scoutsuite.ScoutSuite.api_run as scoutsuite_api +import common.cloud.scoutsuite.ScoutSuite.api_run as scoutsuite_api def run(*args, **kwargs): diff --git a/monkey/infection_monkey/telemetry/scoutsuite_telem.py b/monkey/infection_monkey/telemetry/scoutsuite_telem.py index 743de93e7..ef9ce53c0 100644 --- a/monkey/infection_monkey/telemetry/scoutsuite_telem.py +++ b/monkey/infection_monkey/telemetry/scoutsuite_telem.py @@ -1,5 +1,5 @@ from common.common_consts.telem_categories import TelemCategoryEnum -from infection_monkey.system_info.collectors.scoutsuite_collector.scoutsuite.ScoutSuite.output.result_encoder import \ +from common.cloud.scoutsuite.ScoutSuite.output.result_encoder import \ ScoutJsonEncoder from infection_monkey.telemetry.base_telem import BaseTelem