mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 20:57:31 +00:00
fix(query): realtime data on defined requests (#3726)
* feat: directly specify factors on addCustomLoginPolicy and return on LoginPolicy responses * fix proto * update login policy * feat: directly specify idp on addCustomLoginPolicy and return on LoginPolicy responses * fix: tests * fix(projection): trigger bulk * refactor: clean projection pkg * instance should bulk * fix(query): should trigger bulk on id calls * tests * build prerelease * fix: add shouldTriggerBulk * fix: test Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: Max Peintner <max@caos.ch>
This commit is contained in:
@@ -7,8 +7,6 @@ import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"testing"
|
||||
|
||||
errs "github.com/zitadel/zitadel/internal/errors"
|
||||
)
|
||||
|
||||
func Test_ProjectRolePrepares(t *testing.T) {
|
||||
@@ -205,104 +203,6 @@ func Test_ProjectRolePrepares(t *testing.T) {
|
||||
},
|
||||
object: nil,
|
||||
},
|
||||
{
|
||||
name: "prepareProjectRoleQuery no result",
|
||||
prepare: prepareProjectRoleQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT projections.project_roles.project_id,`+
|
||||
` projections.project_roles.creation_date,`+
|
||||
` projections.project_roles.change_date,`+
|
||||
` projections.project_roles.resource_owner,`+
|
||||
` projections.project_roles.sequence,`+
|
||||
` projections.project_roles.role_key,`+
|
||||
` projections.project_roles.display_name,`+
|
||||
` projections.project_roles.group_name`+
|
||||
` FROM projections.project_roles`),
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errs.IsNotFound(err) {
|
||||
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: (*ProjectRole)(nil),
|
||||
},
|
||||
{
|
||||
name: "prepareProjectRoleQuery found",
|
||||
prepare: prepareProjectRoleQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT projections.project_roles.project_id,`+
|
||||
` projections.project_roles.creation_date,`+
|
||||
` projections.project_roles.change_date,`+
|
||||
` projections.project_roles.resource_owner,`+
|
||||
` projections.project_roles.sequence,`+
|
||||
` projections.project_roles.role_key,`+
|
||||
` projections.project_roles.display_name,`+
|
||||
` projections.project_roles.group_name`+
|
||||
` FROM projections.project_roles`),
|
||||
[]string{
|
||||
"project_id",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"resource_owner",
|
||||
"sequence",
|
||||
"role_key",
|
||||
"display_name",
|
||||
"group_name",
|
||||
},
|
||||
[]driver.Value{
|
||||
"project-id",
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
uint64(20211111),
|
||||
"role-key",
|
||||
"role-display-name",
|
||||
"role-group",
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &ProjectRole{
|
||||
ProjectID: "project-id",
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
Sequence: 20211111,
|
||||
Key: "role-key",
|
||||
DisplayName: "role-display-name",
|
||||
Group: "role-group",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareProjectRoleQuery sql err",
|
||||
prepare: prepareProjectRoleQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT projections.project_roles.project_id,`+
|
||||
` projections.project_roles.creation_date,`+
|
||||
` projections.project_roles.change_date,`+
|
||||
` projections.project_roles.resource_owner,`+
|
||||
` projections.project_roles.sequence,`+
|
||||
` projections.project_roles.role_key,`+
|
||||
` projections.project_roles.display_name,`+
|
||||
` projections.project_roles.group_name`+
|
||||
` FROM projections.project_roles`),
|
||||
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: nil,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
|
Reference in New Issue
Block a user