feat(3282): upgrade Node.js v22 and dependencies. BREAKING CHANGE: Node22

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.eslintignore

@@ -1,3 +1,3 @@
-artifacts
-node_modules
-.git
+node_modules/
+artifacts/
+features/*.feature

.eslintrc.yaml

@@ -0,0 +1 @@
+extends: screwdriver

.gitignore

@@ -9,4 +9,5 @@ CVS/
 .svn
 *~
 .com.apple.timemachine.supported
-.nyc_output
+.nyc_output
+package-lock.json

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Contributing to Screwdriver
+
+Have a look at our guidelines, as well as pointers on where to start making changes, in our official [documentation](https://docs.screwdriver.cd/about/contributing/pull-requests).

README.md

@@ -1,8 +1,10 @@
+[![Version][npm-image]][npm-url]  [![Build Status][status-image]][status-url] [![Open Issues][issues-image]][issues-url] ![License][license-image]
+
 # retry-function
 Wrapper to retry function calls with an exponential backoff strategy
 
 ## Installation:
-```npm install --save retry-function```
+```npm install --save screwdriver-retry-function```
 
 ## Usage:
 Pass a function and callback to retryFn and it will retry with exponential backoff.
@@ -76,3 +78,17 @@ retryFn({
 ```
 
 Code licensed under the MIT license. See LICENSE file for terms.
+
+[![Version][npm-image]][npm-url] 
+[![Build Status][status-image]][status-url] 
+[![Open Issues][issues-image]][issues-url] 
+![License][license-image]
+
+[npm-image]: https://img.shields.io/npm/v/screwdriver-retry-function.svg
+[npm-url]: https://npmjs.org/package/screwdriver-retry-function
+[license-image]: https://img.shields.io/badge/license-MIT-green
+[issues-image]: https://img.shields.io/github/issues/screwdriver-cd/screwdriver.svg
+[issues-url]: https://github.com/screwdriver-cd/screwdriver/issues
+[status-image]: https://cd.screwdriver.cd/pipelines/10797/badge
+[status-url]: https://cd.screwdriver.cd/pipelines/10797
+[screwdriver job-tools]: https://github.com/screwdriver-cd/job-tools

index.js

@@ -1,6 +1,4 @@
-// Copyright 2015 Yahoo Inc.
-// Licensed under the MIT license.
-// See the included LICENSE file for terms.
+'use strict';
 
 const retry = require('retry');
 const joi = require('joi');
@@ -15,8 +13,9 @@ const joi = require('joi');
 function execRetry(config, callback) {
     const c = config;
 
-    c.shouldRetry = c.shouldRetry
-        || function shouldRetry() {
+    c.shouldRetry =
+        c.shouldRetry ||
+        function shouldRetry() {
             return true;
         };
     c.options = c.options || {};
@@ -60,13 +59,13 @@ function validateRetry(config, callback) {
                     factor: joi.number().optional(),
                     minTimeout: joi.number().optional(),
                     maxTimeout: joi.number().optional(),
-                    randomize: joi.boolean().optional(),
+                    randomize: joi.boolean().optional()
                 })
                 .optional(),
             context: joi.object().optional(),
             arguments: joi.array().optional(),
             shouldRetry: joi.func().optional(),
-            method: joi.func().required(),
+            method: joi.func().required()
         })
         .required();
 
@@ -77,9 +76,7 @@ function validateRetry(config, callback) {
     const result = schema.validate(config);
 
     if (result.error) {
-        throw new Error(
-            result.error.details.map((detail) => detail.message).join(','),
-        );
+        throw new Error(result.error.details.map(detail => detail.message).join(','));
     }
 
     execRetry(config, callback);

mocha.config.json

@@ -0,0 +1,6 @@
+{
+    "reporterEnabled": "spec, mocha-sonarqube-reporter",
+    "mochaSonarqubeReporterReporterOptions": {
+        "output": "./artifacts/report/test.xml"
+    }
+}

package.json

@@ -1,37 +1,53 @@
 {
-  "name": "retry-function",
-  "version": "3.0.0",
+  "name": "screwdriver-retry-function",
+  "version": "1.0.0",
   "description": "Wrapper to retry function calls with an exponential backoff strategy",
   "main": "index.js",
   "scripts": {
-    "test": "nyc --reporter=lcov --reporter=text-summary mocha tests/*",
-    "lint": "eslint ."
+    "pretest": "eslint .",
+    "test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/petey/retry-function.git"
+    "url": "git+https://github.com/screwdriver-cd/retry-function.git"
   },
+  "homepage": "https://github.com/screwdriver-cd/retry-function",
+  "bugs": "https://github.com/screwdriver-cd/screwdriver/issues",
+  "keywords": [
+    "screwdriver",
+    "yahoo"
+  ],
+  "license": "BSD-3-Clause",
   "author": "Pete Peterson <petey31@yahoo.com>",
-  "bugs": {
-    "url": "https://github.com/petey/retry-function/issues"
-  },
-  "engines": {
-    "node": ">=10.0.0"
-  },
-  "homepage": "https://github.com/petey/retry-function",
+  "contributors": [
+    "Alan Dong <alandong2016@gmail.com>",
+    "Dao Lam <daolam112@gmail.com>",
+    "Dekus Lam <dekusdenial@hotmail.com>",
+    "Jithin Emmanuel <jithin1987@gmail.com>",
+    "Kevin Lu <klu13960@gmail.com>",
+    "Lakshminarasimhan Parthasarathy <laky@ymail.com>",
+    "Pritam Paul <pritam.paul09@hotmail.com>",
+    "Tiffany Kyi <tiffanykyi@gmail.com>"
+  ],
   "dependencies": {
-    "joi": "^17.3.0",
-    "retry": "^0.12.0"
+    "joi": "^17.13.3",
+    "retry": "^0.13.1"
   },
   "devDependencies": {
-    "chai": "^4.2.0",
-    "eslint": "^7.12.1",
-    "eslint-config-airbnb-base": "^14.2.0",
-    "eslint-plugin-import": "^2.22.1",
-    "jenkins-mocha": "^8.0.0",
-    "mocha": "^8.2.0",
+    "chai": "^4.3.7",
+    "eslint": "^8.57.0",
+    "eslint-config-screwdriver": "^8.0.0",
+    "mocha": "^10.1.0",
+    "mocha-multi-reporters": "^1.5.1",
+    "mocha-sonarqube-reporter": "^1.0.2",
     "nyc": "^15.1.0",
-    "sinon": "^9.2.1"
+    "mockery": "^2.1.0",
+    "sinon": "^15.0.0"
+  },
+  "engines": {
+    "node": ">=22.0.0"
   },
-  "license": "MIT"
+  "release": {
+    "debug": false
+  }
 }

screwdriver.yaml

@@ -1,11 +1,20 @@
 shared:
-    image: node:6
+    image: node:22
 
 jobs:
     main:
+        environment:
+            SD_SONAR_OPTS:  "-Dsonar.sources=app -Dsonar.tests=test -Dsonar.javascript.lcov.reportPaths=artifacts/coverage/lcov.info -Dsonar.testExecutionReportPaths=artifacts/report/test.xml"
+        requires: [~pr, ~commit]
         steps:
             - install: npm install
             - test: npm test
-        requires: 
-            - ~pr
-            - ~commit
+
+    publish:
+        requires: [main]
+        template: screwdriver-cd/semantic-release
+        secrets:
+            # Publishing to NPM
+            - NPM_TOKEN
+            # Pushing tags to Git
+            - GH_TOKEN

tests/index.test.js → test/index.test.js

@@ -1,8 +1,4 @@
-/* eslint-env mocha */
-
-// Copyright 2015 Yahoo Inc.
-// Licensed under the MIT license.
-// See the included LICENSE file for terms.
+'use strict';
 
 const sinon = require('sinon');
 const { assert } = require('chai');
@@ -17,8 +13,8 @@ describe('retry-function test case', () => {
     });
 
     describe('retryFn', () => {
-        it('should not retry if first run successful', (done) => {
-            myCallback = (err) => {
+        it('should not retry if first run successful', done => {
+            myCallback = err => {
                 assert.isNull(err);
                 assert.isTrue(myFunc.calledOnce);
                 done();
@@ -28,14 +24,14 @@ describe('retry-function test case', () => {
 
             retryFn(
                 {
-                    method: myFunc,
+                    method: myFunc
                 },
-                myCallback,
+                myCallback
             );
         });
 
-        it('should retry fn until success', (done) => {
-            myCallback = (err) => {
+        it('should retry fn until success', done => {
+            myCallback = err => {
                 assert.isNull(err);
                 assert.isTrue(myFunc.calledThrice);
                 done();
@@ -49,15 +45,15 @@ describe('retry-function test case', () => {
                     method: myFunc,
                     options: {
                         minTimeout: 10,
-                        retries: 5,
-                    },
+                        retries: 5
+                    }
                 },
-                myCallback,
+                myCallback
             );
         });
 
-        it('should have error if never succeeds', (done) => {
-            myCallback = (err) => {
+        it('should have error if never succeeds', done => {
+            myCallback = err => {
                 assert.isNotNull(err);
                 assert.equal(err.message, 'nope');
                 assert.isTrue(myFunc.calledThrice);
@@ -71,15 +67,15 @@ describe('retry-function test case', () => {
                     method: myFunc,
                     options: {
                         minTimeout: 10,
-                        retries: 2,
-                    },
+                        retries: 2
+                    }
                 },
-                myCallback,
+                myCallback
             );
         });
 
-        it('should not continue if shouldRetry says not to', (done) => {
-            myCallback = (err) => {
+        it('should not continue if shouldRetry says not to', done => {
+            myCallback = err => {
                 assert.isNotNull(err);
                 assert.equal(err.message, 'yep');
                 assert.isTrue(myFunc.calledThrice);
@@ -92,13 +88,13 @@ describe('retry-function test case', () => {
             retryFn(
                 {
                     method: myFunc,
-                    shouldRetry: (err) => err.message === 'nope',
+                    shouldRetry: err => err.message === 'nope',
                     options: {
                         minTimeout: 10,
-                        retries: 5,
-                    },
+                        retries: 5
+                    }
                 },
-                myCallback,
+                myCallback
             );
         });
 
@@ -108,7 +104,7 @@ describe('retry-function test case', () => {
                     retryFn({}, () => ({}));
                 },
                 Error,
-                '"method" is required',
+                '"method" is required'
             );
         });
 
@@ -118,7 +114,7 @@ describe('retry-function test case', () => {
                     retryFn({});
                 },
                 Error,
-                '"callback" must be a function',
+                '"callback" must be a function'
             );
         });
     });