[ServiceBus] Prepare for 7.10.0-beta.1 release

Azure · May 6, 2024 · 9e67a66 · 9e67a66
1 parent cc10baa
commit 9e67a66
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 22 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/sdk/servicebus/service-bus/CHANGELOG.md b/sdk/servicebus/service-bus/CHANGELOG.md
@@ -1,16 +1,10 @@
 # Release History
 
-## 7.10.0 (Unreleased)
+## 7.10.0-beta.1 (2024-05-07)
 
 ### Features Added
 
-- Adds `deleteMessages` which deletes messages from the queue.
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Add support to delete messages from an entity in batches using receiver method `deleteMessages()`. The target messages can be constrained to a fixed count, limited to only those earlier than a given date, or unconstrained such that all messages are deleted.
 
 ## 7.9.4 (2024-02-06)
 

diff --git 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.10.0",
+  "version": "7.10.0-beta.1",
   "license": "MIT",
   "description": "Azure Service Bus SDK for JavaScript",
   "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/servicebus/service-bus/",
@@ -29,14 +29,14 @@
     "./dist/index.js": "dist-esm/src/index.js",
     "./dist-esm/src/util/runtimeInfo.js": "./dist-esm/src/util/runtimeInfo.native.js"
   },
-  "types": "./types/latest/service-bus.d.ts",
+  "types": "./types/latest/service-bus-beta.d.ts",
   "engines": {
     "node": ">=18.0.0"
   },
   "files": [
     "dist/",
     "dist-esm/src/",
-    "types/latest/service-bus.d.ts",
+    "types/latest/service-bus-beta.d.ts",
     "README.md",
     "LICENSE"
   ],

diff --git a/sdk/servicebus/service-bus/src/receivers/receiver.ts b/sdk/servicebus/service-bus/src/receivers/receiver.ts
@@ -512,9 +512,9 @@ export class ServiceBusReceiverImpl implements ServiceBusReceiver {
     logger.verbose(
       `${this.logPrefix} receiver '${this.identifier}' deleted ${deletedCount} messages.`,
     );
-    if (deletedCount === MaxDeleteMessageCount) {
-      let batchCount = MaxDeleteMessageCount;
-      while (batchCount === MaxDeleteMessageCount) {
+    if (deletedCount > 0) {
+      let batchCount = deletedCount;
+      while (batchCount > 0) {
         batchCount = await this.deleteMessages({
           maxMessageCount: MaxDeleteMessageCount,
           beforeEnqueueTime: options?.beforeEnqueueTime,

diff --git a/sdk/servicebus/service-bus/src/receivers/sessionReceiver.ts b/sdk/servicebus/service-bus/src/receivers/sessionReceiver.ts
@@ -442,16 +442,25 @@ export class ServiceBusSessionReceiverImpl implements ServiceBusSessionReceiver
       maxMessageCount: MaxDeleteMessageCount,
       beforeEnqueueTime: options?.beforeEnqueueTime,
     });
-    if (deletedCount === MaxDeleteMessageCount) {
-      let batchCount = MaxDeleteMessageCount;
-      while (batchCount === MaxDeleteMessageCount) {
+    logger.verbose(
+      `${this.logPrefix} receiver '${this.identifier}' deleted ${deletedCount} messages.`,
+    );
+    if (deletedCount > 0) {
+      let batchCount = deletedCount;
+      while (batchCount > 0) {
         batchCount = await this.deleteMessages({
           maxMessageCount: MaxDeleteMessageCount,
           beforeEnqueueTime: options?.beforeEnqueueTime,
         });
+        logger.verbose(
+          `${this.logPrefix} receiver '${this.identifier}' deleted ${batchCount} messages.`,
+        );
         deletedCount += batchCount;
       }
     }
+    logger.verbose(
+      `${this.logPrefix} receiver '${this.identifier}' purged ${deletedCount} messages.`,
+    );
     return deletedCount;
   }
 

diff --git a/sdk/servicebus/service-bus/src/util/constants.ts b/sdk/servicebus/service-bus/src/util/constants.ts
@@ -6,7 +6,7 @@
  */
 export const packageJsonInfo = {
   name: "@azure/service-bus",
-  version: "7.10.0",
+  version: "7.10.0-beta.1",
 };
 
 /**