@codefresh-io/service-base 4.0.7 → 5.0.1

package/codefresh.yaml

@@ -8,13 +8,13 @@ steps:
 
     install_dependencies:
         title: 'Installing testing dependencies'
-        image: node:14.0.0
+        image: node:${{NODE_VERSION}}
         commands:
             - yarn install --frozen-lockfile
 
     eslint:
         title: 'Running linting logic'
-        image: node:12.13.0
+        image: node:${{NODE_VERSION}}
         commands:
             - yarn eslint
 

package/infra/__tests__/smoke_test.spec.js

@@ -2,15 +2,15 @@ const { splitUriBySlash, getDbNameFromUri } = require('../helper');
 const { MongoMemoryServer } = require('mongodb-memory-server');
 const mongoClient = require('../mongo');
 
-
+/**
+ * @type {MongoMemoryServer}
+ */
 let mongod;
 async function clientSetupByUriAndDbName() {
-    const uri = await mongod.getUri();
-    const port = await mongod.getPort();
+    const uri = mongod.getUri();
+    const { port, dbPath, dbName } = mongod.instanceInfo;
     console.log(`using port ${port}`);
-    const dbPath = await mongod.getDbPath();
     console.log(`dbPath ${dbPath}`);
-    const dbName = await mongod.getDbName();
     console.log(`dbName ${dbName}`);
 
     await mongoClient.init({ mongo: { uri, dbName } });
@@ -19,7 +19,7 @@ async function clientSetupByUriAndDbName() {
 
 describe('mongo init compatibility code', () => {
     beforeEach(async () => {
-        mongod = new MongoMemoryServer();
+        mongod = await MongoMemoryServer.create();
     });
     afterEach(async () => {
         await mongoClient.stop();
@@ -46,8 +46,8 @@ describe('mongo init compatibility code', () => {
     });
 
     it('smokeTest2.2.33  and 3.6 extracted dbname', async () => {
-        const uri = await mongod.getUri();
-        const dbName = await mongod.getDbName();
+        const uri = mongod.getUri();
+        const { dbName } = mongod.instanceInfo;
         expect(dbName)
             .toEqual(getDbNameFromUri(uri));
         await mongoClient.init({ mongo: { uri } });
@@ -61,7 +61,7 @@ describe('mongo init compatibility code', () => {
     });
 
     it('db.db old use driver 2.x style API of uri no dbname param', async () => {
-        const uri = await mongod.getUri();
+        const uri = mongod.getUri();
         await mongoClient.init({ mongo: { uri } });
         const pipelineManagerDB = mongoClient.client.db(process.env.PIPELINE_MANAGER_DB || 'pipeline-manager');
         const stepCollection = pipelineManagerDB.collection('steps');
@@ -71,8 +71,8 @@ describe('mongo init compatibility code', () => {
     });
 
     it('client.db 3.x the new style using client', async () => {
-        const uri = await mongod.getUri();
-        const dbName = await mongod.getDbName();
+        const uri = mongod.getUri();
+        const { dbName } = mongod.instanceInfo;
         expect(dbName).toEqual(getDbNameFromUri(uri));
         await mongoClient.init({ mongo: { uri } });
         const pipelineManagerDB = await mongoClient.client.db(process.env.PIPELINE_MANAGER_DB || 'pipeline-manager');
@@ -85,8 +85,8 @@ describe('mongo init compatibility code', () => {
     });
 
     it('additional uses', async () => {
-        const uri = await mongod.getUri();
-        const dbName = await mongod.getDbName();
+        const uri = mongod.getUri();
+        const { dbName } = mongod.instanceInfo;
         expect(dbName).toEqual(getDbNameFromUri(uri));
         await mongoClient.init({ mongo: { uri } });
         // eslint-disable-next-line prefer-destructuring
@@ -94,11 +94,11 @@ describe('mongo init compatibility code', () => {
         expect(ObjectId).toBeTruthy();
 
         const collection = mongoClient.collection('charts');
-        await collection.ensureIndex({ account: 1, repository: 1, name: 1, version: 1 }, {
+        await collection.createIndex({ account: 1, repository: 1, name: 1, version: 1 }, {
             unique: true,
             background: true,
         });
-        await collection.ensureIndex({ created: 1 }, { expireAfterSeconds: 60 });
+        await collection.createIndex({ created: 1 }, { expireAfterSeconds: 60 });
         const generateObjectId = () => new mongoClient.ObjectId().toString();
         const objectId = generateObjectId();
         expect(objectId).toBeTruthy();

package/infra/encryption/safe.js

@@ -47,7 +47,7 @@ function getOrCreateSafe(safeId) {
                 _id: safeId,
                 key: (new Buffer(uuid.v4())).toString('base64'), // eslint-disable-line
             };
-            return collection.save(newSafe)
+            return collection.insertOne(newSafe)
                 .then(() => new Safe(newSafe))
                 .catch((err) => {
                     throw new Error(`Error occurred while creating safe: ${safeId}. Caused by: ${err.toString()}`);

package/infra/mongo.js

@@ -1,6 +1,3 @@
-
-
-const Promise = require('bluebird');
 const { MongoClient, ObjectId } = require('mongodb');
 const { getDbNameFromUri } = require('./helper');
 
@@ -12,31 +9,26 @@ class Mongo {
 
     /**
      * starts the connection to mongo
-     * @returns {*}
+     * @returns {Promise<void>}
      */
-    init(config) {
-        const clientSettings = {
-            promiseLibrary: Promise,
-            ...config.mongo.options,
-        };
+    async init(config) {
+        const clientSettings = { ...config.mongo.options };
 
         const logger = require('cf-logs').Logger('codefresh:infra:mongo'); // eslint-disable-line
         this.logger = logger;
 
         const { uri } = config.mongo;
         const dbName = config.mongo.dbName || getDbNameFromUri(uri);
-        return MongoClient.connect(uri, clientSettings)
-            .then(async (client) => {
-                this.client = client;
-                this.db = await client.db(dbName);
-                logger.info('Mongo driver connected');
-            });
+        const client = await MongoClient.connect(uri, clientSettings);
+        this.client = client;
+        this.db = client.db(dbName);
+        logger.info('Mongo driver connected');
     }
 
 
     /**
      * stops the connection to mongo
-     * @returns {*}
+     * @returns {Promise<void>}
      */
     stop() {
         if (!this.db) {

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@codefresh-io/service-base",
-  "version": "4.0.7",
+  "version": "5.0.1",
   "main": "index.js",
   "description": "",
   "bin": {
     "cf-openapi": "./node_modules/cf-openapi/bin/cf-openapi"
   },
+  "engines": {
+    "node": ">=12.22.12"
+  },
   "scripts": {
     "test": "(find . -not -path './node_modules/*' -path '*/*.spec.js' | grep -v '__tests__' | NODE_ENV=test xargs mocha) && jest",
     "start": "node index.js",
@@ -49,7 +52,7 @@
     "js-yaml": "^3.13.1",
     "lodash": "4.17.21",
     "method-override": "^3.0.0",
-    "mongodb": "~3.3.0",
+    "mongodb": "^4.17.2",
     "morgan": "^1.9.1",
     "node-uuid": "^1.4.8",
     "proxyquire": "^1.8.0",
@@ -59,14 +62,14 @@
     "request-promise": "4.2.6"
   },
   "devDependencies": {
-    "@shelf/jest-mongodb": "^1.2.2",
+    "@shelf/jest-mongodb": "^4.2.0",
     "eslint": "^4.18.2",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-import": "^2.9.0",
-    "eslint-plugin-jest": "^21.12.3",
+    "eslint-plugin-jest": "^27.6.3",
     "eslint-plugin-mocha": "^4.12.1",
-    "jest": "^26.4.0",
+    "jest": "^29.7.0",
     "mocha": "^8.2.1",
-    "mongodb-memory-server": "^6.6.3"
+    "mongodb-memory-server": "^9.1.6"
   }
 }