Browse Source

fix lint

pull/4/head
andrey 4 months ago
parent
commit
126ec4cb88
  1. 3
      .drone.yml
  2. 2
      .golangci.yml
  3. 1
      client.go
  4. 8
      provider/arg/provider.go
  5. 1
      provider/arg/provider_test.go
  6. 2
      provider/env/provider.go
  7. 1
      provider/watcher/provider.go
  8. 7
      provider/watcher/provider_test.go
  9. 2
      test/provider_suite.go
  10. 2
      value.go

3
.drone.yml

@ -10,7 +10,8 @@ steps:
- name: test - name: test
image: golang image: golang
commands: commands:
- go test -parallel 10 -race ./... # - go test -parallel 10 -race ./...
- go test -race ./...
- name: golangci-lint - name: golangci-lint
image: golangci/golangci-lint:v1.53 image: golangci/golangci-lint:v1.53

2
.golangci.yml

@ -43,6 +43,8 @@ linters:
- ifshort - ifshort
- nosnakecase - nosnakecase
- ireturn # implement provider interface
issues: issues:
# Excluding configuration per-path, per-linter, per-text and per-source # Excluding configuration per-path, per-linter, per-text and per-source
exclude-rules: exclude-rules:

1
client.go

@ -124,7 +124,6 @@ func (c *Client) Value(ctx context.Context, path ...string) (Value, error) {
} }
func (c *Client) Watch(ctx context.Context, callback WatchCallback, path ...string) error { func (c *Client) Watch(ctx context.Context, callback WatchCallback, path ...string) error {
for idx, prov := range c.providers { for idx, prov := range c.providers {
provider, ok := prov.(WatchProvider) provider, ok := prov.(WatchProvider)
if !ok { if !ok {

8
provider/arg/provider.go

@ -106,7 +106,7 @@ func (p *Provider) Name() string {
return p.name return p.name
} }
func (p *Provider) Value(ctx context.Context, path ...string) (config.Value, error) { func (p *Provider) Value(_ context.Context, path ...string) (config.Value, error) {
if err := p.parse(); err != nil { if err := p.parse(); err != nil {
return nil, err return nil, err
} }
@ -123,7 +123,11 @@ func (p *Provider) Value(ctx context.Context, path ...string) (config.Value, err
} }
return value.Decode(func(v interface{}) error { return value.Decode(func(v interface{}) error {
return json.Unmarshal(data, v) if err := json.Unmarshal(data, v); err != nil {
return fmt.Errorf("unmarshal:%w", err)
}
return nil
}), nil }), nil
} }
} }

1
provider/arg/provider_test.go

@ -58,6 +58,7 @@ func (d *Duration) UnmarshalJSON(in []byte) error {
if err != nil { if err != nil {
return fmt.Errorf("parse:%w", err) return fmt.Errorf("parse:%w", err)
} }
d.Duration = o d.Duration = o
return nil return nil

2
provider/env/provider.go

@ -45,7 +45,7 @@ func (p *Provider) Name() string {
return p.name return p.name
} }
func (p *Provider) Value(ctx context.Context, path ...string) (config.Value, error) { func (p *Provider) Value(_ context.Context, path ...string) (config.Value, error) {
name := p.prefix + p.key(path...) name := p.prefix + p.key(path...)
if val, ok := os.LookupEnv(name); ok { if val, ok := os.LookupEnv(name); ok {
return value.JString(val), nil return value.JString(val), nil

1
provider/watcher/provider.go

@ -67,7 +67,6 @@ func (p *Provider) Watch(ctx context.Context, callback config.WatchCallback, key
return return
} }
p.logger(ctx, "callback %v:%v", key, err) p.logger(ctx, "callback %v:%v", key, err)
} }
oldVar = newVar oldVar = newVar
} }

7
provider/watcher/provider_test.go

@ -2,7 +2,7 @@ package watcher_test
import ( import (
"context" "context"
"fmt" "strconv"
"sync" "sync"
"sync/atomic" "sync/atomic"
"testing" "testing"
@ -14,6 +14,8 @@ import (
"gitoa.ru/go-4devs/config/value" "gitoa.ru/go-4devs/config/value"
) )
var _ config.Provider = (*provider)(nil)
type provider struct { type provider struct {
cnt int32 cnt int32
} }
@ -25,7 +27,7 @@ func (p *provider) Name() string {
func (p *provider) Value(context.Context, ...string) (config.Value, error) { func (p *provider) Value(context.Context, ...string) (config.Value, error) {
p.cnt++ p.cnt++
return value.JString(fmt.Sprint(p.cnt)), nil return value.JString(strconv.Itoa(int(p.cnt))), nil
} }
func TestWatcher(t *testing.T) { func TestWatcher(t *testing.T) {
@ -57,6 +59,7 @@ func TestWatcher(t *testing.T) {
}, },
"tmpname", "tmpname",
) )
wg.Wait() wg.Wait()
require.NoError(t, err) require.NoError(t, err)

2
test/provider_suite.go

@ -26,10 +26,8 @@ func Run(t *testing.T, provider config.Provider, read []Read) {
val, err := provider.Value(ctx, read.Key...) val, err := provider.Value(ctx, read.Key...)
require.NoError(t, err, read.Key) require.NoError(t, err, read.Key)
read.Assert(t, val) read.Assert(t, val)
}) })
} }
} }
type Read struct { type Read struct {

2
value.go

@ -8,7 +8,7 @@ type Value interface {
ReadValue ReadValue
ParseValue ParseValue
UnmarshalValue UnmarshalValue
IsEquals(Value) bool IsEquals(in Value) bool
} }
type UnmarshalValue interface { type UnmarshalValue interface {

Loading…
Cancel
Save