TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: initial failures (#4291)

Browse Source 
* fix(cmd): read configuration correctly

* fix(database): read weakly typed config

* fix(database): correct handling of update columns

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Silvan
2022-09-01 09:24:26 +02:00
committed by GitHub
parent 32b751a3a0
commit 2f647ce9a2
13 changed files with 164 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/initialise/verify_zitadel.go
View File

@@ -31,16 +31,18 @@ Prereqesits:
- cockroachdb with user and database
`,
RunE: func(cmd *cobra.Command, args []string) error {
config := new(Config)
if err := viper.Unmarshal(config); err != nil {
return err
}
config := MustNewConfig(viper.GetViper())
return verifyZitadel(config.Database)
},
}
}
func VerifyZitadel(db *sql.DB, config database.Config) error {
err := ReadStmts(config.Type())
if err != nil {
return err
}
if err := exec(db, fmt.Sprintf(createSystemStmt, config.Username()), nil); err != nil {
return err
}
@@ -73,10 +75,12 @@ func VerifyZitadel(db *sql.DB, config database.Config) error {
func verifyZitadel(config database.Config) error {
logging.WithFields("database", config.Database()).Info("verify zitadel")
db, err := database.Connect(config, false)
if err != nil {
return err
}
if err := VerifyZitadel(db, config); err != nil {
return nil
}