Merge pull request 'move to micro v4' (#97 ) from v4 into master

Reviewed-on: #97
move to micro v4
2023-05-05 17:41:12 +03:00 · 2023-05-05 17:40:52 +03:00 · 2023-05-05 17:39:21 +03:00 · 2022-03-05 19:08:55 +03:00 · 2022-02-25 09:47:17 +03:00 · 2022-02-25 09:33:54 +03:00
5 changed files with 16 additions and 28 deletions
--- a/env.go
+++ b/env.go
@@ -1,4 +1,4 @@
-package env
+package env // import "go.unistack.org/micro-config-env/v4"
 import (
 	"context"
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
-	"dario.cat/mergo"
+	"github.com/imdario/mergo"
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 var DefaultStructTag = "env"
@@ -40,10 +40,6 @@ func (c *envConfig) Init(opts ...config.Option) error {
 }
 func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
 	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
 		return nil
 	}
 	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -320,10 +316,6 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
 }
 func (c *envConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
 	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
 		return nil
 	}
 	options := config.NewSaveOptions(opts...)
 	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
--- a/env_test.go
+++ b/env_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 type Config struct {
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,8 @@
-module go.unistack.org/micro-config-env/v3
+module go.unistack.org/micro-config-env/v4
 go 1.20
 require (
-	dario.cat/mergo v1.0.0
+	github.com/imdario/mergo v0.3.14
-	go.unistack.org/micro/v3 v3.10.44
+	go.unistack.org/micro/v4 v4.0.1
 )
 require github.com/google/uuid v1.6.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,7 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+github.com/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
 go.unistack.org/micro/v3 v3.10.44 h1:Vgyy9BrJOSdFvo29/klrgIBE/Nme9E8udPAljos34o0=
 go.unistack.org/micro/v3 v3.10.44/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
 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=
--- a/watcher.go
+++ b/watcher.go
@@ -3,9 +3,9 @@ package env
 import (
 	"reflect"
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	"go.unistack.org/micro/v3/util/jitter"
+	"go.unistack.org/micro/v4/util/jitter"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 type envWatcher struct {
Author	SHA1	Message	Date
Vasiliy Tolstov	45631ab974	Merge pull request 'move to micro v4' (#97 ) from v4 into master Reviewed-on: #97	2023-05-05 17:41:12 +03:00
Vasiliy Tolstov	b1badeef63	move to micro v4 Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-05-05 17:40:52 +03:00
Vasiliy Tolstov	64d820f251	Merge branch 'v3'	2023-05-05 17:39:21 +03:00
Vasiliy Tolstov	bef606a7ee	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2022-03-05 19:08:55 +03:00
Vasiliy Tolstov	b39be29685	Merge pull request #52 from unistack-org/dependabot/github_actions/dependabot/fetch-metadata-1.2.1 Bump dependabot/fetch-metadata from 1.1.1 to 1.2.1	2022-02-25 09:47:17 +03:00
Vasiliy Tolstov	2b10a1e5b1	Merge pull request #53 from unistack-org/dependabot/github_actions/golangci/golangci-lint-action-3 Bump golangci/golangci-lint-action from 2 to 3	2022-02-25 09:33:54 +03:00
dependabot[bot]	2add696dc8	Bump golangci/golangci-lint-action from 2 to 3 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 2 to 3. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v2...v3) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-25 04:21:50 +00:00
dependabot[bot]	7945c2cc71	Bump dependabot/fetch-metadata from 1.1.1 to 1.2.1 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.1.1 to 1.2.1. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.1.1...v1.2.1) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-23 04:21:12 +00:00
Vasiliy Tolstov	9ffc9b6a21	Merge pull request #50 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.21 Bump go.unistack.org/micro/v3 from 3.8.20 to 3.8.21	2022-01-31 07:24:30 +03:00
dependabot[bot]	e177ee76c0	Bump go.unistack.org/micro/v3 from 3.8.20 to 3.8.21 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.20 to 3.8.21. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.20...v3.8.21) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-31 04:24:09 +00:00
Vasiliy Tolstov	2b3f80d430	Merge pull request #49 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.20 Bump go.unistack.org/micro/v3 from 3.8.19 to 3.8.20	2022-01-26 07:21:55 +03:00
dependabot[bot]	0aeaaaecd3	Bump go.unistack.org/micro/v3 from 3.8.19 to 3.8.20 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.19 to 3.8.20. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.19...v3.8.20) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-26 04:21:39 +00:00
Vasiliy Tolstov	e8707bb398	Merge pull request #48 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.19 Bump go.unistack.org/micro/v3 from 3.8.18 to 3.8.19	2022-01-25 07:21:49 +03:00
dependabot[bot]	e1bf956f6d	Bump go.unistack.org/micro/v3 from 3.8.18 to 3.8.19 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.18 to 3.8.19. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.18...v3.8.19) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-25 04:21:31 +00:00
Vasiliy Tolstov	d39141e7a9	Merge pull request #47 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.18 Bump go.unistack.org/micro/v3 from 3.8.16 to 3.8.18	2022-01-24 07:21:48 +03:00
dependabot[bot]	a4d99c6b13	Bump go.unistack.org/micro/v3 from 3.8.16 to 3.8.18 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.16 to 3.8.18. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.16...v3.8.18) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-24 04:21:34 +00:00
Vasiliy Tolstov	6127475aa5	Merge pull request #46 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.16 Bump go.unistack.org/micro/v3 from 3.8.15 to 3.8.16	2022-01-21 07:24:11 +03:00
dependabot[bot]	425034bcc7	Bump go.unistack.org/micro/v3 from 3.8.15 to 3.8.16 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.15 to 3.8.16. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.15...v3.8.16) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-21 04:23:48 +00:00
Vasiliy Tolstov	ed3325aaf7	Merge pull request #45 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.15 Bump go.unistack.org/micro/v3 from 3.8.14 to 3.8.15	2022-01-20 07:21:56 +03:00
dependabot[bot]	d97b510d8f	Bump go.unistack.org/micro/v3 from 3.8.14 to 3.8.15 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.14 to 3.8.15. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.14...v3.8.15) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-20 04:21:39 +00:00
Vasiliy Tolstov	456285c70d	Merge pull request #44 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.14 Bump go.unistack.org/micro/v3 from 3.8.13 to 3.8.14	2022-01-11 07:21:59 +03:00
dependabot[bot]	6af70b3805	Bump go.unistack.org/micro/v3 from 3.8.13 to 3.8.14 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.13 to 3.8.14. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.13...v3.8.14) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-11 04:21:40 +00:00
Vasiliy Tolstov	5e02b42d4e	Merge pull request #43 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.13 Bump go.unistack.org/micro/v3 from 3.8.11 to 3.8.13	2021-12-29 00:48:24 +03:00
dependabot[bot]	292fc47f40	Bump go.unistack.org/micro/v3 from 3.8.11 to 3.8.13 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.11 to 3.8.13. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.11...v3.8.13) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-12-28 21:48:06 +00:00