Skip to content

Commit 2955f67

Browse files
author
awstools
committed
feat(client-support-app): Fix incorrect endpoint-prefix in endpoint ruleset.
1 parent 758bc33 commit 2955f67

File tree

3 files changed

+171
-15
lines changed

3 files changed

+171
-15
lines changed

clients/client-support-app/src/endpoint/EndpointParameters.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const resolveClientEndpointParameters = <T>(
2424
};
2525

2626
export interface EndpointParameters extends __EndpointParameters {
27-
Region: string;
27+
Region?: string;
2828
UseDualStack?: boolean;
2929
UseFIPS?: boolean;
3030
Endpoint?: string;

clients/client-support-app/src/endpoint/ruleset.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const ruleSet: RuleSetObject = {
66
parameters: {
77
Region: {
88
builtIn: "AWS::Region",
9-
required: true,
9+
required: false,
1010
documentation: "The AWS region used to dispatch the request.",
1111
type: "String",
1212
},
@@ -180,7 +180,7 @@ export const ruleSet: RuleSetObject = {
180180
{
181181
conditions: [],
182182
endpoint: {
183-
url: "https://support-app-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
183+
url: "https://supportapp-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
184184
properties: {},
185185
headers: {},
186186
},
@@ -232,7 +232,7 @@ export const ruleSet: RuleSetObject = {
232232
{
233233
conditions: [],
234234
endpoint: {
235-
url: "https://support-app-fips.{Region}.{PartitionResult#dnsSuffix}",
235+
url: "https://supportapp-fips.{Region}.{PartitionResult#dnsSuffix}",
236236
properties: {},
237237
headers: {},
238238
},
@@ -284,7 +284,7 @@ export const ruleSet: RuleSetObject = {
284284
{
285285
conditions: [],
286286
endpoint: {
287-
url: "https://support-app.{Region}.{PartitionResult#dualStackDnsSuffix}",
287+
url: "https://supportapp.{Region}.{PartitionResult#dualStackDnsSuffix}",
288288
properties: {},
289289
headers: {},
290290
},
@@ -302,7 +302,7 @@ export const ruleSet: RuleSetObject = {
302302
{
303303
conditions: [],
304304
endpoint: {
305-
url: "https://support-app.{Region}.{PartitionResult#dnsSuffix}",
305+
url: "https://supportapp.{Region}.{PartitionResult#dnsSuffix}",
306306
properties: {},
307307
headers: {},
308308
},

codegen/sdk-codegen/aws-models/support-app.json

+165-9
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@
771771
"parameters": {
772772
"Region": {
773773
"builtIn": "AWS::Region",
774-
"required": true,
774+
"required": false,
775775
"documentation": "The AWS region used to dispatch the request.",
776776
"type": "String"
777777
},
@@ -943,7 +943,7 @@
943943
{
944944
"conditions": [],
945945
"endpoint": {
946-
"url": "https://support-app-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
946+
"url": "https://supportapp-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
947947
"properties": {},
948948
"headers": {}
949949
},
@@ -995,7 +995,7 @@
995995
{
996996
"conditions": [],
997997
"endpoint": {
998-
"url": "https://support-app-fips.{Region}.{PartitionResult#dnsSuffix}",
998+
"url": "https://supportapp-fips.{Region}.{PartitionResult#dnsSuffix}",
999999
"properties": {},
10001000
"headers": {}
10011001
},
@@ -1047,7 +1047,7 @@
10471047
{
10481048
"conditions": [],
10491049
"endpoint": {
1050-
"url": "https://support-app.{Region}.{PartitionResult#dualStackDnsSuffix}",
1050+
"url": "https://supportapp.{Region}.{PartitionResult#dualStackDnsSuffix}",
10511051
"properties": {},
10521052
"headers": {}
10531053
},
@@ -1065,7 +1065,7 @@
10651065
{
10661066
"conditions": [],
10671067
"endpoint": {
1068-
"url": "https://support-app.{Region}.{PartitionResult#dnsSuffix}",
1068+
"url": "https://supportapp.{Region}.{PartitionResult#dnsSuffix}",
10691069
"properties": {},
10701070
"headers": {}
10711071
},
@@ -1077,6 +1077,162 @@
10771077
},
10781078
"smithy.rules#endpointTests": {
10791079
"testCases": [
1080+
{
1081+
"documentation": "For region us-west-2 with FIPS enabled and DualStack enabled",
1082+
"expect": {
1083+
"endpoint": {
1084+
"url": "https://supportapp-fips.us-west-2.api.aws"
1085+
}
1086+
},
1087+
"params": {
1088+
"UseFIPS": true,
1089+
"UseDualStack": true,
1090+
"Region": "us-west-2"
1091+
}
1092+
},
1093+
{
1094+
"documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
1095+
"expect": {
1096+
"endpoint": {
1097+
"url": "https://supportapp-fips.us-west-2.amazonaws.com"
1098+
}
1099+
},
1100+
"params": {
1101+
"UseFIPS": true,
1102+
"UseDualStack": false,
1103+
"Region": "us-west-2"
1104+
}
1105+
},
1106+
{
1107+
"documentation": "For region us-west-2 with FIPS disabled and DualStack enabled",
1108+
"expect": {
1109+
"endpoint": {
1110+
"url": "https://supportapp.us-west-2.api.aws"
1111+
}
1112+
},
1113+
"params": {
1114+
"UseFIPS": false,
1115+
"UseDualStack": true,
1116+
"Region": "us-west-2"
1117+
}
1118+
},
1119+
{
1120+
"documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
1121+
"expect": {
1122+
"endpoint": {
1123+
"url": "https://supportapp.us-west-2.amazonaws.com"
1124+
}
1125+
},
1126+
"params": {
1127+
"UseFIPS": false,
1128+
"UseDualStack": false,
1129+
"Region": "us-west-2"
1130+
}
1131+
},
1132+
{
1133+
"documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled",
1134+
"expect": {
1135+
"endpoint": {
1136+
"url": "https://supportapp-fips.eu-west-1.api.aws"
1137+
}
1138+
},
1139+
"params": {
1140+
"UseFIPS": true,
1141+
"UseDualStack": true,
1142+
"Region": "eu-west-1"
1143+
}
1144+
},
1145+
{
1146+
"documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled",
1147+
"expect": {
1148+
"endpoint": {
1149+
"url": "https://supportapp-fips.eu-west-1.amazonaws.com"
1150+
}
1151+
},
1152+
"params": {
1153+
"UseFIPS": true,
1154+
"UseDualStack": false,
1155+
"Region": "eu-west-1"
1156+
}
1157+
},
1158+
{
1159+
"documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled",
1160+
"expect": {
1161+
"endpoint": {
1162+
"url": "https://supportapp.eu-west-1.api.aws"
1163+
}
1164+
},
1165+
"params": {
1166+
"UseFIPS": false,
1167+
"UseDualStack": true,
1168+
"Region": "eu-west-1"
1169+
}
1170+
},
1171+
{
1172+
"documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
1173+
"expect": {
1174+
"endpoint": {
1175+
"url": "https://supportapp.eu-west-1.amazonaws.com"
1176+
}
1177+
},
1178+
"params": {
1179+
"UseFIPS": false,
1180+
"UseDualStack": false,
1181+
"Region": "eu-west-1"
1182+
}
1183+
},
1184+
{
1185+
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
1186+
"expect": {
1187+
"endpoint": {
1188+
"url": "https://supportapp-fips.us-east-1.api.aws"
1189+
}
1190+
},
1191+
"params": {
1192+
"UseFIPS": true,
1193+
"UseDualStack": true,
1194+
"Region": "us-east-1"
1195+
}
1196+
},
1197+
{
1198+
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
1199+
"expect": {
1200+
"endpoint": {
1201+
"url": "https://supportapp-fips.us-east-1.amazonaws.com"
1202+
}
1203+
},
1204+
"params": {
1205+
"UseFIPS": true,
1206+
"UseDualStack": false,
1207+
"Region": "us-east-1"
1208+
}
1209+
},
1210+
{
1211+
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
1212+
"expect": {
1213+
"endpoint": {
1214+
"url": "https://supportapp.us-east-1.api.aws"
1215+
}
1216+
},
1217+
"params": {
1218+
"UseFIPS": false,
1219+
"UseDualStack": true,
1220+
"Region": "us-east-1"
1221+
}
1222+
},
1223+
{
1224+
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
1225+
"expect": {
1226+
"endpoint": {
1227+
"url": "https://supportapp.us-east-1.amazonaws.com"
1228+
}
1229+
},
1230+
"params": {
1231+
"UseFIPS": false,
1232+
"UseDualStack": false,
1233+
"Region": "us-east-1"
1234+
}
1235+
},
10801236
{
10811237
"documentation": "For custom endpoint with fips disabled and dualstack disabled",
10821238
"expect": {
@@ -1086,8 +1242,8 @@
10861242
},
10871243
"params": {
10881244
"UseFIPS": false,
1089-
"Region": "us-east-1",
10901245
"UseDualStack": false,
1246+
"Region": "us-east-1",
10911247
"Endpoint": "https://example.com"
10921248
}
10931249
},
@@ -1098,8 +1254,8 @@
10981254
},
10991255
"params": {
11001256
"UseFIPS": true,
1101-
"Region": "us-east-1",
11021257
"UseDualStack": false,
1258+
"Region": "us-east-1",
11031259
"Endpoint": "https://example.com"
11041260
}
11051261
},
@@ -1110,8 +1266,8 @@
11101266
},
11111267
"params": {
11121268
"UseFIPS": false,
1113-
"Region": "us-east-1",
11141269
"UseDualStack": true,
1270+
"Region": "us-east-1",
11151271
"Endpoint": "https://example.com"
11161272
}
11171273
}
@@ -1358,4 +1514,4 @@
13581514
}
13591515
}
13601516
}
1361-
}
1517+
}

0 commit comments

Comments
 (0)