Skip to content

Commit cd6cba0

Browse files
authored
fix: move retry defaults to middleware-retry (#1363)
1 parent 7209d1d commit cd6cba0

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

packages/middleware-retry/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"license": "Apache-2.0",
1919
"dependencies": {
2020
"@aws-sdk/protocol-http": "1.0.0-gamma.2",
21-
"@aws-sdk/retry-config-provider": "1.0.0-gamma.1",
2221
"@aws-sdk/service-error-classification": "1.0.0-gamma.2",
2322
"@aws-sdk/types": "1.0.0-gamma.2",
2423
"react-native-get-random-values": "^1.4.0",

packages/middleware-retry/src/defaultStrategy.spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { HttpRequest } from "@aws-sdk/protocol-http";
2-
import { DEFAULT_MAX_ATTEMPTS } from "@aws-sdk/retry-config-provider";
32
import { isThrottlingError } from "@aws-sdk/service-error-classification";
43
import { v4 } from "uuid";
54

65
import { DEFAULT_RETRY_DELAY_BASE, INITIAL_RETRY_TOKENS, THROTTLING_RETRY_DELAY_BASE } from "./constants";
76
import { getDefaultRetryQuota } from "./defaultRetryQuota";
8-
import { RetryQuota, StandardRetryStrategy } from "./defaultStrategy";
7+
import { DEFAULT_MAX_ATTEMPTS, RetryQuota, StandardRetryStrategy } from "./defaultStrategy";
98
import { defaultDelayDecider } from "./delayDecider";
109
import { defaultRetryDecider } from "./retryDecider";
1110

packages/middleware-retry/src/defaultStrategy.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { HttpRequest } from "@aws-sdk/protocol-http";
2-
import { DEFAULT_MAX_ATTEMPTS } from "@aws-sdk/retry-config-provider";
32
import { isThrottlingError } from "@aws-sdk/service-error-classification";
43
import { SdkError } from "@aws-sdk/smithy-client";
54
import { FinalizeHandler, FinalizeHandlerArguments, MetadataBearer, Provider, RetryStrategy } from "@aws-sdk/types";
@@ -10,6 +9,17 @@ import { getDefaultRetryQuota } from "./defaultRetryQuota";
109
import { defaultDelayDecider } from "./delayDecider";
1110
import { defaultRetryDecider } from "./retryDecider";
1211

12+
/**
13+
* The default value for how many HTTP requests an SDK should make for a
14+
* single SDK operation invocation before giving up
15+
*/
16+
export const DEFAULT_MAX_ATTEMPTS = "3";
17+
18+
/**
19+
* The default retry algorithm to use.
20+
*/
21+
export const DEFAULT_RETRY_MODE = "standard";
22+
1323
/**
1424
* Determines whether an error is retryable based on the number of retries
1525
* already attempted, the HTTP status code, and the error received (if any).

packages/retry-config-provider/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
},
2323
"license": "Apache-2.0",
2424
"dependencies": {
25+
"@aws-sdk/middleware-retry": "1.0.0-gamma.2",
2526
"@aws-sdk/property-provider": "1.0.0-gamma.2",
2627
"@aws-sdk/shared-ini-file-loader": "1.0.0-gamma.2",
2728
"@aws-sdk/types": "1.0.0-gamma.2",

packages/retry-config-provider/src/defaultProvider.spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/middleware-retry";
12
import { chain, fromStatic, memoize } from "@aws-sdk/property-provider";
23

34
import {
45
CONFIG_MAX_ATTEMPTS,
56
CONFIG_RETRY_MODE,
6-
DEFAULT_MAX_ATTEMPTS,
7-
DEFAULT_RETRY_MODE,
87
ENV_MAX_ATTEMPTS,
98
ENV_RETRY_MODE,
109
maxAttemptsProvider,

packages/retry-config-provider/src/defaultProvider.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/middleware-retry";
12
import { chain, fromStatic, memoize } from "@aws-sdk/property-provider";
23
import { Provider } from "@aws-sdk/types";
34

@@ -6,11 +7,9 @@ import { fromSharedConfigFiles, SharedConfigInit } from "./fromSharedConfigFiles
67

78
export const ENV_MAX_ATTEMPTS = "AWS_MAX_ATTEMPTS";
89
export const CONFIG_MAX_ATTEMPTS = "max_attempts";
9-
export const DEFAULT_MAX_ATTEMPTS = "3";
1010

1111
export const ENV_RETRY_MODE = "AWS_RETRY_MODE";
1212
export const CONFIG_RETRY_MODE = "retry_mode";
13-
export const DEFAULT_RETRY_MODE = "standard";
1413

1514
const defaultProvider = (
1615
configuration: SharedConfigInit = {},

0 commit comments

Comments
 (0)