Merge pull request #702 from EmmaZhu/master

Upgrade json-schema to 0.4.0 and fix an issue where customized retry interval doesn't take effact.
Azure · Dec 17, 2021 · ad8472f · ad8472f
2 parents 7a42c7b + ddc7e8b
commit ad8472f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,12 @@
 Note: This is an Azure Storage only package. The all up Azure node sdk still has the old storage bits in there. In a future release, those storage bits will be removed and an npm dependency to this storage node sdk will 
 be taken. This is a GA release and the changes described below indicate the changes from the Azure node SDK 0.9.8 available here - https://github.com/Azure/azure-sdk-for-node.
 
+2021.12 Version 2.10.6
+
+* Upgraded `validator` to 13.7.0.
+* Upgraded `json-schema` to 0.4.0.
+* Fixed an issue where customized retry interval doesn't take effact.
+
 2021.09 Version 2.10.5
 
 * Upgraded `validator` to 13.6.0.

diff --git a/lib/common/filters/retrypolicyfilter.js b/lib/common/filters/retrypolicyfilter.js
@@ -75,7 +75,6 @@ RetryPolicyFilter.prototype.handle = function (requestOptions, next) {
 RetryPolicyFilter._handle = function (self, requestOptions, next) {
 
   var retryRequestOptions = extend({}, requestOptions);
-  retryRequestOptions.retryInterval = 0;
 
   // Initialize retryContext because that will be passed to the shouldRetry method which users will implement 
   retryRequestOptions.retryContext = {

diff --git a/lib/common/services/storageserviceclient.js b/lib/common/services/storageserviceclient.js
@@ -551,6 +551,7 @@ StorageServiceClient.prototype._performRequest = function (webResource, body, op
       // filter -> operation -> process response
       if(postFiltersRequestOptions.retryContext) {
         var func = function() {
+          postFiltersRequestOptions.retryInterval = 0;
           operation(postFiltersRequestOptions, nextPostCallback);
         };
 

diff --git a/lib/common/util/constants.js b/lib/common/util/constants.js
@@ -37,7 +37,7 @@ var Constants = {
   * @const
   * @type {string}
   */
-  USER_AGENT_PRODUCT_VERSION: '2.10.5',
+  USER_AGENT_PRODUCT_VERSION: '2.10.6',
 
   /**
   * The number of default concurrent requests for parallel operation.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-storage",
   "author": "Microsoft Corporation",
-  "version": "2.10.5",
+  "version": "2.10.6",
   "description": "Microsoft Azure Storage Client Library for Node.js",
   "typings": "typings/azure-storage/azure-storage.d.ts",
   "tags": [
@@ -33,7 +33,8 @@
     "uuid": "^3.0.0",
     "validator": "~13.7.0",
     "xml2js": "0.2.8",
-    "xmlbuilder": "^9.0.7"
+    "xmlbuilder": "^9.0.7",
+    "json-schema": "^0.4.0"
   },
   "devDependencies": {
     "batchflow": "0.4.0",