Skip to content

Commit ba7915e

Browse files
author
AWS
committed
AWSBillingConductor Update: This release adds the Tiering Pricing Rule feature.
1 parent 68046f3 commit ba7915e

File tree

4 files changed

+107
-12
lines changed

4 files changed

+107
-12
lines changed
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 the Tiering Pricing Rule feature."
6+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"parameters": {
44
"Region": {
55
"builtIn": "AWS::Region",
6-
"required": false,
6+
"required": true,
77
"documentation": "The AWS region used to dispatch the request.",
88
"type": "String"
99
},

services/billingconductor/src/main/resources/codegen-resources/endpoint-tests.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
"authSchemes": [
99
{
1010
"name": "sigv4",
11-
"signingRegion": "us-east-1",
12-
"signingName": "billingconductor"
11+
"signingName": "billingconductor",
12+
"signingRegion": "us-east-1"
1313
}
1414
]
1515
},
1616
"url": "https://billingconductor.us-east-1.amazonaws.com"
1717
}
1818
},
1919
"params": {
20+
"UseDualStack": false,
2021
"UseFIPS": false,
21-
"Region": "aws-global",
22-
"UseDualStack": false
22+
"Region": "aws-global"
2323
}
2424
},
2525
{
@@ -30,9 +30,9 @@
3030
}
3131
},
3232
"params": {
33+
"UseDualStack": false,
3334
"UseFIPS": false,
3435
"Region": "us-east-1",
35-
"UseDualStack": false,
3636
"Endpoint": "https://example.com"
3737
}
3838
},
@@ -42,9 +42,9 @@
4242
"error": "Invalid Configuration: FIPS and custom endpoint are not supported"
4343
},
4444
"params": {
45+
"UseDualStack": false,
4546
"UseFIPS": true,
4647
"Region": "us-east-1",
47-
"UseDualStack": false,
4848
"Endpoint": "https://example.com"
4949
}
5050
},
@@ -54,9 +54,9 @@
5454
"error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
5555
},
5656
"params": {
57+
"UseDualStack": true,
5758
"UseFIPS": false,
5859
"Region": "us-east-1",
59-
"UseDualStack": true,
6060
"Endpoint": "https://example.com"
6161
}
6262
}

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

Lines changed: 93 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,17 @@
11181118
}
11191119
}
11201120
},
1121+
"CreateFreeTierConfig":{
1122+
"type":"structure",
1123+
"required":["Activated"],
1124+
"members":{
1125+
"Activated":{
1126+
"shape":"TieringActivated",
1127+
"documentation":"<p> Activate or deactivate Amazon Web Services Free Tier. </p>"
1128+
}
1129+
},
1130+
"documentation":"<p> The possible Amazon Web Services Free Tier configurations. </p>"
1131+
},
11211132
"CreatePricingPlanInput":{
11221133
"type":"structure",
11231134
"required":["Name"],
@@ -1161,8 +1172,7 @@
11611172
"required":[
11621173
"Name",
11631174
"Scope",
1164-
"Type",
1165-
"ModifierPercentage"
1175+
"Type"
11661176
],
11671177
"members":{
11681178
"ClientToken":{
@@ -1203,6 +1213,10 @@
12031213
"BillingEntity":{
12041214
"shape":"BillingEntity",
12051215
"documentation":"<p> The seller of services provided by Amazon Web Services, their affiliates, or third-party providers selling services via Amazon Web Services Marketplace. </p>"
1216+
},
1217+
"Tiering":{
1218+
"shape":"CreateTieringInput",
1219+
"documentation":"<p> The set of tiering configurations for the pricing rule. </p>"
12061220
}
12071221
}
12081222
},
@@ -1215,6 +1229,17 @@
12151229
}
12161230
}
12171231
},
1232+
"CreateTieringInput":{
1233+
"type":"structure",
1234+
"required":["FreeTier"],
1235+
"members":{
1236+
"FreeTier":{
1237+
"shape":"CreateFreeTierConfig",
1238+
"documentation":"<p> The possible Amazon Web Services Free Tier configurations. </p>"
1239+
}
1240+
},
1241+
"documentation":"<p> The set of tiering configurations for the pricing rule. </p>"
1242+
},
12181243
"Currency":{"type":"string"},
12191244
"CurrencyCode":{
12201245
"type":"string",
@@ -1613,6 +1638,17 @@
16131638
"type":"list",
16141639
"member":{"shape":"DisassociateResourceResponseElement"}
16151640
},
1641+
"FreeTierConfig":{
1642+
"type":"structure",
1643+
"required":["Activated"],
1644+
"members":{
1645+
"Activated":{
1646+
"shape":"TieringActivated",
1647+
"documentation":"<p> Activate or deactivate Amazon Web Services Free Tier application. </p>"
1648+
}
1649+
},
1650+
"documentation":"<p> The possible Amazon Web Services Free Tier configurations. </p>"
1651+
},
16161652
"Instant":{"type":"long"},
16171653
"InternalServerException":{
16181654
"type":"structure",
@@ -2383,6 +2419,10 @@
23832419
"BillingEntity":{
23842420
"shape":"BillingEntity",
23852421
"documentation":"<p> The seller of services provided by Amazon Web Services, their affiliates, or third-party providers selling services via Amazon Web Services Marketplace. </p>"
2422+
},
2423+
"Tiering":{
2424+
"shape":"Tiering",
2425+
"documentation":"<p> The set of tiering configurations for the pricing rule. </p>"
23862426
}
23872427
},
23882428
"documentation":"<p> A representation of a pricing rule. </p>"
@@ -2406,7 +2446,8 @@
24062446
"type":"string",
24072447
"enum":[
24082448
"MARKUP",
2409-
"DISCOUNT"
2449+
"DISCOUNT",
2450+
"TIERING"
24102451
]
24112452
},
24122453
"ProformaCost":{"type":"string"},
@@ -2542,6 +2583,21 @@
25422583
},
25432584
"exception":true
25442585
},
2586+
"Tiering":{
2587+
"type":"structure",
2588+
"required":["FreeTier"],
2589+
"members":{
2590+
"FreeTier":{
2591+
"shape":"FreeTierConfig",
2592+
"documentation":"<p> The possible Amazon Web Services Free Tier configurations. </p>"
2593+
}
2594+
},
2595+
"documentation":"<p> The set of tiering configurations for the pricing rule. </p>"
2596+
},
2597+
"TieringActivated":{
2598+
"type":"boolean",
2599+
"box":true
2600+
},
25452601
"Token":{"type":"string"},
25462602
"UntagResourceRequest":{
25472603
"type":"structure",
@@ -2728,6 +2784,17 @@
27282784
},
27292785
"documentation":"<p> A representation of the new charge details that are associated with a percentage custom line item. </p>"
27302786
},
2787+
"UpdateFreeTierConfig":{
2788+
"type":"structure",
2789+
"required":["Activated"],
2790+
"members":{
2791+
"Activated":{
2792+
"shape":"TieringActivated",
2793+
"documentation":"<p> Activate or deactivate application of Amazon Web Services Free Tier. </p>"
2794+
}
2795+
},
2796+
"documentation":"<p> The possible Amazon Web Services Free Tier configurations. </p>"
2797+
},
27312798
"UpdatePricingPlanInput":{
27322799
"type":"structure",
27332800
"required":["Arn"],
@@ -2794,6 +2861,10 @@
27942861
"ModifierPercentage":{
27952862
"shape":"ModifierPercentage",
27962863
"documentation":"<p> The new modifier to show pricing plan rates as a percentage. </p>"
2864+
},
2865+
"Tiering":{
2866+
"shape":"UpdateTieringInput",
2867+
"documentation":"<p> The set of tiering configurations for the pricing rule. </p>"
27972868
}
27982869
}
27992870
},
@@ -2839,9 +2910,24 @@
28392910
"BillingEntity":{
28402911
"shape":"BillingEntity",
28412912
"documentation":"<p> The seller of services provided by Amazon Web Services, their affiliates, or third-party providers selling services via Amazon Web Services Marketplace. </p>"
2913+
},
2914+
"Tiering":{
2915+
"shape":"UpdateTieringInput",
2916+
"documentation":"<p> The set of tiering configurations for the pricing rule. </p>"
28422917
}
28432918
}
28442919
},
2920+
"UpdateTieringInput":{
2921+
"type":"structure",
2922+
"required":["FreeTier"],
2923+
"members":{
2924+
"FreeTier":{
2925+
"shape":"UpdateFreeTierConfig",
2926+
"documentation":"<p> The possible Amazon Web Services Free Tier configurations. </p>"
2927+
}
2928+
},
2929+
"documentation":"<p> The set of tiering configurations for the pricing rule. </p>"
2930+
},
28452931
"ValidationException":{
28462932
"type":"structure",
28472933
"required":["Message"],
@@ -2937,7 +3023,10 @@
29373023
"INVALID_BILLING_GROUP",
29383024
"INVALID_BILLING_PERIOD_FOR_OPERATION",
29393025
"ILLEGAL_BILLING_ENTITY",
2940-
"ILLEGAL_MODIFIER_PERCENTAGE"
3026+
"ILLEGAL_MODIFIER_PERCENTAGE",
3027+
"ILLEGAL_TYPE",
3028+
"ILLEGAL_ENDED_BILLINGGROUP",
3029+
"ILLEGAL_TIERING_INPUT"
29413030
]
29423031
}
29433032
},

0 commit comments

Comments
 (0)