Skip to content

Commit

Permalink
chore: revert #17534 (c39990c) (#18096)
Browse files Browse the repository at this point in the history
  • Loading branch information
andig authored Jan 6, 2025
1 parent 711f5e5 commit 3e6f23e
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 3 deletions.
42 changes: 39 additions & 3 deletions provider/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
)

type constProvider struct {
*getter
ctx context.Context
str string
set Config
Expand Down Expand Up @@ -39,8 +38,6 @@ func NewConstFromConfig(ctx context.Context, other map[string]interface{}) (Prov
set: cc.Set,
}

p.getter = defaultGetters(p, 1)

return p, nil
}

Expand All @@ -52,6 +49,45 @@ func (p *constProvider) StringGetter() (func() (string, error), error) {
}, nil
}

var _ IntProvider = (*constProvider)(nil)

func (p *constProvider) IntGetter() (func() (int64, error), error) {
val, err := strconv.ParseInt(p.str, 10, 64)
if err != nil && p.str == "" {
err = nil
}

return func() (int64, error) {
return val, err
}, err
}

var _ FloatProvider = (*constProvider)(nil)

func (p *constProvider) FloatGetter() (func() (float64, error), error) {
val, err := strconv.ParseFloat(p.str, 64)
if err != nil && p.str == "" {
err = nil
}

return func() (float64, error) {
return val, err
}, err
}

var _ BoolProvider = (*constProvider)(nil)

func (p *constProvider) BoolGetter() (func() (bool, error), error) {
val, err := strconv.ParseBool(p.str)
if err != nil && p.str == "" {
err = nil
}

return func() (bool, error) {
return val, err
}, err
}

var _ SetIntProvider = (*constProvider)(nil)

func (p *constProvider) IntSetter(param string) (func(int64) error, error) {
Expand Down
40 changes: 40 additions & 0 deletions provider/const_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package provider

import (
"context"
"testing"

"github.com/stretchr/testify/assert"
)

func TestConst(t *testing.T) {
p, err := NewConstFromConfig(context.TODO(), map[string]interface{}{"value": nil})
assert.NoError(t, err)

{
g, err := p.(StringProvider).StringGetter()
assert.NoError(t, err)

v, err := g()
assert.NoError(t, err)
assert.Equal(t, "", v)
}

{
g, err := p.(IntProvider).IntGetter()
assert.NoError(t, err)

v, err := g()
assert.NoError(t, err)
assert.Equal(t, int64(0), v)
}

{
g, err := p.(FloatProvider).FloatGetter()
assert.NoError(t, err)

v, err := g()
assert.NoError(t, err)
assert.Equal(t, float64(0), v)
}
}

0 comments on commit 3e6f23e

Please sign in to comment.