adjust repeater service to match the current go-pkgz/repeater

go-pkgz · Feb 9, 2021 · 3d7976c · 3d7976c
1 parent 2f99204
commit 3d7976c
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 48 deletions.
diff --git a/middleware/mocks/cache.go b/middleware/mocks/cache.go
diff --git a/middleware/mocks/circuit_breaker.go b/middleware/mocks/circuit_breaker.go
diff --git a/middleware/mocks/logger.go b/middleware/mocks/logger.go
diff --git a/middleware/mocks/repeater.go b/middleware/mocks/repeater.go
diff --git a/middleware/repeater.go b/middleware/repeater.go
@@ -1,14 +1,15 @@
 package middleware
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
 )
 
 // RepeaterSvc defines repeater interface
 type RepeaterSvc interface {
-	Do(fun func() error, errs ...error) (err error)
+	Do(ctx context.Context, fun func() error, errs ...error) (err error)
 }
 
 // Repeater sets middleware with provided RepeaterSvc to retry failed requests
@@ -23,7 +24,7 @@ func Repeater(repeater RepeaterSvc, failOnCodes ...int) RoundTripperHandler {
 
 			var resp *http.Response
 			var err error
-			e := repeater.Do(func() error {
+			e := repeater.Do(req.Context(), func() error {
 				resp, err = next.RoundTrip(req)
 				if err != nil {
 					return err

diff --git a/middleware/repeater_test.go b/middleware/repeater_test.go
@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"context"
 	"errors"
 	"net/http"
 	"sync/atomic"
@@ -23,7 +24,7 @@ func TestRepeater_Passed(t *testing.T) {
 		return resp, errors.New("blah")
 	}}
 
-	repeater := &mocks.RepeaterSvcMock{DoFunc: func(fun func() error, errs ...error) (err error) {
+	repeater := &mocks.RepeaterSvcMock{DoFunc: func(ctx context.Context, fun func() error, errs ...error) (err error) {
 		for i := 0; i < 5; i++ {
 			if err = fun(); err == nil {
 				return nil
@@ -51,7 +52,7 @@ func TestRepeater_Failed(t *testing.T) {
 		return resp, errors.New("http error")
 	}}
 
-	repeater := &mocks.RepeaterSvcMock{DoFunc: func(fun func() error, errs ...error) (err error) {
+	repeater := &mocks.RepeaterSvcMock{DoFunc: func(ctx context.Context, fun func() error, errs ...error) (err error) {
 		for i := 0; i < 5; i++ {
 			if err = fun(); err == nil {
 				return nil
@@ -78,7 +79,7 @@ func TestRepeater_FailedStatus(t *testing.T) {
 		return resp, nil
 	}}
 
-	repeater := &mocks.RepeaterSvcMock{DoFunc: func(fun func() error, errs ...error) (err error) {
+	repeater := &mocks.RepeaterSvcMock{DoFunc: func(ctx context.Context, fun func() error, errs ...error) (err error) {
 		for i := 0; i < 5; i++ {
 			if err = fun(); err == nil {
 				return nil