extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-07 08:44:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

simpified CanCreateEnvironment that just uses the resource class from the user limits (#606)

Browse Source
This commit is contained in:
Michael Quigley 2024-06-06 14:00:49 -04:00
parent bee5356e3c
commit eb02e68db8
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
1 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
controller/limits/agent.go
View File

@ -57,42 +57,12 @@ func (a *Agent) CanCreateEnvironment(acctId int, trx *sqlx.Tx) (bool, error) {
return false, err
}
alcs, err := a.str.FindAppliedLimitClassesForAccount(acctId, trx)
ul, err := a.getUserLimits(acctId, trx)
if err != nil {
return false, err
}
maxEnvironments := a.cfg.Environments
var lcId *int
for _, alc := range alcs {
if alc.ShareMode == nil && alc.BackendMode == nil && alc.Environments > maxEnvironments {
maxEnvironments = alc.Environments
lcId = &alc.Id
}
}
if lcId == nil {
if empty, err := a.str.IsBandwidthLimitJournalEmptyForGlobal(acctId, trx); err == nil && !empty {
lj, err := a.str.FindLatestBandwidthLimitJournalForGlobal(acctId, trx)
if err != nil {
return false, err
}
if lj.Action == store.LimitLimitAction {
return false, nil
}
}
} else {
if empty, err := a.str.IsBandwidthLimitJournalEmptyForLimitClass(acctId, *lcId, trx); err == nil && !empty {
lj, err := a.str.FindLatestBandwidthLimitJournalForLimitClass(acctId, *lcId, trx)
if err != nil {
return false, err
}
if lj.Action == store.LimitLimitAction {
return false, nil
}
}
}
if maxEnvironments > store.Unlimited {
if ul.resource.GetEnvironments() > store.Unlimited {
envs, err := a.str.FindEnvironmentsForAccount(acctId, trx)
if err != nil {
return false, err