From 9644d8b1bc90d8cfbc86791a5c8343f8623d65d6 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 20 Feb 2023 16:20:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20ansible=20=E7=BD=91?=
 =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/accounts/serializers/account/account.py |  4 +--
 apps/accounts/serializers/account/backup.py  | 26 +++++++++++---------
 apps/ops/ansible/inventory.py                |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/accounts/serializers/account/account.py b/apps/accounts/serializers/account/account.py
index 4062d7fe9..1e22a2f16 100644
--- a/apps/accounts/serializers/account/account.py
+++ b/apps/accounts/serializers/account/account.py
@@ -60,9 +60,7 @@ class AccountSerializerCreateValidateMixin:
         return instance
 
 
-class AccountSerializerCreateMixin(
-    AccountSerializerCreateValidateMixin, BulkModelSerializer
-):
+class AccountSerializerCreateMixin(AccountSerializerCreateValidateMixin, BulkModelSerializer):
     template = serializers.BooleanField(
         default=False, label=_("Template"), write_only=True
     )
diff --git a/apps/accounts/serializers/account/backup.py b/apps/accounts/serializers/account/backup.py
index 9df58725c..af07ca04d 100644
--- a/apps/accounts/serializers/account/backup.py
+++ b/apps/accounts/serializers/account/backup.py
@@ -3,13 +3,12 @@
 from django.utils.translation import ugettext as _
 from rest_framework import serializers
 
-from orgs.mixins.serializers import BulkOrgResourceModelSerializer
-from ops.mixin import PeriodTaskSerializerMixin
-from common.utils import get_logger
+from accounts.models import AccountBackupAutomation, AccountBackupExecution
 from common.const.choices import Trigger
 from common.serializers.fields import LabeledChoiceField
-
-from accounts.models import AccountBackupAutomation, AccountBackupExecution
+from common.utils import get_logger
+from ops.mixin import PeriodTaskSerializerMixin
+from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 
 logger = get_logger(__file__)
 
@@ -20,18 +19,21 @@ class AccountBackupSerializer(PeriodTaskSerializerMixin, BulkOrgResourceModelSer
     class Meta:
         model = AccountBackupAutomation
         read_only_fields = [
-            'date_created', 'date_updated', 'created_by', 'periodic_display', 'executed_amount'
+            'date_created', 'date_updated', 'created_by',
+            'periodic_display', 'executed_amount'
         ]
         fields = read_only_fields + [
-            'id', 'name', 'is_periodic', 'interval', 'crontab', 'comment', 'recipients', 'types'
+            'id', 'name', 'is_periodic', 'interval', 'crontab',
+            'comment', 'recipients', 'types'
         ]
         extra_kwargs = {
             'name': {'required': True},
             'periodic_display': {'label': _('Periodic perform')},
             'executed_amount': {'label': _('Executed amount')},
-            'recipients': {'label': _('Recipient'), 'help_text': _(
-                'Currently only mail sending is supported'
-            )},
+            'recipients': {
+                'label': _('Recipient'),
+                'help_text': _('Currently only mail sending is supported')
+            },
             'types': {'label': _('Asset type')}
         }
 
@@ -42,7 +44,7 @@ class AccountBackupPlanExecutionSerializer(serializers.ModelSerializer):
     class Meta:
         model = AccountBackupExecution
         read_only_fields = [
-            'id', 'date_start', 'timedelta', 'plan_snapshot', 'trigger', 'reason',
-            'is_success', 'org_id', 'recipients'
+            'id', 'date_start', 'timedelta', 'plan_snapshot',
+            'trigger', 'reason', 'is_success', 'org_id', 'recipients'
         ]
         fields = read_only_fields + ['plan']
diff --git a/apps/ops/ansible/inventory.py b/apps/ops/ansible/inventory.py
index 4f108c13b..01cdbd87d 100644
--- a/apps/ops/ansible/inventory.py
+++ b/apps/ops/ansible/inventory.py
@@ -54,7 +54,7 @@ class JMSInventory:
         if gateway.private_key:
             proxy_command_list.append("-i {}".format(gateway.private_key_path))
 
-        proxy_command = "'-o ProxyCommand={}'".format(
+        proxy_command = '-o ProxyCommand=\"{}\"'.format(
             " ".join(proxy_command_list)
         )
         return {"ansible_ssh_common_args": proxy_command}