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

[ReleasePR @azure/arm-billing] Fix some bad output-folder for go SDK #11499

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 sdk/billing/arm-billing/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) 2020 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
24 changes: 13 additions & 11 deletions sdk/billing/arm-billing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,24 @@ This package contains an isomorphic SDK for BillingManagementClient.

### How to Install

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

### How to use

#### nodejs - Authentication, client creation and list enrollmentAccounts as an example written in TypeScript.
#### nodejs - Authentication, client creation and list billingAccounts 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
```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,7 +35,8 @@ const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new BillingManagementClient(creds, subscriptionId);
client.enrollmentAccounts.list().then((result) => {
const expand = "testexpand";
client.billingAccounts.list(expand).then((result) => {
console.log("The result is:");
console.log(result);
});
Expand All @@ -43,11 +45,11 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
});
```

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

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

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

Expand Down Expand Up @@ -77,7 +79,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
authManager.login();
}
const client = new Azure.ArmBilling.BillingManagementClient(res.creds, subscriptionId);
client.enrollmentAccounts.list().then((result) => {
const expand = "testexpand";
client.billingAccounts.list(expand).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand All @@ -95,5 +98,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%2Fbilling%2Farm-billing%2FREADME.png)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/billing/arm-billing/README.png)
22 changes: 12 additions & 10 deletions sdk/billing/arm-billing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "BillingManagementClient Library with typescript type definitions for node.js and browser.",
"version": "2.2.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/billingManagementClient.js",
"types": "./esm/billingManagementClient.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/billing/arm-billing",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/billing/arm-billing",
"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
22 changes: 14 additions & 8 deletions sdk/billing/arm-billing/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/billingManagementClient.js',
external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
input: "./esm/billingManagementClient.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
],
output: {
file: "./dist/arm-billing.js",
format: "umd",
Expand All @@ -16,16 +22,16 @@ const config = {
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* 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.
* 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;
42 changes: 37 additions & 5 deletions sdk/billing/arm-billing/src/billingManagementClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,55 @@ import { BillingManagementClientContext } from "./billingManagementClientContext

class BillingManagementClient extends BillingManagementClientContext {
// Operation groups
enrollmentAccounts: operations.EnrollmentAccounts;
billingPeriods: operations.BillingPeriods;
billingAccounts: operations.BillingAccounts;
address: operations.Address;
availableBalances: operations.AvailableBalances;
instructions: operations.Instructions;
billingProfiles: operations.BillingProfiles;
customers: operations.Customers;
invoiceSections: operations.InvoiceSections;
billingPermissions: operations.BillingPermissions;
billingSubscriptions: operations.BillingSubscriptions;
products: operations.Products;
invoices: operations.Invoices;
transactions: operations.Transactions;
policies: operations.Policies;
billingProperty: operations.BillingPropertyOperations;
operations: operations.Operations;
billingRoleDefinitions: operations.BillingRoleDefinitions;
billingRoleAssignments: operations.BillingRoleAssignments;
agreements: operations.Agreements;
enrollmentAccounts: operations.EnrollmentAccounts;
billingPeriods: operations.BillingPeriods;

/**
* Initializes a new instance of the BillingManagementClient class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param subscriptionId Azure Subscription ID.
* @param subscriptionId The ID that uniquely identifies an Azure subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.BillingManagementClientOptions) {
super(credentials, subscriptionId, options);
this.enrollmentAccounts = new operations.EnrollmentAccounts(this);
this.billingPeriods = new operations.BillingPeriods(this);
this.billingAccounts = new operations.BillingAccounts(this);
this.address = new operations.Address(this);
this.availableBalances = new operations.AvailableBalances(this);
this.instructions = new operations.Instructions(this);
this.billingProfiles = new operations.BillingProfiles(this);
this.customers = new operations.Customers(this);
this.invoiceSections = new operations.InvoiceSections(this);
this.billingPermissions = new operations.BillingPermissions(this);
this.billingSubscriptions = new operations.BillingSubscriptions(this);
this.products = new operations.Products(this);
this.invoices = new operations.Invoices(this);
this.transactions = new operations.Transactions(this);
this.policies = new operations.Policies(this);
this.billingProperty = new operations.BillingPropertyOperations(this);
this.operations = new operations.Operations(this);
this.billingRoleDefinitions = new operations.BillingRoleDefinitions(this);
this.billingRoleAssignments = new operations.BillingRoleAssignments(this);
this.agreements = new operations.Agreements(this);
this.enrollmentAccounts = new operations.EnrollmentAccounts(this);
this.billingPeriods = new operations.BillingPeriods(this);
}
}

Expand Down
6 changes: 2 additions & 4 deletions sdk/billing/arm-billing/src/billingManagementClientContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@ import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";

const packageName = "@azure/arm-billing";
const packageVersion = "0.1.0";
const packageVersion = "2.2.0";

export class BillingManagementClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
apiVersion?: string;
subscriptionId: string;

/**
* Initializes a new instance of the BillingManagementClient class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param subscriptionId Azure Subscription ID.
* @param subscriptionId The ID that uniquely identifies an Azure subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.BillingManagementClientOptions) {
Expand All @@ -44,7 +43,6 @@ export class BillingManagementClientContext extends msRestAzure.AzureServiceClie

super(credentials, options);

this.apiVersion = '2018-03-01-preview';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
15 changes: 15 additions & 0 deletions sdk/billing/arm-billing/src/models/addressMappers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* 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 {
AddressDetails,
ErrorDetails,
ErrorResponse,
ErrorSubDetailsItem,
ValidateAddressResponse
} from "../models/mappers";
50 changes: 50 additions & 0 deletions sdk/billing/arm-billing/src/models/agreementsMappers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* 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 {
AddressDetails,
Agreement,
AgreementListResult,
Amount,
AvailableBalance,
AzurePlan,
BaseResource,
BillingAccount,
BillingPeriod,
BillingPermissionsProperties,
BillingProfile,
BillingProfilesOnExpand,
BillingProperty,
BillingRoleAssignment,
BillingRoleDefinition,
BillingSubscription,
Customer,
CustomerPolicy,
Department,
Document,
Enrollment,
EnrollmentAccount,
EnrollmentAccountSummary,
EnrollmentPolicies,
ErrorDetails,
ErrorResponse,
ErrorSubDetailsItem,
IndirectRelationshipInfo,
Instruction,
Invoice,
InvoiceSection,
InvoiceSectionsOnExpand,
Participants,
PaymentProperties,
Policy,
Product,
RebillDetails,
Reseller,
Resource,
Transaction
} from "../models/mappers";
49 changes: 49 additions & 0 deletions sdk/billing/arm-billing/src/models/availableBalancesMappers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* 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 {
AddressDetails,
Agreement,
Amount,
AvailableBalance,
AzurePlan,
BaseResource,
BillingAccount,
BillingPeriod,
BillingPermissionsProperties,
BillingProfile,
BillingProfilesOnExpand,
BillingProperty,
BillingRoleAssignment,
BillingRoleDefinition,
BillingSubscription,
Customer,
CustomerPolicy,
Department,
Document,
Enrollment,
EnrollmentAccount,
EnrollmentAccountSummary,
EnrollmentPolicies,
ErrorDetails,
ErrorResponse,
ErrorSubDetailsItem,
IndirectRelationshipInfo,
Instruction,
Invoice,
InvoiceSection,
InvoiceSectionsOnExpand,
Participants,
PaymentProperties,
Policy,
Product,
RebillDetails,
Reseller,
Resource,
Transaction
} from "../models/mappers";
Loading