@azure/arm-reservations 8.0.1-alpha.20230303.1 → 9.0.0

package/src/lroImpl.ts

@@ -6,29 +6,37 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { AbortSignalLike } from "@azure/abort-controller";
 import { LongRunningOperation, LroResponse } from "@azure/core-lro";
 
-export class LroImpl<T> implements LongRunningOperation<T> {
-  constructor(
-    private sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>,
-    private args: Record<string, unknown>,
-    private spec: {
-      readonly requestBody?: unknown;
-      readonly path?: string;
-      readonly httpMethod: string;
-    } & Record<string, any>,
-    public requestPath: string = spec.path!,
-    public requestMethod: string = spec.httpMethod
-  ) {}
-  public async sendInitialRequest(): Promise<LroResponse<T>> {
-    return this.sendOperationFn(this.args, this.spec);
-  }
-  public async sendPollRequest(path: string): Promise<LroResponse<T>> {
-    const { requestBody, ...restSpec } = this.spec;
-    return this.sendOperationFn(this.args, {
-      ...restSpec,
-      path,
-      httpMethod: "GET"
-    });
-  }
+export function createLroSpec<T>(inputs: {
+  sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>;
+  args: Record<string, unknown>;
+  spec: {
+    readonly requestBody?: unknown;
+    readonly path?: string;
+    readonly httpMethod: string;
+  } & Record<string, any>;
+}): LongRunningOperation<T> {
+  const { args, spec, sendOperationFn } = inputs;
+  return {
+    requestMethod: spec.httpMethod,
+    requestPath: spec.path!,
+    sendInitialRequest: () => sendOperationFn(args, spec),
+    sendPollRequest: (
+      path: string,
+      options?: { abortSignal?: AbortSignalLike }
+    ) => {
+      const { requestBody, ...restSpec } = spec;
+      return sendOperationFn(args, {
+        ...restSpec,
+        httpMethod: "GET",
+        path,
+        abortSignal: options?.abortSignal
+      });
+    }
+  };
 }

package/src/models/index.ts

@@ -121,6 +121,10 @@ export interface SkuProperty {
 export interface CatalogMsrp {
   /** Amount in pricing currency. Tax not included. */
   p1Y?: Price;
+  /** Amount in pricing currency. Tax not included. */
+  p3Y?: Price;
+  /** Amount in pricing currency. Tax not included. */
+  p5Y?: Price;
 }
 
 /** Pricing information containing the amount and the currency code */
@@ -196,7 +200,7 @@ export interface PurchaseRequest {
   displayName?: string;
   /** Type of the Applied Scope. */
   appliedScopeType?: AppliedScopeType;
-  /** List of the subscriptions that the benefit will be applied. Do not specify if AppliedScopeType is Shared. */
+  /** List of the subscriptions that the benefit will be applied. Do not specify if AppliedScopeType is Shared. This property will be deprecated and replaced by appliedScopeProperties instead for Single AppliedScopeType. */
   appliedScopes?: string[];
   /** Properties specific to applied scope type. Not required if not applicable. Required and need to provide tenantId and managementGroupId if AppliedScopeType is ManagementGroup */
   appliedScopeProperties?: AppliedScopeProperties;
@@ -610,7 +614,7 @@ export interface ReservationList {
 export interface Patch {
   /** Type of the Applied Scope. */
   appliedScopeType?: AppliedScopeType;
-  /** List of the subscriptions that the benefit will be applied. Do not specify if AppliedScopeType is Shared. */
+  /** List of the subscriptions that the benefit will be applied. Do not specify if AppliedScopeType is Shared. This property will be deprecated and replaced by appliedScopeProperties instead for Single AppliedScopeType. */
   appliedScopes?: string[];
   /** Properties specific to applied scope type. Not required if not applicable. Required and need to provide tenantId and managementGroupId if AppliedScopeType is ManagementGroup */
   appliedScopeProperties?: AppliedScopeProperties;
@@ -2621,7 +2625,7 @@ export interface ReturnPostOptionalParams extends coreClient.OperationOptions {
 }
 
 /** Contains response data for the post operation. */
-export type ReturnPostResponse = ReturnPostHeaders & RefundResponse;
+export type ReturnPostResponse = ReservationOrderResponse;
 
 /** Optional parameters. */
 export interface CalculateExchangePostOptionalParams

package/src/models/mappers.ts

@@ -322,6 +322,20 @@ export const CatalogMsrp: coreClient.CompositeMapper = {
           name: "Composite",
           className: "Price"
         }
+      },
+      p3Y: {
+        serializedName: "p3Y",
+        type: {
+          name: "Composite",
+          className: "Price"
+        }
+      },
+      p5Y: {
+        serializedName: "p5Y",
+        type: {
+          name: "Composite",
+          className: "Price"
+        }
       }
     }
   }

package/src/operations/calculateExchange.ts

@@ -11,8 +11,12 @@ import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { AzureReservationAPI } from "../azureReservationAPI";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
+import {
+  SimplePollerLike,
+  OperationState,
+  createHttpPoller
+} from "@azure/core-lro";
+import { createLroSpec } from "../lroImpl";
 import {
   CalculateExchangeRequest,
   CalculateExchangePostOptionalParams,
@@ -41,8 +45,8 @@ export class CalculateExchangeImpl implements CalculateExchange {
     body: CalculateExchangeRequest,
     options?: CalculateExchangePostOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<CalculateExchangePostResponse>,
+    SimplePollerLike<
+      OperationState<CalculateExchangePostResponse>,
       CalculateExchangePostResponse
     >
   > {
@@ -52,7 +56,7 @@ export class CalculateExchangeImpl implements CalculateExchange {
     ): Promise<CalculateExchangePostResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -85,15 +89,18 @@ export class CalculateExchangeImpl implements CalculateExchange {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { body, options },
-      postOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { body, options },
+      spec: postOperationSpec
+    });
+    const poller = await createHttpPoller<
+      CalculateExchangePostResponse,
+      OperationState<CalculateExchangePostResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;

package/src/operations/exchange.ts

@@ -11,8 +11,12 @@ import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { AzureReservationAPI } from "../azureReservationAPI";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
+import {
+  SimplePollerLike,
+  OperationState,
+  createHttpPoller
+} from "@azure/core-lro";
+import { createLroSpec } from "../lroImpl";
 import {
   ExchangeRequest,
   ExchangePostOptionalParams,
@@ -41,7 +45,7 @@ export class ExchangeImpl implements Exchange {
     body: ExchangeRequest,
     options?: ExchangePostOptionalParams
   ): Promise<
-    PollerLike<PollOperationState<ExchangePostResponse>, ExchangePostResponse>
+    SimplePollerLike<OperationState<ExchangePostResponse>, ExchangePostResponse>
   > {
     const directSendOperation = async (
       args: coreClient.OperationArguments,
@@ -49,7 +53,7 @@ export class ExchangeImpl implements Exchange {
     ): Promise<ExchangePostResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -82,15 +86,18 @@ export class ExchangeImpl implements Exchange {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { body, options },
-      postOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { body, options },
+      spec: postOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ExchangePostResponse,
+      OperationState<ExchangePostResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;

package/src/operations/quota.ts

@@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { AzureReservationAPI } from "../azureReservationAPI";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
+import {
+  SimplePollerLike,
+  OperationState,
+  createHttpPoller
+} from "@azure/core-lro";
+import { createLroSpec } from "../lroImpl";
 import {
   CurrentQuotaLimitBase,
   QuotaListNextOptionalParams,
@@ -178,8 +182,8 @@ export class QuotaImpl implements Quota {
     createQuotaRequest: CurrentQuotaLimitBase,
     options?: QuotaCreateOrUpdateOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<QuotaCreateOrUpdateResponse>,
+    SimplePollerLike<
+      OperationState<QuotaCreateOrUpdateResponse>,
       QuotaCreateOrUpdateResponse
     >
   > {
@@ -189,7 +193,7 @@ export class QuotaImpl implements Quota {
     ): Promise<QuotaCreateOrUpdateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -222,9 +226,9 @@ export class QuotaImpl implements Quota {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      {
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: {
         subscriptionId,
         providerId,
         location,
@@ -232,12 +236,15 @@ export class QuotaImpl implements Quota {
         createQuotaRequest,
         options
       },
-      createOrUpdateOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+      spec: createOrUpdateOperationSpec
+    });
+    const poller = await createHttpPoller<
+      QuotaCreateOrUpdateResponse,
+      OperationState<QuotaCreateOrUpdateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "original-uri"
+      resourceLocationConfig: "original-uri"
     });
     await poller.poll();
     return poller;
@@ -301,7 +308,7 @@ export class QuotaImpl implements Quota {
     createQuotaRequest: CurrentQuotaLimitBase,
     options?: QuotaUpdateOptionalParams
   ): Promise<
-    PollerLike<PollOperationState<QuotaUpdateResponse>, QuotaUpdateResponse>
+    SimplePollerLike<OperationState<QuotaUpdateResponse>, QuotaUpdateResponse>
   > {
     const directSendOperation = async (
       args: coreClient.OperationArguments,
@@ -309,7 +316,7 @@ export class QuotaImpl implements Quota {
     ): Promise<QuotaUpdateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -342,9 +349,9 @@ export class QuotaImpl implements Quota {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      {
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: {
         subscriptionId,
         providerId,
         location,
@@ -352,12 +359,15 @@ export class QuotaImpl implements Quota {
         createQuotaRequest,
         options
       },
-      updateOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+      spec: updateOperationSpec
+    });
+    const poller = await createHttpPoller<
+      QuotaUpdateResponse,
+      OperationState<QuotaUpdateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "original-uri"
+      resourceLocationConfig: "original-uri"
     });
     await poller.poll();
     return poller;

package/src/operations/reservation.ts

@@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { AzureReservationAPI } from "../azureReservationAPI";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
+import {
+  SimplePollerLike,
+  OperationState,
+  createHttpPoller
+} from "@azure/core-lro";
+import { createLroSpec } from "../lroImpl";
 import {
   ReservationResponse,
   ReservationListNextOptionalParams,
@@ -275,8 +279,8 @@ export class ReservationImpl implements Reservation {
     body: AvailableScopeRequest,
     options?: ReservationAvailableScopesOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<ReservationAvailableScopesResponse>,
+    SimplePollerLike<
+      OperationState<ReservationAvailableScopesResponse>,
       ReservationAvailableScopesResponse
     >
   > {
@@ -286,7 +290,7 @@ export class ReservationImpl implements Reservation {
     ): Promise<ReservationAvailableScopesResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -319,13 +323,16 @@ export class ReservationImpl implements Reservation {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { reservationOrderId, reservationId, body, options },
-      availableScopesOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { reservationOrderId, reservationId, body, options },
+      spec: availableScopesOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ReservationAvailableScopesResponse,
+      OperationState<ReservationAvailableScopesResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
     await poller.poll();
@@ -366,8 +373,8 @@ export class ReservationImpl implements Reservation {
     body: SplitRequest,
     options?: ReservationSplitOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<ReservationSplitResponse>,
+    SimplePollerLike<
+      OperationState<ReservationSplitResponse>,
       ReservationSplitResponse
     >
   > {
@@ -377,7 +384,7 @@ export class ReservationImpl implements Reservation {
     ): Promise<ReservationSplitResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -410,15 +417,18 @@ export class ReservationImpl implements Reservation {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { reservationOrderId, body, options },
-      splitOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { reservationOrderId, body, options },
+      spec: splitOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ReservationSplitResponse,
+      OperationState<ReservationSplitResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "location"
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;
@@ -451,8 +461,8 @@ export class ReservationImpl implements Reservation {
     body: MergeRequest,
     options?: ReservationMergeOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<ReservationMergeResponse>,
+    SimplePollerLike<
+      OperationState<ReservationMergeResponse>,
       ReservationMergeResponse
     >
   > {
@@ -462,7 +472,7 @@ export class ReservationImpl implements Reservation {
     ): Promise<ReservationMergeResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -495,15 +505,18 @@ export class ReservationImpl implements Reservation {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { reservationOrderId, body, options },
-      mergeOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { reservationOrderId, body, options },
+      spec: mergeOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ReservationMergeResponse,
+      OperationState<ReservationMergeResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "location"
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;
@@ -570,8 +583,8 @@ export class ReservationImpl implements Reservation {
     parameters: Patch,
     options?: ReservationUpdateOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<ReservationUpdateResponse>,
+    SimplePollerLike<
+      OperationState<ReservationUpdateResponse>,
       ReservationUpdateResponse
     >
   > {
@@ -581,7 +594,7 @@ export class ReservationImpl implements Reservation {
     ): Promise<ReservationUpdateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -614,15 +627,18 @@ export class ReservationImpl implements Reservation {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { reservationOrderId, reservationId, parameters, options },
-      updateOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { reservationOrderId, reservationId, parameters, options },
+      spec: updateOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ReservationUpdateResponse,
+      OperationState<ReservationUpdateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;

package/src/operations/reservationOrder.ts

@@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { AzureReservationAPI } from "../azureReservationAPI";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
+import {
+  SimplePollerLike,
+  OperationState,
+  createHttpPoller
+} from "@azure/core-lro";
+import { createLroSpec } from "../lroImpl";
 import {
   ReservationOrderResponse,
   ReservationOrderListNextOptionalParams,
@@ -136,8 +140,8 @@ export class ReservationOrderImpl implements ReservationOrder {
     body: PurchaseRequest,
     options?: ReservationOrderPurchaseOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<ReservationOrderPurchaseResponse>,
+    SimplePollerLike<
+      OperationState<ReservationOrderPurchaseResponse>,
       ReservationOrderPurchaseResponse
     >
   > {
@@ -147,7 +151,7 @@ export class ReservationOrderImpl implements ReservationOrder {
     ): Promise<ReservationOrderPurchaseResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -180,15 +184,18 @@ export class ReservationOrderImpl implements ReservationOrder {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { reservationOrderId, body, options },
-      purchaseOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { reservationOrderId, body, options },
+      spec: purchaseOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ReservationOrderPurchaseResponse,
+      OperationState<ReservationOrderPurchaseResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "location"
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;