@azure/arm-monitor 8.0.0-beta.2 → 8.0.0-beta.4

package/src/operations/alertRuleIncidents.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 { AlertRuleIncidents } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -15,9 +15,9 @@ import { MonitorClient } from "../monitorClient";
 import {
   Incident,
   AlertRuleIncidentsListByAlertRuleOptionalParams,
+  AlertRuleIncidentsListByAlertRuleResponse,
   AlertRuleIncidentsGetOptionalParams,
-  AlertRuleIncidentsGetResponse,
-  AlertRuleIncidentsListByAlertRuleResponse
+  AlertRuleIncidentsGetResponse
 } from "../models";
 
 /// <reference lib="esnext.asynciterable" />
@@ -56,11 +56,15 @@ export class AlertRuleIncidentsImpl implements AlertRuleIncidents {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByAlertRulePagingPage(
           resourceGroupName,
           ruleName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -69,13 +73,11 @@ export class AlertRuleIncidentsImpl implements AlertRuleIncidents {
   private async *listByAlertRulePagingPage(
     resourceGroupName: string,
     ruleName: string,
-    options?: AlertRuleIncidentsListByAlertRuleOptionalParams
+    options?: AlertRuleIncidentsListByAlertRuleOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<Incident[]> {
-    let result = await this._listByAlertRule(
-      resourceGroupName,
-      ruleName,
-      options
-    );
+    let result: AlertRuleIncidentsListByAlertRuleResponse;
+    result = await this._listByAlertRule(resourceGroupName, ruleName, options);
     yield result.value || [];
   }
 

package/src/operations/alertRules.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 { AlertRules } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -15,7 +15,9 @@ import { MonitorClient } from "../monitorClient";
 import {
   AlertRuleResource,
   AlertRulesListByResourceGroupOptionalParams,
+  AlertRulesListByResourceGroupResponse,
   AlertRulesListBySubscriptionOptionalParams,
+  AlertRulesListBySubscriptionResponse,
   AlertRulesCreateOrUpdateOptionalParams,
   AlertRulesCreateOrUpdateResponse,
   AlertRulesDeleteOptionalParams,
@@ -23,9 +25,7 @@ import {
   AlertRulesGetResponse,
   AlertRuleResourcePatch,
   AlertRulesUpdateOptionalParams,
-  AlertRulesUpdateResponse,
-  AlertRulesListByResourceGroupResponse,
-  AlertRulesListBySubscriptionResponse
+  AlertRulesUpdateResponse
 } from "../models";
 
 /// <reference lib="esnext.asynciterable" />
@@ -58,17 +58,26 @@ export class AlertRulesImpl implements AlertRules {
       [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?: AlertRulesListByResourceGroupOptionalParams
+    options?: AlertRulesListByResourceGroupOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<AlertRuleResource[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
+    let result: AlertRulesListByResourceGroupResponse;
+    result = await this._listByResourceGroup(resourceGroupName, options);
     yield result.value || [];
   }
 
@@ -99,16 +108,21 @@ export class AlertRulesImpl implements AlertRules {
       [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?: AlertRulesListBySubscriptionOptionalParams
+    options?: AlertRulesListBySubscriptionOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<AlertRuleResource[]> {
-    let result = await this._listBySubscription(options);
+    let result: AlertRulesListBySubscriptionResponse;
+    result = await this._listBySubscription(options);
     yield result.value || [];
   }
 

package/src/operations/autoscaleSettings.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 { AutoscaleSettings } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,9 +17,10 @@ import {
   AutoscaleSettingResource,
   AutoscaleSettingsListByResourceGroupNextOptionalParams,
   AutoscaleSettingsListByResourceGroupOptionalParams,
+  AutoscaleSettingsListByResourceGroupResponse,
   AutoscaleSettingsListBySubscriptionNextOptionalParams,
   AutoscaleSettingsListBySubscriptionOptionalParams,
-  AutoscaleSettingsListByResourceGroupResponse,
+  AutoscaleSettingsListBySubscriptionResponse,
   AutoscaleSettingsCreateOrUpdateOptionalParams,
   AutoscaleSettingsCreateOrUpdateResponse,
   AutoscaleSettingsDeleteOptionalParams,
@@ -27,7 +29,6 @@ import {
   AutoscaleSettingResourcePatch,
   AutoscaleSettingsUpdateOptionalParams,
   AutoscaleSettingsUpdateResponse,
-  AutoscaleSettingsListBySubscriptionResponse,
   AutoscaleSettingsListByResourceGroupNextResponse,
   AutoscaleSettingsListBySubscriptionNextResponse
 } from "../models";
@@ -62,19 +63,33 @@ export class AutoscaleSettingsImpl implements AutoscaleSettings {
       [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?: AutoscaleSettingsListByResourceGroupOptionalParams
+    options?: AutoscaleSettingsListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<AutoscaleSettingResource[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: AutoscaleSettingsListByResourceGroupResponse;
+    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,
@@ -82,7 +97,9 @@ export class AutoscaleSettingsImpl implements AutoscaleSettings {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -113,22 +130,34 @@ export class AutoscaleSettingsImpl implements AutoscaleSettings {
       [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?: AutoscaleSettingsListBySubscriptionOptionalParams
+    options?: AutoscaleSettingsListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<AutoscaleSettingResource[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: AutoscaleSettingsListBySubscriptionResponse;
+    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;
     }
   }
 
@@ -423,7 +452,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.AutoscaleErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.resourceGroupName,
@@ -444,7 +472,6 @@ const listBySubscriptionNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.AutoscaleErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,