From 499f4624b4a8eae289db76fd559b5a781408d433 Mon Sep 17 00:00:00 2001
From: lvyangyang <lvyangyang@yunion.cn>
Date: Tue, 5 Jan 2021 14:26:18 +0800
Subject: [PATCH] fix(region): replace cloud tags

---
 pkg/compute/models/buckets.go                | 2 +-
 pkg/compute/models/dbinstances.go            | 2 +-
 pkg/compute/models/elasticcache_instances.go | 2 +-
 pkg/compute/models/guests.go                 | 2 +-
 pkg/compute/models/loadbalancers.go          | 2 +-
 pkg/multicloud/aws/instance.go               | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/compute/models/buckets.go b/pkg/compute/models/buckets.go
index 8baab8ed0e..528dd14f44 100644
--- a/pkg/compute/models/buckets.go
+++ b/pkg/compute/models/buckets.go
@@ -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
diff --git a/pkg/compute/models/dbinstances.go b/pkg/compute/models/dbinstances.go
index c511c552a7..8cd18f3c37 100644
--- a/pkg/compute/models/dbinstances.go
+++ b/pkg/compute/models/dbinstances.go
@@ -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)
 	}
diff --git a/pkg/compute/models/elasticcache_instances.go b/pkg/compute/models/elasticcache_instances.go
index f22330cfd7..e3bd4b15af 100644
--- a/pkg/compute/models/elasticcache_instances.go
+++ b/pkg/compute/models/elasticcache_instances.go
@@ -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)
 	}
diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go
index 50840f760d..b3afdb3959 100644
--- a/pkg/compute/models/guests.go
+++ b/pkg/compute/models/guests.go
@@ -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)
 	}
diff --git a/pkg/compute/models/loadbalancers.go b/pkg/compute/models/loadbalancers.go
index d0ffc29694..4a631b516c 100644
--- a/pkg/compute/models/loadbalancers.go
+++ b/pkg/compute/models/loadbalancers.go
@@ -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)
 	}
diff --git a/pkg/multicloud/aws/instance.go b/pkg/multicloud/aws/instance.go
index fa69195895..21de470188 100644
--- a/pkg/multicloud/aws/instance.go
+++ b/pkg/multicloud/aws/instance.go
@@ -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())