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 #14037 from swordqiu/hotfix/qj-sync-domain-default-project

Browse Source 
fix: sync IDP domain default project
This commit is contained in:
Zexi Li
2022-04-16 03:37:28 +08:00
committed by GitHub
parent b641b485b6 69418d1a37
commit 543db56d71
1 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/identity_provider.go
+34 -27
View File
@@ -1003,42 +1003,49 @@ func (self *SIdentityProvider) SyncOrCreateDomain(ctx context.Context, extId str
}
}
}
return domain, nil
}
} else {
// otherwise, create the domain
domain = &SDomain{}
domain.SetModelManager(DomainManager, domain)
domain.Id = domainId
domain.Enabled = tristate.True
domain.IsDomain = tristate.True
domain.DomainId = api.KeystoneDomainRoot
domain.Description = fmt.Sprintf("domain for %s", extDesc)
// otherwise, create the domain
domain = &SDomain{}
domain.SetModelManager(DomainManager, domain)
domain.Id = domainId
domain.Enabled = tristate.True
domain.IsDomain = tristate.True
domain.DomainId = api.KeystoneDomainRoot
domain.Description = fmt.Sprintf("domain for %s", extDesc)
err = func() error {
lockman.LockClass(ctx, DomainManager, "name")
defer lockman.ReleaseClass(ctx, DomainManager, "name")
err = func() error {
lockman.LockClass(ctx, DomainManager, "name")
defer lockman.ReleaseClass(ctx, DomainManager, "name")
newName, err := db.GenerateName(ctx, DomainManager, nil, extName)
if err != nil {
return errors.Wrap(err, "GenerateName")
}
domain.Name = newName
newName, err := db.GenerateName(ctx, DomainManager, nil, extName)
return DomainManager.TableSpec().Insert(ctx, domain)
}()
if err != nil {
return errors.Wrap(err, "GenerateName")
return nil, errors.Wrap(err, "insert")
}
domain.Name = newName
return DomainManager.TableSpec().Insert(ctx, domain)
}()
if err != nil {
return nil, errors.Wrap(err, "insert")
}
if self.AutoCreateProject.IsTrue() && consts.GetNonDefaultDomainProjects() && createDefaultProject {
_, err := ProjectManager.NewProject(ctx,
fmt.Sprintf("%s_default_project", extName),
fmt.Sprintf("Default project for domain %s", extName),
domain.Id,
)
// check existence
projCnt, err := domain.GetProjectCount()
if err != nil {
log.Errorf("ProjectManager.NewProject fail %s", err)
return nil, errors.Wrap(err, "get domain project count")
}
if projCnt == 0 {
// not exist, to create
_, err := ProjectManager.NewProject(ctx,
fmt.Sprintf("%s_default_project", extName),
fmt.Sprintf("Default project for domain %s", extName),
domain.Id,
)
if err != nil {
log.Errorf("ProjectManager.NewProject fail %s", err)
}
}
}