Merge pull request #2009 from guardicore/1997-rename-credential_collector_classes

Rename `credential_collector_classes`

monkey/infection_monkey/master/automated_master.py

@@ -149,7 +149,7 @@ class AutomatedMaster(IMaster):
             target=self._run_plugins,
             name="CredentialCollectorThread",
             args=(
-                config["credential_collector_classes"],
+                config["credential_collectors"],
                 "credential collector",
                 self._collect_credentials,
             ),

monkey/monkey_island/cc/services/config_schema/config_schema.py

@@ -1,7 +1,7 @@
 from monkey_island.cc.services.config_schema.basic import BASIC
 from monkey_island.cc.services.config_schema.basic_network import BASIC_NETWORK
 from monkey_island.cc.services.config_schema.definitions.credential_collector_classes import (
-    CREDENTIAL_COLLECTOR_CLASSES,
+    CREDENTIAL_COLLECTORS,
 )
 from monkey_island.cc.services.config_schema.definitions.exploiter_classes import EXPLOITER_CLASSES
 from monkey_island.cc.services.config_schema.definitions.finger_classes import FINGER_CLASSES
@@ -20,7 +20,7 @@ SCHEMA = {
     # users will not accidentally chose unsafe options
     "definitions": {
         "exploiter_classes": EXPLOITER_CLASSES,
-        "credential_collector_classes": CREDENTIAL_COLLECTOR_CLASSES,
+        "credential_collectors": CREDENTIAL_COLLECTORS,
         "post_breach_actions": POST_BREACH_ACTIONS,
         "finger_classes": FINGER_CLASSES,
     },

monkey/monkey_island/cc/services/config_schema/definitions/credential_collector_classes.py

@@ -1,6 +1,6 @@
 from common.common_consts.credential_collector_names import MIMIKATZ_COLLECTOR, SSH_COLLECTOR
 
-CREDENTIAL_COLLECTOR_CLASSES = {
+CREDENTIAL_COLLECTORS = {
     "title": "Credential Collectors",
     "description": "Click on a credential collector to find out what it collects.",
     "type": "string",

monkey/monkey_island/cc/services/config_schema/monkey.py

@@ -77,11 +77,11 @@ MONKEY = {
             "title": "Credential collection",
             "type": "object",
             "properties": {
-                "credential_collector_classes": {
+                "credential_collectors": {
                     "title": "Credential collectors",
                     "type": "array",
                     "uniqueItems": True,
-                    "items": {"$ref": "#/definitions/credential_collector_classes"},
+                    "items": {"$ref": "#/definitions/credential_collectors"},
                     "default": [
                         MIMIKATZ_COLLECTOR,
                         SSH_COLLECTOR,

monkey/monkey_island/cc/ui/src/components/configuration-components/UiSchema.js

@@ -95,7 +95,7 @@ export default function UiSchema(props) {
         }
       },
       credential_collectors: {
-        credential_collector_classes: {
+        credential_collectors: {
           classNames: 'config-template-no-header',
           'ui:widget': AdvancedMultiSelect
         }

monkey/monkey_island/cc/ui/src/components/utils/SafeOptionValidator.js

@@ -17,8 +17,8 @@ function getPluginDescriptors(schema, config) {
     },
     {
       name: 'CredentialCollectors',
-      allPlugins: schema.definitions.credential_collector_classes.anyOf,
-      selectedPlugins: config.monkey.credential_collectors.credential_collector_classes
+      allPlugins: schema.definitions.credential_collectors.anyOf,
+      selectedPlugins: config.monkey.credential_collectors.credential_collectors
     }
   ]);
 }

monkey/tests/data_for_tests/monkey_configs/automated_master_config.json

@@ -101,7 +101,7 @@
                 "other_behaviors": {"readme": true}
             }
         },
-        "credential_collector_classes": [
+        "credential_collectors": [
             "MimikatzCollector",
             "SSHCollector"
         ]