fix(backend): 修改客户端克隆集群类型bug TencentBlueKing#8437

ymakedaq · Dec 5, 2024 · b04c4e4 · b04c4e4
1 parent f7ea25d
commit b04c4e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/dbm-ui/backend/db_monitor/management/commands/update_collect.py b/dbm-ui/backend/db_monitor/management/commands/update_collect.py
@@ -12,6 +12,7 @@
 
 from django.core.management.base import BaseCommand
 
+from backend.configuration.constants import DBType
 from backend.db_monitor.models import CollectInstance
 
 logger = logging.getLogger("root")
@@ -25,7 +26,7 @@ def add_arguments(self, parser):
         parser.add_argument(
             "-d",
             "--dbtype",
-            choices=["mysql", "redis", "es", "hdfs", "kafka", "pulsar", "influxdb", "all"],
+            choices=[*DBType.get_values(), "all"],
             type=str,
             help="db类型",
         )

diff --git a/dbm-ui/backend/ticket/builders/mysql/mysql_clone_rules.py b/dbm-ui/backend/ticket/builders/mysql/mysql_clone_rules.py
@@ -14,7 +14,6 @@
 from rest_framework import serializers
 
 from backend import env
-from backend.db_meta.enums import ClusterType
 from backend.db_services.mysql.permission.constants import CloneClusterType, CloneType
 from backend.db_services.mysql.permission.exceptions import CloneDataHasExpiredException, DBPermissionBaseException
 from backend.flow.engine.controller.mysql import MySQLController
@@ -42,7 +41,7 @@ class MySQLCloneRulesSerializer(SkipToRepresentationMixin, serializers.Serialize
     clone_uid = serializers.CharField(help_text=_("权限克隆数据缓存uid"), required=False)
     clone_type = serializers.ChoiceField(help_text=_("权限克隆类型"), choices=CloneType.get_choices())
     clone_cluster_type = serializers.ChoiceField(
-        help_text=_("克隆集群类型"), choices=ClusterType.get_choices(), required=False, default=CloneClusterType.MYSQL
+        help_text=_("克隆集群类型"), choices=CloneClusterType.get_choices(), required=False, default=CloneClusterType.MYSQL
     )
 
 

diff --git a/dbm-ui/backend/ticket/builders/tendbcluster/tendb_clone_rules.py b/dbm-ui/backend/ticket/builders/tendbcluster/tendb_clone_rules.py
@@ -13,7 +13,6 @@
 from rest_framework import serializers
 
 from backend.configuration.constants import DBType
-from backend.db_meta.enums import ClusterType
 from backend.db_services.mysql.permission.constants import CloneClusterType
 from backend.ticket import builders
 from backend.ticket.builders.mysql.mysql_clone_rules import (
@@ -26,7 +25,10 @@
 
 class TendbClusterCloneRulesSerializer(MySQLCloneRulesSerializer):
     clone_cluster_type = serializers.ChoiceField(
-        help_text=_("克隆集群类型"), choices=ClusterType.get_choices(), required=False, default=CloneClusterType.TendbCluster
+        help_text=_("集群类型"),
+        choices=CloneClusterType.get_choices(),
+        required=False,
+        default=CloneClusterType.TendbCluster,
     )