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..a87202410b13 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 }; @@ -641,7 +641,7 @@ export interface ReservationSummary extends Resource { readonly reservationId?: string; /** * @member {string} [skuName] This is the ARM Sku name. It can be used to - * join with the servicetype field in additoinalinfo in usage records. + * join with the serviceType field in additional info in usage records. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ @@ -723,7 +723,7 @@ export interface ReservationDetail extends Resource { readonly reservationId?: string; /** * @member {string} [skuName] This is the ARM Sku name. It can be used to - * join with the servicetype field in additoinalinfo in usage records. + * join with the serviceType field in additional info in usage records. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ @@ -757,7 +757,7 @@ export interface ReservationDetail extends Resource { readonly instanceId?: string; /** * @member {number} [totalReservedQuantity] This is the total count of - * instances that are reserved for the reservationid. + * instances that are reserved for the reservationId. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ @@ -834,7 +834,7 @@ export interface ReservationRecommendation { */ readonly costWithNoReservedInstances?: number; /** - * @member {number} [recommendedQuantity] Recomended quality for reserved + * @member {number} [recommendedQuantity] Recommended quality for reserved * instances. * **NOTE: This property will not be serialized. It can only be populated by * the server.** @@ -909,7 +909,7 @@ export interface ProxyResource extends BaseResource { readonly type?: string; /** * @member {string} [eTag] eTag of the resource. To handle concurrent update - * scenarion, this field will be used to determine whether the user is + * scenario, this field will be used to determine whether the user is * updating the latest version or not. */ eTag?: string; @@ -1064,7 +1064,7 @@ export interface Budget extends ProxyResource { * budget. The start date must be first of the month and should be less than * the end date. Budget start date must be on or after June 1, 2017. Future * start date should not be more than three months. Past start date should - * be selected within the timegrain preiod. There are no restrictions on the + * be selected within the timegrain period. There are no restrictions on the * end date. */ timePeriod: BudgetTimePeriod; 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..8139f71f6d3a 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"; @@ -52,7 +52,7 @@ export class Marketplaces { } /** - * Lists the marketplaces for a scope by billing period and subscripotionId. Marketplaces are + * Lists the marketplaces for a scope by billing period and subscriptionId. Marketplaces are * available via this API only for May 1, 2014 or later. * @param billingPeriodName Billing Period Name. * @param [options] The optional parameters @@ -358,7 +358,7 @@ export class Marketplaces { } /** - * Lists the marketplaces for a scope by billing period and subscripotionId. Marketplaces are + * Lists the marketplaces for a scope by billing period and subscriptionId. Marketplaces are * available via this API only for May 1, 2014 or later. * @param nextPageLink The NextLink from the previous successful call to List operation. * @param [options] The optional 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..3616db527b6f 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"; @@ -27,7 +27,7 @@ export class ReservationRecommendations { } /** - * List of recomendations for purchasing reserved instances. + * List of recommendations for purchasing reserved instances. * @param [options] The optional parameters * @returns Promise */ @@ -51,7 +51,7 @@ export class ReservationRecommendations { } /** - * List of recomendations for purchasing reserved instances. + * List of recommendations for purchasing reserved instances. * @param nextPageLink The NextLink from the previous successful call to List operation. * @param [options] The optional parameters * @returns Promise 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"] }