@aws-sdk/middleware-sdk-s3 3.882.0 → 3.883.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-cjs/index.js +13 -9
- package/dist-es/region-redirect-middleware.js +15 -10
- package/package.json +2 -2
package/dist-cjs/index.js
CHANGED
|
@@ -137,16 +137,20 @@ function regionRedirectMiddleware(clientConfig) {
|
|
|
137
137
|
return await next(args);
|
|
138
138
|
} catch (err) {
|
|
139
139
|
if (clientConfig.followRegionRedirects) {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
140
|
+
const statusCode = err?.$metadata?.httpStatusCode;
|
|
141
|
+
const isHeadBucket = context.commandName === "HeadBucketCommand";
|
|
142
|
+
const bucketRegionHeader = err?.$response?.headers?.["x-amz-bucket-region"];
|
|
143
|
+
if (bucketRegionHeader) {
|
|
144
|
+
if (statusCode === 301 || statusCode === 400 && (err?.name === "IllegalLocationConstraintException" || isHeadBucket)) {
|
|
145
|
+
try {
|
|
146
|
+
const actualRegion = bucketRegionHeader;
|
|
147
|
+
context.logger?.debug(`Redirecting from ${await clientConfig.region()} to ${actualRegion}`);
|
|
148
|
+
context.__s3RegionRedirect = actualRegion;
|
|
149
|
+
} catch (e) {
|
|
150
|
+
throw new Error("Region redirect failed: " + e);
|
|
151
|
+
}
|
|
152
|
+
return next(args);
|
|
148
153
|
}
|
|
149
|
-
return next(args);
|
|
150
154
|
}
|
|
151
155
|
}
|
|
152
156
|
throw err;
|
|
@@ -6,17 +6,22 @@ export function regionRedirectMiddleware(clientConfig) {
|
|
|
6
6
|
}
|
|
7
7
|
catch (err) {
|
|
8
8
|
if (clientConfig.followRegionRedirects) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
const statusCode = err?.$metadata?.httpStatusCode;
|
|
10
|
+
const isHeadBucket = context.commandName === "HeadBucketCommand";
|
|
11
|
+
const bucketRegionHeader = err?.$response?.headers?.["x-amz-bucket-region"];
|
|
12
|
+
if (bucketRegionHeader) {
|
|
13
|
+
if (statusCode === 301 ||
|
|
14
|
+
(statusCode === 400 && (err?.name === "IllegalLocationConstraintException" || isHeadBucket))) {
|
|
15
|
+
try {
|
|
16
|
+
const actualRegion = bucketRegionHeader;
|
|
17
|
+
context.logger?.debug(`Redirecting from ${await clientConfig.region()} to ${actualRegion}`);
|
|
18
|
+
context.__s3RegionRedirect = actualRegion;
|
|
19
|
+
}
|
|
20
|
+
catch (e) {
|
|
21
|
+
throw new Error("Region redirect failed: " + e);
|
|
22
|
+
}
|
|
23
|
+
return next(args);
|
|
15
24
|
}
|
|
16
|
-
catch (e) {
|
|
17
|
-
throw new Error("Region redirect failed: " + e);
|
|
18
|
-
}
|
|
19
|
-
return next(args);
|
|
20
25
|
}
|
|
21
26
|
}
|
|
22
27
|
throw err;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-sdk/middleware-sdk-s3",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.883.0",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
|
|
6
6
|
"build:cjs": "node ../../scripts/compilation/inline middleware-sdk-s3",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"license": "Apache-2.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@aws-sdk/core": "3.
|
|
30
|
+
"@aws-sdk/core": "3.883.0",
|
|
31
31
|
"@aws-sdk/types": "3.862.0",
|
|
32
32
|
"@aws-sdk/util-arn-parser": "3.873.0",
|
|
33
33
|
"@smithy/core": "^3.9.2",
|