From d7a793b4c45523357fa7578c818b0f186b03cb19 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Thu, 15 Dec 2022 18:47:54 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9k8s=20tree?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/utils/k8s.py | 1 - apps/perms/api/user_permission/tree/node_with_asset.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/assets/utils/k8s.py b/apps/assets/utils/k8s.py index 7b287d740..2f66bf049 100644 --- a/apps/assets/utils/k8s.py +++ b/apps/assets/utils/k8s.py @@ -10,7 +10,6 @@ from kubernetes.client.exceptions import ApiException from rest_framework.generics import get_object_or_404 from common.utils import get_logger -from common.tree import TreeNode from assets.models import Account, Asset from ..const import CloudTypes, Category diff --git a/apps/perms/api/user_permission/tree/node_with_asset.py b/apps/perms/api/user_permission/tree/node_with_asset.py index 98b7cd261..e4d442b53 100644 --- a/apps/perms/api/user_permission/tree/node_with_asset.py +++ b/apps/perms/api/user_permission/tree/node_with_asset.py @@ -160,7 +160,7 @@ class UserGrantedK8sAsTreeApi( asset_id = parent_info.get('asset_id') asset_id = tree_id if not asset_id else asset_id - if tree_id and not account_username: + if tree_id and not key and not account_username: asset = self.asset(asset_id) accounts = self.get_accounts(asset) asset_node = KubernetesTree(tree_id).as_asset_tree_node(asset) @@ -170,6 +170,6 @@ class UserGrantedK8sAsTreeApi( account, parent_info, ) tree.append(account_node) - else: + elif key and account_username: tree = KubernetesTree(key).async_tree_node(parent_info) return Response(data=tree)