bugfix: 自定义业务拓扑场景下新建策略报错 (closed #1010)

apps/iam/handlers/resources.py

@@ -45,7 +45,7 @@ def to_json(cls):
         }
 
     @classmethod
-    def create_simple_instance(cls, instance_id: str, attribute=None) -> Resource:
+    def create_simple_instance(cls, instance_id: int, attribute=None) -> Resource:
         """
         创建简单资源实例
         :param instance_id: 实例ID
@@ -84,7 +84,7 @@ class Business(ResourceMeta):
     related_instance_selections = [{"system_id": system_id, "id": "business", "ignore_iam_path": True}]
 
     @classmethod
-    def create_instance(cls, instance_id: str, attribute=None) -> Resource:
+    def create_instance(cls, instance_id: int, attribute=None) -> Resource:
         resource = cls.create_simple_instance(instance_id, attribute)
 
         bk_biz_name = str(instance_id)

apps/node_man/tools/host_v2.py

@@ -18,7 +18,6 @@
 from apps.backend.constants import InstNodeType
 from apps.node_man import constants, models
 from apps.node_man.handlers.cmdb import CmdbHandler
-from apps.utils.local import get_request
 
 
 class HostV2Tools:
@@ -66,11 +65,7 @@ def fetch_set_ids(bk_biz_id: int, target_inst_id: int, action: Optional[str] = N
         :param action: iam action type
         :return: 集群ID列表
         """
-        params = {"bk_biz_id": bk_biz_id, "is_superuser": get_request().user.is_superuser, "with_biz_node": True}
-        if action:
-            params.update({"action": action})
-
-        biz_topo = CmdbHandler().fetch_topo(**params)
+        biz_topo = CmdbHandler().fetch_topo(bk_biz_id=bk_biz_id, with_biz_node=True)
         stack = [biz_topo]
         target_node = None
 

dev_log/2.2.22/xcwang_202208221738.yaml

@@ -0,0 +1,3 @@
+---
+bugfix:
+  - "自定义业务拓扑场景下新建策略报错 (closed #1010)"