mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-24 16:03:43 +08:00
fix(region): add project tag short desc
This commit is contained in:
@@ -692,6 +692,17 @@ func IsMetadataKeySystemAdmin(key string) bool {
|
||||
return strings.HasPrefix(key, SYSTEM_ADMIN_PREFIX)
|
||||
}
|
||||
|
||||
func IsMetadataKeyPrivateKey(key string) bool {
|
||||
for _, k := range []string{"admin", "project"} {
|
||||
for _, v := range []string{"ssh-private-key", "ssh-public-key"} {
|
||||
if key == fmt.Sprintf("%s-%s", k, v) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return strings.HasPrefix(key, SYSTEM_ADMIN_PREFIX)
|
||||
}
|
||||
|
||||
func IsMetadataKeySysTag(key string) bool {
|
||||
return strings.HasPrefix(key, SYS_TAG_PREFIX)
|
||||
}
|
||||
@@ -701,7 +712,7 @@ func (manager *SMetadataManager) GetSysadminKey(key string) string {
|
||||
}
|
||||
|
||||
func IsMetadataKeyVisiable(key string) bool {
|
||||
return !(IsMetadataKeySysTag(key) || IsMetadataKeySystemAdmin(key))
|
||||
return !(IsMetadataKeySysTag(key) || IsMetadataKeySystemAdmin(key) || IsMetadataKeyPrivateKey(key))
|
||||
}
|
||||
|
||||
func GetVisiableMetadata(ctx context.Context, model IStandaloneModel, userCred mcclient.TokenCredential) (map[string]string, error) {
|
||||
|
||||
@@ -608,6 +608,8 @@ func (model *SVirtualResourceBase) GetShortDesc(ctx context.Context) *jsonutils.
|
||||
tc, _ := TenantCacheManager.FetchTenantById(ctx, model.ProjectId)
|
||||
if tc != nil {
|
||||
desc.Add(jsonutils.NewString(tc.GetName()), "owner_tenant")
|
||||
metadata, _ := GetVisiableMetadata(ctx, tc, nil)
|
||||
desc.Set("project_tags", jsonutils.Marshal(metadata))
|
||||
}
|
||||
return desc
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user