mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 19:07:30 +00:00
feat(cli): setup (#3267)
* commander * commander * selber! * move to packages * fix(errors): implement Is interface * test: command * test: commands * add init steps * setup tenant * add default step yaml * possibility to set password * merge v2 into v2-commander * fix: rename iam command side to instance * fix: rename iam command side to instance * fix: rename iam command side to instance * fix: rename iam command side to instance * fix: search query builder can filter events in memory * fix: filters for add member * fix(setup): add `ExternalSecure` to config * chore: name iam to instance * fix: matching * remove unsued func * base url * base url * test(command): filter funcs * test: commands * fix: rename orgiampolicy to domain policy * start from init * commands * config * fix indexes and add constraints * fixes * fix: merge conflicts * fix: protos * fix: md files * setup * add deprecated org iam policy again * typo * fix search query * fix filter * Apply suggestions from code review * remove custom org from org setup * add todos for verification * change apps creation * simplify package structure * fix error * move preparation helper for tests * fix unique constraints * fix config mapping in setup * fix error handling in encryption_keys.go * fix projection config * fix query from old views to projection * fix setup of mgmt api * set iam project and fix instance projection * imports Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
This commit is contained in:
@@ -2,7 +2,6 @@ package migration
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
|
||||
"github.com/caos/logging"
|
||||
|
||||
@@ -41,7 +40,7 @@ func Migrate(ctx context.Context, es *eventstore.Eventstore, migration Migration
|
||||
|
||||
func shouldExec(ctx context.Context, es *eventstore.Eventstore, migration Migration) (should bool, err error) {
|
||||
events, err := es.Filter(ctx, eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
||||
OrderDesc().
|
||||
OrderAsc().
|
||||
AddQuery().
|
||||
AggregateTypes(aggregateType).
|
||||
AggregateIDs(aggregateID).
|
||||
@@ -51,34 +50,24 @@ func shouldExec(ctx context.Context, es *eventstore.Eventstore, migration Migrat
|
||||
return false, err
|
||||
}
|
||||
|
||||
if len(events) == 0 {
|
||||
return true, nil
|
||||
}
|
||||
if events[len(events)-1].Type() == startedType {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
for _, e := range events {
|
||||
step := new(SetupStep)
|
||||
|
||||
err = json.Unmarshal(e.DataAsBytes(), step)
|
||||
if err != nil {
|
||||
return false, err
|
||||
var isStarted bool
|
||||
for _, event := range events {
|
||||
e, ok := event.(*SetupStep)
|
||||
if !ok {
|
||||
return false, errors.ThrowInternal(nil, "MIGRA-IJY3D", "Errors.Internal")
|
||||
}
|
||||
|
||||
if step.Name != migration.String() {
|
||||
if e.Name != migration.String() {
|
||||
continue
|
||||
}
|
||||
|
||||
switch e.Type() {
|
||||
case startedType, doneType:
|
||||
//TODO: if started should we wait until done/failed?
|
||||
switch event.Type() {
|
||||
case startedType, failedType:
|
||||
isStarted = !isStarted
|
||||
case doneType:
|
||||
return false, nil
|
||||
case failedType:
|
||||
//TODO: how to allow retries?
|
||||
logging.WithFields("migration", migration.String()).Error("failed before")
|
||||
return false, errors.ThrowInternal(nil, "MIGRA-mjI2E", "migration failed before")
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
|
||||
return !isStarted, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user