diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index e721a666efc9..885d06d1974a 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -3891,7 +3891,7 @@ packages:
dependencies:
semver: 7.3.8
shelljs: 0.8.5
- typescript: 5.0.0-dev.20221115
+ typescript: 5.0.0-dev.20221116
dev: false
/downlevel-dts/0.8.0:
@@ -8839,8 +8839,8 @@ packages:
hasBin: true
dev: false
- /typescript/5.0.0-dev.20221115:
- resolution: {integrity: sha512-h2MaHsq3nKjUZF9t/UCwOmitFUC9cFE1bNKHHHvQcoRUoVfriTvvg82RedkT6ixtrqC7RRhYcEJd7S23YioNkw==}
+ /typescript/5.0.0-dev.20221116:
+ resolution: {integrity: sha512-zLbvvDaFHHwquRZH6P42X5JOjP+BAYZvebvA+IuNjaaj8A8XKWYJbaoZ9qg/PL2E85oAsOTjuZOsp4Mk1ZSWKA==}
engines: {node: '>=4.2.0'}
hasBin: true
dev: false
@@ -14454,7 +14454,7 @@ packages:
dev: false
file:projects/arm-security.tgz:
- resolution: {integrity: sha512-Tm7ys+lUtb50Hxkp1TwkF+KpSCTOPXwUHIlUt1CdwuaMmndqR+20QJPqW2NtQsXVgcnHtL6W6FWtX6PQO8NRkQ==, tarball: file:projects/arm-security.tgz}
+ resolution: {integrity: sha512-/UbMfk2WVmA8zvVsvFzSxDSRCW4uyyXe6az1pJPOMpdsuJLsTwE9Vi3xrbBNva6+5RKwi73JppKH3H5UD9pFNA==, tarball: file:projects/arm-security.tgz}
name: '@rush-temp/arm-security'
version: 0.0.0
dependencies:
@@ -14472,11 +14472,12 @@ packages:
mocha: 7.2.0
rimraf: 3.0.2
rollup: 2.79.1
- rollup-plugin-sourcemaps: 0.6.3_1225c068d0546e507df7db46196a6444
+ rollup-plugin-sourcemaps: 0.6.3_rollup@2.79.1
tslib: 2.4.1
- typescript: 4.8.4
+ typescript: 4.6.4
uglify-js: 3.17.4
transitivePeerDependencies:
+ - '@types/node'
- supports-color
dev: false
diff --git a/sdk/security/arm-security/CHANGELOG.md b/sdk/security/arm-security/CHANGELOG.md
index b8699034905d..35e3d5ea60f4 100644
--- a/sdk/security/arm-security/CHANGELOG.md
+++ b/sdk/security/arm-security/CHANGELOG.md
@@ -1,6 +1,6 @@
# Release History
-## 6.0.0-beta.2 (2022-11-15)
+## 6.0.0-beta.2 (2022-11-16)
**Features**
diff --git a/sdk/security/arm-security/_meta.json b/sdk/security/arm-security/_meta.json
index 5a4c130037f8..393cb518f305 100644
--- a/sdk/security/arm-security/_meta.json
+++ b/sdk/security/arm-security/_meta.json
@@ -1,8 +1,8 @@
{
- "commit": "d8461c6480ba57b5163c48795e917e7c1d99d4fd",
+ "commit": "a421d84866dcf08dd0bceae8f7b5a48a25696d13",
"readme": "specification/security/resource-manager/readme.md",
- "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\security\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.3.20221108.1 --generate-sample=true",
- "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
- "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2",
- "use": "@autorest/typescript@6.0.0-rc.3.20221108.1"
+ "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/security/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.2",
+ "repository_url": "https://github.com/test-repo-billy/azure-rest-api-specs.git",
+ "release_tool": "@azure-tools/js-sdk-release-tools@2.5.1",
+ "use": "@autorest/typescript@6.0.0-rc.2"
}
\ No newline at end of file
diff --git a/sdk/security/arm-security/package.json b/sdk/security/arm-security/package.json
index 83e5d7b77ee3..0675bbcd6501 100644
--- a/sdk/security/arm-security/package.json
+++ b/sdk/security/arm-security/package.json
@@ -11,7 +11,7 @@
"@azure/core-lro": "^2.2.0",
"@azure/abort-controller": "^1.0.0",
"@azure/core-paging": "^1.2.0",
- "@azure/core-client": "^1.6.1",
+ "@azure/core-client": "^1.5.0",
"@azure/core-auth": "^1.3.0",
"@azure/core-rest-pipeline": "^1.8.0",
"tslib": "^2.2.0"
@@ -36,7 +36,7 @@
"mkdirp": "^1.0.4",
"rollup": "^2.66.1",
"rollup-plugin-sourcemaps": "^0.6.3",
- "typescript": "~4.8.0",
+ "typescript": "~4.6.0",
"uglify-js": "^3.4.9",
"rimraf": "^3.0.0",
"@azure/identity": "^2.0.1",
@@ -46,7 +46,6 @@
"@types/chai": "^4.2.8",
"chai": "^4.2.0",
"cross-env": "^7.0.2",
- "@types/node": "^14.0.0",
"@azure/dev-tool": "^1.0.0"
},
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/security/arm-security",
@@ -110,13 +109,5 @@
}
]
},
- "autoPublish": true,
- "//sampleConfiguration": {
- "productName": "",
- "productSlugs": [
- "azure"
- ],
- "disableDocsMs": true,
- "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-security?view=azure-node-preview"
- }
+ "autoPublish": true
}
\ No newline at end of file
diff --git a/sdk/security/arm-security/review/arm-security.api.md b/sdk/security/arm-security/review/arm-security.api.md
index 887688a4dfad..472c3e144f25 100644
--- a/sdk/security/arm-security/review/arm-security.api.md
+++ b/sdk/security/arm-security/review/arm-security.api.md
@@ -2183,9 +2183,6 @@ export interface GcpProjectEnvironmentData extends EnvironmentData {
projectDetails?: GcpProjectDetails;
}
-// @public
-export function getContinuationToken(page: unknown): string | undefined;
-
// @public
export interface GithubScopeEnvironmentData extends EnvironmentData {
environmentType: "GithubScope";
diff --git a/sdk/security/arm-security/src/index.ts b/sdk/security/arm-security/src/index.ts
index bb0bd6d5357c..82e018581ae7 100644
--- a/sdk/security/arm-security/src/index.ts
+++ b/sdk/security/arm-security/src/index.ts
@@ -7,7 +7,6 @@
*/
///
-export { getContinuationToken } from "./pagingHelper";
export * from "./models";
export { SecurityCenter } from "./securityCenter";
export * from "./operationsInterfaces";
diff --git a/sdk/security/arm-security/src/operations/aPICollection.ts b/sdk/security/arm-security/src/operations/aPICollection.ts
index 39ccc106ba86..0ba02155a769 100644
--- a/sdk/security/arm-security/src/operations/aPICollection.ts
+++ b/sdk/security/arm-security/src/operations/aPICollection.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { APICollection } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -58,16 +57,8 @@ export class APICollectionImpl implements APICollection {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(
- resourceGroupName,
- serviceName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listPagingPage(resourceGroupName, serviceName, options);
}
};
}
@@ -75,18 +66,11 @@ export class APICollectionImpl implements APICollection {
private async *listPagingPage(
resourceGroupName: string,
serviceName: string,
- options?: APICollectionListOptionalParams,
- settings?: PageSettings
+ options?: APICollectionListOptionalParams
): AsyncIterableIterator {
- let result: APICollectionListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(resourceGroupName, serviceName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(resourceGroupName, serviceName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
resourceGroupName,
@@ -95,9 +79,7 @@ export class APICollectionImpl implements APICollection {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/adaptiveNetworkHardenings.ts b/sdk/security/arm-security/src/operations/adaptiveNetworkHardenings.ts
index 969049678fd5..907199d87256 100644
--- a/sdk/security/arm-security/src/operations/adaptiveNetworkHardenings.ts
+++ b/sdk/security/arm-security/src/operations/adaptiveNetworkHardenings.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { AdaptiveNetworkHardenings } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -71,17 +70,13 @@ export class AdaptiveNetworkHardeningsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listByExtendedResourcePagingPage(
resourceGroupName,
resourceNamespace,
resourceType,
resourceName,
- options,
- settings
+ options
);
}
};
@@ -92,24 +87,17 @@ export class AdaptiveNetworkHardeningsImpl
resourceNamespace: string,
resourceType: string,
resourceName: string,
- options?: AdaptiveNetworkHardeningsListByExtendedResourceOptionalParams,
- settings?: PageSettings
+ options?: AdaptiveNetworkHardeningsListByExtendedResourceOptionalParams
): AsyncIterableIterator {
- let result: AdaptiveNetworkHardeningsListByExtendedResourceResponse;
- 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;
- }
+ let result = await this._listByExtendedResource(
+ resourceGroupName,
+ resourceNamespace,
+ resourceType,
+ resourceName,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByExtendedResourceNext(
resourceGroupName,
@@ -120,9 +108,7 @@ export class AdaptiveNetworkHardeningsImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/alerts.ts b/sdk/security/arm-security/src/operations/alerts.ts
index 3c611b84603b..470c52268fa5 100644
--- a/sdk/security/arm-security/src/operations/alerts.ts
+++ b/sdk/security/arm-security/src/operations/alerts.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Alerts } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -19,15 +18,15 @@ import {
Alert,
AlertsListNextOptionalParams,
AlertsListOptionalParams,
- AlertsListResponse,
AlertsListByResourceGroupNextOptionalParams,
AlertsListByResourceGroupOptionalParams,
- AlertsListByResourceGroupResponse,
AlertsListSubscriptionLevelByRegionNextOptionalParams,
AlertsListSubscriptionLevelByRegionOptionalParams,
- AlertsListSubscriptionLevelByRegionResponse,
AlertsListResourceGroupLevelByRegionNextOptionalParams,
AlertsListResourceGroupLevelByRegionOptionalParams,
+ AlertsListResponse,
+ AlertsListByResourceGroupResponse,
+ AlertsListSubscriptionLevelByRegionResponse,
AlertsListResourceGroupLevelByRegionResponse,
AlertsGetSubscriptionLevelOptionalParams,
AlertsGetSubscriptionLevelResponse,
@@ -77,34 +76,22 @@ export class AlertsImpl implements Alerts {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: AlertsListOptionalParams,
- settings?: PageSettings
+ options?: AlertsListOptionalParams
): AsyncIterableIterator {
- let result: AlertsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -134,33 +121,19 @@ export class AlertsImpl implements Alerts {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByResourceGroupPagingPage(
- resourceGroupName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listByResourceGroupPagingPage(resourceGroupName, options);
}
};
}
private async *listByResourceGroupPagingPage(
resourceGroupName: string,
- options?: AlertsListByResourceGroupOptionalParams,
- settings?: PageSettings
+ options?: AlertsListByResourceGroupOptionalParams
): AsyncIterableIterator {
- let result: AlertsListByResourceGroupResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroup(resourceGroupName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroup(resourceGroupName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupNext(
resourceGroupName,
@@ -168,9 +141,7 @@ export class AlertsImpl implements Alerts {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -207,14 +178,10 @@ export class AlertsImpl implements Alerts {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listSubscriptionLevelByRegionPagingPage(
ascLocation,
- options,
- settings
+ options
);
}
};
@@ -222,18 +189,14 @@ export class AlertsImpl implements Alerts {
private async *listSubscriptionLevelByRegionPagingPage(
ascLocation: string,
- options?: AlertsListSubscriptionLevelByRegionOptionalParams,
- settings?: PageSettings
+ options?: AlertsListSubscriptionLevelByRegionOptionalParams
): AsyncIterableIterator {
- let result: AlertsListSubscriptionLevelByRegionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listSubscriptionLevelByRegion(ascLocation, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listSubscriptionLevelByRegion(
+ ascLocation,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listSubscriptionLevelByRegionNext(
ascLocation,
@@ -241,9 +204,7 @@ export class AlertsImpl implements Alerts {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -285,15 +246,11 @@ export class AlertsImpl implements Alerts {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listResourceGroupLevelByRegionPagingPage(
ascLocation,
resourceGroupName,
- options,
- settings
+ options
);
}
};
@@ -302,22 +259,15 @@ export class AlertsImpl implements Alerts {
private async *listResourceGroupLevelByRegionPagingPage(
ascLocation: string,
resourceGroupName: string,
- options?: AlertsListResourceGroupLevelByRegionOptionalParams,
- settings?: PageSettings
+ options?: AlertsListResourceGroupLevelByRegionOptionalParams
): AsyncIterableIterator {
- let result: AlertsListResourceGroupLevelByRegionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listResourceGroupLevelByRegion(
- ascLocation,
- resourceGroupName,
- options
- );
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listResourceGroupLevelByRegion(
+ ascLocation,
+ resourceGroupName,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listResourceGroupLevelByRegionNext(
ascLocation,
@@ -326,9 +276,7 @@ export class AlertsImpl implements Alerts {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/alertsSuppressionRules.ts b/sdk/security/arm-security/src/operations/alertsSuppressionRules.ts
index b90563386809..45ff0c938c6e 100644
--- a/sdk/security/arm-security/src/operations/alertsSuppressionRules.ts
+++ b/sdk/security/arm-security/src/operations/alertsSuppressionRules.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { AlertsSuppressionRules } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -54,34 +53,22 @@ export class AlertsSuppressionRulesImpl implements AlertsSuppressionRules {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: AlertsSuppressionRulesListOptionalParams,
- settings?: PageSettings
+ options?: AlertsSuppressionRulesListOptionalParams
): AsyncIterableIterator {
- let result: AlertsSuppressionRulesListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/allowedConnections.ts b/sdk/security/arm-security/src/operations/allowedConnections.ts
index 74c87b498b2d..c1c3926e0f6d 100644
--- a/sdk/security/arm-security/src/operations/allowedConnections.ts
+++ b/sdk/security/arm-security/src/operations/allowedConnections.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { AllowedConnections } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
AllowedConnectionsResource,
AllowedConnectionsListNextOptionalParams,
AllowedConnectionsListOptionalParams,
- AllowedConnectionsListResponse,
AllowedConnectionsListByHomeRegionNextOptionalParams,
AllowedConnectionsListByHomeRegionOptionalParams,
+ AllowedConnectionsListResponse,
AllowedConnectionsListByHomeRegionResponse,
ConnectionType,
AllowedConnectionsGetOptionalParams,
@@ -56,34 +55,22 @@ export class AllowedConnectionsImpl implements AllowedConnections {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: AllowedConnectionsListOptionalParams,
- settings?: PageSettings
+ options?: AllowedConnectionsListOptionalParams
): AsyncIterableIterator {
- let result: AllowedConnectionsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -113,29 +100,19 @@ export class AllowedConnectionsImpl implements AllowedConnections {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByHomeRegionPagingPage(ascLocation, options, settings);
+ byPage: () => {
+ return this.listByHomeRegionPagingPage(ascLocation, options);
}
};
}
private async *listByHomeRegionPagingPage(
ascLocation: string,
- options?: AllowedConnectionsListByHomeRegionOptionalParams,
- settings?: PageSettings
+ options?: AllowedConnectionsListByHomeRegionOptionalParams
): AsyncIterableIterator {
- let result: AllowedConnectionsListByHomeRegionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByHomeRegion(ascLocation, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByHomeRegion(ascLocation, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByHomeRegionNext(
ascLocation,
@@ -143,9 +120,7 @@ export class AllowedConnectionsImpl implements AllowedConnections {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/applications.ts b/sdk/security/arm-security/src/operations/applications.ts
index 089098026c88..10bb96e03553 100644
--- a/sdk/security/arm-security/src/operations/applications.ts
+++ b/sdk/security/arm-security/src/operations/applications.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Applications } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -49,34 +48,22 @@ export class ApplicationsImpl implements Applications {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: ApplicationsListOptionalParams,
- settings?: PageSettings
+ options?: ApplicationsListOptionalParams
): AsyncIterableIterator {
- let result: ApplicationsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/assessments.ts b/sdk/security/arm-security/src/operations/assessments.ts
index 1c9aaadd1d22..b4d41a650f4a 100644
--- a/sdk/security/arm-security/src/operations/assessments.ts
+++ b/sdk/security/arm-security/src/operations/assessments.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Assessments } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -59,35 +58,23 @@ export class AssessmentsImpl implements Assessments {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(scope, options, settings);
+ byPage: () => {
+ return this.listPagingPage(scope, options);
}
};
}
private async *listPagingPage(
scope: string,
- options?: AssessmentsListOptionalParams,
- settings?: PageSettings
+ options?: AssessmentsListOptionalParams
): AsyncIterableIterator {
- let result: AssessmentsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(scope, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(scope, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(scope, continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/assessmentsMetadata.ts b/sdk/security/arm-security/src/operations/assessmentsMetadata.ts
index 7ba2627c3d1b..3376958008cf 100644
--- a/sdk/security/arm-security/src/operations/assessmentsMetadata.ts
+++ b/sdk/security/arm-security/src/operations/assessmentsMetadata.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { AssessmentsMetadata } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,12 +16,12 @@ import {
SecurityAssessmentMetadataResponse,
AssessmentsMetadataListNextOptionalParams,
AssessmentsMetadataListOptionalParams,
- AssessmentsMetadataListResponse,
AssessmentsMetadataListBySubscriptionNextOptionalParams,
AssessmentsMetadataListBySubscriptionOptionalParams,
- AssessmentsMetadataListBySubscriptionResponse,
+ AssessmentsMetadataListResponse,
AssessmentsMetadataGetOptionalParams,
AssessmentsMetadataGetResponse,
+ AssessmentsMetadataListBySubscriptionResponse,
AssessmentsMetadataGetInSubscriptionOptionalParams,
AssessmentsMetadataGetInSubscriptionResponse,
AssessmentsMetadataCreateInSubscriptionOptionalParams,
@@ -60,34 +59,22 @@ export class AssessmentsMetadataImpl implements AssessmentsMetadata {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: AssessmentsMetadataListOptionalParams,
- settings?: PageSettings
+ options?: AssessmentsMetadataListOptionalParams
): AsyncIterableIterator {
- let result: AssessmentsMetadataListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -114,34 +101,22 @@ export class AssessmentsMetadataImpl implements AssessmentsMetadata {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listBySubscriptionPagingPage(options, settings);
+ byPage: () => {
+ return this.listBySubscriptionPagingPage(options);
}
};
}
private async *listBySubscriptionPagingPage(
- options?: AssessmentsMetadataListBySubscriptionOptionalParams,
- settings?: PageSettings
+ options?: AssessmentsMetadataListBySubscriptionOptionalParams
): AsyncIterableIterator {
- let result: AssessmentsMetadataListBySubscriptionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listBySubscription(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listBySubscription(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listBySubscriptionNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/autoProvisioningSettings.ts b/sdk/security/arm-security/src/operations/autoProvisioningSettings.ts
index 477d3951fb1b..038b34712c11 100644
--- a/sdk/security/arm-security/src/operations/autoProvisioningSettings.ts
+++ b/sdk/security/arm-security/src/operations/autoProvisioningSettings.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { AutoProvisioningSettings } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -53,34 +52,22 @@ export class AutoProvisioningSettingsImpl implements AutoProvisioningSettings {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: AutoProvisioningSettingsListOptionalParams,
- settings?: PageSettings
+ options?: AutoProvisioningSettingsListOptionalParams
): AsyncIterableIterator {
- let result: AutoProvisioningSettingsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/automations.ts b/sdk/security/arm-security/src/operations/automations.ts
index 68b96a1066c3..2d8fc989b267 100644
--- a/sdk/security/arm-security/src/operations/automations.ts
+++ b/sdk/security/arm-security/src/operations/automations.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Automations } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
Automation,
AutomationsListNextOptionalParams,
AutomationsListOptionalParams,
- AutomationsListResponse,
AutomationsListByResourceGroupNextOptionalParams,
AutomationsListByResourceGroupOptionalParams,
+ AutomationsListResponse,
AutomationsListByResourceGroupResponse,
AutomationsGetOptionalParams,
AutomationsGetResponse,
@@ -61,34 +60,22 @@ export class AutomationsImpl implements Automations {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: AutomationsListOptionalParams,
- settings?: PageSettings
+ options?: AutomationsListOptionalParams
): AsyncIterableIterator {
- let result: AutomationsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -119,33 +106,19 @@ export class AutomationsImpl implements Automations {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByResourceGroupPagingPage(
- resourceGroupName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listByResourceGroupPagingPage(resourceGroupName, options);
}
};
}
private async *listByResourceGroupPagingPage(
resourceGroupName: string,
- options?: AutomationsListByResourceGroupOptionalParams,
- settings?: PageSettings
+ options?: AutomationsListByResourceGroupOptionalParams
): AsyncIterableIterator {
- let result: AutomationsListByResourceGroupResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroup(resourceGroupName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroup(resourceGroupName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupNext(
resourceGroupName,
@@ -153,9 +126,7 @@ export class AutomationsImpl implements Automations {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/complianceResults.ts b/sdk/security/arm-security/src/operations/complianceResults.ts
index 658300395eed..a854803d3bb7 100644
--- a/sdk/security/arm-security/src/operations/complianceResults.ts
+++ b/sdk/security/arm-security/src/operations/complianceResults.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { ComplianceResults } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -55,35 +54,23 @@ export class ComplianceResultsImpl implements ComplianceResults {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(scope, options, settings);
+ byPage: () => {
+ return this.listPagingPage(scope, options);
}
};
}
private async *listPagingPage(
scope: string,
- options?: ComplianceResultsListOptionalParams,
- settings?: PageSettings
+ options?: ComplianceResultsListOptionalParams
): AsyncIterableIterator {
- let result: ComplianceResultsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(scope, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(scope, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(scope, continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/compliances.ts b/sdk/security/arm-security/src/operations/compliances.ts
index 3881d6b2afd0..cb826dcbfb31 100644
--- a/sdk/security/arm-security/src/operations/compliances.ts
+++ b/sdk/security/arm-security/src/operations/compliances.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Compliances } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -55,35 +54,23 @@ export class CompliancesImpl implements Compliances {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(scope, options, settings);
+ byPage: () => {
+ return this.listPagingPage(scope, options);
}
};
}
private async *listPagingPage(
scope: string,
- options?: CompliancesListOptionalParams,
- settings?: PageSettings
+ options?: CompliancesListOptionalParams
): AsyncIterableIterator {
- let result: CompliancesListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(scope, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(scope, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(scope, continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/connectors.ts b/sdk/security/arm-security/src/operations/connectors.ts
index f158339dbadc..4691220e51f7 100644
--- a/sdk/security/arm-security/src/operations/connectors.ts
+++ b/sdk/security/arm-security/src/operations/connectors.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Connectors } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -54,34 +53,22 @@ export class ConnectorsImpl implements Connectors {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: ConnectorsListOptionalParams,
- settings?: PageSettings
+ options?: ConnectorsListOptionalParams
): AsyncIterableIterator {
- let result: ConnectorsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/customAssessmentAutomations.ts b/sdk/security/arm-security/src/operations/customAssessmentAutomations.ts
index 5cb27bd84b4d..e433b773bac0 100644
--- a/sdk/security/arm-security/src/operations/customAssessmentAutomations.ts
+++ b/sdk/security/arm-security/src/operations/customAssessmentAutomations.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { CustomAssessmentAutomations } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,16 +16,16 @@ import {
CustomAssessmentAutomation,
CustomAssessmentAutomationsListByResourceGroupNextOptionalParams,
CustomAssessmentAutomationsListByResourceGroupOptionalParams,
- CustomAssessmentAutomationsListByResourceGroupResponse,
CustomAssessmentAutomationsListBySubscriptionNextOptionalParams,
CustomAssessmentAutomationsListBySubscriptionOptionalParams,
- CustomAssessmentAutomationsListBySubscriptionResponse,
CustomAssessmentAutomationsGetOptionalParams,
CustomAssessmentAutomationsGetResponse,
CustomAssessmentAutomationRequest,
CustomAssessmentAutomationsCreateOptionalParams,
CustomAssessmentAutomationsCreateResponse,
CustomAssessmentAutomationsDeleteOptionalParams,
+ CustomAssessmentAutomationsListByResourceGroupResponse,
+ CustomAssessmentAutomationsListBySubscriptionResponse,
CustomAssessmentAutomationsListByResourceGroupNextResponse,
CustomAssessmentAutomationsListBySubscriptionNextResponse
} from "../models";
@@ -63,33 +62,19 @@ export class CustomAssessmentAutomationsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByResourceGroupPagingPage(
- resourceGroupName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listByResourceGroupPagingPage(resourceGroupName, options);
}
};
}
private async *listByResourceGroupPagingPage(
resourceGroupName: string,
- options?: CustomAssessmentAutomationsListByResourceGroupOptionalParams,
- settings?: PageSettings
+ options?: CustomAssessmentAutomationsListByResourceGroupOptionalParams
): AsyncIterableIterator {
- let result: CustomAssessmentAutomationsListByResourceGroupResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroup(resourceGroupName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroup(resourceGroupName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupNext(
resourceGroupName,
@@ -97,9 +82,7 @@ export class CustomAssessmentAutomationsImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -130,34 +113,22 @@ export class CustomAssessmentAutomationsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listBySubscriptionPagingPage(options, settings);
+ byPage: () => {
+ return this.listBySubscriptionPagingPage(options);
}
};
}
private async *listBySubscriptionPagingPage(
- options?: CustomAssessmentAutomationsListBySubscriptionOptionalParams,
- settings?: PageSettings
+ options?: CustomAssessmentAutomationsListBySubscriptionOptionalParams
): AsyncIterableIterator {
- let result: CustomAssessmentAutomationsListBySubscriptionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listBySubscription(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listBySubscription(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listBySubscriptionNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/customEntityStoreAssignments.ts b/sdk/security/arm-security/src/operations/customEntityStoreAssignments.ts
index 6053f992baee..1e938346abfa 100644
--- a/sdk/security/arm-security/src/operations/customEntityStoreAssignments.ts
+++ b/sdk/security/arm-security/src/operations/customEntityStoreAssignments.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { CustomEntityStoreAssignments } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,16 +16,16 @@ import {
CustomEntityStoreAssignment,
CustomEntityStoreAssignmentsListByResourceGroupNextOptionalParams,
CustomEntityStoreAssignmentsListByResourceGroupOptionalParams,
- CustomEntityStoreAssignmentsListByResourceGroupResponse,
CustomEntityStoreAssignmentsListBySubscriptionNextOptionalParams,
CustomEntityStoreAssignmentsListBySubscriptionOptionalParams,
- CustomEntityStoreAssignmentsListBySubscriptionResponse,
CustomEntityStoreAssignmentsGetOptionalParams,
CustomEntityStoreAssignmentsGetResponse,
CustomEntityStoreAssignmentRequest,
CustomEntityStoreAssignmentsCreateOptionalParams,
CustomEntityStoreAssignmentsCreateResponse,
CustomEntityStoreAssignmentsDeleteOptionalParams,
+ CustomEntityStoreAssignmentsListByResourceGroupResponse,
+ CustomEntityStoreAssignmentsListBySubscriptionResponse,
CustomEntityStoreAssignmentsListByResourceGroupNextResponse,
CustomEntityStoreAssignmentsListBySubscriptionNextResponse
} from "../models";
@@ -63,33 +62,19 @@ export class CustomEntityStoreAssignmentsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByResourceGroupPagingPage(
- resourceGroupName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listByResourceGroupPagingPage(resourceGroupName, options);
}
};
}
private async *listByResourceGroupPagingPage(
resourceGroupName: string,
- options?: CustomEntityStoreAssignmentsListByResourceGroupOptionalParams,
- settings?: PageSettings
+ options?: CustomEntityStoreAssignmentsListByResourceGroupOptionalParams
): AsyncIterableIterator {
- let result: CustomEntityStoreAssignmentsListByResourceGroupResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroup(resourceGroupName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroup(resourceGroupName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupNext(
resourceGroupName,
@@ -97,9 +82,7 @@ export class CustomEntityStoreAssignmentsImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -130,34 +113,22 @@ export class CustomEntityStoreAssignmentsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listBySubscriptionPagingPage(options, settings);
+ byPage: () => {
+ return this.listBySubscriptionPagingPage(options);
}
};
}
private async *listBySubscriptionPagingPage(
- options?: CustomEntityStoreAssignmentsListBySubscriptionOptionalParams,
- settings?: PageSettings
+ options?: CustomEntityStoreAssignmentsListBySubscriptionOptionalParams
): AsyncIterableIterator {
- let result: CustomEntityStoreAssignmentsListBySubscriptionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listBySubscription(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listBySubscription(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listBySubscriptionNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/deviceSecurityGroups.ts b/sdk/security/arm-security/src/operations/deviceSecurityGroups.ts
index 1973fed41420..333d07ae91b6 100644
--- a/sdk/security/arm-security/src/operations/deviceSecurityGroups.ts
+++ b/sdk/security/arm-security/src/operations/deviceSecurityGroups.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { DeviceSecurityGroups } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -56,35 +55,23 @@ export class DeviceSecurityGroupsImpl implements DeviceSecurityGroups {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(resourceId, options, settings);
+ byPage: () => {
+ return this.listPagingPage(resourceId, options);
}
};
}
private async *listPagingPage(
resourceId: string,
- options?: DeviceSecurityGroupsListOptionalParams,
- settings?: PageSettings
+ options?: DeviceSecurityGroupsListOptionalParams
): AsyncIterableIterator {
- let result: DeviceSecurityGroupsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(resourceId, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(resourceId, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(resourceId, continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/discoveredSecuritySolutions.ts b/sdk/security/arm-security/src/operations/discoveredSecuritySolutions.ts
index 0bc7fd9e81b1..ec304fd3a57f 100644
--- a/sdk/security/arm-security/src/operations/discoveredSecuritySolutions.ts
+++ b/sdk/security/arm-security/src/operations/discoveredSecuritySolutions.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { DiscoveredSecuritySolutions } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
DiscoveredSecuritySolution,
DiscoveredSecuritySolutionsListNextOptionalParams,
DiscoveredSecuritySolutionsListOptionalParams,
- DiscoveredSecuritySolutionsListResponse,
DiscoveredSecuritySolutionsListByHomeRegionNextOptionalParams,
DiscoveredSecuritySolutionsListByHomeRegionOptionalParams,
+ DiscoveredSecuritySolutionsListResponse,
DiscoveredSecuritySolutionsListByHomeRegionResponse,
DiscoveredSecuritySolutionsGetOptionalParams,
DiscoveredSecuritySolutionsGetResponse,
@@ -56,34 +55,22 @@ export class DiscoveredSecuritySolutionsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: DiscoveredSecuritySolutionsListOptionalParams,
- settings?: PageSettings
+ options?: DiscoveredSecuritySolutionsListOptionalParams
): AsyncIterableIterator {
- let result: DiscoveredSecuritySolutionsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -113,29 +100,19 @@ export class DiscoveredSecuritySolutionsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByHomeRegionPagingPage(ascLocation, options, settings);
+ byPage: () => {
+ return this.listByHomeRegionPagingPage(ascLocation, options);
}
};
}
private async *listByHomeRegionPagingPage(
ascLocation: string,
- options?: DiscoveredSecuritySolutionsListByHomeRegionOptionalParams,
- settings?: PageSettings
+ options?: DiscoveredSecuritySolutionsListByHomeRegionOptionalParams
): AsyncIterableIterator {
- let result: DiscoveredSecuritySolutionsListByHomeRegionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByHomeRegion(ascLocation, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByHomeRegion(ascLocation, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByHomeRegionNext(
ascLocation,
@@ -143,9 +120,7 @@ export class DiscoveredSecuritySolutionsImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/externalSecuritySolutions.ts b/sdk/security/arm-security/src/operations/externalSecuritySolutions.ts
index 4c6438c391c9..9a0a7cc5f08d 100644
--- a/sdk/security/arm-security/src/operations/externalSecuritySolutions.ts
+++ b/sdk/security/arm-security/src/operations/externalSecuritySolutions.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { ExternalSecuritySolutions } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
ExternalSecuritySolution,
ExternalSecuritySolutionsListNextOptionalParams,
ExternalSecuritySolutionsListOptionalParams,
- ExternalSecuritySolutionsListResponse,
ExternalSecuritySolutionsListByHomeRegionNextOptionalParams,
ExternalSecuritySolutionsListByHomeRegionOptionalParams,
+ ExternalSecuritySolutionsListResponse,
ExternalSecuritySolutionsListByHomeRegionResponse,
ExternalSecuritySolutionsGetOptionalParams,
ExternalSecuritySolutionsGetResponse,
@@ -56,34 +55,22 @@ export class ExternalSecuritySolutionsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: ExternalSecuritySolutionsListOptionalParams,
- settings?: PageSettings
+ options?: ExternalSecuritySolutionsListOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -113,29 +100,19 @@ export class ExternalSecuritySolutionsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByHomeRegionPagingPage(ascLocation, options, settings);
+ byPage: () => {
+ return this.listByHomeRegionPagingPage(ascLocation, options);
}
};
}
private async *listByHomeRegionPagingPage(
ascLocation: string,
- options?: ExternalSecuritySolutionsListByHomeRegionOptionalParams,
- settings?: PageSettings
+ options?: ExternalSecuritySolutionsListByHomeRegionOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._listByHomeRegion(ascLocation, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByHomeRegionNext(
ascLocation,
@@ -143,9 +120,7 @@ export class ExternalSecuritySolutionsImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/governanceAssignments.ts b/sdk/security/arm-security/src/operations/governanceAssignments.ts
index 31f0228ed73e..06bf4668034d 100644
--- a/sdk/security/arm-security/src/operations/governanceAssignments.ts
+++ b/sdk/security/arm-security/src/operations/governanceAssignments.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { GovernanceAssignments } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -60,11 +59,8 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(scope, assessmentName, options, settings);
+ byPage: () => {
+ return this.listPagingPage(scope, assessmentName, options);
}
};
}
@@ -72,18 +68,11 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
private async *listPagingPage(
scope: string,
assessmentName: string,
- options?: GovernanceAssignmentsListOptionalParams,
- settings?: PageSettings
+ options?: GovernanceAssignmentsListOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._list(scope, assessmentName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
scope,
@@ -92,9 +81,7 @@ export class GovernanceAssignmentsImpl implements GovernanceAssignments {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/governanceRuleOperations.ts b/sdk/security/arm-security/src/operations/governanceRuleOperations.ts
index 7570f62f879b..ab0eb8f0474b 100644
--- a/sdk/security/arm-security/src/operations/governanceRuleOperations.ts
+++ b/sdk/security/arm-security/src/operations/governanceRuleOperations.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { GovernanceRuleOperations } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -49,34 +48,22 @@ export class GovernanceRuleOperationsImpl implements GovernanceRuleOperations {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: GovernanceRuleListOptionalParams,
- settings?: PageSettings
+ options?: GovernanceRuleListOptionalParams
): AsyncIterableIterator {
- let result: GovernanceRuleListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/informationProtectionPolicies.ts b/sdk/security/arm-security/src/operations/informationProtectionPolicies.ts
index 308b5aad1276..fb81b2d13521 100644
--- a/sdk/security/arm-security/src/operations/informationProtectionPolicies.ts
+++ b/sdk/security/arm-security/src/operations/informationProtectionPolicies.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { InformationProtectionPolicies } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,12 +16,12 @@ import {
InformationProtectionPolicy,
InformationProtectionPoliciesListNextOptionalParams,
InformationProtectionPoliciesListOptionalParams,
- InformationProtectionPoliciesListResponse,
InformationProtectionPolicyName,
InformationProtectionPoliciesGetOptionalParams,
InformationProtectionPoliciesGetResponse,
InformationProtectionPoliciesCreateOrUpdateOptionalParams,
InformationProtectionPoliciesCreateOrUpdateResponse,
+ InformationProtectionPoliciesListResponse,
InformationProtectionPoliciesListNextResponse
} from "../models";
@@ -59,35 +58,23 @@ export class InformationProtectionPoliciesImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(scope, options, settings);
+ byPage: () => {
+ return this.listPagingPage(scope, options);
}
};
}
private async *listPagingPage(
scope: string,
- options?: InformationProtectionPoliciesListOptionalParams,
- settings?: PageSettings
+ options?: InformationProtectionPoliciesListOptionalParams
): AsyncIterableIterator {
- let result: InformationProtectionPoliciesListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(scope, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(scope, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(scope, continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/ingestionSettings.ts b/sdk/security/arm-security/src/operations/ingestionSettings.ts
index 20e49b6265d6..793393858fd8 100644
--- a/sdk/security/arm-security/src/operations/ingestionSettings.ts
+++ b/sdk/security/arm-security/src/operations/ingestionSettings.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { IngestionSettings } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -59,34 +58,22 @@ export class IngestionSettingsImpl implements IngestionSettings {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: IngestionSettingsListOptionalParams,
- settings?: PageSettings
+ options?: IngestionSettingsListOptionalParams
): AsyncIterableIterator {
- let result: IngestionSettingsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/iotSecuritySolution.ts b/sdk/security/arm-security/src/operations/iotSecuritySolution.ts
index da2006151614..622225204c33 100644
--- a/sdk/security/arm-security/src/operations/iotSecuritySolution.ts
+++ b/sdk/security/arm-security/src/operations/iotSecuritySolution.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { IotSecuritySolution } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
IoTSecuritySolutionModel,
IotSecuritySolutionListBySubscriptionNextOptionalParams,
IotSecuritySolutionListBySubscriptionOptionalParams,
- IotSecuritySolutionListBySubscriptionResponse,
IotSecuritySolutionListByResourceGroupNextOptionalParams,
IotSecuritySolutionListByResourceGroupOptionalParams,
+ IotSecuritySolutionListBySubscriptionResponse,
IotSecuritySolutionListByResourceGroupResponse,
IotSecuritySolutionGetOptionalParams,
IotSecuritySolutionGetResponse,
@@ -61,34 +60,22 @@ export class IotSecuritySolutionImpl implements IotSecuritySolution {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listBySubscriptionPagingPage(options, settings);
+ byPage: () => {
+ return this.listBySubscriptionPagingPage(options);
}
};
}
private async *listBySubscriptionPagingPage(
- options?: IotSecuritySolutionListBySubscriptionOptionalParams,
- settings?: PageSettings
+ options?: IotSecuritySolutionListBySubscriptionOptionalParams
): AsyncIterableIterator {
- let result: IotSecuritySolutionListBySubscriptionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listBySubscription(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listBySubscription(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listBySubscriptionNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -118,33 +105,19 @@ export class IotSecuritySolutionImpl implements IotSecuritySolution {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByResourceGroupPagingPage(
- resourceGroupName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listByResourceGroupPagingPage(resourceGroupName, options);
}
};
}
private async *listByResourceGroupPagingPage(
resourceGroupName: string,
- options?: IotSecuritySolutionListByResourceGroupOptionalParams,
- settings?: PageSettings
+ options?: IotSecuritySolutionListByResourceGroupOptionalParams
): AsyncIterableIterator {
- let result: IotSecuritySolutionListByResourceGroupResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroup(resourceGroupName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroup(resourceGroupName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupNext(
resourceGroupName,
@@ -152,9 +125,7 @@ export class IotSecuritySolutionImpl implements IotSecuritySolution {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/iotSecuritySolutionsAnalyticsAggregatedAlert.ts b/sdk/security/arm-security/src/operations/iotSecuritySolutionsAnalyticsAggregatedAlert.ts
index 591232afc82d..a13297c853b3 100644
--- a/sdk/security/arm-security/src/operations/iotSecuritySolutionsAnalyticsAggregatedAlert.ts
+++ b/sdk/security/arm-security/src/operations/iotSecuritySolutionsAnalyticsAggregatedAlert.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { IotSecuritySolutionsAnalyticsAggregatedAlert } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -58,16 +57,8 @@ export class IotSecuritySolutionsAnalyticsAggregatedAlertImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(
- resourceGroupName,
- solutionName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listPagingPage(resourceGroupName, solutionName, options);
}
};
}
@@ -75,18 +66,11 @@ export class IotSecuritySolutionsAnalyticsAggregatedAlertImpl
private async *listPagingPage(
resourceGroupName: string,
solutionName: string,
- options?: IotSecuritySolutionsAnalyticsAggregatedAlertListOptionalParams,
- settings?: PageSettings
+ options?: IotSecuritySolutionsAnalyticsAggregatedAlertListOptionalParams
): AsyncIterableIterator {
- let result: IotSecuritySolutionsAnalyticsAggregatedAlertListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(resourceGroupName, solutionName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(resourceGroupName, solutionName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
resourceGroupName,
@@ -95,9 +79,7 @@ export class IotSecuritySolutionsAnalyticsAggregatedAlertImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/iotSecuritySolutionsAnalyticsRecommendation.ts b/sdk/security/arm-security/src/operations/iotSecuritySolutionsAnalyticsRecommendation.ts
index 17f16039df73..a43941426a5f 100644
--- a/sdk/security/arm-security/src/operations/iotSecuritySolutionsAnalyticsRecommendation.ts
+++ b/sdk/security/arm-security/src/operations/iotSecuritySolutionsAnalyticsRecommendation.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { IotSecuritySolutionsAnalyticsRecommendation } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
IoTSecurityAggregatedRecommendation,
IotSecuritySolutionsAnalyticsRecommendationListNextOptionalParams,
IotSecuritySolutionsAnalyticsRecommendationListOptionalParams,
- IotSecuritySolutionsAnalyticsRecommendationListResponse,
IotSecuritySolutionsAnalyticsRecommendationGetOptionalParams,
IotSecuritySolutionsAnalyticsRecommendationGetResponse,
+ IotSecuritySolutionsAnalyticsRecommendationListResponse,
IotSecuritySolutionsAnalyticsRecommendationListNextResponse
} from "../models";
@@ -58,16 +57,8 @@ export class IotSecuritySolutionsAnalyticsRecommendationImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(
- resourceGroupName,
- solutionName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listPagingPage(resourceGroupName, solutionName, options);
}
};
}
@@ -75,18 +66,11 @@ export class IotSecuritySolutionsAnalyticsRecommendationImpl
private async *listPagingPage(
resourceGroupName: string,
solutionName: string,
- options?: IotSecuritySolutionsAnalyticsRecommendationListOptionalParams,
- settings?: PageSettings
+ options?: IotSecuritySolutionsAnalyticsRecommendationListOptionalParams
): AsyncIterableIterator {
- let result: IotSecuritySolutionsAnalyticsRecommendationListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(resourceGroupName, solutionName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(resourceGroupName, solutionName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
resourceGroupName,
@@ -95,9 +79,7 @@ export class IotSecuritySolutionsAnalyticsRecommendationImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/jitNetworkAccessPolicies.ts b/sdk/security/arm-security/src/operations/jitNetworkAccessPolicies.ts
index d1787f5f575f..ce8746070583 100644
--- a/sdk/security/arm-security/src/operations/jitNetworkAccessPolicies.ts
+++ b/sdk/security/arm-security/src/operations/jitNetworkAccessPolicies.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { JitNetworkAccessPolicies } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,15 +16,15 @@ import {
JitNetworkAccessPolicy,
JitNetworkAccessPoliciesListNextOptionalParams,
JitNetworkAccessPoliciesListOptionalParams,
- JitNetworkAccessPoliciesListResponse,
JitNetworkAccessPoliciesListByRegionNextOptionalParams,
JitNetworkAccessPoliciesListByRegionOptionalParams,
- JitNetworkAccessPoliciesListByRegionResponse,
JitNetworkAccessPoliciesListByResourceGroupNextOptionalParams,
JitNetworkAccessPoliciesListByResourceGroupOptionalParams,
- JitNetworkAccessPoliciesListByResourceGroupResponse,
JitNetworkAccessPoliciesListByResourceGroupAndRegionNextOptionalParams,
JitNetworkAccessPoliciesListByResourceGroupAndRegionOptionalParams,
+ JitNetworkAccessPoliciesListResponse,
+ JitNetworkAccessPoliciesListByRegionResponse,
+ JitNetworkAccessPoliciesListByResourceGroupResponse,
JitNetworkAccessPoliciesListByResourceGroupAndRegionResponse,
JitNetworkAccessPoliciesGetOptionalParams,
JitNetworkAccessPoliciesGetResponse,
@@ -69,34 +68,22 @@ export class JitNetworkAccessPoliciesImpl implements JitNetworkAccessPolicies {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: JitNetworkAccessPoliciesListOptionalParams,
- settings?: PageSettings
+ options?: JitNetworkAccessPoliciesListOptionalParams
): AsyncIterableIterator {
- let result: JitNetworkAccessPoliciesListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -126,29 +113,19 @@ export class JitNetworkAccessPoliciesImpl implements JitNetworkAccessPolicies {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByRegionPagingPage(ascLocation, options, settings);
+ byPage: () => {
+ return this.listByRegionPagingPage(ascLocation, options);
}
};
}
private async *listByRegionPagingPage(
ascLocation: string,
- options?: JitNetworkAccessPoliciesListByRegionOptionalParams,
- settings?: PageSettings
+ options?: JitNetworkAccessPoliciesListByRegionOptionalParams
): AsyncIterableIterator {
- let result: JitNetworkAccessPoliciesListByRegionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByRegion(ascLocation, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByRegion(ascLocation, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByRegionNext(
ascLocation,
@@ -156,9 +133,7 @@ export class JitNetworkAccessPoliciesImpl implements JitNetworkAccessPolicies {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -192,33 +167,19 @@ export class JitNetworkAccessPoliciesImpl implements JitNetworkAccessPolicies {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByResourceGroupPagingPage(
- resourceGroupName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listByResourceGroupPagingPage(resourceGroupName, options);
}
};
}
private async *listByResourceGroupPagingPage(
resourceGroupName: string,
- options?: JitNetworkAccessPoliciesListByResourceGroupOptionalParams,
- settings?: PageSettings
+ options?: JitNetworkAccessPoliciesListByResourceGroupOptionalParams
): AsyncIterableIterator {
- let result: JitNetworkAccessPoliciesListByResourceGroupResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroup(resourceGroupName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroup(resourceGroupName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupNext(
resourceGroupName,
@@ -226,9 +187,7 @@ export class JitNetworkAccessPoliciesImpl implements JitNetworkAccessPolicies {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -269,15 +228,11 @@ export class JitNetworkAccessPoliciesImpl implements JitNetworkAccessPolicies {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listByResourceGroupAndRegionPagingPage(
resourceGroupName,
ascLocation,
- options,
- settings
+ options
);
}
};
@@ -286,22 +241,15 @@ export class JitNetworkAccessPoliciesImpl implements JitNetworkAccessPolicies {
private async *listByResourceGroupAndRegionPagingPage(
resourceGroupName: string,
ascLocation: string,
- options?: JitNetworkAccessPoliciesListByResourceGroupAndRegionOptionalParams,
- settings?: PageSettings
+ options?: JitNetworkAccessPoliciesListByResourceGroupAndRegionOptionalParams
): AsyncIterableIterator {
- let result: JitNetworkAccessPoliciesListByResourceGroupAndRegionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroupAndRegion(
- resourceGroupName,
- ascLocation,
- options
- );
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroupAndRegion(
+ resourceGroupName,
+ ascLocation,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupAndRegionNext(
resourceGroupName,
@@ -310,9 +258,7 @@ export class JitNetworkAccessPoliciesImpl implements JitNetworkAccessPolicies {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/locations.ts b/sdk/security/arm-security/src/operations/locations.ts
index 4331121b098f..30e1744dca9c 100644
--- a/sdk/security/arm-security/src/operations/locations.ts
+++ b/sdk/security/arm-security/src/operations/locations.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Locations } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -53,34 +52,22 @@ export class LocationsImpl implements Locations {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: LocationsListOptionalParams,
- settings?: PageSettings
+ options?: LocationsListOptionalParams
): AsyncIterableIterator {
- let result: LocationsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/operations.ts b/sdk/security/arm-security/src/operations/operations.ts
index 5d26baaa3bc5..b4953ee838f9 100644
--- a/sdk/security/arm-security/src/operations/operations.ts
+++ b/sdk/security/arm-security/src/operations/operations.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Operations } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -49,34 +48,22 @@ export class OperationsImpl implements Operations {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: OperationsListOptionalParams,
- settings?: PageSettings
+ options?: OperationsListOptionalParams
): AsyncIterableIterator {
- let result: OperationsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/regulatoryComplianceAssessments.ts b/sdk/security/arm-security/src/operations/regulatoryComplianceAssessments.ts
index 257e1f1ed673..3f52d797da8e 100644
--- a/sdk/security/arm-security/src/operations/regulatoryComplianceAssessments.ts
+++ b/sdk/security/arm-security/src/operations/regulatoryComplianceAssessments.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { RegulatoryComplianceAssessments } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -60,15 +59,11 @@ export class RegulatoryComplianceAssessmentsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listPagingPage(
regulatoryComplianceStandardName,
regulatoryComplianceControlName,
- options,
- settings
+ options
);
}
};
@@ -77,22 +72,15 @@ export class RegulatoryComplianceAssessmentsImpl
private async *listPagingPage(
regulatoryComplianceStandardName: string,
regulatoryComplianceControlName: string,
- options?: RegulatoryComplianceAssessmentsListOptionalParams,
- settings?: PageSettings
+ options?: RegulatoryComplianceAssessmentsListOptionalParams
): AsyncIterableIterator {
- let result: RegulatoryComplianceAssessmentsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(
- regulatoryComplianceStandardName,
- regulatoryComplianceControlName,
- options
- );
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(
+ regulatoryComplianceStandardName,
+ regulatoryComplianceControlName,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
regulatoryComplianceStandardName,
@@ -101,9 +89,7 @@ export class RegulatoryComplianceAssessmentsImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/regulatoryComplianceControls.ts b/sdk/security/arm-security/src/operations/regulatoryComplianceControls.ts
index eac6a49052c7..30b576f33754 100644
--- a/sdk/security/arm-security/src/operations/regulatoryComplianceControls.ts
+++ b/sdk/security/arm-security/src/operations/regulatoryComplianceControls.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { RegulatoryComplianceControls } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -54,33 +53,19 @@ export class RegulatoryComplianceControlsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(
- regulatoryComplianceStandardName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listPagingPage(regulatoryComplianceStandardName, options);
}
};
}
private async *listPagingPage(
regulatoryComplianceStandardName: string,
- options?: RegulatoryComplianceControlsListOptionalParams,
- settings?: PageSettings
+ options?: RegulatoryComplianceControlsListOptionalParams
): AsyncIterableIterator {
- let result: RegulatoryComplianceControlsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(regulatoryComplianceStandardName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(regulatoryComplianceStandardName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
regulatoryComplianceStandardName,
@@ -88,9 +73,7 @@ export class RegulatoryComplianceControlsImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/regulatoryComplianceStandards.ts b/sdk/security/arm-security/src/operations/regulatoryComplianceStandards.ts
index 2bd2b46c852f..f203900517df 100644
--- a/sdk/security/arm-security/src/operations/regulatoryComplianceStandards.ts
+++ b/sdk/security/arm-security/src/operations/regulatoryComplianceStandards.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { RegulatoryComplianceStandards } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -52,34 +51,22 @@ export class RegulatoryComplianceStandardsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: RegulatoryComplianceStandardsListOptionalParams,
- settings?: PageSettings
+ options?: RegulatoryComplianceStandardsListOptionalParams
): AsyncIterableIterator {
- let result: RegulatoryComplianceStandardsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/secureScoreControlDefinitions.ts b/sdk/security/arm-security/src/operations/secureScoreControlDefinitions.ts
index 920a0d6dc310..5fbc81bd45e1 100644
--- a/sdk/security/arm-security/src/operations/secureScoreControlDefinitions.ts
+++ b/sdk/security/arm-security/src/operations/secureScoreControlDefinitions.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SecureScoreControlDefinitions } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
SecureScoreControlDefinitionItem,
SecureScoreControlDefinitionsListNextOptionalParams,
SecureScoreControlDefinitionsListOptionalParams,
- SecureScoreControlDefinitionsListResponse,
SecureScoreControlDefinitionsListBySubscriptionNextOptionalParams,
SecureScoreControlDefinitionsListBySubscriptionOptionalParams,
+ SecureScoreControlDefinitionsListResponse,
SecureScoreControlDefinitionsListBySubscriptionResponse,
SecureScoreControlDefinitionsListNextResponse,
SecureScoreControlDefinitionsListBySubscriptionNextResponse
@@ -54,34 +53,22 @@ export class SecureScoreControlDefinitionsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: SecureScoreControlDefinitionsListOptionalParams,
- settings?: PageSettings
+ options?: SecureScoreControlDefinitionsListOptionalParams
): AsyncIterableIterator {
- let result: SecureScoreControlDefinitionsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -109,34 +96,22 @@ export class SecureScoreControlDefinitionsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listBySubscriptionPagingPage(options, settings);
+ byPage: () => {
+ return this.listBySubscriptionPagingPage(options);
}
};
}
private async *listBySubscriptionPagingPage(
- options?: SecureScoreControlDefinitionsListBySubscriptionOptionalParams,
- settings?: PageSettings
+ options?: SecureScoreControlDefinitionsListBySubscriptionOptionalParams
): AsyncIterableIterator {
- let result: SecureScoreControlDefinitionsListBySubscriptionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listBySubscription(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listBySubscription(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listBySubscriptionNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/secureScoreControls.ts b/sdk/security/arm-security/src/operations/secureScoreControls.ts
index 554b30125fcb..8643a57816da 100644
--- a/sdk/security/arm-security/src/operations/secureScoreControls.ts
+++ b/sdk/security/arm-security/src/operations/secureScoreControls.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SecureScoreControls } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
SecureScoreControlDetails,
SecureScoreControlsListBySecureScoreNextOptionalParams,
SecureScoreControlsListBySecureScoreOptionalParams,
- SecureScoreControlsListBySecureScoreResponse,
SecureScoreControlsListNextOptionalParams,
SecureScoreControlsListOptionalParams,
+ SecureScoreControlsListBySecureScoreResponse,
SecureScoreControlsListResponse,
SecureScoreControlsListBySecureScoreNextResponse,
SecureScoreControlsListNextResponse
@@ -56,33 +55,19 @@ export class SecureScoreControlsImpl implements SecureScoreControls {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listBySecureScorePagingPage(
- secureScoreName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listBySecureScorePagingPage(secureScoreName, options);
}
};
}
private async *listBySecureScorePagingPage(
secureScoreName: string,
- options?: SecureScoreControlsListBySecureScoreOptionalParams,
- settings?: PageSettings
+ options?: SecureScoreControlsListBySecureScoreOptionalParams
): AsyncIterableIterator {
- let result: SecureScoreControlsListBySecureScoreResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listBySecureScore(secureScoreName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listBySecureScore(secureScoreName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listBySecureScoreNext(
secureScoreName,
@@ -90,9 +75,7 @@ export class SecureScoreControlsImpl implements SecureScoreControls {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -123,34 +106,22 @@ export class SecureScoreControlsImpl implements SecureScoreControls {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: SecureScoreControlsListOptionalParams,
- settings?: PageSettings
+ options?: SecureScoreControlsListOptionalParams
): AsyncIterableIterator {
- let result: SecureScoreControlsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/secureScores.ts b/sdk/security/arm-security/src/operations/secureScores.ts
index cd92d5be5942..0b84b95cde6f 100644
--- a/sdk/security/arm-security/src/operations/secureScores.ts
+++ b/sdk/security/arm-security/src/operations/secureScores.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SecureScores } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -51,34 +50,22 @@ export class SecureScoresImpl implements SecureScores {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: SecureScoresListOptionalParams,
- settings?: PageSettings
+ options?: SecureScoresListOptionalParams
): AsyncIterableIterator {
- let result: SecureScoresListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/securityConnectorApplications.ts b/sdk/security/arm-security/src/operations/securityConnectorApplications.ts
index 2b73284961b7..7cb809b3b930 100644
--- a/sdk/security/arm-security/src/operations/securityConnectorApplications.ts
+++ b/sdk/security/arm-security/src/operations/securityConnectorApplications.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SecurityConnectorApplications } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -59,15 +58,11 @@ export class SecurityConnectorApplicationsImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listPagingPage(
resourceGroupName,
securityConnectorName,
- options,
- settings
+ options
);
}
};
@@ -76,22 +71,15 @@ export class SecurityConnectorApplicationsImpl
private async *listPagingPage(
resourceGroupName: string,
securityConnectorName: string,
- options?: SecurityConnectorApplicationsListOptionalParams,
- settings?: PageSettings
+ options?: SecurityConnectorApplicationsListOptionalParams
): AsyncIterableIterator {
- let result: SecurityConnectorApplicationsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(
- resourceGroupName,
- securityConnectorName,
- options
- );
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(
+ resourceGroupName,
+ securityConnectorName,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
resourceGroupName,
@@ -100,9 +88,7 @@ export class SecurityConnectorApplicationsImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/securityConnectorGovernanceRule.ts b/sdk/security/arm-security/src/operations/securityConnectorGovernanceRule.ts
index 20863977505a..1e2993e8a11d 100644
--- a/sdk/security/arm-security/src/operations/securityConnectorGovernanceRule.ts
+++ b/sdk/security/arm-security/src/operations/securityConnectorGovernanceRule.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SecurityConnectorGovernanceRule } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -59,15 +58,11 @@ export class SecurityConnectorGovernanceRuleImpl
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listPagingPage(
resourceGroupName,
securityConnectorName,
- options,
- settings
+ options
);
}
};
@@ -76,22 +71,15 @@ export class SecurityConnectorGovernanceRuleImpl
private async *listPagingPage(
resourceGroupName: string,
securityConnectorName: string,
- options?: SecurityConnectorGovernanceRuleListOptionalParams,
- settings?: PageSettings
+ options?: SecurityConnectorGovernanceRuleListOptionalParams
): AsyncIterableIterator {
- let result: SecurityConnectorGovernanceRuleListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(
- resourceGroupName,
- securityConnectorName,
- options
- );
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(
+ resourceGroupName,
+ securityConnectorName,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
resourceGroupName,
@@ -100,9 +88,7 @@ export class SecurityConnectorGovernanceRuleImpl
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/securityConnectors.ts b/sdk/security/arm-security/src/operations/securityConnectors.ts
index 6399e0059845..07657b0301a6 100644
--- a/sdk/security/arm-security/src/operations/securityConnectors.ts
+++ b/sdk/security/arm-security/src/operations/securityConnectors.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SecurityConnectors } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
SecurityConnector,
SecurityConnectorsListNextOptionalParams,
SecurityConnectorsListOptionalParams,
- SecurityConnectorsListResponse,
SecurityConnectorsListByResourceGroupNextOptionalParams,
SecurityConnectorsListByResourceGroupOptionalParams,
+ SecurityConnectorsListResponse,
SecurityConnectorsListByResourceGroupResponse,
SecurityConnectorsGetOptionalParams,
SecurityConnectorsGetResponse,
@@ -61,34 +60,22 @@ export class SecurityConnectorsImpl implements SecurityConnectors {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: SecurityConnectorsListOptionalParams,
- settings?: PageSettings
+ options?: SecurityConnectorsListOptionalParams
): AsyncIterableIterator {
- let result: SecurityConnectorsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -119,33 +106,19 @@ export class SecurityConnectorsImpl implements SecurityConnectors {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByResourceGroupPagingPage(
- resourceGroupName,
- options,
- settings
- );
+ byPage: () => {
+ return this.listByResourceGroupPagingPage(resourceGroupName, options);
}
};
}
private async *listByResourceGroupPagingPage(
resourceGroupName: string,
- options?: SecurityConnectorsListByResourceGroupOptionalParams,
- settings?: PageSettings
+ options?: SecurityConnectorsListByResourceGroupOptionalParams
): AsyncIterableIterator {
- let result: SecurityConnectorsListByResourceGroupResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroup(resourceGroupName, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroup(resourceGroupName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupNext(
resourceGroupName,
@@ -153,9 +126,7 @@ export class SecurityConnectorsImpl implements SecurityConnectors {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/securityContacts.ts b/sdk/security/arm-security/src/operations/securityContacts.ts
index d78aa8f67604..346bd811cbe1 100644
--- a/sdk/security/arm-security/src/operations/securityContacts.ts
+++ b/sdk/security/arm-security/src/operations/securityContacts.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SecurityContacts } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -54,34 +53,22 @@ export class SecurityContactsImpl implements SecurityContacts {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: SecurityContactsListOptionalParams,
- settings?: PageSettings
+ options?: SecurityContactsListOptionalParams
): AsyncIterableIterator {
- let result: SecurityContactsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/securitySolutions.ts b/sdk/security/arm-security/src/operations/securitySolutions.ts
index b1823fa4227f..1f6af5d837f1 100644
--- a/sdk/security/arm-security/src/operations/securitySolutions.ts
+++ b/sdk/security/arm-security/src/operations/securitySolutions.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SecuritySolutions } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -51,34 +50,22 @@ export class SecuritySolutionsImpl implements SecuritySolutions {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: SecuritySolutionsListOptionalParams,
- settings?: PageSettings
+ options?: SecuritySolutionsListOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/settings.ts b/sdk/security/arm-security/src/operations/settings.ts
index a252cca2152e..05fac13160e0 100644
--- a/sdk/security/arm-security/src/operations/settings.ts
+++ b/sdk/security/arm-security/src/operations/settings.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Settings } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -54,34 +53,22 @@ export class SettingsImpl implements Settings {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: SettingsListOptionalParams,
- settings?: PageSettings
+ options?: SettingsListOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/softwareInventories.ts b/sdk/security/arm-security/src/operations/softwareInventories.ts
index 1cbe05bb487e..29a1f328cad4 100644
--- a/sdk/security/arm-security/src/operations/softwareInventories.ts
+++ b/sdk/security/arm-security/src/operations/softwareInventories.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SoftwareInventories } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
Software,
SoftwareInventoriesListByExtendedResourceNextOptionalParams,
SoftwareInventoriesListByExtendedResourceOptionalParams,
- SoftwareInventoriesListByExtendedResourceResponse,
SoftwareInventoriesListBySubscriptionNextOptionalParams,
SoftwareInventoriesListBySubscriptionOptionalParams,
+ SoftwareInventoriesListByExtendedResourceResponse,
SoftwareInventoriesListBySubscriptionResponse,
SoftwareInventoriesGetOptionalParams,
SoftwareInventoriesGetResponse,
@@ -70,17 +69,13 @@ export class SoftwareInventoriesImpl implements SoftwareInventories {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listByExtendedResourcePagingPage(
resourceGroupName,
resourceNamespace,
resourceType,
resourceName,
- options,
- settings
+ options
);
}
};
@@ -91,24 +86,17 @@ export class SoftwareInventoriesImpl implements SoftwareInventories {
resourceNamespace: string,
resourceType: string,
resourceName: string,
- options?: SoftwareInventoriesListByExtendedResourceOptionalParams,
- settings?: PageSettings
+ options?: SoftwareInventoriesListByExtendedResourceOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._listByExtendedResource(
+ resourceGroupName,
+ resourceNamespace,
+ resourceType,
+ resourceName,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByExtendedResourceNext(
resourceGroupName,
@@ -119,9 +107,7 @@ export class SoftwareInventoriesImpl implements SoftwareInventories {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -158,34 +144,22 @@ export class SoftwareInventoriesImpl implements SoftwareInventories {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listBySubscriptionPagingPage(options, settings);
+ byPage: () => {
+ return this.listBySubscriptionPagingPage(options);
}
};
}
private async *listBySubscriptionPagingPage(
- options?: SoftwareInventoriesListBySubscriptionOptionalParams,
- settings?: PageSettings
+ options?: SoftwareInventoriesListBySubscriptionOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._listBySubscription(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listBySubscriptionNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/subAssessments.ts b/sdk/security/arm-security/src/operations/subAssessments.ts
index b7de6f7eeb88..859740916e55 100644
--- a/sdk/security/arm-security/src/operations/subAssessments.ts
+++ b/sdk/security/arm-security/src/operations/subAssessments.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { SubAssessments } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
SecuritySubAssessment,
SubAssessmentsListAllNextOptionalParams,
SubAssessmentsListAllOptionalParams,
- SubAssessmentsListAllResponse,
SubAssessmentsListNextOptionalParams,
SubAssessmentsListOptionalParams,
+ SubAssessmentsListAllResponse,
SubAssessmentsListResponse,
SubAssessmentsGetOptionalParams,
SubAssessmentsGetResponse,
@@ -59,35 +58,23 @@ export class SubAssessmentsImpl implements SubAssessments {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listAllPagingPage(scope, options, settings);
+ byPage: () => {
+ return this.listAllPagingPage(scope, options);
}
};
}
private async *listAllPagingPage(
scope: string,
- options?: SubAssessmentsListAllOptionalParams,
- settings?: PageSettings
+ options?: SubAssessmentsListAllOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._listAll(scope, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listAllNext(scope, continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -121,11 +108,8 @@ export class SubAssessmentsImpl implements SubAssessments {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(scope, assessmentName, options, settings);
+ byPage: () => {
+ return this.listPagingPage(scope, assessmentName, options);
}
};
}
@@ -133,18 +117,11 @@ export class SubAssessmentsImpl implements SubAssessments {
private async *listPagingPage(
scope: string,
assessmentName: string,
- options?: SubAssessmentsListOptionalParams,
- settings?: PageSettings
+ options?: SubAssessmentsListOptionalParams
): AsyncIterableIterator {
- 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;
- }
+ let result = await this._list(scope, assessmentName, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(
scope,
@@ -153,9 +130,7 @@ export class SubAssessmentsImpl implements SubAssessments {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/tasks.ts b/sdk/security/arm-security/src/operations/tasks.ts
index c47865dc9c0c..241d8bba8de8 100644
--- a/sdk/security/arm-security/src/operations/tasks.ts
+++ b/sdk/security/arm-security/src/operations/tasks.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Tasks } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,17 +16,17 @@ import {
SecurityTask,
TasksListNextOptionalParams,
TasksListOptionalParams,
- TasksListResponse,
TasksListByHomeRegionNextOptionalParams,
TasksListByHomeRegionOptionalParams,
- TasksListByHomeRegionResponse,
TasksListByResourceGroupNextOptionalParams,
TasksListByResourceGroupOptionalParams,
- TasksListByResourceGroupResponse,
+ TasksListResponse,
+ TasksListByHomeRegionResponse,
TasksGetSubscriptionLevelTaskOptionalParams,
TasksGetSubscriptionLevelTaskResponse,
TaskUpdateActionType,
TasksUpdateSubscriptionLevelTaskStateOptionalParams,
+ TasksListByResourceGroupResponse,
TasksGetResourceGroupLevelTaskOptionalParams,
TasksGetResourceGroupLevelTaskResponse,
TasksUpdateResourceGroupLevelTaskStateOptionalParams,
@@ -64,34 +63,22 @@ export class TasksImpl implements Tasks {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: TasksListOptionalParams,
- settings?: PageSettings
+ options?: TasksListOptionalParams
): AsyncIterableIterator {
- let result: TasksListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -121,29 +108,19 @@ export class TasksImpl implements Tasks {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByHomeRegionPagingPage(ascLocation, options, settings);
+ byPage: () => {
+ return this.listByHomeRegionPagingPage(ascLocation, options);
}
};
}
private async *listByHomeRegionPagingPage(
ascLocation: string,
- options?: TasksListByHomeRegionOptionalParams,
- settings?: PageSettings
+ options?: TasksListByHomeRegionOptionalParams
): AsyncIterableIterator {
- let result: TasksListByHomeRegionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByHomeRegion(ascLocation, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByHomeRegion(ascLocation, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByHomeRegionNext(
ascLocation,
@@ -151,9 +128,7 @@ export class TasksImpl implements Tasks {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -194,15 +169,11 @@ export class TasksImpl implements Tasks {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
+ byPage: () => {
return this.listByResourceGroupPagingPage(
resourceGroupName,
ascLocation,
- options,
- settings
+ options
);
}
};
@@ -211,22 +182,15 @@ export class TasksImpl implements Tasks {
private async *listByResourceGroupPagingPage(
resourceGroupName: string,
ascLocation: string,
- options?: TasksListByResourceGroupOptionalParams,
- settings?: PageSettings
+ options?: TasksListByResourceGroupOptionalParams
): AsyncIterableIterator {
- let result: TasksListByResourceGroupResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByResourceGroup(
- resourceGroupName,
- ascLocation,
- options
- );
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByResourceGroup(
+ resourceGroupName,
+ ascLocation,
+ options
+ );
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByResourceGroupNext(
resourceGroupName,
@@ -235,9 +199,7 @@ export class TasksImpl implements Tasks {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/topology.ts b/sdk/security/arm-security/src/operations/topology.ts
index 9cac9af0fec4..6b0608f41b5d 100644
--- a/sdk/security/arm-security/src/operations/topology.ts
+++ b/sdk/security/arm-security/src/operations/topology.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { Topology } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -17,9 +16,9 @@ import {
TopologyResource,
TopologyListNextOptionalParams,
TopologyListOptionalParams,
- TopologyListResponse,
TopologyListByHomeRegionNextOptionalParams,
TopologyListByHomeRegionOptionalParams,
+ TopologyListResponse,
TopologyListByHomeRegionResponse,
TopologyGetOptionalParams,
TopologyGetResponse,
@@ -55,34 +54,22 @@ export class TopologyImpl implements Topology {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: TopologyListOptionalParams,
- settings?: PageSettings
+ options?: TopologyListOptionalParams
): AsyncIterableIterator {
- let result: TopologyListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
@@ -112,29 +99,19 @@ export class TopologyImpl implements Topology {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listByHomeRegionPagingPage(ascLocation, options, settings);
+ byPage: () => {
+ return this.listByHomeRegionPagingPage(ascLocation, options);
}
};
}
private async *listByHomeRegionPagingPage(
ascLocation: string,
- options?: TopologyListByHomeRegionOptionalParams,
- settings?: PageSettings
+ options?: TopologyListByHomeRegionOptionalParams
): AsyncIterableIterator {
- let result: TopologyListByHomeRegionResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._listByHomeRegion(ascLocation, options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._listByHomeRegion(ascLocation, options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listByHomeRegionNext(
ascLocation,
@@ -142,9 +119,7 @@ export class TopologyImpl implements Topology {
options
);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/operations/workspaceSettings.ts b/sdk/security/arm-security/src/operations/workspaceSettings.ts
index 1bf77edbda23..c0c10de0f2af 100644
--- a/sdk/security/arm-security/src/operations/workspaceSettings.ts
+++ b/sdk/security/arm-security/src/operations/workspaceSettings.ts
@@ -6,8 +6,7 @@
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
import { WorkspaceSettings } from "../operationsInterfaces";
import * as coreClient from "@azure/core-client";
import * as Mappers from "../models/mappers";
@@ -57,34 +56,22 @@ export class WorkspaceSettingsImpl implements WorkspaceSettings {
[Symbol.asyncIterator]() {
return this;
},
- byPage: (settings?: PageSettings) => {
- if (settings?.maxPageSize) {
- throw new Error("maxPageSize is not supported by this operation.");
- }
- return this.listPagingPage(options, settings);
+ byPage: () => {
+ return this.listPagingPage(options);
}
};
}
private async *listPagingPage(
- options?: WorkspaceSettingsListOptionalParams,
- settings?: PageSettings
+ options?: WorkspaceSettingsListOptionalParams
): AsyncIterableIterator {
- let result: WorkspaceSettingsListResponse;
- let continuationToken = settings?.continuationToken;
- if (!continuationToken) {
- result = await this._list(options);
- let page = result.value || [];
- continuationToken = result.nextLink;
- setContinuationToken(page, continuationToken);
- yield page;
- }
+ let result = await this._list(options);
+ yield result.value || [];
+ let continuationToken = result.nextLink;
while (continuationToken) {
result = await this._listNext(continuationToken, options);
continuationToken = result.nextLink;
- let page = result.value || [];
- setContinuationToken(page, continuationToken);
- yield page;
+ yield result.value || [];
}
}
diff --git a/sdk/security/arm-security/src/pagingHelper.ts b/sdk/security/arm-security/src/pagingHelper.ts
deleted file mode 100644
index d85fc13bce1e..000000000000
--- a/sdk/security/arm-security/src/pagingHelper.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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();
-
-/**
- * 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);
-}
diff --git a/sdk/security/arm-security/src/securityCenter.ts b/sdk/security/arm-security/src/securityCenter.ts
index 73c4240a47ef..03f770ff8af3 100644
--- a/sdk/security/arm-security/src/securityCenter.ts
+++ b/sdk/security/arm-security/src/securityCenter.ts
@@ -178,13 +178,16 @@ export class SecurityCenter extends coreClient.ServiceClient {
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
: `${packageDetails}`;
+ if (!options.credentialScopes) {
+ options.credentialScopes = ["https://management.azure.com/.default"];
+ }
const optionsWithDefaults = {
...defaults,
...options,
userAgentOptions: {
userAgentPrefix
},
- endpoint:
+ baseUri:
options.endpoint ?? options.baseUri ?? "https://management.azure.com"
};
super(optionsWithDefaults);
@@ -210,9 +213,7 @@ export class SecurityCenter extends coreClient.ServiceClient {
this.pipeline.addPolicy(
coreRestPipeline.bearerTokenAuthenticationPolicy({
credential: credentials,
- scopes:
- optionsWithDefaults.credentialScopes ??
- `${optionsWithDefaults.endpoint}/.default`,
+ scopes: `${optionsWithDefaults.credentialScopes}`,
challengeCallbacks: {
authorizeRequestOnChallenge:
coreClient.authorizeRequestOnClaimChallenge
diff --git a/sdk/security/arm-security/test/sampleTest.ts b/sdk/security/arm-security/test/sampleTest.ts
new file mode 100644
index 000000000000..25aeb3ebcc36
--- /dev/null
+++ b/sdk/security/arm-security/test/sampleTest.ts
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+import {
+ Recorder,
+ RecorderStartOptions,
+ env
+} from "@azure-tools/test-recorder";
+import { assert } from "chai";
+import { Context } from "mocha";
+
+const replaceableVariables: Record = {
+ AZURE_CLIENT_ID: "azure_client_id",
+ AZURE_CLIENT_SECRET: "azure_client_secret",
+ AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
+ SUBSCRIPTION_ID: "azure_subscription_id"
+};
+
+const recorderOptions: RecorderStartOptions = {
+ envSetupForPlayback: replaceableVariables
+};
+
+describe("My test", () => {
+ let recorder: Recorder;
+
+ beforeEach(async function(this: Context) {
+ recorder = new Recorder(this.currentTest);
+ await recorder.start(recorderOptions);
+ });
+
+ afterEach(async function() {
+ await recorder.stop();
+ });
+
+ it("sample test", async function() {
+ console.log("Hi, I'm a test!");
+ });
+});
diff --git a/sdk/security/arm-security/tsconfig.json b/sdk/security/arm-security/tsconfig.json
index 3f5144384125..3e6ae96443f3 100644
--- a/sdk/security/arm-security/tsconfig.json
+++ b/sdk/security/arm-security/tsconfig.json
@@ -15,17 +15,11 @@
],
"declaration": true,
"outDir": "./dist-esm",
- "importHelpers": true,
- "paths": {
- "@azure/arm-security": [
- "./src/index"
- ]
- }
+ "importHelpers": true
},
"include": [
"./src/**/*.ts",
- "./test/**/*.ts",
- "samples-dev/**/*.ts"
+ "./test/**/*.ts"
],
"exclude": [
"node_modules"