mirror of
https://github.com/openziti/zrok.git
synced 2024-11-28 19:14:07 +01:00
Merge pull request #668 from openziti/limit_classes_label
Limit Class Label (#666)
This commit is contained in:
commit
941b2964fe
@ -38,6 +38,7 @@ type BandwidthClass interface {
|
|||||||
|
|
||||||
type LimitClass struct {
|
type LimitClass struct {
|
||||||
Model
|
Model
|
||||||
|
Label *string
|
||||||
BackendMode *sdk.BackendMode
|
BackendMode *sdk.BackendMode
|
||||||
Environments int
|
Environments int
|
||||||
Shares int
|
Shares int
|
||||||
@ -111,7 +112,12 @@ func (lc LimitClass) GetLimitAction() LimitAction {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (lc LimitClass) String() string {
|
func (lc LimitClass) String() string {
|
||||||
out := fmt.Sprintf("LimitClass<#%d", lc.Id)
|
out := "LimitClass<"
|
||||||
|
if lc.Label != nil && *lc.Label != "" {
|
||||||
|
out += "'" + *lc.Label + "'"
|
||||||
|
} else {
|
||||||
|
out += fmt.Sprintf("#%d", lc.Id)
|
||||||
|
}
|
||||||
if lc.BackendMode != nil {
|
if lc.BackendMode != nil {
|
||||||
out += fmt.Sprintf(", backendMode: '%s'", *lc.BackendMode)
|
out += fmt.Sprintf(", backendMode: '%s'", *lc.BackendMode)
|
||||||
}
|
}
|
||||||
@ -149,12 +155,12 @@ func (lc LimitClass) String() string {
|
|||||||
var _ BandwidthClass = (*LimitClass)(nil)
|
var _ BandwidthClass = (*LimitClass)(nil)
|
||||||
|
|
||||||
func (str *Store) CreateLimitClass(lc *LimitClass, trx *sqlx.Tx) (int, error) {
|
func (str *Store) CreateLimitClass(lc *LimitClass, trx *sqlx.Tx) (int, error) {
|
||||||
stmt, err := trx.Prepare("insert into limit_classes (backend_mode, environments, shares, reserved_shares, unique_names, share_frontends, period_minutes, rx_bytes, tx_bytes, total_bytes, limit_action) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) returning id")
|
stmt, err := trx.Prepare("insert into limit_classes (label, backend_mode, environments, shares, reserved_shares, unique_names, share_frontends, period_minutes, rx_bytes, tx_bytes, total_bytes, limit_action) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) returning id")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, errors.Wrap(err, "error preparing limit_classes insert statement")
|
return 0, errors.Wrap(err, "error preparing limit_classes insert statement")
|
||||||
}
|
}
|
||||||
var id int
|
var id int
|
||||||
if err := stmt.QueryRow(lc.BackendMode, lc.Environments, lc.Shares, lc.ReservedShares, lc.UniqueNames, lc.ShareFrontends, lc.PeriodMinutes, lc.RxBytes, lc.TxBytes, lc.TotalBytes, lc.LimitAction).Scan(&id); err != nil {
|
if err := stmt.QueryRow(lc.Label, lc.BackendMode, lc.Environments, lc.Shares, lc.ReservedShares, lc.UniqueNames, lc.ShareFrontends, lc.PeriodMinutes, lc.RxBytes, lc.TxBytes, lc.TotalBytes, lc.LimitAction).Scan(&id); err != nil {
|
||||||
return 0, errors.Wrap(err, "error executing limit_classes insert statement")
|
return 0, errors.Wrap(err, "error executing limit_classes insert statement")
|
||||||
}
|
}
|
||||||
return id, nil
|
return id, nil
|
||||||
|
@ -7,14 +7,6 @@ const (
|
|||||||
WarningLimitAction LimitAction = "warning"
|
WarningLimitAction LimitAction = "warning"
|
||||||
)
|
)
|
||||||
|
|
||||||
type LimitScope string
|
|
||||||
|
|
||||||
const (
|
|
||||||
AccountLimitScope LimitScope = "account"
|
|
||||||
EnvironmentLimitScope LimitScope = "environment"
|
|
||||||
ShareLimitScope LimitScope = "share"
|
|
||||||
)
|
|
||||||
|
|
||||||
type PermissionMode string
|
type PermissionMode string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -0,0 +1,3 @@
|
|||||||
|
-- +migrate Up
|
||||||
|
|
||||||
|
alter table limit_classes add column label varchar(32);
|
@ -0,0 +1,3 @@
|
|||||||
|
-- +migrate Up
|
||||||
|
|
||||||
|
alter table limit_classes add column label varchar(32);
|
@ -92,6 +92,7 @@ Limit classes are created by creating a record in the `limit_classes` table in t
|
|||||||
```sql
|
```sql
|
||||||
CREATE TABLE public.limit_classes (
|
CREATE TABLE public.limit_classes (
|
||||||
id integer NOT NULL,
|
id integer NOT NULL,
|
||||||
|
label VARCHAR(32),
|
||||||
backend_mode public.backend_mode,
|
backend_mode public.backend_mode,
|
||||||
environments integer DEFAULT '-1'::integer NOT NULL,
|
environments integer DEFAULT '-1'::integer NOT NULL,
|
||||||
shares integer DEFAULT '-1'::integer NOT NULL,
|
shares integer DEFAULT '-1'::integer NOT NULL,
|
||||||
|
Loading…
Reference in New Issue
Block a user