Skip to content

fix: [gen_perms_apply_data]拓扑资源需考虑system id #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 9, 2023
Merged

fix: [gen_perms_apply_data]拓扑资源需考虑system id #87

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a98f1a
fix: [gen_perms_apply_data]拓扑资源需考虑system id
iSecloud Oct 27, 2023
e6c9301
fix: 资源反向拉取增加ancestors过滤字段
iSecloud Nov 9, 2023
bcd71d4
fix: 补充资源反向拉取单元测试 & 存量单元测试修复
iSecloud Nov 9, 2023
c88db1a
fix: 更新 release 信息及版本号
iSecloud Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions iam/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,12 @@ def gen_perms_apply_data(system, subject, action_to_resources_list):
# NOTE: old _bk_iam_path_ is like /set,1/host,2/
# while the new _bk_iam_path_ is like /bk_cmdb,set,1/bk_cmdb,host,2/
node_parts = part.split(",")
rtype, rid = "", ""
# NOTE: topo resources should be considered to belong to different systems
rsystem, rtype, rid = system_id, "", ""
if len(node_parts) == 2:
rtype, rid = node_parts[0], node_parts[1]
elif len(node_parts) == 3:
rtype, rid = node_parts[1], node_parts[2]
rsystem, rtype, rid = node_parts[0], node_parts[1], node_parts[2]
# NOTE: currently, keep the name of /bk_cmdb,set,1/ same as /set,1/
part = ",".join(node_parts[1:])
else:
Expand All @@ -99,7 +100,7 @@ def gen_perms_apply_data(system, subject, action_to_resources_list):
inst_item.append(
{
"type": rtype,
"type_name": meta.get_resource_name(system_id, rtype),
"type_name": meta.get_resource_name(rsystem, rtype),
"id": rid,
"name": part,
}
Expand Down