Agent: Remove shallow i_puppet.credential_collection subpackage

monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py

@@ -2,7 +2,7 @@ import logging
 from typing import Sequence
 
 from common.credentials import Credentials, LMHash, NTHash, Password, Username
-from infection_monkey.i_puppet.credential_collection import ICredentialCollector
+from infection_monkey.i_puppet import ICredentialCollector
 from infection_monkey.model import USERNAME_PREFIX
 
 from . import pypykatz_handler

monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py

@@ -3,7 +3,7 @@ from typing import Dict, Iterable, Sequence
 
 from common.credentials import Credentials, SSHKeypair, Username
 from infection_monkey.credential_collectors.ssh_collector import ssh_handler
-from infection_monkey.i_puppet.credential_collection import ICredentialCollector
+from infection_monkey.i_puppet import ICredentialCollector
 from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger
 
 logger = logging.getLogger(__name__)

monkey/infection_monkey/i_puppet/__init__.py

@@ -10,3 +10,4 @@ from .i_puppet import (
     UnknownPluginError,
 )
 from .i_fingerprinter import IFingerprinter
+from .i_credential_collector import ICredentialCollector

monkey/infection_monkey/i_puppet/credential_collection/__init__.py

@@ -1 +0,0 @@
-from .i_credential_collector import ICredentialCollector