Skip to content

Commit 5356dbb

Browse files
AllanZhengYPAllanZhengYP
authored
fix: update clients with correct endpoint prefix (#720)
* feat: infer endpoint prefix from a map file * fix: update copy script to override endpoints.ts * chore: add endpoint functional test cases * fix: update clients with correct endpoint prefix from C2J
1 parent 396a065 commit 5356dbb

File tree

39 files changed

+1885
-477
lines changed

39 files changed

+1885
-477
lines changed

‎clients/client-appstream/endpoints.ts

Lines changed: 71 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { RegionInfo, RegionInfoProvider } from "@aws-sdk/types";
22

33
// Partition default templates
4-
const AWS_TEMPLATE = "appstream.{region}.amazonaws.com";
5-
const AWS_CN_TEMPLATE = "appstream.{region}.amazonaws.com.cn";
6-
const AWS_ISO_TEMPLATE = "appstream.{region}.c2s.ic.gov";
7-
const AWS_ISO_B_TEMPLATE = "appstream.{region}.sc2s.sgov.gov";
8-
const AWS_US_GOV_TEMPLATE = "appstream.{region}.amazonaws.com";
4+
const AWS_TEMPLATE = "appstream2.{region}.amazonaws.com";
5+
const AWS_CN_TEMPLATE = "appstream2.{region}.amazonaws.com.cn";
6+
const AWS_ISO_TEMPLATE = "appstream2.{region}.c2s.ic.gov";
7+
const AWS_ISO_B_TEMPLATE = "appstream2.{region}.sc2s.sgov.gov";
8+
const AWS_US_GOV_TEMPLATE = "appstream2.{region}.amazonaws.com";
99

1010
// Partition regions
1111
const AWS_REGIONS = new Set([
@@ -40,11 +40,72 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (
4040
let regionInfo: RegionInfo | undefined = undefined;
4141
switch (region) {
4242
// First, try to match exact region names.
43+
case "ap-northeast-1":
44+
regionInfo = {
45+
hostname: "appstream2.ap-northeast-1.amazonaws.com",
46+
signingService: "appstream"
47+
};
48+
break;
49+
case "ap-northeast-2":
50+
regionInfo = {
51+
hostname: "appstream2.ap-northeast-2.amazonaws.com",
52+
signingService: "appstream"
53+
};
54+
break;
55+
case "ap-southeast-1":
56+
regionInfo = {
57+
hostname: "appstream2.ap-southeast-1.amazonaws.com",
58+
signingService: "appstream"
59+
};
60+
break;
61+
case "ap-southeast-2":
62+
regionInfo = {
63+
hostname: "appstream2.ap-southeast-2.amazonaws.com",
64+
signingService: "appstream"
65+
};
66+
break;
67+
case "eu-central-1":
68+
regionInfo = {
69+
hostname: "appstream2.eu-central-1.amazonaws.com",
70+
signingService: "appstream"
71+
};
72+
break;
73+
case "eu-west-1":
74+
regionInfo = {
75+
hostname: "appstream2.eu-west-1.amazonaws.com",
76+
signingService: "appstream"
77+
};
78+
break;
79+
case "fips":
80+
regionInfo = {
81+
hostname: "appstream2-fips.us-gov-west-1.amazonaws.com",
82+
signingRegion: "us-gov-west-1"
83+
};
84+
break;
85+
case "us-east-1":
86+
regionInfo = {
87+
hostname: "appstream2.us-east-1.amazonaws.com",
88+
signingService: "appstream"
89+
};
90+
break;
91+
case "us-gov-west-1":
92+
regionInfo = {
93+
hostname: "appstream2.us-gov-west-1.amazonaws.com",
94+
signingService: "appstream"
95+
};
96+
break;
97+
case "us-west-2":
98+
regionInfo = {
99+
hostname: "appstream2.us-west-2.amazonaws.com",
100+
signingService: "appstream"
101+
};
102+
break;
43103
// Next, try to match partition endpoints.
44104
default:
45105
if (AWS_REGIONS.has(region)) {
46106
regionInfo = {
47-
hostname: AWS_TEMPLATE.replace("{region}", region)
107+
hostname: AWS_TEMPLATE.replace("{region}", region),
108+
signingService: "appstream"
48109
};
49110
}
50111
if (AWS_CN_REGIONS.has(region)) {
@@ -64,13 +125,15 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (
64125
}
65126
if (AWS_US_GOV_REGIONS.has(region)) {
66127
regionInfo = {
67-
hostname: AWS_US_GOV_TEMPLATE.replace("{region}", region)
128+
hostname: AWS_US_GOV_TEMPLATE.replace("{region}", region),
129+
signingService: "appstream"
68130
};
69131
}
70132
// Finally, assume it's an AWS partition endpoint.
71133
if (regionInfo === undefined) {
72134
regionInfo = {
73-
hostname: AWS_TEMPLATE.replace("{region}", region)
135+
hostname: AWS_TEMPLATE.replace("{region}", region),
136+
signingService: "appstream"
74137
};
75138
}
76139
}

‎clients/client-cloudhsm-v2/endpoints.ts

Lines changed: 87 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { RegionInfo, RegionInfoProvider } from "@aws-sdk/types";
22

33
// Partition default templates
4-
const AWS_TEMPLATE = "cloudhsm.{region}.amazonaws.com";
5-
const AWS_CN_TEMPLATE = "cloudhsm.{region}.amazonaws.com.cn";
6-
const AWS_ISO_TEMPLATE = "cloudhsm.{region}.c2s.ic.gov";
7-
const AWS_ISO_B_TEMPLATE = "cloudhsm.{region}.sc2s.sgov.gov";
8-
const AWS_US_GOV_TEMPLATE = "cloudhsm.{region}.amazonaws.com";
4+
const AWS_TEMPLATE = "cloudhsmv2.{region}.amazonaws.com";
5+
const AWS_CN_TEMPLATE = "cloudhsmv2.{region}.amazonaws.com.cn";
6+
const AWS_ISO_TEMPLATE = "cloudhsmv2.{region}.c2s.ic.gov";
7+
const AWS_ISO_B_TEMPLATE = "cloudhsmv2.{region}.sc2s.sgov.gov";
8+
const AWS_US_GOV_TEMPLATE = "cloudhsmv2.{region}.amazonaws.com";
99

1010
// Partition regions
1111
const AWS_REGIONS = new Set([
@@ -40,66 +40,132 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (
4040
let regionInfo: RegionInfo | undefined = undefined;
4141
switch (region) {
4242
// First, try to match exact region names.
43+
case "ap-east-1":
44+
regionInfo = {
45+
hostname: "cloudhsmv2.ap-east-1.amazonaws.com",
46+
signingService: "cloudhsm"
47+
};
48+
break;
4349
case "ap-northeast-1":
4450
regionInfo = {
45-
hostname: "cloudhsm.ap-northeast-1.amazonaws.com"
51+
hostname: "cloudhsmv2.ap-northeast-1.amazonaws.com",
52+
signingService: "cloudhsm"
53+
};
54+
break;
55+
case "ap-northeast-2":
56+
regionInfo = {
57+
hostname: "cloudhsmv2.ap-northeast-2.amazonaws.com",
58+
signingService: "cloudhsm"
59+
};
60+
break;
61+
case "ap-south-1":
62+
regionInfo = {
63+
hostname: "cloudhsmv2.ap-south-1.amazonaws.com",
64+
signingService: "cloudhsm"
4665
};
4766
break;
4867
case "ap-southeast-1":
4968
regionInfo = {
50-
hostname: "cloudhsm.ap-southeast-1.amazonaws.com"
69+
hostname: "cloudhsmv2.ap-southeast-1.amazonaws.com",
70+
signingService: "cloudhsm"
5171
};
5272
break;
5373
case "ap-southeast-2":
5474
regionInfo = {
55-
hostname: "cloudhsm.ap-southeast-2.amazonaws.com"
75+
hostname: "cloudhsmv2.ap-southeast-2.amazonaws.com",
76+
signingService: "cloudhsm"
5677
};
5778
break;
5879
case "ca-central-1":
5980
regionInfo = {
60-
hostname: "cloudhsm.ca-central-1.amazonaws.com"
81+
hostname: "cloudhsmv2.ca-central-1.amazonaws.com",
82+
signingService: "cloudhsm"
6183
};
6284
break;
6385
case "eu-central-1":
6486
regionInfo = {
65-
hostname: "cloudhsm.eu-central-1.amazonaws.com"
87+
hostname: "cloudhsmv2.eu-central-1.amazonaws.com",
88+
signingService: "cloudhsm"
89+
};
90+
break;
91+
case "eu-north-1":
92+
regionInfo = {
93+
hostname: "cloudhsmv2.eu-north-1.amazonaws.com",
94+
signingService: "cloudhsm"
6695
};
6796
break;
6897
case "eu-west-1":
6998
regionInfo = {
70-
hostname: "cloudhsm.eu-west-1.amazonaws.com"
99+
hostname: "cloudhsmv2.eu-west-1.amazonaws.com",
100+
signingService: "cloudhsm"
101+
};
102+
break;
103+
case "eu-west-2":
104+
regionInfo = {
105+
hostname: "cloudhsmv2.eu-west-2.amazonaws.com",
106+
signingService: "cloudhsm"
107+
};
108+
break;
109+
case "eu-west-3":
110+
regionInfo = {
111+
hostname: "cloudhsmv2.eu-west-3.amazonaws.com",
112+
signingService: "cloudhsm"
113+
};
114+
break;
115+
case "me-south-1":
116+
regionInfo = {
117+
hostname: "cloudhsmv2.me-south-1.amazonaws.com",
118+
signingService: "cloudhsm"
119+
};
120+
break;
121+
case "sa-east-1":
122+
regionInfo = {
123+
hostname: "cloudhsmv2.sa-east-1.amazonaws.com",
124+
signingService: "cloudhsm"
71125
};
72126
break;
73127
case "us-east-1":
74128
regionInfo = {
75-
hostname: "cloudhsm.us-east-1.amazonaws.com"
129+
hostname: "cloudhsmv2.us-east-1.amazonaws.com",
130+
signingService: "cloudhsm"
76131
};
77132
break;
78133
case "us-east-2":
79134
regionInfo = {
80-
hostname: "cloudhsm.us-east-2.amazonaws.com"
135+
hostname: "cloudhsmv2.us-east-2.amazonaws.com",
136+
signingService: "cloudhsm"
137+
};
138+
break;
139+
case "us-gov-east-1":
140+
regionInfo = {
141+
hostname: "cloudhsmv2.us-gov-east-1.amazonaws.com",
142+
signingService: "cloudhsm"
81143
};
82144
break;
83145
case "us-gov-west-1":
84146
regionInfo = {
85-
hostname: "cloudhsm.us-gov-west-1.amazonaws.com"
147+
hostname: "cloudhsmv2.us-gov-west-1.amazonaws.com",
148+
signingService: "cloudhsm"
86149
};
87150
break;
88151
case "us-west-1":
89152
regionInfo = {
90-
hostname: "cloudhsm.us-west-1.amazonaws.com"
153+
hostname: "cloudhsmv2.us-west-1.amazonaws.com",
154+
signingService: "cloudhsm"
91155
};
92156
break;
93157
case "us-west-2":
94158
regionInfo = {
95-
hostname: "cloudhsm.us-west-2.amazonaws.com"
159+
hostname: "cloudhsmv2.us-west-2.amazonaws.com",
160+
signingService: "cloudhsm"
96161
};
97162
break;
98163
// Next, try to match partition endpoints.
99164
default:
100165
if (AWS_REGIONS.has(region)) {
101166
regionInfo = {
102-
hostname: AWS_TEMPLATE.replace("{region}", region)
167+
hostname: AWS_TEMPLATE.replace("{region}", region),
168+
signingService: "cloudhsm"
103169
};
104170
}
105171
if (AWS_CN_REGIONS.has(region)) {
@@ -119,13 +185,15 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (
119185
}
120186
if (AWS_US_GOV_REGIONS.has(region)) {
121187
regionInfo = {
122-
hostname: AWS_US_GOV_TEMPLATE.replace("{region}", region)
188+
hostname: AWS_US_GOV_TEMPLATE.replace("{region}", region),
189+
signingService: "cloudhsm"
123190
};
124191
}
125192
// Finally, assume it's an AWS partition endpoint.
126193
if (regionInfo === undefined) {
127194
regionInfo = {
128-
hostname: AWS_TEMPLATE.replace("{region}", region)
195+
hostname: AWS_TEMPLATE.replace("{region}", region),
196+
signingService: "cloudhsm"
129197
};
130198
}
131199
}

‎clients/client-cloudsearch-domain/endpoints.ts

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { RegionInfo, RegionInfoProvider } from "@aws-sdk/types";
22

33
// Partition default templates
4-
const AWS_TEMPLATE = "cloudsearch.{region}.amazonaws.com";
5-
const AWS_CN_TEMPLATE = "cloudsearch.{region}.amazonaws.com.cn";
6-
const AWS_ISO_TEMPLATE = "cloudsearch.{region}.c2s.ic.gov";
7-
const AWS_ISO_B_TEMPLATE = "cloudsearch.{region}.sc2s.sgov.gov";
8-
const AWS_US_GOV_TEMPLATE = "cloudsearch.{region}.amazonaws.com";
4+
const AWS_TEMPLATE = "cloudsearchdomain.{region}.amazonaws.com";
5+
const AWS_CN_TEMPLATE = "cloudsearchdomain.{region}.amazonaws.com.cn";
6+
const AWS_ISO_TEMPLATE = "cloudsearchdomain.{region}.c2s.ic.gov";
7+
const AWS_ISO_B_TEMPLATE = "cloudsearchdomain.{region}.sc2s.sgov.gov";
8+
const AWS_US_GOV_TEMPLATE = "cloudsearchdomain.{region}.amazonaws.com";
99

1010
// Partition regions
1111
const AWS_REGIONS = new Set([
@@ -40,56 +40,6 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (
4040
let regionInfo: RegionInfo | undefined = undefined;
4141
switch (region) {
4242
// First, try to match exact region names.
43-
case "ap-northeast-1":
44-
regionInfo = {
45-
hostname: "cloudsearch.ap-northeast-1.amazonaws.com"
46-
};
47-
break;
48-
case "ap-northeast-2":
49-
regionInfo = {
50-
hostname: "cloudsearch.ap-northeast-2.amazonaws.com"
51-
};
52-
break;
53-
case "ap-southeast-1":
54-
regionInfo = {
55-
hostname: "cloudsearch.ap-southeast-1.amazonaws.com"
56-
};
57-
break;
58-
case "ap-southeast-2":
59-
regionInfo = {
60-
hostname: "cloudsearch.ap-southeast-2.amazonaws.com"
61-
};
62-
break;
63-
case "eu-central-1":
64-
regionInfo = {
65-
hostname: "cloudsearch.eu-central-1.amazonaws.com"
66-
};
67-
break;
68-
case "eu-west-1":
69-
regionInfo = {
70-
hostname: "cloudsearch.eu-west-1.amazonaws.com"
71-
};
72-
break;
73-
case "sa-east-1":
74-
regionInfo = {
75-
hostname: "cloudsearch.sa-east-1.amazonaws.com"
76-
};
77-
break;
78-
case "us-east-1":
79-
regionInfo = {
80-
hostname: "cloudsearch.us-east-1.amazonaws.com"
81-
};
82-
break;
83-
case "us-west-1":
84-
regionInfo = {
85-
hostname: "cloudsearch.us-west-1.amazonaws.com"
86-
};
87-
break;
88-
case "us-west-2":
89-
regionInfo = {
90-
hostname: "cloudsearch.us-west-2.amazonaws.com"
91-
};
92-
break;
9343
// Next, try to match partition endpoints.
9444
default:
9545
if (AWS_REGIONS.has(region)) {

‎clients/client-connectparticipant/endpoints.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { RegionInfo, RegionInfoProvider } from "@aws-sdk/types";
22

33
// Partition default templates
4-
const AWS_TEMPLATE = "execute-api.{region}.amazonaws.com";
5-
const AWS_CN_TEMPLATE = "execute-api.{region}.amazonaws.com.cn";
6-
const AWS_ISO_TEMPLATE = "execute-api.{region}.c2s.ic.gov";
7-
const AWS_ISO_B_TEMPLATE = "execute-api.{region}.sc2s.sgov.gov";
8-
const AWS_US_GOV_TEMPLATE = "execute-api.{region}.amazonaws.com";
4+
const AWS_TEMPLATE = "participant.connect.{region}.amazonaws.com";
5+
const AWS_CN_TEMPLATE = "participant.connect.{region}.amazonaws.com.cn";
6+
const AWS_ISO_TEMPLATE = "participant.connect.{region}.c2s.ic.gov";
7+
const AWS_ISO_B_TEMPLATE = "participant.connect.{region}.sc2s.sgov.gov";
8+
const AWS_US_GOV_TEMPLATE = "participant.connect.{region}.amazonaws.com";
99

1010
// Partition regions
1111
const AWS_REGIONS = new Set([

0 commit comments

Comments
 (0)