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

fix: clarify instances in steps and config (#4003)

Browse Source 
* fix: clarify instances in steps and config

* docs: update setup step

Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Silvan
2022-07-27 10:22:20 +02:00
committed by GitHub
parent 5bd9badbcf
commit 0b742233f9
12 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/setup/03.go
View File

@@ -16,9 +16,8 @@ import (
"github.com/zitadel/zitadel/internal/eventstore"
)
type DefaultInstance struct {
type FirstInstance struct {
InstanceName string
CustomDomain string
DefaultLanguage language.Tag
Org command.OrgSetup
@@ -33,9 +32,10 @@ type DefaultInstance struct {
externalDomain string
externalSecure bool
externalPort uint16
domain string
}
func (mig *DefaultInstance) Execute(ctx context.Context) error {
func (mig *FirstInstance) Execute(ctx context.Context) error {
keyStorage, err := crypto_db.NewKeyStorage(mig.db, mig.masterKey)
if err != nil {
return fmt.Errorf("cannot start key storage: %w", err)
@@ -77,7 +77,7 @@ func (mig *DefaultInstance) Execute(ctx context.Context) error {
}
mig.instanceSetup.InstanceName = mig.InstanceName
mig.instanceSetup.CustomDomain = mig.CustomDomain
mig.instanceSetup.CustomDomain = mig.externalDomain
mig.instanceSetup.DefaultLanguage = mig.DefaultLanguage
mig.instanceSetup.Org = mig.Org
mig.instanceSetup.Org.Human.Email.Address = strings.TrimSpace(mig.instanceSetup.Org.Human.Email.Address)
@@ -89,7 +89,7 @@ func (mig *DefaultInstance) Execute(ctx context.Context) error {
return err
}
func (mig *DefaultInstance) String() string {
func (mig *FirstInstance) String() string {
return "03_default_instance"
}

2
cmd/setup/config.go
View File

@@ -49,7 +49,7 @@ func MustNewConfig(v *viper.Viper) *Config {
type Steps struct {
s1ProjectionTable *ProjectionTable
s2AssetsTable *AssetTable
S3DefaultInstance *DefaultInstance
FirstInstance *FirstInstance
}
type encryptionKeyConfig struct {

24
cmd/setup/setup.go
View File

@@ -66,17 +66,17 @@ func Setup(config *Config, steps *Steps, masterKey string) {
steps.s1ProjectionTable = &ProjectionTable{dbClient: dbClient}
steps.s2AssetsTable = &AssetTable{dbClient: dbClient}
steps.S3DefaultInstance.instanceSetup = config.DefaultInstance
steps.S3DefaultInstance.userEncryptionKey = config.EncryptionKeys.User
steps.S3DefaultInstance.smtpEncryptionKey = config.EncryptionKeys.SMTP
steps.S3DefaultInstance.masterKey = masterKey
steps.S3DefaultInstance.db = dbClient
steps.S3DefaultInstance.es = eventstoreClient
steps.S3DefaultInstance.defaults = config.SystemDefaults
steps.S3DefaultInstance.zitadelRoles = config.InternalAuthZ.RolePermissionMappings
steps.S3DefaultInstance.externalDomain = config.ExternalDomain
steps.S3DefaultInstance.externalSecure = config.ExternalSecure
steps.S3DefaultInstance.externalPort = config.ExternalPort
steps.FirstInstance.instanceSetup = config.DefaultInstance
steps.FirstInstance.userEncryptionKey = config.EncryptionKeys.User
steps.FirstInstance.smtpEncryptionKey = config.EncryptionKeys.SMTP
steps.FirstInstance.masterKey = masterKey
steps.FirstInstance.db = dbClient
steps.FirstInstance.es = eventstoreClient
steps.FirstInstance.defaults = config.SystemDefaults
steps.FirstInstance.zitadelRoles = config.InternalAuthZ.RolePermissionMappings
steps.FirstInstance.externalDomain = config.ExternalDomain
steps.FirstInstance.externalSecure = config.ExternalSecure
steps.FirstInstance.externalPort = config.ExternalPort
repeatableSteps := []migration.RepeatableMigration{
&externalConfigChange{
@@ -92,7 +92,7 @@ func Setup(config *Config, steps *Steps, masterKey string) {
logging.OnError(err).Fatal("unable to migrate step 1")
err = migration.Migrate(ctx, eventstoreClient, steps.s2AssetsTable)
logging.OnError(err).Fatal("unable to migrate step 2")
err = migration.Migrate(ctx, eventstoreClient, steps.S3DefaultInstance)
err = migration.Migrate(ctx, eventstoreClient, steps.FirstInstance)
logging.OnError(err).Fatal("unable to migrate step 3")
for _, repeatableStep := range repeatableSteps {

5
cmd/setup/steps.yaml
View File

@@ -1,6 +1,5 @@
S3DefaultInstance:
InstanceName: Localhost
CustomDomain: localhost
FirstInstance:
InstanceName: ZITADEL
DefaultLanguage: en
Org:
Name: ZITADEL