Merge pull request #8876 from liranmauda/liran-bump-deps

Remove `uuid` module and replace it with the native `crypto.randomUUID()`

Author: liranmauda

package-lock.json

@@ -117,7 +117,6 @@
     "seedrandom": "3.0.5",
     "setimmediate": "1.0.5",
     "typescript": "5.8.2",
-    "uuid": "10.0.0",
     "ws": "8.18.1",
     "xml2js": "0.6.2",
     "yaml": "2.7.0",

package.json

@@ -10,7 +10,7 @@ const os = require('os');
 const path = require('path');
 const util = require('util');
 const repl = require('repl');
-const { v4: uuid } = require('uuid');
+const crypto = require('crypto');
 const argv = require('minimist')(process.argv);
 const S3Auth = require('aws-sdk/lib/signers/s3');
 
@@ -114,7 +114,7 @@ class AgentCLI {
                     self.client.options.address = self.params.address;
                 }
                 if (!self.params.host_id) {
-                    self.params.host_id = uuid();
+                    self.params.host_id = crypto.randomUUID();
                     return self.agent_conf.update({
                         host_id: self.params.host_id
                     });

src/agent/agent_cli.js

@@ -3,7 +3,7 @@
 
 const _ = require('lodash');
 const s3_const = require('../s3_constants');
-const { v4: uuid } = require('uuid');
+const crypto = require('crypto');
 const dbg = require('../../../util/debug_module')(__filename);
 const S3Error = require('../s3_errors').S3Error;
 
@@ -98,13 +98,13 @@ async function put_bucket_lifecycle(req) {
             }
         } else {
             // Generate a random ID if missing
-            current_rule.id = uuid();
+            current_rule.id = crypto.randomUUID();
         }
 
         // Check for duplicate ID in the rules
         if (id_set.has(current_rule.id)) {
             dbg.error('Rule ID must be unique. Found same ID for more than one rule: ', current_rule.id);
-            throw new S3Error({ ...S3Error.InvalidArgument, message: 'Rule ID must be unique. Found same ID for more than one rule'});
+            throw new S3Error({ ...S3Error.InvalidArgument, message: 'Rule ID must be unique. Found same ID for more than one rule' });
         }
         id_set.add(current_rule.id);
 

src/endpoint/s3/ops/s3_put_bucket_lifecycle.js

@@ -1,7 +1,7 @@
 /* Copyright (C) 2016 NooBaa */
 'use strict';
 
-const { v4: uuid } = require('uuid');
+const crypto = require('crypto');
 const path = require('path');
 const util = require('util');
 const fs = require('fs');
@@ -197,7 +197,7 @@ class HostedAgents {
     start_local_agent(params) {
         if (!this._started) return;
 
-        const host_id = uuid();
+        const host_id = crypto.randomUUID();
         const node_name = 'noobaa-internal-agent-' + params.name;
         const storage_path = path.join(process.cwd(), 'noobaa_storage', node_name);
 

src/hosted_agents/hosted_agents.js

@@ -8,7 +8,6 @@ const fs = require('fs');
 const path = require('path');
 const util = require('util');
 const mime = require('mime');
-const { v4: uuidv4 } = require('uuid');
 const P = require('../util/promise');
 const dbg = require('../util/debug_module')(__filename);
 const config = require('../../config');
@@ -1283,7 +1282,7 @@ class NamespaceFS {
         let upload_path;
         // upload path is needed only when open_mode is w / for copy
         if (open_mode === 'w' || params.copy_source) {
-            const upload_id = uuidv4();
+            const upload_id = crypto.randomUUID();
             const bucket_tmp_dir_path = this.get_bucket_tmpdir_full_path();
             upload_path = path.join(bucket_tmp_dir_path, 'uploads', upload_id);
             await native_fs_utils._make_path_dirs(upload_path, fs_context);
@@ -1730,7 +1729,7 @@ class NamespaceFS {
             const fs_context = this.prepare_fs_context(object_sdk);
             await this._load_bucket(params, fs_context);
             await this._throw_if_low_space(fs_context);
-            params.obj_id = uuidv4();
+            params.obj_id = crypto.randomUUID();
             params.mpu_path = this._mpu_path(params);
             await native_fs_utils._create_path(params.mpu_path, fs_context);
             const create_params = JSON.stringify({ ...params, source_stream: null });

src/sdk/namespace_fs.js

@@ -8,7 +8,7 @@ const dbg = require('../../util/debug_module')(__filename);
 const { KubeStore } = require('../kube-store.js');
 const yaml = require('yaml');
 const Agent = require('../../agent/agent');
-const { v4: uuid } = require('uuid');
+const crypto = require('crypto');
 const js_utils = require('../../util/js_utils');
 const size_utils = require('../../util/size_utils');
 
@@ -220,7 +220,7 @@ class InProcessAgentsPoolController extends PoolController {
                 read: () => _.cloneDeep(create_node_token),
                 write: new_token => { create_node_token = _.cloneDeep(new_token); }
             },
-            host_id: uuid(),
+            host_id: crypto.randomUUID(),
             test_hostname: hostname
         });
         await agent.start();

src/server/system_services/pool_controllers.js

@@ -16,7 +16,7 @@ const test_utils = require('./test_utils');
 
 const fs = require('fs');
 const AWS = require('aws-sdk');
-const { v4: uuid } = require('uuid');
+const crypto = require('crypto');
 const assert = require('assert');
 
 
@@ -114,10 +114,10 @@ async function setup() {
     // S3 policies which gives the user equivalent permissions over the buckets that permission_list was giving.
     await Promise.all(
         full_access_user
-            .allowed_buckets
-            .permission_list
-            .map(bucket => test_utils.generate_s3_policy(full_access_user.email, bucket, ['s3:*']))
-            .map(generated => client.bucket.put_bucket_policy({ name: generated.params.bucket, policy: generated.policy }))
+        .allowed_buckets
+        .permission_list
+        .map(bucket => test_utils.generate_s3_policy(full_access_user.email, bucket, ['s3:*']))
+        .map(generated => client.bucket.put_bucket_policy({ name: generated.params.bucket, policy: generated.policy }))
     );
 
     account = account_by_name(system_info.accounts, bucket1_user.email);
@@ -127,10 +127,10 @@ async function setup() {
     // S3 policies which gives the user equivalent permissions over the buckets that permission_list was giving.
     await Promise.all(
         full_access_user
-            .allowed_buckets
-            .permission_list
-            .map(bucket => test_utils.generate_s3_policy(full_access_user.email, bucket, ['s3:*']))
-            .map(generated => client.bucket.put_bucket_policy({ name: generated.params.bucket, policy: generated.policy }))
+        .allowed_buckets
+        .permission_list
+        .map(bucket => test_utils.generate_s3_policy(full_access_user.email, bucket, ['s3:*']))
+        .map(generated => client.bucket.put_bucket_policy({ name: generated.params.bucket, policy: generated.policy }))
     );
 
     account = account_by_name(system_info.accounts, no_access_user.email);
@@ -140,10 +140,10 @@ async function setup() {
     // S3 policies which gives the user equivalent permissions over the buckets that permission_list was giving.
     await Promise.all(
         full_access_user
-            .allowed_buckets
-            .permission_list
-            .map(bucket => test_utils.generate_s3_policy(full_access_user.email, bucket, ['s3:*']))
-            .map(generated => client.bucket.put_bucket_policy({ name: generated.params.bucket, policy: generated.policy }))
+        .allowed_buckets
+        .permission_list
+        .map(bucket => test_utils.generate_s3_policy(full_access_user.email, bucket, ['s3:*']))
+        .map(generated => client.bucket.put_bucket_policy({ name: generated.params.bucket, policy: generated.policy }))
     );
 }
 
@@ -322,7 +322,7 @@ async function test_bucket_list_denied() {
 async function test_create_bucket_add_creator_permissions() {
     console.log(`Starting test_create_bucket_add_creator_permissions`);
     const server = get_new_server(full_access_user);
-    const unique_bucket_name = 'bucket' + uuid();
+    const unique_bucket_name = 'bucket' + crypto.randomUUID();
     const params = {
         Bucket: unique_bucket_name
     };
@@ -336,7 +336,7 @@ async function test_create_bucket_add_creator_permissions() {
 async function test_delete_bucket_deletes_permissions() {
     console.log(`Starting test_delete_bucket_deletes_permissions`);
     const server = get_new_server(full_access_user);
-    const unique_bucket_name = 'bucket' + uuid();
+    const unique_bucket_name = 'bucket' + crypto.randomUUID();
 
     await server.createBucket({ Bucket: unique_bucket_name }).promise();
 

src/test/system_tests/test_bucket_access.js

@@ -13,11 +13,11 @@ const P = require('../../util/promise');
 const api = require('../../api');
 const ops = require('../utils/basic_server_ops');
 const dotenv = require('../../util/dotenv');
-const { v4: uuid } = require('uuid');
+const crypto = require('crypto');
 dotenv.load();
 
 
-const suffix = uuid().split('-')[0];
+const suffix = crypto.randomUUID().split('-')[0];
 
 const {
     mgmt_ip = 'localhost',

src/test/system_tests/test_node_failure.js

@@ -9,7 +9,6 @@ const util = require('util');
 const mocha = require('mocha');
 const assert = require('assert');
 const mongodb = require('mongodb');
-const { v4: uuid } = require('uuid');
 const _ = require('lodash');
 const crypto = require('crypto');
 const stream = require('stream');
@@ -149,7 +148,7 @@ mocha.describe('lifecycle', () => {
         }
 
         mocha.it('test prefix, absolute date expiration', async () => {
-            const key = uuid();
+            const key = crypto.randomUUID();
             const prefix = key.split('-')[0];
             const age = 17;
             const bucket = Bucket;
@@ -162,7 +161,7 @@ mocha.describe('lifecycle', () => {
             await verify_object_deleted(key);
         });
         mocha.it('test prefix, absolute date and tags expiration', async () => {
-            const key = uuid();
+            const key = crypto.randomUUID();
             const prefix = key.split('-')[0];
             const age = 17;
             const bucket = Bucket;
@@ -177,7 +176,7 @@ mocha.describe('lifecycle', () => {
             await verify_object_deleted(key);
         });
         mocha.it('test size less, absolute date expiration', async () => {
-            const key = uuid();
+            const key = crypto.randomUUID();
             const age = 17;
             const size = 64;
             const bucket = Bucket;
@@ -189,7 +188,7 @@ mocha.describe('lifecycle', () => {
             await verify_object_deleted(key);
         });
         mocha.it('test size interval, absolute date expiration', async () => {
-            const key = uuid();
+            const key = crypto.randomUUID();
             const age = 17;
             const gt = 1;
             const size_object = 2;
@@ -203,7 +202,7 @@ mocha.describe('lifecycle', () => {
             await verify_object_deleted(key);
         });
         mocha.it('test size less, relative days expiration', async () => {
-            const key = uuid();
+            const key = crypto.randomUUID();
             const object_age = 2;
             const days = 1;
             const size = 1;
@@ -216,7 +215,7 @@ mocha.describe('lifecycle', () => {
             await verify_object_deleted(key);
         });
         mocha.it('test tag, relative days expiration', async () => {
-            const key = uuid();
+            const key = crypto.randomUUID();
             const object_age = 2;
             const days = 1;
             const tag = { key: 'tagname', value: 'tagvalue' };