Merge pull request #39 from ppiaas/master

Stebalien · web-flow · commit de90a0db04ad · 2020-11-24T10:00:43.000-08:00
fix: http response body need defer close
diff --git a/client.go b/client.go
@@ -144,17 +144,14 @@ func httpClient(ctx context.Context, addr string, namespace string, outs []inter
 		if err != nil {
 			return clientResponse{}, err
 		}
+		defer httpResp.Body.Close()
 
 		var resp clientResponse
 
 		if err := json.NewDecoder(httpResp.Body).Decode(&resp); err != nil {
 			return clientResponse{}, xerrors.Errorf("unmarshaling response: %w", err)
 		}
 
-		if err := httpResp.Body.Close(); err != nil {
-			return clientResponse{}, err
-		}
-
 		if resp.ID != *cr.req.ID {
 			return clientResponse{}, xerrors.New("request and response id didn't match")
 		}

Original file line number	Diff line number	Diff line change
`@@ -144,17 +144,14 @@ func httpClient(ctx context.Context, addr string, namespace string, outs []inter`
`144`	`144`	`if err != nil {`
`145`	`145`	`return clientResponse{}, err`
`146`	`146`	`}`
	`147`	`+ defer httpResp.Body.Close()`
`147`	`148`
`148`	`149`	`var resp clientResponse`
`149`	`150`
`150`	`151`	`if err := json.NewDecoder(httpResp.Body).Decode(&resp); err != nil {`
`151`	`152`	`return clientResponse{}, xerrors.Errorf("unmarshaling response: %w", err)`
`152`	`153`	`}`
`153`	`154`
`154`		`- if err := httpResp.Body.Close(); err != nil {`
`155`		`- return clientResponse{}, err`
`156`		`- }`
`157`		`-`
`158`	`155`	`if resp.ID != *cr.req.ID {`
`159`	`156`	`return clientResponse{}, xerrors.New("request and response id didn't match")`
`160`	`157`	`}`