From e995e3b35ae63066bf359cf5c5e1eb0595b4e11f Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Fri, 4 Nov 2022 11:09:56 +0800 Subject: [PATCH] perf: change secret adjustment --- apps/assets/automations/change_secret/manager.py | 4 +--- apps/assets/models/base.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/assets/automations/change_secret/manager.py b/apps/assets/automations/change_secret/manager.py index fd289b12f..a8b7dd515 100644 --- a/apps/assets/automations/change_secret/manager.py +++ b/apps/assets/automations/change_secret/manager.py @@ -192,10 +192,8 @@ class ChangeSecretManager(BasePlaybookManager): self.send_recorder_mail(recorders) def send_recorder_mail(self, recorders): - if not recorders: - return recipients = self.execution.recipients - if not recipients: + if not recorders or not recipients: return recipients = User.objects.filter(id__in=list(recipients)) diff --git a/apps/assets/models/base.py b/apps/assets/models/base.py index 8fa91b2cb..c0bf5b078 100644 --- a/apps/assets/models/base.py +++ b/apps/assets/models/base.py @@ -116,7 +116,7 @@ class BaseAccount(OrgModelMixin): @property def private_key_path(self): - if not self.secret_type != 'ssh_key' or not self.secret: + if not self.secret_type != SecretType.ssh_key or not self.secret: return None project_dir = settings.PROJECT_DIR tmp_dir = os.path.join(project_dir, 'tmp')