mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-12 02:38:31 +00:00

This PR summarizes multiple changes specifically only available with ZITADEL v3: - feat: Web Keys management (https://github.com/zitadel/zitadel/pull/9526) - fix(cmd): ensure proper working of mirror (https://github.com/zitadel/zitadel/pull/9509) - feat(Authz): system user support for permission check v2 (https://github.com/zitadel/zitadel/pull/9640) - chore(license): change from Apache to AGPL (https://github.com/zitadel/zitadel/pull/9597) - feat(console): list v2 sessions (https://github.com/zitadel/zitadel/pull/9539) - fix(console): add loginV2 feature flag (https://github.com/zitadel/zitadel/pull/9682) - fix(feature flags): allow reading "own" flags (https://github.com/zitadel/zitadel/pull/9649) - feat(console): add Actions V2 UI (https://github.com/zitadel/zitadel/pull/9591) BREAKING CHANGE - feat(webkey): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9445) - chore!: remove CockroachDB Support (https://github.com/zitadel/zitadel/pull/9444) - feat(actions): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9489) --------- Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com> Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com> Co-authored-by: Ramon <mail@conblem.me> Co-authored-by: Elio Bischof <elio@zitadel.com> Co-authored-by: Kenta Yamaguchi <56732734+KEY60228@users.noreply.github.com> Co-authored-by: Harsha Reddy <harsha.reddy@klaviyo.com> Co-authored-by: Livio Spring <livio@zitadel.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Iraq <66622793+kkrime@users.noreply.github.com> Co-authored-by: Florian Forster <florian@zitadel.com> Co-authored-by: Tim Möhlmann <tim+github@zitadel.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Max Peintner <peintnerm@gmail.com>
121 lines
2.9 KiB
Go
121 lines
2.9 KiB
Go
package query
|
|
|
|
import (
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"testing"
|
|
|
|
"golang.org/x/text/language"
|
|
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
)
|
|
|
|
var (
|
|
expectedRestrictionsQuery = regexp.QuoteMeta("SELECT projections.restrictions2.aggregate_id," +
|
|
" projections.restrictions2.creation_date," +
|
|
" projections.restrictions2.change_date," +
|
|
" projections.restrictions2.resource_owner," +
|
|
" projections.restrictions2.sequence," +
|
|
" projections.restrictions2.disallow_public_org_registration," +
|
|
" projections.restrictions2.allowed_languages" +
|
|
" FROM projections.restrictions2",
|
|
)
|
|
|
|
restrictionsCols = []string{
|
|
"aggregate_id",
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"sequence",
|
|
"disallow_public_org_registration",
|
|
"allowed_languages",
|
|
}
|
|
)
|
|
|
|
func Test_RestrictionsPrepare(t *testing.T) {
|
|
type want struct {
|
|
sqlExpectations sqlExpectation
|
|
err checkErr
|
|
object interface{}
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare interface{}
|
|
want want
|
|
}{
|
|
{
|
|
name: "prepareRestrictionsQuery no result",
|
|
prepare: prepareRestrictionsQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryScanErr(
|
|
expectedRestrictionsQuery,
|
|
nil,
|
|
nil,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrNoRows) {
|
|
return fmt.Errorf("err should be sql.ErrNoRows got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
object: Restrictions{
|
|
AllowedLanguages: make([]language.Tag, 0),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareRestrictionsQuery",
|
|
prepare: prepareRestrictionsQuery,
|
|
want: want{
|
|
sqlExpectations: mockQuery(
|
|
expectedRestrictionsQuery,
|
|
restrictionsCols,
|
|
[]driver.Value{
|
|
"restrictions1",
|
|
testNow,
|
|
testNow,
|
|
"instance1",
|
|
0,
|
|
true,
|
|
database.TextArray[string]([]string{"en", "de", "ru"}),
|
|
},
|
|
),
|
|
object: Restrictions{
|
|
AggregateID: "restrictions1",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "instance1",
|
|
Sequence: 0,
|
|
DisallowPublicOrgRegistration: true,
|
|
AllowedLanguages: []language.Tag{language.Make("en"), language.Make("de"), language.Make("ru")},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareRestrictionsQuery sql err",
|
|
prepare: prepareRestrictionsQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
expectedRestrictionsQuery,
|
|
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: (*Restrictions)(nil),
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assertPrepare(t, tt.prepare, tt.want.object, tt.want.sqlExpectations, tt.want.err)
|
|
})
|
|
}
|
|
}
|