mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 21:07:31 +00:00
test: correct notifications integration test with eventual consistency (#9569)
# Which Problems Are Solved Quota notification integration test failed sometimes due to eventual consistency issues, which resulted in calls which should have been counted to the quota not being added. This resulted in flaky integration tests as the expected API calls to be limited were executed normally. # How the Problems Are Solved As there is no API call to query the currently applied Quota, there was a sleep added as a last effort, to give some time that the event gets processed into the projection. # Additional Changes None # Additional Context Related to https://github.com/zitadel/zitadel/actions/runs/13922326003/job/38959595055 Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
@@ -31,27 +31,10 @@ func TestServer_QuotaNotification_Limit(t *testing.T) {
|
|||||||
percent := 50
|
percent := 50
|
||||||
percentAmount := amount * percent / 100
|
percentAmount := amount * percent / 100
|
||||||
|
|
||||||
_, err := integration.SystemClient().SetQuota(CTX, &system.SetQuotaRequest{
|
setQuota(t, instance.Instance.Id, amount, true, []*quota_pb.Notification{
|
||||||
InstanceId: instance.Instance.Id,
|
{Percent: uint32(percent), Repeat: true, CallUrl: callURL},
|
||||||
Unit: quota_pb.Unit_UNIT_REQUESTS_ALL_AUTHENTICATED,
|
{Percent: 100, Repeat: true, CallUrl: callURL},
|
||||||
From: timestamppb.Now(),
|
|
||||||
ResetInterval: durationpb.New(time.Minute * 5),
|
|
||||||
Amount: uint64(amount),
|
|
||||||
Limit: true,
|
|
||||||
Notifications: []*quota_pb.Notification{
|
|
||||||
{
|
|
||||||
Percent: uint32(percent),
|
|
||||||
Repeat: true,
|
|
||||||
CallUrl: callURL,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Percent: 100,
|
|
||||||
Repeat: true,
|
|
||||||
CallUrl: callURL,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
sub := sink.Subscribe(CTX, sink.ChannelQuota)
|
sub := sink.Subscribe(CTX, sink.ChannelQuota)
|
||||||
defer sub.Close()
|
defer sub.Close()
|
||||||
@@ -72,6 +55,22 @@ func TestServer_QuotaNotification_Limit(t *testing.T) {
|
|||||||
require.Error(t, limitErr)
|
require.Error(t, limitErr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func setQuota(t *testing.T, instanceID string, amount int, limit bool, notifications []*quota_pb.Notification) {
|
||||||
|
_, err := integration.SystemClient().SetQuota(CTX, &system.SetQuotaRequest{
|
||||||
|
InstanceId: instanceID,
|
||||||
|
Unit: quota_pb.Unit_UNIT_REQUESTS_ALL_AUTHENTICATED,
|
||||||
|
From: timestamppb.Now(),
|
||||||
|
ResetInterval: durationpb.New(time.Minute * 5),
|
||||||
|
Amount: uint64(amount),
|
||||||
|
Limit: limit,
|
||||||
|
Notifications: notifications,
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// wait for some time as there is an eventual consistency until the quota is applied and used in the interceptor
|
||||||
|
time.Sleep(time.Second * 5)
|
||||||
|
}
|
||||||
|
|
||||||
func TestServer_QuotaNotification_NoLimit(t *testing.T) {
|
func TestServer_QuotaNotification_NoLimit(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
iamCTX := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
|
iamCTX := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
|
||||||
@@ -80,27 +79,10 @@ func TestServer_QuotaNotification_NoLimit(t *testing.T) {
|
|||||||
percent := 50
|
percent := 50
|
||||||
percentAmount := amount * percent / 100
|
percentAmount := amount * percent / 100
|
||||||
|
|
||||||
_, err := integration.SystemClient().SetQuota(CTX, &system.SetQuotaRequest{
|
setQuota(t, instance.Instance.Id, amount, false, []*quota_pb.Notification{
|
||||||
InstanceId: instance.Instance.Id,
|
{Percent: uint32(percent), Repeat: false, CallUrl: callURL},
|
||||||
Unit: quota_pb.Unit_UNIT_REQUESTS_ALL_AUTHENTICATED,
|
{Percent: 100, Repeat: true, CallUrl: callURL},
|
||||||
From: timestamppb.Now(),
|
|
||||||
ResetInterval: durationpb.New(time.Minute * 5),
|
|
||||||
Amount: uint64(amount),
|
|
||||||
Limit: false,
|
|
||||||
Notifications: []*quota_pb.Notification{
|
|
||||||
{
|
|
||||||
Percent: uint32(percent),
|
|
||||||
Repeat: false,
|
|
||||||
CallUrl: callURL,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Percent: 100,
|
|
||||||
Repeat: true,
|
|
||||||
CallUrl: callURL,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
sub := sink.Subscribe(CTX, sink.ChannelQuota)
|
sub := sink.Subscribe(CTX, sink.ChannelQuota)
|
||||||
defer sub.Close()
|
defer sub.Close()
|
||||||
|
Reference in New Issue
Block a user