opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(keystone): avoid remove project metadata when join organization node (#21763)

Browse Source
This commit is contained in:
屈轩
2024-12-07 20:58:45 +08:00
committed by GitHub
parent 93c06cf715
commit 64652c4656
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/standalone_anon.go
+15 -14
View File
@@ -365,20 +365,21 @@ func (model *SStandaloneAnonResourceBase) SetOrganizationMetadataAll(ctx context
return errors.Wrap(err, "SetAllOrganization")
}
}
{
userTags := make(map[string]interface{})
for k, _ := range meta {
if strings.HasPrefix(k, ORGANIZATION_TAG_PREFIX) {
k = k[len(ORGANIZATION_TAG_PREFIX):]
}
k = USER_TAG_PREFIX + k
userTags[k] = "none"
}
err := Metadata.SetValuesWithLog(ctx, model, userTags, userCred)
if err != nil {
return errors.Wrap(err, "SetValuesWithLog userTags")
}
}
// 避免加入组织架构后，项目所在的层级会移除此项目
//{
// userTags := make(map[string]interface{})
// for k, _ := range meta {
// if strings.HasPrefix(k, ORGANIZATION_TAG_PREFIX) {
// k = k[len(ORGANIZATION_TAG_PREFIX):]
// }
// k = USER_TAG_PREFIX + k
// userTags[k] = "none"
// }
// err := Metadata.SetValuesWithLog(ctx, model, userTags, userCred)
// if err != nil {
// return errors.Wrap(err, "SetValuesWithLog userTags")
// }
//}
return nil
}