Skip to content

[WIP] chore(clients): remove redundant endpoint configuration from PartitionHash #2965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

[WIP] chore(clients): remove redundant endpoint configuration from PartitionHash #2965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da7a2da
chore(codegen): remove redundant endpoint configuration from Partitio…
trivikr Nov 1, 2021
48b7a4c
chore: experiment with removing endpoint from PartitionHash
trivikr Nov 1, 2021
3df247b
chore(config-resolver): add optional signing region/service in Region…
trivikr Nov 1, 2021
0af2112
chore(codegen): do not populate regionHash if partition endpoint is p…
trivikr Nov 1, 2021
96f93e0
chore(clients): do not populate regionHash if partition endpoint is p…
trivikr Nov 1, 2021
2d07e90
chore(codegen): add Endpoint class for storing endpoint configuration
trivikr Nov 1, 2021
16f84e9
chore(codegen): overwrite hostname in partitionHash if present in par…
trivikr Nov 1, 2021
0987625
chore(clients): overwrite hostname in partitionHash if present in par…
trivikr Nov 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions clients/client-account/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-cn-global": {
hostname: "account.cn-northwest-1.amazonaws.com.cn",
signingRegion: "cn-northwest-1",
},
"aws-global": {
hostname: "account.us-east-1.amazonaws.com",
signingRegion: "us-east-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -39,12 +30,12 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "account.us-east-1.amazonaws.com",
},
"aws-cn": {
regions: ["aws-cn-global", "cn-north-1", "cn-northwest-1"],
regionRegex: "^cn\\-\\w+\\-\\d+$",
endpoint: "aws-cn-global",
hostname: "account.cn-northwest-1.amazonaws.com.cn",
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
Expand Down
15 changes: 3 additions & 12 deletions clients/client-budgets/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-cn-global": {
hostname: "budgets.amazonaws.com.cn",
signingRegion: "cn-northwest-1",
},
"aws-global": {
hostname: "budgets.amazonaws.com",
signingRegion: "us-east-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -39,12 +30,12 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "budgets.amazonaws.com",
},
"aws-cn": {
regions: ["aws-cn-global", "cn-north-1", "cn-northwest-1"],
regionRegex: "^cn\\-\\w+\\-\\d+$",
endpoint: "aws-cn-global",
hostname: "budgets.amazonaws.com.cn",
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
Expand Down
9 changes: 2 additions & 7 deletions clients/client-chime/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-global": {
hostname: "chime.us-east-1.amazonaws.com",
signingRegion: "us-east-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -35,7 +30,7 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "chime.us-east-1.amazonaws.com",
},
"aws-cn": {
regions: ["cn-north-1", "cn-northwest-1"],
Expand Down
15 changes: 3 additions & 12 deletions clients/client-cloudfront/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-cn-global": {
hostname: "cloudfront.cn-northwest-1.amazonaws.com.cn",
signingRegion: "cn-northwest-1",
},
"aws-global": {
hostname: "cloudfront.amazonaws.com",
signingRegion: "us-east-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -39,12 +30,12 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "cloudfront.amazonaws.com",
},
"aws-cn": {
regions: ["aws-cn-global", "cn-north-1", "cn-northwest-1"],
regionRegex: "^cn\\-\\w+\\-\\d+$",
endpoint: "aws-cn-global",
hostname: "cloudfront.cn-northwest-1.amazonaws.com.cn",
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
Expand Down
15 changes: 3 additions & 12 deletions clients/client-cost-explorer/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-cn-global": {
hostname: "ce.cn-northwest-1.amazonaws.com.cn",
signingRegion: "cn-northwest-1",
},
"aws-global": {
hostname: "ce.us-east-1.amazonaws.com",
signingRegion: "us-east-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -39,12 +30,12 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "ce.us-east-1.amazonaws.com",
},
"aws-cn": {
regions: ["aws-cn-global", "cn-north-1", "cn-northwest-1"],
regionRegex: "^cn\\-\\w+\\-\\d+$",
endpoint: "aws-cn-global",
hostname: "ce.cn-northwest-1.amazonaws.com.cn",
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
Expand Down
41 changes: 6 additions & 35 deletions clients/client-iam/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-cn-global": {
hostname: "iam.cn-north-1.amazonaws.com.cn",
signingRegion: "cn-north-1",
},
"aws-global": {
hostname: "iam.amazonaws.com",
signingRegion: "us-east-1",
},
"aws-iso-b-global": {
hostname: "iam.us-isob-east-1.sc2s.sgov.gov",
signingRegion: "us-isob-east-1",
},
"aws-iso-global": {
hostname: "iam.us-iso-east-1.c2s.ic.gov",
signingRegion: "us-iso-east-1",
},
"aws-us-gov-global": {
hostname: "iam.us-gov.amazonaws.com",
signingRegion: "us-gov-west-1",
},
"iam-fips": {
hostname: "iam-fips.amazonaws.com",
signingRegion: "us-east-1",
},
"iam-govcloud-fips": {
hostname: "iam.us-gov.amazonaws.com",
signingRegion: "us-gov-west-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -60,27 +31,27 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "iam.amazonaws.com",
},
"aws-cn": {
regions: ["aws-cn-global", "cn-north-1", "cn-northwest-1"],
regionRegex: "^cn\\-\\w+\\-\\d+$",
endpoint: "aws-cn-global",
hostname: "iam.cn-north-1.amazonaws.com.cn",
},
"aws-iso": {
regions: ["aws-iso-global", "us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
endpoint: "aws-iso-global",
hostname: "iam.us-iso-east-1.c2s.ic.gov",
},
"aws-iso-b": {
regions: ["aws-iso-b-global", "us-isob-east-1"],
regionRegex: "^us\\-isob\\-\\w+\\-\\d+$",
endpoint: "aws-iso-b-global",
hostname: "iam.us-isob-east-1.sc2s.sgov.gov",
},
"aws-us-gov": {
regions: ["aws-us-gov-global", "iam-govcloud-fips", "us-gov-east-1", "us-gov-west-1"],
regionRegex: "^us\\-gov\\-\\w+\\-\\d+$",
endpoint: "aws-us-gov-global",
hostname: "iam.us-gov.amazonaws.com",
},
};

Expand Down
29 changes: 4 additions & 25 deletions clients/client-organizations/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-cn-global": {
hostname: "organizations.cn-northwest-1.amazonaws.com.cn",
signingRegion: "cn-northwest-1",
},
"aws-global": {
hostname: "organizations.us-east-1.amazonaws.com",
signingRegion: "us-east-1",
},
"aws-us-gov-global": {
hostname: "organizations.us-gov-west-1.amazonaws.com",
signingRegion: "us-gov-west-1",
},
"fips-aws-global": {
hostname: "organizations-fips.us-east-1.amazonaws.com",
signingRegion: "us-east-1",
},
"fips-aws-us-gov-global": {
hostname: "organizations.us-gov-west-1.amazonaws.com",
signingRegion: "us-gov-west-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -52,12 +31,12 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "organizations.us-east-1.amazonaws.com",
},
"aws-cn": {
regions: ["aws-cn-global", "cn-north-1", "cn-northwest-1"],
regionRegex: "^cn\\-\\w+\\-\\d+$",
endpoint: "aws-cn-global",
hostname: "organizations.cn-northwest-1.amazonaws.com.cn",
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
Expand All @@ -72,7 +51,7 @@ const partitionHash: PartitionHash = {
"aws-us-gov": {
regions: ["aws-us-gov-global", "fips-aws-us-gov-global", "us-gov-east-1", "us-gov-west-1"],
regionRegex: "^us\\-gov\\-\\w+\\-\\d+$",
endpoint: "aws-us-gov-global",
hostname: "organizations.us-gov-west-1.amazonaws.com",
},
};

Expand Down
41 changes: 6 additions & 35 deletions clients/client-route-53/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-cn-global": {
hostname: "route53.amazonaws.com.cn",
signingRegion: "cn-northwest-1",
},
"aws-global": {
hostname: "route53.amazonaws.com",
signingRegion: "us-east-1",
},
"aws-iso-b-global": {
hostname: "route53.sc2s.sgov.gov",
signingRegion: "us-isob-east-1",
},
"aws-iso-global": {
hostname: "route53.c2s.ic.gov",
signingRegion: "us-iso-east-1",
},
"aws-us-gov-global": {
hostname: "route53.us-gov.amazonaws.com",
signingRegion: "us-gov-west-1",
},
"fips-aws-global": {
hostname: "route53-fips.amazonaws.com",
signingRegion: "us-east-1",
},
"fips-aws-us-gov-global": {
hostname: "route53.us-gov.amazonaws.com",
signingRegion: "us-gov-west-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -60,27 +31,27 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "route53.amazonaws.com",
},
"aws-cn": {
regions: ["aws-cn-global", "cn-north-1", "cn-northwest-1"],
regionRegex: "^cn\\-\\w+\\-\\d+$",
endpoint: "aws-cn-global",
hostname: "route53.amazonaws.com.cn",
},
"aws-iso": {
regions: ["aws-iso-global", "us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
endpoint: "aws-iso-global",
hostname: "route53.c2s.ic.gov",
},
"aws-iso-b": {
regions: ["aws-iso-b-global", "us-isob-east-1"],
regionRegex: "^us\\-isob\\-\\w+\\-\\d+$",
endpoint: "aws-iso-b-global",
hostname: "route53.sc2s.sgov.gov",
},
"aws-us-gov": {
regions: ["aws-us-gov-global", "fips-aws-us-gov-global", "us-gov-east-1", "us-gov-west-1"],
regionRegex: "^us\\-gov\\-\\w+\\-\\d+$",
endpoint: "aws-us-gov-global",
hostname: "route53.us-gov.amazonaws.com",
},
};

Expand Down
9 changes: 2 additions & 7 deletions clients/client-savingsplans/src/endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import { getRegionInfo, PartitionHash, RegionHash } from "@aws-sdk/config-resolver";
import { RegionInfoProvider } from "@aws-sdk/types";

const regionHash: RegionHash = {
"aws-global": {
hostname: "savingsplans.amazonaws.com",
signingRegion: "us-east-1",
},
};
const regionHash: RegionHash = {};

const partitionHash: PartitionHash = {
aws: {
Expand Down Expand Up @@ -35,7 +30,7 @@ const partitionHash: PartitionHash = {
"us-west-2",
],
regionRegex: "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
endpoint: "aws-global",
hostname: "savingsplans.amazonaws.com",
},
"aws-cn": {
regions: ["cn-north-1", "cn-northwest-1"],
Expand Down
Loading