From 921fd1e8fc4970e93dade797c2a00275fc41be0a Mon Sep 17 00:00:00 2001 From: ioito Date: Thu, 2 Dec 2021 17:53:32 +0800 Subject: [PATCH] fix(region): apsara tags sync for project --- pkg/compute/models/external_projects.go | 4 ++-- pkg/multicloud/apsara/organization.go | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/compute/models/external_projects.go b/pkg/compute/models/external_projects.go index 01e471f7d1..5e4729552b 100644 --- a/pkg/compute/models/external_projects.go +++ b/pkg/compute/models/external_projects.go @@ -254,7 +254,7 @@ func (self *SExternalProject) SyncWithCloudProject(ctx context.Context, userCred tags, _ := ext.GetTags() if len(tags) > 0 { - identity.Projects.PerformAction(s, self.ProjectId, "user-metadata", jsonutils.Marshal(tags)) + identity.Projects.PerformAction(s, self.ProjectId, "set-user-metadata", jsonutils.Marshal(tags)) } syncMetadata(ctx, userCred, self, ext) db.OpsLog.LogSyncUpdate(self, diff, userCred) @@ -351,7 +351,7 @@ func (manager *SExternalProjectManager) newFromCloudProject(ctx context.Context, tags, _ := extProject.GetTags() if len(tags) > 0 { s := auth.GetAdminSession(ctx, consts.GetRegion(), "v1") - identity.Projects.PerformAction(s, project.ProjectId, "user-metadata", jsonutils.Marshal(tags)) + identity.Projects.PerformAction(s, project.ProjectId, "set-user-metadata", jsonutils.Marshal(tags)) } syncMetadata(ctx, userCred, &project, extProject) diff --git a/pkg/multicloud/apsara/organization.go b/pkg/multicloud/apsara/organization.go index db2207c7f5..bb7d325b9b 100644 --- a/pkg/multicloud/apsara/organization.go +++ b/pkg/multicloud/apsara/organization.go @@ -176,11 +176,7 @@ func (self *SProject) SetTags(tags map[string]string, replace bool) error { func (self *SProject) GetTags() (map[string]string, error) { ret := map[string]string{} for i, key := range self.Tags { - for j, value := range self.Tags { - if j-i == 1 { - ret[key] = value - } - } + ret[fmt.Sprintf("L%d", i+1)] = key } return ret, nil }