p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Common: Remove circular dependency in agent_configuration.py

This commit is contained in:
Mike Salvatore 2022-06-24 12:42:09 -04:00
parent 4c47eae70b
commit ea02bec0b4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monkey/common/configuration/agent_configuration.py
View File

@ -3,7 +3,7 @@ from __future__ import annotations
from dataclasses import dataclass from dataclasses import dataclass
from typing import List from typing import List
from marshmallow import Schema, fields, post_load from marshmallow import Schema, fields
from .agent_sub_configuration_schemas import ( from .agent_sub_configuration_schemas import (
CustomPBAConfigurationSchema, CustomPBAConfigurationSchema,
@ -28,11 +28,13 @@ class AgentConfiguration:
@staticmethod @staticmethod
def from_dict(dict_: dict): def from_dict(dict_: dict):
return AgentConfigurationSchema().load(dict_) config_dict = AgentConfigurationSchema().load(dict_)
return AgentConfiguration(**config_dict)
@staticmethod @staticmethod
def from_json(config_json: dict): def from_json(config_json: dict):
return AgentConfigurationSchema().loads(config_json) config_dict = AgentConfigurationSchema().loads(config_json)
return AgentConfiguration(**config_dict)
@staticmethod @staticmethod
def to_json(config: AgentConfiguration) -> str: def to_json(config: AgentConfiguration) -> str:
@ -46,7 +48,3 @@ class AgentConfigurationSchema(Schema):
credential_collectors = fields.List(fields.Nested(PluginConfigurationSchema)) credential_collectors = fields.List(fields.Nested(PluginConfigurationSchema))
payloads = fields.List(fields.Nested(PluginConfigurationSchema)) payloads = fields.List(fields.Nested(PluginConfigurationSchema))
propagation = fields.Nested(PropagationConfigurationSchema) propagation = fields.Nested(PropagationConfigurationSchema)
@post_load
def _make_agent_configuration(self, data, **kwargs):
return AgentConfiguration(**data)