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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions common/config/rush/common-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/event-hubs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions sdk/servicebus/service-bus/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Release History

## 7.0.0 (Unreleased)

## 7.0.0-preview.8 (2020-11-04)

### New features:
Expand All @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion sdk/servicebus/service-bus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down
2 changes: 1 addition & 1 deletion sdk/servicebus/service-bus/migrationguide.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions sdk/servicebus/service-bus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -97,9 +97,9 @@
},
"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-http": "^1.2.0",
"@azure/core-tracing": "1.0.0-preview.9",
"@azure/core-paging": "^1.1.1",
"@azure/core-auth": "^1.1.3",
Expand Down
6 changes: 3 additions & 3 deletions sdk/servicebus/service-bus/review/service-bus.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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<void>;
Expand All @@ -148,6 +146,8 @@ export interface MessageHandlers {

export { MessagingError }

export { MessagingErrorCodes }

// @public
export interface NamespaceProperties {
createdAt: Date;
Expand Down
2 changes: 1 addition & 1 deletion sdk/servicebus/service-bus/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

export {
delay,
MessageErrorCodes,
MessagingErrorCodes,
MessagingError,
RetryOptions,
TokenType,
Expand Down
8 changes: 4 additions & 4 deletions sdk/servicebus/service-bus/src/serviceBusError.ts
Original file line number Diff line number Diff line change
@@ -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";

/**
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion sdk/servicebus/service-bus/src/util/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
export const packageJsonInfo = {
name: "@azure/service-bus",
version: "7.0.0-preview.8"
version: "7.0.0"
};

/**
Expand Down