@azure/arm-security 6.0.0-beta.1 → 6.0.0-beta.3

package/src/operations/securitySolutions.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 { SecuritySolutions } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -50,22 +51,34 @@ export class SecuritySolutionsImpl implements SecuritySolutions {
       [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?: SecuritySolutionsListOptionalParams
+    options?: SecuritySolutionsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<SecuritySolution[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SecuritySolutionsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -177,7 +190,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion10],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/serverVulnerabilityAssessmentOperations.ts

@@ -11,8 +11,12 @@ import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { SecurityCenter } from "../securityCenter";
-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 {
   ServerVulnerabilityAssessmentListByExtendedResourceOptionalParams,
   ServerVulnerabilityAssessmentListByExtendedResourceResponse,
@@ -136,14 +140,14 @@ export class ServerVulnerabilityAssessmentOperationsImpl
     resourceType: string,
     resourceName: string,
     options?: ServerVulnerabilityAssessmentDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
+  ): Promise<SimplePollerLike<OperationState<void>, void>> {
     const directSendOperation = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ): Promise<void> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -176,21 +180,21 @@ export class ServerVulnerabilityAssessmentOperationsImpl
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      {
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: {
         resourceGroupName,
         resourceNamespace,
         resourceType,
         resourceName,
         options
       },
-      deleteOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+      spec: deleteOperationSpec
+    });
+    const poller = await createHttpPoller<void, OperationState<void>>(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs,
-      lroResourceLocationConfig: "location"
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;

package/src/operations/settings.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 { Settings } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -53,22 +54,34 @@ export class SettingsImpl implements Settings {
       [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?: SettingsListOptionalParams
+    options?: SettingsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<SettingUnion[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SettingsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -151,7 +164,7 @@ const listOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion14],
+  queryParameters: [Parameters.apiVersion13],
   urlParameters: [Parameters.$host, Parameters.subscriptionId],
   headerParameters: [Parameters.accept],
   serializer
@@ -168,7 +181,7 @@ const getOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion14],
+  queryParameters: [Parameters.apiVersion13],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -190,7 +203,7 @@ const updateOperationSpec: coreClient.OperationSpec = {
     }
   },
   requestBody: Parameters.setting1,
-  queryParameters: [Parameters.apiVersion14],
+  queryParameters: [Parameters.apiVersion13],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -211,7 +224,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion14],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/softwareInventories.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 { SoftwareInventories } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,9 +17,9 @@ import {
   Software,
   SoftwareInventoriesListByExtendedResourceNextOptionalParams,
   SoftwareInventoriesListByExtendedResourceOptionalParams,
+  SoftwareInventoriesListByExtendedResourceResponse,
   SoftwareInventoriesListBySubscriptionNextOptionalParams,
   SoftwareInventoriesListBySubscriptionOptionalParams,
-  SoftwareInventoriesListByExtendedResourceResponse,
   SoftwareInventoriesListBySubscriptionResponse,
   SoftwareInventoriesGetOptionalParams,
   SoftwareInventoriesGetResponse,
@@ -69,13 +70,17 @@ export class SoftwareInventoriesImpl implements SoftwareInventories {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByExtendedResourcePagingPage(
           resourceGroupName,
           resourceNamespace,
           resourceType,
           resourceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -86,17 +91,24 @@ export class SoftwareInventoriesImpl implements SoftwareInventories {
     resourceNamespace: string,
     resourceType: string,
     resourceName: string,
-    options?: SoftwareInventoriesListByExtendedResourceOptionalParams
+    options?: SoftwareInventoriesListByExtendedResourceOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Software[]> {
-    let result = await this._listByExtendedResource(
-      resourceGroupName,
-      resourceNamespace,
-      resourceType,
-      resourceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SoftwareInventoriesListByExtendedResourceResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByExtendedResource(
+        resourceGroupName,
+        resourceNamespace,
+        resourceType,
+        resourceName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByExtendedResourceNext(
         resourceGroupName,
@@ -107,7 +119,9 @@ export class SoftwareInventoriesImpl implements SoftwareInventories {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -144,22 +158,34 @@ export class SoftwareInventoriesImpl implements SoftwareInventories {
       [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?: SoftwareInventoriesListBySubscriptionOptionalParams
+    options?: SoftwareInventoriesListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Software[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SoftwareInventoriesListBySubscriptionResponse;
+    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;
     }
   }
 
@@ -304,7 +330,7 @@ const listByExtendedResourceOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion16],
+  queryParameters: [Parameters.apiVersion15],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -328,7 +354,7 @@ const listBySubscriptionOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion16],
+  queryParameters: [Parameters.apiVersion15],
   urlParameters: [Parameters.$host, Parameters.subscriptionId],
   headerParameters: [Parameters.accept],
   serializer
@@ -345,7 +371,7 @@ const getOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion16],
+  queryParameters: [Parameters.apiVersion15],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -369,7 +395,6 @@ const listByExtendedResourceNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion16],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -393,7 +418,6 @@ const listBySubscriptionNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion16],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/sqlVulnerabilityAssessmentBaselineRules.ts

@@ -143,7 +143,7 @@ const createOrUpdateOperationSpec: coreClient.OperationSpec = {
     }
   },
   requestBody: Parameters.body4,
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [Parameters.$host, Parameters.resourceId, Parameters.ruleId],
   headerParameters: [Parameters.accept, Parameters.contentType],
   mediaType: "json",
@@ -161,7 +161,7 @@ const getOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [Parameters.$host, Parameters.resourceId, Parameters.ruleId],
   headerParameters: [Parameters.accept],
   serializer
@@ -177,7 +177,7 @@ const deleteOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [Parameters.$host, Parameters.resourceId, Parameters.ruleId],
   headerParameters: [Parameters.accept],
   serializer
@@ -194,7 +194,7 @@ const listOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [Parameters.$host, Parameters.resourceId],
   headerParameters: [Parameters.accept],
   serializer
@@ -212,7 +212,7 @@ const addOperationSpec: coreClient.OperationSpec = {
     }
   },
   requestBody: Parameters.body5,
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [Parameters.$host, Parameters.resourceId],
   headerParameters: [Parameters.accept, Parameters.contentType],
   mediaType: "json",

package/src/operations/sqlVulnerabilityAssessmentScanResults.ts

@@ -86,7 +86,7 @@ const getOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [
     Parameters.$host,
     Parameters.resourceId,
@@ -108,7 +108,7 @@ const listOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [Parameters.$host, Parameters.resourceId, Parameters.scanId],
   headerParameters: [Parameters.accept],
   serializer

package/src/operations/sqlVulnerabilityAssessmentScans.ts

@@ -82,7 +82,7 @@ const getOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [Parameters.$host, Parameters.resourceId, Parameters.scanId],
   headerParameters: [Parameters.accept],
   serializer
@@ -99,7 +99,7 @@ const listOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.workspaceId, Parameters.apiVersion12],
+  queryParameters: [Parameters.apiVersion20, Parameters.workspaceId],
   urlParameters: [Parameters.$host, Parameters.resourceId],
   headerParameters: [Parameters.accept],
   serializer

package/src/operations/subAssessments.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 { SubAssessments } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,9 +17,9 @@ import {
   SecuritySubAssessment,
   SubAssessmentsListAllNextOptionalParams,
   SubAssessmentsListAllOptionalParams,
+  SubAssessmentsListAllResponse,
   SubAssessmentsListNextOptionalParams,
   SubAssessmentsListOptionalParams,
-  SubAssessmentsListAllResponse,
   SubAssessmentsListResponse,
   SubAssessmentsGetOptionalParams,
   SubAssessmentsGetResponse,
@@ -58,23 +59,35 @@ export class SubAssessmentsImpl implements SubAssessments {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listAllPagingPage(scope, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listAllPagingPage(scope, options, settings);
       }
     };
   }
 
   private async *listAllPagingPage(
     scope: string,
-    options?: SubAssessmentsListAllOptionalParams
+    options?: SubAssessmentsListAllOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<SecuritySubAssessment[]> {
-    let result = await this._listAll(scope, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SubAssessmentsListAllResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listAll(scope, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listAllNext(scope, continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -108,8 +121,11 @@ export class SubAssessmentsImpl implements SubAssessments {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(scope, assessmentName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(scope, assessmentName, options, settings);
       }
     };
   }
@@ -117,11 +133,18 @@ export class SubAssessmentsImpl implements SubAssessments {
   private async *listPagingPage(
     scope: string,
     assessmentName: string,
-    options?: SubAssessmentsListOptionalParams
+    options?: SubAssessmentsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<SecuritySubAssessment[]> {
-    let result = await this._list(scope, assessmentName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SubAssessmentsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(scope, assessmentName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         scope,
@@ -130,7 +153,9 @@ export class SubAssessmentsImpl implements SubAssessments {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -318,7 +343,6 @@ const listAllNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion9],
   urlParameters: [Parameters.$host, Parameters.nextLink, Parameters.scope],
   headerParameters: [Parameters.accept],
   serializer
@@ -334,7 +358,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion9],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,