Skip to content

Commit 2bb7326

Browse files
author
AWS
committed
AWSBillingConductor Update: This release adds support for Billing Transfers, enabling management of billing transfers with billing groups on AWS Billing Conductor.
1 parent d6b5e71 commit 2bb7326

File tree

2 files changed

+145
-26
lines changed

2 files changed

+145
-26
lines changed

‎.changes/next-release/feature-AWSBillingConductor-64f2ba8.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": "AWSBillingConductor",
4+
"contributor": "",
5+
"description": "This release adds support for Billing Transfers, enabling management of billing transfers with billing groups on AWS Billing Conductor."
6+
}

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

Lines changed: 139 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@
307307
{"shape":"InternalServerException"},
308308
{"shape":"ResourceNotFoundException"}
309309
],
310-
"documentation":"<p>Retrieves the margin summary report, which includes the Amazon Web Services cost and charged amount (pro forma cost) by Amazon Web Services service for a specific billing group.</p>"
310+
"documentation":"<p>Retrieves the margin summary report, which includes the Amazon Web Services cost and charged amount (pro forma cost) by Amazon Web Services service for a specific billing group.</p>",
311+
"readonly":true
311312
},
312313
"ListAccountAssociations":{
313314
"name":"ListAccountAssociations",
@@ -325,7 +326,8 @@
325326
{"shape":"InternalServerException"},
326327
{"shape":"ResourceNotFoundException"}
327328
],
328-
"documentation":"<p> This is a paginated call to list linked accounts that are linked to the payer account for the specified time period. If no information is provided, the current billing period is used. The response will optionally include the billing group that's associated with the linked account.</p>"
329+
"documentation":"<p> This is a paginated call to list linked accounts that are linked to the payer account for the specified time period. If no information is provided, the current billing period is used. The response will optionally include the billing group that's associated with the linked account.</p>",
330+
"readonly":true
329331
},
330332
"ListBillingGroupCostReports":{
331333
"name":"ListBillingGroupCostReports",
@@ -343,7 +345,8 @@
343345
{"shape":"InternalServerException"},
344346
{"shape":"ResourceNotFoundException"}
345347
],
346-
"documentation":"<p>A paginated call to retrieve a summary report of actual Amazon Web Services charges and the calculated Amazon Web Services charges based on the associated pricing plan of a billing group.</p>"
348+
"documentation":"<p>A paginated call to retrieve a summary report of actual Amazon Web Services charges and the calculated Amazon Web Services charges based on the associated pricing plan of a billing group.</p>",
349+
"readonly":true
347350
},
348351
"ListBillingGroups":{
349352
"name":"ListBillingGroups",
@@ -361,7 +364,8 @@
361364
{"shape":"InternalServerException"},
362365
{"shape":"ResourceNotFoundException"}
363366
],
364-
"documentation":"<p>A paginated call to retrieve a list of billing groups for the given billing period. If you don't provide a billing group, the current billing period is used.</p>"
367+
"documentation":"<p>A paginated call to retrieve a list of billing groups for the given billing period. If you don't provide a billing group, the current billing period is used.</p>",
368+
"readonly":true
365369
},
366370
"ListCustomLineItemVersions":{
367371
"name":"ListCustomLineItemVersions",
@@ -378,7 +382,8 @@
378382
{"shape":"ValidationException"},
379383
{"shape":"InternalServerException"}
380384
],
381-
"documentation":"<p>A paginated call to get a list of all custom line item versions.</p>"
385+
"documentation":"<p>A paginated call to get a list of all custom line item versions.</p>",
386+
"readonly":true
382387
},
383388
"ListCustomLineItems":{
384389
"name":"ListCustomLineItems",
@@ -396,7 +401,8 @@
396401
{"shape":"InternalServerException"},
397402
{"shape":"ResourceNotFoundException"}
398403
],
399-
"documentation":"<p> A paginated call to get a list of all custom line items (FFLIs) for the given billing period. If you don't provide a billing period, the current billing period is used. </p>"
404+
"documentation":"<p> A paginated call to get a list of all custom line items (FFLIs) for the given billing period. If you don't provide a billing period, the current billing period is used. </p>",
405+
"readonly":true
400406
},
401407
"ListPricingPlans":{
402408
"name":"ListPricingPlans",
@@ -413,7 +419,8 @@
413419
{"shape":"ValidationException"},
414420
{"shape":"InternalServerException"}
415421
],
416-
"documentation":"<p>A paginated call to get pricing plans for the given billing period. If you don't provide a billing period, the current billing period is used. </p>"
422+
"documentation":"<p>A paginated call to get pricing plans for the given billing period. If you don't provide a billing period, the current billing period is used. </p>",
423+
"readonly":true
417424
},
418425
"ListPricingPlansAssociatedWithPricingRule":{
419426
"name":"ListPricingPlansAssociatedWithPricingRule",
@@ -431,7 +438,8 @@
431438
{"shape":"InternalServerException"},
432439
{"shape":"ResourceNotFoundException"}
433440
],
434-
"documentation":"<p> A list of the pricing plans that are associated with a pricing rule. </p>"
441+
"documentation":"<p> A list of the pricing plans that are associated with a pricing rule. </p>",
442+
"readonly":true
435443
},
436444
"ListPricingRules":{
437445
"name":"ListPricingRules",
@@ -448,7 +456,8 @@
448456
{"shape":"ValidationException"},
449457
{"shape":"InternalServerException"}
450458
],
451-
"documentation":"<p> Describes a pricing rule that can be associated to a pricing plan, or set of pricing plans. </p>"
459+
"documentation":"<p> Describes a pricing rule that can be associated to a pricing plan, or set of pricing plans. </p>",
460+
"readonly":true
452461
},
453462
"ListPricingRulesAssociatedToPricingPlan":{
454463
"name":"ListPricingRulesAssociatedToPricingPlan",
@@ -466,7 +475,8 @@
466475
{"shape":"InternalServerException"},
467476
{"shape":"ResourceNotFoundException"}
468477
],
469-
"documentation":"<p> Lists the pricing rules that are associated with a pricing plan. </p>"
478+
"documentation":"<p> Lists the pricing rules that are associated with a pricing plan. </p>",
479+
"readonly":true
470480
},
471481
"ListResourcesAssociatedToCustomLineItem":{
472482
"name":"ListResourcesAssociatedToCustomLineItem",
@@ -484,7 +494,8 @@
484494
{"shape":"InternalServerException"},
485495
{"shape":"ResourceNotFoundException"}
486496
],
487-
"documentation":"<p> List the resources that are associated to a custom line item. </p>"
497+
"documentation":"<p> List the resources that are associated to a custom line item. </p>",
498+
"readonly":true
488499
},
489500
"ListTagsForResource":{
490501
"name":"ListTagsForResource",
@@ -667,7 +678,6 @@
667678
},
668679
"AccountGrouping":{
669680
"type":"structure",
670-
"required":["LinkedAccountIds"],
671681
"members":{
672682
"LinkedAccountIds":{
673683
"shape":"AccountIdList",
@@ -676,6 +686,10 @@
676686
"AutoAssociate":{
677687
"shape":"Boolean",
678688
"documentation":"<p>Specifies if this billing group will automatically associate newly added Amazon Web Services accounts that join your consolidated billing family.</p>"
689+
},
690+
"ResponsibilityTransferArn":{
691+
"shape":"ResponsibilityTransferArn",
692+
"documentation":"<p> The Amazon Resource Name (ARN) that identifies the transfer relationship owned by the Bill Transfer account (caller account). When specified, the PrimaryAccountId is no longer required. </p>"
679693
}
680694
},
681695
"documentation":"<p>The set of accounts that will be under the billing group. The set of accounts resemble the linked accounts in a consolidated billing family.</p>"
@@ -694,7 +708,7 @@
694708
"type":"list",
695709
"member":{"shape":"AccountId"},
696710
"max":30,
697-
"min":1
711+
"min":0
698712
},
699713
"AccountName":{
700714
"type":"string",
@@ -802,7 +816,7 @@
802816
},
803817
"Association":{
804818
"type":"string",
805-
"pattern":"((arn:aws(-cn)?:billingconductor::[0-9]{12}:billinggroup/)?[0-9]{12}|MONITORED|UNMONITORED)"
819+
"pattern":"((arn:aws(-cn)?:billingconductor::[0-9]{12}:billinggroup/)?[a-zA-Z0-9]{10,12}|MONITORED|UNMONITORED)"
806820
},
807821
"Attribute":{
808822
"type":"structure",
@@ -1027,6 +1041,10 @@
10271041
"AccountGrouping":{
10281042
"shape":"ListBillingGroupAccountGrouping",
10291043
"documentation":"<p>Specifies if the billing group has automatic account association (<code>AutoAssociate</code>) enabled.</p>"
1044+
},
1045+
"BillingGroupType":{
1046+
"shape":"BillingGroupType",
1047+
"documentation":"<p> The type of billing group. </p>"
10301048
}
10311049
},
10321050
"documentation":"<p>A representation of a billing group.</p>"
@@ -1042,7 +1060,8 @@
10421060
"type":"string",
10431061
"enum":[
10441062
"ACTIVE",
1045-
"PRIMARY_ACCOUNT_MISSING"
1063+
"PRIMARY_ACCOUNT_MISSING",
1064+
"PENDING"
10461065
]
10471066
},
10481067
"BillingGroupStatusList":{
@@ -1052,6 +1071,19 @@
10521071
"min":1
10531072
},
10541073
"BillingGroupStatusReason":{"type":"string"},
1074+
"BillingGroupType":{
1075+
"type":"string",
1076+
"enum":[
1077+
"STANDARD",
1078+
"TRANSFER_BILLING"
1079+
]
1080+
},
1081+
"BillingGroupTypeList":{
1082+
"type":"list",
1083+
"member":{"shape":"BillingGroupType"},
1084+
"max":2,
1085+
"min":1
1086+
},
10551087
"BillingPeriod":{
10561088
"type":"string",
10571089
"pattern":"\\d{4}-(0?[1-9]|1[012])"
@@ -1233,8 +1265,14 @@
12331265
"shape":"AccountId",
12341266
"documentation":"<p>The Amazon Web Services account in which this custom line item will be applied to.</p>"
12351267
},
1236-
"ComputationRule":{"shape":"ComputationRuleEnum"},
1237-
"PresentationDetails":{"shape":"PresentationObject"}
1268+
"ComputationRule":{
1269+
"shape":"ComputationRuleEnum",
1270+
"documentation":"<p> Specifies how the custom line item charges are computed. </p>"
1271+
},
1272+
"PresentationDetails":{
1273+
"shape":"PresentationObject",
1274+
"documentation":"<p> Details controlling how the custom line item charges are presented in the bill. Contains specifications for which service the charges will be shown under. </p>"
1275+
}
12381276
}
12391277
},
12401278
"CreateCustomLineItemOutput":{
@@ -1530,11 +1568,11 @@
15301568
},
15311569
"ComputationRule":{
15321570
"shape":"ComputationRuleEnum",
1533-
"documentation":"<p>The display settings of the custom line item</p>"
1571+
"documentation":"<p> The computation rule that determines how the custom line item charges are computed and reflected in the bill. </p>"
15341572
},
15351573
"PresentationDetails":{
15361574
"shape":"PresentationObject",
1537-
"documentation":"<p>The presentation configuration of the custom line item</p>"
1575+
"documentation":"<p> Configuration details specifying how the custom line item charges are presented, including which service the charges are shown under. </p>"
15381576
}
15391577
},
15401578
"documentation":"<p>A representation of a custom line item.</p>"
@@ -1654,11 +1692,11 @@
16541692
},
16551693
"ComputationRule":{
16561694
"shape":"ComputationRuleEnum",
1657-
"documentation":"<p>The display settings of the custom line item</p>"
1695+
"documentation":"<p> The computation rule for a specific version of a custom line item, determining how charges are computed and reflected in the bill. </p>"
16581696
},
16591697
"PresentationDetails":{
16601698
"shape":"PresentationObject",
1661-
"documentation":"<p>The presentation configuration of the custom line item</p>"
1699+
"documentation":"<p> Presentation configuration for a specific version of a custom line item, specifying how charges are displayed in the bill. </p>"
16621700
}
16631701
},
16641702
"documentation":"<p>A representation of a custom line item version.</p>"
@@ -1907,10 +1945,10 @@
19071945
},
19081946
"Values":{
19091947
"shape":"LineItemFilterValuesList",
1910-
"documentation":"<p>The values of the line item filter. This specifies the values to filter on. Currently, you can only exclude Savings Plan discounts.</p>"
1948+
"documentation":"<p>The values of the line item filter. This specifies the values to filter on. Currently, you can only exclude Savings Plans discounts.</p>"
19111949
}
19121950
},
1913-
"documentation":"<p>A representation of the line item filter for your custom line item. You can use line item filters to include or exclude specific resource values from the billing group's total cost. For example, if you create a custom line item and you want to filter out a value, such as Savings Plan discounts, you can update <code>LineItemFilter</code> to exclude it.</p>"
1951+
"documentation":"<p>A representation of the line item filter for your custom line item. You can use line item filters to include or exclude specific resource values from the billing group's total cost. For example, if you create a custom line item and you want to filter out a value, such as Savings Plans discounts, you can update <code>LineItemFilter</code> to exclude it.</p>"
19141952
},
19151953
"LineItemFilterAttributeName":{
19161954
"type":"string",
@@ -1924,7 +1962,7 @@
19241962
"type":"list",
19251963
"member":{"shape":"LineItemFilterValue"},
19261964
"max":1,
1927-
"min":1
1965+
"min":0
19281966
},
19291967
"LineItemFiltersList":{
19301968
"type":"list",
@@ -1986,6 +2024,10 @@
19862024
"AutoAssociate":{
19872025
"shape":"Boolean",
19882026
"documentation":"<p>Specifies if this billing group will automatically associate newly added Amazon Web Services accounts that join your consolidated billing family.</p>"
2027+
},
2028+
"ResponsibilityTransferArn":{
2029+
"shape":"ResponsibilityTransferArn",
2030+
"documentation":"<p> The Amazon Resource Name (ARN) that identifies the transfer relationship for the billing group. </p>"
19892031
}
19902032
},
19912033
"documentation":"<p>Specifies if the billing group has the following features enabled.</p>"
@@ -2052,6 +2094,22 @@
20522094
"AutoAssociate":{
20532095
"shape":"Boolean",
20542096
"documentation":"<p>Specifies if this billing group will automatically associate newly added Amazon Web Services accounts that join your consolidated billing family.</p>"
2097+
},
2098+
"PrimaryAccountIds":{
2099+
"shape":"PrimaryAccountIdList",
2100+
"documentation":"<p> A list of primary account IDs to filter the billing groups. </p>"
2101+
},
2102+
"BillingGroupTypes":{
2103+
"shape":"BillingGroupTypeList",
2104+
"documentation":"<p> Filter billing groups by their type. </p>"
2105+
},
2106+
"Names":{
2107+
"shape":"StringSearches",
2108+
"documentation":"<p> Filter billing groups by their names. </p>"
2109+
},
2110+
"ResponsibilityTransferArns":{
2111+
"shape":"ResponsibilityTransferArnsList",
2112+
"documentation":"<p> Filter billing groups by their responsibility transfer ARNs. </p>"
20552113
}
20562114
},
20572115
"documentation":"<p>The filter that specifies the billing groups and pricing plans to retrieve billing group information.</p>"
@@ -2597,10 +2655,10 @@
25972655
"members":{
25982656
"Service":{
25992657
"shape":"Service",
2600-
"documentation":"<p>This defines the service of where the custom line item is presented</p>"
2658+
"documentation":"<p> The service under which the custom line item charges will be presented. Must be a string between 1 and 128 characters matching the pattern \"<code>^[a-zA-Z0-9]+$</code>\". </p>"
26012659
}
26022660
},
2603-
"documentation":"<p>The presentation configuration of the custom line item</p>"
2661+
"documentation":"<p> An object that defines how custom line item charges are presented in the bill, containing specifications for service presentation. </p>"
26042662
},
26052663
"PricingPlanArn":{
26062664
"type":"string",
@@ -2781,6 +2839,12 @@
27812839
"TIERING"
27822840
]
27832841
},
2842+
"PrimaryAccountIdList":{
2843+
"type":"list",
2844+
"member":{"shape":"AccountId"},
2845+
"max":100,
2846+
"min":1
2847+
},
27842848
"ProformaCost":{"type":"string"},
27852849
"ResourceNotFoundException":{
27862850
"type":"structure",
@@ -2807,7 +2871,27 @@
28072871
},
28082872
"exception":true
28092873
},
2874+
"ResponsibilityTransferArn":{
2875+
"type":"string",
2876+
"pattern":"arn:[a-z0-9][a-z0-9-.]{0,62}:organizations::\\d{12}:transfer/o-[a-z0-9]{10,32}/(billing)/(inbound|outbound)/rt-[0-9a-z]{8,32}"
2877+
},
2878+
"ResponsibilityTransferArnsList":{
2879+
"type":"list",
2880+
"member":{"shape":"ResponsibilityTransferArn"},
2881+
"max":30,
2882+
"min":1
2883+
},
28102884
"RetryAfterSeconds":{"type":"integer"},
2885+
"SearchOption":{
2886+
"type":"string",
2887+
"enum":["STARTS_WITH"]
2888+
},
2889+
"SearchValue":{
2890+
"type":"string",
2891+
"max":128,
2892+
"min":1,
2893+
"pattern":"[a-zA-Z0-9_\\+=\\.\\-@ ]+"
2894+
},
28112895
"Service":{
28122896
"type":"string",
28132897
"max":128,
@@ -2848,6 +2932,30 @@
28482932
"exception":true
28492933
},
28502934
"String":{"type":"string"},
2935+
"StringSearch":{
2936+
"type":"structure",
2937+
"required":[
2938+
"SearchOption",
2939+
"SearchValue"
2940+
],
2941+
"members":{
2942+
"SearchOption":{
2943+
"shape":"SearchOption",
2944+
"documentation":"<p> The search option to be applied when performing the string search. </p>"
2945+
},
2946+
"SearchValue":{
2947+
"shape":"SearchValue",
2948+
"documentation":"<p> The value to search for within the specified string field. </p>"
2949+
}
2950+
},
2951+
"documentation":"<p> A structure that defines string search parameters. </p>"
2952+
},
2953+
"StringSearches":{
2954+
"type":"list",
2955+
"member":{"shape":"StringSearch"},
2956+
"max":1,
2957+
"min":1
2958+
},
28512959
"TagKey":{
28522960
"type":"string",
28532961
"max":128,
@@ -2960,6 +3068,10 @@
29603068
"AutoAssociate":{
29613069
"shape":"Boolean",
29623070
"documentation":"<p>Specifies if this billing group will automatically associate newly added Amazon Web Services accounts that join your consolidated billing family.</p>"
3071+
},
3072+
"ResponsibilityTransferArn":{
3073+
"shape":"ResponsibilityTransferArn",
3074+
"documentation":"<p> The Amazon Resource Name (ARN) that identifies the transfer relationship. Note: Modifications to the ResponsibilityTransferArn are not permitted for existing billing groups. </p>"
29633075
}
29643076
},
29653077
"documentation":"<p>Specifies if the billing group has the following features enabled.</p>"
@@ -3391,6 +3503,7 @@
33913503
"ILLEGAL_BILLING_ENTITY",
33923504
"ILLEGAL_MODIFIER_PERCENTAGE",
33933505
"ILLEGAL_TYPE",
3506+
"ILLEGAL_BILLING_GROUP_TYPE",
33943507
"ILLEGAL_ENDED_BILLINGGROUP",
33953508
"ILLEGAL_TIERING_INPUT",
33963509
"ILLEGAL_OPERATION",

0 commit comments

Comments
 (0)