From 2fc6ed54bc94cc369dac6c9ce348de96a57e3359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafet=20Top=C3=A7u?= <44340673+rafet@users.noreply.github.com> Date: Fri, 26 Apr 2024 11:21:05 +0300 Subject: [PATCH] PA-26431 Fix Insrequester Timeout Data Type (#30) --- insrequester/README.md | 4 ++-- insrequester/requester.go | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/insrequester/README.md b/insrequester/README.md index 93fa352..d0ac13b 100644 --- a/insrequester/README.md +++ b/insrequester/README.md @@ -61,8 +61,8 @@ requester.WithCircuitbreaker(circuitBreakerConfig) For setting a timeout on requests, you can utilize the WithTimeout method: ```go -timeoutSeconds := 30 -requester.WithTimeout(timeoutSeconds) // this timeout overrides the default timeout +timeout := 30 * time.Duration +requester.WithTimeout(timeout) // this timeout overrides the default timeout ``` #### Default Headers diff --git a/insrequester/requester.go b/insrequester/requester.go index 7a9a8db..8831e64 100644 --- a/insrequester/requester.go +++ b/insrequester/requester.go @@ -8,7 +8,7 @@ import ( "github.com/slok/goresilience/circuitbreaker" goresilienceErrors "github.com/slok/goresilience/errors" "github.com/slok/goresilience/retry" - "github.com/slok/goresilience/timeout" + resilienceTimeout "github.com/slok/goresilience/timeout" "net/http" "time" ) @@ -38,7 +38,7 @@ type Requester interface { Delete(re RequestEntity) (*http.Response, error) WithRetry(config RetryConfig) *Request WithCircuitbreaker(config CircuitBreakerConfig) *Request - WithTimeout(timeoutSeconds int) *Request + WithTimeout(timeout time.Duration) *Request WithHeaders(headers Headers) *Request Load() *Request } @@ -53,7 +53,7 @@ type RequestEntity struct { } type Request struct { - timeout int + timeout time.Duration runner goresilience.Runner middlewares []goresilience.Middleware headers Headers @@ -187,15 +187,15 @@ func (r *Request) WithCircuitbreaker(config CircuitBreakerConfig) *Request { return r } -func (r *Request) WithTimeout(timeoutSeconds int) *Request { - if timeoutSeconds == 0 { - r.timeout = 30 +func (r *Request) WithTimeout(timeout time.Duration) *Request { + if timeout == 0 { + r.timeout = 30 * time.Second } else { - r.timeout = timeoutSeconds + r.timeout = timeout } - mw := timeout.NewMiddleware(timeout.Config{ - Timeout: time.Duration(r.timeout) * time.Second, + mw := resilienceTimeout.NewMiddleware(resilienceTimeout.Config{ + Timeout: r.timeout, }) r.middlewares = append(r.middlewares, mw)