@skillswaveca/nova-shared-libraries 3.15.0 → 4.15.1

package/docs-base/package-info.js

@@ -1,31 +1,31 @@
 export const packageInfo = [
   {
     "name": "@skillswaveca/nova-utils",
-    "version": "3.14.0",
+    "version": "3.15.1",
     "description": "A collection of random utils used in nova repos",
     "docsPath": "./nova-utils/index.html"
   },
   {
     "name": "nova-router",
-    "version": "3.14.0",
+    "version": "3.15.1",
     "description": "An extended Koa router that enables better validation",
     "docsPath": "./nova-router/index.html"
   },
   {
     "name": "@skillswaveca/nova-model",
-    "version": "3.14.0",
+    "version": "3.15.1",
     "description": "Nova model stuff",
     "docsPath": "./nova-model/index.html"
   },
   {
     "name": "@skillswaveca/nova-middleware",
-    "version": "3.14.0",
+    "version": "3.15.1",
     "description": "A collection of middleware used by nova projects",
     "docsPath": "./nova-middleware/index.html"
   },
   {
     "name": "@skillswaveca/nova-drivers",
-    "version": "3.14.0",
+    "version": "3.15.1",
     "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.15.0",
+  "version": "4.15.1",
   "main": "index.js",
   "license": "MIT",
   "keywords": [],

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.15.0",
+  "version": "4.15.1",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/drivers/src/oauth.js

@@ -154,17 +154,26 @@ export class OAuthDriver extends HttpDriver {
    * @returns {Promise<{message, status: string}|*|{message: string, status: string}>}
    */
   async health() {
-    const response = await super.get('/health');
-    const { success, body, error, statusCode } = response;
-    if(success) {
-      return body;
-    } else {
-      if(statusCode === 404) {
+    try {
+      const response = await super.get('/api/v2/health');
+      const { success, body, error, statusCode } = response;
+
+      this.log.trace({ baseUrl: this.baseUrl, success, error, statusCode, body } , 'Checking the health of the service');
+
+      if (success) return body;
+
+      if (statusCode === 404) {
+        this.log.warn({ baseUrl: this.baseUrl, statusCode }, 'Health check endpoint not found');
         return { status: 'unknown', message: 'No health check endpoint found' };
-      } else {
-        return { status: 'error', message: error };
       }
-    }
 
+      this.log.error({ baseUrl: this.baseUrl, error, statusCode }, 'Service health check failed');
+
+      return { status: 'error', message: error || 'An unknown error occurred during health check' };
+    } catch (err) {
+      this.log.error({ baseUrl: this.baseUrl, error: err }, 'Unexpected error during health check');
+      return { status: 'error', message: 'Unexpected error occurred while checking service health' };
+    }
   }
+
 }

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.15.0",
+  "version": "4.15.1",
   "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.15.0",
+  "version": "4.15.1",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-router/package.json

@@ -3,7 +3,7 @@
   "name": "nova-router",
   "description": "An extended Koa router that enables better validation",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "3.15.0",
+  "version": "4.15.1",
   "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.15.0",
+  "version": "4.15.1",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

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

@@ -236,8 +236,8 @@ export class NovaStageConfig {
   createConfigForStage(stage, region) {
     const baseConfig = this.baseConfig(stage);
     const stageConfig = this.stages[stage] || this.stages.dev;
-    const awsAccount = stageConfig?.awsAccount || baseConfig?.awsAccount;
-    const accountConfig = this.accounts ? this.accounts[awsAccount] : {};
+    const appEnvironment = stageConfig?.appEnvironment || baseConfig?.appEnvironment;
+    const accountConfig = this.accounts ? this.accounts[appEnvironment] : {};
     const regionConfig = region ? this.stages[`${stage}.${region}`] : {};
     let ret = deepMerge(baseConfig, accountConfig);
     ret = deepMerge(ret, stageConfig);