larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Middleware: Context timeout expansion (#2048)

Browse Source 
## Description
Adds additional definitions for context timeouts for middleware usage
<!-- Insert PR description-->

## Does this PR need a docs update or release note?


- [x] ⛔ No 

## Type of change

- [x] 🐛 Bugfix


## Issue(s)

<!-- Can reference multiple issues. Use one of the following "magic words" - "closes, fixes" to auto-close the Github issue. -->
*related  #2047<issue>

## Test Plan

<!-- How will this be tested prior to merging.-->
- [x] 💪 Manual
This commit is contained in:
Danny 2023-01-18 09:08:00 -05:00 committed by GitHub
parent 3a37584938
commit dc17c68074
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal/connector/graph/errors.go
View File

@ -1,7 +1,9 @@
package graph package graph
import ( import (
"context"
"net/url" "net/url"
"os"
"github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -126,6 +128,10 @@ func hasErrorCode(err error, codes ...string) bool {
// timeouts as other errors are handled within a middleware in the // timeouts as other errors are handled within a middleware in the
// client. // client.
func isTimeoutErr(err error) bool { func isTimeoutErr(err error) bool {
if errors.Is(err, context.DeadlineExceeded) || os.IsTimeout(err) {
return true
}
switch err := err.(type) { switch err := err.(type) {
case *url.Error: case *url.Error:
return err.Timeout() return err.Timeout()