@azure/arm-mysql 5.0.2-alpha.20221101.1 → 5.1.0

package/src/operations/serverBasedPerformanceTier.ts

@@ -6,7 +6,7 @@
  * 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 { ServerBasedPerformanceTier } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -51,8 +51,16 @@ export class ServerBasedPerformanceTierImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, serverName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(
+          resourceGroupName,
+          serverName,
+          options,
+          settings
+        );
       }
     };
   }
@@ -60,9 +68,11 @@ export class ServerBasedPerformanceTierImpl
   private async *listPagingPage(
     resourceGroupName: string,
     serverName: string,
-    options?: ServerBasedPerformanceTierListOptionalParams
+    options?: ServerBasedPerformanceTierListOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<PerformanceTierProperties[]> {
-    let result = await this._list(resourceGroupName, serverName, options);
+    let result: ServerBasedPerformanceTierListResponse;
+    result = await this._list(resourceGroupName, serverName, options);
     yield result.value || [];
   }
 

package/src/operations/serverKeys.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 { ServerKeys } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -59,8 +60,16 @@ export class ServerKeysImpl implements ServerKeys {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, serverName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(
+          resourceGroupName,
+          serverName,
+          options,
+          settings
+        );
       }
     };
   }
@@ -68,11 +77,18 @@ export class ServerKeysImpl implements ServerKeys {
   private async *listPagingPage(
     resourceGroupName: string,
     serverName: string,
-    options?: ServerKeysListOptionalParams
+    options?: ServerKeysListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ServerKey[]> {
-    let result = await this._list(resourceGroupName, serverName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ServerKeysListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(resourceGroupName, serverName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         resourceGroupName,
@@ -81,7 +97,9 @@ export class ServerKeysImpl implements ServerKeys {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/serverSecurityAlertPolicies.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 { ServerSecurityAlertPolicies } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,12 +19,12 @@ import {
   ServerSecurityAlertPolicy,
   ServerSecurityAlertPoliciesListByServerNextOptionalParams,
   ServerSecurityAlertPoliciesListByServerOptionalParams,
+  ServerSecurityAlertPoliciesListByServerResponse,
   SecurityAlertPolicyName,
   ServerSecurityAlertPoliciesGetOptionalParams,
   ServerSecurityAlertPoliciesGetResponse,
   ServerSecurityAlertPoliciesCreateOrUpdateOptionalParams,
   ServerSecurityAlertPoliciesCreateOrUpdateResponse,
-  ServerSecurityAlertPoliciesListByServerResponse,
   ServerSecurityAlertPoliciesListByServerNextResponse
 } from "../models";
 
@@ -64,11 +65,15 @@ export class ServerSecurityAlertPoliciesImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByServerPagingPage(
           resourceGroupName,
           serverName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -77,15 +82,18 @@ export class ServerSecurityAlertPoliciesImpl
   private async *listByServerPagingPage(
     resourceGroupName: string,
     serverName: string,
-    options?: ServerSecurityAlertPoliciesListByServerOptionalParams
+    options?: ServerSecurityAlertPoliciesListByServerOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ServerSecurityAlertPolicy[]> {
-    let result = await this._listByServer(
-      resourceGroupName,
-      serverName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ServerSecurityAlertPoliciesListByServerResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByServer(resourceGroupName, serverName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByServerNext(
         resourceGroupName,
@@ -94,7 +102,9 @@ export class ServerSecurityAlertPoliciesImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/servers.ts

@@ -6,7 +6,7 @@
  * 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 { Servers } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -17,7 +17,9 @@ import { LroImpl } from "../lroImpl";
 import {
   Server,
   ServersListByResourceGroupOptionalParams,
+  ServersListByResourceGroupResponse,
   ServersListOptionalParams,
+  ServersListResponse,
   ServerForCreate,
   ServersCreateOptionalParams,
   ServersCreateResponse,
@@ -27,8 +29,6 @@ import {
   ServersDeleteOptionalParams,
   ServersGetOptionalParams,
   ServersGetResponse,
-  ServersListByResourceGroupResponse,
-  ServersListResponse,
   ServersRestartOptionalParams,
   ServersStartOptionalParams,
   ServersStopOptionalParams,
@@ -66,17 +66,26 @@ export class ServersImpl implements Servers {
       [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?: ServersListByResourceGroupOptionalParams
+    options?: ServersListByResourceGroupOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<Server[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
+    let result: ServersListByResourceGroupResponse;
+    result = await this._listByResourceGroup(resourceGroupName, options);
     yield result.value || [];
   }
 
@@ -107,16 +116,21 @@ export class ServersImpl implements Servers {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(options, settings);
       }
     };
   }
 
   private async *listPagingPage(
-    options?: ServersListOptionalParams
+    options?: ServersListOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<Server[]> {
-    let result = await this._list(options);
+    let result: ServersListResponse;
+    result = await this._list(options);
     yield result.value || [];
   }
 

package/src/operations/topQueryStatistics.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 { TopQueryStatistics } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -17,9 +18,9 @@ import {
   TopQueryStatisticsInput,
   TopQueryStatisticsListByServerNextOptionalParams,
   TopQueryStatisticsListByServerOptionalParams,
+  TopQueryStatisticsListByServerResponse,
   TopQueryStatisticsGetOptionalParams,
   TopQueryStatisticsGetResponse,
-  TopQueryStatisticsListByServerResponse,
   TopQueryStatisticsListByServerNextResponse
 } from "../models";
 
@@ -62,12 +63,16 @@ export class TopQueryStatisticsImpl implements TopQueryStatistics {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByServerPagingPage(
           resourceGroupName,
           serverName,
           parameters,
-          options
+          options,
+          settings
         );
       }
     };
@@ -77,16 +82,23 @@ export class TopQueryStatisticsImpl implements TopQueryStatistics {
     resourceGroupName: string,
     serverName: string,
     parameters: TopQueryStatisticsInput,
-    options?: TopQueryStatisticsListByServerOptionalParams
+    options?: TopQueryStatisticsListByServerOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<QueryStatistic[]> {
-    let result = await this._listByServer(
-      resourceGroupName,
-      serverName,
-      parameters,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: TopQueryStatisticsListByServerResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByServer(
+        resourceGroupName,
+        serverName,
+        parameters,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByServerNext(
         resourceGroupName,
@@ -96,7 +108,9 @@ export class TopQueryStatisticsImpl implements TopQueryStatistics {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/virtualNetworkRules.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 { VirtualNetworkRules } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,12 +19,12 @@ import {
   VirtualNetworkRule,
   VirtualNetworkRulesListByServerNextOptionalParams,
   VirtualNetworkRulesListByServerOptionalParams,
+  VirtualNetworkRulesListByServerResponse,
   VirtualNetworkRulesGetOptionalParams,
   VirtualNetworkRulesGetResponse,
   VirtualNetworkRulesCreateOrUpdateOptionalParams,
   VirtualNetworkRulesCreateOrUpdateResponse,
   VirtualNetworkRulesDeleteOptionalParams,
-  VirtualNetworkRulesListByServerResponse,
   VirtualNetworkRulesListByServerNextResponse
 } from "../models";
 
@@ -63,11 +64,15 @@ export class VirtualNetworkRulesImpl implements VirtualNetworkRules {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByServerPagingPage(
           resourceGroupName,
           serverName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -76,15 +81,18 @@ export class VirtualNetworkRulesImpl implements VirtualNetworkRules {
   private async *listByServerPagingPage(
     resourceGroupName: string,
     serverName: string,
-    options?: VirtualNetworkRulesListByServerOptionalParams
+    options?: VirtualNetworkRulesListByServerOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<VirtualNetworkRule[]> {
-    let result = await this._listByServer(
-      resourceGroupName,
-      serverName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: VirtualNetworkRulesListByServerResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByServer(resourceGroupName, serverName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByServerNext(
         resourceGroupName,
@@ -93,7 +101,9 @@ export class VirtualNetworkRulesImpl implements VirtualNetworkRules {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/waitStatistics.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 { WaitStatistics } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -17,9 +18,9 @@ import {
   WaitStatisticsInput,
   WaitStatisticsListByServerNextOptionalParams,
   WaitStatisticsListByServerOptionalParams,
+  WaitStatisticsListByServerResponse,
   WaitStatisticsGetOptionalParams,
   WaitStatisticsGetResponse,
-  WaitStatisticsListByServerResponse,
   WaitStatisticsListByServerNextResponse
 } from "../models";
 
@@ -62,12 +63,16 @@ export class WaitStatisticsImpl implements WaitStatistics {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByServerPagingPage(
           resourceGroupName,
           serverName,
           parameters,
-          options
+          options,
+          settings
         );
       }
     };
@@ -77,16 +82,23 @@ export class WaitStatisticsImpl implements WaitStatistics {
     resourceGroupName: string,
     serverName: string,
     parameters: WaitStatisticsInput,
-    options?: WaitStatisticsListByServerOptionalParams
+    options?: WaitStatisticsListByServerOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<WaitStatistic[]> {
-    let result = await this._listByServer(
-      resourceGroupName,
-      serverName,
-      parameters,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: WaitStatisticsListByServerResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByServer(
+        resourceGroupName,
+        serverName,
+        parameters,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByServerNext(
         resourceGroupName,
@@ -96,7 +108,9 @@ export class WaitStatisticsImpl implements WaitStatistics {
         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);
+}