mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 20:27:32 +00:00
fix: set quotas (#6597)
* feat: set quotas
* fix: start new period on younger anchor
* cleanup e2e config
* fix set notifications
* lint
* test: fix quota projection tests
* fix add quota tests
* make quota fields nullable
* enable amount 0
* fix initial setup
* create a prerelease
* avoid success comments
* fix quota projection primary key
* Revert "fix quota projection primary key"
This reverts commit e72f4d7fa1.
* simplify write model
* fix aggregate id
* avoid push without changes
* test set quota lifecycle
* test set quota mutations
* fix quota unit test
* fix: quotas
* test quota.set event projection
* use SetQuota in integration tests
* fix: release quotas 3
* reset releaserc
* fix comment
* test notification order doesn't matter
* test notification order doesn't matter
* test with unmarshalled events
* test with unmarshalled events
This commit is contained in:
Elio Bischof
373
internal/command/quota_model_test.go
Normal file
373
internal/command/quota_model_test.go
Normal file
@@ -0,0 +1,373 @@
|
||||
package command
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/eventstore"
|
||||
"github.com/zitadel/zitadel/internal/id"
|
||||
id_mock "github.com/zitadel/zitadel/internal/id/mock"
|
||||
"github.com/zitadel/zitadel/internal/repository/quota"
|
||||
)
|
||||
|
||||
func TestQuotaWriteModel_NewChanges(t *testing.T) {
|
||||
type fields struct {
|
||||
from time.Time
|
||||
resetInterval time.Duration
|
||||
amount uint64
|
||||
limit bool
|
||||
notifications []*quota.SetEventNotification
|
||||
}
|
||||
type args struct {
|
||||
idGenerator id.Generator
|
||||
createNew bool
|
||||
amount uint64
|
||||
from time.Time
|
||||
resetInterval time.Duration
|
||||
limit bool
|
||||
notifications []*QuotaNotification
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
fields fields
|
||||
args args
|
||||
wantEvent quota.SetEvent
|
||||
wantErr assert.ErrorAssertionFunc
|
||||
}{{
|
||||
name: "change reset interval",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: make([]*quota.SetEventNotification, 0),
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Minute,
|
||||
limit: true,
|
||||
notifications: make([]*QuotaNotification, 0),
|
||||
},
|
||||
wantEvent: quota.SetEvent{
|
||||
ResetInterval: durationPtr(time.Minute),
|
||||
},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "change reset interval and amount",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: make([]*quota.SetEventNotification, 0),
|
||||
},
|
||||
args: args{
|
||||
amount: 10,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Minute,
|
||||
limit: true,
|
||||
notifications: make([]*QuotaNotification, 0),
|
||||
},
|
||||
wantEvent: quota.SetEvent{
|
||||
ResetInterval: durationPtr(time.Minute),
|
||||
Amount: uint64Ptr(10),
|
||||
},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "change nothing",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*quota.SetEventNotification{},
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*QuotaNotification{},
|
||||
},
|
||||
wantEvent: quota.SetEvent{},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "change limit to zero value",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: make([]*quota.SetEventNotification, 0),
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: false,
|
||||
notifications: make([]*QuotaNotification, 0),
|
||||
},
|
||||
wantEvent: quota.SetEvent{Limit: boolPtr(false)},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "change amount to zero value",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: make([]*quota.SetEventNotification, 0),
|
||||
},
|
||||
args: args{
|
||||
amount: 0,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: make([]*QuotaNotification, 0),
|
||||
},
|
||||
wantEvent: quota.SetEvent{Amount: uint64Ptr(0)},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "change from to zero value",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: make([]*quota.SetEventNotification, 0),
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Time{},
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: make([]*QuotaNotification, 0),
|
||||
},
|
||||
wantEvent: quota.SetEvent{From: &time.Time{}},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "add notification",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*quota.SetEventNotification{{
|
||||
ID: "notification1",
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*QuotaNotification{{
|
||||
Percent: 20,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "notification1"),
|
||||
},
|
||||
wantEvent: quota.SetEvent{Notifications: &[]*quota.SetEventNotification{{
|
||||
ID: "notification1",
|
||||
Percent: 20,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}}},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "change nothing with notification",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*quota.SetEventNotification{{
|
||||
ID: "notification1",
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*QuotaNotification{{
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
idGenerator: id_mock.NewIDGenerator(t),
|
||||
},
|
||||
wantEvent: quota.SetEvent{},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "change nothing but notification order",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*quota.SetEventNotification{{
|
||||
ID: "notification1",
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}, {
|
||||
ID: "notification2",
|
||||
Percent: 10,
|
||||
Repeat: false,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*QuotaNotification{{
|
||||
Percent: 10,
|
||||
Repeat: false,
|
||||
CallURL: "https://call.url",
|
||||
}, {
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "newnotification1", "newnotification2"),
|
||||
},
|
||||
wantEvent: quota.SetEvent{},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "change notification to zero value",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*quota.SetEventNotification{{
|
||||
ID: "notification1",
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*QuotaNotification{},
|
||||
},
|
||||
wantEvent: quota.SetEvent{Notifications: &[]*quota.SetEventNotification{}},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "create new without notification",
|
||||
fields: fields{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*quota.SetEventNotification{{
|
||||
ID: "notification1",
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
},
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*QuotaNotification{},
|
||||
},
|
||||
wantEvent: quota.SetEvent{Notifications: &[]*quota.SetEventNotification{}},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "create new with all values values",
|
||||
args: args{
|
||||
amount: 5,
|
||||
from: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
||||
resetInterval: time.Hour,
|
||||
limit: true,
|
||||
notifications: []*QuotaNotification{{
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "notification1"),
|
||||
createNew: true,
|
||||
},
|
||||
wantEvent: quota.SetEvent{
|
||||
From: timePtr(time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)),
|
||||
ResetInterval: durationPtr(time.Hour),
|
||||
Amount: uint64Ptr(5),
|
||||
Limit: boolPtr(true),
|
||||
Notifications: &[]*quota.SetEventNotification{{
|
||||
ID: "notification1",
|
||||
Percent: 10,
|
||||
Repeat: true,
|
||||
CallURL: "https://call.url",
|
||||
}},
|
||||
},
|
||||
wantErr: assert.NoError,
|
||||
}, {
|
||||
name: "create new with zero values",
|
||||
args: args{createNew: true},
|
||||
wantEvent: quota.SetEvent{
|
||||
From: &time.Time{},
|
||||
ResetInterval: durationPtr(0),
|
||||
Amount: uint64Ptr(0),
|
||||
Limit: boolPtr(false),
|
||||
Notifications: &[]*quota.SetEventNotification{},
|
||||
},
|
||||
wantErr: assert.NoError,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
wm := "aWriteModel{
|
||||
from: tt.fields.from,
|
||||
resetInterval: tt.fields.resetInterval,
|
||||
amount: tt.fields.amount,
|
||||
limit: tt.fields.limit,
|
||||
notifications: tt.fields.notifications,
|
||||
}
|
||||
gotChanges, err := wm.NewChanges(tt.args.idGenerator, tt.args.createNew, tt.args.amount, tt.args.from, tt.args.resetInterval, tt.args.limit, tt.args.notifications...)
|
||||
if !tt.wantErr(t, err, fmt.Sprintf("NewChanges(%v, %v, %v, %v, %v, %v)", tt.args.createNew, tt.args.amount, tt.args.from, tt.args.resetInterval, tt.args.limit, tt.args.notifications)) {
|
||||
return
|
||||
}
|
||||
marshalled, err := json.Marshal(quota.NewSetEvent(
|
||||
eventstore.NewBaseEventForPush(
|
||||
context.Background(),
|
||||
"a.NewAggregate("quota1", "instance1").Aggregate,
|
||||
quota.SetEventType,
|
||||
),
|
||||
quota.Unimplemented,
|
||||
gotChanges...,
|
||||
))
|
||||
assert.NoError(t, err)
|
||||
unmarshalled := new(quota.SetEvent)
|
||||
assert.NoError(t, json.Unmarshal(marshalled, unmarshalled))
|
||||
assert.Equalf(t, tt.wantEvent, *unmarshalled, "NewChanges(%v, %v, %v, %v, %v, %v)", tt.args.createNew, tt.args.amount, tt.args.from, tt.args.resetInterval, tt.args.limit, tt.args.notifications)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func uint64Ptr(i uint64) *uint64 { return &i }
|
||||
func boolPtr(b bool) *bool { return &b }
|
||||
func durationPtr(d time.Duration) *time.Duration { return &d }
|
||||
func timePtr(t time.Time) *time.Time { return &t }
|
||||
Reference in New Issue
Block a user