From 5acf0bc0f6736c65b6233456349b0e1eda7de7a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 08:25:59 +0000 Subject: [PATCH 1/2] Bump dependabot/fetch-metadata from 1.1.1 to 1.2.0 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.1.1 to 1.2.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.1.1...v1.2.0) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependabot-automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index 69e4c39..79594fa 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -15,7 +15,7 @@ jobs: steps: - name: metadata id: metadata - uses: dependabot/fetch-metadata@v1.1.1 + uses: dependabot/fetch-metadata@v1.2.0 with: github-token: "${{ secrets.TOKEN }}" - name: approve From c0ef0763bfe48ba6954d496f7756c55cdfcbde44 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 16 Feb 2022 14:59:35 +0300 Subject: [PATCH 2/2] allow to set http client Signed-off-by: Vasiliy Tolstov --- options.go | 7 +++++++ vault.go | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/options.go b/options.go index 1d06846..007c72d 100644 --- a/options.go +++ b/options.go @@ -1,12 +1,19 @@ package vault import ( + "net/http" "time" "github.com/hashicorp/vault/api" "go.unistack.org/micro/v3/config" ) +type httpClientKey struct{} + +func HTTPClient(c *http.Client) config.Option { + return config.SetOption(httpClientKey{}, c) +} + type configKey struct{} func Config(cfg *api.Config) config.Option { diff --git a/vault.go b/vault.go index 8255a40..ae28f1e 100644 --- a/vault.go +++ b/vault.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "net/http" "time" "github.com/hashicorp/vault/api" @@ -46,6 +47,10 @@ func (c *vaultConfig) Init(opts ...config.Option) error { cfg = v } + if v, ok := c.opts.Context.Value(httpClientKey{}).(*http.Client); ok { + cfg.HttpClient = v + } + if v, ok := c.opts.Context.Value(timeoutKey{}).(time.Duration); ok { cfg.Timeout = v }