Skip to content

Commit a4ba672

Browse files
author
awstools
committed
feat(client-billingconductor): Launch itemized custom line item and service line item filter
1 parent 0cfa1d4 commit a4ba672

File tree

8 files changed

+102
-22
lines changed

8 files changed

+102
-22
lines changed

‎clients/client-billingconductor/src/commands/CreateCustomLineItemCommand.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,19 @@ export interface CreateCustomLineItemCommandOutput extends CreateCustomLineItemO
6565
* Type: "CREDIT" || "FEE", // required
6666
* LineItemFilters: [ // LineItemFiltersList
6767
* { // LineItemFilter
68-
* Attribute: "LINE_ITEM_TYPE", // required
69-
* MatchOption: "NOT_EQUAL", // required
70-
* Values: [ // LineItemFilterValuesList // required
68+
* Attribute: "LINE_ITEM_TYPE" || "SERVICE", // required
69+
* MatchOption: "NOT_EQUAL" || "EQUAL", // required
70+
* Values: [ // LineItemFilterValuesList
7171
* "SAVINGS_PLAN_NEGATION",
7272
* ],
73+
* AttributeValues: [ // AttributeValueList
74+
* "STRING_VALUE",
75+
* ],
7376
* },
7477
* ],
7578
* },
7679
* AccountId: "STRING_VALUE",
77-
* ComputationRule: "CONSOLIDATED",
80+
* ComputationRule: "ITEMIZED" || "CONSOLIDATED",
7881
* PresentationDetails: { // PresentationObject
7982
* Service: "STRING_VALUE", // required
8083
* },

‎clients/client-billingconductor/src/commands/ListCustomLineItemVersionsCommand.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,14 @@ export interface ListCustomLineItemVersionsCommandOutput extends ListCustomLineI
6767
* // Type: "CREDIT" || "FEE", // required
6868
* // LineItemFilters: [ // LineItemFiltersList
6969
* // { // LineItemFilter
70-
* // Attribute: "LINE_ITEM_TYPE", // required
71-
* // MatchOption: "NOT_EQUAL", // required
72-
* // Values: [ // LineItemFilterValuesList // required
70+
* // Attribute: "LINE_ITEM_TYPE" || "SERVICE", // required
71+
* // MatchOption: "NOT_EQUAL" || "EQUAL", // required
72+
* // Values: [ // LineItemFilterValuesList
7373
* // "SAVINGS_PLAN_NEGATION",
7474
* // ],
75+
* // AttributeValues: [ // AttributeValueList
76+
* // "STRING_VALUE",
77+
* // ],
7578
* // },
7679
* // ],
7780
* // },
@@ -87,7 +90,7 @@ export interface ListCustomLineItemVersionsCommandOutput extends ListCustomLineI
8790
* // Arn: "STRING_VALUE",
8891
* // StartTime: Number("long"),
8992
* // AccountId: "STRING_VALUE",
90-
* // ComputationRule: "CONSOLIDATED",
93+
* // ComputationRule: "ITEMIZED" || "CONSOLIDATED",
9194
* // PresentationDetails: { // PresentationObject
9295
* // Service: "STRING_VALUE", // required
9396
* // },

‎clients/client-billingconductor/src/commands/ListCustomLineItemsCommand.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,14 @@ export interface ListCustomLineItemsCommandOutput extends ListCustomLineItemsOut
7676
* // Type: "CREDIT" || "FEE", // required
7777
* // LineItemFilters: [ // LineItemFiltersList
7878
* // { // LineItemFilter
79-
* // Attribute: "LINE_ITEM_TYPE", // required
80-
* // MatchOption: "NOT_EQUAL", // required
81-
* // Values: [ // LineItemFilterValuesList // required
79+
* // Attribute: "LINE_ITEM_TYPE" || "SERVICE", // required
80+
* // MatchOption: "NOT_EQUAL" || "EQUAL", // required
81+
* // Values: [ // LineItemFilterValuesList
8282
* // "SAVINGS_PLAN_NEGATION",
8383
* // ],
84+
* // AttributeValues: [ // AttributeValueList
85+
* // "STRING_VALUE",
86+
* // ],
8487
* // },
8588
* // ],
8689
* // },
@@ -92,7 +95,7 @@ export interface ListCustomLineItemsCommandOutput extends ListCustomLineItemsOut
9295
* // LastModifiedTime: Number("long"),
9396
* // AssociationSize: Number("long"),
9497
* // AccountId: "STRING_VALUE",
95-
* // ComputationRule: "CONSOLIDATED",
98+
* // ComputationRule: "ITEMIZED" || "CONSOLIDATED",
9699
* // PresentationDetails: { // PresentationObject
97100
* // Service: "STRING_VALUE", // required
98101
* // },

‎clients/client-billingconductor/src/commands/UpdateCustomLineItemCommand.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,14 @@ export interface UpdateCustomLineItemCommandOutput extends UpdateCustomLineItemO
5353
* },
5454
* LineItemFilters: [ // LineItemFiltersList
5555
* { // LineItemFilter
56-
* Attribute: "LINE_ITEM_TYPE", // required
57-
* MatchOption: "NOT_EQUAL", // required
58-
* Values: [ // LineItemFilterValuesList // required
56+
* Attribute: "LINE_ITEM_TYPE" || "SERVICE", // required
57+
* MatchOption: "NOT_EQUAL" || "EQUAL", // required
58+
* Values: [ // LineItemFilterValuesList
5959
* "SAVINGS_PLAN_NEGATION",
6060
* ],
61+
* AttributeValues: [ // AttributeValueList
62+
* "STRING_VALUE",
63+
* ],
6164
* },
6265
* ],
6366
* },
@@ -83,11 +86,14 @@ export interface UpdateCustomLineItemCommandOutput extends UpdateCustomLineItemO
8386
* // Type: "CREDIT" || "FEE", // required
8487
* // LineItemFilters: [ // LineItemFiltersList
8588
* // { // LineItemFilter
86-
* // Attribute: "LINE_ITEM_TYPE", // required
87-
* // MatchOption: "NOT_EQUAL", // required
88-
* // Values: [ // LineItemFilterValuesList // required
89+
* // Attribute: "LINE_ITEM_TYPE" || "SERVICE", // required
90+
* // MatchOption: "NOT_EQUAL" || "EQUAL", // required
91+
* // Values: [ // LineItemFilterValuesList
8992
* // "SAVINGS_PLAN_NEGATION",
9093
* // ],
94+
* // AttributeValues: [ // AttributeValueList
95+
* // "STRING_VALUE",
96+
* // ],
9197
* // },
9298
* // ],
9399
* // },

‎clients/client-billingconductor/src/models/enums.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export const ValidationExceptionReason = {
3232
ILLEGAL_ACCOUNTS: "ILLEGAL_ACCOUNTS",
3333
ILLEGAL_ACCOUNT_ID: "ILLEGAL_ACCOUNT_ID",
3434
ILLEGAL_BILLING_ENTITY: "ILLEGAL_BILLING_ENTITY",
35+
ILLEGAL_BILLING_GROUP_PRICING_PLAN: "ILLEGAL_BILLING_GROUP_PRICING_PLAN",
3536
ILLEGAL_BILLING_GROUP_TYPE: "ILLEGAL_BILLING_GROUP_TYPE",
3637
ILLEGAL_BILLING_PERIOD: "ILLEGAL_BILLING_PERIOD",
3738
ILLEGAL_BILLING_PERIOD_RANGE: "ILLEGAL_BILLING_PERIOD_RANGE",
@@ -153,6 +154,7 @@ export type BillingGroupStatus = (typeof BillingGroupStatus)[keyof typeof Billin
153154
*/
154155
export const LineItemFilterAttributeName = {
155156
LINE_ITEM_TYPE: "LINE_ITEM_TYPE",
157+
SERVICE: "SERVICE",
156158
} as const;
157159
/**
158160
* @public
@@ -165,6 +167,7 @@ export type LineItemFilterAttributeName =
165167
* @enum
166168
*/
167169
export const MatchOption = {
170+
EQUAL: "EQUAL",
168171
NOT_EQUAL: "NOT_EQUAL",
169172
} as const;
170173
/**
@@ -203,6 +206,7 @@ export type CustomLineItemType = (typeof CustomLineItemType)[keyof typeof Custom
203206
*/
204207
export const ComputationRuleEnum = {
205208
CONSOLIDATED: "CONSOLIDATED",
209+
ITEMIZED: "ITEMIZED",
206210
} as const;
207211
/**
208212
* @public

‎clients/client-billingconductor/src/models/models_0.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,13 @@ export interface LineItemFilter {
805805
* <p>The values of the line item filter. This specifies the values to filter on. Currently, you can only exclude Savings Plans discounts.</p>
806806
* @public
807807
*/
808-
Values: LineItemFilterValue[] | undefined;
808+
Values?: LineItemFilterValue[] | undefined;
809+
810+
/**
811+
* <p>The values of the line item filter. This specifies the values to filter on.</p>
812+
* @public
813+
*/
814+
AttributeValues?: string[] | undefined;
809815
}
810816

811817
/**

‎clients/client-billingconductor/src/schemas/schemas_0.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const _ARRE = "AssociateResourceResponseElement";
2222
const _ARRL = "AssociateResourcesResponseList";
2323
const _AS = "AssociationSize";
2424
const _AV = "AssociatedValues";
25+
const _AVt = "AttributeValues";
2526
const _AWSC = "AWSCost";
2627
const _Ac = "Activated";
2728
const _Ar = "Arns";
@@ -609,7 +610,7 @@ export var InternalServerException: StaticErrorSchema = [
609610
[0, [1, { [_hH]: _RA_ }]],
610611
];
611612
TypeRegistry.for(n0).registerError(InternalServerException, __InternalServerException);
612-
export var LineItemFilter: StaticStructureSchema = [3, n0, _LIFi, 0, [_At, _MO, _Va], [0, 0, 64 | 0]];
613+
export var LineItemFilter: StaticStructureSchema = [3, n0, _LIFi, 0, [_At, _MO, _Va, _AVt], [0, 0, 64 | 0, 64 | 0]];
613614
export var ListAccountAssociationsFilter: StaticStructureSchema = [3, n0, _LAAF, 0, [_As, _AI, _AIc], [0, 0, 64 | 0]];
614615
export var ListAccountAssociationsInput: StaticStructureSchema = [
615616
3,
@@ -1044,6 +1045,7 @@ export var AccountIdFilterList = 64 | 0;
10441045
export var AccountIdList = 64 | 0;
10451046
export var AssociateResourcesResponseList: StaticListSchema = [1, n0, _ARRL, 0, () => AssociateResourceResponseElement];
10461047
export var AttributesList: StaticListSchema = [1, n0, _AL, 0, () => Attribute];
1048+
export var AttributeValueList = 64 | 0;
10471049
export var BillingGroupArnList = 64 | 0;
10481050
export var BillingGroupCostReportList: StaticListSchema = [1, n0, _BGCRL, 0, () => BillingGroupCostReportElement];
10491051
export var BillingGroupCostReportResultsList: StaticListSchema = [

‎codegen/sdk-codegen/aws-models/billingconductor.json‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,6 +1123,28 @@
11231123
"smithy.api#documentation": "<p>The key-value pair that represents the attribute by which the <code>BillingGroupCostReportResults</code> are grouped. For example, if you want a service-level breakdown for Amazon Simple Storage Service (Amazon S3) of the billing group, the attribute will be a key-value pair of <code>\"PRODUCT_NAME\"</code> and <code>\"S3\"</code>.</p>"
11241124
}
11251125
},
1126+
"com.amazonaws.billingconductor#AttributeValue": {
1127+
"type": "string",
1128+
"traits": {
1129+
"smithy.api#length": {
1130+
"min": 1,
1131+
"max": 128
1132+
},
1133+
"smithy.api#pattern": "^[a-zA-Z0-9]+$"
1134+
}
1135+
},
1136+
"com.amazonaws.billingconductor#AttributeValueList": {
1137+
"type": "list",
1138+
"member": {
1139+
"target": "com.amazonaws.billingconductor#AttributeValue"
1140+
},
1141+
"traits": {
1142+
"smithy.api#length": {
1143+
"min": 0,
1144+
"max": 1
1145+
}
1146+
}
1147+
},
11261148
"com.amazonaws.billingconductor#AttributesList": {
11271149
"type": "list",
11281150
"member": {
@@ -1687,6 +1709,12 @@
16871709
"com.amazonaws.billingconductor#ComputationRuleEnum": {
16881710
"type": "enum",
16891711
"members": {
1712+
"ITEMIZED": {
1713+
"target": "smithy.api#Unit",
1714+
"traits": {
1715+
"smithy.api#enumValue": "ITEMIZED"
1716+
}
1717+
},
16901718
"CONSOLIDATED": {
16911719
"target": "smithy.api#Unit",
16921720
"traits": {
@@ -3346,8 +3374,15 @@
33463374
"Values": {
33473375
"target": "com.amazonaws.billingconductor#LineItemFilterValuesList",
33483376
"traits": {
3349-
"smithy.api#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>",
3350-
"smithy.api#required": {}
3377+
"smithy.api#addedDefault": {},
3378+
"smithy.api#default": [],
3379+
"smithy.api#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>"
3380+
}
3381+
},
3382+
"AttributeValues": {
3383+
"target": "com.amazonaws.billingconductor#AttributeValueList",
3384+
"traits": {
3385+
"smithy.api#documentation": "<p>The values of the line item filter. This specifies the values to filter on.</p>"
33513386
}
33523387
}
33533388
},
@@ -3363,6 +3398,12 @@
33633398
"traits": {
33643399
"smithy.api#enumValue": "LINE_ITEM_TYPE"
33653400
}
3401+
},
3402+
"SERVICE": {
3403+
"target": "smithy.api#Unit",
3404+
"traits": {
3405+
"smithy.api#enumValue": "SERVICE"
3406+
}
33663407
}
33673408
}
33683409
},
@@ -4727,6 +4768,12 @@
47274768
"traits": {
47284769
"smithy.api#enumValue": "NOT_EQUAL"
47294770
}
4771+
},
4772+
"EQUAL": {
4773+
"target": "smithy.api#Unit",
4774+
"traits": {
4775+
"smithy.api#enumValue": "EQUAL"
4776+
}
47304777
}
47314778
}
47324779
},
@@ -6694,6 +6741,12 @@
66946741
"smithy.api#enumValue": "ILLEGAL_BILLING_GROUP_TYPE"
66956742
}
66966743
},
6744+
"ILLEGAL_BILLING_GROUP_PRICING_PLAN": {
6745+
"target": "smithy.api#Unit",
6746+
"traits": {
6747+
"smithy.api#enumValue": "ILLEGAL_BILLING_GROUP_PRICING_PLAN"
6748+
}
6749+
},
66976750
"ILLEGAL_ENDED_BILLINGGROUP": {
66986751
"target": "smithy.api#Unit",
66996752
"traits": {

0 commit comments

Comments
 (0)