From 68385ef4114d14f9ef97c04ecf190c428db7b13f Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 3 May 2022 23:25:26 +0000 Subject: [PATCH] CodeGen from PR 18895 in Azure/azure-rest-api-specs Merge ff908090bd79fb050cb5d4522cf8d7464073a91c into 50ed15bd61ac79f2368d769df0c207a00b9e099f --- common/config/rush/pnpm-lock.yaml | 31 ++++---- sdk/eventgrid/arm-eventgrid/CHANGELOG.md | 8 +- sdk/eventgrid/arm-eventgrid/README.md | 11 --- sdk/eventgrid/arm-eventgrid/_meta.json | 8 +- sdk/eventgrid/arm-eventgrid/package.json | 36 +++------ .../arm-eventgrid/review/arm-eventgrid.api.md | 33 ++++++++ sdk/eventgrid/arm-eventgrid/rollup.config.js | 78 +++++++++++++++++-- .../src/eventGridManagementClient.ts | 5 +- .../arm-eventgrid/src/models/index.ts | 57 +++++++++++++- .../arm-eventgrid/src/operations/channels.ts | 4 +- .../operations/domainEventSubscriptions.ts | 68 +++++++++++++--- .../domainTopicEventSubscriptions.ts | 72 ++++++++++++++--- .../src/operations/domainTopics.ts | 8 +- .../arm-eventgrid/src/operations/domains.ts | 12 +-- .../src/operations/eventChannels.ts | 4 +- .../src/operations/eventSubscriptions.ts | 12 +-- .../src/operations/partnerConfigurations.ts | 12 +-- .../src/operations/partnerDestinations.ts | 4 +- .../src/operations/partnerNamespaces.ts | 12 +-- .../src/operations/partnerRegistrations.ts | 12 +-- .../partnerTopicEventSubscriptions.ts | 12 +-- .../src/operations/partnerTopics.ts | 4 +- .../operations/privateEndpointConnections.ts | 8 +- .../systemTopicEventSubscriptions.ts | 12 +-- .../src/operations/systemTopics.ts | 12 +-- .../src/operations/topicEventSubscriptions.ts | 68 +++++++++++++--- .../arm-eventgrid/src/operations/topics.ts | 16 +--- .../arm-eventgrid/test/sampleTest.ts | 48 ++++++++++++ sdk/eventgrid/arm-eventgrid/tsconfig.json | 10 +-- 29 files changed, 458 insertions(+), 219 deletions(-) create mode 100644 sdk/eventgrid/arm-eventgrid/test/sampleTest.ts diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 5ff4fc59ae81..c895bbf9ccf2 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -10807,28 +10807,27 @@ packages: dev: false file:projects/arm-eventgrid.tgz: - resolution: {integrity: sha512-XscA7PNd+AncG9fYsHq0qfE3n7vA1whsgIEJxPoELsmZMlst8wc+n55LeYiEROwpemNQrAzUddFYWoa3/Hk0Jg==, tarball: file:projects/arm-eventgrid.tgz} + resolution: {integrity: sha512-dQpEfB3vlOtUtsq8bpfrDkGs1bhylhY96nlbuGX7LuimWFipmlGdonScBKIDlsnYBpManmwhSQJ6uC+805d0gg==, tarball: file:projects/arm-eventgrid.tgz} name: '@rush-temp/arm-eventgrid' version: 0.0.0 dependencies: '@azure-tools/test-recorder': 1.0.2 '@azure/identity': 2.0.4 - '@microsoft/api-extractor': 7.18.11 - '@rollup/plugin-commonjs': 21.1.0_rollup@2.70.2 - '@rollup/plugin-json': 4.1.0_rollup@2.70.2 - '@rollup/plugin-multi-entry': 4.1.0_rollup@2.70.2 - '@rollup/plugin-node-resolve': 13.2.1_rollup@2.70.2 + '@microsoft/api-extractor': 7.23.0 + '@rollup/plugin-commonjs': 11.0.2_rollup@1.32.1 + '@rollup/plugin-json': 4.1.0_rollup@1.32.1 + '@rollup/plugin-multi-entry': 3.0.1_rollup@1.32.1 + '@rollup/plugin-node-resolve': 8.4.0_rollup@1.32.1 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 rimraf: 3.0.2 - rollup: 2.70.2 - rollup-plugin-sourcemaps: 0.6.3_rollup@2.70.2 + rollup: 1.32.1 + rollup-plugin-sourcemaps: 0.4.2_rollup@1.32.1 tslib: 2.4.0 typescript: 4.2.4 uglify-js: 3.15.4 transitivePeerDependencies: - - '@types/node' - debug - encoding - supports-color @@ -13944,7 +13943,7 @@ packages: dev: false file:projects/communication-chat.tgz: - resolution: {integrity: sha512-FqxHOpHgvyJ+4HOwbd46Dnvs0GLTHf2yn8GXEM+q7A+SdJlVRoSFkc0p+778/j5MjMec4wUI8o9vjwqo4NpSqg==, tarball: file:projects/communication-chat.tgz} + resolution: {integrity: sha512-+8VZZdu1Fu/lKPyvi/37fpg6+S7upYhys4DsaznSQ+ulmGfBnw0P7bYej9X9FpYgA+efyZX0TlI9WhSaWXNV8Q==, tarball: file:projects/communication-chat.tgz} name: '@rush-temp/communication-chat' version: 0.0.0 dependencies: @@ -14040,7 +14039,7 @@ packages: dev: false file:projects/communication-identity.tgz: - resolution: {integrity: sha512-vxgXni5XMG17f4VN9oUMwK92VPtbzVp0QEuMUunxHkN3Php0q1wkEzXOQYH6e3LJ9gPF3f5OO9SlhOQZLZmJXA==, tarball: file:projects/communication-identity.tgz} + resolution: {integrity: sha512-AkTEHTicK1ekCwVX6HT+2OtonFbaage4MyKFk7wTSQHhK02WtcfKrubzcYxbPUA5+A5pc9yiLJdNqk56e3zxvA==, tarball: file:projects/communication-identity.tgz} name: '@rush-temp/communication-identity' version: 0.0.0 dependencies: @@ -14084,7 +14083,7 @@ packages: dev: false file:projects/communication-network-traversal.tgz: - resolution: {integrity: sha512-iED6nE4NRyd7+qNY65Ss9/lngc0U4xh7DrfmtP5DMt2w6Cm2UGghNmpTZam4ImgvOd4+EWYWPbKLF8/MqxL38w==, tarball: file:projects/communication-network-traversal.tgz} + resolution: {integrity: sha512-6ZYXWgB9oALo9Rc7xHYhVbsqpW+exsd1L55nltwzNwt8vpW7+Yc8BLGEUknfFyQO259w75AEpRZe4UL8W0HxcA==, tarball: file:projects/communication-network-traversal.tgz} name: '@rush-temp/communication-network-traversal' version: 0.0.0 dependencies: @@ -14140,7 +14139,7 @@ packages: dev: false file:projects/communication-phone-numbers.tgz: - resolution: {integrity: sha512-TY1dj2joVG2RJ2GGtfpTOu780pBjScLNmyCZyvE6dloZPrV5zWnBX/h3sRoYu3uAyk8pZoPlmo6mxcIGzQHSLw==, tarball: file:projects/communication-phone-numbers.tgz} + resolution: {integrity: sha512-IJc+4F/LXXmhwoJYyN+JQL18SJ4tHlOkqdk4j0kwa+hgTu3UKy0kaFpiSJ4eIttK0CZ4aFwVwd/oJnHabAc3Aw==, tarball: file:projects/communication-phone-numbers.tgz} name: '@rush-temp/communication-phone-numbers' version: 0.0.0 dependencies: @@ -14188,7 +14187,7 @@ packages: dev: false file:projects/communication-short-codes.tgz: - resolution: {integrity: sha512-Iy050FwINEEFX1maUdTLOiOyqT/KKTDLcBUDnNKvbzYHEYwO5vTeTc8tRQmVGsiIGaTjQOAfg1MEekMQolQxUQ==, tarball: file:projects/communication-short-codes.tgz} + resolution: {integrity: sha512-93KQ1ue9OxVCFXCRO1kvR82UE9E06ufrpRfwEr6U7eqro2a2e+IXl66cgA1T1q4pwDZSp0HgQ0au3c0sfwcO8A==, tarball: file:projects/communication-short-codes.tgz} name: '@rush-temp/communication-short-codes' version: 0.0.0 dependencies: @@ -14236,7 +14235,7 @@ packages: dev: false file:projects/communication-sms.tgz: - resolution: {integrity: sha512-E/nwbz1Zg3kgLv1+MLlZeHvQByxJ2oNMrPKsRs1C0qF1T+T3lVNHUjQfoCYT/PiQZ9JG0VBP3IMSE9Wseb2dgg==, tarball: file:projects/communication-sms.tgz} + resolution: {integrity: sha512-PzOvaS727+n8TUBbTTgBRf3DfYxAczzVlfb2430AWyb0H1LXtbMcwBUNNxoPSKbkZ3//6FjfCsb6Hz6ODPztNQ==, tarball: file:projects/communication-sms.tgz} name: '@rush-temp/communication-sms' version: 0.0.0 dependencies: @@ -14454,7 +14453,7 @@ packages: dev: false file:projects/core-client-1.tgz: - resolution: {integrity: sha512-YVRueduM5XqOb2/bGEpUPclRvtfNt94OijJSFZBuobcIG+rjBny/AjYlBA3WCorxiRykA1pgO5iOWwrL8X061A==, tarball: file:projects/core-client-1.tgz} + resolution: {integrity: sha512-pKMx4lsB6VWxrN4kxJ4vnj5dVJXzZ4y3ej0DVGSy6m4OXzToIATJ+gAlJrKJkl2siLVVi8DuBBTWFK6jIQDJag==, tarball: file:projects/core-client-1.tgz} name: '@rush-temp/core-client-1' version: 0.0.0 dependencies: diff --git a/sdk/eventgrid/arm-eventgrid/CHANGELOG.md b/sdk/eventgrid/arm-eventgrid/CHANGELOG.md index 993822420bcf..255487101ba8 100644 --- a/sdk/eventgrid/arm-eventgrid/CHANGELOG.md +++ b/sdk/eventgrid/arm-eventgrid/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 14.0.0-beta.1 (2022-04-06) +## 14.0.0-beta.2 (2022-05-03) **Features** @@ -30,6 +30,7 @@ - Added Interface DomainEventSubscriptionsGetDeliveryAttributesOptionalParams - Added Interface DomainEventSubscriptionsGetFullUrlOptionalParams - Added Interface DomainEventSubscriptionsGetOptionalParams + - Added Interface DomainEventSubscriptionsListNextOptionalParams - Added Interface DomainEventSubscriptionsListOptionalParams - Added Interface DomainEventSubscriptionsUpdateOptionalParams - Added Interface DomainTopicEventSubscriptionsCreateOrUpdateOptionalParams @@ -37,6 +38,7 @@ - Added Interface DomainTopicEventSubscriptionsGetDeliveryAttributesOptionalParams - Added Interface DomainTopicEventSubscriptionsGetFullUrlOptionalParams - Added Interface DomainTopicEventSubscriptionsGetOptionalParams + - Added Interface DomainTopicEventSubscriptionsListNextOptionalParams - Added Interface DomainTopicEventSubscriptionsListOptionalParams - Added Interface DomainTopicEventSubscriptionsUpdateOptionalParams - Added Interface EventChannelDestination @@ -132,6 +134,7 @@ - Added Interface TopicEventSubscriptionsGetDeliveryAttributesOptionalParams - Added Interface TopicEventSubscriptionsGetFullUrlOptionalParams - Added Interface TopicEventSubscriptionsGetOptionalParams + - Added Interface TopicEventSubscriptionsListNextOptionalParams - Added Interface TopicEventSubscriptionsListOptionalParams - Added Interface TopicEventSubscriptionsUpdateOptionalParams - Added Interface VerifiedPartnersGetOptionalParams @@ -152,12 +155,14 @@ - Added Type Alias DomainEventSubscriptionsGetDeliveryAttributesResponse - Added Type Alias DomainEventSubscriptionsGetFullUrlResponse - Added Type Alias DomainEventSubscriptionsGetResponse + - Added Type Alias DomainEventSubscriptionsListNextResponse - Added Type Alias DomainEventSubscriptionsListResponse - Added Type Alias DomainEventSubscriptionsUpdateResponse - Added Type Alias DomainTopicEventSubscriptionsCreateOrUpdateResponse - Added Type Alias DomainTopicEventSubscriptionsGetDeliveryAttributesResponse - Added Type Alias DomainTopicEventSubscriptionsGetFullUrlResponse - Added Type Alias DomainTopicEventSubscriptionsGetResponse + - Added Type Alias DomainTopicEventSubscriptionsListNextResponse - Added Type Alias DomainTopicEventSubscriptionsListResponse - Added Type Alias DomainTopicEventSubscriptionsUpdateResponse - Added Type Alias EventChannel @@ -249,6 +254,7 @@ - Added Type Alias TopicEventSubscriptionsGetDeliveryAttributesResponse - Added Type Alias TopicEventSubscriptionsGetFullUrlResponse - Added Type Alias TopicEventSubscriptionsGetResponse + - Added Type Alias TopicEventSubscriptionsListNextResponse - Added Type Alias TopicEventSubscriptionsListResponse - Added Type Alias TopicEventSubscriptionsUpdateResponse - Added Type Alias VerifiedPartner diff --git a/sdk/eventgrid/arm-eventgrid/README.md b/sdk/eventgrid/arm-eventgrid/README.md index 1f767893bca4..2f99b9c83456 100644 --- a/sdk/eventgrid/arm-eventgrid/README.md +++ b/sdk/eventgrid/arm-eventgrid/README.md @@ -16,8 +16,6 @@ Azure EventGrid Management Client - [LTS versions of Node.js](https://nodejs.org/about/releases/) - Latest versions of Safari, Chrome, Edge and Firefox. -See our [support policy](https://github.com/Azure/azure-sdk-for-js/blob/main/SUPPORT.md) for more details. - ### Prerequisites - An [Azure subscription][azure_sub]. @@ -51,17 +49,8 @@ For more information about how to create an Azure AD Application check out [this ```javascript const { EventGridManagementClient } = require("@azure/arm-eventgrid"); const { DefaultAzureCredential } = require("@azure/identity"); -// For client-side applications running in the browser, use InteractiveBrowserCredential instead of DefaultAzureCredential. See https://aka.ms/azsdk/js/identity/examples for more details. - const subscriptionId = "00000000-0000-0000-0000-000000000000"; const client = new EventGridManagementClient(new DefaultAzureCredential(), subscriptionId); - -// For client-side applications running in the browser, use this code instead: -// const credential = new InteractiveBrowserCredential({ -// tenantId: "", -// clientId: "" -// }); -// const client = new EventGridManagementClient(credential, subscriptionId); ``` diff --git a/sdk/eventgrid/arm-eventgrid/_meta.json b/sdk/eventgrid/arm-eventgrid/_meta.json index 1b3e56baf8d0..47c677446f97 100644 --- a/sdk/eventgrid/arm-eventgrid/_meta.json +++ b/sdk/eventgrid/arm-eventgrid/_meta.json @@ -1,8 +1,8 @@ { - "commit": "515a036fd42e59b65e94c8480b3a850d0b192bfc", + "commit": "713d48eb2bab28330a9cd154a3a70e0ced04c788", "readme": "specification/eventgrid/resource-manager/readme.md", - "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\work\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\eventgrid\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.18.20220329.1 --generate-sample=true", + "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --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/eventgrid/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220105.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.2.1", - "use": "@autorest/typescript@6.0.0-alpha.18.20220329.1" + "release_tool": "@azure-tools/js-sdk-release-tools@2.3.0", + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/eventgrid/arm-eventgrid/package.json b/sdk/eventgrid/arm-eventgrid/package.json index 5366d3edadbf..119370dbf546 100644 --- a/sdk/eventgrid/arm-eventgrid/package.json +++ b/sdk/eventgrid/arm-eventgrid/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for EventGridManagementClient.", - "version": "14.0.0-beta.1", + "version": "14.0.0-beta.2", "engines": { "node": ">=12.0.0" }, @@ -28,14 +28,14 @@ "module": "./dist-esm/src/index.js", "types": "./types/arm-eventgrid.d.ts", "devDependencies": { - "@microsoft/api-extractor": "7.18.11", - "@rollup/plugin-commonjs": "^21.0.1", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-multi-entry": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.1.3", + "@microsoft/api-extractor": "^7.18.11", + "@rollup/plugin-commonjs": "11.0.2", + "@rollup/plugin-json": "^4.0.0", + "@rollup/plugin-multi-entry": "^3.0.0", + "@rollup/plugin-node-resolve": "^8.0.0", "mkdirp": "^1.0.4", - "rollup": "^2.66.1", - "rollup-plugin-sourcemaps": "^0.6.3", + "rollup": "^1.16.3", + "rollup-plugin-sourcemaps": "^0.4.2", "typescript": "~4.2.0", "uglify-js": "^3.4.9", "rimraf": "^3.0.0", @@ -98,21 +98,5 @@ "docs": "echo skipped" }, "sideEffects": false, - "//metadata": { - "constantPaths": [ - { - "path": "src/eventGridManagementClient.ts", - "prefix": "packageDetails" - } - ] - }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-eventgrid?view=azure-node-preview" - } -} + "autoPublish": true +} \ No newline at end of file diff --git a/sdk/eventgrid/arm-eventgrid/review/arm-eventgrid.api.md b/sdk/eventgrid/arm-eventgrid/review/arm-eventgrid.api.md index a1f312ae46f5..41b535c8b46a 100644 --- a/sdk/eventgrid/arm-eventgrid/review/arm-eventgrid.api.md +++ b/sdk/eventgrid/arm-eventgrid/review/arm-eventgrid.api.md @@ -257,8 +257,19 @@ export interface DomainEventSubscriptionsGetOptionalParams extends coreClient.Op // @public export type DomainEventSubscriptionsGetResponse = EventSubscription; +// @public +export interface DomainEventSubscriptionsListNextOptionalParams extends coreClient.OperationOptions { + filter?: string; + top?: number; +} + +// @public +export type DomainEventSubscriptionsListNextResponse = EventSubscriptionsListResult; + // @public export interface DomainEventSubscriptionsListOptionalParams extends coreClient.OperationOptions { + filter?: string; + top?: number; } // @public @@ -442,8 +453,19 @@ export interface DomainTopicEventSubscriptionsGetOptionalParams extends coreClie // @public export type DomainTopicEventSubscriptionsGetResponse = EventSubscription; +// @public +export interface DomainTopicEventSubscriptionsListNextOptionalParams extends coreClient.OperationOptions { + filter?: string; + top?: number; +} + +// @public +export type DomainTopicEventSubscriptionsListNextResponse = EventSubscriptionsListResult; + // @public export interface DomainTopicEventSubscriptionsListOptionalParams extends coreClient.OperationOptions { + filter?: string; + top?: number; } // @public @@ -3033,8 +3055,19 @@ export interface TopicEventSubscriptionsGetOptionalParams extends coreClient.Ope // @public export type TopicEventSubscriptionsGetResponse = EventSubscription; +// @public +export interface TopicEventSubscriptionsListNextOptionalParams extends coreClient.OperationOptions { + filter?: string; + top?: number; +} + +// @public +export type TopicEventSubscriptionsListNextResponse = EventSubscriptionsListResult; + // @public export interface TopicEventSubscriptionsListOptionalParams extends coreClient.OperationOptions { + filter?: string; + top?: number; } // @public diff --git a/sdk/eventgrid/arm-eventgrid/rollup.config.js b/sdk/eventgrid/arm-eventgrid/rollup.config.js index 3f89d7309da5..9be1955eb7f1 100644 --- a/sdk/eventgrid/arm-eventgrid/rollup.config.js +++ b/sdk/eventgrid/arm-eventgrid/rollup.config.js @@ -14,14 +14,62 @@ import json from "@rollup/plugin-json"; import nodeBuiltins from "builtin-modules"; +/** + * Gets the proper configuration needed for rollup's commonJS plugin for @opentelemetry/api. + * + * NOTE: this manual configuration is only needed because OpenTelemetry uses an + * __exportStar downleveled helper function to declare its exports which confuses + * rollup's automatic discovery mechanism. + * + * @returns an object reference that can be `...`'d into your cjs() configuration. + */ +export function openTelemetryCommonJs() { + const namedExports = {}; + + for (const key of [ + "@opentelemetry/api", + "@azure/core-tracing/node_modules/@opentelemetry/api" + ]) { + namedExports[key] = [ + "SpanKind", + "TraceFlags", + "getSpan", + "setSpan", + "SpanStatusCode", + "getSpanContext", + "setSpanContext" + ]; + } + + const releasedOpenTelemetryVersions = ["0.10.2", "1.0.0-rc.0"]; + + for (const version of releasedOpenTelemetryVersions) { + namedExports[ + // working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path. + `../../../common/temp/node_modules/.pnpm/@opentelemetry/api@${version}/node_modules/@opentelemetry/api/build/src/index.js` + ] = [ + "SpanKind", + "TraceFlags", + "getSpan", + "setSpan", + "StatusCode", + "CanonicalCode", + "getSpanContext", + "setSpanContext" + ]; + } + + return namedExports; +} + // #region Warning Handler /** - * A function that can determine whether a rollup warning should be ignored. If + * A function that can determine whether a rollupwarning should be ignored. If * the function returns `true`, then the warning will not be displayed. */ -function ignoreNiseSinonEval(warning) { +function ignoreNiseSinonEvalWarnings(warning) { return ( warning.code === "EVAL" && warning.id && @@ -30,14 +78,17 @@ function ignoreNiseSinonEval(warning) { ); } -function ignoreChaiCircularDependency(warning) { +function ignoreChaiCircularDependencyWarnings(warning) { return ( warning.code === "CIRCULAR_DEPENDENCY" && warning.importer && warning.importer.includes("node_modules/chai") === true ); } -const warningInhibitors = [ignoreChaiCircularDependency, ignoreNiseSinonEval]; +const warningInhibitors = [ + ignoreChaiCircularDependencyWarnings, + ignoreNiseSinonEvalWarnings +]; /** * Construct a warning handler for the shared rollup configuration @@ -71,7 +122,22 @@ function makeBrowserTestConfig() { nodeResolve({ mainFields: ["module", "browser"] }), - cjs(), + cjs({ + namedExports: { + // Chai's strange internal architecture makes it impossible to statically + // analyze its exports. + chai: [ + "version", + "use", + "util", + "config", + "expect", + "should", + "assert" + ], + ...openTelemetryCommonJs() + } + }), json(), sourcemaps() //viz({ filename: "dist-test/browser-stats.html", sourcemap: true }) @@ -107,7 +173,7 @@ export function makeConfig(pkg, options) { ], output: { file: "dist/index.js", format: "cjs", sourcemap: true }, preserveSymlinks: false, - plugins: [sourcemaps(), nodeResolve()] + plugins: [sourcemaps(), nodeResolve(), cjs()] }; const config = [baseConfig]; diff --git a/sdk/eventgrid/arm-eventgrid/src/eventGridManagementClient.ts b/sdk/eventgrid/arm-eventgrid/src/eventGridManagementClient.ts index cf1201483fc8..a0278da5f02d 100644 --- a/sdk/eventgrid/arm-eventgrid/src/eventGridManagementClient.ts +++ b/sdk/eventgrid/arm-eventgrid/src/eventGridManagementClient.ts @@ -93,7 +93,7 @@ export class EventGridManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-eventgrid/14.0.0-beta.1`; + const packageDetails = `azsdk-js-arm-eventgrid/14.0.0-beta.2`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -108,8 +108,7 @@ export class EventGridManagementClient extends coreClient.ServiceClient { userAgentOptions: { userAgentPrefix }, - baseUri: - options.endpoint ?? options.baseUri ?? "https://management.azure.com" + baseUri: options.endpoint || "https://management.azure.com" }; super(optionsWithDefaults); // Parameter assignments diff --git a/sdk/eventgrid/arm-eventgrid/src/models/index.ts b/sdk/eventgrid/arm-eventgrid/src/models/index.ts index 04da8c8d3b24..8c60c31e759e 100644 --- a/sdk/eventgrid/arm-eventgrid/src/models/index.ts +++ b/sdk/eventgrid/arm-eventgrid/src/models/index.ts @@ -3195,7 +3195,12 @@ export type DomainTopicEventSubscriptionsGetFullUrlResponse = EventSubscriptionF /** Optional parameters. */ export interface DomainTopicEventSubscriptionsListOptionalParams - extends coreClient.OperationOptions {} + extends coreClient.OperationOptions { + /** The query used to filter the search results using OData syntax. Filtering is permitted on the 'name' property only and with limited number of OData operations. These operations are: the 'contains' function as well as the following logical operations: not, and, or, eq (for equal), and ne (for not equal). No arithmetic operations are supported. The following is a valid filter example: $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The following is not a valid filter example: $filter=location eq 'westus'. */ + filter?: string; + /** The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page. */ + top?: number; +} /** Contains response data for the list operation. */ export type DomainTopicEventSubscriptionsListResponse = EventSubscriptionsListResult; @@ -3207,6 +3212,18 @@ export interface DomainTopicEventSubscriptionsGetDeliveryAttributesOptionalParam /** Contains response data for the getDeliveryAttributes operation. */ export type DomainTopicEventSubscriptionsGetDeliveryAttributesResponse = DeliveryAttributeListResult; +/** Optional parameters. */ +export interface DomainTopicEventSubscriptionsListNextOptionalParams + extends coreClient.OperationOptions { + /** The query used to filter the search results using OData syntax. Filtering is permitted on the 'name' property only and with limited number of OData operations. These operations are: the 'contains' function as well as the following logical operations: not, and, or, eq (for equal), and ne (for not equal). No arithmetic operations are supported. The following is a valid filter example: $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The following is not a valid filter example: $filter=location eq 'westus'. */ + filter?: string; + /** The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page. */ + top?: number; +} + +/** Contains response data for the listNext operation. */ +export type DomainTopicEventSubscriptionsListNextResponse = EventSubscriptionsListResult; + /** Optional parameters. */ export interface TopicEventSubscriptionsGetOptionalParams extends coreClient.OperationOptions {} @@ -3256,7 +3273,12 @@ export type TopicEventSubscriptionsGetFullUrlResponse = EventSubscriptionFullUrl /** Optional parameters. */ export interface TopicEventSubscriptionsListOptionalParams - extends coreClient.OperationOptions {} + extends coreClient.OperationOptions { + /** The query used to filter the search results using OData syntax. Filtering is permitted on the 'name' property only and with limited number of OData operations. These operations are: the 'contains' function as well as the following logical operations: not, and, or, eq (for equal), and ne (for not equal). No arithmetic operations are supported. The following is a valid filter example: $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The following is not a valid filter example: $filter=location eq 'westus'. */ + filter?: string; + /** The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page. */ + top?: number; +} /** Contains response data for the list operation. */ export type TopicEventSubscriptionsListResponse = EventSubscriptionsListResult; @@ -3268,6 +3290,18 @@ export interface TopicEventSubscriptionsGetDeliveryAttributesOptionalParams /** Contains response data for the getDeliveryAttributes operation. */ export type TopicEventSubscriptionsGetDeliveryAttributesResponse = DeliveryAttributeListResult; +/** Optional parameters. */ +export interface TopicEventSubscriptionsListNextOptionalParams + extends coreClient.OperationOptions { + /** The query used to filter the search results using OData syntax. Filtering is permitted on the 'name' property only and with limited number of OData operations. These operations are: the 'contains' function as well as the following logical operations: not, and, or, eq (for equal), and ne (for not equal). No arithmetic operations are supported. The following is a valid filter example: $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The following is not a valid filter example: $filter=location eq 'westus'. */ + filter?: string; + /** The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page. */ + top?: number; +} + +/** Contains response data for the listNext operation. */ +export type TopicEventSubscriptionsListNextResponse = EventSubscriptionsListResult; + /** Optional parameters. */ export interface DomainEventSubscriptionsGetOptionalParams extends coreClient.OperationOptions {} @@ -3317,7 +3351,12 @@ export type DomainEventSubscriptionsGetFullUrlResponse = EventSubscriptionFullUr /** Optional parameters. */ export interface DomainEventSubscriptionsListOptionalParams - extends coreClient.OperationOptions {} + extends coreClient.OperationOptions { + /** The query used to filter the search results using OData syntax. Filtering is permitted on the 'name' property only and with limited number of OData operations. These operations are: the 'contains' function as well as the following logical operations: not, and, or, eq (for equal), and ne (for not equal). No arithmetic operations are supported. The following is a valid filter example: $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The following is not a valid filter example: $filter=location eq 'westus'. */ + filter?: string; + /** The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page. */ + top?: number; +} /** Contains response data for the list operation. */ export type DomainEventSubscriptionsListResponse = EventSubscriptionsListResult; @@ -3329,6 +3368,18 @@ export interface DomainEventSubscriptionsGetDeliveryAttributesOptionalParams /** Contains response data for the getDeliveryAttributes operation. */ export type DomainEventSubscriptionsGetDeliveryAttributesResponse = DeliveryAttributeListResult; +/** Optional parameters. */ +export interface DomainEventSubscriptionsListNextOptionalParams + extends coreClient.OperationOptions { + /** The query used to filter the search results using OData syntax. Filtering is permitted on the 'name' property only and with limited number of OData operations. These operations are: the 'contains' function as well as the following logical operations: not, and, or, eq (for equal), and ne (for not equal). No arithmetic operations are supported. The following is a valid filter example: $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The following is not a valid filter example: $filter=location eq 'westus'. */ + filter?: string; + /** The number of results to return per page for the list operation. Valid range for top parameter is 1 to 100. If not specified, the default number of results to be returned is 20 items per page. */ + top?: number; +} + +/** Contains response data for the listNext operation. */ +export type DomainEventSubscriptionsListNextResponse = EventSubscriptionsListResult; + /** Optional parameters. */ export interface SystemTopicEventSubscriptionsGetOptionalParams extends coreClient.OperationOptions {} diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/channels.ts b/sdk/eventgrid/arm-eventgrid/src/operations/channels.ts index e354da0750ca..2a76379cd3aa 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/channels.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/channels.ts @@ -218,12 +218,10 @@ export class ChannelsImpl implements Channels { { resourceGroupName, partnerNamespaceName, channelName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/domainEventSubscriptions.ts b/sdk/eventgrid/arm-eventgrid/src/operations/domainEventSubscriptions.ts index 36594ed8c2d1..8788a56686c3 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/domainEventSubscriptions.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/domainEventSubscriptions.ts @@ -16,6 +16,7 @@ import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; import { LroImpl } from "../lroImpl"; import { EventSubscription, + DomainEventSubscriptionsListNextOptionalParams, DomainEventSubscriptionsListOptionalParams, DomainEventSubscriptionsGetOptionalParams, DomainEventSubscriptionsGetResponse, @@ -29,7 +30,8 @@ import { DomainEventSubscriptionsGetFullUrlResponse, DomainEventSubscriptionsListResponse, DomainEventSubscriptionsGetDeliveryAttributesOptionalParams, - DomainEventSubscriptionsGetDeliveryAttributesResponse + DomainEventSubscriptionsGetDeliveryAttributesResponse, + DomainEventSubscriptionsListNextResponse } from "../models"; /// @@ -77,6 +79,17 @@ export class DomainEventSubscriptionsImpl implements DomainEventSubscriptions { ): AsyncIterableIterator { let result = await this._list(resourceGroupName, domainName, options); yield result.value || []; + let continuationToken = result.nextLink; + while (continuationToken) { + result = await this._listNext( + resourceGroupName, + domainName, + continuationToken, + options + ); + continuationToken = result.nextLink; + yield result.value || []; + } } private async *listPagingAll( @@ -185,12 +198,10 @@ export class DomainEventSubscriptionsImpl implements DomainEventSubscriptions { }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -278,12 +289,10 @@ export class DomainEventSubscriptionsImpl implements DomainEventSubscriptions { { resourceGroupName, domainName, eventSubscriptionName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -379,12 +388,10 @@ export class DomainEventSubscriptionsImpl implements DomainEventSubscriptions { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -466,6 +473,25 @@ export class DomainEventSubscriptionsImpl implements DomainEventSubscriptions { getDeliveryAttributesOperationSpec ); } + + /** + * ListNext + * @param resourceGroupName The name of the resource group within the user's subscription. + * @param domainName Name of the domain. + * @param nextLink The nextLink from the previous successful call to the List method. + * @param options The options parameters. + */ + private _listNext( + resourceGroupName: string, + domainName: string, + nextLink: string, + options?: DomainEventSubscriptionsListNextOptionalParams + ): Promise { + return this.client.sendOperationRequest( + { resourceGroupName, domainName, nextLink, options }, + listNextOperationSpec + ); + } } // Operation Specifications const serializer = coreClient.createSerializer(Mappers, /* isXml */ false); @@ -601,7 +627,7 @@ const listOperationSpec: coreClient.OperationSpec = { }, default: {} }, - queryParameters: [Parameters.apiVersion], + queryParameters: [Parameters.apiVersion, Parameters.filter, Parameters.top], urlParameters: [ Parameters.$host, Parameters.subscriptionId, @@ -632,3 +658,23 @@ const getDeliveryAttributesOperationSpec: coreClient.OperationSpec = { headerParameters: [Parameters.accept], serializer }; +const listNextOperationSpec: coreClient.OperationSpec = { + path: "{nextLink}", + httpMethod: "GET", + responses: { + 200: { + bodyMapper: Mappers.EventSubscriptionsListResult + }, + default: {} + }, + queryParameters: [Parameters.apiVersion, Parameters.filter, Parameters.top], + urlParameters: [ + Parameters.$host, + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.nextLink, + Parameters.domainName + ], + headerParameters: [Parameters.accept], + serializer +}; diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/domainTopicEventSubscriptions.ts b/sdk/eventgrid/arm-eventgrid/src/operations/domainTopicEventSubscriptions.ts index a1910c7e02a3..990932b8b9c3 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/domainTopicEventSubscriptions.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/domainTopicEventSubscriptions.ts @@ -16,6 +16,7 @@ import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; import { LroImpl } from "../lroImpl"; import { EventSubscription, + DomainTopicEventSubscriptionsListNextOptionalParams, DomainTopicEventSubscriptionsListOptionalParams, DomainTopicEventSubscriptionsGetOptionalParams, DomainTopicEventSubscriptionsGetResponse, @@ -29,7 +30,8 @@ import { DomainTopicEventSubscriptionsGetFullUrlResponse, DomainTopicEventSubscriptionsListResponse, DomainTopicEventSubscriptionsGetDeliveryAttributesOptionalParams, - DomainTopicEventSubscriptionsGetDeliveryAttributesResponse + DomainTopicEventSubscriptionsGetDeliveryAttributesResponse, + DomainTopicEventSubscriptionsListNextResponse } from "../models"; /// @@ -96,6 +98,18 @@ export class DomainTopicEventSubscriptionsImpl options ); yield result.value || []; + let continuationToken = result.nextLink; + while (continuationToken) { + result = await this._listNext( + resourceGroupName, + domainName, + topicName, + continuationToken, + options + ); + continuationToken = result.nextLink; + yield result.value || []; + } } private async *listPagingAll( @@ -216,12 +230,10 @@ export class DomainTopicEventSubscriptionsImpl }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -320,12 +332,10 @@ export class DomainTopicEventSubscriptionsImpl }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -427,12 +437,10 @@ export class DomainTopicEventSubscriptionsImpl }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -535,6 +543,27 @@ export class DomainTopicEventSubscriptionsImpl getDeliveryAttributesOperationSpec ); } + + /** + * ListNext + * @param resourceGroupName The name of the resource group within the user's subscription. + * @param domainName Name of the top level domain. + * @param topicName Name of the domain topic. + * @param nextLink The nextLink from the previous successful call to the List method. + * @param options The options parameters. + */ + private _listNext( + resourceGroupName: string, + domainName: string, + topicName: string, + nextLink: string, + options?: DomainTopicEventSubscriptionsListNextOptionalParams + ): Promise { + return this.client.sendOperationRequest( + { resourceGroupName, domainName, topicName, nextLink, options }, + listNextOperationSpec + ); + } } // Operation Specifications const serializer = coreClient.createSerializer(Mappers, /* isXml */ false); @@ -675,7 +704,7 @@ const listOperationSpec: coreClient.OperationSpec = { }, default: {} }, - queryParameters: [Parameters.apiVersion], + queryParameters: [Parameters.apiVersion, Parameters.filter, Parameters.top], urlParameters: [ Parameters.$host, Parameters.subscriptionId, @@ -708,3 +737,24 @@ const getDeliveryAttributesOperationSpec: coreClient.OperationSpec = { headerParameters: [Parameters.accept], serializer }; +const listNextOperationSpec: coreClient.OperationSpec = { + path: "{nextLink}", + httpMethod: "GET", + responses: { + 200: { + bodyMapper: Mappers.EventSubscriptionsListResult + }, + default: {} + }, + queryParameters: [Parameters.apiVersion, Parameters.filter, Parameters.top], + urlParameters: [ + Parameters.$host, + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.nextLink, + Parameters.domainName, + Parameters.topicName + ], + headerParameters: [Parameters.accept], + serializer +}; diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/domainTopics.ts b/sdk/eventgrid/arm-eventgrid/src/operations/domainTopics.ts index eb2feead801d..52c3761178a0 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/domainTopics.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/domainTopics.ts @@ -192,12 +192,10 @@ export class DomainTopicsImpl implements DomainTopics { { resourceGroupName, domainName, domainTopicName, options }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -279,12 +277,10 @@ export class DomainTopicsImpl implements DomainTopics { { resourceGroupName, domainName, domainTopicName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/domains.ts b/sdk/eventgrid/arm-eventgrid/src/operations/domains.ts index 36573e1c4045..e952f5bd3b0c 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/domains.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/domains.ts @@ -225,12 +225,10 @@ export class DomainsImpl implements Domains { { resourceGroupName, domainName, domainInfo, options }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -310,12 +308,10 @@ export class DomainsImpl implements Domains { { resourceGroupName, domainName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -394,12 +390,10 @@ export class DomainsImpl implements Domains { { resourceGroupName, domainName, domainUpdateParameters, options }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/eventChannels.ts b/sdk/eventgrid/arm-eventgrid/src/operations/eventChannels.ts index 984099b00f50..477faf8879ae 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/eventChannels.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/eventChannels.ts @@ -214,12 +214,10 @@ export class EventChannelsImpl implements EventChannels { { resourceGroupName, partnerNamespaceName, eventChannelName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/eventSubscriptions.ts b/sdk/eventgrid/arm-eventgrid/src/operations/eventSubscriptions.ts index bc1ef7b21763..be96f5c01144 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/eventSubscriptions.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/eventSubscriptions.ts @@ -867,12 +867,10 @@ export class EventSubscriptionsImpl implements EventSubscriptions { { scope, eventSubscriptionName, eventSubscriptionInfo, options }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -970,12 +968,10 @@ export class EventSubscriptionsImpl implements EventSubscriptions { { scope, eventSubscriptionName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -1078,12 +1074,10 @@ export class EventSubscriptionsImpl implements EventSubscriptions { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/partnerConfigurations.ts b/sdk/eventgrid/arm-eventgrid/src/operations/partnerConfigurations.ts index f23a74ebbb82..b15e47f7f80e 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/partnerConfigurations.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/partnerConfigurations.ts @@ -210,12 +210,10 @@ export class PartnerConfigurationsImpl implements PartnerConfigurations { { resourceGroupName, partnerConfigurationInfo, options }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -290,12 +288,10 @@ export class PartnerConfigurationsImpl implements PartnerConfigurations { { resourceGroupName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -371,12 +367,10 @@ export class PartnerConfigurationsImpl implements PartnerConfigurations { { resourceGroupName, partnerConfigurationUpdateParameters, options }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/partnerDestinations.ts b/sdk/eventgrid/arm-eventgrid/src/operations/partnerDestinations.ts index 5231bd47a5b9..46a6e3a4231f 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/partnerDestinations.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/partnerDestinations.ts @@ -240,12 +240,10 @@ export class PartnerDestinationsImpl implements PartnerDestinations { { resourceGroupName, partnerDestinationName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/partnerNamespaces.ts b/sdk/eventgrid/arm-eventgrid/src/operations/partnerNamespaces.ts index 0d180a448ccf..36dc3041db80 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/partnerNamespaces.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/partnerNamespaces.ts @@ -230,12 +230,10 @@ export class PartnerNamespacesImpl implements PartnerNamespaces { }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -315,12 +313,10 @@ export class PartnerNamespacesImpl implements PartnerNamespaces { { resourceGroupName, partnerNamespaceName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -404,12 +400,10 @@ export class PartnerNamespacesImpl implements PartnerNamespaces { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/partnerRegistrations.ts b/sdk/eventgrid/arm-eventgrid/src/operations/partnerRegistrations.ts index 1ca71c296206..12331483d036 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/partnerRegistrations.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/partnerRegistrations.ts @@ -225,12 +225,10 @@ export class PartnerRegistrationsImpl implements PartnerRegistrations { }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -310,12 +308,10 @@ export class PartnerRegistrationsImpl implements PartnerRegistrations { { resourceGroupName, partnerRegistrationName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -399,12 +395,10 @@ export class PartnerRegistrationsImpl implements PartnerRegistrations { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/partnerTopicEventSubscriptions.ts b/sdk/eventgrid/arm-eventgrid/src/operations/partnerTopicEventSubscriptions.ts index 5def567b6593..f3dfa14c2073 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/partnerTopicEventSubscriptions.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/partnerTopicEventSubscriptions.ts @@ -212,12 +212,10 @@ export class PartnerTopicEventSubscriptionsImpl }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -306,12 +304,10 @@ export class PartnerTopicEventSubscriptionsImpl { resourceGroupName, partnerTopicName, eventSubscriptionName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -408,12 +404,10 @@ export class PartnerTopicEventSubscriptionsImpl }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/partnerTopics.ts b/sdk/eventgrid/arm-eventgrid/src/operations/partnerTopics.ts index 3285e2eefbbb..2cf55ba0857f 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/partnerTopics.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/partnerTopics.ts @@ -237,12 +237,10 @@ export class PartnerTopicsImpl implements PartnerTopics { { resourceGroupName, partnerTopicName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/privateEndpointConnections.ts b/sdk/eventgrid/arm-eventgrid/src/operations/privateEndpointConnections.ts index 7cee42f9972e..b9b7f05c6703 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/privateEndpointConnections.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/privateEndpointConnections.ts @@ -228,12 +228,10 @@ export class PrivateEndpointConnectionsImpl }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -333,12 +331,10 @@ export class PrivateEndpointConnectionsImpl }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/systemTopicEventSubscriptions.ts b/sdk/eventgrid/arm-eventgrid/src/operations/systemTopicEventSubscriptions.ts index 86b8e7898604..aa5b0a59a1e5 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/systemTopicEventSubscriptions.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/systemTopicEventSubscriptions.ts @@ -212,12 +212,10 @@ export class SystemTopicEventSubscriptionsImpl }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -306,12 +304,10 @@ export class SystemTopicEventSubscriptionsImpl { resourceGroupName, systemTopicName, eventSubscriptionName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -408,12 +404,10 @@ export class SystemTopicEventSubscriptionsImpl }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/systemTopics.ts b/sdk/eventgrid/arm-eventgrid/src/operations/systemTopics.ts index fe35a3cc512b..b7ce4828e2b0 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/systemTopics.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/systemTopics.ts @@ -221,12 +221,10 @@ export class SystemTopicsImpl implements SystemTopics { { resourceGroupName, systemTopicName, systemTopicInfo, options }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -306,12 +304,10 @@ export class SystemTopicsImpl implements SystemTopics { { resourceGroupName, systemTopicName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -400,12 +396,10 @@ export class SystemTopicsImpl implements SystemTopics { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/topicEventSubscriptions.ts b/sdk/eventgrid/arm-eventgrid/src/operations/topicEventSubscriptions.ts index 76e7ba2bbf35..49f48f1ec19a 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/topicEventSubscriptions.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/topicEventSubscriptions.ts @@ -16,6 +16,7 @@ import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; import { LroImpl } from "../lroImpl"; import { EventSubscription, + TopicEventSubscriptionsListNextOptionalParams, TopicEventSubscriptionsListOptionalParams, TopicEventSubscriptionsGetOptionalParams, TopicEventSubscriptionsGetResponse, @@ -29,7 +30,8 @@ import { TopicEventSubscriptionsGetFullUrlResponse, TopicEventSubscriptionsListResponse, TopicEventSubscriptionsGetDeliveryAttributesOptionalParams, - TopicEventSubscriptionsGetDeliveryAttributesResponse + TopicEventSubscriptionsGetDeliveryAttributesResponse, + TopicEventSubscriptionsListNextResponse } from "../models"; /// @@ -77,6 +79,17 @@ export class TopicEventSubscriptionsImpl implements TopicEventSubscriptions { ): AsyncIterableIterator { let result = await this._list(resourceGroupName, topicName, options); yield result.value || []; + let continuationToken = result.nextLink; + while (continuationToken) { + result = await this._listNext( + resourceGroupName, + topicName, + continuationToken, + options + ); + continuationToken = result.nextLink; + yield result.value || []; + } } private async *listPagingAll( @@ -185,12 +198,10 @@ export class TopicEventSubscriptionsImpl implements TopicEventSubscriptions { }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -278,12 +289,10 @@ export class TopicEventSubscriptionsImpl implements TopicEventSubscriptions { { resourceGroupName, topicName, eventSubscriptionName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -379,12 +388,10 @@ export class TopicEventSubscriptionsImpl implements TopicEventSubscriptions { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -466,6 +473,25 @@ export class TopicEventSubscriptionsImpl implements TopicEventSubscriptions { getDeliveryAttributesOperationSpec ); } + + /** + * ListNext + * @param resourceGroupName The name of the resource group within the user's subscription. + * @param topicName Name of the topic. + * @param nextLink The nextLink from the previous successful call to the List method. + * @param options The options parameters. + */ + private _listNext( + resourceGroupName: string, + topicName: string, + nextLink: string, + options?: TopicEventSubscriptionsListNextOptionalParams + ): Promise { + return this.client.sendOperationRequest( + { resourceGroupName, topicName, nextLink, options }, + listNextOperationSpec + ); + } } // Operation Specifications const serializer = coreClient.createSerializer(Mappers, /* isXml */ false); @@ -601,7 +627,7 @@ const listOperationSpec: coreClient.OperationSpec = { }, default: {} }, - queryParameters: [Parameters.apiVersion], + queryParameters: [Parameters.apiVersion, Parameters.filter, Parameters.top], urlParameters: [ Parameters.$host, Parameters.subscriptionId, @@ -632,3 +658,23 @@ const getDeliveryAttributesOperationSpec: coreClient.OperationSpec = { headerParameters: [Parameters.accept], serializer }; +const listNextOperationSpec: coreClient.OperationSpec = { + path: "{nextLink}", + httpMethod: "GET", + responses: { + 200: { + bodyMapper: Mappers.EventSubscriptionsListResult + }, + default: {} + }, + queryParameters: [Parameters.apiVersion, Parameters.filter, Parameters.top], + urlParameters: [ + Parameters.$host, + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.nextLink, + Parameters.topicName + ], + headerParameters: [Parameters.accept], + serializer +}; diff --git a/sdk/eventgrid/arm-eventgrid/src/operations/topics.ts b/sdk/eventgrid/arm-eventgrid/src/operations/topics.ts index 12393eaf83b5..824feafd4667 100644 --- a/sdk/eventgrid/arm-eventgrid/src/operations/topics.ts +++ b/sdk/eventgrid/arm-eventgrid/src/operations/topics.ts @@ -304,12 +304,10 @@ export class TopicsImpl implements Topics { { resourceGroupName, topicName, topicInfo, options }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -389,12 +387,10 @@ export class TopicsImpl implements Topics { { resourceGroupName, topicName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -473,12 +469,10 @@ export class TopicsImpl implements Topics { { resourceGroupName, topicName, topicUpdateParameters, options }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -610,12 +604,10 @@ export class TopicsImpl implements Topics { { resourceGroupName, topicName, regenerateKeyRequest, options }, regenerateKeyOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/eventgrid/arm-eventgrid/test/sampleTest.ts b/sdk/eventgrid/arm-eventgrid/test/sampleTest.ts new file mode 100644 index 000000000000..7ed89b043e1b --- /dev/null +++ b/sdk/eventgrid/arm-eventgrid/test/sampleTest.ts @@ -0,0 +1,48 @@ +/* + * 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 { + env, + record, + RecorderEnvironmentSetup, + Recorder +} from "@azure-tools/test-recorder"; +import * as assert from "assert"; + +const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + 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" + }, + customizationsOnRecordings: [ + (recording: any): any => + recording.replace( + /"access_token":"[^"]*"/g, + `"access_token":"access_token"` + ) + ], + queryParametersToSkip: [] +}; + +describe("My test", () => { + let recorder: Recorder; + + beforeEach(async function() { + recorder = record(this, recorderEnvSetup); + }); + + afterEach(async function() { + await recorder.stop(); + }); + + it("sample test", async function() { + console.log("Hi, I'm a test!"); + }); +}); diff --git a/sdk/eventgrid/arm-eventgrid/tsconfig.json b/sdk/eventgrid/arm-eventgrid/tsconfig.json index bf7a2cee2deb..3e6ae96443f3 100644 --- a/sdk/eventgrid/arm-eventgrid/tsconfig.json +++ b/sdk/eventgrid/arm-eventgrid/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-eventgrid": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"