diff --git a/monkey/common/cloud/all_instances.py b/monkey/common/cloud/all_instances.py deleted file mode 100644 index 6387730f6..000000000 --- a/monkey/common/cloud/all_instances.py +++ /dev/null @@ -1,12 +0,0 @@ -from typing import List - -from common.cloud.aws.aws_instance import AwsInstance -from common.cloud.azure.azure_instance import AzureInstance -from common.cloud.gcp.gcp_instance import GcpInstance -from common.cloud.instance import CloudInstance - -all_cloud_instances = [AwsInstance(), AzureInstance(), GcpInstance()] - - -def get_all_cloud_instances() -> List[CloudInstance]: - return all_cloud_instances diff --git a/monkey/common/cloud/environment_names.py b/monkey/common/cloud/environment_names.py index 945d438ce..438c64379 100644 --- a/monkey/common/cloud/environment_names.py +++ b/monkey/common/cloud/environment_names.py @@ -2,14 +2,4 @@ from enum import Enum class Environment(Enum): - UNKNOWN = "Unknown" - ON_PREMISE = "On Premise" - AZURE = "Azure" AWS = "AWS" - GCP = "GCP" - ALIBABA = "Alibaba Cloud" - IBM = "IBM Cloud" - DigitalOcean = "Digital Ocean" - - -ALL_ENVIRONMENTS_NAMES = [x.value for x in Environment] diff --git a/monkey/common/cloud/instance.py b/monkey/common/cloud/instance.py index f0da19359..77376ee8e 100644 --- a/monkey/common/cloud/instance.py +++ b/monkey/common/cloud/instance.py @@ -1,6 +1,3 @@ -from common.cloud.environment_names import Environment - - class CloudInstance(object): """ This is an abstract class which represents a cloud instance. @@ -10,6 +7,3 @@ class CloudInstance(object): def is_instance(self) -> bool: raise NotImplementedError() - - def get_cloud_provider_name(self) -> Environment: - raise NotImplementedError() diff --git a/monkey/common/cloud/scoutsuite_consts.py b/monkey/common/cloud/scoutsuite_consts.py index 091b51114..e2d0c1664 100644 --- a/monkey/common/cloud/scoutsuite_consts.py +++ b/monkey/common/cloud/scoutsuite_consts.py @@ -3,7 +3,3 @@ from enum import Enum class CloudProviders(Enum): AWS = "aws" - AZURE = "azure" - GCP = "gcp" - ALIBABA = "aliyun" - ORACLE = "oci" diff --git a/monkey/monkey_island/cc/models/monkey.py b/monkey/monkey_island/cc/models/monkey.py index a6d5b2138..888d1c569 100644 --- a/monkey/monkey_island/cc/models/monkey.py +++ b/monkey/monkey_island/cc/models/monkey.py @@ -14,7 +14,6 @@ from mongoengine import ( StringField, ) -from common.cloud import environment_names from monkey_island.cc.models.command_control_channel import CommandControlChannel from monkey_island.cc.models.monkey_ttl import MonkeyTtl, create_monkey_ttl_document from monkey_island.cc.server_utils.consts import DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS