update allow optional messageText (#11258)

Azure · Sep 24, 2020 · cbcfa5b · cbcfa5b
1 parent 2e8784e
commit cbcfa5b
Show file tree

Hide file tree

Showing 5 changed files with 235 additions and 5 deletions.
diff --git a/...ueclient_messageid_methods/recording_update_visibility_timeout_only_preserve_content.json b/...ueclient_messageid_methods/recording_update_visibility_timeout_only_preserve_content.json
diff --git a/...ueueclient_messageid_methods/recording_update_visibility_timeout_only_preserve_content.js b/...ueueclient_messageid_methods/recording_update_visibility_timeout_only_preserve_content.js
diff --git a/sdk/storage/storage-queue/review/storage-queue.api.md b/sdk/storage/storage-queue/review/storage-queue.api.md
@@ -370,7 +370,7 @@ export class QueueClient extends StorageClient {
     sendMessage(messageText: string, options?: QueueSendMessageOptions): Promise<QueueSendMessageResponse>;
     setAccessPolicy(queueAcl?: SignedIdentifier[], options?: QueueSetAccessPolicyOptions): Promise<QueueSetAccessPolicyResponse>;
     setMetadata(metadata?: Metadata, options?: QueueSetMetadataOptions): Promise<QueueSetMetadataResponse>;
-    updateMessage(messageId: string, popReceipt: string, message: string, visibilityTimeout?: number, options?: QueueUpdateMessageOptions): Promise<QueueUpdateMessageResponse>;
+    updateMessage(messageId: string, popReceipt: string, message?: string, visibilityTimeout?: number, options?: QueueUpdateMessageOptions): Promise<QueueUpdateMessageResponse>;
 }
 
 // @public

diff --git a/sdk/storage/storage-queue/src/QueueClient.ts b/sdk/storage/storage-queue/src/QueueClient.ts
@@ -1271,18 +1271,21 @@ export class QueueClient extends StorageClient {
   public async updateMessage(
     messageId: string,
     popReceipt: string,
-    message: string,
+    message?: string,
     visibilityTimeout?: number,
     options: QueueUpdateMessageOptions = {}
   ): Promise<QueueUpdateMessageResponse> {
     const { span, spanOptions } = createSpan("QueueClient-updateMessage", options.tracingOptions);
+    let queueMessage = undefined;
+    if (message) {
+      queueMessage = { messageText: message };
+    }
+
     try {
       return await this.getMessageIdContext(messageId).update(popReceipt, visibilityTimeout || 0, {
         abortSignal: options.abortSignal,
         spanOptions,
-        queueMessage: {
-          messageText: message
-        }
+        queueMessage
       });
     } catch (e) {
       span.setStatus({

diff --git a/sdk/storage/storage-queue/test/messageidclient.spec.ts b/sdk/storage/storage-queue/test/messageidclient.spec.ts
@@ -206,4 +206,13 @@ describe("QueueClient messageId methods", () => {
     );
     assert.equal(newClient.name, queueName, "Queue name is not the same as the one provided.");
   });
+
+  it("update visibility timeout only preserve content", async () => {
+    const message = "foo";
+    const enqueueRes = await queueClient.sendMessage(message, { visibilityTimeout: 10 });
+    await queueClient.updateMessage(enqueueRes.messageId, enqueueRes.popReceipt);
+    const receiveMessage = (await queueClient.receiveMessages()).receivedMessageItems[0];
+    assert.equal(enqueueRes.messageId, receiveMessage.messageId);
+    assert.equal(message, receiveMessage.messageText);
+  });
 });