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

package/src/operations/externalSecuritySolutions.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 { ExternalSecuritySolutions } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,9 +17,9 @@ import {
   ExternalSecuritySolution,
   ExternalSecuritySolutionsListNextOptionalParams,
   ExternalSecuritySolutionsListOptionalParams,
+  ExternalSecuritySolutionsListResponse,
   ExternalSecuritySolutionsListByHomeRegionNextOptionalParams,
   ExternalSecuritySolutionsListByHomeRegionOptionalParams,
-  ExternalSecuritySolutionsListResponse,
   ExternalSecuritySolutionsListByHomeRegionResponse,
   ExternalSecuritySolutionsGetOptionalParams,
   ExternalSecuritySolutionsGetResponse,
@@ -55,22 +56,34 @@ export class ExternalSecuritySolutionsImpl
       [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?: ExternalSecuritySolutionsListOptionalParams
+    options?: ExternalSecuritySolutionsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ExternalSecuritySolution[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ExternalSecuritySolutionsListResponse;
+    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;
     }
   }
 
@@ -100,19 +113,29 @@ export class ExternalSecuritySolutionsImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listByHomeRegionPagingPage(ascLocation, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listByHomeRegionPagingPage(ascLocation, options, settings);
       }
     };
   }
 
   private async *listByHomeRegionPagingPage(
     ascLocation: string,
-    options?: ExternalSecuritySolutionsListByHomeRegionOptionalParams
+    options?: ExternalSecuritySolutionsListByHomeRegionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ExternalSecuritySolution[]> {
-    let result = await this._listByHomeRegion(ascLocation, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ExternalSecuritySolutionsListByHomeRegionResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByHomeRegion(ascLocation, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByHomeRegionNext(
         ascLocation,
@@ -120,7 +143,9 @@ export class ExternalSecuritySolutionsImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -296,7 +321,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion10],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -316,7 +340,6 @@ const listByHomeRegionNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion10],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/governanceAssignments.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 { GovernanceAssignments } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -39,11 +40,11 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
   }
 
   /**
-   * Get security governanceAssignments on all your resources inside a scope
-   * @param scope Scope of the query, can be subscription
-   *              (/subscriptions/0b06d9ea-afe6-4779-bd59-30e5c2d9d13f) or management group
-   *              (/providers/Microsoft.Management/managementGroups/mgName).
-   * @param assessmentName The Assessment Key - Unique key for the assessment type
+   * Get governance assignments on all of your resources inside a scope
+   * @param scope The scope of the Governance assignments. Valid scopes are: subscription (format:
+   *              'subscriptions/{subscriptionId}'), or security connector (format:
+   *              'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName})'
+   * @param assessmentName The Assessment Key - A unique key for the assessment type
    * @param options The options parameters.
    */
   public list(
@@ -59,8 +60,11 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
       [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);
       }
     };
   }
@@ -68,11 +72,18 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
   private async *listPagingPage(
     scope: string,
     assessmentName: string,
-    options?: GovernanceAssignmentsListOptionalParams
+    options?: GovernanceAssignmentsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<GovernanceAssignment[]> {
-    let result = await this._list(scope, assessmentName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: GovernanceAssignmentsListResponse;
+    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,
@@ -81,7 +92,9 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -100,11 +113,11 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
   }
 
   /**
-   * Get security governanceAssignments on all your resources inside a scope
-   * @param scope Scope of the query, can be subscription
-   *              (/subscriptions/0b06d9ea-afe6-4779-bd59-30e5c2d9d13f) or management group
-   *              (/providers/Microsoft.Management/managementGroups/mgName).
-   * @param assessmentName The Assessment Key - Unique key for the assessment type
+   * Get governance assignments on all of your resources inside a scope
+   * @param scope The scope of the Governance assignments. Valid scopes are: subscription (format:
+   *              'subscriptions/{subscriptionId}'), or security connector (format:
+   *              'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName})'
+   * @param assessmentName The Assessment Key - A unique key for the assessment type
    * @param options The options parameters.
    */
   private _list(
@@ -120,12 +133,12 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
 
   /**
    * Get a specific governanceAssignment for the requested scope by AssignmentKey
-   * @param scope Scope of the query, can be subscription
-   *              (/subscriptions/0b06d9ea-afe6-4779-bd59-30e5c2d9d13f) or management group
-   *              (/providers/Microsoft.Management/managementGroups/mgName).
-   * @param assessmentName The Assessment Key - Unique key for the assessment type
-   * @param assignmentKey The security governance assignment key - the assessment key of the required
-   *                      governance assignment
+   * @param scope The scope of the Governance assignments. Valid scopes are: subscription (format:
+   *              'subscriptions/{subscriptionId}'), or security connector (format:
+   *              'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName})'
+   * @param assessmentName The Assessment Key - A unique key for the assessment type
+   * @param assignmentKey The governance assignment key - the assessment key of the required governance
+   *                      assignment
    * @param options The options parameters.
    */
   get(
@@ -141,14 +154,14 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
   }
 
   /**
-   * Creates or update a security GovernanceAssignment on the given subscription.
-   * @param scope Scope of the query, can be subscription
-   *              (/subscriptions/0b06d9ea-afe6-4779-bd59-30e5c2d9d13f) or management group
-   *              (/providers/Microsoft.Management/managementGroups/mgName).
-   * @param assessmentName The Assessment Key - Unique key for the assessment type
-   * @param assignmentKey The security governance assignment key - the assessment key of the required
-   *                      governance assignment
-   * @param governanceAssignment GovernanceAssignment over a subscription scope
+   * Creates or updates a governance assignment on the given subscription.
+   * @param scope The scope of the Governance assignments. Valid scopes are: subscription (format:
+   *              'subscriptions/{subscriptionId}'), or security connector (format:
+   *              'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName})'
+   * @param assessmentName The Assessment Key - A unique key for the assessment type
+   * @param assignmentKey The governance assignment key - the assessment key of the required governance
+   *                      assignment
+   * @param governanceAssignment Governance assignment over a subscription scope
    * @param options The options parameters.
    */
   createOrUpdate(
@@ -166,12 +179,12 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
 
   /**
    * Delete a GovernanceAssignment over a given scope
-   * @param scope Scope of the query, can be subscription
-   *              (/subscriptions/0b06d9ea-afe6-4779-bd59-30e5c2d9d13f) or management group
-   *              (/providers/Microsoft.Management/managementGroups/mgName).
-   * @param assessmentName The Assessment Key - Unique key for the assessment type
-   * @param assignmentKey The security governance assignment key - the assessment key of the required
-   *                      governance assignment
+   * @param scope The scope of the Governance assignments. Valid scopes are: subscription (format:
+   *              'subscriptions/{subscriptionId}'), or security connector (format:
+   *              'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName})'
+   * @param assessmentName The Assessment Key - A unique key for the assessment type
+   * @param assignmentKey The governance assignment key - the assessment key of the required governance
+   *                      assignment
    * @param options The options parameters.
    */
   delete(
@@ -188,10 +201,10 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
 
   /**
    * ListNext
-   * @param scope Scope of the query, can be subscription
-   *              (/subscriptions/0b06d9ea-afe6-4779-bd59-30e5c2d9d13f) or management group
-   *              (/providers/Microsoft.Management/managementGroups/mgName).
-   * @param assessmentName The Assessment Key - Unique key for the assessment type
+   * @param scope The scope of the Governance assignments. Valid scopes are: subscription (format:
+   *              'subscriptions/{subscriptionId}'), or security connector (format:
+   *              'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName})'
+   * @param assessmentName The Assessment Key - A unique key for the assessment type
    * @param nextLink The nextLink from the previous successful call to the List method.
    * @param options The options parameters.
    */
@@ -222,11 +235,11 @@ const listOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion18],
+  queryParameters: [Parameters.apiVersion17],
   urlParameters: [
     Parameters.$host,
-    Parameters.scope,
-    Parameters.assessmentName
+    Parameters.scope1,
+    Parameters.assessmentName1
   ],
   headerParameters: [Parameters.accept],
   serializer
@@ -243,11 +256,11 @@ const getOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion18],
+  queryParameters: [Parameters.apiVersion17],
   urlParameters: [
     Parameters.$host,
-    Parameters.scope,
-    Parameters.assessmentName,
+    Parameters.scope1,
+    Parameters.assessmentName1,
     Parameters.assignmentKey
   ],
   headerParameters: [Parameters.accept],
@@ -269,11 +282,11 @@ const createOrUpdateOperationSpec: coreClient.OperationSpec = {
     }
   },
   requestBody: Parameters.governanceAssignment,
-  queryParameters: [Parameters.apiVersion18],
+  queryParameters: [Parameters.apiVersion17],
   urlParameters: [
     Parameters.$host,
-    Parameters.scope,
-    Parameters.assessmentName,
+    Parameters.scope1,
+    Parameters.assessmentName1,
     Parameters.assignmentKey
   ],
   headerParameters: [Parameters.accept, Parameters.contentType],
@@ -285,11 +298,11 @@ const deleteOperationSpec: coreClient.OperationSpec = {
     "/{scope}/providers/Microsoft.Security/assessments/{assessmentName}/governanceAssignments/{assignmentKey}",
   httpMethod: "DELETE",
   responses: { 200: {}, 204: {}, default: {} },
-  queryParameters: [Parameters.apiVersion18],
+  queryParameters: [Parameters.apiVersion17],
   urlParameters: [
     Parameters.$host,
-    Parameters.scope,
-    Parameters.assessmentName,
+    Parameters.scope1,
+    Parameters.assessmentName1,
     Parameters.assignmentKey
   ],
   serializer
@@ -305,12 +318,11 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion18],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,
-    Parameters.scope,
-    Parameters.assessmentName
+    Parameters.scope1,
+    Parameters.assessmentName1
   ],
   headerParameters: [Parameters.accept],
   serializer