Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(httpc): refactor inputs to eliminate required path 

the base address should be enough to make a request. All requests
are now valid without a path provided. This will be true as long
as the address is valid.
pull/17941/head
Johnny Steenbergen 2020-05-01 17:19:57 -07:00 committed by Johnny Steenbergen
parent 95ad3c6582
commit 35ed5734bb
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkg/httpc/client.go
View File

@ -76,51 +76,51 @@ func New(opts ...ClientOptFn) (*Client, error) {
}
// Delete generates a DELETE request.
func (c *Client) Delete(urlPath string, rest ...string) *Req {
return c.Req(http.MethodDelete, nil, urlPath, rest...)
func (c *Client) Delete(urlPath ...string) *Req {
return c.Req(http.MethodDelete, nil, urlPath...)
}
// Get generates a GET request.
func (c *Client) Get(urlPath string, rest ...string) *Req {
return c.Req(http.MethodGet, nil, urlPath, rest...)
func (c *Client) Get(urlPath ...string) *Req {
return c.Req(http.MethodGet, nil, urlPath...)
}
// Patch generates a PATCH request.
func (c *Client) Patch(bFn BodyFn, urlPath string, rest ...string) *Req {
return c.Req(http.MethodPatch, bFn, urlPath, rest...)
func (c *Client) Patch(bFn BodyFn, urlPath ...string) *Req {
return c.Req(http.MethodPatch, bFn, urlPath...)
}
// PatchJSON generates a PATCH request. This is to be used with value or pointer to value type.
// Providing a stream/reader will result in disappointment.
func (c *Client) PatchJSON(v interface{}, urlPath string, rest ...string) *Req {
return c.Patch(BodyJSON(v), urlPath, rest...)
func (c *Client) PatchJSON(v interface{}, urlPath ...string) *Req {
return c.Patch(BodyJSON(v), urlPath...)
}
// Post generates a POST request.
func (c *Client) Post(bFn BodyFn, urlPath string, rest ...string) *Req {
return c.Req(http.MethodPost, bFn, urlPath, rest...)
func (c *Client) Post(bFn BodyFn, urlPath ...string) *Req {
return c.Req(http.MethodPost, bFn, urlPath...)
}
// PostJSON generates a POST request and json encodes the body. This is to be
// used with value or pointer to value type. Providing a stream/reader will result
// in disappointment.
func (c *Client) PostJSON(v interface{}, urlPath string, rest ...string) *Req {
return c.Post(BodyJSON(v), urlPath, rest...)
func (c *Client) PostJSON(v interface{}, urlPath ...string) *Req {
return c.Post(BodyJSON(v), urlPath...)
}
// Put generates a PUT request.
func (c *Client) Put(bFn BodyFn, urlPath string, rest ...string) *Req {
return c.Req(http.MethodPut, bFn, urlPath, rest...)
func (c *Client) Put(bFn BodyFn, urlPath ...string) *Req {
return c.Req(http.MethodPut, bFn, urlPath...)
}
// PutJSON generates a PUT request. This is to be used with value or pointer to value type.
// Providing a stream/reader will result in disappointment.
func (c *Client) PutJSON(v interface{}, urlPath string, rest ...string) *Req {
return c.Put(BodyJSON(v), urlPath, rest...)
func (c *Client) PutJSON(v interface{}, urlPath ...string) *Req {
return c.Put(BodyJSON(v), urlPath...)
}
// Req constructs a request.
func (c *Client) Req(method string, bFn BodyFn, urlPath string, rest ...string) *Req {
func (c *Client) Req(method string, bFn BodyFn, urlPath ...string) *Req {
bodyF := BodyEmpty
if bFn != nil {
bodyF = bFn
@ -165,7 +165,7 @@ func (c *Client) Req(method string, bFn BodyFn, urlPath string, rest ...string)
body = &buf
}
req, err := http.NewRequest(method, c.buildURL(urlPath, rest...), body)
req, err := http.NewRequest(method, c.buildURL(urlPath...), body)
if err != nil {
return &Req{err: err}
}
@ -205,11 +205,10 @@ func (c *Client) Clone(opts ...ClientOptFn) (*Client, error) {
return New(append(existingOpts, opts...)...)
}
func (c *Client) buildURL(urlPath string, rest ...string) string {
func (c *Client) buildURL(urlPath ...string) string {
u := c.addr
u.Path = path.Join(u.Path, urlPath)
if len(rest) > 0 {
u.Path = path.Join(u.Path, path.Join(rest...))
if len(urlPath) > 0 {
u.Path = path.Join(u.Path, path.Join(urlPath...))
}
return u.String()
}