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

fix(region): sync max priority project tag (#19736)

Browse Source
This commit is contained in:
屈轩
2024-03-15 19:10:30 +08:00
committed by GitHub
parent fa6d12d7be
commit 9a5df8760d
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/external_projects.go
+21 -7
View File
@@ -366,6 +366,15 @@ func (self *SExternalProject) GetProjectCount() (int, error) {
return ExternalProjectManager.Query().Equals("tenant_id", self.ProjectId).CountWithError()
}
func (self *SExternalProject) IsMaxPriority() bool {
project := &SExternalProject{}
err := ExternalProjectManager.Query().Equals("tenant_id", self.ProjectId).Equals("cloudaccount_id", self.CloudaccountId).Desc("priority").First(project)
if err != nil {
return false
}
return project.Priority == self.Priority
}
func (self *SExternalProject) SyncWithCloudProject(ctx context.Context, userCred mcclient.TokenCredential, account *SCloudaccount, ext cloudprovider.ICloudProject) error {
s := auth.GetAdminSession(ctx, consts.GetRegion())
providers := account.GetCloudproviders()
@@ -472,10 +481,13 @@ func (self *SExternalProject) SyncWithCloudProject(ctx context.Context, userCred
return errors.Wrapf(err, "db.UpdateWithLock")
}
tags, _ := ext.GetTags()
if len(tags) > 0 {
identity.Projects.PerformAction(s, self.ProjectId, "user-metadata", jsonutils.Marshal(tags))
if self.IsMaxPriority() {
tags, _ := ext.GetTags()
if len(tags) > 0 {
identity.Projects.PerformAction(s, self.ProjectId, "user-metadata", jsonutils.Marshal(tags))
}
}
syncMetadata(ctx, userCred, self, ext, account.ReadOnly)
db.OpsLog.LogSyncUpdate(self, diff, userCred)
return nil
@@ -613,10 +625,12 @@ func (manager *SExternalProjectManager) newFromCloudProject(ctx context.Context,
return nil, errors.Wrapf(err, "Insert")
}
tags, _ := extProject.GetTags()
if len(tags) > 0 {
s := auth.GetAdminSession(ctx, consts.GetRegion())
identity.Projects.PerformAction(s, project.ProjectId, "user-metadata", jsonutils.Marshal(tags))
if project.IsMaxPriority() {
tags, _ := extProject.GetTags()
if len(tags) > 0 {
s := auth.GetAdminSession(ctx, consts.GetRegion())
identity.Projects.PerformAction(s, project.ProjectId, "user-metadata", jsonutils.Marshal(tags))
}
}
syncMetadata(ctx, userCred, &project, extProject, account.ReadOnly)