@friggframework/devtools 2.0.0--canary.461.0a68e4c.0 → 2.0.0--canary.461.fa770c1.0

package/infrastructure/domains/database/migration-builder.js

@@ -309,6 +309,17 @@ class MigrationBuilder extends InfrastructureBuilder {
 
         console.log('  ✓ Added S3_BUCKET_NAME, DB_MIGRATION_QUEUE_URL, and DB_TYPE environment variables');
 
+        // Add worker function name to router environment (for Lambda invocation)
+        // Router needs this to invoke worker for database state checks
+        if (!result.functions.dbMigrationRouter.environment) {
+            result.functions.dbMigrationRouter.environment = {};
+        }
+        result.functions.dbMigrationRouter.environment.WORKER_FUNCTION_NAME = {
+            Ref: 'DbMigrationWorkerLambdaFunction',
+        };
+
+        console.log('  ✓ Added WORKER_FUNCTION_NAME environment variable to router');
+
         // Add IAM permissions for SQS
         result.iamStatements.push({
             Effect: 'Allow',
@@ -354,6 +365,16 @@ class MigrationBuilder extends InfrastructureBuilder {
 
         console.log('  ✓ Added S3 IAM permissions for migration status tracking');
 
+        // Add IAM permission for router to invoke worker Lambda
+        // Router invokes worker for database state checks (keeps router lightweight)
+        result.iamStatements.push({
+            Effect: 'Allow',
+            Action: ['lambda:InvokeFunction'],
+            Resource: { 'Fn::GetAtt': ['DbMigrationWorkerLambdaFunction', 'Arn'] },
+        });
+
+        console.log('  ✓ Added Lambda invocation permissions for router → worker');
+
         console.log(`[${this.name}] ✅ Migration infrastructure configuration completed`);
         return result;
     }

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

@@ -90,7 +90,7 @@ class VpcBuilder extends InfrastructureBuilder {
         if (appDefinition.vpc?.subnets?.management) ignoredOptions.push('vpc.subnets.management');
         if (appDefinition.vpc?.natGateway?.management) ignoredOptions.push('vpc.natGateway.management');
         if (appDefinition.vpc?.shareAcrossStages !== undefined) ignoredOptions.push('vpc.shareAcrossStages');
-        
+
         if (ignoredOptions.length > 0) {
             console.log(`  ⚠️  managementMode='managed' ignoring: ${ignoredOptions.join(', ')}`);
         }
@@ -134,13 +134,13 @@ class VpcBuilder extends InfrastructureBuilder {
         if (globalMode === 'managed') {
             // Warn about ignored granular options
             this.warnIgnoredOptions(appDefinition);
-            
+
             // Clear granular options to prevent conflicts
             delete appDefinition.vpc.management;
             if (appDefinition.vpc.subnets) delete appDefinition.vpc.subnets.management;
             if (appDefinition.vpc.natGateway) delete appDefinition.vpc.natGateway.management;
             delete appDefinition.vpc.shareAcrossStages;
-            
+
             // Set management based on isolation strategy
             if (vpcIsolation === 'isolated') {
                 management = 'create-new';
@@ -158,7 +158,7 @@ class VpcBuilder extends InfrastructureBuilder {
             // Legacy shareAcrossStages support (backwards compatibility)
             management = appDefinition.vpc.shareAcrossStages ? 'discover' : 'create-new';
             console.log(`  VPC Sharing: ${appDefinition.vpc.shareAcrossStages ? 'shared' : 'isolated'} (translated to ${management})`);
-            
+
             if (!appDefinition.vpc.shareAcrossStages && !appDefinition.vpc.natGateway?.management) {
                 appDefinition.vpc.natGateway = appDefinition.vpc.natGateway || {};
                 appDefinition.vpc.natGateway.management = 'createAndManage';
@@ -167,7 +167,7 @@ class VpcBuilder extends InfrastructureBuilder {
         } else {
             management = management || 'discover';
         }
-        
+
         console.log(`  VPC Management Mode: ${management}`);
 
         // Handle self-healing if enabled
@@ -611,7 +611,7 @@ class VpcBuilder extends InfrastructureBuilder {
         } else {
             // Find available CIDRs for existing VPC by checking existing subnets
             const existingCidrs = new Set();
-            
+
             // Collect all existing subnet CIDRs
             if (discoveredResources?.subnets) {
                 for (const subnet of discoveredResources.subnets) {
@@ -620,9 +620,9 @@ class VpcBuilder extends InfrastructureBuilder {
                     }
                 }
             }
-            
+
             console.log(`    Found ${existingCidrs.size} existing subnet CIDRs in VPC`);
-            
+
             // Generate candidates in the default VPC range (172.31.0.0/16)
             // Private subnets: 240-249, Public subnets: 250-255
             const findAvailableCidr = (startOctet, endOctet) => {
@@ -636,19 +636,19 @@ class VpcBuilder extends InfrastructureBuilder {
                 // Fallback if range exhausted
                 return `172.31.${startOctet}.0/24`;
             };
-            
+
             const privateRange = { start: 240, end: 249 };
             const publicRange = { start: 250, end: 255 };
-            
+
             const cidrs = {
                 private1: findAvailableCidr(privateRange.start, privateRange.end),
                 private2: findAvailableCidr(privateRange.start, privateRange.end),
                 public1: findAvailableCidr(publicRange.start, publicRange.end),
                 public2: findAvailableCidr(publicRange.start, publicRange.end),
             };
-            
+
             console.log(`    Using available CIDRs: ${Object.values(cidrs).join(', ')}`);
-            
+
             return cidrs;
         }
     }

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

@@ -840,7 +840,7 @@ describe('VpcBuilder', () => {
             // Should create new isolated VPC
             expect(result.vpcId).toEqual({ Ref: 'FriggVPC' });
             expect(result.resources.FriggVPC).toBeDefined();
-            
+
             // Subnets should use CloudFormation Fn::Cidr
             expect(result.resources.FriggPrivateSubnet1.Properties.CidrBlock).toEqual({
                 'Fn::Select': [0, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }]
@@ -875,7 +875,7 @@ describe('VpcBuilder', () => {
             // Should discover existing VPC
             expect(result.vpcId).toBe('vpc-existing');
             expect(result.resources.FriggVPC).toBeUndefined();
-            
+
             // Should create new stage-specific subnets
             expect(result.resources.FriggPrivateSubnet1).toBeDefined();
 
@@ -986,7 +986,7 @@ describe('VpcBuilder', () => {
     describe('generateSubnetCidrs()', () => {
         it('should use CloudFormation Fn::Cidr for create-new mode', () => {
             const cidrs = vpcBuilder.generateSubnetCidrs('create-new', {});
-            
+
             expect(cidrs.private1).toEqual({
                 'Fn::Select': [0, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }]
             });
@@ -1005,9 +1005,9 @@ describe('VpcBuilder', () => {
             const discoveredResources = {
                 subnets: []
             };
-            
+
             const cidrs = vpcBuilder.generateSubnetCidrs('discover', discoveredResources);
-            
+
             expect(cidrs.private1).toBe('172.31.240.0/24');
             expect(cidrs.private2).toBe('172.31.241.0/24');
             expect(cidrs.public1).toBe('172.31.250.0/24');
@@ -1023,9 +1023,9 @@ describe('VpcBuilder', () => {
                     { CidrBlock: '172.31.16.0/20' },   // Default VPC subnet
                 ]
             };
-            
+
             const cidrs = vpcBuilder.generateSubnetCidrs('discover', discoveredResources);
-            
+
             // Should skip 240 and 241 (already taken), use 242-243 for private, 250-251 for public
             expect(cidrs.private1).toBe('172.31.242.0/24');
             expect(cidrs.private2).toBe('172.31.243.0/24');
@@ -1041,9 +1041,9 @@ describe('VpcBuilder', () => {
                     { CidrBlock: '172.31.244.0/24' },
                 ]
             };
-            
+
             const cidrs = vpcBuilder.generateSubnetCidrs('discover', discoveredResources);
-            
+
             // Should use 241, 243 for private (filling gaps), 250, 251 for public
             expect(cidrs.private1).toBe('172.31.241.0/24');
             expect(cidrs.private2).toBe('172.31.243.0/24');
@@ -1053,7 +1053,7 @@ describe('VpcBuilder', () => {
 
         it('should handle missing discoveredResources gracefully', () => {
             const cidrs = vpcBuilder.generateSubnetCidrs('discover', null);
-            
+
             // Should fallback to default CIDRs
             expect(cidrs.private1).toBe('172.31.240.0/24');
             expect(cidrs.private2).toBe('172.31.241.0/24');
@@ -1061,9 +1061,9 @@ describe('VpcBuilder', () => {
 
         it('should handle discoveredResources without subnets array', () => {
             const discoveredResources = { vpcId: 'vpc-123' };
-            
+
             const cidrs = vpcBuilder.generateSubnetCidrs('discover', discoveredResources);
-            
+
             // Should fallback to default CIDRs
             expect(cidrs.private1).toBe('172.31.240.0/24');
             expect(cidrs.private2).toBe('172.31.241.0/24');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.0a68e4c.0",
+  "version": "2.0.0--canary.461.fa770c1.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.0a68e4c.0",
-    "@friggframework/test": "2.0.0--canary.461.0a68e4c.0",
+    "@friggframework/schemas": "2.0.0--canary.461.fa770c1.0",
+    "@friggframework/test": "2.0.0--canary.461.fa770c1.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.0a68e4c.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.0a68e4c.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.fa770c1.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.fa770c1.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": "0a68e4cd99db73582144693112740ff3786d8e93"
+  "gitHead": "fa770c14042eacc322cb204dd0886d913938ec11"
 }