From 0980a053d584264c199d726832d881d140d14fda Mon Sep 17 00:00:00 2001 From: Artem Kotik Date: Sat, 22 Jun 2024 23:26:49 +0800 Subject: [PATCH] Closes #69: Fix logger in SecretsMixin (#71) * Fix logging in SecretsMixin * Dont set credentials, if using data source --- netbox_config_diff/compliance/base.py | 5 ++++- netbox_config_diff/compliance/secrets.py | 5 ++++- netbox_config_diff/models/data_models.py | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/netbox_config_diff/compliance/base.py b/netbox_config_diff/compliance/base.py index 297a76e..f4fee83 100644 --- a/netbox_config_diff/compliance/base.py +++ b/netbox_config_diff/compliance/base.py @@ -130,7 +130,10 @@ def get_devices_with_rendered_configs(self, devices: Iterable[Device]) -> Iterat self.check_netbox_secrets() self.substitutes = {} for device in devices: - username, password, auth_secondary, default_desired_privilege_level = self.get_credentials(device) + if self.data["data_source"]: + username, password, auth_secondary, default_desired_privilege_level = None, None, None, None + else: + username, password, auth_secondary, default_desired_privilege_level = self.get_credentials(device) rendered_config = None error = None context_data = device.get_config_context() diff --git a/netbox_config_diff/compliance/secrets.py b/netbox_config_diff/compliance/secrets.py index 14d6d79..a7df185 100644 --- a/netbox_config_diff/compliance/secrets.py +++ b/netbox_config_diff/compliance/secrets.py @@ -34,7 +34,10 @@ def get_master_key(self) -> None: self.master_key = sk.get_master_key(self.session_key) except Exception as e: if getattr(self, "logger"): - self.logger.log_failure(f"Can't fetch master_key: {str(e)}") + if getattr(self.logger, "log_failure"): + self.logger.log_failure(f"Can't fetch master_key: {str(e)}") + else: + self.logger.error(f"Can't fetch master_key: {str(e)}") else: self.log_failure(f"Can't fetch master_key: {str(e)}") diff --git a/netbox_config_diff/models/data_models.py b/netbox_config_diff/models/data_models.py index b3de515..5a2bc22 100644 --- a/netbox_config_diff/models/data_models.py +++ b/netbox_config_diff/models/data_models.py @@ -15,8 +15,8 @@ class BaseDeviceDataClass: name: str mgmt_ip: str platform: str - username: str - password: str + username: str | None + password: str | None exclude_regex: str | None = None rendered_config: str | None = None actual_config: str | None = None