fixup load options using
Some checks failed
build / test (push) Has been cancelled
build / lint (push) Has been cancelled
codeql / analyze (go) (push) Failing after 1m8s

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2024-04-17 16:55:13 +03:00
parent 8368768957
commit ae787511f4

13
file.go
View File

@ -81,11 +81,20 @@ func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error {
} }
path := c.path path := c.path
transformer := c.transformer
reader := c.reader
options := config.NewLoadOptions(opts...) options := config.NewLoadOptions(opts...)
if options.Context != nil { if options.Context != nil {
if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" { if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" {
path = v path = v
} }
if v, ok := c.opts.Context.Value(transformerKey{}).(transform.Transformer); ok {
transformer = v
}
if v, ok := c.opts.Context.Value(readerKey{}).(io.Reader); ok {
reader = v
}
} }
var fp io.Reader var fp io.Reader
@ -94,7 +103,7 @@ func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error {
if c.path != "" { if c.path != "" {
fp, err = os.OpenFile(path, os.O_RDONLY, os.FileMode(0o400)) fp, err = os.OpenFile(path, os.O_RDONLY, os.FileMode(0o400))
} else if c.reader != nil { } else if c.reader != nil {
fp = c.reader fp = reader
} else { } else {
err = fmt.Errorf("Path or Reader must be specified") err = fmt.Errorf("Path or Reader must be specified")
} }
@ -119,7 +128,7 @@ func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error {
} }
var r io.Reader var r io.Reader
if c.transformer != nil { if transformer != nil {
r = transform.NewReader(fp, c.transformer) r = transform.NewReader(fp, c.transformer)
} else { } else {
r = fp r = fp