luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

api: create fresh http client for unix sockets (#8602) 

Co-authored-by: Matt Keeler <mkeeler@users.noreply.github.com>
This commit is contained in:
Seth Hoenig 2020-09-06 11:27:39 -05:00 committed by GitHub
parent 581f19b9d4
commit 99b822c4b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/8602.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
api: Allow for the client to use TLS over a Unix domain socket.
```

6
api/api.go
View File

@ -607,9 +607,11 @@ func NewClient(config *Config) (*Client, error) {
trans.DialContext = func(_ context.Context, _, _ string) (net.Conn, error) { trans.DialContext = func(_ context.Context, _, _ string) (net.Conn, error) {
return net.Dial("unix", parts[1]) return net.Dial("unix", parts[1])
} }
config.HttpClient = &http.Client{ httpClient, err := NewHttpClient(trans, config.TLSConfig)
Transport: trans, if err != nil {
return nil, err
} }
config.HttpClient = httpClient
default: default:
return nil, fmt.Errorf("Unknown protocol scheme: %s", parts[0]) return nil, fmt.Errorf("Unknown protocol scheme: %s", parts[0])
} }