Merge pull request 'move to micro v4' (#76) from v4 into master
Some checks failed
build / test (push) Failing after 7s
build / lint (push) Failing after 4s
codeql / analyze (go) (push) Failing after 5s

Reviewed-on: #76
This commit is contained in:
Василий Толстов 2023-05-05 19:58:39 +03:00
commit c325b0a760
5 changed files with 11 additions and 15 deletions

View File

@ -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,8 @@ import (
"strings"
"time"
"go.unistack.org/micro/v3/config"
rutil "go.unistack.org/micro/v3/util/reflect"
"go.unistack.org/micro/v4/config"
rutil "go.unistack.org/micro/v4/util/reflect"
)
var (

View File

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

4
go.mod
View File

@ -2,6 +2,6 @@ module go.unistack.org/micro-config-flag/v3
go 1.18
require go.unistack.org/micro/v3 v3.10.16
require go.unistack.org/micro/v4 v4.0.1
require github.com/imdario/mergo v0.3.13 // indirect
require github.com/imdario/mergo v0.3.14 // indirect

11
go.sum
View File

@ -1,10 +1,7 @@
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/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo=
github.com/imdario/mergo v0.3.14/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=
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=

View File

@ -3,7 +3,7 @@ package flag
import (
"flag"
"go.unistack.org/micro/v3/config"
"go.unistack.org/micro/v4/config"
)
type sliceDelimKey struct{}
@ -55,7 +55,6 @@ func FlagUsage(fn func()) config.Option {
return config.SetOption(flagSetUsageKey{}, fn)
}
type flagEnvKey struct{}
// FlagEnv set flag set usage func