feat(remote): make retryStatusCodes configurable (#1635)

aslafy-z · web-flow · commit 52d59d1b94c1 · 2023-04-20T10:15:08.000-07:00
diff --git a/pkg/v1/remote/options.go b/pkg/v1/remote/options.go
@@ -46,6 +46,7 @@ type options struct {
 	pageSize                       int
 	retryBackoff                   Backoff
 	retryPredicate                 retry.Predicate
+	retryStatusCodes               []int
 	filter                         map[string]string
 }
 
@@ -83,7 +84,7 @@ var fastBackoff = Backoff{
 	Steps:    3,
 }
 
-var retryableStatusCodes = []int{
+var defaultRetryStatusCodes = []int{
 	http.StatusRequestTimeout,
 	http.StatusInternalServerError,
 	http.StatusBadGateway,
@@ -119,13 +120,14 @@ var DefaultTransport http.RoundTripper = &http.Transport{
 
 func makeOptions(opts ...Option) (*options, error) {
 	o := &options{
-		transport:      DefaultTransport,
-		platform:       defaultPlatform,
-		context:        context.Background(),
-		jobs:           defaultJobs,
-		pageSize:       defaultPageSize,
-		retryPredicate: defaultRetryPredicate,
-		retryBackoff:   defaultRetryBackoff,
+		transport:        DefaultTransport,
+		platform:         defaultPlatform,
+		context:          context.Background(),
+		jobs:             defaultJobs,
+		pageSize:         defaultPageSize,
+		retryPredicate:   defaultRetryPredicate,
+		retryBackoff:     defaultRetryBackoff,
+		retryStatusCodes: defaultRetryStatusCodes,
 	}
 
 	for _, option := range opts {
@@ -154,7 +156,7 @@ func makeOptions(opts ...Option) (*options, error) {
 		}
 
 		// Wrap the transport in something that can retry network flakes.
-		o.transport = transport.NewRetry(o.transport, transport.WithRetryPredicate(defaultRetryPredicate), transport.WithRetryStatusCodes(retryableStatusCodes...))
+		o.transport = transport.NewRetry(o.transport, transport.WithRetryPredicate(defaultRetryPredicate), transport.WithRetryStatusCodes(o.retryStatusCodes...))
 
 		// Wrap this last to prevent transport.New from double-wrapping.
 		if o.userAgent != "" {
@@ -303,6 +305,14 @@ func WithRetryPredicate(predicate retry.Predicate) Option {
 	}
 }
 
+// WithRetryStatusCodes sets which http response codes will be retried.
+func WithRetryStatusCodes(codes ...int) Option {
+	return func(o *options) error {
+		o.retryStatusCodes = codes
+		return nil
+	}
+}
+
 // WithFilter sets the filter querystring for HTTP operations.
 func WithFilter(key string, value string) Option {
 	return func(o *options) error {
