@friggframework/devtools 2.0.0--canary.490.a308628.0 → 2.0.0--canary.490.81a6847.0

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

@@ -295,6 +295,15 @@ class VpcBuilder extends InfrastructureBuilder {
             }
         }
 
+        // Add flat discovery properties directly to discovery object for resolver access
+        // The resolver checks both discovery.defaultSecurityGroupId and discovery.external array
+        discovery.defaultVpcId = flatDiscovery.defaultVpcId;
+        discovery.defaultSecurityGroupId = flatDiscovery.defaultSecurityGroupId;
+        discovery.privateSubnetId1 = flatDiscovery.privateSubnetId1;
+        discovery.privateSubnetId2 = flatDiscovery.privateSubnetId2;
+        discovery.natGatewayId = flatDiscovery.natGatewayId;
+        discovery.lambdaSecurityGroupId = flatDiscovery.lambdaSecurityGroupId;
+
         return discovery;
     }
 

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

@@ -1448,6 +1448,30 @@ describe('VpcBuilder', () => {
         });
     });
 
+    describe('convertFlatDiscoveryToStructured - Direct Properties', () => {
+        it('should copy flat discovery properties to structured discovery for resolver access', () => {
+            const flatDiscovery = {
+                fromCloudFormationStack: true,
+                defaultVpcId: 'vpc-123',
+                defaultSecurityGroupId: 'sg-default-456',
+                lambdaSecurityGroupId: 'sg-lambda-789',
+                privateSubnetId1: 'subnet-1',
+                privateSubnetId2: 'subnet-2',
+                natGatewayId: 'nat-123'
+            };
+
+            const result = vpcBuilder.convertFlatDiscoveryToStructured(flatDiscovery);
+
+            // Direct properties should be copied for resolver access
+            expect(result.defaultVpcId).toBe('vpc-123');
+            expect(result.defaultSecurityGroupId).toBe('sg-default-456');
+            expect(result.lambdaSecurityGroupId).toBe('sg-lambda-789');
+            expect(result.privateSubnetId1).toBe('subnet-1');
+            expect(result.privateSubnetId2).toBe('subnet-2');
+            expect(result.natGatewayId).toBe('nat-123');
+        });
+    });
+
     describe('convertFlatDiscoveryToStructured - VPC Endpoints from CloudFormation', () => {
         it('should add VPC endpoints to stackManaged when in existingLogicalIds', () => {
             const flatDiscovery = {

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

@@ -246,8 +246,31 @@ class CloudFormationDiscovery {
                         );
 
                         if (sgDetails.SecurityGroups && sgDetails.SecurityGroups.length > 0) {
-                            discovered.defaultVpcId = sgDetails.SecurityGroups[0].VpcId;
-                            console.log(`  ✓ Extracted VPC ID from security group: ${discovered.defaultVpcId}`);
+                            const vpcId = sgDetails.SecurityGroups[0].VpcId;
+                            discovered.defaultVpcId = vpcId;
+                            console.log(`  ✓ Extracted VPC ID from security group: ${vpcId}`);
+                            
+                            // Now query for the default security group in this VPC
+                            if (!discovered.defaultSecurityGroupId) {
+                                try {
+                                    console.log(`  Querying for default security group in VPC...`);
+                                    const defaultSgResponse = await ec2Client.send(
+                                        new DescribeSecurityGroupsCommand({
+                                            Filters: [
+                                                { Name: 'vpc-id', Values: [vpcId] },
+                                                { Name: 'group-name', Values: ['default'] }
+                                            ]
+                                        })
+                                    );
+                                    
+                                    if (defaultSgResponse.SecurityGroups && defaultSgResponse.SecurityGroups.length > 0) {
+                                        discovered.defaultSecurityGroupId = defaultSgResponse.SecurityGroups[0].GroupId;
+                                        console.log(`  ✓ Discovered default security group: ${discovered.defaultSecurityGroupId}`);
+                                    }
+                                } catch (error) {
+                                    console.warn(`  ⚠️  Could not query default security group: ${error.message}`);
+                                }
+                            }
                         } else {
                             console.warn(`  ⚠️  Security group query returned no results`);
                         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.490.a308628.0",
+  "version": "2.0.0--canary.490.81a6847.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -16,9 +16,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.490.a308628.0",
-    "@friggframework/schemas": "2.0.0--canary.490.a308628.0",
-    "@friggframework/test": "2.0.0--canary.490.a308628.0",
+    "@friggframework/core": "2.0.0--canary.490.81a6847.0",
+    "@friggframework/schemas": "2.0.0--canary.490.81a6847.0",
+    "@friggframework/test": "2.0.0--canary.490.81a6847.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -46,8 +46,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.490.a308628.0",
-    "@friggframework/prettier-config": "2.0.0--canary.490.a308628.0",
+    "@friggframework/eslint-config": "2.0.0--canary.490.81a6847.0",
+    "@friggframework/prettier-config": "2.0.0--canary.490.81a6847.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a308628470332edb561e569dc860fcc8f20b83ff"
+  "gitHead": "81a684747fa412f872340aaefde6d5661a01b903"
 }