diff --git a/cmd/initialise/config.go b/cmd/initialise/config.go index 848bece05b..b3499ea7ad 100644 --- a/cmd/initialise/config.go +++ b/cmd/initialise/config.go @@ -24,5 +24,7 @@ func MustNewConfig(v *viper.Viper) *Config { err = config.Log.SetLogger() logging.OnError(err).Fatal("unable to set logger") + id.Configure(config.Machine) + return config } diff --git a/cmd/initialise/init.go b/cmd/initialise/init.go index 14c4a0cfcc..9a62a87994 100644 --- a/cmd/initialise/init.go +++ b/cmd/initialise/init.go @@ -9,7 +9,6 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/id" ) var ( @@ -58,8 +57,6 @@ The user provided by flags needs privileges to } func InitAll(config *Config) { - id.Configure(config.Machine) - err := initialise(config.Database, VerifyUser(config.Database.Username(), config.Database.Password()), VerifyDatabase(config.Database.Database()), diff --git a/cmd/initialise/verify_database.go b/cmd/initialise/verify_database.go index 08133472c5..e9f46687f9 100644 --- a/cmd/initialise/verify_database.go +++ b/cmd/initialise/verify_database.go @@ -25,7 +25,7 @@ The user provided by flags needs priviledge to - grant all rights of the ZITADEL database to the user created if not yet set `, Run: func(cmd *cobra.Command, args []string) { - config := MustNewConfig(viper.New()) + config := MustNewConfig(viper.GetViper()) err := initialise(config.Database, VerifyDatabase(config.Database.Database())) logging.OnError(err).Fatal("unable to initialize the database") diff --git a/cmd/initialise/verify_grant.go b/cmd/initialise/verify_grant.go index 24915c7caf..bbe2b639ee 100644 --- a/cmd/initialise/verify_grant.go +++ b/cmd/initialise/verify_grant.go @@ -20,7 +20,7 @@ Prereqesits: - cockroachDB or postgreSQL `, Run: func(cmd *cobra.Command, args []string) { - config := MustNewConfig(viper.New()) + config := MustNewConfig(viper.GetViper()) err := initialise(config.Database, VerifyGrant(config.Database.Database(), config.Database.Username())) logging.OnError(err).Fatal("unable to set grant") diff --git a/cmd/initialise/verify_user.go b/cmd/initialise/verify_user.go index 0dddb50f7f..702b51f126 100644 --- a/cmd/initialise/verify_user.go +++ b/cmd/initialise/verify_user.go @@ -25,7 +25,7 @@ The user provided by flags needs priviledge to - grant all rights of the ZITADEL database to the user created if not yet set `, Run: func(cmd *cobra.Command, args []string) { - config := MustNewConfig(viper.New()) + config := MustNewConfig(viper.GetViper()) err := initialise(config.Database, VerifyUser(config.Database.Username(), config.Database.Password())) logging.OnError(err).Fatal("unable to init user") diff --git a/cmd/start/config.go b/cmd/start/config.go index 66f97b06c7..86bbef92e9 100644 --- a/cmd/start/config.go +++ b/cmd/start/config.go @@ -20,6 +20,7 @@ import ( "github.com/zitadel/zitadel/internal/config/systemdefaults" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/query/projection" static_config "github.com/zitadel/zitadel/internal/static/config" metrics "github.com/zitadel/zitadel/internal/telemetry/metrics/config" @@ -54,6 +55,7 @@ type Config struct { AuditLogRetention time.Duration SystemAPIUsers map[string]*internal_authz.SystemAPIUser CustomerPortal string + Machine *id.Config } func MustNewConfig(v *viper.Viper) *Config { @@ -79,6 +81,8 @@ func MustNewConfig(v *viper.Viper) *Config { err = config.Metrics.NewMeter() logging.OnError(err).Fatal("unable to set meter") + id.Configure(config.Machine) + return config }