unistack-org/micro-config-service
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

update

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2021-06-21 16:00:32 +03:00
parent e118b32d00
commit cc6c4c002a
3 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service.go
View File

@@ -54,7 +54,7 @@ func (c *serviceConfig) Init(opts ...config.Option) error {
return nil
}
func (c *serviceConfig) Load(ctx context.Context) error {
func (c *serviceConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
for _, fn := range c.opts.BeforeLoad {
if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
return err
@@ -66,11 +66,20 @@ func (c *serviceConfig) Load(ctx context.Context) error {
return fmt.Errorf("failed to load config: %w", err)
}
options := config.NewLoadOptions(opts...)
mopts := []func(*mergo.Config){mergo.WithTypeCheck}
if options.Override {
mopts = append(mopts, mergo.WithOverride)
}
if options.Append {
mopts = append(mopts, mergo.WithAppendSlice)
}
src, err := rutil.Zero(c.opts.Struct)
if err == nil {
err = c.opts.Codec.Unmarshal(rsp.Config, src)
if err == nil {
err = mergo.Merge(c.opts.Struct, src, mergo.WithOverride, mergo.WithTypeCheck, mergo.WithAppendSlice)
err = mergo.Merge(c.opts.Struct, src, mopts...)
}
}
if err != nil && !c.opts.AllowFail {
@@ -86,7 +95,7 @@ func (c *serviceConfig) Load(ctx context.Context) error {
return nil
}
func (c *serviceConfig) Save(ctx context.Context) error {
func (c *serviceConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
for _, fn := range c.opts.BeforeSave {
if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
return err