Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/security/arm-security/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 6.0.0-beta.2 (2022-11-15)
## 6.0.0-beta.2 (2022-11-16)

**Features**

Expand Down
10 changes: 5 additions & 5 deletions sdk/security/arm-security/_meta.json
Original file line number Diff line number Diff line change
@@ -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"
}
15 changes: 3 additions & 12 deletions sdk/security/arm-security/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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
}
3 changes: 0 additions & 3 deletions sdk/security/arm-security/review/arm-security.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 0 additions & 1 deletion sdk/security/arm-security/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

/// <reference lib="esnext.asynciterable" />
export { getContinuationToken } from "./pagingHelper";
export * from "./models";
export { SecurityCenter } from "./securityCenter";
export * from "./operationsInterfaces";
34 changes: 8 additions & 26 deletions sdk/security/arm-security/src/operations/aPICollection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -58,35 +57,20 @@ 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);
}
};
}

private async *listPagingPage(
resourceGroupName: string,
serviceName: string,
options?: APICollectionListOptionalParams,
settings?: PageSettings
options?: APICollectionListOptionalParams
): AsyncIterableIterator<ApiCollectionResponse[]> {
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,
Expand All @@ -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 || [];
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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
);
}
};
Expand All @@ -92,24 +87,17 @@ export class AdaptiveNetworkHardeningsImpl
resourceNamespace: string,
resourceType: string,
resourceName: string,
options?: AdaptiveNetworkHardeningsListByExtendedResourceOptionalParams,
settings?: PageSettings
options?: AdaptiveNetworkHardeningsListByExtendedResourceOptionalParams
): AsyncIterableIterator<AdaptiveNetworkHardening[]> {
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,
Expand All @@ -120,9 +108,7 @@ export class AdaptiveNetworkHardeningsImpl
options
);
continuationToken = result.nextLink;
let page = result.value || [];
setContinuationToken(page, continuationToken);
yield page;
yield result.value || [];
}
}

Expand Down
Loading