wip bump deps + adapt eslint file + uuid fixup

Author: benzekrimaha

.eslintrc

@@ -59,7 +59,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '22'
           cache: 'yarn'
       - run: sudo apt-get update -q
       # Ubuntu 24.04 doesn't have libssl1.1 which is needed by mongo-memory-server

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-const uuid = require('node-uuid');
+const { v4: uuid } = require('uuid');
 const { once } = require('arsenal').jsutil;
 const { deserializeBigInts, serializeBigInts } = require('./utils/utils');
 
@@ -95,7 +95,7 @@ class CountWorkerObj {
     }
 
     setup(callback) {
-        const id = uuid.v4();
+        const id = uuid();
         this._addCallback(id, 'setup', callback);
         this._worker.send({
             id,
@@ -108,7 +108,7 @@ class CountWorkerObj {
         if (!this.clientConnected || !this._worker.isConnected()) {
             return callback();
         }
-        const id = uuid.v4();
+        const id = uuid();
         this._addCallback(id, 'teardown', callback);
         return this._worker.send({
             id,
@@ -118,7 +118,7 @@ class CountWorkerObj {
     }
 
     count(bucketInfo, callback) {
-        const id = uuid.v4();
+        const id = uuid();
         this._addCallback(id, 'count', (err, results) => {
             if (err) {
                 return callback(err);

CountItems/CountWorkerObj.js

@@ -0,0 +1,42 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [...compat.extends("scality"), 
+    {
+        languageOptions: {
+            ecmaVersion: 2020,
+            sourceType: "script",
+            globals: {
+                BigInt: "readonly",
+            },
+        },
+        rules: {
+            "no-plusplus": 0,
+            "no-underscore-dangle": 0,
+            "no-restricted-syntax": 0,
+            "max-len": 0,
+            "import/no-extraneous-dependencies": 0,
+            "no-continue": 0,
+            "global-require": 0,
+            "no-prototype-builtins": 0,
+            "class-methods-use-this": 0,
+            "no-unused-vars": 0,
+            "no-lonely-if": 0,
+            "max-classes-per-file": 0,
+            "prefer-spread": 0,
+            "no-constructor-return": 0,
+            "new-cap": 0
+        }
+    }
+];

eslint.config.mjs

@@ -2,7 +2,7 @@
   "name": "s3utils",
   "version": "1.15.7",
   "engines": {
-    "node": ">= 16"
+    "node": ">= 22"
   },
   "description": "Awesome scripts to use when working with S3 at scale",
   "scripts": {
@@ -26,22 +26,22 @@
   },
   "homepage": "https://github.com/scality/s3utils#readme",
   "dependencies": {
-    "@senx/warp10": "^1.1.2",
+    "@senx/warp10": "^2.0.3",
     "JSONStream": "^1.3.5",
-    "arsenal": "git+https://github.com/scality/arsenal#8.1.146",
-    "async": "^2.6.4",
-    "aws-sdk": "^2.1005.0",
-    "bucketclient": "git+https://github.com/scality/bucketclient#8.1.5",
-    "express": "^4.18.2",
+    "arsenal": "git+https://github.com/scality/arsenal#8.2.1",
+    "async": "^3.2.6",
+    "aws-sdk": "^2.1691.0",
+    "bucketclient": "scality/bucketclient#8.2.0",
+    "express": "^5.1.0",
     "heapdump": "^0.3.15",
-    "httpagent": "git+https://github.com/scality/httpagent#1.0.6",
-    "level": "^7",
-    "needle": "^3.2.0",
-    "node-rdkafka": "2.12.0",
-    "node-schedule": "^1.3.2",
-    "node-uuid": "^1.4.8",
-    "vaultclient": "scality/vaultclient#8.2.6",
-    "werelogs": "scality/werelogs#8.1.2",
+    "httpagent": "git+https://github.com/scality/httpagent#1.1.0",
+    "level": "^9.0.0",
+    "needle": "^3.3.1",
+    "node-rdkafka": "^2.12.0",
+    "node-schedule": "^2.1.1",
+    "uuid": "^11.0.3",
+    "vaultclient": "scality/vaultclient#8.5.1",
+    "werelogs": "scality/werelogs#8.2.1",
     "xml2js": "^0.6.2",
     "zenkoclient": "scality/zenkoclient#1.2.1"
   },
@@ -50,15 +50,15 @@
     "jsprim": "1.4.2"
   },
   "devDependencies": {
-    "@sinonjs/fake-timers": "^9.1.2",
-    "eslint": "^8.8.0",
-    "eslint-config-airbnb": "^19.0.0",
-    "eslint-config-scality": "github:scality/Guidelines#8.2.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jest": "^23.6.0",
+    "@sinonjs/fake-timers": "^14.0.0",
+    "eslint": "^9.14.0",
+    "eslint-config-scality": "github:scality/Guidelines#8.3.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest": "^28.11.0",
     "jest": "^29.7.0",
-    "mongodb-memory-server": "^8.10.2",
+    "mongodb-memory-server": "10.1.2",
     "randomatic": "^3.1.1",
-    "sinon": "^17.0.1"
+    "sinon": "^19.0.2",
+    "typescript": "^4.9.5"
   }
 }

package.json

@@ -1,6 +1,6 @@
-jest.mock('node-uuid', () => require('../../mocks/uuid'));
+jest.mock('uuid', () => require('../../mocks/uuid'));
 
-const uuid = require('node-uuid');
+const { v4: uuid } = require('uuid');
 const Subprocess = require('../../mocks/subprocess');
 
 const CountWorkerObj = require('../../../CountItems/CountWorkerObj');
@@ -14,7 +14,7 @@ const createWorker = () => {
 describe('CountItems::CountWorkerObj', () => {
     beforeEach(() => {
         jest.resetModules();
-        uuid.v4.mockReset();
+        uuid.mockReset();
     });
 
     test('should add callback object to list', () => {
@@ -146,7 +146,7 @@ describe('CountItems::CountWorkerObj', () => {
         const { p, w } = createWorker();
         w.clientConnected = testCase.connected;
         const pSendFn = jest.spyOn(p, 'send');
-        uuid.v4.mockImplementationOnce(() => testCase.id);
+        uuid.mockImplementationOnce(() => testCase.id);
         w[testCase.type](...testCase.args, err => {
             if (testCase.error) {
                 expect(err).toEqual(new Error(testCase.error));
@@ -183,7 +183,7 @@ describe('CountItems::CountWorkerObj', () => {
         w.clientConnected = true;
         const testCallbackFn = jest.fn();
         let id = 0;
-        uuid.v4.mockImplementation(() => id++);
+        uuid.mockImplementation(() => id++);
         w.init(testCallbackFn);
         w.setup(testCallbackFn);
         w.teardown(testCallbackFn);