Skip to content

Commit 0980a05

Browse files
authored
Closes #69: Fix logger in SecretsMixin (#71)
* Fix logging in SecretsMixin * Dont set credentials, if using data source
1 parent 5dee473 commit 0980a05

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

netbox_config_diff/compliance/base.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@ def get_devices_with_rendered_configs(self, devices: Iterable[Device]) -> Iterat
130130
self.check_netbox_secrets()
131131
self.substitutes = {}
132132
for device in devices:
133-
username, password, auth_secondary, default_desired_privilege_level = self.get_credentials(device)
133+
if self.data["data_source"]:
134+
username, password, auth_secondary, default_desired_privilege_level = None, None, None, None
135+
else:
136+
username, password, auth_secondary, default_desired_privilege_level = self.get_credentials(device)
134137
rendered_config = None
135138
error = None
136139
context_data = device.get_config_context()

netbox_config_diff/compliance/secrets.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ def get_master_key(self) -> None:
3434
self.master_key = sk.get_master_key(self.session_key)
3535
except Exception as e:
3636
if getattr(self, "logger"):
37-
self.logger.log_failure(f"Can't fetch master_key: {str(e)}")
37+
if getattr(self.logger, "log_failure"):
38+
self.logger.log_failure(f"Can't fetch master_key: {str(e)}")
39+
else:
40+
self.logger.error(f"Can't fetch master_key: {str(e)}")
3841
else:
3942
self.log_failure(f"Can't fetch master_key: {str(e)}")
4043

netbox_config_diff/models/data_models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class BaseDeviceDataClass:
1515
name: str
1616
mgmt_ip: str
1717
platform: str
18-
username: str
19-
password: str
18+
username: str | None
19+
password: str | None
2020
exclude_regex: str | None = None
2121
rendered_config: str | None = None
2222
actual_config: str | None = None

0 commit comments

Comments
 (0)