From aef99975289c4551c2739a673497a096f129eb74 Mon Sep 17 00:00:00 2001 From: Vishnu Reddy Date: Fri, 21 Jul 2023 13:54:48 -0400 Subject: [PATCH] fix: don't send error string from azure storage on the wire (#1196) * don't send error string from azure storage on the wire * concatenate status code * fix typo and update unit test --- device/core/src/blob_upload/blob_upload_result.ts | 2 +- device/core/test/blob_upload/_blob_upload_result_test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device/core/src/blob_upload/blob_upload_result.ts b/device/core/src/blob_upload/blob_upload_result.ts index 16dabde08..d811abd7c 100644 --- a/device/core/src/blob_upload/blob_upload_result.ts +++ b/device/core/src/blob_upload/blob_upload_result.ts @@ -52,7 +52,7 @@ export class BlobUploadResult { let uploadResult: BlobUploadResult; if (err) { const statusCode = ((Object.prototype.hasOwnProperty.call(err, 'statusCode')) ? (err.statusCode) : (-1)); - const statusDescription = ((Object.prototype.hasOwnProperty.call(err, 'response')) ? (err.response) : (err.message)); + const statusDescription = `Failed to upload to blob${statusCode === -1 ? '' : `. Status code: ${statusCode}`}`; /*Codes_SRS_NODE_DEVICE_BLOB_UPLOAD_RESULT_41_002: [If `err` is not `null`, the `BlobUploadResult` shall have the `isSuccess` property set to `false`]*/ uploadResult = new BlobUploadResult(false, statusCode, statusDescription); } else { diff --git a/device/core/test/blob_upload/_blob_upload_result_test.js b/device/core/test/blob_upload/_blob_upload_result_test.js index df1e1eb12..edcb05649 100644 --- a/device/core/test/blob_upload/_blob_upload_result_test.js +++ b/device/core/test/blob_upload/_blob_upload_result_test.js @@ -46,7 +46,7 @@ describe('BlobUploadResult', function () { let result = BlobUploadResult.fromAzureStorageCallbackArgs(new Error(testBody), null); assert.isFalse(result.isSuccess); assert.equal(result.statusCode, -1); - assert.equal(result.statusDescription, testBody); + assert.equal(result.statusDescription, "Failed to upload to blob"); }); /*Tests_SRS_NODE_DEVICE_BLOB_UPLOAD_RESULT_41_003: [If `err` is null but `uploadResponse` is provided, and `uploadResponse.ErrorCode` is not null, `BlobUploadResult` shall have the `isSuccess` property set to `false`]*/