From c4642141f0358e95a354300ac8414c1d565e038e Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Fri, 23 Sep 2022 18:36:03 +0530 Subject: [PATCH] Island: Move terminate_all_agents.py and terminate_all_agents.py under cc/resources/agent_signals/ --- monkey/monkey_island/cc/app.py | 2 +- monkey/monkey_island/cc/resources/__init__.py | 3 +-- monkey/monkey_island/cc/resources/agent_signals/__init__.py | 2 ++ .../cc/resources/{ => agent_signals}/agent_signals.py | 0 .../cc/resources/{ => agent_signals}/terminate_all_agents.py | 0 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 monkey/monkey_island/cc/resources/agent_signals/__init__.py rename monkey/monkey_island/cc/resources/{ => agent_signals}/agent_signals.py (100%) rename monkey/monkey_island/cc/resources/{ => agent_signals}/terminate_all_agents.py (100%) diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py index 7438f1eac..86616b596 100644 --- a/monkey/monkey_island/cc/app.py +++ b/monkey/monkey_island/cc/app.py @@ -24,6 +24,7 @@ from monkey_island.cc.resources import ( PropagationCredentials, RemoteRun, ResetAgentConfiguration, + TerminateAllAgents, ) from monkey_island.cc.resources.AbstractResource import AbstractResource from monkey_island.cc.resources.agent_controls import StopAgentCheck @@ -49,7 +50,6 @@ from monkey_island.cc.resources.root import Root from monkey_island.cc.resources.security_report import SecurityReport from monkey_island.cc.resources.telemetry import Telemetry from monkey_island.cc.resources.telemetry_feed import TelemetryFeed -from monkey_island.cc.resources.terminate_all_agents import TerminateAllAgents from monkey_island.cc.resources.version import Version from monkey_island.cc.resources.zero_trust.finding_event import ZeroTrustFindingEvent from monkey_island.cc.resources.zero_trust.zero_trust_report import ZeroTrustReport diff --git a/monkey/monkey_island/cc/resources/__init__.py b/monkey/monkey_island/cc/resources/__init__.py index bef3988e8..937766e2b 100644 --- a/monkey/monkey_island/cc/resources/__init__.py +++ b/monkey/monkey_island/cc/resources/__init__.py @@ -10,5 +10,4 @@ from .pba_file_upload import PBAFileUpload, LINUX_PBA_TYPE, WINDOWS_PBA_TYPE from .pba_file_download import PBAFileDownload from .agent_events import AgentEvents from .agents import Agents -from .agent_signals import AgentSignals -from .terminate_all_agents import TerminateAllAgents +from .agent_signals import AgentSignals, TerminateAllAgents diff --git a/monkey/monkey_island/cc/resources/agent_signals/__init__.py b/monkey/monkey_island/cc/resources/agent_signals/__init__.py new file mode 100644 index 000000000..b09dbdd87 --- /dev/null +++ b/monkey/monkey_island/cc/resources/agent_signals/__init__.py @@ -0,0 +1,2 @@ +from .agent_signals import AgentSignals +from .terminate_all_agents import TerminateAllAgents diff --git a/monkey/monkey_island/cc/resources/agent_signals.py b/monkey/monkey_island/cc/resources/agent_signals/agent_signals.py similarity index 100% rename from monkey/monkey_island/cc/resources/agent_signals.py rename to monkey/monkey_island/cc/resources/agent_signals/agent_signals.py diff --git a/monkey/monkey_island/cc/resources/terminate_all_agents.py b/monkey/monkey_island/cc/resources/agent_signals/terminate_all_agents.py similarity index 100% rename from monkey/monkey_island/cc/resources/terminate_all_agents.py rename to monkey/monkey_island/cc/resources/agent_signals/terminate_all_agents.py