mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 11:04:25 +00:00
1a49b7d298
* project quota added * project quota removed * add periods table * make log record generic * accumulate usage * query usage * count action run seconds * fix filter in ReportQuotaUsage * fix existing tests * fix logstore tests * fix typo * fix: add quota unit tests command side * fix: add quota unit tests command side * fix: add quota unit tests command side * move notifications into debouncer and improve limit querying * cleanup * comment * fix: add quota unit tests command side * fix remaining quota usage query * implement InmemLogStorage * cleanup and linting * improve test * fix: add quota unit tests command side * fix: add quota unit tests command side * fix: add quota unit tests command side * fix: add quota unit tests command side * action notifications and fixes for notifications query * revert console prefix * fix: add quota unit tests command side * fix: add quota integration tests * improve accountable requests * improve accountable requests * fix: add quota integration tests * fix: add quota integration tests * fix: add quota integration tests * comment * remove ability to store logs in db and other changes requested from review * changes requested from review * changes requested from review * Update internal/api/http/middleware/access_interceptor.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * tests: fix quotas integration tests * improve incrementUsageStatement * linting * fix: delete e2e tests as intergation tests cover functionality * Update internal/api/http/middleware/access_interceptor.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * backup * fix conflict * create rc * create prerelease * remove issue release labeling * fix tracing --------- Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: adlerhurst <silvan.reusser@gmail.com>
308 lines
7.3 KiB
Go
308 lines
7.3 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
|
"github.com/zitadel/zitadel/internal/id"
|
|
id_mock "github.com/zitadel/zitadel/internal/id/mock"
|
|
"github.com/zitadel/zitadel/internal/repository/quota"
|
|
)
|
|
|
|
func TestQuotaReport_ReportQuotaUsage(t *testing.T) {
|
|
type fields struct {
|
|
eventstore *eventstore.Eventstore
|
|
}
|
|
type args struct {
|
|
ctx context.Context
|
|
dueNotifications []*quota.NotificationDueEvent
|
|
}
|
|
type res struct {
|
|
err func(error) bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
fields fields
|
|
args args
|
|
res res
|
|
}{
|
|
{
|
|
name: "no due events",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
},
|
|
res: res{},
|
|
},
|
|
{
|
|
name: "due event already reported",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectFilter(
|
|
eventFromEventPusherWithInstanceID(
|
|
"INSTANCE",
|
|
quota.NewNotificationDueEvent(context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
200,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
dueNotifications: []*quota.NotificationDueEvent{
|
|
{
|
|
Unit: QuotaRequestsAllAuthenticated.Enum(),
|
|
ID: "id",
|
|
CallURL: "url",
|
|
PeriodStart: time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
Threshold: 1000,
|
|
Usage: 250,
|
|
},
|
|
},
|
|
},
|
|
res: res{},
|
|
},
|
|
{
|
|
name: "due event not reported",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectFilter(),
|
|
expectPush(
|
|
[]*repository.Event{
|
|
eventFromEventPusherWithInstanceID(
|
|
"INSTANCE",
|
|
quota.NewNotificationDueEvent(context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
),
|
|
},
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
dueNotifications: []*quota.NotificationDueEvent{
|
|
quota.NewNotificationDueEvent(
|
|
context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
},
|
|
},
|
|
res: res{},
|
|
},
|
|
{
|
|
name: "due events",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectFilter(),
|
|
expectFilter(
|
|
eventFromEventPusherWithInstanceID(
|
|
"INSTANCE",
|
|
quota.NewNotificationDueEvent(context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id2",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
),
|
|
),
|
|
expectFilter(),
|
|
expectPush(
|
|
[]*repository.Event{
|
|
eventFromEventPusherWithInstanceID(
|
|
"INSTANCE",
|
|
quota.NewNotificationDueEvent(context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id1",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
),
|
|
eventFromEventPusherWithInstanceID(
|
|
"INSTANCE",
|
|
quota.NewNotificationDueEvent(context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id3",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
),
|
|
},
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
dueNotifications: []*quota.NotificationDueEvent{
|
|
quota.NewNotificationDueEvent(
|
|
context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id1",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
quota.NewNotificationDueEvent(
|
|
context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id2",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
quota.NewNotificationDueEvent(
|
|
context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id3",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
},
|
|
},
|
|
res: res{},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
r := &Commands{
|
|
eventstore: tt.fields.eventstore,
|
|
}
|
|
err := r.ReportQuotaUsage(tt.args.ctx, tt.args.dueNotifications)
|
|
if tt.res.err == nil {
|
|
assert.NoError(t, err)
|
|
}
|
|
if tt.res.err != nil && !tt.res.err(err) {
|
|
t.Errorf("got wrong err: %v ", err)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestQuotaReport_UsageNotificationSent(t *testing.T) {
|
|
type fields struct {
|
|
eventstore *eventstore.Eventstore
|
|
idGenerator id.Generator
|
|
}
|
|
type args struct {
|
|
ctx context.Context
|
|
dueNotification *quota.NotificationDueEvent
|
|
}
|
|
type res struct {
|
|
err func(error) bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
fields fields
|
|
args args
|
|
res res
|
|
}{
|
|
{
|
|
name: "usage notification sent, ok",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectPush(
|
|
[]*repository.Event{
|
|
eventFromEventPusherWithInstanceID(
|
|
"INSTANCE",
|
|
quota.NewNotifiedEvent(
|
|
context.Background(),
|
|
"quota1",
|
|
quota.NewNotificationDueEvent(
|
|
context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id1",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
),
|
|
),
|
|
},
|
|
),
|
|
),
|
|
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "quota1"),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
dueNotification: quota.NewNotificationDueEvent(
|
|
context.Background(),
|
|
"a.NewAggregate("quota1", "INSTANCE").Aggregate,
|
|
QuotaRequestsAllAuthenticated.Enum(),
|
|
"id1",
|
|
"url",
|
|
time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC),
|
|
1000,
|
|
250,
|
|
),
|
|
},
|
|
res: res{},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
r := &Commands{
|
|
eventstore: tt.fields.eventstore,
|
|
idGenerator: tt.fields.idGenerator,
|
|
}
|
|
err := r.UsageNotificationSent(tt.args.ctx, tt.args.dueNotification)
|
|
if tt.res.err == nil {
|
|
assert.NoError(t, err)
|
|
}
|
|
if tt.res.err != nil && !tt.res.err(err) {
|
|
t.Errorf("got wrong err: %v ", err)
|
|
}
|
|
})
|
|
}
|
|
}
|