screwdriver-api 4.1.153 → 4.1.157

package/config/custom-environment-variables.yaml

@@ -416,6 +416,8 @@ redisLock:
     retryDelay: REDLOCK_RETRY_DELAY
     # the maximum time in milliseconds randomly added to retries
     retryJitter: REDLOCK_RETRY_JITTER
+    # the maximum time in milliseconds living of a key that has a timeout
+    ttl: REDLOCK_TTL
     # Configuration of the redis instance
     redisConnection:
       host: REDLOCK_REDIS_HOST

package/config/default.yaml

@@ -348,6 +348,8 @@ redisLock:
     retryDelay: 500
     # the maximum time in milliseconds randomly added to retries
     retryJitter: 200
+    # the maximum time in milliseconds living of a key that has a timeout
+    ttl: 20000
     # Configuration of the redis instance
     redisConnection:
       host: "127.0.0.1"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "4.1.153",
+  "version": "4.1.157",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/lock.js

@@ -5,19 +5,36 @@ const Redlock = require('redlock');
 const config = require('config');
 const logger = require('screwdriver-logger');
 
+/**
+ * parse value to Boolean
+ * @method parseBool
+ * @param {(Boolean|String)} value
+ * @return {Boolean}
+ */
+function parseBool(value) {
+    if (typeof value === 'boolean') {
+        return value;
+    }
+
+    // True values refers to https://yaml.org/type/bool.html
+    return ['on', 'true', 'yes', 'y'].includes(String(value).toLowerCase());
+}
+
 class Lock {
     /**
      * Constructor
      */
     constructor() {
-        if (config.get('redisLock.enabled')) {
+        if (parseBool(config.get('redisLock.enabled'))) {
             const redisLockConfig = config.get('redisLock.options');
             const connectionDetails = {
                 host: redisLockConfig.redisConnection.host,
                 options: {
                     password:
                         redisLockConfig.redisConnection.options && redisLockConfig.redisConnection.options.password,
-                    tls: redisLockConfig.redisConnection.options ? redisLockConfig.redisConnection.options.tls : false
+                    tls: redisLockConfig.redisConnection.options
+                        ? parseBool(redisLockConfig.redisConnection.options.tls)
+                        : false
                 },
                 port: redisLockConfig.redisConnection.port
             };
@@ -25,11 +42,12 @@ class Lock {
             try {
                 this.redis = new Redis(connectionDetails.port, connectionDetails.host, connectionDetails.options);
                 this.redlock = new Redlock([this.redis], {
-                    driftFactor: redisLockConfig.driftFactor,
-                    retryCount: redisLockConfig.retryCount,
-                    retryDelay: redisLockConfig.retryDelay,
-                    retryJitter: redisLockConfig.retryJitter
+                    driftFactor: parseFloat(redisLockConfig.driftFactor),
+                    retryCount: parseInt(redisLockConfig.retryCount, 10),
+                    retryDelay: parseFloat(redisLockConfig.retryDelay),
+                    retryJitter: parseFloat(redisLockConfig.retryJitter)
                 });
+                this.ttl = parseFloat(redisLockConfig.ttl);
             } catch (err) {
                 logger.error('Failed to initialize redlock', err);
             }
@@ -44,7 +62,7 @@ class Lock {
      * @param   {Number}      ttl           maximum lock duration in milliseconds
      * @returns {Promise}
      */
-    async lock(resource, ttl = 20000) {
+    async lock(resource, ttl = this.ttl) {
         if (this.redlock) {
             try {
                 const lock = await this.redlock.lock(resource, ttl);