Compare commits

...

3 Commits

Author SHA1 Message Date
770e8425bd config: move reflect stuff to util/reflect
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2021-01-19 01:40:34 +03:00
4783c6d9a3 client: add option helper
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2021-01-19 00:45:55 +03:00
2b2bcf4586 client: add call option helper
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2021-01-18 23:48:50 +03:00
5 changed files with 33 additions and 4 deletions

View File

@@ -5,6 +5,7 @@ import (
"github.com/unistack-org/micro/v3/api/resolver"
"github.com/unistack-org/micro/v3/api/resolver/vpath"
"github.com/unistack-org/micro/v3/logger"
"github.com/unistack-org/micro/v3/registry"
)
@@ -12,6 +13,7 @@ type Options struct {
Handler string
Registry registry.Registry
Resolver resolver.Resolver
Logger logger.Logger
Context context.Context
}

View File

@@ -32,3 +32,23 @@ func SetPublishOption(k, v interface{}) PublishOption {
o.Context = context.WithValue(o.Context, k, v)
}
}
// SetCallOption returns a function to setup a context with given value
func SetCallOption(k, v interface{}) CallOption {
return func(o *CallOptions) {
if o.Context == nil {
o.Context = context.Background()
}
o.Context = context.WithValue(o.Context, k, v)
}
}
// SetOption returns a function to setup a context with given value
func SetOption(k, v interface{}) Option {
return func(o *Options) {
if o.Context == nil {
o.Context = context.Background()
}
o.Context = context.WithValue(o.Context, k, v)
}
}

View File

@@ -5,6 +5,8 @@ import (
"reflect"
"strconv"
"strings"
rutil "github.com/unistack-org/micro/v3/util/reflect"
)
type defaultConfig struct {
@@ -45,7 +47,7 @@ func (c *defaultConfig) Load(ctx context.Context) error {
}
func (c *defaultConfig) fillValue(ctx context.Context, value reflect.Value, val string) error {
if !IsEmpty(value) {
if !rutil.IsEmpty(value) {
return nil
}
switch value.Kind() {

View File

@@ -3,7 +3,7 @@ package config_test
import (
"testing"
"github.com/unistack-org/micro/v3/config"
rutil "github.com/unistack-org/micro/v3/util/reflect"
)
type Config struct {
@@ -18,7 +18,7 @@ type SubConfig struct {
func TestReflect(t *testing.T) {
cfg1 := &Config{Value: "cfg1", Config: &Config{Value: "cfg1_1"}, SubConfig: &SubConfig{Value: "cfg1"}}
cfg2, err := config.Zero(cfg1)
cfg2, err := rutil.Zero(cfg1)
if err != nil {
t.Fatal(err)
}

View File

@@ -1,9 +1,14 @@
package config
package reflect
import (
"errors"
"reflect"
)
var (
ErrInvalidStruct = errors.New("invalid struct specified")
)
func IsEmpty(v reflect.Value) bool {
switch v.Kind() {
case reflect.Array, reflect.Map, reflect.Slice, reflect.String: