@friggframework/core 2.0.0--canary.404.e9d4980.0 → 2.0.0--canary.405.b87f8d8.0

package/handlers/routers/health.js

@@ -119,6 +119,44 @@ router.get('/health/detailed', async (_req, res) => {
         checks.status = 'unhealthy';
     }
 
+    try {
+        const { STAGE, BYPASS_ENCRYPTION_STAGE, KMS_KEY_ARN, AES_KEY_ID } =
+            process.env;
+        const defaultBypassStages = ['dev', 'test', 'local'];
+        const useEnv = BYPASS_ENCRYPTION_STAGE !== undefined;
+        const bypassStages = useEnv
+            ? BYPASS_ENCRYPTION_STAGE.split(',').map((s) => s.trim())
+            : defaultBypassStages;
+        const bypassed = bypassStages.includes(STAGE);
+        const mode = KMS_KEY_ARN ? 'kms' : AES_KEY_ID ? 'aes' : 'none';
+
+        let status = 'disabled';
+        // Having both KMS_KEY_ARN and AES_KEY_ID present is considered unhealthy,
+        // as only one encryption method should be configured at a time to avoid ambiguity
+        // and potential security misconfiguration.
+        if (KMS_KEY_ARN && AES_KEY_ID) {
+            status = 'unhealthy';
+        } else if (!bypassed && mode !== 'none') {
+            status = 'enabled';
+        } else {
+            status = 'disabled';
+        }
+
+        checks.checks.encryption = {
+            status,
+            mode,
+            bypassed,
+            stage: STAGE || null,
+        };
+        if (status === 'unhealthy') checks.status = 'unhealthy';
+    } catch (error) {
+        checks.checks.encryption = {
+            status: 'unhealthy',
+            error: error.message,
+        };
+        checks.status = 'unhealthy';
+    }
+
     const externalAPIs = [
         { name: 'github', url: 'https://api.github.com/status' },
         { name: 'npm', url: 'https://registry.npmjs.org' }
@@ -141,19 +179,25 @@ router.get('/health/detailed', async (_req, res) => {
     });
 
     try {
-        const availableModules = moduleFactory.getAll();
-        const availableIntegrations = integrationFactory.getAll();
-        
+        const moduleTypes = Array.isArray(moduleFactory.moduleTypes)
+            ? moduleFactory.moduleTypes
+            : [];
+        const integrationTypes = Array.isArray(
+            integrationFactory.integrationTypes
+        )
+            ? integrationFactory.integrationTypes
+            : [];
+
         checks.checks.integrations = {
             status: 'healthy',
             modules: {
-                count: Object.keys(availableModules).length,
-                available: Object.keys(availableModules)
+                count: moduleTypes.length,
+                available: moduleTypes,
             },
             integrations: {
-                count: Object.keys(availableIntegrations).length,
-                available: Object.keys(availableIntegrations)
-            }
+                count: integrationTypes.length,
+                available: integrationTypes,
+            },
         };
     } catch (error) {
         checks.checks.integrations = {
@@ -188,8 +232,10 @@ router.get('/health/ready', async (_req, res) => {
     checks.checks.database = dbState === 1;
     
     try {
-        const modules = moduleFactory.getAll();
-        checks.checks.modules = Object.keys(modules).length > 0;
+        const moduleTypes = Array.isArray(moduleFactory.moduleTypes)
+            ? moduleFactory.moduleTypes
+            : [];
+        checks.checks.modules = moduleTypes.length > 0;
     } catch (error) {
         checks.checks.modules = false;
     }

package/handlers/routers/health.test.js

@@ -14,16 +14,10 @@ jest.mock('mongoose', () => ({
 
 jest.mock('./../backend-utils', () => ({
     moduleFactory: {
-        getAll: () => ({
-            'test-module': {},
-            'another-module': {}
-        })
+        moduleTypes: ['test-module', 'another-module']
     },
     integrationFactory: {
-        getAll: () => ({
-            'test-integration': {},
-            'another-integration': {}
-        })
+        integrationTypes: ['test-integration', 'another-integration']
     }
 }));
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.404.e9d4980.0",
+  "version": "2.0.0--canary.405.b87f8d8.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "aws-sdk": "^2.1200.0",
@@ -22,9 +22,9 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.404.e9d4980.0",
-    "@friggframework/prettier-config": "2.0.0--canary.404.e9d4980.0",
-    "@friggframework/test": "2.0.0--canary.404.e9d4980.0",
+    "@friggframework/eslint-config": "2.0.0--canary.405.b87f8d8.0",
+    "@friggframework/prettier-config": "2.0.0--canary.405.b87f8d8.0",
+    "@friggframework/test": "2.0.0--canary.405.b87f8d8.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -53,5 +53,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "e9d4980828d7deda79e33dfbb2fed93cb6fef84d"
+  "gitHead": "b87f8d874639f6fbb52c8a7efc7841c879a1286f"
 }