TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-04-30 21:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix awaiting ids

Browse Source
This commit is contained in:
Elio Bischof 2022-07-20 18:15:25 +02:00
parent 3505b7b423
commit 66b574e813
No known key found for this signature in database
GPG Key ID: 7B383FDE4DDBF1BD
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/e2e-setup/ids.go
View File

@ -15,23 +15,23 @@ import (
var idRegexp = regexp.MustCompile("[0-9]{16}")
func ids(ctx context.Context, cfg *E2EConfig, dbClient *sql.DB) (string, string, error) {
zitadelProjectResourceID := strings.TrimPrefix(cfg.ZitadelProjectResourceID, "bignumber-")
instanceID := strings.TrimPrefix(cfg.InstanceID, "bignumber-")
zitadelProjectResourceID := strings.TrimPrefix(cfg.ZitadelProjectResourceID, "bignumber-")
if idRegexp.MatchString(zitadelProjectResourceID) && idRegexp.MatchString(instanceID) {
return zitadelProjectResourceID, instanceID, nil
}
projCtx, projCancel := context.WithTimeout(ctx, time.Minute)
defer projCancel()
zitadelProjectResourceID, err := querySingleString(projCtx, dbClient, `select aggregate_id from eventstore.events where event_type = 'project.added' and event_data = '{"name": "ZITADEL"}'`)
if err != nil {
return "", "", err
if idRegexp.MatchString(instanceID) && idRegexp.MatchString(zitadelProjectResourceID) {
return instanceID, zitadelProjectResourceID, nil
}
instCtx, instCancel := context.WithTimeout(ctx, time.Minute)
defer instCancel()
instanceID, err = querySingleString(instCtx, dbClient, `select aggregate_id from eventstore.events where event_type = 'instance.added' and event_data = '{"name": "Localhost"}'`)
instanceID, err := querySingleString(instCtx, dbClient, `select aggregate_id from eventstore.events where event_type = 'instance.added' and event_data = '{"name": "Localhost"}'`)
if err != nil {
return "", "", err
}
projCtx, projCancel := context.WithTimeout(ctx, time.Minute)
defer projCancel()
zitadelProjectResourceID, err = querySingleString(projCtx, dbClient, `select aggregate_id from eventstore.events where event_type = 'project.added' and event_data = '{"name": "ZITADEL"}'`)
return instanceID, zitadelProjectResourceID, err
}

2
cmd/e2e-setup/main.go
View File

@ -69,7 +69,7 @@ func startE2ESetup(conf *Config, masterkey string) {
dbClient, err := database.Connect(conf.Database)
logging.New().OnError(err).Fatalf("cannot start client for projection: %s", err)
zitadelProjectResourceID, instanceID, err := ids(ctx, conf.E2E, dbClient)
instanceID, zitadelProjectResourceID, err := ids(ctx, conf.E2E, dbClient)
logging.New().OnError(err).Fatalf("cannot get instance and project IDs: %s", err)
keyStorage, err := cryptoDB.NewKeyStorage(dbClient, masterkey)