Skip to content

Commit 352ed1a

Browse files
author
SDKAuto
committed
CodeGen from PR 18543 in Azure/azure-rest-api-specs
Merge c3c30786aee07f72a2f19b2eb6bbd89aa8b94fd1 into 12aa4dd9607f82bdc1087f24b91cec7d5c4499c2
1 parent 429a952 commit 352ed1a

File tree

17 files changed

+367
-53
lines changed

17 files changed

+367
-53
lines changed

‎common/config/rush/pnpm-lock.yaml‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/consumption/arm-consumption/CHANGELOG.md‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
# Release History
2-
3-
## 9.0.1 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
12-
2+
3+
## 10.0.0 (2022-04-05)
4+
5+
**Features**
6+
7+
- Added operation LotsOperations.listByCustomer
8+
- Added Interface LotsListByCustomerNextOptionalParams
9+
- Added Interface LotsListByCustomerOptionalParams
10+
- Added Type Alias LotsListByCustomerNextResponse
11+
- Added Type Alias LotsListByCustomerResponse
12+
- Type Alias LegacyUsageDetail has a new parameter benefitId
13+
- Type Alias LegacyUsageDetail has a new parameter benefitName
14+
15+
**Breaking Changes**
16+
17+
- Interface BudgetFilter no longer has parameter not
18+
19+
1320
## 9.0.0 (2021-12-16)
1421

1522
The package of @azure/arm-consumption is using our next generation design principles since version 9.0.0, which contains breaking changes.

‎sdk/consumption/arm-consumption/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021 Microsoft
3+
Copyright (c) 2022 Microsoft
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎sdk/consumption/arm-consumption/_meta.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"commit": "d600759c3516b61a7c353bc8682bccbab85a6f65",
2+
"commit": "76c641c5f75c5c62657740c26e4946758fbad8b3",
33
"readme": "specification/consumption/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/consumption/resource-manager/readme.md --use=@autorest/[email protected].20211207.1",
4+
"autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/consumption/resource-manager/readme.md --use=@autorest/[email protected].20220105.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"use": "@autorest/[email protected]"
6+
"release_tool": "@azure-tools/[email protected]",
7+
"use": "@autorest/[email protected]"
78
}

‎sdk/consumption/arm-consumption/api-extractor.json‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
33
"mainEntryPointFilePath": "./dist-esm/src/index.d.ts",
4-
"docModel": { "enabled": true },
5-
"apiReport": { "enabled": true, "reportFolder": "./review" },
4+
"docModel": {
5+
"enabled": true
6+
},
7+
"apiReport": {
8+
"enabled": true,
9+
"reportFolder": "./review"
10+
},
611
"dtsRollup": {
712
"enabled": true,
813
"untrimmedFilePath": "",
914
"publicTrimmedFilePath": "./types/arm-consumption.d.ts"
1015
},
1116
"messages": {
12-
"tsdocMessageReporting": { "default": { "logLevel": "none" } },
17+
"tsdocMessageReporting": {
18+
"default": {
19+
"logLevel": "none"
20+
}
21+
},
1322
"extractorMessageReporting": {
14-
"ae-missing-release-tag": { "logLevel": "none" },
15-
"ae-unresolved-link": { "logLevel": "none" }
23+
"ae-missing-release-tag": {
24+
"logLevel": "none"
25+
},
26+
"ae-unresolved-link": {
27+
"logLevel": "none"
28+
}
1629
}
1730
}
18-
}
31+
}

‎sdk/consumption/arm-consumption/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for ConsumptionManagementClient.",
6-
"version": "9.0.1",
6+
"version": "10.0.0",
77
"engines": {
88
"node": ">=12.0.0"
99
},
@@ -27,12 +27,12 @@
2727
"types": "./types/arm-consumption.d.ts",
2828
"devDependencies": {
2929
"@microsoft/api-extractor": "^7.18.11",
30-
"@rollup/plugin-commonjs": "^21.0.1",
30+
"@rollup/plugin-commonjs": "11.0.2",
3131
"@rollup/plugin-json": "^4.0.0",
3232
"@rollup/plugin-multi-entry": "^3.0.0",
3333
"@rollup/plugin-node-resolve": "^8.0.0",
3434
"mkdirp": "^1.0.4",
35-
"rollup": "^2.0.0",
35+
"rollup": "^1.16.3",
3636
"rollup-plugin-sourcemaps": "^0.4.2",
3737
"typescript": "~4.2.0",
3838
"uglify-js": "^3.4.9",
@@ -97,4 +97,4 @@
9797
},
9898
"sideEffects": false,
9999
"autoPublish": true
100-
}
100+
}

‎sdk/consumption/arm-consumption/review/arm-consumption.api.md‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ export interface BudgetComparisonExpression {
120120
export interface BudgetFilter {
121121
and?: BudgetFilterProperties[];
122122
dimensions?: BudgetComparisonExpression;
123-
not?: BudgetFilterProperties;
124123
tags?: BudgetComparisonExpression;
125124
}
126125

@@ -746,6 +745,8 @@ export type LegacyUsageDetail = UsageDetail & {
746745
readonly chargeType?: string;
747746
readonly frequency?: string;
748747
readonly payGPrice?: number;
748+
readonly benefitId?: string;
749+
readonly benefitName?: string;
749750
readonly pricingModel?: PricingModelType;
750751
};
751752

@@ -788,10 +789,27 @@ export interface LotsListByBillingProfileOptionalParams extends coreClient.Opera
788789
// @public
789790
export type LotsListByBillingProfileResponse = Lots;
790791

792+
// @public
793+
export interface LotsListByCustomerNextOptionalParams extends coreClient.OperationOptions {
794+
filter?: string;
795+
}
796+
797+
// @public
798+
export type LotsListByCustomerNextResponse = Lots;
799+
800+
// @public
801+
export interface LotsListByCustomerOptionalParams extends coreClient.OperationOptions {
802+
filter?: string;
803+
}
804+
805+
// @public
806+
export type LotsListByCustomerResponse = Lots;
807+
791808
// @public
792809
export interface LotsOperations {
793810
listByBillingAccount(billingAccountId: string, options?: LotsListByBillingAccountOptionalParams): PagedAsyncIterableIterator<LotSummary>;
794811
listByBillingProfile(billingAccountId: string, billingProfileId: string, options?: LotsListByBillingProfileOptionalParams): PagedAsyncIterableIterator<LotSummary>;
812+
listByCustomer(billingAccountId: string, customerId: string, options?: LotsListByCustomerOptionalParams): PagedAsyncIterableIterator<LotSummary>;
795813
}
796814

797815
// @public

‎sdk/consumption/arm-consumption/src/consumptionManagementClient.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export class ConsumptionManagementClient extends coreClient.ServiceClient {
8080
credential: credentials
8181
};
8282

83-
const packageDetails = `azsdk-js-arm-consumption/9.0.0`;
83+
const packageDetails = `azsdk-js-arm-consumption/10.0.0`;
8484
const userAgentPrefix =
8585
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
8686
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`

‎sdk/consumption/arm-consumption/src/models/index.ts‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ export interface BudgetTimePeriod {
136136
export interface BudgetFilter {
137137
/** The logical "AND" expression. Must have at least 2 items. */
138138
and?: BudgetFilterProperties[];
139-
/** The logical "NOT" expression. */
140-
not?: BudgetFilterProperties;
141139
/** Has comparison expression for a dimension */
142140
dimensions?: BudgetComparisonExpression;
143141
/** Has comparison expression for a tag */
@@ -2121,6 +2119,16 @@ export type LegacyUsageDetail = UsageDetail & {
21212119
* NOTE: This property will not be serialized. It can only be populated by the server.
21222120
*/
21232121
readonly payGPrice?: number;
2122+
/**
2123+
* Unique identifier for the applicable benefit.
2124+
* NOTE: This property will not be serialized. It can only be populated by the server.
2125+
*/
2126+
readonly benefitId?: string;
2127+
/**
2128+
* Name of the applicable benefit.
2129+
* NOTE: This property will not be serialized. It can only be populated by the server.
2130+
*/
2131+
readonly benefitName?: string;
21242132
/**
21252133
* Identifier that indicates how the meter is priced.
21262134
* NOTE: This property will not be serialized. It can only be populated by the server.
@@ -3586,6 +3594,16 @@ export interface LotsListByBillingAccountOptionalParams
35863594
/** Contains response data for the listByBillingAccount operation. */
35873595
export type LotsListByBillingAccountResponse = Lots;
35883596

3597+
/** Optional parameters. */
3598+
export interface LotsListByCustomerOptionalParams
3599+
extends coreClient.OperationOptions {
3600+
/** May be used to filter the lots by Status, Source etc. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. Tag filter is a key value pair string where key and value is separated by a colon (:). */
3601+
filter?: string;
3602+
}
3603+
3604+
/** Contains response data for the listByCustomer operation. */
3605+
export type LotsListByCustomerResponse = Lots;
3606+
35893607
/** Optional parameters. */
35903608
export interface LotsListByBillingProfileNextOptionalParams
35913609
extends coreClient.OperationOptions {}
@@ -3603,6 +3621,16 @@ export interface LotsListByBillingAccountNextOptionalParams
36033621
/** Contains response data for the listByBillingAccountNext operation. */
36043622
export type LotsListByBillingAccountNextResponse = Lots;
36053623

3624+
/** Optional parameters. */
3625+
export interface LotsListByCustomerNextOptionalParams
3626+
extends coreClient.OperationOptions {
3627+
/** May be used to filter the lots by Status, Source etc. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. Tag filter is a key value pair string where key and value is separated by a colon (:). */
3628+
filter?: string;
3629+
}
3630+
3631+
/** Contains response data for the listByCustomerNext operation. */
3632+
export type LotsListByCustomerNextResponse = Lots;
3633+
36063634
/** Optional parameters. */
36073635
export interface CreditsGetOptionalParams extends coreClient.OperationOptions {}
36083636

‎sdk/consumption/arm-consumption/src/models/mappers.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,6 @@ export const BudgetFilter: coreClient.CompositeMapper = {
218218
}
219219
}
220220
},
221-
not: {
222-
serializedName: "not",
223-
type: {
224-
name: "Composite",
225-
className: "BudgetFilterProperties"
226-
}
227-
},
228221
dimensions: {
229222
serializedName: "dimensions",
230223
type: {
@@ -3023,7 +3016,6 @@ export const ReservationTransaction: coreClient.CompositeMapper = {
30233016
};
30243017

30253018
export const ModernReservationTransaction: coreClient.CompositeMapper = {
3026-
serializedName: "Modern",
30273019
type: {
30283020
name: "Composite",
30293021
className: "ModernReservationTransaction",
@@ -3542,6 +3534,20 @@ export const LegacyUsageDetail: coreClient.CompositeMapper = {
35423534
name: "Number"
35433535
}
35443536
},
3537+
benefitId: {
3538+
serializedName: "properties.benefitId",
3539+
readOnly: true,
3540+
type: {
3541+
name: "String"
3542+
}
3543+
},
3544+
benefitName: {
3545+
serializedName: "properties.benefitName",
3546+
readOnly: true,
3547+
type: {
3548+
name: "String"
3549+
}
3550+
},
35453551
pricingModel: {
35463552
serializedName: "properties.pricingModel",
35473553
readOnly: true,

0 commit comments

Comments
 (0)