@azure/arm-resourcemover 2.1.1-alpha.20231023.1 → 2.2.0

package/src/operations/moveCollections.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 { ResourceMoverServiceAPI } from "../resourceMoverServiceAPI";
-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 {
   MoveCollection,
   MoveCollectionsListMoveCollectionsBySubscriptionNextOptionalParams,
@@ -244,8 +248,8 @@ export class MoveCollectionsImpl implements MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsDeleteOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsDeleteResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsDeleteResponse>,
       MoveCollectionsDeleteResponse
     >
   > {
@@ -255,7 +259,7 @@ export class MoveCollectionsImpl implements MoveCollections {
     ): Promise<MoveCollectionsDeleteResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -288,15 +292,18 @@ export class MoveCollectionsImpl implements MoveCollections {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, options },
-      deleteOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, moveCollectionName, options },
+      spec: deleteOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveCollectionsDeleteResponse,
+      OperationState<MoveCollectionsDeleteResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;
@@ -352,8 +359,8 @@ export class MoveCollectionsImpl implements MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsPrepareOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsPrepareResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsPrepareResponse>,
       MoveCollectionsPrepareResponse
     >
   > {
@@ -363,7 +370,7 @@ export class MoveCollectionsImpl implements MoveCollections {
     ): Promise<MoveCollectionsPrepareResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -396,15 +403,18 @@ export class MoveCollectionsImpl implements MoveCollections {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, options },
-      prepareOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, moveCollectionName, options },
+      spec: prepareOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveCollectionsPrepareResponse,
+      OperationState<MoveCollectionsPrepareResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;
@@ -446,8 +456,8 @@ export class MoveCollectionsImpl implements MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsInitiateMoveOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsInitiateMoveResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsInitiateMoveResponse>,
       MoveCollectionsInitiateMoveResponse
     >
   > {
@@ -457,7 +467,7 @@ export class MoveCollectionsImpl implements MoveCollections {
     ): Promise<MoveCollectionsInitiateMoveResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -490,15 +500,18 @@ export class MoveCollectionsImpl implements MoveCollections {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, options },
-      initiateMoveOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, moveCollectionName, options },
+      spec: initiateMoveOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveCollectionsInitiateMoveResponse,
+      OperationState<MoveCollectionsInitiateMoveResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;
@@ -540,8 +553,8 @@ export class MoveCollectionsImpl implements MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsCommitOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsCommitResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsCommitResponse>,
       MoveCollectionsCommitResponse
     >
   > {
@@ -551,7 +564,7 @@ export class MoveCollectionsImpl implements MoveCollections {
     ): Promise<MoveCollectionsCommitResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -584,15 +597,18 @@ export class MoveCollectionsImpl implements MoveCollections {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, options },
-      commitOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, moveCollectionName, options },
+      spec: commitOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveCollectionsCommitResponse,
+      OperationState<MoveCollectionsCommitResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;
@@ -634,8 +650,8 @@ export class MoveCollectionsImpl implements MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsDiscardOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsDiscardResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsDiscardResponse>,
       MoveCollectionsDiscardResponse
     >
   > {
@@ -645,7 +661,7 @@ export class MoveCollectionsImpl implements MoveCollections {
     ): Promise<MoveCollectionsDiscardResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -678,15 +694,18 @@ export class MoveCollectionsImpl implements MoveCollections {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, options },
-      discardOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, moveCollectionName, options },
+      spec: discardOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveCollectionsDiscardResponse,
+      OperationState<MoveCollectionsDiscardResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;
@@ -725,8 +744,8 @@ export class MoveCollectionsImpl implements MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsResolveDependenciesOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsResolveDependenciesResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsResolveDependenciesResponse>,
       MoveCollectionsResolveDependenciesResponse
     >
   > {
@@ -736,7 +755,7 @@ export class MoveCollectionsImpl implements MoveCollections {
     ): Promise<MoveCollectionsResolveDependenciesResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -769,15 +788,18 @@ export class MoveCollectionsImpl implements MoveCollections {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, options },
-      resolveDependenciesOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, moveCollectionName, options },
+      spec: resolveDependenciesOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveCollectionsResolveDependenciesResponse,
+      OperationState<MoveCollectionsResolveDependenciesResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;
@@ -815,8 +837,8 @@ export class MoveCollectionsImpl implements MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsBulkRemoveOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsBulkRemoveResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsBulkRemoveResponse>,
       MoveCollectionsBulkRemoveResponse
     >
   > {
@@ -826,7 +848,7 @@ export class MoveCollectionsImpl implements MoveCollections {
     ): Promise<MoveCollectionsBulkRemoveResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -859,15 +881,18 @@ export class MoveCollectionsImpl implements MoveCollections {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, options },
-      bulkRemoveOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, moveCollectionName, options },
+      spec: bulkRemoveOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveCollectionsBulkRemoveResponse,
+      OperationState<MoveCollectionsBulkRemoveResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;

package/src/operations/moveResources.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 { ResourceMoverServiceAPI } from "../resourceMoverServiceAPI";
-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 {
   MoveResource,
   MoveResourcesListNextOptionalParams,
@@ -152,8 +156,8 @@ export class MoveResourcesImpl implements MoveResources {
     moveResourceName: string,
     options?: MoveResourcesCreateOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveResourcesCreateResponse>,
+    SimplePollerLike<
+      OperationState<MoveResourcesCreateResponse>,
       MoveResourcesCreateResponse
     >
   > {
@@ -163,7 +167,7 @@ export class MoveResourcesImpl implements MoveResources {
     ): Promise<MoveResourcesCreateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -196,15 +200,23 @@ export class MoveResourcesImpl implements MoveResources {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, moveResourceName, options },
-      createOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: {
+        resourceGroupName,
+        moveCollectionName,
+        moveResourceName,
+        options
+      },
+      spec: createOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveResourcesCreateResponse,
+      OperationState<MoveResourcesCreateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;
@@ -245,8 +257,8 @@ export class MoveResourcesImpl implements MoveResources {
     moveResourceName: string,
     options?: MoveResourcesDeleteOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveResourcesDeleteResponse>,
+    SimplePollerLike<
+      OperationState<MoveResourcesDeleteResponse>,
       MoveResourcesDeleteResponse
     >
   > {
@@ -256,7 +268,7 @@ export class MoveResourcesImpl implements MoveResources {
     ): Promise<MoveResourcesDeleteResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -289,15 +301,23 @@ export class MoveResourcesImpl implements MoveResources {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, moveCollectionName, moveResourceName, options },
-      deleteOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: {
+        resourceGroupName,
+        moveCollectionName,
+        moveResourceName,
+        options
+      },
+      spec: deleteOperationSpec
+    });
+    const poller = await createHttpPoller<
+      MoveResourcesDeleteResponse,
+      OperationState<MoveResourcesDeleteResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "azure-async-operation"
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;

package/src/operationsInterfaces/moveCollections.ts

@@ -7,7 +7,7 @@
  */
 
 import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
+import { SimplePollerLike, OperationState } from "@azure/core-lro";
 import {
   MoveCollection,
   MoveCollectionsListMoveCollectionsBySubscriptionOptionalParams,
@@ -88,8 +88,8 @@ export interface MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsDeleteOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsDeleteResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsDeleteResponse>,
       MoveCollectionsDeleteResponse
     >
   >;
@@ -129,8 +129,8 @@ export interface MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsPrepareOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsPrepareResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsPrepareResponse>,
       MoveCollectionsPrepareResponse
     >
   >;
@@ -162,8 +162,8 @@ export interface MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsInitiateMoveOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsInitiateMoveResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsInitiateMoveResponse>,
       MoveCollectionsInitiateMoveResponse
     >
   >;
@@ -195,8 +195,8 @@ export interface MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsCommitOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsCommitResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsCommitResponse>,
       MoveCollectionsCommitResponse
     >
   >;
@@ -228,8 +228,8 @@ export interface MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsDiscardOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsDiscardResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsDiscardResponse>,
       MoveCollectionsDiscardResponse
     >
   >;
@@ -258,8 +258,8 @@ export interface MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsResolveDependenciesOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsResolveDependenciesResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsResolveDependenciesResponse>,
       MoveCollectionsResolveDependenciesResponse
     >
   >;
@@ -287,8 +287,8 @@ export interface MoveCollections {
     moveCollectionName: string,
     options?: MoveCollectionsBulkRemoveOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveCollectionsBulkRemoveResponse>,
+    SimplePollerLike<
+      OperationState<MoveCollectionsBulkRemoveResponse>,
       MoveCollectionsBulkRemoveResponse
     >
   >;

package/src/operationsInterfaces/moveResources.ts

@@ -7,7 +7,7 @@
  */
 
 import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
+import { SimplePollerLike, OperationState } from "@azure/core-lro";
 import {
   MoveResource,
   MoveResourcesListOptionalParams,
@@ -46,8 +46,8 @@ export interface MoveResources {
     moveResourceName: string,
     options?: MoveResourcesCreateOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveResourcesCreateResponse>,
+    SimplePollerLike<
+      OperationState<MoveResourcesCreateResponse>,
       MoveResourcesCreateResponse
     >
   >;
@@ -77,8 +77,8 @@ export interface MoveResources {
     moveResourceName: string,
     options?: MoveResourcesDeleteOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<MoveResourcesDeleteResponse>,
+    SimplePollerLike<
+      OperationState<MoveResourcesDeleteResponse>,
       MoveResourcesDeleteResponse
     >
   >;

package/src/resourceMoverServiceAPI.ts

@@ -30,7 +30,7 @@ import { ResourceMoverServiceAPIOptionalParams } from "./models";
 
 export class ResourceMoverServiceAPI extends coreClient.ServiceClient {
   $host: string;
-  subscriptionId: string;
+  subscriptionId?: string;
   apiVersion: string;
 
   /**
@@ -43,12 +43,26 @@ export class ResourceMoverServiceAPI extends coreClient.ServiceClient {
     credentials: coreAuth.TokenCredential,
     subscriptionId: string,
     options?: ResourceMoverServiceAPIOptionalParams
+  );
+  constructor(
+    credentials: coreAuth.TokenCredential,
+    options?: ResourceMoverServiceAPIOptionalParams
+  );
+  constructor(
+    credentials: coreAuth.TokenCredential,
+    subscriptionIdOrOptions?: ResourceMoverServiceAPIOptionalParams | string,
+    options?: ResourceMoverServiceAPIOptionalParams
   ) {
     if (credentials === undefined) {
       throw new Error("'credentials' cannot be null");
     }
-    if (subscriptionId === undefined) {
-      throw new Error("'subscriptionId' cannot be null");
+
+    let subscriptionId: string | undefined;
+
+    if (typeof subscriptionIdOrOptions === "string") {
+      subscriptionId = subscriptionIdOrOptions;
+    } else if (typeof subscriptionIdOrOptions === "object") {
+      options = subscriptionIdOrOptions;
     }
 
     // Initializing default values for options
@@ -60,7 +74,7 @@ export class ResourceMoverServiceAPI extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-resourcemover/2.1.1`;
+    const packageDetails = `azsdk-js-arm-resourcemover/2.2.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -113,7 +127,7 @@ export class ResourceMoverServiceAPI extends coreClient.ServiceClient {
 
     // Assigning values to Constant parameters
     this.$host = options.$host || "https://management.azure.com";
-    this.apiVersion = options.apiVersion || "2021-08-01";
+    this.apiVersion = options.apiVersion || "2023-08-01";
     this.moveCollections = new MoveCollectionsImpl(this);
     this.moveResources = new MoveResourcesImpl(this);
     this.unresolvedDependencies = new UnresolvedDependenciesImpl(this);