mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 18:17:35 +00:00
chore!: Introduce ZITADEL v3 (#9645)
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>
This commit is contained in:
@@ -171,8 +171,7 @@ func (s *Storage) push(ctx context.Context, tx *sql.Tx, reducer eventstore.Reduc
|
||||
cmd.position.InPositionOrder,
|
||||
)
|
||||
|
||||
stmt.WriteString(s.pushPositionStmt)
|
||||
stmt.WriteString(`)`)
|
||||
stmt.WriteString(", statement_timestamp(), EXTRACT(EPOCH FROM clock_timestamp()))")
|
||||
}
|
||||
stmt.WriteString(` RETURNING created_at, "position"`)
|
||||
|
||||
|
@@ -1288,7 +1288,6 @@ func Test_push(t *testing.T) {
|
||||
},
|
||||
},
|
||||
}
|
||||
initPushStmt("postgres")
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
dbMock := mock.NewSQLMock(t, append([]mock.Expectation{mock.ExpectBegin(nil)}, tt.args.expectations...)...)
|
||||
@@ -1297,9 +1296,7 @@ func Test_push(t *testing.T) {
|
||||
t.Errorf("unexpected error in begin: %v", err)
|
||||
t.FailNow()
|
||||
}
|
||||
s := Storage{
|
||||
pushPositionStmt: initPushStmt("postgres"),
|
||||
}
|
||||
s := Storage{}
|
||||
err = s.push(context.Background(), tx, tt.args.reducer, tt.args.commands)
|
||||
tt.want.assertErr(t, err)
|
||||
dbMock.Assert(t)
|
||||
|
@@ -3,8 +3,6 @@ package postgres
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/zitadel/logging"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/database"
|
||||
"github.com/zitadel/zitadel/internal/v2/eventstore"
|
||||
)
|
||||
@@ -15,9 +13,8 @@ var (
|
||||
)
|
||||
|
||||
type Storage struct {
|
||||
client *database.DB
|
||||
config *Config
|
||||
pushPositionStmt string
|
||||
client *database.DB
|
||||
config *Config
|
||||
}
|
||||
|
||||
type Config struct {
|
||||
@@ -25,23 +22,9 @@ type Config struct {
|
||||
}
|
||||
|
||||
func New(client *database.DB, config *Config) *Storage {
|
||||
initPushStmt(client.Type())
|
||||
return &Storage{
|
||||
client: client,
|
||||
config: config,
|
||||
pushPositionStmt: initPushStmt(client.Type()),
|
||||
}
|
||||
}
|
||||
|
||||
func initPushStmt(typ string) string {
|
||||
switch typ {
|
||||
case "cockroach":
|
||||
return ", hlc_to_timestamp(cluster_logical_timestamp()), cluster_logical_timestamp()"
|
||||
case "postgres":
|
||||
return ", statement_timestamp(), EXTRACT(EPOCH FROM clock_timestamp())"
|
||||
default:
|
||||
logging.WithFields("database_type", typ).Panic("position statement for type not implemented")
|
||||
return ""
|
||||
client: client,
|
||||
config: config,
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user