Skip to content

Commit

Permalink
client: Allow configuration of http client (#1025)
Browse files Browse the repository at this point in the history
* client: Allow configuration of http client

Signed-off-by: yolossn <nssvlr@gmail.com>

* Add api.Config validation to prevent confusion

Update config documentation

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

Co-authored-by: Kemal Akkoyun <kakkoyun@gmail.com>
  • Loading branch information
yolossn and kakkoyun committed Apr 29, 2022
1 parent efe8e6f commit 4048091
Showing 1 changed file with 26 additions and 1 deletion.
27 changes: 26 additions & 1 deletion api/client.go
Expand Up @@ -17,6 +17,7 @@ package api
import (
"bytes"
"context"
"errors"
"net"
"net/http"
"net/url"
Expand All @@ -40,6 +41,10 @@ type Config struct {
// The address of the Prometheus to connect to.
Address string

// Client is used by the Client to drive HTTP requests. If not provided,
// a new one based on the provided RoundTripper (or DefaultRoundTripper) will be used.
Client *http.Client

// RoundTripper is used by the Client to drive HTTP requests. If not
// provided, DefaultRoundTripper will be used.
RoundTripper http.RoundTripper
Expand All @@ -52,6 +57,22 @@ func (cfg *Config) roundTripper() http.RoundTripper {
return cfg.RoundTripper
}

func (cfg *Config) client() http.Client {
if cfg.Client == nil {
return http.Client{
Transport: cfg.roundTripper(),
}
}
return *cfg.Client
}

func (cfg *Config) validate() error {
if cfg.Client != nil && cfg.RoundTripper != nil {
return errors.New("api.Config.RoundTripper and api.Config.Client are mutually exclusive")
}
return nil
}

// Client is the interface for an API client.
type Client interface {
URL(ep string, args map[string]string) *url.URL
Expand All @@ -68,9 +89,13 @@ func NewClient(cfg Config) (Client, error) {
}
u.Path = strings.TrimRight(u.Path, "/")

if err := cfg.validate(); err != nil {
return nil, err
}

return &httpClient{
endpoint: u,
client: http.Client{Transport: cfg.roundTripper()},
client: cfg.client(),
}, nil
}

Expand Down

0 comments on commit 4048091

Please sign in to comment.