mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-15 04:18:01 +00:00
32bad3feb3
Some checks are pending
ZITADEL CI/CD / core (push) Waiting to run
ZITADEL CI/CD / console (push) Waiting to run
ZITADEL CI/CD / version (push) Waiting to run
ZITADEL CI/CD / compile (push) Blocked by required conditions
ZITADEL CI/CD / core-unit-test (push) Blocked by required conditions
ZITADEL CI/CD / core-integration-test (push) Blocked by required conditions
ZITADEL CI/CD / lint (push) Blocked by required conditions
ZITADEL CI/CD / container (push) Blocked by required conditions
ZITADEL CI/CD / e2e (push) Blocked by required conditions
ZITADEL CI/CD / release (push) Blocked by required conditions
Code Scanning / CodeQL-Build (go) (push) Waiting to run
Code Scanning / CodeQL-Build (javascript) (push) Waiting to run
# Which Problems Are Solved Milestones used existing events from a number of aggregates. OIDC session is one of them. We noticed in load-tests that the reduction of the oidc_session.added event into the milestone projection is a costly business with payload based conditionals. A milestone is reached once, but even then we remain subscribed to the OIDC events. This requires the projections.current_states to be updated continuously. # How the Problems Are Solved The milestone creation is refactored to use dedicated events instead. The command side decides when a milestone is reached and creates the reached event once for each milestone when required. # Additional Changes In order to prevent reached milestones being created twice, a migration script is provided. When the old `projections.milestones` table exist, the state is read from there and `v2` milestone aggregate events are created, with the original reached and pushed dates. # Additional Context - Closes https://github.com/zitadel/zitadel/issues/8800
191 lines
3.8 KiB
Go
191 lines
3.8 KiB
Go
package query
|
|
|
|
import (
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"testing"
|
|
)
|
|
|
|
var (
|
|
expectedMilestoneQuery = regexp.QuoteMeta(`
|
|
SELECT projections.milestones2.instance_id,
|
|
projections.instance_domains.domain,
|
|
projections.milestones2.reached_date,
|
|
projections.milestones2.last_pushed_date,
|
|
projections.milestones2.type,
|
|
COUNT(*) OVER ()
|
|
FROM projections.milestones2 AS OF SYSTEM TIME '-1 ms'
|
|
LEFT JOIN projections.instance_domains ON projections.milestones2.instance_id = projections.instance_domains.instance_id
|
|
`)
|
|
|
|
milestoneCols = []string{
|
|
"instance_id",
|
|
"primary_domain",
|
|
"reached_date",
|
|
"last_pushed_date",
|
|
"type",
|
|
"ignore_client_ids",
|
|
}
|
|
)
|
|
|
|
func Test_MilestonesPrepare(t *testing.T) {
|
|
type want struct {
|
|
sqlExpectations sqlExpectation
|
|
err checkErr
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare interface{}
|
|
want want
|
|
object interface{}
|
|
}{
|
|
{
|
|
name: "prepareMilestonesQuery no result",
|
|
prepare: prepareMilestonesQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
expectedMilestoneQuery,
|
|
nil,
|
|
nil,
|
|
),
|
|
},
|
|
object: &Milestones{Milestones: []*Milestone{}},
|
|
},
|
|
{
|
|
name: "prepareMilestonesQuery",
|
|
prepare: prepareMilestonesQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
expectedMilestoneQuery,
|
|
milestoneCols,
|
|
[][]driver.Value{
|
|
{
|
|
"instance-id",
|
|
"primary.domain",
|
|
testNow,
|
|
testNow,
|
|
1,
|
|
1,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Milestones{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
Milestones: []*Milestone{
|
|
{
|
|
InstanceID: "instance-id",
|
|
Type: 1,
|
|
ReachedDate: testNow,
|
|
PushedDate: testNow,
|
|
PrimaryDomain: "primary.domain",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMilestonesQuery multiple result",
|
|
prepare: prepareMilestonesQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
expectedMilestoneQuery,
|
|
milestoneCols,
|
|
[][]driver.Value{
|
|
{
|
|
"instance-id",
|
|
"primary.domain",
|
|
testNow,
|
|
testNow,
|
|
1,
|
|
1,
|
|
},
|
|
{
|
|
"instance-id",
|
|
"primary.domain",
|
|
testNow,
|
|
testNow,
|
|
2,
|
|
2,
|
|
},
|
|
{
|
|
"instance-id",
|
|
"primary.domain",
|
|
testNow,
|
|
nil,
|
|
3,
|
|
3,
|
|
},
|
|
{
|
|
"instance-id",
|
|
"primary.domain",
|
|
nil,
|
|
nil,
|
|
4,
|
|
4,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &Milestones{
|
|
SearchResponse: SearchResponse{
|
|
Count: 4,
|
|
},
|
|
Milestones: []*Milestone{
|
|
{
|
|
InstanceID: "instance-id",
|
|
Type: 1,
|
|
ReachedDate: testNow,
|
|
PushedDate: testNow,
|
|
PrimaryDomain: "primary.domain",
|
|
},
|
|
{
|
|
InstanceID: "instance-id",
|
|
Type: 2,
|
|
ReachedDate: testNow,
|
|
PushedDate: testNow,
|
|
PrimaryDomain: "primary.domain",
|
|
},
|
|
{
|
|
InstanceID: "instance-id",
|
|
Type: 3,
|
|
ReachedDate: testNow,
|
|
PrimaryDomain: "primary.domain",
|
|
},
|
|
{
|
|
InstanceID: "instance-id",
|
|
Type: 4,
|
|
PrimaryDomain: "primary.domain",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareMilestonesQuery sql err",
|
|
prepare: prepareMilestonesQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
expectedMilestoneQuery,
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: (*Milestones)(nil),
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err, defaultPrepareArgs...)
|
|
})
|
|
}
|
|
}
|