@azure/arm-commerce 3.0.0 → 4.0.0-beta.1

package/src/operations/rateCard.ts

@@ -3,84 +3,57 @@
  * 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.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as Models from "../models";
-import * as Mappers from "../models/rateCardMappers";
+import { RateCard } from "../operationsInterfaces";
+import * as coreClient from "@azure/core-client";
+import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { UsageManagementClientContext } from "../usageManagementClientContext";
+import { UsageManagementClient } from "../usageManagementClient";
+import { RateCardGetOptionalParams, RateCardGetResponse } from "../models";
 
-/** Class representing a RateCard. */
-export class RateCard {
-  private readonly client: UsageManagementClientContext;
+/** Class containing RateCard operations. */
+export class RateCardImpl implements RateCard {
+  private readonly client: UsageManagementClient;
 
   /**
-   * Create a RateCard.
-   * @param {UsageManagementClientContext} client Reference to the service client.
+   * Initialize a new instance of the class RateCard class.
+   * @param client Reference to the service client
    */
-  constructor(client: UsageManagementClientContext) {
+  constructor(client: UsageManagementClient) {
     this.client = client;
   }
 
   /**
-   * Enables you to query for the resource/meter metadata and related prices used in a given
-   * subscription by Offer ID, Currency, Locale and Region. The metadata associated with the billing
-   * meters, including but not limited to service names, types, resources, units of measure, and
-   * regions, is subject to change at any time and without notice. If you intend to use this billing
-   * data in an automated fashion, please use the billing meter GUID to uniquely identify each
-   * billable item. If the billing meter GUID is scheduled to change due to a new billing model, you
-   * will be notified in advance of the change.
+   * Enables you to query for the resource/meter metadata and related prices used in a given subscription
+   * by Offer ID, Currency, Locale and Region. The metadata associated with the billing meters, including
+   * but not limited to service names, types, resources, units of measure, and regions, is subject to
+   * change at any time and without notice. If you intend to use this billing data in an automated
+   * fashion, please use the billing meter GUID to uniquely identify each billable item. If the billing
+   * meter GUID is scheduled to change due to a new billing model, you will be notified in advance of the
+   * change.
    * @param filter The filter to apply on the operation. It ONLY supports the 'eq' and 'and' logical
-   * operators at this time. All the 4 query parameters 'OfferDurableId',  'Currency', 'Locale',
-   * 'Region' are required to be a part of the $filter.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RateCardGetResponse>
+   *               operators at this time. All the 4 query parameters 'OfferDurableId',  'Currency', 'Locale', 'Region'
+   *               are required to be a part of the $filter.
+   * @param options The options parameters.
    */
-  get(filter: string, options?: msRest.RequestOptionsBase): Promise<Models.RateCardGetResponse>;
-  /**
-   * @param filter The filter to apply on the operation. It ONLY supports the 'eq' and 'and' logical
-   * operators at this time. All the 4 query parameters 'OfferDurableId',  'Currency', 'Locale',
-   * 'Region' are required to be a part of the $filter.
-   * @param callback The callback
-   */
-  get(filter: string, callback: msRest.ServiceCallback<Models.ResourceRateCardInfo>): void;
-  /**
-   * @param filter The filter to apply on the operation. It ONLY supports the 'eq' and 'and' logical
-   * operators at this time. All the 4 query parameters 'OfferDurableId',  'Currency', 'Locale',
-   * 'Region' are required to be a part of the $filter.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  get(filter: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceRateCardInfo>): void;
-  get(filter: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceRateCardInfo>, callback?: msRest.ServiceCallback<Models.ResourceRateCardInfo>): Promise<Models.RateCardGetResponse> {
+  get(
+    filter: string,
+    options?: RateCardGetOptionalParams
+  ): Promise<RateCardGetResponse> {
     return this.client.sendOperationRequest(
-      {
-        filter,
-        options
-      },
-      getOperationSpec,
-      callback) as Promise<Models.RateCardGetResponse>;
+      { filter, options },
+      getOperationSpec
+    );
   }
 }
-
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
+
+const getOperationSpec: coreClient.OperationSpec = {
+  path: "/subscriptions/{subscriptionId}/providers/Microsoft.Commerce/RateCard",
   httpMethod: "GET",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.Commerce/RateCard",
-  urlParameters: [
-    Parameters.subscriptionId
-  ],
-  queryParameters: [
-    Parameters.filter,
-    Parameters.apiVersion
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
   responses: {
     200: {
       bodyMapper: Mappers.ResourceRateCardInfo
@@ -89,5 +62,8 @@ const getOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion, Parameters.filter],
+  urlParameters: [Parameters.$host, Parameters.subscriptionId],
+  headerParameters: [Parameters.accept],
   serializer
 };

package/src/operations/usageAggregates.ts

@@ -3,25 +3,33 @@
  * 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.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as Models from "../models";
-import * as Mappers from "../models/usageAggregatesMappers";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { UsageAggregates } from "../operationsInterfaces";
+import * as coreClient from "@azure/core-client";
+import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { UsageManagementClientContext } from "../usageManagementClientContext";
+import { UsageManagementClient } from "../usageManagementClient";
+import {
+  UsageAggregation,
+  UsageAggregatesListNextOptionalParams,
+  UsageAggregatesListOptionalParams,
+  UsageAggregatesListResponse,
+  UsageAggregatesListNextResponse
+} from "../models";
 
-/** Class representing a UsageAggregates. */
-export class UsageAggregates {
-  private readonly client: UsageManagementClientContext;
+/// <reference lib="esnext.asynciterable" />
+/** Class containing UsageAggregates operations. */
+export class UsageAggregatesImpl implements UsageAggregates {
+  private readonly client: UsageManagementClient;
 
   /**
-   * Create a UsageAggregates.
-   * @param {UsageManagementClientContext} client Reference to the service client.
+   * Initialize a new instance of the class UsageAggregates class.
+   * @param client Reference to the service client
    */
-  constructor(client: UsageManagementClientContext) {
+  constructor(client: UsageManagementClient) {
     this.client = client;
   }
 
@@ -29,79 +37,116 @@ export class UsageAggregates {
    * Query aggregated Azure subscription consumption data for a date range.
    * @param reportedStartTime The start of the time range to retrieve data for.
    * @param reportedEndTime The end of the time range to retrieve data for.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.UsageAggregatesListResponse>
+   * @param options The options parameters.
    */
-  list(reportedStartTime: Date | string, reportedEndTime: Date | string, options?: Models.UsageAggregatesListOptionalParams): Promise<Models.UsageAggregatesListResponse>;
-  /**
-   * @param reportedStartTime The start of the time range to retrieve data for.
-   * @param reportedEndTime The end of the time range to retrieve data for.
-   * @param callback The callback
-   */
-  list(reportedStartTime: Date | string, reportedEndTime: Date | string, callback: msRest.ServiceCallback<Models.UsageAggregationListResult>): void;
-  /**
-   * @param reportedStartTime The start of the time range to retrieve data for.
-   * @param reportedEndTime The end of the time range to retrieve data for.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  list(reportedStartTime: Date | string, reportedEndTime: Date | string, options: Models.UsageAggregatesListOptionalParams, callback: msRest.ServiceCallback<Models.UsageAggregationListResult>): void;
-  list(reportedStartTime: Date | string, reportedEndTime: Date | string, options?: Models.UsageAggregatesListOptionalParams | msRest.ServiceCallback<Models.UsageAggregationListResult>, callback?: msRest.ServiceCallback<Models.UsageAggregationListResult>): Promise<Models.UsageAggregatesListResponse> {
-    return this.client.sendOperationRequest(
-      {
+  public list(
+    reportedStartTime: Date,
+    reportedEndTime: Date,
+    options?: UsageAggregatesListOptionalParams
+  ): PagedAsyncIterableIterator<UsageAggregation> {
+    const iter = this.listPagingAll(
+      reportedStartTime,
+      reportedEndTime,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listPagingPage(reportedStartTime, reportedEndTime, options);
+      }
+    };
+  }
+
+  private async *listPagingPage(
+    reportedStartTime: Date,
+    reportedEndTime: Date,
+    options?: UsageAggregatesListOptionalParams
+  ): AsyncIterableIterator<UsageAggregation[]> {
+    let result = await this._list(reportedStartTime, reportedEndTime, options);
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listNext(
         reportedStartTime,
         reportedEndTime,
+        continuationToken,
         options
-      },
-      listOperationSpec,
-      callback) as Promise<Models.UsageAggregatesListResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listPagingAll(
+    reportedStartTime: Date,
+    reportedEndTime: Date,
+    options?: UsageAggregatesListOptionalParams
+  ): AsyncIterableIterator<UsageAggregation> {
+    for await (const page of this.listPagingPage(
+      reportedStartTime,
+      reportedEndTime,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
    * Query aggregated Azure subscription consumption data for a date range.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param reportedStartTime The start of the time range to retrieve data for.
-   * @param reportedEndTime The end of the time range to retrieve data for.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.UsageAggregatesListNextResponse>
-   */
-  listNext(nextPageLink: string, reportedStartTime: Date | string, reportedEndTime: Date | string, options?: Models.UsageAggregatesListNextOptionalParams): Promise<Models.UsageAggregatesListNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param reportedStartTime The start of the time range to retrieve data for.
    * @param reportedEndTime The end of the time range to retrieve data for.
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  listNext(nextPageLink: string, reportedStartTime: Date | string, reportedEndTime: Date | string, callback: msRest.ServiceCallback<Models.UsageAggregationListResult>): void;
+  private _list(
+    reportedStartTime: Date,
+    reportedEndTime: Date,
+    options?: UsageAggregatesListOptionalParams
+  ): Promise<UsageAggregatesListResponse> {
+    return this.client.sendOperationRequest(
+      { reportedStartTime, reportedEndTime, options },
+      listOperationSpec
+    );
+  }
+
   /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * ListNext
    * @param reportedStartTime The start of the time range to retrieve data for.
    * @param reportedEndTime The end of the time range to retrieve data for.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param nextLink The nextLink from the previous successful call to the List method.
+   * @param options The options parameters.
    */
-  listNext(nextPageLink: string, reportedStartTime: Date | string, reportedEndTime: Date | string, options: Models.UsageAggregatesListNextOptionalParams, callback: msRest.ServiceCallback<Models.UsageAggregationListResult>): void;
-  listNext(nextPageLink: string, reportedStartTime: Date | string, reportedEndTime: Date | string, options?: Models.UsageAggregatesListNextOptionalParams | msRest.ServiceCallback<Models.UsageAggregationListResult>, callback?: msRest.ServiceCallback<Models.UsageAggregationListResult>): Promise<Models.UsageAggregatesListNextResponse> {
+  private _listNext(
+    reportedStartTime: Date,
+    reportedEndTime: Date,
+    nextLink: string,
+    options?: UsageAggregatesListNextOptionalParams
+  ): Promise<UsageAggregatesListNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        reportedStartTime,
-        reportedEndTime,
-        options
-      },
-      listNextOperationSpec,
-      callback) as Promise<Models.UsageAggregatesListNextResponse>;
+      { reportedStartTime, reportedEndTime, nextLink, options },
+      listNextOperationSpec
+    );
   }
 }
-
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
+
+const listOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Commerce/UsageAggregates",
   httpMethod: "GET",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.Commerce/UsageAggregates",
-  urlParameters: [
-    Parameters.subscriptionId
-  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.UsageAggregationListResult
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
   queryParameters: [
     Parameters.reportedStartTime,
     Parameters.reportedEndTime,
@@ -110,9 +155,13 @@ const listOperationSpec: msRest.OperationSpec = {
     Parameters.continuationToken,
     Parameters.apiVersion
   ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  urlParameters: [Parameters.$host, Parameters.subscriptionId],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const listNextOperationSpec: coreClient.OperationSpec = {
+  path: "{nextLink}",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.UsageAggregationListResult
@@ -121,16 +170,6 @@ const listOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const listNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
-  path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
   queryParameters: [
     Parameters.reportedStartTime,
     Parameters.reportedEndTime,
@@ -139,16 +178,11 @@ const listNextOperationSpec: msRest.OperationSpec = {
     Parameters.continuationToken,
     Parameters.apiVersion
   ],
-  headerParameters: [
-    Parameters.acceptLanguage
+  urlParameters: [
+    Parameters.$host,
+    Parameters.subscriptionId,
+    Parameters.nextLink
   ],
-  responses: {
-    200: {
-      bodyMapper: Mappers.UsageAggregationListResult
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse
-    }
-  },
+  headerParameters: [Parameters.accept],
   serializer
 };

package/src/{models/usageAggregatesMappers.ts → operationsInterfaces/index.ts}

@@ -6,10 +6,5 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-export {
-  discriminators,
-  ErrorResponse,
-  InfoField,
-  UsageAggregation,
-  UsageAggregationListResult
-} from "../models/mappers";
+export * from "./usageAggregates";
+export * from "./rateCard";

package/src/operationsInterfaces/rateCard.ts

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+import { RateCardGetOptionalParams, RateCardGetResponse } from "../models";
+
+/** Interface representing a RateCard. */
+export interface RateCard {
+  /**
+   * Enables you to query for the resource/meter metadata and related prices used in a given subscription
+   * by Offer ID, Currency, Locale and Region. The metadata associated with the billing meters, including
+   * but not limited to service names, types, resources, units of measure, and regions, is subject to
+   * change at any time and without notice. If you intend to use this billing data in an automated
+   * fashion, please use the billing meter GUID to uniquely identify each billable item. If the billing
+   * meter GUID is scheduled to change due to a new billing model, you will be notified in advance of the
+   * change.
+   * @param filter The filter to apply on the operation. It ONLY supports the 'eq' and 'and' logical
+   *               operators at this time. All the 4 query parameters 'OfferDurableId',  'Currency', 'Locale', 'Region'
+   *               are required to be a part of the $filter.
+   * @param options The options parameters.
+   */
+  get(
+    filter: string,
+    options?: RateCardGetOptionalParams
+  ): Promise<RateCardGetResponse>;
+}

package/src/operationsInterfaces/usageAggregates.ts

@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { UsageAggregation, UsageAggregatesListOptionalParams } from "../models";
+
+/// <reference lib="esnext.asynciterable" />
+/** Interface representing a UsageAggregates. */
+export interface UsageAggregates {
+  /**
+   * Query aggregated Azure subscription consumption data for a date range.
+   * @param reportedStartTime The start of the time range to retrieve data for.
+   * @param reportedEndTime The end of the time range to retrieve data for.
+   * @param options The options parameters.
+   */
+  list(
+    reportedStartTime: Date,
+    reportedEndTime: Date,
+    options?: UsageAggregatesListOptionalParams
+  ): PagedAsyncIterableIterator<UsageAggregation>;
+}

package/src/usageManagementClient.ts

@@ -3,48 +3,76 @@
  * 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.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import { TokenCredential } from "@azure/core-auth";
-import * as Models from "./models";
-import * as Mappers from "./models/mappers";
-import * as operations from "./operations";
-import { UsageManagementClientContext } from "./usageManagementClientContext";
+import * as coreClient from "@azure/core-client";
+import * as coreAuth from "@azure/core-auth";
+import { UsageAggregatesImpl, RateCardImpl } from "./operations";
+import { UsageAggregates, RateCard } from "./operationsInterfaces";
+import { UsageManagementClientOptionalParams } from "./models";
 
-
-class UsageManagementClient extends UsageManagementClientContext {
-  // Operation groups
-  usageAggregates: operations.UsageAggregates;
-  rateCard: operations.RateCard;
+export class UsageManagementClient extends coreClient.ServiceClient {
+  $host: string;
+  apiVersion: string;
+  subscriptionId: string;
 
   /**
    * Initializes a new instance of the UsageManagementClient class.
-   * @param credentials Credentials needed for the client to connect to Azure. Credentials
-   * implementing the TokenCredential interface from the @azure/identity package are recommended. For
-   * more information about these credentials, see
-   * {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
-   * ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
-   * @azure/ms-rest-browserauth are also supported.
-   * @param subscriptionId It uniquely identifies Microsoft Azure subscription. The subscription ID
-   * forms part of the URI for every service call.
-   * @param [options] The parameter options
+   * @param credentials Subscription credentials which uniquely identify client subscription.
+   * @param subscriptionId It uniquely identifies Microsoft Azure subscription. The subscription ID forms
+   *                       part of the URI for every service call.
+   * @param options The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.UsageManagementClientOptions) {
-    super(credentials, subscriptionId, options);
-    this.usageAggregates = new operations.UsageAggregates(this);
-    this.rateCard = new operations.RateCard(this);
-  }
-}
+  constructor(
+    credentials: coreAuth.TokenCredential,
+    subscriptionId: string,
+    options?: UsageManagementClientOptionalParams
+  ) {
+    if (credentials === undefined) {
+      throw new Error("'credentials' cannot be null");
+    }
+    if (subscriptionId === undefined) {
+      throw new Error("'subscriptionId' cannot be null");
+    }
+
+    // Initializing default values for options
+    if (!options) {
+      options = {};
+    }
+    const defaults: UsageManagementClientOptionalParams = {
+      requestContentType: "application/json; charset=utf-8",
+      credential: credentials
+    };
 
-// Operation Specifications
+    const packageDetails = `azsdk-js-arm-commerce/4.0.0-beta.1`;
+    const userAgentPrefix =
+      options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+        : `${packageDetails}`;
 
-export {
-  UsageManagementClient,
-  UsageManagementClientContext,
-  Models as UsageManagementModels,
-  Mappers as UsageManagementMappers
-};
-export * from "./operations";
+    if (!options.credentialScopes) {
+      options.credentialScopes = ["https://management.azure.com/.default"];
+    }
+    const optionsWithDefaults = {
+      ...defaults,
+      ...options,
+      userAgentOptions: {
+        userAgentPrefix
+      },
+      baseUri: options.endpoint || "https://management.azure.com"
+    };
+    super(optionsWithDefaults);
+    // Parameter assignments
+    this.subscriptionId = subscriptionId;
+
+    // Assigning values to Constant parameters
+    this.$host = options.$host || "https://management.azure.com";
+    this.apiVersion = options.apiVersion || "2015-06-01-preview";
+    this.usageAggregates = new UsageAggregatesImpl(this);
+    this.rateCard = new RateCardImpl(this);
+  }
+
+  usageAggregates: UsageAggregates;
+  rateCard: RateCard;
+}

package/tsconfig.json

@@ -3,7 +3,7 @@
     "module": "es6",
     "moduleResolution": "node",
     "strict": true,
-    "target": "es5",
+    "target": "es6",
     "sourceMap": true,
     "declarationMap": true,
     "esModuleInterop": true,
@@ -11,9 +11,10 @@
     "forceConsistentCasingInFileNames": true,
     "lib": ["es6", "dom"],
     "declaration": true,
-    "outDir": "./esm",
-    "importHelpers": true
+    "outDir": "./dist-esm",
+    "importHelpers": true,
+    "paths": { "@azure/arm-commerce": ["./src/index"] }
   },
-  "include": ["./src/**/*.ts"],
+  "include": ["./src/**/*.ts", "./test/**/*.ts", "samples-dev/**/*.ts"],
   "exclude": ["node_modules"]
 }