From 85b6ad8a345878db5f76d180d825df7c018e81ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 7 Feb 2024 11:04:29 +0800 Subject: [PATCH] fix(region): trim tag space (#19467) --- pkg/compute/models/syncutils.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/compute/models/syncutils.go b/pkg/compute/models/syncutils.go index 2b54e1dabd..3b0b781cae 100644 --- a/pkg/compute/models/syncutils.go +++ b/pkg/compute/models/syncutils.go @@ -16,6 +16,7 @@ package models import ( "context" + "strings" "yunion.io/x/cloudmux/pkg/cloudprovider" "yunion.io/x/log" @@ -43,6 +44,8 @@ func syncMetadata(ctx context.Context, userCred mcclient.TokenCredential, model sysTags := remote.GetSysTags() sysStore := make(map[string]string, 0) for key, value := range sysTags { + key = strings.TrimSpace(key) + value = strings.TrimSpace(value) sysStore[db.SYS_CLOUD_TAG_PREFIX+key] = value } if options.Options.KeepTagLocalization { @@ -54,6 +57,8 @@ func syncMetadata(ctx context.Context, userCred mcclient.TokenCredential, model if err == nil { store := make(map[string]string, 0) for key, value := range tags { + key = strings.TrimSpace(key) + value = strings.TrimSpace(value) store[db.CLOUD_TAG_PREFIX+key] = value } model.SetCloudMetadataAll(ctx, store, userCred, readOnly) @@ -65,6 +70,8 @@ func syncVirtualResourceMetadata(ctx context.Context, userCred mcclient.TokenCre sysTags := remote.GetSysTags() sysStore := make(map[string]string, 0) for key, value := range sysTags { + key = strings.TrimSpace(key) + value = strings.TrimSpace(value) if key == apis.IS_SYSTEM && value == "true" { model.SetSystemInfo(true) } @@ -89,6 +96,8 @@ func syncVirtualResourceMetadata(ctx context.Context, userCred mcclient.TokenCre if err == nil { store := make(map[string]string, 0) for key, value := range tags { + key = strings.TrimSpace(key) + value = strings.TrimSpace(value) store[db.CLOUD_TAG_PREFIX+key] = value } model.SetCloudMetadataAll(ctx, store, userCred, readOnly)