@azure/arm-datamigration 3.0.0-beta.1 → 3.0.0-beta.3

package/src/operations/sqlMigrationServices.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { SqlMigrationServices } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,11 +19,14 @@ import {
   SqlMigrationService,
   SqlMigrationServicesListByResourceGroupNextOptionalParams,
   SqlMigrationServicesListByResourceGroupOptionalParams,
+  SqlMigrationServicesListByResourceGroupResponse,
   DatabaseMigration,
   SqlMigrationServicesListMigrationsNextOptionalParams,
   SqlMigrationServicesListMigrationsOptionalParams,
+  SqlMigrationServicesListMigrationsResponse,
   SqlMigrationServicesListBySubscriptionNextOptionalParams,
   SqlMigrationServicesListBySubscriptionOptionalParams,
+  SqlMigrationServicesListBySubscriptionResponse,
   SqlMigrationServicesGetOptionalParams,
   SqlMigrationServicesGetResponse,
   SqlMigrationServicesCreateOrUpdateOptionalParams,
@@ -31,7 +35,6 @@ import {
   SqlMigrationServiceUpdate,
   SqlMigrationServicesUpdateOptionalParams,
   SqlMigrationServicesUpdateResponse,
-  SqlMigrationServicesListByResourceGroupResponse,
   SqlMigrationServicesListAuthKeysOptionalParams,
   SqlMigrationServicesListAuthKeysResponse,
   RegenAuthKeys,
@@ -40,10 +43,8 @@ import {
   DeleteNode,
   SqlMigrationServicesDeleteNodeOptionalParams,
   SqlMigrationServicesDeleteNodeResponse,
-  SqlMigrationServicesListMigrationsResponse,
   SqlMigrationServicesListMonitoringDataOptionalParams,
   SqlMigrationServicesListMonitoringDataResponse,
-  SqlMigrationServicesListBySubscriptionResponse,
   SqlMigrationServicesListByResourceGroupNextResponse,
   SqlMigrationServicesListMigrationsNextResponse,
   SqlMigrationServicesListBySubscriptionNextResponse
@@ -80,19 +81,33 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listByResourceGroupPagingPage(resourceGroupName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listByResourceGroupPagingPage(
+          resourceGroupName,
+          options,
+          settings
+        );
       }
     };
   }
 
   private async *listByResourceGroupPagingPage(
     resourceGroupName: string,
-    options?: SqlMigrationServicesListByResourceGroupOptionalParams
+    options?: SqlMigrationServicesListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<SqlMigrationService[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SqlMigrationServicesListByResourceGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByResourceGroup(resourceGroupName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByResourceGroupNext(
         resourceGroupName,
@@ -100,7 +115,9 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -140,11 +157,15 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listMigrationsPagingPage(
           resourceGroupName,
           sqlMigrationServiceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -153,15 +174,22 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
   private async *listMigrationsPagingPage(
     resourceGroupName: string,
     sqlMigrationServiceName: string,
-    options?: SqlMigrationServicesListMigrationsOptionalParams
+    options?: SqlMigrationServicesListMigrationsOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<DatabaseMigration[]> {
-    let result = await this._listMigrations(
-      resourceGroupName,
-      sqlMigrationServiceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SqlMigrationServicesListMigrationsResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listMigrations(
+        resourceGroupName,
+        sqlMigrationServiceName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listMigrationsNext(
         resourceGroupName,
@@ -170,7 +198,9 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -203,22 +233,34 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listBySubscriptionPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listBySubscriptionPagingPage(options, settings);
       }
     };
   }
 
   private async *listBySubscriptionPagingPage(
-    options?: SqlMigrationServicesListBySubscriptionOptionalParams
+    options?: SqlMigrationServicesListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<SqlMigrationService[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SqlMigrationServicesListBySubscriptionResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listBySubscription(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listBySubscriptionNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -311,10 +353,12 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
       { resourceGroupName, sqlMigrationServiceName, parameters, options },
       createOrUpdateOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**
@@ -396,10 +440,12 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
       { resourceGroupName, sqlMigrationServiceName, options },
       deleteOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**
@@ -485,10 +531,12 @@ export class SqlMigrationServicesImpl implements SqlMigrationServices {
       { resourceGroupName, sqlMigrationServiceName, parameters, options },
       updateOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**

package/src/operations/tasks.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { Tasks } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -73,12 +74,16 @@ export class TasksImpl implements Tasks {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listPagingPage(
           groupName,
           serviceName,
           projectName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -88,11 +93,18 @@ export class TasksImpl implements Tasks {
     groupName: string,
     serviceName: string,
     projectName: string,
-    options?: TasksListOptionalParams
+    options?: TasksListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ProjectTask[]> {
-    let result = await this._list(groupName, serviceName, projectName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: TasksListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(groupName, serviceName, projectName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         groupName,
@@ -102,7 +114,9 @@ export class TasksImpl implements Tasks {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/usages.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { Usages } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -51,23 +52,35 @@ export class UsagesImpl implements Usages {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(location, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(location, options, settings);
       }
     };
   }
 
   private async *listPagingPage(
     location: string,
-    options?: UsagesListOptionalParams
+    options?: UsagesListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Quota[]> {
-    let result = await this._list(location, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: UsagesListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(location, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(location, continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

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/tsconfig.json

@@ -9,12 +9,25 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
-    "lib": ["es6", "dom"],
+    "lib": [
+      "es6",
+      "dom"
+    ],
     "declaration": true,
     "outDir": "./dist-esm",
     "importHelpers": true,
-    "paths": { "@azure/arm-datamigration": ["./src/index"] }
+    "paths": {
+      "@azure/arm-datamigration": [
+        "./src/index"
+      ]
+    }
   },
-  "include": ["./src/**/*.ts", "./test/**/*.ts", "samples-dev/**/*.ts"],
-  "exclude": ["node_modules"]
-}
+  "include": [
+    "./src/**/*.ts",
+    "./test/**/*.ts",
+    "samples-dev/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}