Merge branch 'w/9.0/improvement/CLDSRV-648-kmipretry' into tmp/octopus/w/9.1/improvement/CLDSRV-648-kmipretry

Author: bert-e

lib/Config.js

@@ -719,6 +719,7 @@ class Config extends EventEmitter {
                 process.env.S3KMIP_BUCKET_ATTRIBUTE_NAME || '',
             },
             transport: this._parseKmipTransport({}),
+            retries: 0,
         };
         if (config.kmip) {
             assert(config.kmip.providerName, 'config.kmip.providerName must be defined');
@@ -743,6 +744,14 @@ class Config extends EventEmitter {
                 if (Array.isArray(config.kmip.transport)) {
                     this.kmip.transport = config.kmip.transport.map(t =>
                         this._parseKmipTransport(t));
+                    if (config.kmip.retries) {
+                        assert(typeof config.kmip.retries === 'number',
+                            'bad config: KMIP Cluster retries must be a number');
+                        assert(config.kmip.retries <= this.kmip.transport.length - 1,
+                            'bad config: KMIP Cluster retries must be lower or equal to the number of hosts - 1');
+                    } else {
+                        this.kmip.retries = this.kmip.transport.length - 1;
+                    }
                 } else {
                     this.kmip.transport =
                         this._parseKmipTransport(config.kmip.transport);

lib/kms/wrapper.js

@@ -52,7 +52,7 @@ const kmsFactory = {
             throw new Error('KMIP KMS driver configuration is missing.');
         }
         const client = Array.isArray(config.kmip.transport)
-            ? new KMIPClusterClient({ kmip: config.kmip })
+            ? new KMIPClusterClient({ kmip: config.kmip, logger, retries: config.kmip.retries })
             : new KMIPClient({ kmip: config.kmip });
         return { client, implName: 'kmip' };
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenko/cloudserver",
-  "version": "9.0.10",
+  "version": "9.0.11",
   "description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
   "main": "index.js",
   "engines": {
@@ -21,7 +21,7 @@
   "dependencies": {
     "@azure/storage-blob": "^12.25.0",
     "@hapi/joi": "^17.1.1",
-    "arsenal": "git+https://github.com/scality/arsenal#8.2.16",
+    "arsenal": "git+https://github.com/scality/arsenal#8.2.17",
     "async": "2.6.4",
     "aws-sdk": "^2.1692.0",
     "bucketclient": "scality/bucketclient#8.2.3",

yarn.lock

@@ -1474,9 +1474,9 @@ arraybuffer.prototype.slice@^1.0.4:
   optionalDependencies:
     ioctl "^2.0.2"
 
-"arsenal@git+https://github.com/scality/arsenal#8.2.16":
-  version "8.2.16"
-  resolved "git+https://github.com/scality/arsenal#3f104fc56492bb76e2675b0d166c33e50445d8d0"
+"arsenal@git+https://github.com/scality/arsenal#8.2.17":
+  version "8.2.17"
+  resolved "git+https://github.com/scality/arsenal#692a82c9e2778549f24c1a1f108e663ed20108ce"
   dependencies:
     "@azure/identity" "^4.9.1"
     "@azure/storage-blob" "^12.27.0"