Skip to content

Commit b7f064e

Browse files
author
AWS
committed
Amazon EMR Containers Update: Correct endpoint for FIPS is configured for US Gov Regions.
1 parent 5142dc4 commit b7f064e

File tree

4 files changed

+84
-12
lines changed

4 files changed

+84
-12
lines changed

‎.changes/next-release/feature-AmazonEMRContainers-ed42f19.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "Amazon EMR Containers",
4+
"contributor": "",
5+
"description": "Correct endpoint for FIPS is configured for US Gov Regions."
6+
}

‎services/emrcontainers/src/main/resources/codegen-resources/endpoint-rule-set.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,44 @@
218218
}
219219
],
220220
"rules": [
221+
{
222+
"conditions": [
223+
{
224+
"fn": "stringEquals",
225+
"argv": [
226+
{
227+
"ref": "Region"
228+
},
229+
"us-gov-east-1"
230+
]
231+
}
232+
],
233+
"endpoint": {
234+
"url": "https://emr-containers.us-gov-east-1.amazonaws.com",
235+
"properties": {},
236+
"headers": {}
237+
},
238+
"type": "endpoint"
239+
},
240+
{
241+
"conditions": [
242+
{
243+
"fn": "stringEquals",
244+
"argv": [
245+
{
246+
"ref": "Region"
247+
},
248+
"us-gov-west-1"
249+
]
250+
}
251+
],
252+
"endpoint": {
253+
"url": "https://emr-containers.us-gov-west-1.amazonaws.com",
254+
"properties": {},
255+
"headers": {}
256+
},
257+
"type": "endpoint"
258+
},
221259
{
222260
"conditions": [],
223261
"endpoint": {

‎services/emrcontainers/src/main/resources/codegen-resources/endpoint-tests.json

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -365,23 +365,23 @@
365365
}
366366
},
367367
{
368-
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
368+
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
369369
"expect": {
370370
"endpoint": {
371-
"url": "https://emr-containers-fips.us-gov-east-1.api.aws"
371+
"url": "https://emr-containers.us-gov-east-1.amazonaws.com"
372372
}
373373
},
374374
"params": {
375375
"Region": "us-gov-east-1",
376-
"UseFIPS": true,
377-
"UseDualStack": true
376+
"UseFIPS": false,
377+
"UseDualStack": false
378378
}
379379
},
380380
{
381381
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
382382
"expect": {
383383
"endpoint": {
384-
"url": "https://emr-containers-fips.us-gov-east-1.amazonaws.com"
384+
"url": "https://emr-containers.us-gov-east-1.amazonaws.com"
385385
}
386386
},
387387
"params": {
@@ -391,29 +391,55 @@
391391
}
392392
},
393393
{
394-
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
394+
"documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
395395
"expect": {
396396
"endpoint": {
397-
"url": "https://emr-containers.us-gov-east-1.api.aws"
397+
"url": "https://emr-containers.us-gov-west-1.amazonaws.com"
398398
}
399399
},
400400
"params": {
401-
"Region": "us-gov-east-1",
401+
"Region": "us-gov-west-1",
402402
"UseFIPS": false,
403+
"UseDualStack": false
404+
}
405+
},
406+
{
407+
"documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
408+
"expect": {
409+
"endpoint": {
410+
"url": "https://emr-containers.us-gov-west-1.amazonaws.com"
411+
}
412+
},
413+
"params": {
414+
"Region": "us-gov-west-1",
415+
"UseFIPS": true,
416+
"UseDualStack": false
417+
}
418+
},
419+
{
420+
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
421+
"expect": {
422+
"endpoint": {
423+
"url": "https://emr-containers-fips.us-gov-east-1.api.aws"
424+
}
425+
},
426+
"params": {
427+
"Region": "us-gov-east-1",
428+
"UseFIPS": true,
403429
"UseDualStack": true
404430
}
405431
},
406432
{
407-
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
433+
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
408434
"expect": {
409435
"endpoint": {
410-
"url": "https://emr-containers.us-gov-east-1.amazonaws.com"
436+
"url": "https://emr-containers.us-gov-east-1.api.aws"
411437
}
412438
},
413439
"params": {
414440
"Region": "us-gov-east-1",
415441
"UseFIPS": false,
416-
"UseDualStack": false
442+
"UseDualStack": true
417443
}
418444
},
419445
{

‎services/emrcontainers/src/main/resources/codegen-resources/service-2.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
"endpointPrefix":"emr-containers",
66
"jsonVersion":"1.1",
77
"protocol":"rest-json",
8+
"protocols":["rest-json"],
89
"serviceFullName":"Amazon EMR Containers",
910
"serviceId":"EMR containers",
1011
"signatureVersion":"v4",
1112
"signingName":"emr-containers",
12-
"uid":"emr-containers-2020-10-01"
13+
"uid":"emr-containers-2020-10-01",
14+
"auth":["aws.auth#sigv4"]
1315
},
1416
"operations":{
1517
"CancelJobRun":{

0 commit comments

Comments
 (0)