Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR] consumption/resource-manager #1778

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@azure/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) 2019 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
29 changes: 8 additions & 21 deletions packages/@azure/arm-consumption/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ 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 - Authentication, client creation and list operations as an example written in TypeScript.

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

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

##### Sample code

```ts
```typescript
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";
Expand All @@ -34,12 +34,7 @@ const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new ConsumptionManagementClient(creds, subscriptionId);
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) => {
client.operations.list().then((result) => {
console.log("The result is:");
console.log(result);
});
Expand All @@ -48,11 +43,11 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
});
```

#### browser - Authentication, client creation and list usageDetails as an example written in JavaScript.
#### browser - Authentication, client creation and list operations as an example written in JavaScript.

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

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

Expand Down Expand Up @@ -82,12 +77,7 @@ 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 expand = "testexpand";
const filter = "testfilter";
const skiptoken = "testskiptoken";
const top = 1;
const apply = "testapply";
client.usageDetails.list(expand, filter, skiptoken, top, apply).then((result) => {
client.operations.list().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand All @@ -104,6 +94,3 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
## Related projects

- [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%2Fpackages%2F%40azure%2Farm-consumption%2FREADME.png)
45 changes: 18 additions & 27 deletions packages/@azure/arm-consumption/lib/consumptionManagementClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,32 @@ import { ConsumptionManagementClientContext } from "./consumptionManagementClien

class ConsumptionManagementClient extends ConsumptionManagementClientContext {
// Operation groups
usageDetails: operations.UsageDetails;
marketplaces: operations.Marketplaces;
balances: operations.Balances;
reservationsSummaries: operations.ReservationsSummaries;
reservationsDetails: operations.ReservationsDetails;
reservationRecommendations: operations.ReservationRecommendations;
budgets: operations.Budgets;
priceSheet: operations.PriceSheet;
tags: operations.Tags;
forecasts: operations.Forecasts;
operations: operations.Operations;
aggregatedCost: operations.AggregatedCost;
charges: operations.Charges;
creditSummaryByBillingProfile: operations.CreditSummaryByBillingProfile;
eventsByBillingProfile: operations.EventsByBillingProfile;
lotsByBillingProfile: operations.LotsByBillingProfile;
invoicePricesheet: operations.InvoicePricesheet;
billingProfilePricesheet: operations.BillingProfilePricesheet;
chargesByBillingAccount: operations.ChargesByBillingAccount;
chargesByBillingProfile: operations.ChargesByBillingProfile;
chargesByInvoiceSection: operations.ChargesByInvoiceSection;

/**
* Initializes a new instance of the ConsumptionManagementClient class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param subscriptionId Azure Subscription ID.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ConsumptionManagementClientOptions) {
super(credentials, subscriptionId, options);
this.usageDetails = new operations.UsageDetails(this);
this.marketplaces = new operations.Marketplaces(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.priceSheet = new operations.PriceSheet(this);
this.tags = new operations.Tags(this);
this.forecasts = new operations.Forecasts(this);
constructor(credentials: msRest.ServiceClientCredentials, options?: Models.ConsumptionManagementClientOptions) {
super(credentials, options);
this.operations = new operations.Operations(this);
this.aggregatedCost = new operations.AggregatedCost(this);
this.charges = new operations.Charges(this);
this.creditSummaryByBillingProfile = new operations.CreditSummaryByBillingProfile(this);
this.eventsByBillingProfile = new operations.EventsByBillingProfile(this);
this.lotsByBillingProfile = new operations.LotsByBillingProfile(this);
this.invoicePricesheet = new operations.InvoicePricesheet(this);
this.billingProfilePricesheet = new operations.BillingProfilePricesheet(this);
this.chargesByBillingAccount = new operations.ChargesByBillingAccount(this);
this.chargesByBillingProfile = new operations.ChargesByBillingProfile(this);
this.chargesByInvoiceSection = new operations.ChargesByInvoiceSection(this);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,21 @@ 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;
apiVersion?: string;
subscriptionId: string;

/**
* Initializes a new instance of the ConsumptionManagementClient class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param subscriptionId Azure Subscription ID.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ConsumptionManagementClientOptions) {
constructor(credentials: msRest.ServiceClientCredentials, options?: Models.ConsumptionManagementClientOptions) {
if (credentials == undefined) {
throw new Error('\'credentials\' cannot be null.');
}
if (subscriptionId == undefined) {
throw new Error('\'subscriptionId\' cannot be null.');
}

if (!options) {
options = {};
Expand All @@ -44,13 +39,12 @@ export class ConsumptionManagementClientContext extends msRestAzure.AzureService

super(credentials, options);

this.apiVersion = '2018-10-01';
this.apiVersion = '2018-11-01-preview';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
this.requestContentType = "application/json; charset=utf-8";
this.credentials = credentials;
this.subscriptionId = subscriptionId;

if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* 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 {
PricesheetDownloadResponse,
Resource,
BaseResource,
BillingProfilePricesheetDownloadHeaders,
ErrorResponse,
ErrorDetails,
Department,
EnrollmentAccount,
BillingProfile,
Address,
InvoiceSection,
BillingAccount,
Enrollment,
EnrollmentPolicies,
CreditSummary,
CreditBalanceSummary,
Amount,
EventSummary,
LotSummary,
ChargeSummaryByBillingAccount,
ChargeSummaryByBillingProfile,
ChargeSummaryByInvoiceSection,
ProxyResource
} from "../models/mappers";

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* 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 {
ChargesListByBillingAccount,
ChargeSummaryByBillingAccount,
Resource,
BaseResource,
Amount,
ErrorResponse,
ErrorDetails,
Department,
EnrollmentAccount,
BillingProfile,
Address,
InvoiceSection,
BillingAccount,
Enrollment,
EnrollmentPolicies,
PricesheetDownloadResponse,
CreditSummary,
CreditBalanceSummary,
EventSummary,
LotSummary,
ChargeSummaryByBillingProfile,
ChargeSummaryByInvoiceSection,
ProxyResource
} from "../models/mappers";

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* 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 {
ChargesListByBillingProfile,
ChargeSummaryByBillingProfile,
Resource,
BaseResource,
Amount,
ErrorResponse,
ErrorDetails,
Department,
EnrollmentAccount,
BillingProfile,
Address,
InvoiceSection,
BillingAccount,
Enrollment,
EnrollmentPolicies,
PricesheetDownloadResponse,
CreditSummary,
CreditBalanceSummary,
EventSummary,
LotSummary,
ChargeSummaryByBillingAccount,
ChargeSummaryByInvoiceSection,
ProxyResource
} from "../models/mappers";

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* 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 {
ChargesListByInvoiceSection,
ChargeSummaryByInvoiceSection,
Resource,
BaseResource,
Amount,
ErrorResponse,
ErrorDetails,
Department,
EnrollmentAccount,
BillingProfile,
Address,
InvoiceSection,
BillingAccount,
Enrollment,
EnrollmentPolicies,
PricesheetDownloadResponse,
CreditSummary,
CreditBalanceSummary,
EventSummary,
LotSummary,
ChargeSummaryByBillingAccount,
ChargeSummaryByBillingProfile,
ProxyResource
} from "../models/mappers";

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* 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 {
CreditSummary,
Resource,
BaseResource,
CreditBalanceSummary,
Amount,
ErrorResponse,
ErrorDetails,
Department,
EnrollmentAccount,
BillingProfile,
Address,
InvoiceSection,
BillingAccount,
Enrollment,
EnrollmentPolicies,
PricesheetDownloadResponse,
EventSummary,
LotSummary,
ChargeSummaryByBillingAccount,
ChargeSummaryByBillingProfile,
ChargeSummaryByInvoiceSection,
ProxyResource
} from "../models/mappers";

Loading