@friggframework/devtools 2.0.0--canary.461.27d4ea2.0 → 2.0.0--canary.461.55dbac3.0

package/infrastructure/domains/networking/vpc-builder.js

@@ -732,7 +732,7 @@ class VpcBuilder extends InfrastructureBuilder {
         };
 
         // Create public routing (public subnets → Internet Gateway)
-        this.createPublicRouting(appDefinition, result);
+        this.createPublicRouting(appDefinition, discoveredResources, result);
 
         // Create routing for the new NAT Gateway (private subnets → NAT → IGW)
         this.createNatGatewayRouting(appDefinition, discoveredResources, result, { Ref: 'FriggNATGateway' });
@@ -744,7 +744,7 @@ class VpcBuilder extends InfrastructureBuilder {
      * Create public route table with Internet Gateway route
      * Required for NAT Gateway to have internet access
      */
-    createPublicRouting(appDefinition, result) {
+    createPublicRouting(appDefinition, discoveredResources, result) {
         // Public route table with Internet Gateway route
         result.resources.FriggPublicRouteTable = {
             Type: 'AWS::EC2::RouteTable',
@@ -768,11 +768,15 @@ class VpcBuilder extends InfrastructureBuilder {
             },
         };
 
+        // Use discovered public subnets or created ones
+        const publicSubnet1 = discoveredResources.publicSubnetId1 || { Ref: 'FriggPublicSubnet' };
+        const publicSubnet2 = discoveredResources.publicSubnetId2 || { Ref: 'FriggPublicSubnet2' };
+
         // Associate public subnets with public route table
         result.resources.FriggPublicSubnet1RouteTableAssociation = {
             Type: 'AWS::EC2::SubnetRouteTableAssociation',
             Properties: {
-                SubnetId: { Ref: 'FriggPublicSubnet' },
+                SubnetId: publicSubnet1,
                 RouteTableId: { Ref: 'FriggPublicRouteTable' },
             },
         };
@@ -780,7 +784,7 @@ class VpcBuilder extends InfrastructureBuilder {
         result.resources.FriggPublicSubnet2RouteTableAssociation = {
             Type: 'AWS::EC2::SubnetRouteTableAssociation',
             Properties: {
-                SubnetId: { Ref: 'FriggPublicSubnet2' },
+                SubnetId: publicSubnet2,
                 RouteTableId: { Ref: 'FriggPublicRouteTable' },
             },
         };

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

@@ -62,8 +62,8 @@ function getGeneratedClientPackages(databaseConfig = {}) {
     const packages = [];
 
     // Check if MongoDB is enabled (via mongoDB or documentDB config)
-    const mongoEnabled = databaseConfig?.mongoDB?.enable === true || 
-                         databaseConfig?.documentDB?.enable === true;
+    const mongoEnabled = databaseConfig?.mongoDB?.enable === true ||
+        databaseConfig?.documentDB?.enable === true;
     if (mongoEnabled) {
         packages.push('generated/prisma-mongodb');
         log('Including MongoDB client (based on AppDefinition)', 'blue');
@@ -411,16 +411,21 @@ async function verifyRhelBinaries(expectedClients) {
 /**
  * Verify required files exist
  * Runtime layer should NOT have CLI files
+ * @param {Array} clientPackages - Generated client packages that were included
  */
-async function verifyLayerStructure() {
+async function verifyLayerStructure(clientPackages) {
     logStep(8, 'Verifying layer structure (runtime only)');
 
     const requiredPaths = [
         '@prisma/client/runtime',
         '@prisma/client/index.d.ts',
-        'generated/prisma-postgresql/schema.prisma',  // PostgreSQL (default)
     ];
 
+    // Add schema.prisma for each included client
+    for (const pkg of clientPackages) {
+        requiredPaths.push(`${pkg}/schema.prisma`);
+    }
+
     // Verify CLI is NOT present (keeps layer small)
     const forbiddenPaths = [
         'prisma/build',
@@ -512,7 +517,7 @@ async function buildPrismaLayer(databaseConfig = {}) {
         await removeUnnecessaryFiles();             // Remove source maps, docs, tests (37MB+)
         await removeNonRhelBinaries();              // Remove non-Linux binaries
         await verifyRhelBinaries(clientPackages);   // Verify query engines present
-        await verifyLayerStructure();               // Verify minimal runtime structure
+        await verifyLayerStructure(clientPackages); // Verify minimal runtime structure
         await displayLayerSummary();
 
         const duration = ((Date.now() - startTime) / 1000).toFixed(2);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.27d4ea2.0",
+  "version": "2.0.0--canary.461.55dbac3.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.27d4ea2.0",
-    "@friggframework/test": "2.0.0--canary.461.27d4ea2.0",
+    "@friggframework/schemas": "2.0.0--canary.461.55dbac3.0",
+    "@friggframework/test": "2.0.0--canary.461.55dbac3.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.27d4ea2.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.27d4ea2.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.55dbac3.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.55dbac3.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": "27d4ea22c26e1cc261affa921951355fc4109f46"
+  "gitHead": "55dbac3a1560176988b66b6244f14f0d1d2007c6"
 }