Skip to content

Commit b90c2a7

Browse files
[Service Bus] Revert core-http pin 1.1.9 and core-amqp pin 2.0.0-beta.1 👋 (Azure#12292)
1 parent 3ef4bf8 commit b90c2a7

File tree

10 files changed

+18
-20
lines changed

10 files changed

+18
-20
lines changed

common/config/rush/common-versions.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@
4141
* This design avoids unnecessary churn in this file.
4242
*/
4343
"allowedAlternativeVersions": {
44-
/**
45-
* Temporary workaround to release service-bus v7 preview.8.
46-
* Supposed to be reverted after the release.
47-
*/
48-
"@azure/core-http": ["^1.1.9"],
4944
"@azure/ms-rest-js": ["^2.0.0"],
5045
/**
5146
* For example, allow some projects to use an older TypeScript compiler

sdk/eventhub/event-hubs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
},
8989
"dependencies": {
9090
"@azure/abort-controller": "^1.0.0",
91-
"@azure/core-amqp": "2.0.0-beta.1",
91+
"@azure/core-amqp": "^2.0.0",
9292
"@azure/core-asynciterator-polyfill": "^1.0.0",
9393
"@azure/core-tracing": "1.0.0-preview.9",
9494
"@azure/core-auth": "^1.1.3",

sdk/servicebus/service-bus/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Release History
22

3+
## 7.0.0 (Unreleased)
4+
35
## 7.0.0-preview.8 (2020-11-04)
46

57
### New features:
@@ -21,6 +23,7 @@
2123
[PR 11927](https://github.com/Azure/azure-sdk-for-js/pull/11927)
2224
- 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.
2325
- Method and interface renames based on user studies and internal reviews:
26+
2427
- 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:
2528
- The `createBatch` method on the sender is renamed to `createMessageBatch`.
2629
- The interface `CreateBatchOptions` followed by the options that are passed to the `createBatch` method is renamed to `CreateMessageBatchOptions`.

sdk/servicebus/service-bus/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Use the client library `@azure/service-bus` in your application to
88
- Receive messages from an Azure Service Bus Queue or Subscription
99
- Create/Get/Delete/Update/List Queues/Topics/Subscriptions/Rules in an Azure Service Bus namespace.
1010

11-
Resources for the v7.0.0-preview.8 of `@azure/service-bus`:
11+
Resources for the v7.0.0 of `@azure/service-bus`:
1212

1313
[Source code](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/servicebus/service-bus) |
1414
[Package (npm)](https://www.npmjs.com/package/@azure/service-bus) |

sdk/servicebus/service-bus/migrationguide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Guide to migrate from @azure/service-bus v1 to v7.preview.8
1+
# Guide to migrate from @azure/service-bus v1 to v7
22

33
This document is intended for users that would like to try out preview 8
44
for @azure/service-bus. As the package is in preview, these details might

sdk/servicebus/service-bus/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@azure/service-bus",
33
"sdk-type": "client",
44
"author": "Microsoft Corporation",
5-
"version": "7.0.0-preview.8",
5+
"version": "7.0.0",
66
"license": "MIT",
77
"description": "Azure Service Bus SDK for Node.js",
88
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/servicebus/service-bus",
@@ -97,9 +97,9 @@
9797
},
9898
"dependencies": {
9999
"@azure/abort-controller": "^1.0.0",
100-
"@azure/core-amqp": "2.0.0-beta.1",
100+
"@azure/core-amqp": "^2.0.0",
101101
"@azure/core-asynciterator-polyfill": "^1.0.0",
102-
"@azure/core-http": "^1.1.9",
102+
"@azure/core-http": "^1.2.0",
103103
"@azure/core-tracing": "1.0.0-preview.9",
104104
"@azure/core-paging": "^1.1.1",
105105
"@azure/core-auth": "^1.1.3",

sdk/servicebus/service-bus/review/service-bus.api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { delay } from '@azure/core-amqp';
1010
import { Delivery } from 'rhea-promise';
1111
import { HttpResponse } from '@azure/core-http';
1212
import Long from 'long';
13-
import { MessageErrorCodes } from '@azure/core-amqp';
1413
import { MessagingError } from '@azure/core-amqp';
14+
import { MessagingErrorCodes } from '@azure/core-amqp';
1515
import { OperationOptions } from '@azure/core-http';
1616
import { PagedAsyncIterableIterator } from '@azure/core-paging';
1717
import { PageSettings } from '@azure/core-paging';
@@ -138,8 +138,6 @@ export interface GetMessageIteratorOptions extends OperationOptionsBase {
138138
// @public
139139
export function isServiceBusError(err: Error | AmqpError | ServiceBusError): err is ServiceBusError;
140140

141-
export { MessageErrorCodes }
142-
143141
// @public
144142
export interface MessageHandlers {
145143
processError(args: ProcessErrorArgs): Promise<void>;
@@ -148,6 +146,8 @@ export interface MessageHandlers {
148146

149147
export { MessagingError }
150148

149+
export { MessagingErrorCodes }
150+
151151
// @public
152152
export interface NamespaceProperties {
153153
createdAt: Date;

sdk/servicebus/service-bus/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export {
88
delay,
9-
MessageErrorCodes,
9+
MessagingErrorCodes,
1010
MessagingError,
1111
RetryOptions,
1212
TokenType,

sdk/servicebus/service-bus/src/serviceBusError.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { isMessagingError, MessageErrorCodes, MessagingError, translate } from "@azure/core-amqp";
1+
import { isMessagingError, MessagingErrorCodes, MessagingError, translate } from "@azure/core-amqp";
22
import { AmqpError } from "rhea-promise";
33

44
/**
@@ -64,13 +64,13 @@ export type ServiceBusErrorReason =
6464
| "Unauthorized";
6565

6666
/**
67-
* Translation between the MessageErrorCodes into a ServiceBusReason
67+
* Translation between the MessagingErrorCodes into a ServiceBusReason
6868
*
6969
* @internal
7070
* @ignore
7171
*/
7272
export const wellKnownMessageCodesToServiceBusReasons: Map<
73-
MessageErrorCodes,
73+
MessagingErrorCodes,
7474
ServiceBusErrorReason
7575
> = new Map([
7676
["MessagingEntityNotFoundError", "MessagingEntityNotFound"],
@@ -133,7 +133,7 @@ export class ServiceBusError extends MessagingError {
133133
}
134134

135135
private static convertMessagingCodeToReason(oldCode?: string): ServiceBusErrorReason {
136-
const code = oldCode as MessageErrorCodes | undefined;
136+
const code = oldCode as MessagingErrorCodes | undefined;
137137

138138
if (code == null || !wellKnownMessageCodesToServiceBusReasons.has(code)) {
139139
return "GeneralError";

sdk/servicebus/service-bus/src/util/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
export const packageJsonInfo = {
99
name: "@azure/service-bus",
10-
version: "7.0.0-preview.8"
10+
version: "7.0.0"
1111
};
1212

1313
/**

0 commit comments

Comments
 (0)