update deps
Some checks failed
build / test (push) Failing after 1m26s
codeql / analyze (go) (push) Failing after 1m53s
build / lint (push) Successful in 9m22s

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2024-03-06 17:45:56 +03:00
parent efeb5277aa
commit a2d3f6e192
3 changed files with 59 additions and 75 deletions

View File

@@ -1,4 +1,4 @@
package vault // import "go.unistack.org/micro-config-vault/v3"
package vault
import (
"context"
@@ -7,8 +7,8 @@ import (
"net/http"
"time"
"dario.cat/mergo"
"github.com/hashicorp/vault/api"
"github.com/imdario/mergo"
"go.unistack.org/micro/v3/config"
rutil "go.unistack.org/micro/v3/util/reflect"
)
@@ -207,7 +207,6 @@ func (c *vaultConfig) Load(ctx context.Context, opts ...config.LoadOption) error
mopts = append(mopts, mergo.WithAppendSlice)
}
err = mergo.Merge(dst, src, mopts...)
if err != nil {
err = fmt.Errorf("vault load path %s err: %w", c.path, err)
if !c.opts.AllowFail {