Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename request and reponse to requestBody and responseBody

Browse Source
This commit is contained in:
Juan Carlos Mejías Rodríguez 2019-08-24 15:06:16 -04:00
parent 19f58c4e1f
commit a8bed6a7cc
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/client.go
View File

@ -104,13 +104,13 @@ func checkResponseForErrors(resp *http.Response) error {
} }
// Do an http request // Do an http request
func (n *portainerClientImp) do(uri, method string, request io.Reader, headers http.Header) (resp *http.Response, err error) { func (n *portainerClientImp) do(uri, method string, requestBody io.Reader, headers http.Header) (resp *http.Response, err error) {
requestURL, err := n.url.Parse(uri) requestURL, err := n.url.Parse(uri)
if err != nil { if err != nil {
return return
} }
req, err := http.NewRequest(method, requestURL.String(), request) req, err := http.NewRequest(method, requestURL.String(), requestBody)
if err != nil { if err != nil {
return return
} }
@ -119,7 +119,7 @@ func (n *portainerClientImp) do(uri, method string, request io.Reader, headers h
req.Header = headers req.Header = headers
} }
if request != nil { if requestBody != nil {
req.Header.Set("User-Agent", n.userAgent) req.Header.Set("User-Agent", n.userAgent)
} }
@ -153,11 +153,11 @@ func (n *portainerClientImp) do(uri, method string, request io.Reader, headers h
} }
// Do a JSON http request // Do a JSON http request
func (n *portainerClientImp) doJSON(uri, method string, headers http.Header, request interface{}, response interface{}) error { func (n *portainerClientImp) doJSON(uri, method string, headers http.Header, requestBody interface{}, responseBody interface{}) error {
var body io.Reader var body io.Reader
if request != nil { if requestBody != nil {
reqBodyBytes, err := json.Marshal(request) reqBodyBytes, err := json.Marshal(requestBody)
if err != nil { if err != nil {
return err return err
} }
@ -171,9 +171,9 @@ func (n *portainerClientImp) doJSON(uri, method string, headers http.Header, req
return err return err
} }
if response != nil { if responseBody != nil {
d := json.NewDecoder(resp.Body) d := json.NewDecoder(resp.Body)
err := d.Decode(response) err := d.Decode(responseBody)
if err != nil { if err != nil {
return err return err
} }

4
client/client_test.go
View File

@ -87,7 +87,7 @@ func Test_portainerClientImp_do(t *testing.T) {
type args struct { type args struct {
uri string uri string
method string method string
request io.Reader requestBody io.Reader
headers http.Header headers http.Header
} }
tests := []struct { tests := []struct {
@ -174,7 +174,7 @@ func Test_portainerClientImp_do(t *testing.T) {
if tt.fields.beforeFunctionCall != nil { if tt.fields.beforeFunctionCall != nil {
tt.fields.beforeFunctionCall(t, &tt.fields) tt.fields.beforeFunctionCall(t, &tt.fields)
} }
gotResp, err := n.do(tt.args.uri, tt.args.method, tt.args.request, tt.args.headers) gotResp, err := n.do(tt.args.uri, tt.args.method, tt.args.requestBody, tt.args.headers)
assert.Equal(t, tt.wantErr, err != nil) assert.Equal(t, tt.wantErr, err != nil)
if tt.wantRespCheck != nil { if tt.wantRespCheck != nil {