From c5e8856b42e63e6d61b31433b53b3613964103ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 24 Nov 2023 22:18:00 +0800 Subject: [PATCH] fix(region): trim metadata key (#18775) --- pkg/cloudcommon/db/metadata.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/cloudcommon/db/metadata.go b/pkg/cloudcommon/db/metadata.go index 10d4af9469..6e1ffcc510 100644 --- a/pkg/cloudcommon/db/metadata.go +++ b/pkg/cloudcommon/db/metadata.go @@ -544,6 +544,7 @@ func (manager *SMetadataManager) rawSetValues(ctx context.Context, objType strin keys := make([]string, 0, len(store)) changes := make([]sMetadataChange, 0) for key, value := range store { + key = strings.TrimSpace(key) keys = append(keys, key) record := SMetadata{} @@ -708,7 +709,7 @@ func (manager *SMetadataManager) rawGetAll(objType, objId string, keys []string, ret := make(map[string]string) for _, rec := range records { if len(rec.Value) > 0 || strings.HasPrefix(rec.Key, USER_TAG_PREFIX) || strings.HasPrefix(rec.Key, CLOUD_TAG_PREFIX) { - ret[rec.Key] = rec.Value + ret[strings.TrimSpace(rec.Key)] = rec.Value } } return ret, nil @@ -771,7 +772,7 @@ func metaList2Map(manager IMetadataBaseModelManager, userCred mcclient.TokenCred hiddenKeys := manager.GetMetadataHiddenKeys() for _, meta := range metaList { if IsMetadataKeyVisible(meta.Key) && !utils.IsInStringArray(meta.Key, hiddenKeys) { - metaMap[meta.Key] = meta.Value + metaMap[strings.TrimSpace(meta.Key)] = meta.Value } }