opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9761 from lvyangyang/automated-cherry-pick-of-#9760-upstream-release-3.7

Browse Source 
Automated cherry pick of #9760: fix(region): replace cloud tags
This commit is contained in:
Zexi Li
2021-01-05 18:31:24 +08:00
committed by GitHub
parent 857c9f2278 499f4624b4
commit 0e272e57d2
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/buckets.go
+1 -1
View File
@@ -1875,7 +1875,7 @@ func (bucket *SBucket) OnMetadataUpdated(ctx context.Context, userCred mcclient.
return
}
tags, _ := bucket.GetAllUserMetadata()
err = cloudprovider.SetBucketMetadata(iBucket, tags, false)
err = cloudprovider.SetBucketMetadata(iBucket, tags, true)
if err != nil {
log.Errorf("iBucket.SetMetadata failed: %s", err)
return
pkg/compute/models/dbinstances.go
+1 -1
View File
@@ -2052,7 +2052,7 @@ func (self *SDBInstance) OnMetadataUpdated(ctx context.Context, userCred mcclien
if len(self.ExternalId) == 0 {
return
}
err := self.StartRemoteUpdateTask(ctx, userCred, false, "")
err := self.StartRemoteUpdateTask(ctx, userCred, true, "")
if err != nil {
log.Errorf("StartRemoteUpdateTask fail: %s", err)
}
pkg/compute/models/elasticcache_instances.go
+1 -1
View File
@@ -1925,7 +1925,7 @@ func (self *SElasticcache) OnMetadataUpdated(ctx context.Context, userCred mccli
if len(self.ExternalId) == 0 {
return
}
err := self.StartRemoteUpdateTask(ctx, userCred, false, "")
err := self.StartRemoteUpdateTask(ctx, userCred, true, "")
if err != nil {
log.Errorf("StartRemoteUpdateTask fail: %s", err)
}
pkg/compute/models/guests.go
+1 -1
View File
@@ -5701,7 +5701,7 @@ func (guest *SGuest) StartRemoteUpdateTask(ctx context.Context, userCred mcclien
}
func (guest *SGuest) OnMetadataUpdated(ctx context.Context, userCred mcclient.TokenCredential) {
err := guest.StartRemoteUpdateTask(ctx, userCred, false, "")
err := guest.StartRemoteUpdateTask(ctx, userCred, true, "")
if err != nil {
log.Errorf("StartRemoteUpdateTask fail: %s", err)
}
pkg/compute/models/loadbalancers.go
+1 -1
View File
@@ -1397,7 +1397,7 @@ func (self *SLoadbalancer) OnMetadataUpdated(ctx context.Context, userCred mccli
if len(self.ExternalId) == 0 {
return
}
err := self.StartRemoteUpdateTask(ctx, userCred, false, "")
err := self.StartRemoteUpdateTask(ctx, userCred, true, "")
if err != nil {
log.Errorf("StartRemoteUpdateTask fail: %s", err)
}
pkg/multicloud/aws/instance.go
+2 -2
View File
@@ -1205,7 +1205,6 @@ func (self *SInstance) GetError() error {
}
func (self *SInstance) SetTags(tags map[string]string, replace bool) error {
delete(tags, "Name")
oldTagsJson, err := FetchTags(self.host.zone.region.ec2Client, self.InstanceId)
if err != nil {
return errors.Wrapf(err, "FetchTags(self.host.zone.region.ec2Client, %s)", self.InstanceId)
@@ -1232,7 +1231,7 @@ func (self *SInstance) SetTags(tags map[string]string, replace bool) error {
if replace {
for k := range oldTags {
if _, ok := tags[k]; !ok {
if !strings.HasPrefix(k, "aws:") {
if !strings.HasPrefix(k, "aws:") && k != "Name" {
delTags = append(delTags, k)
}
}
@@ -1243,6 +1242,7 @@ func (self *SInstance) SetTags(tags map[string]string, replace bool) error {
if err != nil {
return errors.Wrapf(err, "self.host.zone.region.UntagResources([]string{%s}, %s)", Arn, jsonutils.Marshal(delTags).String())
}
delete(addTags, "Name")
err = self.host.zone.region.TagResources([]string{Arn}, addTags)
if err != nil {
return errors.Wrapf(err, "self.host.zone.region.TagResources([]string{%s}, %s)", Arn, jsonutils.Marshal(addTags).String())