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 #15625 from ioito/hotfix/qx-external-project-sync

Browse Source 
fix(region): external project sync
This commit is contained in:
Zexi Li
2022-12-27 21:00:38 +08:00
committed by GitHub
parent 62fc725643 a7e545f322
commit dffc10a99e
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/external_projects.go
+12
View File
@@ -400,6 +400,7 @@ func (manager *SExternalProjectManager) newFromCloudProject(ctx context.Context,
if err != nil {
return nil, errors.Wrapf(err, "extModel.GetTags")
}
find := false
if pm.Rules != nil {
for _, rule := range *pm.Rules {
domainId, projectId, newProj, isMatch := rule.IsMatchTags(extTags)
@@ -412,11 +413,22 @@ func (manager *SExternalProjectManager) newFromCloudProject(ctx context.Context,
if len(domainId) > 0 && len(projectId) > 0 {
project.DomainId = domainId
project.ProjectId = projectId
find = true
break
}
}
}
}
if !find && account.AutoCreateProject {
desc := fmt.Sprintf("auto create from cloud project %s (%s)", project.Name, project.ExternalId)
domainId, projectId, err := account.getOrCreateTenant(ctx, project.Name, project.DomainId, "", desc)
if err != nil {
log.Errorf("failed to get or create tenant %s(%s) %v", project.Name, project.ExternalId, err)
} else {
project.DomainId = domainId
project.ProjectId = projectId
}
}
} else if account.AutoCreateProject {
desc := fmt.Sprintf("auto create from cloud project %s (%s)", project.Name, project.ExternalId)
domainId, projectId, err := account.getOrCreateTenant(ctx, project.Name, project.DomainId, "", desc)