Skip to content

Commit bcd37ae

Browse files
committed
chore(config-resolver): rename getSigningRegion to getResolvedSigningRegion
1 parent f7e4c42 commit bcd37ae

File tree

3 files changed

+28
-31
lines changed

3 files changed

+28
-31
lines changed

packages/config-resolver/src/regionInfo/getRegionInfo.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { RegionInfo } from "@aws-sdk/types";
22

33
import { getResolvedHostname } from "./getResolvedHostname";
44
import { getResolvedPartition } from "./getResolvedPartition";
5-
import { getSigningRegion } from "./getSigningRegion";
5+
import { getResolvedSigningRegion } from "./getResolvedSigningRegion";
66
import { PartitionHash } from "./PartitionHash";
77
import { RegionHash } from "./RegionHash";
88

@@ -24,7 +24,11 @@ export const getRegionInfo = (
2424
regionHostname: regionHash[resolvedRegion]?.hostname,
2525
partitionHostname: partitionHash[partition]?.hostname,
2626
});
27-
const signingRegion = getSigningRegion(region, { hostname, partition, regionHash, partitionHash });
27+
const signingRegion = getResolvedSigningRegion(region, {
28+
hostname,
29+
resolvedRegionHash: regionHash[resolvedRegion],
30+
regionRegex: partitionHash[partition].regionRegex,
31+
});
2832

2933
return {
3034
partition,
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { isFipsRegion } from "./isFipsRegion";
2+
3+
export interface GetResolvedSigningRegionOptions {
4+
hostname: string;
5+
resolvedRegionHash: { signingRegion?: string };
6+
regionRegex: string;
7+
}
8+
9+
export const getResolvedSigningRegion = (
10+
region: string,
11+
{ hostname, resolvedRegionHash, regionRegex }: GetResolvedSigningRegionOptions
12+
) => {
13+
if (resolvedRegionHash?.signingRegion) {
14+
return resolvedRegionHash.signingRegion;
15+
} else if (isFipsRegion(region)) {
16+
const regionRegexJs = regionRegex.replace("\\\\", "\\").replace(/^\^/g, "").replace(/\$$/g, "");
17+
const regionRegexmatchArray = hostname.match(regionRegexJs);
18+
if (regionRegexmatchArray) {
19+
return regionRegexmatchArray[0];
20+
}
21+
}
22+
};

packages/config-resolver/src/regionInfo/getSigningRegion.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)