@friggframework/devtools 2.0.0--canary.461.4066059.0 → 2.0.0--canary.461.c53515a.0

package/infrastructure/domains/shared/resource-discovery.js

@@ -96,8 +96,14 @@ async function gatherDiscoveredResources(appDefinition) {
             console.log('  ℹ Isolated mode: discovering KMS (shareable) but not VPC/Aurora (isolated)');
 
             // Still run KMS discovery - encryption keys are safe to share
+            // Pass serviceName and stage to search for stage-specific alias
             const kmsDiscovery = new KmsDiscovery(provider);
-            const kmsResult = await kmsDiscovery.discover();
+            const kmsConfig = {
+                serviceName: appDefinition.name || 'create-frigg-app',
+                stage,
+                keyAlias: `alias/${appDefinition.name || 'create-frigg-app'}-${stage}-frigg-kms`,
+            };
+            const kmsResult = await kmsDiscovery.discover(kmsConfig);
 
             if (kmsResult?.defaultKmsKeyId) {
                 console.log('  ✓ Found shared KMS key (can be reused across stages)');
@@ -105,7 +111,7 @@ async function gatherDiscoveredResources(appDefinition) {
                 return kmsResult;
             }
 
-            console.log('  ℹ No existing resources found - will create fresh infrastructure');
+            console.log('  ℹ No existing KMS key found - will create new one');
             console.log('✅ Cloud resource discovery completed successfully!');
             return {};
         }

package/infrastructure/scripts/build-prisma-layer.test.js

@@ -0,0 +1,101 @@
+/**
+ * Tests for Prisma Lambda Layer Builder
+ * Validates database client selection logic
+ */
+
+const { getGeneratedClientPackages } = require('./build-prisma-layer');
+
+// Mock the log function
+jest.mock('./build-prisma-layer', () => {
+    const actual = jest.requireActual('./build-prisma-layer');
+    return {
+        ...actual,
+        getGeneratedClientPackages: actual.getGeneratedClientPackages,
+    };
+});
+
+describe('getGeneratedClientPackages()', () => {
+    it('should include MongoDB client when mongoDB.enable is true', () => {
+        const databaseConfig = {
+            mongoDB: { enable: true },
+        };
+
+        const packages = getGeneratedClientPackages(databaseConfig);
+
+        expect(packages).toContain('generated/prisma-mongodb');
+    });
+
+    it('should include MongoDB client when documentDB.enable is true', () => {
+        const databaseConfig = {
+            documentDB: { enable: true },
+        };
+
+        const packages = getGeneratedClientPackages(databaseConfig);
+
+        expect(packages).toContain('generated/prisma-mongodb');
+    });
+
+    it('should include PostgreSQL client when postgres.enable is true', () => {
+        const databaseConfig = {
+            postgres: { enable: true },
+        };
+
+        const packages = getGeneratedClientPackages(databaseConfig);
+
+        expect(packages).toContain('generated/prisma-postgresql');
+    });
+
+    it('should include both clients when both databases are enabled', () => {
+        const databaseConfig = {
+            mongoDB: { enable: true },
+            postgres: { enable: true },
+        };
+
+        const packages = getGeneratedClientPackages(databaseConfig);
+
+        expect(packages).toContain('generated/prisma-mongodb');
+        expect(packages).toContain('generated/prisma-postgresql');
+        expect(packages).toHaveLength(2);
+    });
+
+    it('should include both clients when documentDB and postgres are enabled', () => {
+        const databaseConfig = {
+            documentDB: { enable: true },
+            postgres: { enable: true },
+        };
+
+        const packages = getGeneratedClientPackages(databaseConfig);
+
+        expect(packages).toContain('generated/prisma-mongodb');
+        expect(packages).toContain('generated/prisma-postgresql');
+        expect(packages).toHaveLength(2);
+    });
+
+    it('should default to PostgreSQL when no database config provided', () => {
+        const packages = getGeneratedClientPackages({});
+
+        expect(packages).toContain('generated/prisma-postgresql');
+        expect(packages).toHaveLength(1);
+    });
+
+    it('should default to PostgreSQL when database config is null', () => {
+        const packages = getGeneratedClientPackages(null);
+
+        expect(packages).toContain('generated/prisma-postgresql');
+        expect(packages).toHaveLength(1);
+    });
+
+    it('should only include MongoDB when postgres.enable is false and mongoDB is true', () => {
+        const databaseConfig = {
+            mongoDB: { enable: true },
+            postgres: { enable: false },
+        };
+
+        const packages = getGeneratedClientPackages(databaseConfig);
+
+        expect(packages).toContain('generated/prisma-mongodb');
+        expect(packages).not.toContain('generated/prisma-postgresql');
+        expect(packages).toHaveLength(1);
+    });
+});
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.4066059.0",
+  "version": "2.0.0--canary.461.c53515a.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -11,8 +11,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.461.4066059.0",
-    "@friggframework/test": "2.0.0--canary.461.4066059.0",
+    "@friggframework/schemas": "2.0.0--canary.461.c53515a.0",
+    "@friggframework/test": "2.0.0--canary.461.c53515a.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -34,8 +34,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.461.4066059.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.4066059.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.c53515a.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.c53515a.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4066059afecf11231ca7ff94cc4483b47f5b6e74"
+  "gitHead": "c53515a6014c114056ebde56a8b7c08007c53908"
 }