Merge pull request #41312 from thaJeztah/19.03_backport_pass_network_error

tiborvass · web-flow · commit 340e0f5aae92 · 2020-09-15T15:56:29.000-07:00
[19.03 backport] Check for context error that is wrapped in url.Error
Upstream-commit: 50b33bd3cd1789847ec62646738f98155f601141
Component: engine
diff --git a/components/engine/client/request.go b/components/engine/client/request.go
@@ -143,8 +143,7 @@ func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResp
 
 		// Don't decorate context sentinel errors; users may be comparing to
 		// them directly.
-		switch err {
-		case context.Canceled, context.DeadlineExceeded:
+		if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
 			return serverResp, err
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,7 @@ func (cli Client) doRequest(ctx context.Context, req http.Request) (serverResp`
`143`	`143`
`144`	`144`	`// Don't decorate context sentinel errors; users may be comparing to`
`145`	`145`	`// them directly.`
`146`		`- switch err {`
`147`		`- case context.Canceled, context.DeadlineExceeded:`
	`146`	`+ if errors.Is(err, context.Canceled) \|\| errors.Is(err, context.DeadlineExceeded) {`
`148`	`147`	`return serverResp, err`
`149`	`148`	`}`
`150`	`149`