Merge pull request 'Update workflows' (#81) from atolstikhin/micro-config-flag:v3 into v3

Reviewed-on: #81

flag.go

@@ -1,4 +1,4 @@
-package flag // import "go.unistack.org/micro-config-flag/v4"
+package flag
 
 import (
 	"context"
@@ -10,9 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"go.unistack.org/micro/v4/config"
-	"go.unistack.org/micro/v4/options"
-	rutil "go.unistack.org/micro/v4/util/reflect"
+	"go.unistack.org/micro/v3/config"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
 var (
@@ -40,13 +39,9 @@ func (c *flagConfig) Options() config.Options {
 	return c.opts
 }
 
-func (c *flagConfig) Init(opts ...options.Option) error {
-	var err error
-
+func (c *flagConfig) Init(opts ...config.Option) error {
 	for _, o := range opts {
-		if err = o(&c.opts); err != nil {
-			return err
-		}
+		o(&c.opts)
 	}
 
 	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
@@ -160,7 +155,7 @@ func (c *flagConfig) Init(opts ...options.Option) error {
 	return nil
 }
 
-func (c *flagConfig) Load(ctx context.Context, opts ...options.Option) error {
+func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
 	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
 		return nil
 	}
@@ -182,7 +177,7 @@ func (c *flagConfig) Load(ctx context.Context, opts ...options.Option) error {
 	return nil
 }
 
-func (c *flagConfig) Save(ctx context.Context, opts ...options.Option) error {
+func (c *flagConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
 	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
 		return nil
 	}
@@ -206,7 +201,7 @@ func (c *flagConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *flagConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
+func (c *flagConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
 	return nil, fmt.Errorf("not implemented")
 }
 
@@ -321,7 +316,7 @@ func (c *flagConfig) configure() {
 	c.name = flagSetName
 }
 
-func NewConfig(opts ...options.Option) config.Config {
+func NewConfig(opts ...config.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/v4/config"
+	"go.unistack.org/micro/v3/config"
 )
 
 func TestLoad(t *testing.T) {

go.mod

@@ -1,10 +1,16 @@
-module go.unistack.org/micro-config-flag/v4
+module go.unistack.org/micro-config-flag/v3
 
-go 1.18
+go 1.22
 
-require go.unistack.org/micro/v4 v4.0.17
+toolchain go1.23.1
+
+require go.unistack.org/micro/v3 v3.11.14
 
 require (
-	dario.cat/mergo v1.0.0 // indirect
+	dario.cat/mergo v1.0.1 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	google.golang.org/protobuf v1.35.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,9 +1,17 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-go.unistack.org/micro/v4 v4.0.17 h1:mF7uM+J4ILdG+1fcwzKYCwDlxhdbF/e1WnGzKKLnIXc=
-go.unistack.org/micro/v4 v4.0.17/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
+go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
+go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v3 v3.11.14 h1:3e9T30Ih9cvqZTCD8inG1qsBWRk4x5ZinWuTiDFM4CE=
+go.unistack.org/micro/v3 v3.11.14/go.mod h1:k++F5Ej4LIy3XnOW/oj3P7B97wp2t9yLSlqtUzMpatM=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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,61 +3,62 @@ package flag
 import (
 	"flag"
 
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v3/config"
 )
 
 type sliceDelimKey struct{}
 
 // SliceDelim set the slice delimeter
-func SliceDelim(s string) options.Option {
-	return options.ContextOption(sliceDelimKey{}, s)
+func SliceDelim(s string) config.Option {
+	return config.SetOption(sliceDelimKey{}, s)
 }
 
 type mapDelimKey struct{}
 
 // MapDelim set the map delimeter
-func MapDelim(s string) options.Option {
-	return options.ContextOption(mapDelimKey{}, s)
+func MapDelim(s string) config.Option {
+	return config.SetOption(mapDelimKey{}, s)
 }
 
 type timeFormatKey struct{}
 
 // TimeFormat set the time format
-func TimeFormat(s string) options.Option {
-	return options.ContextOption(timeFormatKey{}, s)
+func TimeFormat(s string) config.Option {
+	return config.SetOption(timeFormatKey{}, s)
 }
 
 type flagSetKey struct{}
 
 // FlagSet set flag set name
-func FlagSet(f *flag.FlagSet) options.Option {
-	return options.ContextOption(flagSetKey{}, f)
+func FlagSet(f *flag.FlagSet) config.Option {
+	return config.SetOption(flagSetKey{}, f)
 }
 
 type flagSetNameKey struct{}
 
 // FlagSetName set flag set name
-func FlagSetName(n string) options.Option {
-	return options.ContextOption(flagSetNameKey{}, n)
+func FlagSetName(n string) config.Option {
+	return config.SetOption(flagSetNameKey{}, n)
 }
 
 type flagSetErrorHandlingKey struct{}
 
 // FlagErrorHandling set flag set error handling
-func FlagErrorHandling(eh flag.ErrorHandling) options.Option {
-	return options.ContextOption(flagSetErrorHandlingKey{}, eh)
+func FlagErrorHandling(eh flag.ErrorHandling) config.Option {
+	return config.SetOption(flagSetErrorHandlingKey{}, eh)
 }
 
 type flagSetUsageKey struct{}
 
 // FlagUsage set flag set usage func
-func FlagUsage(fn func()) options.Option {
-	return options.ContextOption(flagSetUsageKey{}, fn)
+func FlagUsage(fn func()) config.Option {
+	return config.SetOption(flagSetUsageKey{}, fn)
 }
 
+
 type flagEnvKey struct{}
 
 // FlagEnv set flag set usage func
-func FlagEnv(n string) options.Option {
-	return options.ContextOption(flagEnvKey{}, n)
+func FlagEnv(n string) config.Option {
+	return config.SetOption(flagEnvKey{}, n)
 }