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

Reviewed-on: #95
move to micro v4
2023-05-05 19:16:20 +03:00 · 2023-05-05 19:15:16 +03:00 · 2022-03-05 19:08:58 +03:00 · 2022-02-25 09:45:05 +03:00 · 2022-02-25 09:38:47 +03:00 · 2022-02-25 04:21:09 +00:00
5 changed files with 17 additions and 36 deletions
--- a/file.go
+++ b/file.go
@@ -1,4 +1,4 @@
-package file // import "go.unistack.org/micro-config-file/v3"
+package file // import "go.unistack.org/micro-config-file/v4"

 import (
 	"context"
@@ -8,9 +8,9 @@ import (
 	"os"

 	"github.com/imdario/mergo"
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/config"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/config"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )

 var DefaultStructTag = "file"
@@ -54,10 +54,6 @@ func (c *fileConfig) Init(opts ...config.Option) error {
 }

 func (c *fileConfig) 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
 	}
@@ -129,10 +125,6 @@ func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error
 }

 func (c *fileConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
-		return nil
-	}
-
 	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,8 @@
-module go.unistack.org/micro-config-file/v3
+module go.unistack.org/micro-config-file/v4

-go 1.18
+go 1.20

 require (
-	github.com/imdario/mergo v0.3.16
-	go.unistack.org/micro/v3 v3.10.36
+	github.com/imdario/mergo v0.3.14
+	go.unistack.org/micro/v4 v4.0.1
 )
-
-require github.com/google/uuid v1.5.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,16 +1,7 @@
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
-github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-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=
-go.unistack.org/micro/v3 v3.10.36 h1:+XPhpguDC0HldSePp5TODdMJ06+IUy1AQkYN7ub84DA=
-go.unistack.org/micro/v3 v3.10.36/go.mod h1:eUgtvbtiiz6te93m0ZdmoecbitWwjdBmmr84srmEIKA=
+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=
--- a/options.go
+++ b/options.go
@@ -1,7 +1,7 @@
 package file

 import (
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
 )

 type pathKey struct{}
--- a/watcher.go
+++ b/watcher.go
@@ -7,10 +7,10 @@ import (
 	"os"
 	"reflect"

-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/config"
-	"go.unistack.org/micro/v3/util/jitter"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/micro/v4/util/jitter"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )

 type fileWatcher struct {
Author	SHA1	Message	Date
Vasiliy Tolstov	1d81cb3c80	Merge pull request 'move to micro v4' (#95 ) from v4 into master Some checks failed build / test (push) Failing after 5s Details build / lint (push) Failing after 5s Details codeql / analyze (go) (push) Failing after 5s Details Reviewed-on: #95	2023-05-05 19:16:20 +03:00
Vasiliy Tolstov	6061155190	move to micro v4 Some checks failed codeql / analyze (go) (pull_request) Failing after 6s Details prbuild / test (pull_request) Failing after 5s Details prbuild / lint (pull_request) Failing after 5s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-05-05 19:15:16 +03:00
Vasiliy Tolstov	632868864e	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2022-03-05 19:08:58 +03:00
Vasiliy Tolstov	a23c45515a	Merge pull request #54 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:45:05 +03:00
Vasiliy Tolstov	5f74e48ef4	Merge pull request #55 from unistack-org/dependabot/github_actions/golangci/golangci-lint-action-3 Bump golangci/golangci-lint-action from 2 to 3	2022-02-25 09:38:47 +03:00
dependabot[bot]	19cb6cf800	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:09 +00:00
dependabot[bot]	c0e0529819	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:19 +00:00
Vasiliy Tolstov	3f6f91808b	Merge pull request #52 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:24 +03:00
dependabot[bot]	efd880b2ea	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	69dec86aaa	Merge pull request #51 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:54 +03:00
dependabot[bot]	f1f442339d	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	89d4f83671	Merge pull request #50 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:41 +03:00
dependabot[bot]	9a608532a8	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:24 +00:00
Vasiliy Tolstov	ef412b165f	Merge pull request #49 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:24 +03:00
dependabot[bot]	3c7e3ed5b8	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:07 +00:00
Vasiliy Tolstov	8d35254abe	Merge pull request #48 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:23:25 +03:00
dependabot[bot]	c78878a918	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:12 +00:00
Vasiliy Tolstov	443bc44da1	Merge pull request #47 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:22:18 +03:00
dependabot[bot]	9ec934cc15	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:22:00 +00:00
Vasiliy Tolstov	ae6cde7614	Merge pull request #46 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:00 +03:00
dependabot[bot]	ba9fa173de	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:20:43 +00:00
Vasiliy Tolstov	5e4627d676	Merge pull request #45 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:30 +03:00
dependabot[bot]	bc31a3f7db	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:17 +00:00
Vasiliy Tolstov	58a48621f1	Merge pull request #43 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.11 Bump go.unistack.org/micro/v3 from 3.8.10 to 3.8.11	2021-11-24 07:28:16 +03:00
dependabot[bot]	8af739f80f	Bump go.unistack.org/micro/v3 from 3.8.10 to 3.8.11 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.10 to 3.8.11. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.10...v3.8.11) --- 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-11-24 04:27:58 +00:00
Vasiliy Tolstov	2e91975c6b	Merge pull request #42 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.10 Bump go.unistack.org/micro/v3 from 3.8.9 to 3.8.10	2021-11-19 07:26:08 +03:00
dependabot[bot]	d0a93944e5	Bump go.unistack.org/micro/v3 from 3.8.9 to 3.8.10 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.9 to 3.8.10. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.9...v3.8.10) --- 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-11-19 04:25:51 +00:00