opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11932 from ioito/hotfix/qx-nas-tag

Browse Source 
fix(region): empty aliyun resource tag
This commit is contained in:
Zexi Li
2021-08-18 10:06:26 +08:00
committed by GitHub
parent 101a088c68 82b9cdc1ca
commit 8edfb1fa2c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/aliyun/resource_tags.go
+9 -4
View File
@@ -97,7 +97,7 @@ func (self *SRegion) SetResourceTags(serviceType string, resourceType string, re
if err != nil {
return errors.Wrapf(err, "TagResource")
}
if !replace {
if !replace || len(tags) == 0 {
return nil
}
_, _tags, err := self.ListSysAndUserTags(serviceType, resourceType, resId)
@@ -109,7 +109,7 @@ func (self *SRegion) SetResourceTags(serviceType string, resourceType string, re
tagMaps[strings.ToLower(k)] = v
}
keys := []string{}
for k, _ := range _tags {
for k := range _tags {
if _, ok := tagMaps[strings.ToLower(k)]; !ok {
keys = append(keys, k)
}
@@ -140,9 +140,14 @@ func (self *SRegion) TagResource(serviceType string, resourceType string, resour
params[fmt.Sprintf("Tag.%d.Value", i+1)] = v
i++
}
_, err := self.tagRequest(serviceType, "TagResources", params)
action := "TagResources"
if len(tags) == 0 {
action = "UntagResources"
params["All"] = "true"
}
_, err := self.tagRequest(serviceType, action, params)
if err != nil {
return errors.Wrapf(err, "TagResources %s %s", resourceId, params)
return errors.Wrapf(err, "%s %s %s", action, resourceId, params)
}
return nil
}