@azure/arm-commerce 4.0.0-beta.2 → 4.0.0-beta.3

package/src/pagingHelper.ts

@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+export interface PageInfo {
+  continuationToken?: string;
+}
+
+const pageMap = new WeakMap<object, PageInfo>();
+
+/**
+ * Given a result page from a pageable operation, returns a
+ * continuation token that can be used to begin paging from
+ * that point later.
+ * @param page A result object from calling .byPage() on a paged operation.
+ * @returns The continuation token that can be passed into byPage().
+ */
+export function getContinuationToken(page: unknown): string | undefined {
+  if (typeof page !== "object" || page === null) {
+    return undefined;
+  }
+  return pageMap.get(page)?.continuationToken;
+}
+
+export function setContinuationToken(
+  page: unknown,
+  continuationToken: string | undefined
+): void {
+  if (typeof page !== "object" || page === null || !continuationToken) {
+    return;
+  }
+  const pageInfo = pageMap.get(page) ?? {};
+  pageInfo.continuationToken = continuationToken;
+  pageMap.set(page, pageInfo);
+}

package/src/usageManagementClient.ts

@@ -7,6 +7,12 @@
  */
 
 import * as coreClient from "@azure/core-client";
+import * as coreRestPipeline from "@azure/core-rest-pipeline";
+import {
+  PipelineRequest,
+  PipelineResponse,
+  SendRequest
+} from "@azure/core-rest-pipeline";
 import * as coreAuth from "@azure/core-auth";
 import { UsageAggregatesImpl, RateCardImpl } from "./operations";
 import { UsageAggregates, RateCard } from "./operationsInterfaces";
@@ -45,25 +51,54 @@ export class UsageManagementClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-commerce/4.0.0-beta.2`;
+    const packageDetails = `azsdk-js-arm-commerce/4.0.0-beta.3`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
         : `${packageDetails}`;
 
-    if (!options.credentialScopes) {
-      options.credentialScopes = ["https://management.azure.com/.default"];
-    }
     const optionsWithDefaults = {
       ...defaults,
       ...options,
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri:
+      endpoint:
         options.endpoint ?? options.baseUri ?? "https://management.azure.com"
     };
     super(optionsWithDefaults);
+
+    let bearerTokenAuthenticationPolicyFound: boolean = false;
+    if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
+      const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
+      bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
+        (pipelinePolicy) =>
+          pipelinePolicy.name ===
+          coreRestPipeline.bearerTokenAuthenticationPolicyName
+      );
+    }
+    if (
+      !options ||
+      !options.pipeline ||
+      options.pipeline.getOrderedPolicies().length == 0 ||
+      !bearerTokenAuthenticationPolicyFound
+    ) {
+      this.pipeline.removePolicy({
+        name: coreRestPipeline.bearerTokenAuthenticationPolicyName
+      });
+      this.pipeline.addPolicy(
+        coreRestPipeline.bearerTokenAuthenticationPolicy({
+          credential: credentials,
+          scopes:
+            optionsWithDefaults.credentialScopes ??
+            `${optionsWithDefaults.endpoint}/.default`,
+          challengeCallbacks: {
+            authorizeRequestOnChallenge:
+              coreClient.authorizeRequestOnClaimChallenge
+          }
+        })
+      );
+    }
     // Parameter assignments
     this.subscriptionId = subscriptionId;
 
@@ -72,6 +107,35 @@ export class UsageManagementClient extends coreClient.ServiceClient {
     this.apiVersion = options.apiVersion || "2015-06-01-preview";
     this.usageAggregates = new UsageAggregatesImpl(this);
     this.rateCard = new RateCardImpl(this);
+    this.addCustomApiVersionPolicy(options.apiVersion);
+  }
+
+  /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+  private addCustomApiVersionPolicy(apiVersion?: string) {
+    if (!apiVersion) {
+      return;
+    }
+    const apiVersionPolicy = {
+      name: "CustomApiVersionPolicy",
+      async sendRequest(
+        request: PipelineRequest,
+        next: SendRequest
+      ): Promise<PipelineResponse> {
+        const param = request.url.split("?");
+        if (param.length > 1) {
+          const newParams = param[1].split("&").map((item) => {
+            if (item.indexOf("api-version") > -1) {
+              return "api-version=" + apiVersion;
+            } else {
+              return item;
+            }
+          });
+          request.url = param[0] + "?" + newParams.join("&");
+        }
+        return next(request);
+      }
+    };
+    this.pipeline.addPolicy(apiVersionPolicy);
   }
 
   usageAggregates: UsageAggregates;

package/types/arm-commerce.d.ts

@@ -13,6 +13,15 @@ export declare interface ErrorResponse {
     message?: string;
 }
 
+/**
+ * Given a result page from a pageable operation, returns a
+ * continuation token that can be used to begin paging from
+ * that point later.
+ * @param page A result object from calling .byPage() on a paged operation.
+ * @returns The continuation token that can be passed into byPage().
+ */
+export declare function getContinuationToken(page: unknown): string | undefined;
+
 /** Key-value pairs of instance details in the legacy format. */
 export declare interface InfoField {
     /** Identifies the name of the instance provisioned by the user. */
@@ -46,7 +55,7 @@ export declare interface MeterInfo {
 }
 
 /** Indicates that a monetary commitment is required for this offer */
-export declare type MonetaryCommitment = OfferTermInfoAutoGenerated & {
+export declare interface MonetaryCommitment extends OfferTermInfoAutoGenerated {
     /** Polymorphic discriminator, which specifies the different types this object can be */
     name: "Monetary Commitment";
     /** The list of key/value pairs for the tiered meter rates, in the format 'key':'value' where key = price, and value = the corresponding discount percentage. This field is used only by offer terms of type 'Monetary Commitment'. */
@@ -55,17 +64,17 @@ export declare type MonetaryCommitment = OfferTermInfoAutoGenerated & {
     };
     /** An array of meter ids that are excluded from the given offer terms. */
     excludedMeterIds?: string[];
-};
+}
 
 /** Indicates that this is a monetary credit offer. */
-export declare type MonetaryCredit = OfferTermInfoAutoGenerated & {
+export declare interface MonetaryCredit extends OfferTermInfoAutoGenerated {
     /** Polymorphic discriminator, which specifies the different types this object can be */
     name: "Monetary Credit";
     /** The amount of credit provided under the terms of the given offer level. */
     credit?: number;
     /** An array of meter ids that are excluded from the given offer terms. */
     excludedMeterIds?: string[];
-};
+}
 
 /** Defines values for OfferTermInfo. */
 export declare type OfferTermInfo = "Recurring Charge" | "Monetary Commitment" | "Monetary Credit";
@@ -118,12 +127,12 @@ export declare interface RateCardQueryParameters {
 }
 
 /** Indicates a recurring charge is present for this offer. */
-export declare type RecurringCharge = OfferTermInfoAutoGenerated & {
+export declare interface RecurringCharge extends OfferTermInfoAutoGenerated {
     /** Polymorphic discriminator, which specifies the different types this object can be */
     name: "Recurring Charge";
     /** The amount of recurring charge as per the offer term. */
     recurringCharge?: number;
-};
+}
 
 /** Price and Metadata information for resources */
 export declare interface ResourceRateCardInfo {
@@ -230,6 +239,8 @@ export declare class UsageManagementClient extends coreClient.ServiceClient {
      * @param options The parameter options
      */
     constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: UsageManagementClientOptionalParams);
+    /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+    private addCustomApiVersionPolicy;
     usageAggregates: UsageAggregates;
     rateCard: RateCard;
 }

package/types/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.22.1"
+      "packageVersion": "7.33.6"
     }
   ]
 }