add before Init func support

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
Merge pull request 'move to micro v4' (#114 ) from v4 into master
2023-06-03 23:27:50 +03:00 · 2023-05-05 20:10:19 +03:00 · 2023-05-05 20:10:01 +03:00 · 2023-05-05 20:08:38 +03:00 · 2022-03-05 19:09:08 +03:00 · 2022-02-25 13:36:41 +03:00
6 changed files with 16 additions and 19 deletions
--- a/go.mod
+++ b/go.mod
@ -1,11 +1,11 @@
-module go.unistack.org/micro-config-vault/v3
+module go.unistack.org/micro-config-vault/v4

-go 1.18
+go 1.20

 require (
 	github.com/hashicorp/vault/api v1.9.0
-	github.com/imdario/mergo v0.3.13
-	go.unistack.org/micro/v3 v3.10.18
+	github.com/imdario/mergo v0.3.14
+	go.unistack.org/micro/v4 v4.0.1
 )

 require github.com/stretchr/testify v1.7.2 // indirect
--- a/go.sum
+++ b/go.sum
@ -38,8 +38,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/vault/api v1.9.0 h1:ab7dI6W8DuCY7yCU8blo0UCYl2oHre/dloCmzMWg9w8=
 github.com/hashicorp/vault/api v1.9.0/go.mod h1:lloELQP4EyhjnCQhF8agKvWIVTmxbpEJj70b98959sM=
-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.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo=
+github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
@ -58,21 +58,19 @@ github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUb
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-go.unistack.org/micro/v3 v3.10.18 h1:iz193N8eZKGrKPXuX6XMsGIRHMqdvUaZSfb9mzwlUYM=
-go.unistack.org/micro/v3 v3.10.18/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+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=
 golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
@ -93,6 +91,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
 gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-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
@ -5,7 +5,7 @@ import (
 	"time"

 	"github.com/hashicorp/vault/api"
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
 )

 type httpClientKey struct{}
--- a/vault.go
+++ b/vault.go
@ -9,8 +9,8 @@ import (

 	"github.com/hashicorp/vault/api"
 	"github.com/imdario/mergo"
-	"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 DefaultStructTag = "vault"
--- a/vault_test.go
+++ b/vault_test.go
@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"

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

 func TestInit(t *testing.T) {
--- a/watcher.go
+++ b/watcher.go
@ -6,9 +6,9 @@ import (
 	"reflect"

 	"github.com/hashicorp/vault/api"
-	"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/config"
+	"go.unistack.org/micro/v4/util/jitter"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )

 type vaultWatcher struct {
Author	SHA1	Message	Date
Vasiliy Tolstov	f0a2699141	add before Init func support Some checks failed autoapprove / autoapprove (pull_request) Failing after 4s Details automerge / automerge (pull_request) Failing after 4s Details codeql / analyze (go) (pull_request) Failing after 5s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 5s Details prbuild / lint (pull_request) Failing after 6s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-06-03 23:27:50 +03:00
Vasiliy Tolstov	fd6ebb36eb	Merge pull request 'move to micro v4' (#114 ) from v4 into master Reviewed-on: #114	2023-05-05 20:10:19 +03:00
Vasiliy Tolstov	e186262452	move to micro v4 Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-05-05 20:10:01 +03:00
Vasiliy Tolstov	5e432ca3e2	Merge branch 'v3'	2023-05-05 20:08:38 +03:00
Vasiliy Tolstov	a0859a8c95	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2022-03-05 19:09:08 +03:00
Vasiliy Tolstov	c338e43778	Merge pull request #60 from unistack-org/dependabot/github_actions/dependabot/fetch-metadata-1.2.1 Bump dependabot/fetch-metadata from 1.2.0 to 1.2.1	2022-02-25 13:36:41 +03:00
dependabot[bot]	168af3be49	Bump dependabot/fetch-metadata from 1.2.0 to 1.2.1 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.2.0...v1.2.1) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-25 10:26:41 +00:00
Vasiliy Tolstov	0bcc541995	Merge pull request #61 from unistack-org/dependabot/github_actions/golangci/golangci-lint-action-3 Bump golangci/golangci-lint-action from 2 to 3	2022-02-25 13:25:11 +03:00
dependabot[bot]	2bbcabf7b3	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 08:22:37 +00:00