Generated from f30066455311383f4de879eaf46966f976c41ac7 (#3100)

resolved merge conflicts

sdk/billing/arm-billing/LICENSE.txt

@@ -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

sdk/billing/arm-billing/README.md

@@ -9,23 +9,23 @@ 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
 
-```
+```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";
@@ -34,7 +34,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);
   });
@@ -43,11 +44,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
 ```
 
@@ -77,7 +78,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) => {
@@ -94,6 +96,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/sdk/billing/arm-billing/README.png)

sdk/billing/arm-billing/package.json

@@ -4,8 +4,8 @@
   "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",
+    "@azure/ms-rest-azure-js": "^1.3.2",
+    "@azure/ms-rest-js": "^1.8.1",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -23,9 +23,10 @@
     "typescript": "^3.1.1",
     "rollup": "^0.66.2",
     "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-sourcemaps": "^0.4.2",
     "uglify-js": "^3.4.9"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/sdk/billing/arm-billing",
+  "homepage": "https://github.com/azure/azure-sdk-for-js",
   "repository": {
     "type": "git",
     "url": "https://github.com/azure/azure-sdk-for-js.git"
@@ -43,6 +44,7 @@
     "esm/**/*.d.ts",
     "esm/**/*.d.ts.map",
     "src/**/*.ts",
+    "README.md",
     "rollup.config.js",
     "tsconfig.json"
   ],
@@ -52,5 +54,5 @@
     "prepack": "npm install && npm run build"
   },
   "sideEffects": false,
-  "authPublish": true
+  "autoPublish": true
 }

sdk/billing/arm-billing/rollup.config.js

@@ -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",
@@ -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({ module: true }),
+    sourcemaps()
   ]
 };
+
 export default config;

sdk/billing/arm-billing/src/billingManagementClient.ts

@@ -17,10 +17,28 @@ import { BillingManagementClientContext } from "./billingManagementClientContext
 
 class BillingManagementClient extends BillingManagementClientContext {
   // Operation groups
+  billingAccounts: operations.BillingAccounts;
+  paymentMethods: operations.PaymentMethods;
+  billingAccountsValidateAddress: operations.BillingAccountsValidateAddress;
+  availableBalances: operations.AvailableBalances;
+  billingProfiles: operations.BillingProfiles;
+  invoiceSections: operations.InvoiceSections;
+  departments: operations.Departments;
   enrollmentAccounts: operations.EnrollmentAccounts;
-  billingPeriods: operations.BillingPeriods;
   invoices: operations.Invoices;
+  priceSheet: operations.PriceSheet;
+  billingSubscriptions: operations.BillingSubscriptions;
+  products: operations.Products;
+  transactions: operations.Transactions;
+  policies: operations.Policies;
+  billingProperty: operations.BillingPropertyOperations;
+  transfers: operations.Transfers;
+  recipientTransfers: operations.RecipientTransfers;
   operations: operations.Operations;
+  billingPermissions: operations.BillingPermissions;
+  billingRoleDefinitions: operations.BillingRoleDefinitions;
+  billingRoleAssignments: operations.BillingRoleAssignments;
+  agreements: operations.Agreements;
 
   /**
    * Initializes a new instance of the BillingManagementClient class.
@@ -30,10 +48,28 @@ class BillingManagementClient extends BillingManagementClientContext {
    */
   constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.BillingManagementClientOptions) {
     super(credentials, subscriptionId, options);
+    this.billingAccounts = new operations.BillingAccounts(this);
+    this.paymentMethods = new operations.PaymentMethods(this);
+    this.billingAccountsValidateAddress = new operations.BillingAccountsValidateAddress(this);
+    this.availableBalances = new operations.AvailableBalances(this);
+    this.billingProfiles = new operations.BillingProfiles(this);
+    this.invoiceSections = new operations.InvoiceSections(this);
+    this.departments = new operations.Departments(this);
     this.enrollmentAccounts = new operations.EnrollmentAccounts(this);
-    this.billingPeriods = new operations.BillingPeriods(this);
     this.invoices = new operations.Invoices(this);
+    this.priceSheet = new operations.PriceSheet(this);
+    this.billingSubscriptions = new operations.BillingSubscriptions(this);
+    this.products = new operations.Products(this);
+    this.transactions = new operations.Transactions(this);
+    this.policies = new operations.Policies(this);
+    this.billingProperty = new operations.BillingPropertyOperations(this);
+    this.transfers = new operations.Transfers(this);
+    this.recipientTransfers = new operations.RecipientTransfers(this);
     this.operations = new operations.Operations(this);
+    this.billingPermissions = new operations.BillingPermissions(this);
+    this.billingRoleDefinitions = new operations.BillingRoleDefinitions(this);
+    this.billingRoleAssignments = new operations.BillingRoleAssignments(this);
+    this.agreements = new operations.Agreements(this);
   }
 }
 

sdk/billing/arm-billing/src/billingManagementClientContext.ts

@@ -13,7 +13,7 @@ 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;
@@ -44,7 +44,7 @@ export class BillingManagementClientContext extends msRestAzure.AzureServiceClie
 
     super(credentials, options);
 
-    this.apiVersion = '2018-03-01-preview';
+    this.apiVersion = '2018-11-01-preview';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";

sdk/billing/arm-billing/src/models/agreementsMappers.ts

@@ -0,0 +1,40 @@
+/*
+ * 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 {
+  Address,
+  Agreement,
+  AgreementListResult,
+  Amount,
+  AvailableBalance,
+  BaseResource,
+  BillingAccount,
+  BillingPermissionsProperties,
+  BillingProfile,
+  BillingProperty,
+  BillingRoleAssignment,
+  BillingRoleDefinition,
+  BillingSubscriptionSummary,
+  Department,
+  DownloadProperties,
+  EnabledAzureSKUs,
+  Enrollment,
+  EnrollmentAccount,
+  EnrollmentPolicies,
+  ErrorDetails,
+  ErrorResponse,
+  InvoiceSection,
+  InvoiceSummary,
+  Participants,
+  PaymentMethod,
+  PaymentProperties,
+  Policy,
+  ProductSummary,
+  Resource,
+  TransactionsSummary
+} from "../models/mappers";

sdk/billing/arm-billing/src/models/availableBalancesMappers.ts

@@ -0,0 +1,39 @@
+/*
+ * 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 {
+  Address,
+  Agreement,
+  Amount,
+  AvailableBalance,
+  BaseResource,
+  BillingAccount,
+  BillingPermissionsProperties,
+  BillingProfile,
+  BillingProperty,
+  BillingRoleAssignment,
+  BillingRoleDefinition,
+  BillingSubscriptionSummary,
+  Department,
+  DownloadProperties,
+  EnabledAzureSKUs,
+  Enrollment,
+  EnrollmentAccount,
+  EnrollmentPolicies,
+  ErrorDetails,
+  ErrorResponse,
+  InvoiceSection,
+  InvoiceSummary,
+  Participants,
+  PaymentMethod,
+  PaymentProperties,
+  Policy,
+  ProductSummary,
+  Resource,
+  TransactionsSummary
+} from "../models/mappers";

sdk/billing/arm-billing/src/models/billingAccountsMappers.ts

@@ -0,0 +1,40 @@
+/*
+ * 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 {
+  Address,
+  Agreement,
+  Amount,
+  AvailableBalance,
+  BaseResource,
+  BillingAccount,
+  BillingAccountListResult,
+  BillingPermissionsProperties,
+  BillingProfile,
+  BillingProperty,
+  BillingRoleAssignment,
+  BillingRoleDefinition,
+  BillingSubscriptionSummary,
+  Department,
+  DownloadProperties,
+  EnabledAzureSKUs,
+  Enrollment,
+  EnrollmentAccount,
+  EnrollmentPolicies,
+  ErrorDetails,
+  ErrorResponse,
+  InvoiceSection,
+  InvoiceSummary,
+  Participants,
+  PaymentMethod,
+  PaymentProperties,
+  Policy,
+  ProductSummary,
+  Resource,
+  TransactionsSummary
+} from "../models/mappers";

sdk/billing/arm-billing/src/models/billingAccountsValidateAddressMappers.ts

@@ -0,0 +1,14 @@
+/*
+ * 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 {
+  Address,
+  ErrorDetails,
+  ErrorResponse,
+  ValidateAddressResponse
+} from "../models/mappers";

sdk/billing/arm-billing/src/models/billingPermissionsMappers.ts

@@ -0,0 +1,14 @@
+/*
+ * 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 {
+  BillingPermissionsListResult,
+  BillingPermissionsProperties,
+  ErrorDetails,
+  ErrorResponse
+} from "../models/mappers";