mirror of
https://github.com/zitadel/zitadel
synced 2024-11-22 18:44:40 +00:00
c5b99274d7
* 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>
43 lines
1.1 KiB
Go
43 lines
1.1 KiB
Go
package initialise
|
|
|
|
import (
|
|
"github.com/caos/logging"
|
|
"github.com/caos/zitadel/internal/database"
|
|
"github.com/spf13/viper"
|
|
)
|
|
|
|
type Config struct {
|
|
Database database.Config
|
|
AdminUser database.User
|
|
Log *logging.Config
|
|
}
|
|
|
|
func MustNewConfig(v *viper.Viper) *Config {
|
|
config := new(Config)
|
|
err := v.Unmarshal(config)
|
|
logging.OnError(err).Fatal("unable to read config")
|
|
|
|
err = config.Log.SetLogger()
|
|
logging.OnError(err).Fatal("unable to set logger")
|
|
|
|
return config
|
|
}
|
|
|
|
func adminConfig(config *Config) database.Config {
|
|
adminConfig := config.Database
|
|
adminConfig.Username = config.AdminUser.Username
|
|
adminConfig.Password = config.AdminUser.Password
|
|
adminConfig.SSL.Cert = config.AdminUser.SSL.Cert
|
|
adminConfig.SSL.Key = config.AdminUser.SSL.Key
|
|
if config.AdminUser.SSL.RootCert != "" {
|
|
adminConfig.SSL.RootCert = config.AdminUser.SSL.RootCert
|
|
}
|
|
if config.AdminUser.SSL.Mode != "" {
|
|
adminConfig.SSL.Mode = config.AdminUser.SSL.Mode
|
|
}
|
|
//use default database because the zitadel database might not exist
|
|
adminConfig.Database = ""
|
|
|
|
return adminConfig
|
|
}
|