mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-18 05:47:32 +00:00
9e32740eb8
* start org * refactor(eventstore): filter in sql for querier * feat(eventstore): Aggregate precondition preconditions are checked right before insert. Insert is still transaction save * feat(eventstore): check preconditions in repository * test(eventstore): test precondition in models * test(eventstore): precondition-tests * start org * refactor(eventstore): filter in sql for querier * feat(eventstore): Aggregate precondition preconditions are checked right before insert. Insert is still transaction save * feat(admin): start implement org * feat(eventstore): check preconditions in repository * fix(eventstore): data as NULL if empty refactor(eventstore): naming in sequence methods * feat(admin): org command side * feat(management): start org-repo * feat(org): member * fix: replace ObjectRoot.ID with ObjectRoot.AggregateID * aggregateID * add remove,change member * refactor(org): namings * refactor(eventstore): querier as type * fix(precondition): rename validation from precondition to validation * test(eventstore): isErr func instead of wantErr bool * fix(tests): Data * fix(eventstore): correct check for existing events in push, simplify insert statement * fix(eventstore): aggregate id public * test(org): eventsourcing * test(org): eventstore * test(org): deactivate, reactivate, orgbyid * test(org): getMemberByIDs * tests * running tests * add user repo to admin * thorw not found if no org found * eventstore tests done * lauft * validate if user is already member of org * modules * delete unused file * add member validation test * return error if unable to validat member * generate org id once, set resourceowner of org * Update internal/admin/repository/eventsourcing/eventstore/org.go * Update internal/admin/repository/eventsourcing/eventstore/org.go * Update internal/org/repository/eventsourcing/member_model.go * Update internal/org/repository/eventsourcing/org.go * Update internal/org/repository/eventsourcing/org.go * Update internal/org/repository/eventsourcing/org_member.go * Update internal/org/repository/eventsourcing/org_member.go * Update internal/org/repository/eventsourcing/org_model.go * Update internal/org/repository/eventsourcing/org.go * Update internal/org/repository/eventsourcing/org_model.go * Update internal/org/repository/eventsourcing/org_model.go * typo * correct user events * usercreate for setuporg instead of userregister * set data * mod * mod * tests * cleanup code * code styling * return member on add and change * change username in startup * girignore * orgID as parameter in re-/deactive org * startup config * migration for admin_api-user * probes fro admin * move unique org Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
79 lines
1.8 KiB
Go
79 lines
1.8 KiB
Go
package config
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/BurntSushi/toml"
|
|
"github.com/ghodss/yaml"
|
|
|
|
"github.com/caos/zitadel/internal/errors"
|
|
)
|
|
|
|
type ValidatableConfiguration interface {
|
|
Validate() error
|
|
}
|
|
|
|
type ReaderFunc func(data []byte, o interface{}) error
|
|
|
|
var (
|
|
JSONReader = json.Unmarshal
|
|
TOMLReader = toml.Unmarshal
|
|
YAMLReader = func(data []byte, o interface{}) error { return yaml.Unmarshal(data, o) }
|
|
)
|
|
|
|
// Read deserializes each config file to the target obj
|
|
// using a Reader (depending on file extension)
|
|
// env vars are replaced in the config file as well as the file path
|
|
func Read(obj interface{}, configFiles ...string) error {
|
|
for _, cf := range configFiles {
|
|
readerFunc, err := readerFuncForFile(cf)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := readConfigFile(readerFunc, cf, obj); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if validatable, ok := obj.(ValidatableConfiguration); ok {
|
|
if err := validatable.Validate(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func readConfigFile(readerFunc ReaderFunc, configFile string, obj interface{}) error {
|
|
configFile = os.ExpandEnv(configFile)
|
|
|
|
configStr, err := ioutil.ReadFile(configFile)
|
|
if err != nil {
|
|
return errors.ThrowInternalf(err, "CONFI-nJk2a", "failed to read config file %s", configFile)
|
|
}
|
|
|
|
configStr = []byte(os.ExpandEnv(string(configStr)))
|
|
|
|
if err := readerFunc(configStr, obj); err != nil {
|
|
return errors.ThrowInternalf(err, "CONFI-2Mc3c", "error parse config file %s", configFile)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func readerFuncForFile(configFile string) (ReaderFunc, error) {
|
|
ext := filepath.Ext(configFile)
|
|
switch ext {
|
|
case ".yaml", ".yml":
|
|
return YAMLReader, nil
|
|
case ".json":
|
|
return JSONReader, nil
|
|
case ".toml":
|
|
return TOMLReader, nil
|
|
}
|
|
return nil, errors.ThrowUnimplementedf(nil, "CONFI-ZLk4u", "file extension (%s) not supported", ext)
|
|
}
|