diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 14cd0cf2ff92..ae22d9b9cc3d 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -734,6 +734,7 @@ packages: /@azure/ai-form-recognizer/3.1.0-beta.3: resolution: {integrity: sha512-+4QtFKNyxAmdqpcYjuAtmWKm/MuOe9kZsbpS9jA9h0YHzngNj5gc67AA4egV9BXOq9x+1phjYTNC/rxiOUr1uQ==} engines: {node: '>=8.0.0'} + deprecated: Please migrate to a supported (non-beta) version of this package dependencies: '@azure/core-auth': 1.4.0 '@azure/core-http': 1.2.6 @@ -3998,7 +3999,7 @@ packages: dependencies: semver: 7.3.8 shelljs: 0.8.5 - typescript: 5.1.0-dev.20230405 + typescript: 5.1.0-dev.20230406 dev: false /ecdsa-sig-formatter/1.0.11: @@ -8861,8 +8862,8 @@ packages: hasBin: true dev: false - /typescript/5.1.0-dev.20230405: - resolution: {integrity: sha512-4unWRVmR6URHndao/lK2XCSabqveeczgOSGNNQbfZW7Hu4b+YND5DlpVQOL/Yaz9olB1FgeZidZwYnTQbOXc6w==} + /typescript/5.1.0-dev.20230406: + resolution: {integrity: sha512-FYnJSNhyGIzc9fCHcPTS/YyboOKfchGpKhrDIcNCqvODooe7BNOWGx6sjMu8xTav8E0905iuPa6TOueq/C6gxg==} engines: {node: '>=12.20'} hasBin: true dev: false @@ -14661,7 +14662,7 @@ packages: dev: false file:projects/arm-servicebus.tgz: - resolution: {integrity: sha512-L90s9pI47k0w+/zZtHE3jafPE6q/qNZiK3imV/DI2Qu0FMIbEWj2QNStkWZlsCemj0Mam3go/c8VmKk8LqONSw==, tarball: file:projects/arm-servicebus.tgz} + resolution: {integrity: sha512-OWHANligOPyaDO6AM3fvI8CvBf4Kf0umHQlaY4z/IRB140f8QFWtjkWDfWBZKT45rlW7nfyZew9EXcj+3flzWA==, tarball: file:projects/arm-servicebus.tgz} name: '@rush-temp/arm-servicebus' version: 0.0.0 dependencies: @@ -14675,8 +14676,8 @@ packages: '@types/node': 14.18.42 chai: 4.3.7 cross-env: 7.0.3 - dotenv: 8.6.0 - mkdirp: 1.0.4 + dotenv: 16.0.3 + mkdirp: 2.1.6 mocha: 7.2.0 rimraf: 3.0.2 rollup: 2.79.1 @@ -15680,7 +15681,7 @@ packages: dev: false file:projects/communication-call-automation.tgz: - resolution: {integrity: sha512-BCxCcEVIqXSsumZ5b/0E4S4wAsI6WI7EsbY8tNQX/yEMYeMOKchffplek8nBnjjMXJh93itkE3Im9HTTAd4HBQ==, tarball: file:projects/communication-call-automation.tgz} + resolution: {integrity: sha512-5/l5GYmYlgc007crbcLNODtwZn7Ge10AZ7fONGz/FWCszObt2YQn/6xXttfS8zKo6XNmUFqlUd6qGhJnyv0FjA==, tarball: file:projects/communication-call-automation.tgz} name: '@rush-temp/communication-call-automation' version: 0.0.0 dependencies: @@ -15722,7 +15723,6 @@ packages: transitivePeerDependencies: - bufferutil - debug - - encoding - supports-color - utf-8-validate dev: false @@ -17171,7 +17171,7 @@ packages: dev: false file:projects/eventgrid.tgz: - resolution: {integrity: sha512-55L6D3Zr5nZu7iJ/bEuLzhKZ2AG4xeZ3aqkU2H9n3h1/bCp8g9Z4IhCZ3zBj5tSyZolhXot3cbINTIHlvDZZtA==, tarball: file:projects/eventgrid.tgz} + resolution: {integrity: sha512-/v2/2q6QmBLAy9IctuvCXDMjEedZw7eU0nNBrsQYr1zZqFHDyQRVJXLYYZVsIjWpuYTb6c/o7fkUhfe8YIuFAg==, tarball: file:projects/eventgrid.tgz} name: '@rush-temp/eventgrid' version: 0.0.0 dependencies: @@ -18744,7 +18744,7 @@ packages: dev: false file:projects/perf-service-bus.tgz: - resolution: {integrity: sha512-X1NvwwnX9KW680X8qYAvWSab7HtqQCZXw/alWYUXwIV5glv3ivLmPYQ5Piid4yK4GyhBRMmd1zmgHk+MHPXiOQ==, tarball: file:projects/perf-service-bus.tgz} + resolution: {integrity: sha512-wioVHbwMitD5Oi7RoiJr6nKap7VrDmz+QfijZnl1FWfCgRdtrCyIpYp2oC+VDnmCiPQavSFrLpW+6qmzGR1jrg==, tarball: file:projects/perf-service-bus.tgz} name: '@rush-temp/perf-service-bus' version: 0.0.0 dependencies: diff --git a/sdk/servicebus/arm-servicebus/CHANGELOG.md b/sdk/servicebus/arm-servicebus/CHANGELOG.md index 7ed6ad74eeaf..e9c1812b1e9f 100644 --- a/sdk/servicebus/arm-servicebus/CHANGELOG.md +++ b/sdk/servicebus/arm-servicebus/CHANGELOG.md @@ -1,16 +1,6 @@ # Release History - -## 6.2.0-beta.2 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - -## 6.2.0-beta.1 (2023-02-08) + +## 6.2.0-beta.2 (2023-04-06) **Features** diff --git a/sdk/servicebus/arm-servicebus/_meta.json b/sdk/servicebus/arm-servicebus/_meta.json index a19cab0ca56c..ac8d2b5b8ccc 100644 --- a/sdk/servicebus/arm-servicebus/_meta.json +++ b/sdk/servicebus/arm-servicebus/_meta.json @@ -1,8 +1,8 @@ { - "commit": "48c0c2036efcf0ccae7c0592a597699aac75ec4d", + "commit": "49c42520b1e6d7dc1d5ace715b0ff54b2dabf788", "readme": "specification/servicebus/resource-manager/readme.md", - "autorest_command": "autorest --version=3.9.3 --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\\servicebus\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.7 --generate-sample=true", + "autorest_command": "autorest --version=3.9.3 --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/servicebus/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.10", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.6.1", - "use": "@autorest/typescript@6.0.0-rc.7" + "release_tool": "@azure-tools/js-sdk-release-tools@2.7.0", + "use": "@autorest/typescript@6.0.0-rc.10" } \ No newline at end of file diff --git a/sdk/servicebus/arm-servicebus/package.json b/sdk/servicebus/arm-servicebus/package.json index 93172322d4e3..9694aaa0a20c 100644 --- a/sdk/servicebus/arm-servicebus/package.json +++ b/sdk/servicebus/arm-servicebus/package.json @@ -8,10 +8,10 @@ "node": ">=14.0.0" }, "dependencies": { - "@azure/core-lro": "^2.2.0", + "@azure/core-lro": "^2.5.0", "@azure/abort-controller": "^1.0.0", "@azure/core-paging": "^1.2.0", - "@azure/core-client": "^1.6.1", + "@azure/core-client": "^1.7.0", "@azure/core-auth": "^1.3.0", "@azure/core-rest-pipeline": "^1.8.0", "tslib": "^2.2.0" @@ -33,13 +33,13 @@ "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-multi-entry": "^6.0.0", "@rollup/plugin-node-resolve": "^13.1.3", - "mkdirp": "^1.0.4", + "mkdirp": "^2.1.2", "rollup": "^2.66.1", "rollup-plugin-sourcemaps": "^0.6.3", "typescript": "~4.8.0", "uglify-js": "^3.4.9", "rimraf": "^3.0.0", - "dotenv": "^8.2.0", + "dotenv": "^16.0.0", "@azure/identity": "^2.0.1", "@azure-tools/test-recorder": "^3.0.0", "@azure-tools/test-credential": "^1.0.0", @@ -111,13 +111,5 @@ ] }, "autoPublish": true, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/servicebus/arm-servicebus", - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-servicebus?view=azure-node-preview" - } -} + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/servicebus/arm-servicebus" +} \ No newline at end of file diff --git a/sdk/servicebus/arm-servicebus/review/arm-servicebus.api.md b/sdk/servicebus/arm-servicebus/review/arm-servicebus.api.md index bba904ff949c..5392bf468668 100644 --- a/sdk/servicebus/arm-servicebus/review/arm-servicebus.api.md +++ b/sdk/servicebus/arm-servicebus/review/arm-servicebus.api.md @@ -6,9 +6,9 @@ import * as coreAuth from '@azure/core-auth'; import * as coreClient from '@azure/core-client'; +import { OperationState } from '@azure/core-lro'; import { PagedAsyncIterableIterator } from '@azure/core-paging'; -import { PollerLike } from '@azure/core-lro'; -import { PollOperationState } from '@azure/core-lro'; +import { SimplePollerLike } from '@azure/core-lro'; // @public export interface AccessKeys { @@ -336,7 +336,7 @@ export interface MigrationConfigProperties extends ProxyResource { // @public export interface MigrationConfigs { - beginCreateAndStartMigration(resourceGroupName: string, namespaceName: string, configName: MigrationConfigurationName, parameters: MigrationConfigProperties, options?: MigrationConfigsCreateAndStartMigrationOptionalParams): Promise, MigrationConfigsCreateAndStartMigrationResponse>>; + beginCreateAndStartMigration(resourceGroupName: string, namespaceName: string, configName: MigrationConfigurationName, parameters: MigrationConfigProperties, options?: MigrationConfigsCreateAndStartMigrationOptionalParams): Promise, MigrationConfigsCreateAndStartMigrationResponse>>; beginCreateAndStartMigrationAndWait(resourceGroupName: string, namespaceName: string, configName: MigrationConfigurationName, parameters: MigrationConfigProperties, options?: MigrationConfigsCreateAndStartMigrationOptionalParams): Promise; completeMigration(resourceGroupName: string, namespaceName: string, configName: MigrationConfigurationName, options?: MigrationConfigsCompleteMigrationOptionalParams): Promise; delete(resourceGroupName: string, namespaceName: string, configName: MigrationConfigurationName, options?: MigrationConfigsDeleteOptionalParams): Promise; @@ -392,9 +392,9 @@ export type MigrationConfigurationName = string; // @public export interface Namespaces { - beginCreateOrUpdate(resourceGroupName: string, namespaceName: string, parameters: SBNamespace, options?: NamespacesCreateOrUpdateOptionalParams): Promise, NamespacesCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, namespaceName: string, parameters: SBNamespace, options?: NamespacesCreateOrUpdateOptionalParams): Promise, NamespacesCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, namespaceName: string, parameters: SBNamespace, options?: NamespacesCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, namespaceName: string, options?: NamespacesDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, namespaceName: string, options?: NamespacesDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, namespaceName: string, options?: NamespacesDeleteOptionalParams): Promise; checkNameAvailability(parameters: CheckNameAvailability, options?: NamespacesCheckNameAvailabilityOptionalParams): Promise; createOrUpdateAuthorizationRule(resourceGroupName: string, namespaceName: string, authorizationRuleName: string, parameters: SBAuthorizationRule, options?: NamespacesCreateOrUpdateAuthorizationRuleOptionalParams): Promise; @@ -644,7 +644,7 @@ export interface PrivateEndpointConnectionListResult { // @public export interface PrivateEndpointConnections { - beginDelete(resourceGroupName: string, namespaceName: string, privateEndpointConnectionName: string, options?: PrivateEndpointConnectionsDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, namespaceName: string, privateEndpointConnectionName: string, options?: PrivateEndpointConnectionsDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, namespaceName: string, privateEndpointConnectionName: string, options?: PrivateEndpointConnectionsDeleteOptionalParams): Promise; createOrUpdate(resourceGroupName: string, namespaceName: string, privateEndpointConnectionName: string, parameters: PrivateEndpointConnection, options?: PrivateEndpointConnectionsCreateOrUpdateOptionalParams): Promise; get(resourceGroupName: string, namespaceName: string, privateEndpointConnectionName: string, options?: PrivateEndpointConnectionsGetOptionalParams): Promise; diff --git a/sdk/servicebus/arm-servicebus/src/lroImpl.ts b/sdk/servicebus/arm-servicebus/src/lroImpl.ts index 518d5f053b4e..dd803cd5e28c 100644 --- a/sdk/servicebus/arm-servicebus/src/lroImpl.ts +++ b/sdk/servicebus/arm-servicebus/src/lroImpl.ts @@ -6,29 +6,37 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +import { AbortSignalLike } from "@azure/abort-controller"; import { LongRunningOperation, LroResponse } from "@azure/core-lro"; -export class LroImpl implements LongRunningOperation { - constructor( - private sendOperationFn: (args: any, spec: any) => Promise>, - private args: Record, - private spec: { - readonly requestBody?: unknown; - readonly path?: string; - readonly httpMethod: string; - } & Record, - public requestPath: string = spec.path!, - public requestMethod: string = spec.httpMethod - ) {} - public async sendInitialRequest(): Promise> { - return this.sendOperationFn(this.args, this.spec); - } - public async sendPollRequest(path: string): Promise> { - const { requestBody, ...restSpec } = this.spec; - return this.sendOperationFn(this.args, { - ...restSpec, - path, - httpMethod: "GET" - }); - } +export function createLroSpec(inputs: { + sendOperationFn: (args: any, spec: any) => Promise>; + args: Record; + spec: { + readonly requestBody?: unknown; + readonly path?: string; + readonly httpMethod: string; + } & Record; +}): LongRunningOperation { + const { args, spec, sendOperationFn } = inputs; + return { + requestMethod: spec.httpMethod, + requestPath: spec.path!, + sendInitialRequest: () => sendOperationFn(args, spec), + sendPollRequest: ( + path: string, + options?: { abortSignal?: AbortSignalLike } + ) => { + const { requestBody, ...restSpec } = spec; + return sendOperationFn(args, { + ...restSpec, + httpMethod: "GET", + path, + abortSignal: options?.abortSignal + }); + } + }; } diff --git a/sdk/servicebus/arm-servicebus/src/operations/disasterRecoveryConfigs.ts b/sdk/servicebus/arm-servicebus/src/operations/disasterRecoveryConfigs.ts index c4e25d865080..be75b0ea9e42 100644 --- a/sdk/servicebus/arm-servicebus/src/operations/disasterRecoveryConfigs.ts +++ b/sdk/servicebus/arm-servicebus/src/operations/disasterRecoveryConfigs.ts @@ -502,7 +502,9 @@ const createOrUpdateOperationSpec: coreClient.OperationSpec = { 200: { bodyMapper: Mappers.ArmDisasterRecovery }, - 201: {}, + 201: { + bodyMapper: Mappers.ArmDisasterRecovery + }, default: { bodyMapper: Mappers.ErrorResponse } diff --git a/sdk/servicebus/arm-servicebus/src/operations/migrationConfigs.ts b/sdk/servicebus/arm-servicebus/src/operations/migrationConfigs.ts index 5ec83f38a4b2..f24e3627d7b2 100644 --- a/sdk/servicebus/arm-servicebus/src/operations/migrationConfigs.ts +++ b/sdk/servicebus/arm-servicebus/src/operations/migrationConfigs.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { ServiceBusManagementClient } from "../serviceBusManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { MigrationConfigProperties, MigrationConfigsListNextOptionalParams, @@ -152,8 +156,8 @@ export class MigrationConfigsImpl implements MigrationConfigs { parameters: MigrationConfigProperties, options?: MigrationConfigsCreateAndStartMigrationOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, MigrationConfigsCreateAndStartMigrationResponse > > { @@ -163,7 +167,7 @@ export class MigrationConfigsImpl implements MigrationConfigs { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -196,13 +200,22 @@ export class MigrationConfigsImpl implements MigrationConfigs { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, namespaceName, configName, parameters, options }, - createAndStartMigrationOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { + resourceGroupName, + namespaceName, + configName, + parameters, + options + }, + spec: createAndStartMigrationOperationSpec + }); + const poller = await createHttpPoller< + MigrationConfigsCreateAndStartMigrationResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); diff --git a/sdk/servicebus/arm-servicebus/src/operations/namespaces.ts b/sdk/servicebus/arm-servicebus/src/operations/namespaces.ts index 597feaed8e6b..79acae5235f9 100644 --- a/sdk/servicebus/arm-servicebus/src/operations/namespaces.ts +++ b/sdk/servicebus/arm-servicebus/src/operations/namespaces.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { ServiceBusManagementClient } from "../serviceBusManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { SBNamespace, NamespacesListNextOptionalParams, @@ -405,8 +409,8 @@ export class NamespacesImpl implements Namespaces { parameters: SBNamespace, options?: NamespacesCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, NamespacesCreateOrUpdateResponse > > { @@ -416,7 +420,7 @@ export class NamespacesImpl implements Namespaces { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -449,13 +453,16 @@ export class NamespacesImpl implements Namespaces { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, namespaceName, parameters, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, namespaceName, parameters, options }, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + NamespacesCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -496,14 +503,14 @@ export class NamespacesImpl implements Namespaces { resourceGroupName: string, namespaceName: string, options?: NamespacesDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -536,13 +543,13 @@ export class NamespacesImpl implements Namespaces { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, namespaceName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, namespaceName, options }, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); diff --git a/sdk/servicebus/arm-servicebus/src/operations/privateEndpointConnections.ts b/sdk/servicebus/arm-servicebus/src/operations/privateEndpointConnections.ts index 0db3f1374abc..be2b86738301 100644 --- a/sdk/servicebus/arm-servicebus/src/operations/privateEndpointConnections.ts +++ b/sdk/servicebus/arm-servicebus/src/operations/privateEndpointConnections.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { ServiceBusManagementClient } from "../serviceBusManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { PrivateEndpointConnection, PrivateEndpointConnectionsListNextOptionalParams, @@ -175,14 +179,14 @@ export class PrivateEndpointConnectionsImpl namespaceName: string, privateEndpointConnectionName: string, options?: PrivateEndpointConnectionsDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -215,18 +219,18 @@ export class PrivateEndpointConnectionsImpl }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, namespaceName, privateEndpointConnectionName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); diff --git a/sdk/servicebus/arm-servicebus/src/operationsInterfaces/migrationConfigs.ts b/sdk/servicebus/arm-servicebus/src/operationsInterfaces/migrationConfigs.ts index 00695441daa0..7de9550ca063 100644 --- a/sdk/servicebus/arm-servicebus/src/operationsInterfaces/migrationConfigs.ts +++ b/sdk/servicebus/arm-servicebus/src/operationsInterfaces/migrationConfigs.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { MigrationConfigProperties, MigrationConfigsListOptionalParams, @@ -50,8 +50,8 @@ export interface MigrationConfigs { parameters: MigrationConfigProperties, options?: MigrationConfigsCreateAndStartMigrationOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, MigrationConfigsCreateAndStartMigrationResponse > >; diff --git a/sdk/servicebus/arm-servicebus/src/operationsInterfaces/namespaces.ts b/sdk/servicebus/arm-servicebus/src/operationsInterfaces/namespaces.ts index 3dd3644bd976..daafceb1be8c 100644 --- a/sdk/servicebus/arm-servicebus/src/operationsInterfaces/namespaces.ts +++ b/sdk/servicebus/arm-servicebus/src/operationsInterfaces/namespaces.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { SBNamespace, NamespacesListOptionalParams, @@ -98,8 +98,8 @@ export interface Namespaces { parameters: SBNamespace, options?: NamespacesCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, NamespacesCreateOrUpdateResponse > >; @@ -128,7 +128,7 @@ export interface Namespaces { resourceGroupName: string, namespaceName: string, options?: NamespacesDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Deletes an existing namespace. This operation also removes all associated resources under the * namespace. diff --git a/sdk/servicebus/arm-servicebus/src/operationsInterfaces/privateEndpointConnections.ts b/sdk/servicebus/arm-servicebus/src/operationsInterfaces/privateEndpointConnections.ts index 6b65cbd20cae..5ada80ff464a 100644 --- a/sdk/servicebus/arm-servicebus/src/operationsInterfaces/privateEndpointConnections.ts +++ b/sdk/servicebus/arm-servicebus/src/operationsInterfaces/privateEndpointConnections.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { PrivateEndpointConnection, PrivateEndpointConnectionsListOptionalParams, @@ -60,7 +60,7 @@ export interface PrivateEndpointConnections { namespaceName: string, privateEndpointConnectionName: string, options?: PrivateEndpointConnectionsDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Deletes an existing Private Endpoint Connection. * @param resourceGroupName Name of the Resource group within the Azure subscription. diff --git a/sdk/servicebus/arm-servicebus/test/sampleTest.ts b/sdk/servicebus/arm-servicebus/test/sampleTest.ts new file mode 100644 index 000000000000..25aeb3ebcc36 --- /dev/null +++ b/sdk/servicebus/arm-servicebus/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/servicebus/arm-servicebus/tsconfig.json b/sdk/servicebus/arm-servicebus/tsconfig.json index 035ce6434f28..3e6ae96443f3 100644 --- a/sdk/servicebus/arm-servicebus/tsconfig.json +++ b/sdk/servicebus/arm-servicebus/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-servicebus": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"