Skip to content

Commit 84e86a2

Browse files
Update endpoint ruleset parameters casing
1 parent 86d7855 commit 84e86a2

File tree

3 files changed

+88
-88
lines changed

3 files changed

+88
-88
lines changed

generator/ServiceModels/elasticfilesystem/elasticfilesystem-2015-02-01.endpoint-rule-set.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
"required": true,
77
"default": false,
88
"documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.",
9-
"type": "Boolean"
9+
"type": "boolean"
1010
},
1111
"UseFIPS": {
1212
"builtIn": "AWS::UseFIPS",
1313
"required": true,
1414
"default": false,
1515
"documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.",
16-
"type": "Boolean"
16+
"type": "boolean"
1717
},
1818
"Endpoint": {
1919
"builtIn": "SDK::Endpoint",
2020
"required": false,
2121
"documentation": "Override the endpoint used to send this request",
22-
"type": "String"
22+
"type": "string"
2323
},
2424
"Region": {
2525
"builtIn": "AWS::Region",
2626
"required": false,
2727
"documentation": "The AWS region used to dispatch the request.",
28-
"type": "String"
28+
"type": "string"
2929
}
3030
},
3131
"rules": [

generator/ServiceModels/elasticfilesystem/elasticfilesystem-2015-02-01.endpoint-tests.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -138,53 +138,27 @@
138138
}
139139
},
140140
{
141-
"documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled",
142-
"expect": {
143-
"endpoint": {
144-
"url": "https://efs-fips.us-gov-west-1.api.aws"
145-
}
146-
},
147-
"params": {
148-
"Region": "us-gov-west-1",
149-
"UseFIPS": true,
150-
"UseDualStack": true
151-
}
152-
},
153-
{
154-
"documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
141+
"documentation": "For region eusc-de-east-1 with FIPS enabled and DualStack disabled",
155142
"expect": {
156143
"endpoint": {
157-
"url": "https://elasticfilesystem-fips.us-gov-west-1.amazonaws.com"
144+
"url": "https://elasticfilesystem-fips.eusc-de-east-1.amazonaws.eu"
158145
}
159146
},
160147
"params": {
161-
"Region": "us-gov-west-1",
148+
"Region": "eusc-de-east-1",
162149
"UseFIPS": true,
163150
"UseDualStack": false
164151
}
165152
},
166153
{
167-
"documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled",
168-
"expect": {
169-
"endpoint": {
170-
"url": "https://efs.us-gov-west-1.api.aws"
171-
}
172-
},
173-
"params": {
174-
"Region": "us-gov-west-1",
175-
"UseFIPS": false,
176-
"UseDualStack": true
177-
}
178-
},
179-
{
180-
"documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
154+
"documentation": "For region eusc-de-east-1 with FIPS disabled and DualStack disabled",
181155
"expect": {
182156
"endpoint": {
183-
"url": "https://elasticfilesystem.us-gov-west-1.amazonaws.com"
157+
"url": "https://elasticfilesystem.eusc-de-east-1.amazonaws.eu"
184158
}
185159
},
186160
"params": {
187-
"Region": "us-gov-west-1",
161+
"Region": "eusc-de-east-1",
188162
"UseFIPS": false,
189163
"UseDualStack": false
190164
}
@@ -294,27 +268,53 @@
294268
}
295269
},
296270
{
297-
"documentation": "For region eusc-de-east-1 with FIPS enabled and DualStack disabled",
271+
"documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled",
298272
"expect": {
299273
"endpoint": {
300-
"url": "https://elasticfilesystem-fips.eusc-de-east-1.amazonaws.eu"
274+
"url": "https://efs-fips.us-gov-west-1.api.aws"
301275
}
302276
},
303277
"params": {
304-
"Region": "eusc-de-east-1",
278+
"Region": "us-gov-west-1",
279+
"UseFIPS": true,
280+
"UseDualStack": true
281+
}
282+
},
283+
{
284+
"documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
285+
"expect": {
286+
"endpoint": {
287+
"url": "https://elasticfilesystem-fips.us-gov-west-1.amazonaws.com"
288+
}
289+
},
290+
"params": {
291+
"Region": "us-gov-west-1",
305292
"UseFIPS": true,
306293
"UseDualStack": false
307294
}
308295
},
309296
{
310-
"documentation": "For region eusc-de-east-1 with FIPS disabled and DualStack disabled",
297+
"documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled",
311298
"expect": {
312299
"endpoint": {
313-
"url": "https://elasticfilesystem.eusc-de-east-1.amazonaws.eu"
300+
"url": "https://efs.us-gov-west-1.api.aws"
314301
}
315302
},
316303
"params": {
317-
"Region": "eusc-de-east-1",
304+
"Region": "us-gov-west-1",
305+
"UseFIPS": false,
306+
"UseDualStack": true
307+
}
308+
},
309+
{
310+
"documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
311+
"expect": {
312+
"endpoint": {
313+
"url": "https://elasticfilesystem.us-gov-west-1.amazonaws.com"
314+
}
315+
},
316+
"params": {
317+
"Region": "us-gov-west-1",
318318
"UseFIPS": false,
319319
"UseDualStack": false
320320
}

sdk/test/Services/ElasticFileSystem/UnitTests/Generated/Endpoints/ElasticFileSystemEndpointProviderTests.cs

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -195,60 +195,30 @@ public void For_region_cnnorthwest1_with_FIPS_disabled_and_DualStack_disabled_Te
195195
[TestCategory("UnitTest")]
196196
[TestCategory("Endpoints")]
197197
[TestCategory("ElasticFileSystem")]
198-
[Description("For region us-gov-west-1 with FIPS enabled and DualStack enabled")]
199-
public void For_region_usgovwest1_with_FIPS_enabled_and_DualStack_enabled_Test()
200-
{
201-
var parameters = new ElasticFileSystemEndpointParameters();
202-
parameters["Region"] = "us-gov-west-1";
203-
parameters["UseFIPS"] = true;
204-
parameters["UseDualStack"] = true;
205-
var endpoint = new AmazonElasticFileSystemEndpointProvider().ResolveEndpoint(parameters);
206-
Assert.AreEqual("https://efs-fips.us-gov-west-1.api.aws", endpoint.URL);
207-
}
208-
209-
[TestMethod]
210-
[TestCategory("UnitTest")]
211-
[TestCategory("Endpoints")]
212-
[TestCategory("ElasticFileSystem")]
213-
[Description("For region us-gov-west-1 with FIPS enabled and DualStack disabled")]
214-
public void For_region_usgovwest1_with_FIPS_enabled_and_DualStack_disabled_Test()
198+
[Description("For region eusc-de-east-1 with FIPS enabled and DualStack disabled")]
199+
public void For_region_euscdeeast1_with_FIPS_enabled_and_DualStack_disabled_Test()
215200
{
216201
var parameters = new ElasticFileSystemEndpointParameters();
217-
parameters["Region"] = "us-gov-west-1";
202+
parameters["Region"] = "eusc-de-east-1";
218203
parameters["UseFIPS"] = true;
219204
parameters["UseDualStack"] = false;
220205
var endpoint = new AmazonElasticFileSystemEndpointProvider().ResolveEndpoint(parameters);
221-
Assert.AreEqual("https://elasticfilesystem-fips.us-gov-west-1.amazonaws.com", endpoint.URL);
222-
}
223-
224-
[TestMethod]
225-
[TestCategory("UnitTest")]
226-
[TestCategory("Endpoints")]
227-
[TestCategory("ElasticFileSystem")]
228-
[Description("For region us-gov-west-1 with FIPS disabled and DualStack enabled")]
229-
public void For_region_usgovwest1_with_FIPS_disabled_and_DualStack_enabled_Test()
230-
{
231-
var parameters = new ElasticFileSystemEndpointParameters();
232-
parameters["Region"] = "us-gov-west-1";
233-
parameters["UseFIPS"] = false;
234-
parameters["UseDualStack"] = true;
235-
var endpoint = new AmazonElasticFileSystemEndpointProvider().ResolveEndpoint(parameters);
236-
Assert.AreEqual("https://efs.us-gov-west-1.api.aws", endpoint.URL);
206+
Assert.AreEqual("https://elasticfilesystem-fips.eusc-de-east-1.amazonaws.eu", endpoint.URL);
237207
}
238208

239209
[TestMethod]
240210
[TestCategory("UnitTest")]
241211
[TestCategory("Endpoints")]
242212
[TestCategory("ElasticFileSystem")]
243-
[Description("For region us-gov-west-1 with FIPS disabled and DualStack disabled")]
244-
public void For_region_usgovwest1_with_FIPS_disabled_and_DualStack_disabled_Test()
213+
[Description("For region eusc-de-east-1 with FIPS disabled and DualStack disabled")]
214+
public void For_region_euscdeeast1_with_FIPS_disabled_and_DualStack_disabled_Test()
245215
{
246216
var parameters = new ElasticFileSystemEndpointParameters();
247-
parameters["Region"] = "us-gov-west-1";
217+
parameters["Region"] = "eusc-de-east-1";
248218
parameters["UseFIPS"] = false;
249219
parameters["UseDualStack"] = false;
250220
var endpoint = new AmazonElasticFileSystemEndpointProvider().ResolveEndpoint(parameters);
251-
Assert.AreEqual("https://elasticfilesystem.us-gov-west-1.amazonaws.com", endpoint.URL);
221+
Assert.AreEqual("https://elasticfilesystem.eusc-de-east-1.amazonaws.eu", endpoint.URL);
252222
}
253223

254224
[TestMethod]
@@ -375,30 +345,60 @@ public void For_region_usisofsouth1_with_FIPS_disabled_and_DualStack_disabled_Te
375345
[TestCategory("UnitTest")]
376346
[TestCategory("Endpoints")]
377347
[TestCategory("ElasticFileSystem")]
378-
[Description("For region eusc-de-east-1 with FIPS enabled and DualStack disabled")]
379-
public void For_region_euscdeeast1_with_FIPS_enabled_and_DualStack_disabled_Test()
348+
[Description("For region us-gov-west-1 with FIPS enabled and DualStack enabled")]
349+
public void For_region_usgovwest1_with_FIPS_enabled_and_DualStack_enabled_Test()
380350
{
381351
var parameters = new ElasticFileSystemEndpointParameters();
382-
parameters["Region"] = "eusc-de-east-1";
352+
parameters["Region"] = "us-gov-west-1";
353+
parameters["UseFIPS"] = true;
354+
parameters["UseDualStack"] = true;
355+
var endpoint = new AmazonElasticFileSystemEndpointProvider().ResolveEndpoint(parameters);
356+
Assert.AreEqual("https://efs-fips.us-gov-west-1.api.aws", endpoint.URL);
357+
}
358+
359+
[TestMethod]
360+
[TestCategory("UnitTest")]
361+
[TestCategory("Endpoints")]
362+
[TestCategory("ElasticFileSystem")]
363+
[Description("For region us-gov-west-1 with FIPS enabled and DualStack disabled")]
364+
public void For_region_usgovwest1_with_FIPS_enabled_and_DualStack_disabled_Test()
365+
{
366+
var parameters = new ElasticFileSystemEndpointParameters();
367+
parameters["Region"] = "us-gov-west-1";
383368
parameters["UseFIPS"] = true;
384369
parameters["UseDualStack"] = false;
385370
var endpoint = new AmazonElasticFileSystemEndpointProvider().ResolveEndpoint(parameters);
386-
Assert.AreEqual("https://elasticfilesystem-fips.eusc-de-east-1.amazonaws.eu", endpoint.URL);
371+
Assert.AreEqual("https://elasticfilesystem-fips.us-gov-west-1.amazonaws.com", endpoint.URL);
387372
}
388373

389374
[TestMethod]
390375
[TestCategory("UnitTest")]
391376
[TestCategory("Endpoints")]
392377
[TestCategory("ElasticFileSystem")]
393-
[Description("For region eusc-de-east-1 with FIPS disabled and DualStack disabled")]
394-
public void For_region_euscdeeast1_with_FIPS_disabled_and_DualStack_disabled_Test()
378+
[Description("For region us-gov-west-1 with FIPS disabled and DualStack enabled")]
379+
public void For_region_usgovwest1_with_FIPS_disabled_and_DualStack_enabled_Test()
395380
{
396381
var parameters = new ElasticFileSystemEndpointParameters();
397-
parameters["Region"] = "eusc-de-east-1";
382+
parameters["Region"] = "us-gov-west-1";
383+
parameters["UseFIPS"] = false;
384+
parameters["UseDualStack"] = true;
385+
var endpoint = new AmazonElasticFileSystemEndpointProvider().ResolveEndpoint(parameters);
386+
Assert.AreEqual("https://efs.us-gov-west-1.api.aws", endpoint.URL);
387+
}
388+
389+
[TestMethod]
390+
[TestCategory("UnitTest")]
391+
[TestCategory("Endpoints")]
392+
[TestCategory("ElasticFileSystem")]
393+
[Description("For region us-gov-west-1 with FIPS disabled and DualStack disabled")]
394+
public void For_region_usgovwest1_with_FIPS_disabled_and_DualStack_disabled_Test()
395+
{
396+
var parameters = new ElasticFileSystemEndpointParameters();
397+
parameters["Region"] = "us-gov-west-1";
398398
parameters["UseFIPS"] = false;
399399
parameters["UseDualStack"] = false;
400400
var endpoint = new AmazonElasticFileSystemEndpointProvider().ResolveEndpoint(parameters);
401-
Assert.AreEqual("https://elasticfilesystem.eusc-de-east-1.amazonaws.eu", endpoint.URL);
401+
Assert.AreEqual("https://elasticfilesystem.us-gov-west-1.amazonaws.com", endpoint.URL);
402402
}
403403

404404
[TestMethod]

0 commit comments

Comments
 (0)