From 0d23d0c8083eb713d7437527f1523b0b6f4a3a4b Mon Sep 17 00:00:00 2001 From: HarshaNalluru Date: Wed, 4 Nov 2020 17:39:01 -0800 Subject: [PATCH 1/4] Revert core-http pin 1.1.9 --- common/config/rush/common-versions.json | 5 ----- sdk/servicebus/service-bus/package.json | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json index 469f25cf6337..e15efa4016c2 100644 --- a/common/config/rush/common-versions.json +++ b/common/config/rush/common-versions.json @@ -41,11 +41,6 @@ * This design avoids unnecessary churn in this file. */ "allowedAlternativeVersions": { - /** - * Temporary workaround to release service-bus v7 preview.8. - * Supposed to be reverted after the release. - */ - "@azure/core-http": ["^1.1.9"], "@azure/ms-rest-js": ["^2.0.0"], /** * For example, allow some projects to use an older TypeScript compiler diff --git a/sdk/servicebus/service-bus/package.json b/sdk/servicebus/service-bus/package.json index c894bb9df52e..293724c51c73 100644 --- a/sdk/servicebus/service-bus/package.json +++ b/sdk/servicebus/service-bus/package.json @@ -99,7 +99,7 @@ "@azure/abort-controller": "^1.0.0", "@azure/core-amqp": "2.0.0-beta.1", "@azure/core-asynciterator-polyfill": "^1.0.0", - "@azure/core-http": "^1.1.9", + "@azure/core-http": "^1.2.0", "@azure/core-tracing": "1.0.0-preview.9", "@azure/core-paging": "^1.1.1", "@azure/core-auth": "^1.1.3", From 7ec1e8f93c1d711e73b7f672e05def810b67049a Mon Sep 17 00:00:00 2001 From: HarshaNalluru Date: Wed, 4 Nov 2020 18:00:14 -0800 Subject: [PATCH 2/4] Update to core-amqp 2.0.0 --- sdk/eventhub/event-hubs/package.json | 2 +- sdk/servicebus/service-bus/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/eventhub/event-hubs/package.json b/sdk/eventhub/event-hubs/package.json index 5abfc5cbfa76..46afc25947a6 100644 --- a/sdk/eventhub/event-hubs/package.json +++ b/sdk/eventhub/event-hubs/package.json @@ -88,7 +88,7 @@ }, "dependencies": { "@azure/abort-controller": "^1.0.0", - "@azure/core-amqp": "2.0.0-beta.1", + "@azure/core-amqp": "^2.0.0", "@azure/core-asynciterator-polyfill": "^1.0.0", "@azure/core-tracing": "1.0.0-preview.9", "@azure/core-auth": "^1.1.3", diff --git a/sdk/servicebus/service-bus/package.json b/sdk/servicebus/service-bus/package.json index c894bb9df52e..9775129188ce 100644 --- a/sdk/servicebus/service-bus/package.json +++ b/sdk/servicebus/service-bus/package.json @@ -97,7 +97,7 @@ }, "dependencies": { "@azure/abort-controller": "^1.0.0", - "@azure/core-amqp": "2.0.0-beta.1", + "@azure/core-amqp": "^2.0.0", "@azure/core-asynciterator-polyfill": "^1.0.0", "@azure/core-http": "^1.1.9", "@azure/core-tracing": "1.0.0-preview.9", From 1ed7c77c622c598a051976390ec4dfb4b7f43e90 Mon Sep 17 00:00:00 2001 From: HarshaNalluru Date: Wed, 4 Nov 2020 18:02:19 -0800 Subject: [PATCH 3/4] fix imports --- sdk/servicebus/service-bus/review/service-bus.api.md | 6 +++--- sdk/servicebus/service-bus/src/index.ts | 2 +- sdk/servicebus/service-bus/src/serviceBusError.ts | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/servicebus/service-bus/review/service-bus.api.md b/sdk/servicebus/service-bus/review/service-bus.api.md index 16996a298ecc..7d5d4cd9d5f2 100644 --- a/sdk/servicebus/service-bus/review/service-bus.api.md +++ b/sdk/servicebus/service-bus/review/service-bus.api.md @@ -10,8 +10,8 @@ import { delay } from '@azure/core-amqp'; import { Delivery } from 'rhea-promise'; import { HttpResponse } from '@azure/core-http'; import Long from 'long'; -import { MessageErrorCodes } from '@azure/core-amqp'; import { MessagingError } from '@azure/core-amqp'; +import { MessagingErrorCodes } from '@azure/core-amqp'; import { OperationOptions } from '@azure/core-http'; import { PagedAsyncIterableIterator } from '@azure/core-paging'; import { PageSettings } from '@azure/core-paging'; @@ -138,8 +138,6 @@ export interface GetMessageIteratorOptions extends OperationOptionsBase { // @public export function isServiceBusError(err: Error | AmqpError | ServiceBusError): err is ServiceBusError; -export { MessageErrorCodes } - // @public export interface MessageHandlers { processError(args: ProcessErrorArgs): Promise; @@ -148,6 +146,8 @@ export interface MessageHandlers { export { MessagingError } +export { MessagingErrorCodes } + // @public export interface NamespaceProperties { createdAt: Date; diff --git a/sdk/servicebus/service-bus/src/index.ts b/sdk/servicebus/service-bus/src/index.ts index 4234df3d093e..977e6d91da81 100644 --- a/sdk/servicebus/service-bus/src/index.ts +++ b/sdk/servicebus/service-bus/src/index.ts @@ -6,7 +6,7 @@ export { delay, - MessageErrorCodes, + MessagingErrorCodes, MessagingError, RetryOptions, TokenType, diff --git a/sdk/servicebus/service-bus/src/serviceBusError.ts b/sdk/servicebus/service-bus/src/serviceBusError.ts index 807de48aff4f..6b49ee6af5be 100644 --- a/sdk/servicebus/service-bus/src/serviceBusError.ts +++ b/sdk/servicebus/service-bus/src/serviceBusError.ts @@ -1,4 +1,4 @@ -import { isMessagingError, MessageErrorCodes, MessagingError, translate } from "@azure/core-amqp"; +import { isMessagingError, MessagingErrorCodes, MessagingError, translate } from "@azure/core-amqp"; import { AmqpError } from "rhea-promise"; /** @@ -64,13 +64,13 @@ export type ServiceBusErrorReason = | "Unauthorized"; /** - * Translation between the MessageErrorCodes into a ServiceBusReason + * Translation between the MessagingErrorCodes into a ServiceBusReason * * @internal * @ignore */ export const wellKnownMessageCodesToServiceBusReasons: Map< - MessageErrorCodes, + MessagingErrorCodes, ServiceBusErrorReason > = new Map([ ["MessagingEntityNotFoundError", "MessagingEntityNotFound"], @@ -133,7 +133,7 @@ export class ServiceBusError extends MessagingError { } private static convertMessagingCodeToReason(oldCode?: string): ServiceBusErrorReason { - const code = oldCode as MessageErrorCodes | undefined; + const code = oldCode as MessagingErrorCodes | undefined; if (code == null || !wellKnownMessageCodesToServiceBusReasons.has(code)) { return "GeneralError"; From 9af4fe57436a37d247c6ea79f0e551ce55caea2d Mon Sep 17 00:00:00 2001 From: HarshaNalluru Date: Wed, 4 Nov 2020 19:23:07 -0800 Subject: [PATCH 4/4] Update version in package.json and all other relevant spots --- sdk/servicebus/service-bus/CHANGELOG.md | 3 +++ sdk/servicebus/service-bus/README.md | 2 +- sdk/servicebus/service-bus/migrationguide.md | 2 +- sdk/servicebus/service-bus/package.json | 2 +- sdk/servicebus/service-bus/src/util/constants.ts | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sdk/servicebus/service-bus/CHANGELOG.md b/sdk/servicebus/service-bus/CHANGELOG.md index d3308530d6a9..37561f37483c 100644 --- a/sdk/servicebus/service-bus/CHANGELOG.md +++ b/sdk/servicebus/service-bus/CHANGELOG.md @@ -1,5 +1,7 @@ # Release History +## 7.0.0 (Unreleased) + ## 7.0.0-preview.8 (2020-11-04) ### New features: @@ -21,6 +23,7 @@ [PR 11927](https://github.com/Azure/azure-sdk-for-js/pull/11927) - The methods to complete, abandon, defer and deadletter a message along with the method to renew message lock have been moved from the message to the receiver. With this, we now have additional validation to ensure that a peeked message cannot be used with these methods. - Method and interface renames based on user studies and internal reviews: + - The word "Message" is added to all methods and interfaces related to creating and sending a batch of messages for clarity based on user studies: - The `createBatch` method on the sender is renamed to `createMessageBatch`. - The interface `CreateBatchOptions` followed by the options that are passed to the `createBatch` method is renamed to `CreateMessageBatchOptions`. diff --git a/sdk/servicebus/service-bus/README.md b/sdk/servicebus/service-bus/README.md index 64964328fe67..7e2355aae9e5 100644 --- a/sdk/servicebus/service-bus/README.md +++ b/sdk/servicebus/service-bus/README.md @@ -8,7 +8,7 @@ Use the client library `@azure/service-bus` in your application to - Receive messages from an Azure Service Bus Queue or Subscription - Create/Get/Delete/Update/List Queues/Topics/Subscriptions/Rules in an Azure Service Bus namespace. -Resources for the v7.0.0-preview.8 of `@azure/service-bus`: +Resources for the v7.0.0 of `@azure/service-bus`: [Source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/servicebus/service-bus) | [Package (npm)](https://www.npmjs.com/package/@azure/service-bus) | diff --git a/sdk/servicebus/service-bus/migrationguide.md b/sdk/servicebus/service-bus/migrationguide.md index 267062a0cba5..b9a91db83704 100644 --- a/sdk/servicebus/service-bus/migrationguide.md +++ b/sdk/servicebus/service-bus/migrationguide.md @@ -1,4 +1,4 @@ -# Guide to migrate from @azure/service-bus v1 to v7.preview.8 +# Guide to migrate from @azure/service-bus v1 to v7 This document is intended for users that would like to try out preview 8 for @azure/service-bus. As the package is in preview, these details might diff --git a/sdk/servicebus/service-bus/package.json b/sdk/servicebus/service-bus/package.json index c1e4cfe40bed..e324887f3722 100644 --- a/sdk/servicebus/service-bus/package.json +++ b/sdk/servicebus/service-bus/package.json @@ -2,7 +2,7 @@ "name": "@azure/service-bus", "sdk-type": "client", "author": "Microsoft Corporation", - "version": "7.0.0-preview.8", + "version": "7.0.0", "license": "MIT", "description": "Azure Service Bus SDK for Node.js", "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/servicebus/service-bus", diff --git a/sdk/servicebus/service-bus/src/util/constants.ts b/sdk/servicebus/service-bus/src/util/constants.ts index cbc84670900b..6be563054393 100644 --- a/sdk/servicebus/service-bus/src/util/constants.ts +++ b/sdk/servicebus/service-bus/src/util/constants.ts @@ -7,7 +7,7 @@ */ export const packageJsonInfo = { name: "@azure/service-bus", - version: "7.0.0-preview.8" + version: "7.0.0" }; /**