From 6db649447f5aa106fb7f3f99044459f54cb66d4b Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 3 Oct 2018 19:05:52 +0000 Subject: [PATCH 1/3] Generated from 36242263f17181fd68c46b5e5d41c0e60d71b175 Added IncludedSubscriptions and ExcludedSubscriptions properties to AggregatedCost --- lib/services/consumptionManagement/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/consumptionManagement/package.json b/lib/services/consumptionManagement/package.json index 204a541b08..87c3379cdb 100644 --- a/lib/services/consumptionManagement/package.json +++ b/lib/services/consumptionManagement/package.json @@ -14,7 +14,7 @@ "license": "MIT", "main": "./lib/consumptionManagementClient.js", "types": "./lib/consumptionManagementClient.d.ts", - "homepage": "https://github.com/azure/azure-sdk-for-node/tree/master/lib/services/consumptionManagement", + "homepage": "https://github.com/azure/azure-sdk-for-node", "repository": { "type": "git", "url": "https://github.com/azure/azure-sdk-for-node.git" From c7ec6fe20d378b04638bd3b90416d8d5e47068b6 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Sat, 13 Oct 2018 00:40:24 +0000 Subject: [PATCH 2/3] Generated from c2821abb9e291b0035e8befe7a6f5603c4bef5a3 Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs # Conflicts: # specification/consumption/resource-manager/readme.md --- .../lib/models/index.d.ts | 6 ++++ .../managementGroupAggregatedCostResult.js | 32 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/lib/services/consumptionManagement/lib/models/index.d.ts b/lib/services/consumptionManagement/lib/models/index.d.ts index 73d0de5508..206aab0686 100644 --- a/lib/services/consumptionManagement/lib/models/index.d.ts +++ b/lib/services/consumptionManagement/lib/models/index.d.ts @@ -711,6 +711,10 @@ export interface Forecast extends Resource { * @member {string} [currency] The ISO currency in which the meter is charged, * for example, USD. * @member {array} [children] Children of a management group + * @member {array} [includedSubscriptions] List of subscriptionGuids included + * in the calculation of aggregated cost + * @member {array} [excludedSubscriptions] List of subscriptionGuids excluded + * from the calculation of aggregated cost */ export interface ManagementGroupAggregatedCostResult extends Resource { readonly billingPeriodId?: string; @@ -721,6 +725,8 @@ export interface ManagementGroupAggregatedCostResult extends Resource { readonly chargesBilledSeparately?: number; readonly currency?: string; children?: ManagementGroupAggregatedCostResult[]; + includedSubscriptions?: string[]; + excludedSubscriptions?: string[]; } /** diff --git a/lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js b/lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js index 27b2d42198..39de4cbe2f 100644 --- a/lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js +++ b/lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js @@ -32,6 +32,10 @@ class ManagementGroupAggregatedCostResult extends models['Resource'] { * @member {string} [currency] The ISO currency in which the meter is * charged, for example, USD. * @member {array} [children] Children of a management group + * @member {array} [includedSubscriptions] List of subscriptionGuids included + * in the calculation of aggregated cost + * @member {array} [excludedSubscriptions] List of subscriptionGuids excluded + * from the calculation of aggregated cost */ constructor() { super(); @@ -160,6 +164,34 @@ class ManagementGroupAggregatedCostResult extends models['Resource'] { } } } + }, + includedSubscriptions: { + required: false, + serializedName: 'properties.includedSubscriptions', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'StringElementType', + type: { + name: 'String' + } + } + } + }, + excludedSubscriptions: { + required: false, + serializedName: 'properties.excludedSubscriptions', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'StringElementType', + type: { + name: 'String' + } + } + } } } } From 7b4cc24a08d55f27ebe85060199804f3f41dea29 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 15 Oct 2018 17:37:59 +0000 Subject: [PATCH 3/3] Generated from 63c2d0f4fa8af538b59fa39aea1905b142a9fb5f Updated version and replace subscriptionGuids with subscription Guids in Consumption.json Per comment --- .../lib/consumptionManagementClient.js | 2 +- lib/services/consumptionManagement/lib/models/index.d.ts | 4 ++-- .../lib/models/managementGroupAggregatedCostResult.js | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/services/consumptionManagement/lib/consumptionManagementClient.js b/lib/services/consumptionManagement/lib/consumptionManagementClient.js index ab688cada5..57b0c67bcc 100644 --- a/lib/services/consumptionManagement/lib/consumptionManagementClient.js +++ b/lib/services/consumptionManagement/lib/consumptionManagementClient.js @@ -50,7 +50,7 @@ class ConsumptionManagementClient extends ServiceClient { super(credentials, options); - this.apiVersion = '2018-08-31'; + this.apiVersion = '2018-10-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.generateClientRequestId = true; diff --git a/lib/services/consumptionManagement/lib/models/index.d.ts b/lib/services/consumptionManagement/lib/models/index.d.ts index 206aab0686..f1570af4bb 100644 --- a/lib/services/consumptionManagement/lib/models/index.d.ts +++ b/lib/services/consumptionManagement/lib/models/index.d.ts @@ -711,9 +711,9 @@ export interface Forecast extends Resource { * @member {string} [currency] The ISO currency in which the meter is charged, * for example, USD. * @member {array} [children] Children of a management group - * @member {array} [includedSubscriptions] List of subscriptionGuids included + * @member {array} [includedSubscriptions] List of subscription Guids included * in the calculation of aggregated cost - * @member {array} [excludedSubscriptions] List of subscriptionGuids excluded + * @member {array} [excludedSubscriptions] List of subscription Guids excluded * from the calculation of aggregated cost */ export interface ManagementGroupAggregatedCostResult extends Resource { diff --git a/lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js b/lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js index 39de4cbe2f..ba793233fa 100644 --- a/lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js +++ b/lib/services/consumptionManagement/lib/models/managementGroupAggregatedCostResult.js @@ -32,10 +32,10 @@ class ManagementGroupAggregatedCostResult extends models['Resource'] { * @member {string} [currency] The ISO currency in which the meter is * charged, for example, USD. * @member {array} [children] Children of a management group - * @member {array} [includedSubscriptions] List of subscriptionGuids included - * in the calculation of aggregated cost - * @member {array} [excludedSubscriptions] List of subscriptionGuids excluded - * from the calculation of aggregated cost + * @member {array} [includedSubscriptions] List of subscription Guids + * included in the calculation of aggregated cost + * @member {array} [excludedSubscriptions] List of subscription Guids + * excluded from the calculation of aggregated cost */ constructor() { super();