From 29fa7b76e1f5ae0146e84c0fd8f108969dce10ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 28 Aug 2023 14:45:56 +0800 Subject: [PATCH] fix(region): skip resource by tags (#17856) --- pkg/compute/models/hosts.go | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index e1effb73e2..5b60bfa033 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -2451,20 +2451,24 @@ type SGuestSyncResult struct { } func IsNeedSkipSync(ext cloudprovider.ICloudResource) (bool, string) { - if len(options.Options.SkipServerBySysTagKeys) == 0 && len(options.Options.SkipServerBySysTagKeys) == 0 { + if len(options.Options.SkipServerBySysTagKeys) == 0 && len(options.Options.SkipServerByUserTagKeys) == 0 { return false, "" } - keys := strings.Split(options.Options.SkipServerBySysTagKeys, ",") - for key := range ext.GetSysTags() { - if utils.IsInStringArray(key, keys) { - return true, key + if keys := strings.Split(options.Options.SkipServerBySysTagKeys, ","); len(keys) > 0 { + for key := range ext.GetSysTags() { + key = strings.Trim(key, "") + if len(key) > 0 && utils.IsInStringArray(key, keys) { + return true, key + } } } - userKeys := strings.Split(options.Options.SkipServerByUserTagKeys, ",") - tags, _ := ext.GetTags() - for key := range tags { - if utils.IsInStringArray(key, userKeys) { - return true, key + if userKeys := strings.Split(options.Options.SkipServerByUserTagKeys, ","); len(userKeys) > 0 { + tags, _ := ext.GetTags() + for key := range tags { + key = strings.Trim(key, "") + if len(key) > 0 && utils.IsInStringArray(key, userKeys) { + return true, key + } } } return false, ""