Merge pull request 'update to latest micro' (#77) from micro-v4 into master

Reviewed-on: #77

flag.go

@@ -1,4 +1,4 @@
-package flag // import "go.unistack.org/micro-config-flag/v3"
+package flag // import "go.unistack.org/micro-config-flag/v4"
 
 import (
 	"context"
@@ -10,8 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"go.unistack.org/micro/v3/config"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/micro/v4/options"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var (
@@ -39,7 +40,7 @@ func (c *flagConfig) Options() config.Options {
 	return c.opts
 }
 
-func (c *flagConfig) Init(opts ...config.Option) error {
+func (c *flagConfig) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&c.opts)
 	}
@@ -155,7 +156,7 @@ func (c *flagConfig) Init(opts ...config.Option) error {
 	return nil
 }
 
-func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
+func (c *flagConfig) Load(ctx context.Context, opts ...options.Option) error {
 	options := config.NewLoadOptions(opts...)
 	_ = options
 
@@ -173,7 +174,7 @@ func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error
 	return nil
 }
 
-func (c *flagConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
+func (c *flagConfig) Save(ctx context.Context, opts ...options.Option) error {
 	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -193,7 +194,7 @@ func (c *flagConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *flagConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
+func (c *flagConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
 	return nil, fmt.Errorf("not implemented")
 }
 
@@ -308,7 +309,7 @@ func (c *flagConfig) configure() {
 	c.name = flagSetName
 }
 
-func NewConfig(opts ...config.Option) config.Config {
+func NewConfig(opts ...options.Option) config.Config {
 	options := config.NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = DefaultStructTag

flag_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
 )
 
 func TestLoad(t *testing.T) {

go.mod

@@ -1,7 +1,10 @@
-module go.unistack.org/micro-config-flag/v3
+module go.unistack.org/micro-config-flag/v4
 
 go 1.18
 
-require go.unistack.org/micro/v3 v3.10.16
+require go.unistack.org/micro/v4 v4.0.5
 
-require github.com/imdario/mergo v0.3.13 // indirect
+require (
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
+)

go.sum

@@ -1,10 +1,13 @@
-github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-go.unistack.org/micro/v3 v3.10.16 h1:2er/SKKYbV60M+UuJM4eYCF0MZYAIq/yNUrAbTfgq8Q=
-go.unistack.org/micro/v3 v3.10.16/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
+github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
+go.unistack.org/micro/v4 v4.0.5 h1:uacmV8yHjCOtVfECc4w1tgp6bd3bBWrZa8X4iQLk48g=
+go.unistack.org/micro/v4 v4.0.5/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

options.go

@@ -3,62 +3,61 @@ package flag
 import (
 	"flag"
 
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/options"
 )
 
 type sliceDelimKey struct{}
 
 // SliceDelim set the slice delimeter
-func SliceDelim(s string) config.Option {
-	return config.SetOption(sliceDelimKey{}, s)
+func SliceDelim(s string) options.Option {
+	return options.ContextOption(sliceDelimKey{}, s)
 }
 
 type mapDelimKey struct{}
 
 // MapDelim set the map delimeter
-func MapDelim(s string) config.Option {
-	return config.SetOption(mapDelimKey{}, s)
+func MapDelim(s string) options.Option {
+	return options.ContextOption(mapDelimKey{}, s)
 }
 
 type timeFormatKey struct{}
 
 // TimeFormat set the time format
-func TimeFormat(s string) config.Option {
-	return config.SetOption(timeFormatKey{}, s)
+func TimeFormat(s string) options.Option {
+	return options.ContextOption(timeFormatKey{}, s)
 }
 
 type flagSetKey struct{}
 
 // FlagSet set flag set name
-func FlagSet(f *flag.FlagSet) config.Option {
-	return config.SetOption(flagSetKey{}, f)
+func FlagSet(f *flag.FlagSet) options.Option {
+	return options.ContextOption(flagSetKey{}, f)
 }
 
 type flagSetNameKey struct{}
 
 // FlagSetName set flag set name
-func FlagSetName(n string) config.Option {
-	return config.SetOption(flagSetNameKey{}, n)
+func FlagSetName(n string) options.Option {
+	return options.ContextOption(flagSetNameKey{}, n)
 }
 
 type flagSetErrorHandlingKey struct{}
 
 // FlagErrorHandling set flag set error handling
-func FlagErrorHandling(eh flag.ErrorHandling) config.Option {
-	return config.SetOption(flagSetErrorHandlingKey{}, eh)
+func FlagErrorHandling(eh flag.ErrorHandling) options.Option {
+	return options.ContextOption(flagSetErrorHandlingKey{}, eh)
 }
 
 type flagSetUsageKey struct{}
 
 // FlagUsage set flag set usage func
-func FlagUsage(fn func()) config.Option {
-	return config.SetOption(flagSetUsageKey{}, fn)
+func FlagUsage(fn func()) options.Option {
+	return options.ContextOption(flagSetUsageKey{}, fn)
 }
 
-
 type flagEnvKey struct{}
 
 // FlagEnv set flag set usage func
-func FlagEnv(n string) config.Option {
-	return config.SetOption(flagEnvKey{}, n)
+func FlagEnv(n string) options.Option {
+	return options.ContextOption(flagEnvKey{}, n)
 }