Replaced mongodb.ObjectId() with the function mongo_utils.mongoObjectId()

src/agent/block_store_speed.js

@@ -4,7 +4,7 @@
 // const _ = require('lodash');
 const argv = require('minimist')(process.argv);
 const cluster = require('cluster');
-const mongodb = require('mongodb');
+const mongo_utils = require('../util/mongo_utils');
 
 const api = require('../api');
 const config = require('../../config');
@@ -61,7 +61,7 @@ async function worker(client) {
 }
 
 async function write_block(client) {
-    const block_id = new mongodb.ObjectId();
+    const block_id = new mongo_utils.ObjectId();
     return client.block_store.write_block({
         [RPC_BUFFERS]: { data: Buffer.allocUnsafe(argv.size) },
         block_md: {

src/sdk/nb.d.ts

@@ -2,6 +2,7 @@ export as namespace nb;
 
 import * as fs from 'fs';
 import * as mongodb from 'mongodb';
+import * as mongo_utils from '../util/mongo_utils';
 import { EventEmitter } from 'events';
 import { Readable, Writable } from 'stream';
 import { IncomingMessage, ServerResponse } from 'http';
@@ -46,7 +47,7 @@ interface Base {
     toString?(): string;
 }
 
-type ID = mongodb.ObjectID;
+type ID = mongo_utils.ObjectId;
 type DBBuffer = mongodb.Binary | Buffer;
 
 interface System extends Base {
@@ -719,8 +720,8 @@ interface DBClient {
     populate(docs: object[] | object, doc_path: string, collection: DBCollection, fields: object): Promise<object[] | object>;
     resolve_object_ids_recursive(idmap: object, item: object): object;
     resolve_object_ids_paths(idmap: object, item: object, paths: string[], allow_missing: boolean): object;
-    new_object_id(): mongodb.ObjectId;
-    parse_object_id(id_str: string): mongodb.ObjectId;
+    new_object_id(): mongo_utils.ObjectId;
+    parse_object_id(id_str: string): mongo_utils.ObjectId;
     fix_id_type(doc: object[] | object): object[] | object;
     is_object_id(id: object[] | object): boolean;
     is_err_duplicate_key(err: object): boolean;

src/server/analytic_services/activity_log_store.js

@@ -1,7 +1,7 @@
 /* Copyright (C) 2016 NooBaa */
 'use strict';
 
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const _ = require('lodash');
 
 const db_client = require('../../util/db_client');
@@ -25,7 +25,7 @@ class ActivityLogStore {
     }
 
     make_activity_log_id(id_str) {
-        return new mongodb.ObjectID(id_str);
+        return new mongo_utils.ObjectId(id_str);
     }
 
 

src/server/analytic_services/history_data_store.js

@@ -1,7 +1,7 @@
 /* Copyright (C) 2016 NooBaa */
 'use strict';
 
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 
 // const dbg = require('../../util/debug_module')(__filename);
 const config = require('../../../config.js');
@@ -30,7 +30,7 @@ class HistoryDataStore {
             const time_stamp = new Date();
             const record_expiration_date = new Date(time_stamp.getTime() - config.STATISTICS_COLLECTOR_EXPIRATION);
             const record = {
-                _id: new mongodb.ObjectId(),
+                _id: new mongo_utils.ObjectId(),
                 time_stamp,
                 system_snapshot: item,
                 history_type: 'SYSTEM'

src/server/bg_services/mirror_writer.js

@@ -3,7 +3,7 @@
 
 const util = require('util');
 const _ = require('lodash');
-const { ObjectId } = require('mongodb');
+const { ObjectId } = require('../../util/mongo_utils');
 
 const config = require('../../../config');
 const dbg = require('../../util/debug_module')(__filename);

src/server/node_services/nodes_store.js

@@ -2,7 +2,7 @@
 'use strict';
 
 const _ = require('lodash');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 
 const dbg = require('../../util/debug_module')(__filename);
 const node_schema = require('./node_schema');
@@ -24,7 +24,7 @@ class NodesStore {
     }
 
     make_node_id(id_str) {
-        return new mongodb.ObjectId(id_str);
+        return new mongo_utils.ObjectId(id_str);
     }
 
     is_connected() {

src/server/notifications/alerts_log_store.js

@@ -1,7 +1,7 @@
 /* Copyright (C) 2016 NooBaa */
 'use strict';
 
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const _ = require('lodash');
 const P = require('../../util/promise');
 const db_client = require('../../util/db_client');
@@ -23,7 +23,7 @@ class AlertsLogStore {
     }
 
     make_alert_log_id(id_str) {
-        return new mongodb.ObjectID(id_str);
+        return new mongo_utils.ObjectId(id_str);
     }
 
     create(alert_log) {
@@ -94,12 +94,12 @@ class AlertsLogStore {
 
         let _id;
         if (ids) {
-            const obj_ids = ids.map(id => new mongodb.ObjectID(id));
+            const obj_ids = ids.map(id => new mongo_utils.ObjectId(id));
             _id = { $in: obj_ids };
         } else if (till) {
-            _id = { $lt: new mongodb.ObjectID(till) };
+            _id = { $lt: new mongo_utils.ObjectId(till) };
         } else if (since) {
-            _id = { $gt: new mongodb.ObjectID(since) };
+            _id = { $gt: new mongo_utils.ObjectId(since) };
         }
 
         return _.omitBy({

src/server/object_services/md_store.js

@@ -7,7 +7,7 @@
 const _ = require('lodash');
 const assert = require('assert');
 const moment = require('moment');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const mime = require('mime-types');
 
 const P = require('../../util/promise');
@@ -92,18 +92,18 @@ class MDStore {
         if (zero_suffix) {
             suffix = '0'.repeat(16);
         } else {
-            suffix = String(new mongodb.ObjectId()).slice(8, 24);
+            suffix = String(new mongo_utils.ObjectId()).slice(8, 24);
         }
         const hex_id = padded_hex_time + suffix;
         assert(padded_hex_time.length === 8);
         assert(suffix.length === 16);
         assert(hex_id.length === 24);
         assert(parseInt(padded_hex_time, 16) === Math.floor(time / 1000));
-        return new mongodb.ObjectId(hex_id);
+        return new mongo_utils.ObjectId(hex_id);
     }
 
     is_valid_md_id(id_str) {
-        return mongodb.ObjectId.isValid(id_str);
+        return mongo_utils.ObjectId.isValid(id_str);
     }
 
     /////////////
@@ -2113,7 +2113,7 @@ function sort_list_uploads_with_delimiter(a, b) {
  * @returns {nb.ID}
  */
 function make_md_id(id_str) {
-    return new mongodb.ObjectId(id_str);
+    return new mongo_utils.ObjectId(id_str);
 }
 
 

src/server/system_services/config_file_store.js

@@ -4,7 +4,7 @@
 const _ = require('lodash');
 const dbg = require('../../util/debug_module')(__filename);
 const db_client = require('../../util/db_client');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const config_file_schema = require('./schemas/config_file_schema');
 const config_file_indexes = require('./schemas/config_file_indexes');
 
@@ -26,7 +26,7 @@ class ConfigFileStore {
     async insert(item) {
         dbg.log0(`insert`, item);
         _.defaults(item, {
-            _id: new mongodb.ObjectId()
+            _id: new mongo_utils.ObjectId()
         });
         // There shouldn't be more than one record, this is being on the safe side
         this._config_files.validate(item);

src/server/system_services/replication_store.js

@@ -2,7 +2,7 @@
 'use strict';
 
 const _ = require('lodash');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../util/mongo_utils');
 const db_client = require('../../util/db_client');
 const dbg = require('../../util/debug_module')(__filename);
 const replication_schema = require('./schemas/replication_configuration_schema');
@@ -25,7 +25,7 @@ class ReplicationStore {
         item = _.omitBy(item, _.isNil);
         dbg.log1(`insert_replication`, item);
         const record = {
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             ...item
         };
         this._replicationconfigs.validate(record);

src/test/integration_tests/api/s3/test_lifecycle.js

@@ -9,7 +9,7 @@ const { NodeHttpHandler } = require("@smithy/node-http-handler");
 const util = require('util');
 const mocha = require('mocha');
 const assert = require('assert');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../../../util/mongo_utils');
 const _ = require('lodash');
 const crypto = require('crypto');
 const stream = require('stream');
@@ -153,7 +153,7 @@ mocha.describe('lifecycle', () => {
             if (tagging) update.tagging = tagging;
 
             console.log('create_mock_object bucket', bucket, 'key', key, 'update', util.inspect(update));
-            const id = new mongodb.ObjectId(obj_id);
+            const id = new mongo_utils.ObjectId(obj_id);
             console.log('create_mock_object id', id, 'obj_id', obj_id);
 
             const updateResult = await MDStore.instance().update_object_by_id(id, update);
@@ -385,7 +385,7 @@ mocha.describe('lifecycle', () => {
                     source_stream: readable_buffer(mp_data, split, finish),
                 });
                 console.log("upload_multipart", resp);
-                multiparts_ids.push(new mongodb.ObjectId(resp.multipart_id));
+                multiparts_ids.push(new mongo_utils.ObjectId(resp.multipart_id));
             };
             // upload the real multiparts we want to complete with
             await Promise.all(_.times(num_parts,
@@ -395,7 +395,7 @@ mocha.describe('lifecycle', () => {
             // go back in time
             const update = {
                 // eslint-disable-next-line new-cap
-                upload_started: new mongodb.ObjectId(moment().subtract(age, 'days').unix()),
+                upload_started: new mongo_utils.ObjectId(moment().subtract(age, 'days').unix()),
             };
 
             console.log('create_mock_multipart_upload bucket', bucket, 'obj_id', obj_id, 'multiparts_ids', multiparts_ids);
@@ -610,7 +610,7 @@ mocha.describe('lifecycle', () => {
                 // everything but last will be aged, 
                 // For simple Expiration rule all version should be expired 
                 if (expire_all || i < version_count - 1) {
-                    obj_upload_ids.push(new mongodb.ObjectId(obj_id));
+                    obj_upload_ids.push(new mongo_utils.ObjectId(obj_id));
                 }
             }
             // go back in time

src/test/integration_tests/internal/test_agent_blocks_reclaimer.js

@@ -9,7 +9,7 @@ const _ = require('lodash');
 const mocha = require('mocha');
 const assert = require('assert');
 const crypto = require('crypto');
-const mongodb = require('mongodb');
+const mongo_utils = require('../../../util/mongo_utils');
 
 const P = require('../../../util/promise');
 const config = require('../../../../config');
@@ -246,13 +246,13 @@ mocha.describe('mocked agent_blocks_reclaimer', function() {
     mocha.it('should mark reclaimed on deleted nodes', async function() {
         const self = this; // eslint-disable-line no-invalid-this
         const nodes = [{
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             rpc_address: 'n2n://SlothTown',
             online: false,
             deleted: new Date()
         }];
         const blocks = [{
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             node: nodes[0]._id,
             deleted: new Date()
         }];
@@ -271,12 +271,12 @@ mocha.describe('mocked agent_blocks_reclaimer', function() {
     mocha.it('should not mark reclaimed on offline nodes', async function() {
         const self = this; // eslint-disable-line no-invalid-this
         const nodes = [{
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             rpc_address: 'n2n://SlothTown',
             online: false,
         }];
         const blocks = [{
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             node: nodes[0]._id,
             deleted: new Date(),
             fail_to_delete: true
@@ -296,14 +296,14 @@ mocha.describe('mocked agent_blocks_reclaimer', function() {
     mocha.it('should mark reclaimed on non existing nodes', async function() {
         const self = this; // eslint-disable-line no-invalid-this
         const nodes = [{
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             rpc_address: 'n2n://SlothTown',
             online: true,
         }];
         const blocks = [{
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             // Non existing node on purpose
-            node: new mongodb.ObjectId(),
+            node: new mongo_utils.ObjectId(),
             deleted: new Date()
         }];
         const reclaimer_mock =
@@ -321,16 +321,16 @@ mocha.describe('mocked agent_blocks_reclaimer', function() {
     mocha.it('should not mark reclaimed on failure to delete', async function() {
         const self = this; // eslint-disable-line no-invalid-this
         const nodes = [{
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             rpc_address: 'n2n://SlothTown',
             online: true,
         }];
         const blocks = [{
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             node: nodes[0]._id,
             deleted: new Date()
         }, {
-            _id: new mongodb.ObjectId(),
+            _id: new mongo_utils.ObjectId(),
             node: nodes[0]._id,
             deleted: new Date(),
             fail_to_delete: true