You've already forked woodpecker
mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-06-30 22:13:45 +02:00
Pass down context.Context (#371)
* pass context down to remote clients * make tests work * add ctx to Refresh() and use it * bitbucketserver * code format * plugin interface: add todo context * solve todo * RM TODO by using context.WithTimeout * refactor & fix * Apply suggestions from code review Co-authored-by: Anbraten <anton@ju60.de> * go fmt * Update server/remote/coding/coding.go Co-authored-by: Anbraten <anton@ju60.de> Co-authored-by: Anbraten <anton@ju60.de>
This commit is contained in:
@ -15,6 +15,7 @@
|
||||
package internal
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
@ -29,6 +30,7 @@ type Client struct {
|
||||
token string
|
||||
agent string
|
||||
client *http.Client
|
||||
ctx context.Context
|
||||
}
|
||||
|
||||
type GenericAPIResponse struct {
|
||||
@ -36,13 +38,14 @@ type GenericAPIResponse struct {
|
||||
Data json.RawMessage `json:"data,omitempty"`
|
||||
}
|
||||
|
||||
func NewClient(baseURL, apiPath, token, agent string, client *http.Client) *Client {
|
||||
func NewClient(ctx context.Context, baseURL, apiPath, token, agent string, client *http.Client) *Client {
|
||||
return &Client{
|
||||
baseURL: baseURL,
|
||||
apiPath: apiPath,
|
||||
token: token,
|
||||
agent: agent,
|
||||
client: client,
|
||||
ctx: ctx,
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,10 +66,10 @@ func (c *Client) Do(method, u string, params url.Values) ([]byte, error) {
|
||||
var req *http.Request
|
||||
var err error
|
||||
if method != "GET" {
|
||||
req, err = http.NewRequest(method, rawURL+"?access_token="+c.token, strings.NewReader(params.Encode()))
|
||||
req, err = http.NewRequestWithContext(c.ctx, method, rawURL+"?access_token="+c.token, strings.NewReader(params.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")
|
||||
} else {
|
||||
req, err = http.NewRequest("GET", rawURL+"?"+params.Encode(), nil)
|
||||
req, err = http.NewRequestWithContext(c.ctx, "GET", rawURL+"?"+params.Encode(), nil)
|
||||
}
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("fail to create request for url %q: %v", rawURL, err)
|
||||
|
Reference in New Issue
Block a user