From f1f4091771de2b7bdaaed4a4475fe1809601bdd4 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Wed, 2 Sep 2020 09:54:39 -0500 Subject: [PATCH 1/2] api: create fresh http client for unix sockets The HTTP client over unix socket needs a special transport object, and in doing so we need to create a fresh HTTP client so that we pickup the environment variable based configuration options. --- api/api.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/api.go b/api/api.go index 7b00be967adb..38a4e98fbd2f 100644 --- a/api/api.go +++ b/api/api.go @@ -607,9 +607,11 @@ func NewClient(config *Config) (*Client, error) { trans.DialContext = func(_ context.Context, _, _ string) (net.Conn, error) { return net.Dial("unix", parts[1]) } - config.HttpClient = &http.Client{ - Transport: trans, + httpClient, err := NewHttpClient(trans, config.TLSConfig) + if err != nil { + return nil, err } + config.HttpClient = httpClient default: return nil, fmt.Errorf("Unknown protocol scheme: %s", parts[0]) } From 8182c20c47ee5157571ccd255ef9f94a827ef48e Mon Sep 17 00:00:00 2001 From: Matt Keeler Date: Wed, 2 Sep 2020 11:39:30 -0400 Subject: [PATCH 2/2] Add changelog entry for #8602 --- .changelog/8602.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/8602.txt diff --git a/.changelog/8602.txt b/.changelog/8602.txt new file mode 100644 index 000000000000..49f2c74ce806 --- /dev/null +++ b/.changelog/8602.txt @@ -0,0 +1,3 @@ +```release-note:improvement +api: Allow for the client to use TLS over a Unix domain socket. +```