Skip to content

Commit

Permalink
CodeGen from PR 13327 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge f575ad61e8b434a0927dffb240d1383299a99c45 into a2b6c113528f50d9be6b3e7c4d695a8a971b05b8
  • Loading branch information
SDKAuto committed Mar 16, 2021
1 parent 50e1ea9 commit da1c5ad
Show file tree
Hide file tree
Showing 47 changed files with 8,627 additions and 6,244 deletions.
2 changes: 1 addition & 1 deletion sdk/consumption/arm-consumption/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Microsoft
Copyright (c) 2021 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
Expand Down
33 changes: 17 additions & 16 deletions sdk/consumption/arm-consumption/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,38 @@ This package contains an isomorphic SDK for ConsumptionManagementClient.

### How to Install

```
```bash
npm install @azure/arm-consumption
```

### How to use

#### nodejs - Authentication, client creation and list usageDetails as an example written in TypeScript.
#### nodejs - client creation and list usageDetails as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

```
npm install @azure/ms-rest-nodeauth
- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
```bash
npm install @azure/ms-rest-nodeauth@"^3.0.0"
```

##### 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 { ConsumptionManagementClient, ConsumptionManagementModels, ConsumptionManagementMappers } from "@azure/arm-consumption";
While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
```typescript
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { ConsumptionManagementClient } = require("@azure/arm-consumption");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new ConsumptionManagementClient(creds, subscriptionId);
const scope = "testscope";
const expand = "testexpand";
const filter = "testfilter";
const skiptoken = "testskiptoken";
const top = 1;
const apply = "testapply";
client.usageDetails.list(expand, filter, skiptoken, top, apply).then((result) => {
const metric = "actualcost";
client.usageDetails.list(scope, expand, filter, skiptoken, top, metric).then((result) => {
console.log("The result is:");
console.log(result);
});
Expand All @@ -52,7 +53,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => {

##### Install @azure/ms-rest-browserauth

```
```bash
npm install @azure/ms-rest-browserauth
```

Expand Down Expand Up @@ -82,12 +83,13 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
authManager.login();
}
const client = new Azure.ArmConsumption.ConsumptionManagementClient(res.creds, subscriptionId);
const scope = "testscope";
const expand = "testexpand";
const filter = "testfilter";
const skiptoken = "testskiptoken";
const top = 1;
const apply = "testapply";
client.usageDetails.list(expand, filter, skiptoken, top, apply).then((result) => {
const metric = "actualcost";
client.usageDetails.list(scope, expand, filter, skiptoken, top, metric).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand All @@ -105,5 +107,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to

- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)


![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fconsumption%2Farm-consumption%2FREADME.png)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/consumption/arm-consumption/README.png)
22 changes: 12 additions & 10 deletions sdk/consumption/arm-consumption/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "ConsumptionManagementClient Library with typescript type definitions for node.js and browser.",
"version": "6.3.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^1.1.0",
"@azure/ms-rest-js": "^1.1.0",
"tslib": "^1.9.3"
"@azure/ms-rest-azure-js": "^2.0.1",
"@azure/ms-rest-js": "^2.0.4",
"tslib": "^1.10.0"
},
"keywords": [
"node",
Expand All @@ -20,18 +20,19 @@
"module": "./esm/consumptionManagementClient.js",
"types": "./esm/consumptionManagementClient.d.ts",
"devDependencies": {
"typescript": "^3.1.1",
"rollup": "^0.66.2",
"rollup-plugin-node-resolve": "^3.4.0",
"uglify-js": "^3.4.9"
"typescript": "^3.5.3",
"rollup": "^1.18.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/sdk/consumption/arm-consumption",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/consumption/arm-consumption",
"repository": {
"type": "git",
"url": "https://github.com/azure/azure-sdk-for-js.git"
"url": "https://github.com/Azure/azure-sdk-for-js.git"
},
"bugs": {
"url": "https://github.com/azure/azure-sdk-for-js/issues"
"url": "https://github.com/Azure/azure-sdk-for-js/issues"
},
"files": [
"dist/**/*.js",
Expand All @@ -43,6 +44,7 @@
"esm/**/*.d.ts",
"esm/**/*.d.ts.map",
"src/**/*.ts",
"README.md",
"rollup.config.js",
"tsconfig.json"
],
Expand Down
24 changes: 15 additions & 9 deletions sdk/consumption/arm-consumption/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import rollup from "rollup";
import nodeResolve from "rollup-plugin-node-resolve";
import sourcemaps from "rollup-plugin-sourcemaps";

/**
* @type {import('rollup').RollupFileOptions}
* @type {rollup.RollupFileOptions}
*/
const config = {
input: './esm/consumptionManagementClient.js',
external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
input: "./esm/consumptionManagementClient.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
],
output: {
file: "./dist/arm-consumption.js",
format: "umd",
Expand All @@ -15,17 +21,17 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/`
},
plugins: [
nodeResolve({ module: true })
nodeResolve({ mainFields: ['module', 'main'] }),
sourcemaps()
]
};

export default config;
27 changes: 18 additions & 9 deletions sdk/consumption/arm-consumption/src/consumptionManagementClient.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand All @@ -19,17 +18,22 @@ class ConsumptionManagementClient extends ConsumptionManagementClientContext {
// Operation groups
usageDetails: operations.UsageDetails;
marketplaces: operations.Marketplaces;
budgets: operations.Budgets;
tags: operations.Tags;
charges: operations.Charges;
balances: operations.Balances;
reservationsSummaries: operations.ReservationsSummaries;
reservationsDetails: operations.ReservationsDetails;
reservationRecommendations: operations.ReservationRecommendations;
budgets: operations.Budgets;
reservationRecommendationDetails: operations.ReservationRecommendationDetails;
reservationTransactions: operations.ReservationTransactions;
priceSheet: operations.PriceSheet;
tags: operations.Tags;
forecasts: operations.Forecasts;
operations: operations.Operations;
aggregatedCost: operations.AggregatedCost;
charges: operations.Charges;
events: operations.EventsOperations;
lots: operations.LotsOperations;
credits: operations.Credits;

/**
* Initializes a new instance of the ConsumptionManagementClient class.
Expand All @@ -41,17 +45,22 @@ class ConsumptionManagementClient extends ConsumptionManagementClientContext {
super(credentials, subscriptionId, options);
this.usageDetails = new operations.UsageDetails(this);
this.marketplaces = new operations.Marketplaces(this);
this.budgets = new operations.Budgets(this);
this.tags = new operations.Tags(this);
this.charges = new operations.Charges(this);
this.balances = new operations.Balances(this);
this.reservationsSummaries = new operations.ReservationsSummaries(this);
this.reservationsDetails = new operations.ReservationsDetails(this);
this.reservationRecommendations = new operations.ReservationRecommendations(this);
this.budgets = new operations.Budgets(this);
this.reservationRecommendationDetails = new operations.ReservationRecommendationDetails(this);
this.reservationTransactions = new operations.ReservationTransactions(this);
this.priceSheet = new operations.PriceSheet(this);
this.tags = new operations.Tags(this);
this.forecasts = new operations.Forecasts(this);
this.operations = new operations.Operations(this);
this.aggregatedCost = new operations.AggregatedCost(this);
this.charges = new operations.Charges(this);
this.events = new operations.EventsOperations(this);
this.lots = new operations.LotsOperations(this);
this.credits = new operations.Credits(this);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand All @@ -13,7 +12,7 @@ import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";

const packageName = "@azure/arm-consumption";
const packageVersion = "0.1.0";
const packageVersion = "6.3.0";

export class ConsumptionManagementClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
Expand Down Expand Up @@ -44,7 +43,7 @@ export class ConsumptionManagementClientContext extends msRestAzure.AzureService

super(credentials, options);

this.apiVersion = '2018-10-01';
this.apiVersion = '2019-11-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
72 changes: 46 additions & 26 deletions sdk/consumption/arm-consumption/src/models/aggregatedCostMappers.ts
Original file line number Diff line number Diff line change
@@ -1,39 +1,59 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

export {
ManagementGroupAggregatedCostResult,
Resource,
BaseResource,
ErrorResponse,
ErrorDetails,
UsageDetail,
MeterDetails,
Marketplace,
discriminators,
Amount,
Balance,
BalancePropertiesNewPurchasesDetailsItem,
BalancePropertiesAdjustmentDetailsItem,
ReservationSummary,
ReservationDetail,
PriceSheetResult,
PriceSheetProperties,
BalancePropertiesNewPurchasesDetailsItem,
BaseResource,
Budget,
BudgetComparisonExpression,
BudgetFilter,
BudgetFilterProperties,
BudgetTimePeriod,
ChargeSummary,
CreditBalanceSummary,
CreditSummary,
CurrentSpend,
ErrorDetails,
ErrorResponse,
EventSummary,
Forecast,
ForecastPropertiesConfidenceLevelsItem,
ChargeSummary,
ForecastSpend,
LegacyChargeSummary,
LegacyReservationTransaction,
LegacyUsageDetail,
LotSummary,
ManagementGroupAggregatedCostResult,
Marketplace,
MeterDetails,
MeterDetailsResponse,
ModernChargeSummary,
ModernReservationTransaction,
ModernUsageDetail,
Notification,
PriceSheetProperties,
PriceSheetResult,
ProxyResource,
TagsResult,
ReservationDetail,
ReservationRecommendationDetailsCalculatedSavingsProperties,
ReservationRecommendationDetailsModel,
ReservationRecommendationDetailsResourceProperties,
ReservationRecommendationDetailsSavingsProperties,
ReservationRecommendationDetailsUsageProperties,
ReservationSummary,
ReservationTransaction,
ReservationTransactionResource,
Resource,
Tag,
Budget,
BudgetTimePeriod,
Filters,
CurrentSpend,
Notification
TagsResult,
UsageDetail
} from "../models/mappers";

Loading

0 comments on commit da1c5ad

Please sign in to comment.