merge master #59

Merged
vtolstov merged 26 commits from master into v3 2022-02-16 15:02:01 +03:00
3 changed files with 13 additions and 1 deletions
Showing only changes of commit cf6bde48ae - Show all commits

View File

@ -15,7 +15,7 @@ jobs:
steps: steps:
- name: metadata - name: metadata
id: metadata id: metadata
uses: dependabot/fetch-metadata@v1.1.1 uses: dependabot/fetch-metadata@v1.2.0
with: with:
github-token: "${{ secrets.TOKEN }}" github-token: "${{ secrets.TOKEN }}"
- name: approve - name: approve

View File

@ -1,12 +1,19 @@
package vault package vault
import ( import (
"net/http"
"time" "time"
"github.com/hashicorp/vault/api" "github.com/hashicorp/vault/api"
"go.unistack.org/micro/v3/config" "go.unistack.org/micro/v3/config"
) )
type httpClientKey struct{}
func HTTPClient(c *http.Client) config.Option {
return config.SetOption(httpClientKey{}, c)
}
type configKey struct{} type configKey struct{}
func Config(cfg *api.Config) config.Option { func Config(cfg *api.Config) config.Option {

View File

@ -4,6 +4,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http"
"time" "time"
"github.com/hashicorp/vault/api" "github.com/hashicorp/vault/api"
@ -46,6 +47,10 @@ func (c *vaultConfig) Init(opts ...config.Option) error {
cfg = v 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 { if v, ok := c.opts.Context.Value(timeoutKey{}).(time.Duration); ok {
cfg.Timeout = v cfg.Timeout = v
} }