10 changed files with 31 additions and 229 deletions
@ -1,101 +0,0 @@ |
|||
package yaml |
|||
|
|||
import ( |
|||
"context" |
|||
"errors" |
|||
"fmt" |
|||
"os" |
|||
|
|||
"gitoa.ru/go-4devs/config" |
|||
"gitoa.ru/go-4devs/config/value" |
|||
"gopkg.in/yaml.v3" |
|||
) |
|||
|
|||
const ( |
|||
Name = "yaml" |
|||
) |
|||
|
|||
var _ config.Provider = (*Provider)(nil) |
|||
|
|||
func NewFile(name string, opts ...Option) (*Provider, error) { |
|||
in, err := os.ReadFile(name) |
|||
if err != nil { |
|||
return nil, fmt.Errorf("yaml_file: read error: %w", err) |
|||
} |
|||
|
|||
return New(in, opts...) |
|||
} |
|||
|
|||
func New(yml []byte, opts ...Option) (*Provider, error) { |
|||
var data yaml.Node |
|||
if err := yaml.Unmarshal(yml, &data); err != nil { |
|||
return nil, fmt.Errorf("yaml: unmarshal err: %w", err) |
|||
} |
|||
|
|||
return create(opts...).With(&data), nil |
|||
} |
|||
|
|||
func create(opts ...Option) *Provider { |
|||
prov := Provider{ |
|||
name: Name, |
|||
} |
|||
|
|||
for _, opt := range opts { |
|||
opt(&prov) |
|||
} |
|||
|
|||
return &prov |
|||
} |
|||
|
|||
type Option func(*Provider) |
|||
|
|||
type Provider struct { |
|||
data node |
|||
name string |
|||
} |
|||
|
|||
func (p *Provider) Name() string { |
|||
return p.name |
|||
} |
|||
|
|||
func (p *Provider) Value(_ context.Context, path ...string) (config.Value, error) { |
|||
|
|||
return p.data.read(p.Name(), path) |
|||
} |
|||
|
|||
func (p *Provider) With(data *yaml.Node) *Provider { |
|||
return &Provider{ |
|||
data: node{Node: data}, |
|||
} |
|||
} |
|||
|
|||
type node struct { |
|||
*yaml.Node |
|||
} |
|||
|
|||
func (n *node) read(name string, keys []string) (config.Value, error) { |
|||
val, err := getData(n.Node.Content[0].Content, keys) |
|||
if err != nil { |
|||
if errors.Is(err, config.ErrValueNotFound) { |
|||
return nil, fmt.Errorf("%w: %s", config.ErrValueNotFound, name) |
|||
} |
|||
|
|||
return nil, fmt.Errorf("%w: %s", err, name) |
|||
} |
|||
|
|||
return value.Decode(val), nil |
|||
} |
|||
|
|||
func getData(node []*yaml.Node, keys []string) (func(interface{}) error, error) { |
|||
for idx := len(node) - 1; idx > 0; idx -= 2 { |
|||
if node[idx-1].Value == keys[0] { |
|||
if len(keys) > 1 { |
|||
return getData(node[idx].Content, keys[1:]) |
|||
} |
|||
|
|||
return node[idx].Decode, nil |
|||
} |
|||
} |
|||
|
|||
return nil, config.ErrValueNotFound |
|||
} |
|||
@ -1,26 +0,0 @@ |
|||
package yaml_test |
|||
|
|||
import ( |
|||
"testing" |
|||
"time" |
|||
|
|||
"github.com/stretchr/testify/require" |
|||
provider "gitoa.ru/go-4devs/config/provider/yaml" |
|||
"gitoa.ru/go-4devs/config/test" |
|||
) |
|||
|
|||
func TestProvider(t *testing.T) { |
|||
t.Parallel() |
|||
|
|||
prov, err := provider.New(test.ReadFile("config.yaml")) |
|||
require.Nil(t, err) |
|||
|
|||
read := []test.Read{ |
|||
test.NewRead(21*time.Minute, "duration_var"), |
|||
test.NewRead(true, "app", "name", "bool_var"), |
|||
test.NewRead(test.Time("2020-01-02T15:04:05Z"), "time_var"), |
|||
test.NewReadConfig("cfg"), |
|||
} |
|||
|
|||
test.Run(t, prov, read) |
|||
} |
|||
@ -1,46 +0,0 @@ |
|||
package yaml |
|||
|
|||
import ( |
|||
"context" |
|||
"fmt" |
|||
"os" |
|||
|
|||
"gitoa.ru/go-4devs/config" |
|||
"gopkg.in/yaml.v3" |
|||
) |
|||
|
|||
const NameWatch = "yaml_watch" |
|||
|
|||
func NewWatch(name string, opts ...Option) *Watch { |
|||
f := Watch{ |
|||
file: name, |
|||
prov: create(opts...), |
|||
name: NameWatch, |
|||
} |
|||
|
|||
return &f |
|||
} |
|||
|
|||
type Watch struct { |
|||
file string |
|||
prov *Provider |
|||
name string |
|||
} |
|||
|
|||
func (p *Watch) Name() string { |
|||
return p.name |
|||
} |
|||
|
|||
func (p *Watch) Value(ctx context.Context, path ...string) (config.Value, error) { |
|||
in, err := os.ReadFile(p.file) |
|||
if err != nil { |
|||
return nil, fmt.Errorf("yaml_file: read error: %w", err) |
|||
} |
|||
|
|||
var yNode yaml.Node |
|||
if err = yaml.Unmarshal(in, &yNode); err != nil { |
|||
return nil, fmt.Errorf("yaml_file: unmarshal error: %w", err) |
|||
} |
|||
|
|||
return p.prov.With(&yNode).Value(ctx, path...) |
|||
} |
|||
@ -1,14 +0,0 @@ |
|||
app: |
|||
title: yaml title |
|||
name: |
|||
var: |
|||
- test |
|||
bool_var: true |
|||
duration_var: 21m |
|||
empty_var: |
|||
url_var: "http://google.com/" |
|||
time_var: "2020-01-02T15:04:05Z" |
|||
cfg: |
|||
duration: 21m |
|||
enabled: true |
|||
type: yaml |
|||
@ -1,17 +0,0 @@ |
|||
package test |
|||
|
|||
import ( |
|||
"path/filepath" |
|||
"runtime" |
|||
) |
|||
|
|||
func FixturePath(file string) string { |
|||
path := "fixture/" |
|||
|
|||
_, filename, _, ok := runtime.Caller(0) |
|||
if ok { |
|||
path = filepath.Dir(filename) + "/" + path |
|||
} |
|||
|
|||
return path + file |
|||
} |
|||
@ -1,15 +0,0 @@ |
|||
package test |
|||
|
|||
import ( |
|||
"io/ioutil" |
|||
"log" |
|||
) |
|||
|
|||
func ReadFile(file string) []byte { |
|||
data, err := ioutil.ReadFile(FixturePath(file)) |
|||
if err != nil { |
|||
log.Fatal(err) |
|||
} |
|||
|
|||
return data |
|||
} |
|||
Loading…
Reference in new issue