diff --git a/packages/@azure/arm-billing/LICENSE.txt b/packages/@azure/arm-billing/LICENSE.txt index a70e8cf66038..5431ba98b936 100644 --- a/packages/@azure/arm-billing/LICENSE.txt +++ b/packages/@azure/arm-billing/LICENSE.txt @@ -1,21 +1,21 @@ -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. +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. diff --git a/packages/@azure/arm-billing/README.md b/packages/@azure/arm-billing/README.md index f36daa13d9f6..657c7a22e70f 100644 --- a/packages/@azure/arm-billing/README.md +++ b/packages/@azure/arm-billing/README.md @@ -1,96 +1,77 @@ -## Azure BillingManagementClient SDK for JavaScript - -This package contains an isomorphic SDK for BillingManagementClient. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install - -``` -npm install @azure/arm-billing -``` - -### How to use - -#### nodejs - Authentication, client creation and list enrollmentAccounts as an example written in TypeScript. - -##### Install @azure/ms-rest-nodeauth - -``` -npm install @azure/ms-rest-nodeauth -``` - -##### Sample code - -```ts -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; -import { BillingManagementClient, BillingManagementModels, BillingManagementMappers } from "@azure/arm-billing"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new BillingManagementClient(creds, subscriptionId); - client.enrollmentAccounts.list().then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -#### browser - Authentication, client creation and list enrollmentAccounts as an example written in JavaScript. - -##### Install @azure/ms-rest-browserauth - -``` -npm install @azure/ms-rest-browserauth -``` - -##### Sample code - -See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - -- index.html -```html - - - - @azure/arm-billing sample - - - - - - - - -``` - -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Azure BillingManagementClient SDK for JavaScript +This package contains an isomorphic SDK for BillingManagementClient. + +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript + +## How to Install +``` +npm install @azure/arm-billing +``` + + +## How to use + +### nodejs - Authentication, client creation and list enrollmentAccounts as an example written in TypeScript. + +```ts +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; +import { BillingManagementClient, BillingManagementModels, BillingManagementMappers } from "@azure/arm-billing"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new BillingManagementClient(creds, subscriptionId); + client.enrollmentAccounts.list().then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +### browser - Authentication, client creation and list enrollmentAccounts as an example written in JavaScript. +See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. + +- index.html +```html + + + + @azure/arm-billing sample + + + + + + + + + +``` + +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-billing/lib/billingManagementClient.ts b/packages/@azure/arm-billing/lib/billingManagementClient.ts index 171fe7188b39..9d43fa4f0c48 100644 --- a/packages/@azure/arm-billing/lib/billingManagementClient.ts +++ b/packages/@azure/arm-billing/lib/billingManagementClient.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; import * as operations from "./operations"; diff --git a/packages/@azure/arm-billing/lib/billingManagementClientContext.ts b/packages/@azure/arm-billing/lib/billingManagementClientContext.ts index 3501b4ba6e55..43780d6ae33f 100644 --- a/packages/@azure/arm-billing/lib/billingManagementClientContext.ts +++ b/packages/@azure/arm-billing/lib/billingManagementClientContext.ts @@ -9,8 +9,8 @@ */ import * as Models from "./models"; -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; const packageName = "@azure/arm-billing"; const packageVersion = "0.1.0"; diff --git a/packages/@azure/arm-billing/lib/models/index.ts b/packages/@azure/arm-billing/lib/models/index.ts index 43c00d84b805..be402db324c3 100644 --- a/packages/@azure/arm-billing/lib/models/index.ts +++ b/packages/@azure/arm-billing/lib/models/index.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { BaseResource, CloudError, AzureServiceClientOptions } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export { BaseResource, CloudError }; diff --git a/packages/@azure/arm-billing/lib/models/invoicePricesheetMappers.ts b/packages/@azure/arm-billing/lib/models/invoicePricesheetMappers.ts new file mode 100644 index 000000000000..2e1e53aa3f8b --- /dev/null +++ b/packages/@azure/arm-billing/lib/models/invoicePricesheetMappers.ts @@ -0,0 +1,17 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +export { + DownloadUrl, + InvoicePricesheetDownloadHeaders, + ErrorResponse, + ErrorDetails +} from "../models/mappers"; + diff --git a/packages/@azure/arm-billing/lib/models/mappers.ts b/packages/@azure/arm-billing/lib/models/mappers.ts index 7a43d33d35f4..9ae65c44eb82 100644 --- a/packages/@azure/arm-billing/lib/models/mappers.ts +++ b/packages/@azure/arm-billing/lib/models/mappers.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { CloudErrorMapper, BaseResourceMapper } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export const CloudError = CloudErrorMapper; export const BaseResource = BaseResourceMapper; diff --git a/packages/@azure/arm-billing/lib/models/parameters.ts b/packages/@azure/arm-billing/lib/models/parameters.ts index b8826d672899..c3d7dbc8cd9f 100644 --- a/packages/@azure/arm-billing/lib/models/parameters.ts +++ b/packages/@azure/arm-billing/lib/models/parameters.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; export const acceptLanguage: msRest.OperationParameter = { parameterPath: "acceptLanguage", diff --git a/packages/@azure/arm-billing/lib/operations/billingPeriods.ts b/packages/@azure/arm-billing/lib/operations/billingPeriods.ts index 2dcc29cf78d9..fef9bc9017c2 100644 --- a/packages/@azure/arm-billing/lib/operations/billingPeriods.ts +++ b/packages/@azure/arm-billing/lib/operations/billingPeriods.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/billingPeriodsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-billing/lib/operations/enrollmentAccounts.ts b/packages/@azure/arm-billing/lib/operations/enrollmentAccounts.ts index c3309045d357..e001d2a05cb9 100644 --- a/packages/@azure/arm-billing/lib/operations/enrollmentAccounts.ts +++ b/packages/@azure/arm-billing/lib/operations/enrollmentAccounts.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/enrollmentAccountsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-billing/lib/operations/invoicePricesheet.ts b/packages/@azure/arm-billing/lib/operations/invoicePricesheet.ts new file mode 100644 index 000000000000..3feae1c4b8df --- /dev/null +++ b/packages/@azure/arm-billing/lib/operations/invoicePricesheet.ts @@ -0,0 +1,89 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; +import * as Models from "../models"; +import * as Mappers from "../models/invoicePricesheetMappers"; +import * as Parameters from "../models/parameters"; +import { BillingManagementClientContext } from "../billingManagementClientContext"; + +/** Class representing a InvoicePricesheet. */ +export class InvoicePricesheet { + private readonly client: BillingManagementClientContext; + + /** + * Create a InvoicePricesheet. + * @param {BillingManagementClientContext} client Reference to the service client. + */ + constructor(client: BillingManagementClientContext) { + this.client = client; + } + + /** + * Get pricesheet data for invoice id (invoiceName). + * @param billingAccountId Azure Billing Account ID. + * @param invoiceName The name of an invoice resource. + * @param [options] The optional parameters + * @returns Promise + */ + download(billingAccountId: string, invoiceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginDownload(billingAccountId,invoiceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + } + + /** + * Get pricesheet data for invoice id (invoiceName). + * @param billingAccountId Azure Billing Account ID. + * @param invoiceName The name of an invoice resource. + * @param [options] The optional parameters + * @returns Promise + */ + beginDownload(billingAccountId: string, invoiceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( + { + billingAccountId, + invoiceName, + options + }, + beginDownloadOperationSpec, + options); + } +} + +// Operation Specifications +const serializer = new msRest.Serializer(Mappers); +const beginDownloadOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoices/{invoiceName}/pricesheet/default/download", + urlParameters: [ + Parameters.billingAccountId, + Parameters.invoiceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.DownloadUrl, + headersMapper: Mappers.InvoicePricesheetDownloadHeaders + }, + 202: { + headersMapper: Mappers.InvoicePricesheetDownloadHeaders + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; diff --git a/packages/@azure/arm-billing/lib/operations/invoices.ts b/packages/@azure/arm-billing/lib/operations/invoices.ts index cdf4a4245a57..bb732e8f59c7 100644 --- a/packages/@azure/arm-billing/lib/operations/invoices.ts +++ b/packages/@azure/arm-billing/lib/operations/invoices.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/invoicesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-billing/lib/operations/operations.ts b/packages/@azure/arm-billing/lib/operations/operations.ts index c146d47b7560..e780fcc7595c 100644 --- a/packages/@azure/arm-billing/lib/operations/operations.ts +++ b/packages/@azure/arm-billing/lib/operations/operations.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/operationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-billing/package.json b/packages/@azure/arm-billing/package.json index a6e6a48233a0..a4afea07362c 100644 --- a/packages/@azure/arm-billing/package.json +++ b/packages/@azure/arm-billing/package.json @@ -4,8 +4,8 @@ "description": "BillingManagementClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", + "ms-rest-azure-js": "^1.0.181", + "ms-rest-js": "^1.0.460", "tslib": "^1.9.3" }, "keywords": [ diff --git a/packages/@azure/arm-billing/rollup.config.js b/packages/@azure/arm-billing/rollup.config.js index ae6725122752..11672e9c7e36 100644 --- a/packages/@azure/arm-billing/rollup.config.js +++ b/packages/@azure/arm-billing/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/billingManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/arm-billing.js", format: "umd", name: "Azure.ArmBilling", sourcemap: true, globals: { - "@azure/ms-rest-js": "msRest", - "@azure/ms-rest-azure-js": "msRestAzure" + "ms-rest-js": "msRest", + "ms-rest-azure-js": "msRestAzure" }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/@azure/arm-billing/tsconfig.json b/packages/@azure/arm-billing/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/arm-billing/tsconfig.json +++ b/packages/@azure/arm-billing/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] } diff --git a/packages/@azure/arm-consumption/README.md b/packages/@azure/arm-consumption/README.md index 733d35a9c5cf..54dc31cd7f50 100644 --- a/packages/@azure/arm-consumption/README.md +++ b/packages/@azure/arm-consumption/README.md @@ -1,34 +1,24 @@ -## Azure ConsumptionManagementClient SDK for JavaScript - +# Azure ConsumptionManagementClient SDK for JavaScript This package contains an isomorphic SDK for ConsumptionManagementClient. -### Currently supported environments - +## Currently supported environments - Node.js version 6.x.x or higher - Browser JavaScript -### How to Install - +## How to Install ``` npm install @azure/arm-consumption ``` -### How to use - -#### nodejs - Authentication, client creation and list usageDetails as an example written in TypeScript. -##### Install @azure/ms-rest-nodeauth - -``` -npm install @azure/ms-rest-nodeauth -``` +## How to use -##### Sample code +### nodejs - Authentication, client creation and list usageDetails as an example written in TypeScript. ```ts -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; import { ConsumptionManagementClient, ConsumptionManagementModels, ConsumptionManagementMappers } from "@azure/arm-consumption"; const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; @@ -48,16 +38,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => { }); ``` -#### browser - Authentication, client creation and list usageDetails as an example written in JavaScript. - -##### Install @azure/ms-rest-browserauth - -``` -npm install @azure/ms-rest-browserauth -``` - -##### Sample code - +### browser - Authentication, client creation and list usageDetails as an example written in JavaScript. See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - index.html @@ -66,11 +47,11 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to @azure/arm-consumption sample - - - + + + - - + + ``` -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-consumption/lib/consumptionManagementClient.ts b/packages/@azure/arm-consumption/lib/consumptionManagementClient.ts index 6157a62a09ab..821726d32293 100644 --- a/packages/@azure/arm-consumption/lib/consumptionManagementClient.ts +++ b/packages/@azure/arm-consumption/lib/consumptionManagementClient.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; import * as operations from "./operations"; diff --git a/packages/@azure/arm-consumption/lib/consumptionManagementClientContext.ts b/packages/@azure/arm-consumption/lib/consumptionManagementClientContext.ts index ae3c432891eb..ff820eefd41a 100644 --- a/packages/@azure/arm-consumption/lib/consumptionManagementClientContext.ts +++ b/packages/@azure/arm-consumption/lib/consumptionManagementClientContext.ts @@ -9,8 +9,8 @@ */ import * as Models from "./models"; -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; const packageName = "@azure/arm-consumption"; const packageVersion = "0.1.0"; diff --git a/packages/@azure/arm-consumption/lib/models/index.ts b/packages/@azure/arm-consumption/lib/models/index.ts index a0df6be94f6f..c4c409a43914 100644 --- a/packages/@azure/arm-consumption/lib/models/index.ts +++ b/packages/@azure/arm-consumption/lib/models/index.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { BaseResource, CloudError, AzureServiceClientOptions } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export { BaseResource, CloudError }; diff --git a/packages/@azure/arm-consumption/lib/models/mappers.ts b/packages/@azure/arm-consumption/lib/models/mappers.ts index 69f5bcfaaee2..93f55c00decc 100644 --- a/packages/@azure/arm-consumption/lib/models/mappers.ts +++ b/packages/@azure/arm-consumption/lib/models/mappers.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { CloudErrorMapper, BaseResourceMapper } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export const CloudError = CloudErrorMapper; export const BaseResource = BaseResourceMapper; diff --git a/packages/@azure/arm-consumption/lib/models/parameters.ts b/packages/@azure/arm-consumption/lib/models/parameters.ts index 307ad6cae657..ee3e50aa4a0b 100644 --- a/packages/@azure/arm-consumption/lib/models/parameters.ts +++ b/packages/@azure/arm-consumption/lib/models/parameters.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; export const acceptLanguage: msRest.OperationParameter = { parameterPath: "acceptLanguage", diff --git a/packages/@azure/arm-consumption/lib/operations/aggregatedCost.ts b/packages/@azure/arm-consumption/lib/operations/aggregatedCost.ts index b3747dd1e77e..095fcda14f0c 100644 --- a/packages/@azure/arm-consumption/lib/operations/aggregatedCost.ts +++ b/packages/@azure/arm-consumption/lib/operations/aggregatedCost.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/aggregatedCostMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/balances.ts b/packages/@azure/arm-consumption/lib/operations/balances.ts index 2bce5d1e065c..104cd11c99bb 100644 --- a/packages/@azure/arm-consumption/lib/operations/balances.ts +++ b/packages/@azure/arm-consumption/lib/operations/balances.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/balancesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/budgets.ts b/packages/@azure/arm-consumption/lib/operations/budgets.ts index ea97f7785722..072b110d9fea 100644 --- a/packages/@azure/arm-consumption/lib/operations/budgets.ts +++ b/packages/@azure/arm-consumption/lib/operations/budgets.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/budgetsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/charges.ts b/packages/@azure/arm-consumption/lib/operations/charges.ts index 8ba1f7efd45a..eacabbef5ceb 100644 --- a/packages/@azure/arm-consumption/lib/operations/charges.ts +++ b/packages/@azure/arm-consumption/lib/operations/charges.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/chargesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/forecasts.ts b/packages/@azure/arm-consumption/lib/operations/forecasts.ts index cffd25eed466..672a13aa71eb 100644 --- a/packages/@azure/arm-consumption/lib/operations/forecasts.ts +++ b/packages/@azure/arm-consumption/lib/operations/forecasts.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/forecastsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/marketplaces.ts b/packages/@azure/arm-consumption/lib/operations/marketplaces.ts index b324d9f44a8f..778087971d78 100644 --- a/packages/@azure/arm-consumption/lib/operations/marketplaces.ts +++ b/packages/@azure/arm-consumption/lib/operations/marketplaces.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/marketplacesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/operations.ts b/packages/@azure/arm-consumption/lib/operations/operations.ts index f5d1f7c74f7e..bb311b720186 100644 --- a/packages/@azure/arm-consumption/lib/operations/operations.ts +++ b/packages/@azure/arm-consumption/lib/operations/operations.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/operationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/priceSheet.ts b/packages/@azure/arm-consumption/lib/operations/priceSheet.ts index acc62419b42a..aa4ed79b38c4 100644 --- a/packages/@azure/arm-consumption/lib/operations/priceSheet.ts +++ b/packages/@azure/arm-consumption/lib/operations/priceSheet.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/priceSheetMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/reservationRecommendations.ts b/packages/@azure/arm-consumption/lib/operations/reservationRecommendations.ts index 3f4787a580a9..ecf0e86b8b82 100644 --- a/packages/@azure/arm-consumption/lib/operations/reservationRecommendations.ts +++ b/packages/@azure/arm-consumption/lib/operations/reservationRecommendations.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/reservationRecommendationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/reservationsDetails.ts b/packages/@azure/arm-consumption/lib/operations/reservationsDetails.ts index c712a50bbfcc..606ecc19d3df 100644 --- a/packages/@azure/arm-consumption/lib/operations/reservationsDetails.ts +++ b/packages/@azure/arm-consumption/lib/operations/reservationsDetails.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/reservationsDetailsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/reservationsSummaries.ts b/packages/@azure/arm-consumption/lib/operations/reservationsSummaries.ts index 47d212f52431..957ef50090cf 100644 --- a/packages/@azure/arm-consumption/lib/operations/reservationsSummaries.ts +++ b/packages/@azure/arm-consumption/lib/operations/reservationsSummaries.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/reservationsSummariesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/tags.ts b/packages/@azure/arm-consumption/lib/operations/tags.ts index 81d26e09da89..eaaa1821c6d2 100644 --- a/packages/@azure/arm-consumption/lib/operations/tags.ts +++ b/packages/@azure/arm-consumption/lib/operations/tags.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/tagsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/lib/operations/usageDetails.ts b/packages/@azure/arm-consumption/lib/operations/usageDetails.ts index a35d44831b51..f86eb36bbdb5 100644 --- a/packages/@azure/arm-consumption/lib/operations/usageDetails.ts +++ b/packages/@azure/arm-consumption/lib/operations/usageDetails.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/usageDetailsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-consumption/package.json b/packages/@azure/arm-consumption/package.json index 9db02eb107a7..cc4099fb2a40 100644 --- a/packages/@azure/arm-consumption/package.json +++ b/packages/@azure/arm-consumption/package.json @@ -4,8 +4,8 @@ "description": "ConsumptionManagementClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", + "ms-rest-azure-js": "^1.0.181", + "ms-rest-js": "^1.0.460", "tslib": "^1.9.3" }, "keywords": [ diff --git a/packages/@azure/arm-consumption/rollup.config.js b/packages/@azure/arm-consumption/rollup.config.js index e434910415dd..6b2068adb408 100644 --- a/packages/@azure/arm-consumption/rollup.config.js +++ b/packages/@azure/arm-consumption/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/consumptionManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/arm-consumption.js", format: "umd", name: "Azure.ArmConsumption", sourcemap: true, globals: { - "@azure/ms-rest-js": "msRest", - "@azure/ms-rest-azure-js": "msRestAzure" + "ms-rest-js": "msRest", + "ms-rest-azure-js": "msRestAzure" }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/@azure/arm-consumption/tsconfig.json b/packages/@azure/arm-consumption/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/arm-consumption/tsconfig.json +++ b/packages/@azure/arm-consumption/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] }