[AutoPR consumption/resource-manager] Above-Subscription Level Marketplace and Usage Detail, and Enrollment Level Balances

lib/services/consumptionManagement/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

lib/services/consumptionManagement/README.md

@@ -1,38 +1,45 @@
-# Microsoft Azure SDK for Node.js - ConsumptionManagement
-
-This project provides a Node.js package for accessing the Azure PAS. Right now it supports:
-- **Node.js version: 6.x.x or higher**
-
-## How to Install
-
-```bash
-npm install azure-arm-consumption
-```
-
-## How to Use
-
-### Authentication, client creation and listing usageDetails as an example
-
- ```javascript
- var msRestAzure = require('ms-rest-azure');
- var ConsumptionManagementClient = require("azure-arm-consumption");
-
- // Interactive Login
- // It provides a url and code that needs to be copied and pasted in a browser and authenticated over there. If successful, 
- // the user will get a DeviceTokenCredentials object.
- msRestAzure.interactiveLogin(function(err, credentials) {
-  let client = new ConsumptionManagementClient(credentials, 'your-subscription-id');
-  client.usageDetails.list().then((usageDetails) => {
-    console.log('List of usageDetails:');
-    console.dir(usageDetails, {depth: null, colors: true});
-   });
-  }).catch((err) => {
-   console.log('An error ocurred');
-   console.dir(err, {depth: null, colors: true});
-  });
-});
-```
-
-## Related projects
-
-- [Microsoft Azure SDK for Node.js](https://github.com/Azure/azure-sdk-for-node)
+---
+uid: azure-arm-consumption
+summary: *content
+
+---
+# Microsoft Azure SDK for Node.js - ConsumptionManagementClient
+This project provides a Node.js package for accessing Azure. Right now it supports:
+- **Node.js version 6.x.x or higher**
+
+## Features
+
+
+## How to Install
+
+```bash
+npm install azure-arm-consumption
+```
+
+## How to use
+
+### Authentication, client creation and list usageDetails as an example.
+
+```javascript
+const msRestAzure = require("ms-rest-azure");
+const ConsumptionManagementClient = require("azure-arm-consumption");
+msRestAzure.interactiveLogin().then((creds) => {
+    const subscriptionId = "<Subscription_Id>";
+    const client = new ConsumptionManagementClient(creds, subscriptionId);
+    const expand = "testexpand";
+    const filter = "testfilter";
+    const skiptoken = "testskiptoken";
+    const top = 1;
+    const apply = "testapply";
+    return client.usageDetails.list(expand, filter, skiptoken, top, apply).then((result) => {
+      console.log("The result is:");
+      console.log(result);
+    });
+}).catch((err) => {
+  console.log('An error occurred:');
+  console.dir(err, {depth: null, colors: true});
+});
+
+## Related projects
+
+- [Microsoft Azure SDK for Node.js](https://github.com/Azure/azure-sdk-for-node)

lib/services/consumptionManagement/lib/consumptionManagementClient.d.ts

@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import { ServiceClientCredentials } from 'ms-rest';
+import { ServiceClient, ServiceClientOptions, ServiceCallback, HttpOperationResponse, ServiceClientCredentials } from 'ms-rest';
 import { AzureServiceClient, AzureServiceClientOptions } from 'ms-rest-azure';
 import * as models from "./models";
 import * as operations from "./operations";
@@ -57,14 +57,79 @@ export default class ConsumptionManagementClient extends AzureServiceClient {
 
   // Operation groups
   usageDetails: operations.UsageDetails;
+  usageDetailsByBillingAccount: operations.UsageDetailsByBillingAccount;
+  usageDetailsByDepartment: operations.UsageDetailsByDepartment;
+  usageDetailsByEnrollmentAccount: operations.UsageDetailsByEnrollmentAccount;
   marketplaces: operations.Marketplaces;
+  marketplacesByBillingAccount: operations.MarketplacesByBillingAccount;
+  marketplacesByDepartment: operations.MarketplacesByDepartment;
+  marketplacesByEnrollmentAccounts: operations.MarketplacesByEnrollmentAccounts;
+  getBalancesByBillingAccount: operations.GetBalancesByBillingAccount;
   reservationsSummaries: operations.ReservationsSummaries;
   reservationsDetails: operations.ReservationsDetails;
   reservationRecommendationsOperations: operations.ReservationRecommendationsOperations;
   budgets: operations.Budgets;
   operations: operations.Operations;
   priceSheet: operations.PriceSheet;
-  costAllocationTagsOperations: operations.CostAllocationTagsOperations;
+  costTagsOperations: operations.CostTagsOperations;
+  tagsOperations: operations.TagsOperations;
+
+
+  /**
+   * Gets the balances for a scope by billingAccountId. Balances are available
+   * via this API only for May 1, 2014 or later.
+   *
+   * @param {string} billingAccountId BillingAccount ID
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<Balance>} - The deserialized result object.
+   *
+   * @reject {Error|ServiceError} - The error object.
+   */
+  getBalancesByBillingAccountWithHttpOperationResponse(billingAccountId: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<models.Balance>>;
+
+  /**
+   * Gets the balances for a scope by billingAccountId. Balances are available
+   * via this API only for May 1, 2014 or later.
+   *
+   * @param {string} billingAccountId BillingAccount ID
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {ServiceCallback} [optionalCallback] - The optional callback.
+   *
+   * @returns {ServiceCallback|Promise} If a callback was passed as the last
+   * parameter then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned.
+   *
+   *                      @resolve {Balance} - The deserialized result object.
+   *
+   *                      @reject {Error|ServiceError} - The error object.
+   *
+   * {ServiceCallback} optionalCallback(err, result, request, response)
+   *
+   *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {Balance} [result]   - The deserialized result object if an error did not occur.
+   *                      See {@link Balance} for more information.
+   *
+   *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+   */
+  getBalancesByBillingAccount(billingAccountId: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<models.Balance>;
+  getBalancesByBillingAccount(billingAccountId: string, callback: ServiceCallback<models.Balance>): void;
+  getBalancesByBillingAccount(billingAccountId: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.Balance>): void;
 }
 
 export { ConsumptionManagementClient, models as ConsumptionManagementModels };