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

package/src/models/parameters.ts

@@ -25,8 +25,8 @@ import {
   EnableRequest as EnableRequestMapper,
   MetricAlertResource as MetricAlertResourceMapper,
   MetricAlertResourcePatch as MetricAlertResourcePatchMapper,
-  LogSearchRuleResource as LogSearchRuleResourceMapper,
-  LogSearchRuleResourcePatch as LogSearchRuleResourcePatchMapper,
+  ScheduledQueryRuleResource as ScheduledQueryRuleResourceMapper,
+  ScheduledQueryRuleResourcePatch as ScheduledQueryRuleResourcePatchMapper,
   AzureMonitorPrivateLinkScope as AzureMonitorPrivateLinkScopeMapper,
   TagsResource as TagsResourceMapper,
   PrivateEndpointConnection as PrivateEndpointConnectionMapper,
@@ -36,7 +36,9 @@ import {
   DataCollectionEndpointResource as DataCollectionEndpointResourceMapper,
   ResourceForUpdate as ResourceForUpdateMapper,
   DataCollectionRuleAssociationProxyOnlyResource as DataCollectionRuleAssociationProxyOnlyResourceMapper,
-  DataCollectionRuleResource as DataCollectionRuleResourceMapper
+  DataCollectionRuleResource as DataCollectionRuleResourceMapper,
+  AzureMonitorWorkspaceResource as AzureMonitorWorkspaceResourceMapper,
+  AzureMonitorWorkspaceResourceForUpdate as AzureMonitorWorkspaceResourceForUpdateMapper
 } from "../models/mappers";
 
 export const accept: OperationParameter = {
@@ -554,15 +556,10 @@ export const statusName: OperationURLParameter = {
   }
 };
 
-export const parameters6: OperationParameter = {
-  parameterPath: "parameters",
-  mapper: LogSearchRuleResourceMapper
-};
-
 export const apiVersion8: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2018-04-16",
+    defaultValue: "2022-08-01-preview",
     isConstant: true,
     serializedName: "api-version",
     type: {
@@ -571,9 +568,14 @@ export const apiVersion8: OperationQueryParameter = {
   }
 };
 
+export const parameters6: OperationParameter = {
+  parameterPath: "parameters",
+  mapper: ScheduledQueryRuleResourceMapper
+};
+
 export const parameters7: OperationParameter = {
   parameterPath: "parameters",
-  mapper: LogSearchRuleResourcePatchMapper
+  mapper: ScheduledQueryRuleResourcePatchMapper
 };
 
 export const apiVersion9: OperationQueryParameter = {
@@ -798,3 +800,39 @@ export const body3: OperationParameter = {
   parameterPath: ["options", "body"],
   mapper: DataCollectionRuleResourceMapper
 };
+
+export const apiVersion14: OperationQueryParameter = {
+  parameterPath: "apiVersion",
+  mapper: {
+    defaultValue: "2021-06-03-preview",
+    isConstant: true,
+    serializedName: "api-version",
+    type: {
+      name: "String"
+    }
+  }
+};
+
+export const azureMonitorWorkspaceName: OperationURLParameter = {
+  parameterPath: "azureMonitorWorkspaceName",
+  mapper: {
+    constraints: {
+      Pattern: new RegExp("^(?!-)[a-zA-Z0-9-]+[^-]$")
+    },
+    serializedName: "azureMonitorWorkspaceName",
+    required: true,
+    type: {
+      name: "String"
+    }
+  }
+};
+
+export const azureMonitorWorkspaceProperties: OperationParameter = {
+  parameterPath: "azureMonitorWorkspaceProperties",
+  mapper: AzureMonitorWorkspaceResourceMapper
+};
+
+export const azureMonitorWorkspaceProperties1: OperationParameter = {
+  parameterPath: ["options", "azureMonitorWorkspaceProperties"],
+  mapper: AzureMonitorWorkspaceResourceForUpdateMapper
+};

package/src/monitorClient.ts

@@ -23,7 +23,7 @@ import {
   EventCategoriesImpl,
   TenantActivityLogsImpl,
   MetricDefinitionsImpl,
-  MetricsImpl,
+  MetricsOperationsImpl,
   BaselinesImpl,
   MetricAlertsImpl,
   MetricAlertsStatusImpl,
@@ -38,7 +38,9 @@ import {
   ActivityLogAlertsImpl,
   DataCollectionEndpointsImpl,
   DataCollectionRuleAssociationsImpl,
-  DataCollectionRulesImpl
+  DataCollectionRulesImpl,
+  AzureMonitorWorkspacesImpl,
+  MonitorOperationsImpl
 } from "./operations";
 import {
   AutoscaleSettings,
@@ -54,7 +56,7 @@ import {
   EventCategories,
   TenantActivityLogs,
   MetricDefinitions,
-  Metrics,
+  MetricsOperations,
   Baselines,
   MetricAlerts,
   MetricAlertsStatus,
@@ -69,7 +71,9 @@ import {
   ActivityLogAlerts,
   DataCollectionEndpoints,
   DataCollectionRuleAssociations,
-  DataCollectionRules
+  DataCollectionRules,
+  AzureMonitorWorkspaces,
+  MonitorOperations
 } from "./operationsInterfaces";
 import { MonitorClientOptionalParams } from "./models";
 
@@ -104,22 +108,19 @@ export class MonitorClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-monitor/8.0.0-beta.2`;
+    const packageDetails = `azsdk-js-arm-monitor/8.0.0-beta.4`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
         : `${packageDetails}`;
 
-    if (!options.credentialScopes) {
-      options.credentialScopes = ["https://management.azure.com/.default"];
-    }
     const optionsWithDefaults = {
       ...defaults,
       ...options,
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri:
+      endpoint:
         options.endpoint ?? options.baseUri ?? "https://management.azure.com"
     };
     super(optionsWithDefaults);
@@ -145,7 +146,9 @@ export class MonitorClient extends coreClient.ServiceClient {
       this.pipeline.addPolicy(
         coreRestPipeline.bearerTokenAuthenticationPolicy({
           credential: credentials,
-          scopes: `${optionsWithDefaults.credentialScopes}`,
+          scopes:
+            optionsWithDefaults.credentialScopes ??
+            `${optionsWithDefaults.endpoint}/.default`,
           challengeCallbacks: {
             authorizeRequestOnChallenge:
               coreClient.authorizeRequestOnClaimChallenge
@@ -171,7 +174,7 @@ export class MonitorClient extends coreClient.ServiceClient {
     this.eventCategories = new EventCategoriesImpl(this);
     this.tenantActivityLogs = new TenantActivityLogsImpl(this);
     this.metricDefinitions = new MetricDefinitionsImpl(this);
-    this.metrics = new MetricsImpl(this);
+    this.metricsOperations = new MetricsOperationsImpl(this);
     this.baselines = new BaselinesImpl(this);
     this.metricAlerts = new MetricAlertsImpl(this);
     this.metricAlertsStatus = new MetricAlertsStatusImpl(this);
@@ -191,6 +194,8 @@ export class MonitorClient extends coreClient.ServiceClient {
       this
     );
     this.dataCollectionRules = new DataCollectionRulesImpl(this);
+    this.azureMonitorWorkspaces = new AzureMonitorWorkspacesImpl(this);
+    this.monitorOperations = new MonitorOperationsImpl(this);
   }
 
   autoscaleSettings: AutoscaleSettings;
@@ -206,7 +211,7 @@ export class MonitorClient extends coreClient.ServiceClient {
   eventCategories: EventCategories;
   tenantActivityLogs: TenantActivityLogs;
   metricDefinitions: MetricDefinitions;
-  metrics: Metrics;
+  metricsOperations: MetricsOperations;
   baselines: Baselines;
   metricAlerts: MetricAlerts;
   metricAlertsStatus: MetricAlertsStatus;
@@ -222,4 +227,6 @@ export class MonitorClient extends coreClient.ServiceClient {
   dataCollectionEndpoints: DataCollectionEndpoints;
   dataCollectionRuleAssociations: DataCollectionRuleAssociations;
   dataCollectionRules: DataCollectionRules;
+  azureMonitorWorkspaces: AzureMonitorWorkspaces;
+  monitorOperations: MonitorOperations;
 }

package/src/operations/actionGroups.ts

@@ -6,18 +6,24 @@
  * 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 { ActionGroups } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { MonitorClient } from "../monitorClient";
-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 {
   ActionGroupResource,
   ActionGroupsListBySubscriptionIdOptionalParams,
+  ActionGroupsListBySubscriptionIdResponse,
   ActionGroupsListByResourceGroupOptionalParams,
+  ActionGroupsListByResourceGroupResponse,
   ActionGroupsCreateOrUpdateOptionalParams,
   ActionGroupsCreateOrUpdateResponse,
   ActionGroupsGetOptionalParams,
@@ -39,8 +45,6 @@ import {
   ActionGroupsGetTestNotificationsAtResourceGroupLevelResponse,
   ActionGroupsGetTestNotificationsAtActionGroupResourceLevelOptionalParams,
   ActionGroupsGetTestNotificationsAtActionGroupResourceLevelResponse,
-  ActionGroupsListBySubscriptionIdResponse,
-  ActionGroupsListByResourceGroupResponse,
   EnableRequest,
   ActionGroupsEnableReceiverOptionalParams
 } from "../models";
@@ -73,16 +77,21 @@ export class ActionGroupsImpl implements ActionGroups {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listBySubscriptionIdPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listBySubscriptionIdPagingPage(options, settings);
       }
     };
   }
 
   private async *listBySubscriptionIdPagingPage(
-    options?: ActionGroupsListBySubscriptionIdOptionalParams
+    options?: ActionGroupsListBySubscriptionIdOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<ActionGroupResource[]> {
-    let result = await this._listBySubscriptionId(options);
+    let result: ActionGroupsListBySubscriptionIdResponse;
+    result = await this._listBySubscriptionId(options);
     yield result.value || [];
   }
 
@@ -111,17 +120,26 @@ export class ActionGroupsImpl implements ActionGroups {
       [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?: ActionGroupsListByResourceGroupOptionalParams
+    options?: ActionGroupsListByResourceGroupOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<ActionGroupResource[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
+    let result: ActionGroupsListByResourceGroupResponse;
+    result = await this._listByResourceGroup(resourceGroupName, options);
     yield result.value || [];
   }
 
@@ -218,8 +236,8 @@ export class ActionGroupsImpl implements ActionGroups {
     notificationRequest: NotificationRequestBody,
     options?: ActionGroupsPostTestNotificationsOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<ActionGroupsPostTestNotificationsResponse>,
+    SimplePollerLike<
+      OperationState<ActionGroupsPostTestNotificationsResponse>,
       ActionGroupsPostTestNotificationsResponse
     >
   > {
@@ -229,7 +247,7 @@ export class ActionGroupsImpl implements ActionGroups {
     ): Promise<ActionGroupsPostTestNotificationsResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -262,15 +280,18 @@ export class ActionGroupsImpl implements ActionGroups {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { notificationRequest, options },
-      postTestNotificationsOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { notificationRequest, options },
+      spec: postTestNotificationsOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ActionGroupsPostTestNotificationsResponse,
+      OperationState<ActionGroupsPostTestNotificationsResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "location"
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;
@@ -303,8 +324,8 @@ export class ActionGroupsImpl implements ActionGroups {
     notificationRequest: NotificationRequestBody,
     options?: ActionGroupsCreateNotificationsAtResourceGroupLevelOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<
+    SimplePollerLike<
+      OperationState<
         ActionGroupsCreateNotificationsAtResourceGroupLevelResponse
       >,
       ActionGroupsCreateNotificationsAtResourceGroupLevelResponse
@@ -316,7 +337,7 @@ export class ActionGroupsImpl implements ActionGroups {
     ): Promise<ActionGroupsCreateNotificationsAtResourceGroupLevelResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -349,15 +370,20 @@ export class ActionGroupsImpl implements ActionGroups {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, notificationRequest, options },
-      createNotificationsAtResourceGroupLevelOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, notificationRequest, options },
+      spec: createNotificationsAtResourceGroupLevelOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ActionGroupsCreateNotificationsAtResourceGroupLevelResponse,
+      OperationState<
+        ActionGroupsCreateNotificationsAtResourceGroupLevelResponse
+      >
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "location"
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;
@@ -395,8 +421,8 @@ export class ActionGroupsImpl implements ActionGroups {
     notificationRequest: NotificationRequestBody,
     options?: ActionGroupsCreateNotificationsAtActionGroupResourceLevelOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<
+    SimplePollerLike<
+      OperationState<
         ActionGroupsCreateNotificationsAtActionGroupResourceLevelResponse
       >,
       ActionGroupsCreateNotificationsAtActionGroupResourceLevelResponse
@@ -408,7 +434,7 @@ export class ActionGroupsImpl implements ActionGroups {
     ): Promise<ActionGroupsCreateNotificationsAtActionGroupResourceLevelResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -441,15 +467,25 @@ export class ActionGroupsImpl implements ActionGroups {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, actionGroupName, notificationRequest, options },
-      createNotificationsAtActionGroupResourceLevelOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: {
+        resourceGroupName,
+        actionGroupName,
+        notificationRequest,
+        options
+      },
+      spec: createNotificationsAtActionGroupResourceLevelOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ActionGroupsCreateNotificationsAtActionGroupResourceLevelResponse,
+      OperationState<
+        ActionGroupsCreateNotificationsAtActionGroupResourceLevelResponse
+      >
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "location"
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;

package/src/operations/activityLogAlerts.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 { ActivityLogAlerts } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,8 +17,10 @@ import {
   ActivityLogAlertResource,
   ActivityLogAlertsListBySubscriptionIdNextOptionalParams,
   ActivityLogAlertsListBySubscriptionIdOptionalParams,
+  ActivityLogAlertsListBySubscriptionIdResponse,
   ActivityLogAlertsListByResourceGroupNextOptionalParams,
   ActivityLogAlertsListByResourceGroupOptionalParams,
+  ActivityLogAlertsListByResourceGroupResponse,
   ActivityLogAlertsCreateOrUpdateOptionalParams,
   ActivityLogAlertsCreateOrUpdateResponse,
   ActivityLogAlertsGetOptionalParams,
@@ -26,8 +29,6 @@ import {
   AlertRulePatchObject,
   ActivityLogAlertsUpdateOptionalParams,
   ActivityLogAlertsUpdateResponse,
-  ActivityLogAlertsListBySubscriptionIdResponse,
-  ActivityLogAlertsListByResourceGroupResponse,
   ActivityLogAlertsListBySubscriptionIdNextResponse,
   ActivityLogAlertsListByResourceGroupNextResponse
 } from "../models";
@@ -60,22 +61,34 @@ export class ActivityLogAlertsImpl implements ActivityLogAlerts {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listBySubscriptionIdPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listBySubscriptionIdPagingPage(options, settings);
       }
     };
   }
 
   private async *listBySubscriptionIdPagingPage(
-    options?: ActivityLogAlertsListBySubscriptionIdOptionalParams
+    options?: ActivityLogAlertsListBySubscriptionIdOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ActivityLogAlertResource[]> {
-    let result = await this._listBySubscriptionId(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ActivityLogAlertsListBySubscriptionIdResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listBySubscriptionId(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listBySubscriptionIdNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -104,19 +117,33 @@ export class ActivityLogAlertsImpl implements ActivityLogAlerts {
       [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?: ActivityLogAlertsListByResourceGroupOptionalParams
+    options?: ActivityLogAlertsListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ActivityLogAlertResource[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ActivityLogAlertsListByResourceGroupResponse;
+    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,
@@ -124,7 +151,9 @@ export class ActivityLogAlertsImpl implements ActivityLogAlerts {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -430,7 +459,6 @@ const listBySubscriptionIdNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponseAutoGenerated
     }
   },
-  queryParameters: [Parameters.apiVersion12],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -450,7 +478,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponseAutoGenerated
     }
   },
-  queryParameters: [Parameters.apiVersion12],
   urlParameters: [
     Parameters.$host,
     Parameters.resourceGroupName,

package/src/operations/activityLogs.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 { ActivityLogs } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -62,23 +63,35 @@ export class ActivityLogsImpl implements ActivityLogs {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(filter, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(filter, options, settings);
       }
     };
   }
 
   private async *listPagingPage(
     filter: string,
-    options?: ActivityLogsListOptionalParams
+    options?: ActivityLogsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<EventData[]> {
-    let result = await this._list(filter, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ActivityLogsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(filter, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
-      result = await this._listNext(filter, continuationToken, options);
+      result = await this._listNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -120,29 +133,15 @@ export class ActivityLogsImpl implements ActivityLogs {
 
   /**
    * ListNext
-   * @param filter Reduces the set of data collected.<br>This argument is required and it also requires
-   *               at least the start date/time.<br>The **$filter** argument is very restricted and allows only the
-   *               following patterns.<br>- *List events for a resource group*: $filter=eventTimestamp ge
-   *               '2014-07-16T04:36:37.6407898Z' and eventTimestamp le '2014-07-20T04:36:37.6407898Z' and
-   *               resourceGroupName eq 'resourceGroupName'.<br>- *List events for resource*: $filter=eventTimestamp ge
-   *               '2014-07-16T04:36:37.6407898Z' and eventTimestamp le '2014-07-20T04:36:37.6407898Z' and resourceUri
-   *               eq 'resourceURI'.<br>- *List events for a subscription in a time range*: $filter=eventTimestamp ge
-   *               '2014-07-16T04:36:37.6407898Z' and eventTimestamp le '2014-07-20T04:36:37.6407898Z'.<br>- *List
-   *               events for a resource provider*: $filter=eventTimestamp ge '2014-07-16T04:36:37.6407898Z' and
-   *               eventTimestamp le '2014-07-20T04:36:37.6407898Z' and resourceProvider eq
-   *               'resourceProviderName'.<br>- *List events for a correlation Id*: $filter=eventTimestamp ge
-   *               '2014-07-16T04:36:37.6407898Z' and eventTimestamp le '2014-07-20T04:36:37.6407898Z' and
-   *               correlationId eq 'correlationID'.<br><br>**NOTE**: No other syntax is allowed.
    * @param nextLink The nextLink from the previous successful call to the List method.
    * @param options The options parameters.
    */
   private _listNext(
-    filter: string,
     nextLink: string,
     options?: ActivityLogsListNextOptionalParams
   ): Promise<ActivityLogsListNextResponse> {
     return this.client.sendOperationRequest(
-      { filter, nextLink, options },
+      { nextLink, options },
       listNextOperationSpec
     );
   }
@@ -182,11 +181,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.filter,
-    Parameters.select
-  ],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,