@skillswaveca/nova-shared-libraries 3.5.16 → 3.6.0

package/.github/workflows/pull-request.yml

@@ -6,8 +6,10 @@ jobs:
   run-tests:
     runs-on: ubuntu-latest
     steps:
-      - name: Install pnpm
-        run: npm install -g pnpm
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 9
       - uses: actions/checkout@v4
       - name: Overwrite git protocol to https
         run: git config --global url."https://github.com".insteadOf git://github.com
@@ -17,7 +19,7 @@ jobs:
           cache: 'pnpm'
 
       - name: Install deps
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Run unit tests and linting
         run: pnpm recursive run test

package/.github/workflows/release.yml

@@ -10,8 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Install pnpm
-        run: npm install -g pnpm
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 9
 
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -26,7 +28,7 @@ jobs:
           registry-url: 'https://registry.npmjs.org/'
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Initialize mandatory git config
         run: |

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://github.com/SkillsWave/nova-shared-libraries/assets/1350855/edc19764-ebce-4eab-a813-28edcf5e84fc" width="400"/>
+  <img src="https://github.com/SkillsWave/nova-shared-libraries/assets/1350855/3e7683f6-227c-4948-aaed-b9ee4d2400d7" width="400"/>
 </p>
 
 # Nova shared libraries

package/docs-base/package-info.js

@@ -1,25 +1,25 @@
 export const packageInfo = [
   {
     "name": "@skillswaveca/nova-utils",
-    "version": "3.5.15",
+    "version": "3.5.17",
     "description": "A collection of random utils used in nova repos",
     "docsPath": "./nova-utils/index.html"
   },
   {
     "name": "@skillswaveca/nova-model",
-    "version": "3.5.15",
+    "version": "3.5.17",
     "description": "Nova model stuff",
     "docsPath": "./nova-model/index.html"
   },
   {
     "name": "@skillswaveca/nova-middleware",
-    "version": "3.5.15",
+    "version": "3.5.17",
     "description": "A collection of middleware used by nova projects",
     "docsPath": "./nova-middleware/index.html"
   },
   {
     "name": "@skillswaveca/nova-drivers",
-    "version": "3.5.15",
+    "version": "3.5.17",
     "description": "Some helper drivers for AWS services",
     "docsPath": "./drivers/index.html"
   }

package/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-shared-libraries",
   "description": "A monorepo of shared libraries for Nova projects.",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "3.5.16",
+  "version": "3.6.0",
   "main": "index.js",
   "license": "MIT",
   "keywords": [],
@@ -43,7 +43,6 @@
     "eslint-plugin-jsdoc": "^48.2.5",
     "eslint-plugin-mocha": "^10.4.3",
     "glob": "^10.3.15",
-    "glob-promise": "^6.0.5",
     "live-server": "^1.2.2",
     "mocha": "^10.4.0",
     "rollup": "^4.17.2",

package/packages/drivers/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-drivers",
   "description": "Some helper drivers for AWS services",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "3.5.16",
+  "version": "3.6.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-middleware/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-middleware",
   "description": "A collection of middleware used by nova projects",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "3.5.16",
+  "version": "3.6.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-model/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-model",
   "description": "Nova model stuff",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "3.5.16",
+  "version": "3.6.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-utils/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-utils",
   "description": "A collection of random utils used in nova repos",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "3.5.16",
+  "version": "3.6.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-utils/src/config.js

@@ -1,6 +1,5 @@
 import * as fs from 'fs';
 import * as path from 'path';
-
 import yn from 'yn';
 import { log } from './logger.js';
 
@@ -12,14 +11,16 @@ import { log } from './logger.js';
  * @returns {Object} - The resulting merged object.
  */
 export const deepMerge = (obj1, obj2) => {
-  const output = Object.assign({}, obj1);
+  const output = { ...obj1 }; // Use spread syntax for shallow copy
   for (const key in obj2) {
-    if (obj2[key]) {
+    if (obj2[key] !== undefined && obj2[key] !== null) {
       if (typeof obj2[key] === 'object' && obj2[key] !== null && obj1[key]) {
         output[key] = deepMerge(obj1[key], obj2[key]);
       } else {
         output[key] = obj2[key];
       }
+    } else if (obj2[key] === null) {
+      output[key] = obj2[key];
     }
   }
   return output;
@@ -184,7 +185,11 @@ const readJsonFiles = dir => {
   return fs.readdirSync(dir)
     .filter(file => path.extname(file) === '.json')
     .reduce((acc, file) => {
-      acc[path.basename(file, '.json')] = JSON.parse(fs.readFileSync(path.join(dir, file), 'utf8'));
+      try {
+        acc[path.basename(file, '.json')] = JSON.parse(fs.readFileSync(path.join(dir, file), 'utf8'));
+      } catch (err) {
+        log.error({ message: err.message }, `Error reading JSON file: ${file}`);
+      }
       return acc;
     }, {});
 };
@@ -199,10 +204,16 @@ export class NovaStageConfig {
    *
    * @param {Object} baseConfig - The default configuration object that will be used as the base.
    * @param stageConfig - The stage configuration object or the path to the directory containing stage-specific JSON files.
+   * @param accountConfig - The account configuration object or the path to the directory containing account-specific JSON files.
    */
-  constructor(baseConfig, stageConfig) {
+  constructor(baseConfig, stageConfig, accountConfig) {
     this.baseConfig = baseConfig;
     this.stages = typeof stageConfig === 'string' ? readJsonFiles(stageConfig) : stageConfig;
+    if (accountConfig && typeof accountConfig === 'string') {
+      this.accounts = readJsonFiles(accountConfig);
+    } else {
+      log.info('No account configuration provided.');
+    }
     if (!this.baseConfig) {
       throw new Error('NovaConfig requires a base configuration object to be provided.');
     }
@@ -218,11 +229,19 @@ export class NovaStageConfig {
    *
    * @param {string} stage - The stage for which the configuration is needed, typically corresponds
    *                         to different deployment environments (e.g., 'prod', 'dev').
+   * @param region - The region for which the configuration is needed.
    * @returns {Object} - The merged configuration object that combines the default settings with
    *                     any stage-specific overrides.
    */
-  createConfigForStage(stage) {
+  createConfigForStage(stage, region) {
+    const baseConfig = this.baseConfig(stage);
     const stageConfig = this.stages[stage] || this.stages.dev;
-    return deepMerge(this.baseConfig(stage), stageConfig);
+    const awsAccount = stageConfig?.awsAccount || baseConfig?.awsAccount;
+    const accountConfig = this.accounts ? this.accounts[awsAccount] : {};
+    const regionConfig = region ? this.stages[`${stage}.${region}`] : {};
+    let ret = deepMerge(baseConfig, accountConfig);
+    ret = deepMerge(ret, stageConfig);
+    ret = deepMerge(ret, regionConfig);
+    return ret;
   }
 }