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):auto create project (#20104)

Browse Source
This commit is contained in:
屈轩
2024-04-22 19:26:57 +08:00
committed by GitHub
parent 9b13891c13
commit 3ffea07d31
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/external_projects.go
+26 -24
View File
@@ -402,36 +402,37 @@ func (self *SExternalProject) SyncWithCloudProject(ctx context.Context, userCred
}
pm, _ := account.GetProjectMapping()
if pm != nil && pm.Enabled.IsTrue() && pm.IsNeedProjectSync() && self.ProjectSrc != string(apis.OWNER_SOURCE_LOCAL) {
extTags, err := ext.GetTags()
if err != nil {
return errors.Wrapf(err, "extModel.GetTags")
}
if self.ProjectSrc != string(apis.OWNER_SOURCE_LOCAL) {
find := false
if pm.Rules != nil {
for _, rule := range *pm.Rules {
var newProj string
var isMatch bool
domainId, projectId, newProj, isMatch = rule.IsMatchTags(extTags)
if isMatch && len(newProj) > 0 {
domainId, projectId, err = account.getOrCreateTenant(ctx, newProj, "", "", "auto create from tag")
if err != nil {
log.Errorf("getOrCreateTenant(%s) error: %v", newProj, err)
continue
if pm != nil && pm.Enabled.IsTrue() && pm.IsNeedProjectSync() {
extTags, err := ext.GetTags()
if err != nil {
return errors.Wrapf(err, "extModel.GetTags")
}
if pm.Rules != nil {
for _, rule := range *pm.Rules {
var newProj string
var isMatch bool
domainId, projectId, newProj, isMatch = rule.IsMatchTags(extTags)
if isMatch && len(newProj) > 0 {
domainId, projectId, err = account.getOrCreateTenant(ctx, newProj, "", "", "auto create from tag")
if err != nil {
log.Errorf("getOrCreateTenant(%s) error: %v", newProj, err)
continue
}
find = true
break
}
find = true
break
}
}
}
if !find {
if !find && account.AutoCreateProject {
domainId, projectId = account.DomainId, account.ProjectId
if account.AutoCreateProject {
desc := fmt.Sprintf("auto create from cloud project %s (%s)", self.Name, self.ExternalId)
domainId, projectId, err = account.getOrCreateTenant(ctx, self.Name, self.DomainId, "", desc)
if err != nil {
return errors.Wrapf(err, "getOrCreateTenant")
}
desc := fmt.Sprintf("auto create from cloud project %s (%s)", self.Name, self.ExternalId)
var err error
domainId, projectId, err = account.getOrCreateTenant(ctx, self.Name, self.DomainId, "", desc)
if err != nil {
return errors.Wrapf(err, "getOrCreateTenant")
}
}
}
@@ -552,6 +553,7 @@ func (manager *SExternalProjectManager) newFromCloudProject(ctx context.Context,
project.DomainId = account.DomainId
project.ProjectId = account.ProjectId
project.ExternalDomainId = extProject.GetDomainId()
project.ProjectSrc = string(apis.OWNER_SOURCE_CLOUD)
providers := account.GetCloudproviders()
providerMaps := map[string]string{}