Skip to content

Commit c2919c6

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Fix the AWS Budgets endpoint for the aws-eusc partition.
1 parent 9fb05ff commit c2919c6

File tree

7 files changed

+121
-13
lines changed

7 files changed

+121
-13
lines changed

‎generator/ServiceModels/budgets/budgets-2016-10-20.api.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@
15391539
"type":"string",
15401540
"max":684,
15411541
"min":25,
1542-
"pattern":"^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::(\\d{12}|aws):policy(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$"
1542+
"pattern":"^arn:aws(-eusc|-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::(\\d{12}|aws):policy(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$"
15431543
},
15441544
"PolicyId":{
15451545
"type":"string",
@@ -1551,7 +1551,7 @@
15511551
"type":"string",
15521552
"max":20,
15531553
"min":9,
1554-
"pattern":"^\\w{2}-\\w+(-\\w+)?-\\d$"
1554+
"pattern":"^\\w{2,4}-\\w+(-\\w+)?-\\d$"
15551555
},
15561556
"ResourceLockedException":{
15571557
"type":"structure",
@@ -1603,7 +1603,7 @@
16031603
"type":"string",
16041604
"max":618,
16051605
"min":32,
1606-
"pattern":"^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\\d{12}:role(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$"
1606+
"pattern":"^arn:aws(-eusc|-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\\d{12}:role(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$"
16071607
},
16081608
"Roles":{
16091609
"type":"list",

‎generator/ServiceModels/budgets/budgets-2016-10-20.endpoint-rule-set.json‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,106 @@
319319
},
320320
"type": "endpoint"
321321
},
322+
{
323+
"conditions": [
324+
{
325+
"fn": "stringEquals",
326+
"argv": [
327+
{
328+
"fn": "getAttr",
329+
"argv": [
330+
{
331+
"ref": "PartitionResult"
332+
},
333+
"name"
334+
]
335+
},
336+
"aws-eusc"
337+
]
338+
},
339+
{
340+
"fn": "booleanEquals",
341+
"argv": [
342+
{
343+
"ref": "UseFIPS"
344+
},
345+
false
346+
]
347+
},
348+
{
349+
"fn": "booleanEquals",
350+
"argv": [
351+
{
352+
"ref": "UseDualStack"
353+
},
354+
false
355+
]
356+
}
357+
],
358+
"endpoint": {
359+
"url": "https://budgets.eusc-de-east-1.api.amazonwebservices.eu",
360+
"properties": {
361+
"authSchemes": [
362+
{
363+
"name": "sigv4",
364+
"signingRegion": "eusc-de-east-1"
365+
}
366+
]
367+
},
368+
"headers": {}
369+
},
370+
"type": "endpoint"
371+
},
372+
{
373+
"conditions": [
374+
{
375+
"fn": "stringEquals",
376+
"argv": [
377+
{
378+
"fn": "getAttr",
379+
"argv": [
380+
{
381+
"ref": "PartitionResult"
382+
},
383+
"name"
384+
]
385+
},
386+
"aws-eusc"
387+
]
388+
},
389+
{
390+
"fn": "booleanEquals",
391+
"argv": [
392+
{
393+
"ref": "UseFIPS"
394+
},
395+
false
396+
]
397+
},
398+
{
399+
"fn": "booleanEquals",
400+
"argv": [
401+
{
402+
"ref": "UseDualStack"
403+
},
404+
true
405+
]
406+
}
407+
],
408+
"endpoint": {
409+
"url": "https://budgets.eusc-de-east-1.api.amazonwebservices.eu",
410+
"properties": {
411+
"authSchemes": [
412+
{
413+
"name": "sigv4",
414+
"signingRegion": "eusc-de-east-1"
415+
}
416+
]
417+
},
418+
"headers": {}
419+
},
420+
"type": "endpoint"
421+
},
322422
{
323423
"conditions": [
324424
{

‎generator/ServiceModels/budgets/budgets-2016-10-20.endpoint-tests.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
}
235235
]
236236
},
237-
"url": "https://budgets.amazonaws.eu"
237+
"url": "https://budgets.eusc-de-east-1.api.amazonwebservices.eu"
238238
}
239239
},
240240
"params": {

‎generator/ServiceModels/budgets/budgets-2016-10-20.normal.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2061,7 +2061,7 @@
20612061
"type":"string",
20622062
"max":684,
20632063
"min":25,
2064-
"pattern":"^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::(\\d{12}|aws):policy(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$"
2064+
"pattern":"^arn:aws(-eusc|-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::(\\d{12}|aws):policy(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$"
20652065
},
20662066
"PolicyId":{
20672067
"type":"string",
@@ -2073,7 +2073,7 @@
20732073
"type":"string",
20742074
"max":20,
20752075
"min":9,
2076-
"pattern":"^\\w{2}-\\w+(-\\w+)?-\\d$"
2076+
"pattern":"^\\w{2,4}-\\w+(-\\w+)?-\\d$"
20772077
},
20782078
"ResourceLockedException":{
20792079
"type":"structure",
@@ -2133,7 +2133,7 @@
21332133
"type":"string",
21342134
"max":618,
21352135
"min":32,
2136-
"pattern":"^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\\d{12}:role(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$"
2136+
"pattern":"^arn:aws(-eusc|-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\\d{12}:role(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$"
21372137
},
21382138
"Roles":{
21392139
"type":"list",

‎sdk/code-analysis/ServiceAnalysis/Budgets/Generated/PropertyValueRules.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<property>Amazon.Budgets.Model.CreateBudgetActionRequest.ExecutionRoleArn</property>
2323
<min>32</min>
2424
<max>618</max>
25-
<pattern>^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\d{12}:role(\u002F[\u0021-\u007F]+\u002F|\u002F)[\w+=,.@-]+$</pattern>
25+
<pattern>^arn:aws(-eusc|-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\d{12}:role(\u002F[\u0021-\u007F]+\u002F|\u002F)[\w+=,.@-]+$</pattern>
2626
</property-value-rule>
2727
<property-value-rule>
2828
<property>Amazon.Budgets.Model.CreateBudgetActionResponse.AccountId</property>
@@ -473,7 +473,7 @@
473473
<property>Amazon.Budgets.Model.UpdateBudgetActionRequest.ExecutionRoleArn</property>
474474
<min>32</min>
475475
<max>618</max>
476-
<pattern>^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\d{12}:role(\u002F[\u0021-\u007F]+\u002F|\u002F)[\w+=,.@-]+$</pattern>
476+
<pattern>^arn:aws(-eusc|-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\d{12}:role(\u002F[\u0021-\u007F]+\u002F|\u002F)[\w+=,.@-]+$</pattern>
477477
</property-value-rule>
478478
<property-value-rule>
479479
<property>Amazon.Budgets.Model.UpdateBudgetActionResponse.AccountId</property>
@@ -527,7 +527,7 @@
527527
<property>Amazon.Budgets.Model.Action.ExecutionRoleArn</property>
528528
<min>32</min>
529529
<max>618</max>
530-
<pattern>^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\d{12}:role(\u002F[\u0021-\u007F]+\u002F|\u002F)[\w+=,.@-]+$</pattern>
530+
<pattern>^arn:aws(-eusc|-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::\d{12}:role(\u002F[\u0021-\u007F]+\u002F|\u002F)[\w+=,.@-]+$</pattern>
531531
</property-value-rule>
532532
<property-value-rule>
533533
<property>Amazon.Budgets.Model.ActionHistoryDetails.Message</property>
@@ -584,7 +584,7 @@
584584
<property>Amazon.Budgets.Model.IamActionDefinition.PolicyArn</property>
585585
<min>25</min>
586586
<max>684</max>
587-
<pattern>^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::(\d{12}|aws):policy(\u002F[\u0021-\u007F]+\u002F|\u002F)[\w+=,.@-]+$</pattern>
587+
<pattern>^arn:aws(-eusc|-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::(\d{12}|aws):policy(\u002F[\u0021-\u007F]+\u002F|\u002F)[\w+=,.@-]+$</pattern>
588588
</property-value-rule>
589589
<property-value-rule>
590590
<property>Amazon.Budgets.Model.Notification.Threshold</property>
@@ -623,7 +623,7 @@
623623
<property>Amazon.Budgets.Model.SsmActionDefinition.Region</property>
624624
<min>9</min>
625625
<max>20</max>
626-
<pattern>^\w{2}-\w+(-\w+)?-\d$</pattern>
626+
<pattern>^\w{2,4}-\w+(-\w+)?-\d$</pattern>
627627
</property-value-rule>
628628
<property-value-rule>
629629
<property>Amazon.Budgets.Model.Subscriber.Address</property>

‎sdk/src/Services/Budgets/Generated/Internal/AmazonBudgetsEndpointProvider.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ public Endpoint ResolveEndpoint(EndpointParameters parameters)
8484
{
8585
return new Endpoint("https://budgets.global.csp.hci.ic.gov", InterpolateJson(@"{""authSchemes"":[{""name"":""sigv4"",""signingRegion"":""us-isof-south-1""}]}", refs), InterpolateJson(@"", refs));
8686
}
87+
if (Equals(GetAttr(refs["PartitionResult"], "name"), "aws-eusc") && Equals(refs["UseFIPS"], false) && Equals(refs["UseDualStack"], false))
88+
{
89+
return new Endpoint("https://budgets.eusc-de-east-1.api.amazonwebservices.eu", InterpolateJson(@"{""authSchemes"":[{""name"":""sigv4"",""signingRegion"":""eusc-de-east-1""}]}", refs), InterpolateJson(@"", refs));
90+
}
91+
if (Equals(GetAttr(refs["PartitionResult"], "name"), "aws-eusc") && Equals(refs["UseFIPS"], false) && Equals(refs["UseDualStack"], true))
92+
{
93+
return new Endpoint("https://budgets.eusc-de-east-1.api.amazonwebservices.eu", InterpolateJson(@"{""authSchemes"":[{""name"":""sigv4"",""signingRegion"":""eusc-de-east-1""}]}", refs), InterpolateJson(@"", refs));
94+
}
8795
if (Equals(refs["UseFIPS"], true) && Equals(refs["UseDualStack"], true))
8896
{
8997
if (Equals(true, GetAttr(refs["PartitionResult"], "supportsFIPS")) && Equals(true, GetAttr(refs["PartitionResult"], "supportsDualStack")))

‎sdk/test/Services/Budgets/UnitTests/Generated/Endpoints/BudgetsEndpointProviderTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public void For_region_euscdeeast1_with_FIPS_disabled_and_DualStack_disabled_Tes
218218
parameters["UseFIPS"] = false;
219219
parameters["UseDualStack"] = false;
220220
var endpoint = new AmazonBudgetsEndpointProvider().ResolveEndpoint(parameters);
221-
Assert.AreEqual("https://budgets.amazonaws.eu", endpoint.URL);
221+
Assert.AreEqual("https://budgets.eusc-de-east-1.api.amazonwebservices.eu", endpoint.URL);
222222
}
223223

224224
[TestMethod]

0 commit comments

Comments
 (0)