@friggframework/devtools 2.0.0--canary.461.ec1ad4e.0 → 2.0.0--canary.461.4116d1e.0

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

@@ -108,9 +108,15 @@ class CloudFormationDiscovery {
      * @param {Object} discovered - Object to populate with discovered resources
      */
     async _extractFromResources(resources, discovered) {
+        console.log(`  DEBUG: Processing ${resources.length} CloudFormation resources...`);
         for (const resource of resources) {
             const { LogicalResourceId, PhysicalResourceId, ResourceType } = resource;
 
+            // Debug Aurora detection
+            if (LogicalResourceId.includes('Aurora')) {
+                console.log(`  DEBUG: Found Aurora resource: ${LogicalResourceId} (${ResourceType})`);
+            }
+
             // Security Group - use to get VPC ID
             if (LogicalResourceId === 'FriggLambdaSecurityGroup' && ResourceType === 'AWS::EC2::SecurityGroup') {
                 discovered.securityGroupId = PhysicalResourceId;
@@ -141,21 +147,21 @@ class CloudFormationDiscovery {
             if (LogicalResourceId === 'FriggAuroraCluster' && ResourceType === 'AWS::RDS::DBCluster') {
                 discovered.auroraClusterId = PhysicalResourceId;
                 console.log(`  ✓ Found Aurora cluster in stack: ${PhysicalResourceId}`);
-                
+
                 // Query RDS to get cluster endpoint
                 if (this.provider && !discovered.auroraClusterEndpoint) {
                     try {
                         console.log(`  Querying RDS to get Aurora endpoint...`);
                         const { DescribeDBClustersCommand } = require('@aws-sdk/client-rds');
                         const { RDSClient } = require('@aws-sdk/client-rds');
-                        
+
                         const rdsClient = new RDSClient({ region: this.provider.region });
                         const clusterDetails = await rdsClient.send(
                             new DescribeDBClustersCommand({
                                 DBClusterIdentifier: PhysicalResourceId
                             })
                         );
-                        
+
                         if (clusterDetails.DBClusters && clusterDetails.DBClusters.length > 0) {
                             const cluster = clusterDetails.DBClusters[0];
                             discovered.auroraClusterEndpoint = cluster.Endpoint;
@@ -235,6 +241,58 @@ class CloudFormationDiscovery {
                 discovered.sqsVpcEndpointId = PhysicalResourceId;
             }
         }
+
+        // If we have a VPC ID but no subnet IDs, query EC2 for Frigg-managed subnets
+        if (discovered.defaultVpcId && this.provider && 
+            !discovered.privateSubnetId1 && !discovered.publicSubnetId1) {
+            try {
+                console.log('  Querying EC2 for Frigg-managed subnets...');
+                const { DescribeSubnetsCommand } = require('@aws-sdk/client-ec2');
+                const subnetResponse = await this.provider.getEC2Client().send(
+                    new DescribeSubnetsCommand({
+                        Filters: [
+                            { Name: 'vpc-id', Values: [discovered.defaultVpcId] },
+                            { Name: 'tag:ManagedBy', Values: ['Frigg'] },
+                        ],
+                    })
+                );
+
+                if (subnetResponse.Subnets && subnetResponse.Subnets.length > 0) {
+                    // Extract subnet IDs by logical ID from tags
+                    const subnets = subnetResponse.Subnets.map(subnet => ({
+                        subnetId: subnet.SubnetId,
+                        logicalId: subnet.Tags?.find(t => t.Key === 'aws:cloudformation:logical-id')?.Value,
+                        isPublic: subnet.MapPublicIpOnLaunch,
+                    }));
+
+                    // Find private subnets
+                    const privateSubnets = subnets.filter(s => !s.isPublic).sort((a, b) => 
+                        a.logicalId?.localeCompare(b.logicalId) || 0
+                    );
+                    if (privateSubnets.length >= 1) {
+                        discovered.privateSubnetId1 = privateSubnets[0].subnetId;
+                    }
+                    if (privateSubnets.length >= 2) {
+                        discovered.privateSubnetId2 = privateSubnets[1].subnetId;
+                    }
+
+                    // Find public subnets
+                    const publicSubnets = subnets.filter(s => s.isPublic).sort((a, b) => 
+                        a.logicalId?.localeCompare(b.logicalId) || 0
+                    );
+                    if (publicSubnets.length >= 1) {
+                        discovered.publicSubnetId1 = publicSubnets[0].subnetId;
+                    }
+                    if (publicSubnets.length >= 2) {
+                        discovered.publicSubnetId2 = publicSubnets[1].subnetId;
+                    }
+
+                    console.log(`  ✓ Found ${subnets.length} Frigg-managed subnets via EC2 query`);
+                }
+            } catch (error) {
+                console.warn(`  ⚠️  Could not query EC2 for subnets: ${error.message}`);
+            }
+        }
     }
 }
 

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

@@ -307,6 +307,98 @@ describe('CloudFormationDiscovery', () => {
 
             expect(result).toEqual({});
         });
+
+        it('should query EC2 for subnets when VPC found but no subnet resources in stack', async () => {
+            const mockStack = {
+                StackName: 'test-stack',
+                Outputs: [],
+            };
+
+            const mockResources = [
+                {
+                    LogicalResourceId: 'FriggLambdaSecurityGroup',
+                    PhysicalResourceId: 'sg-123',
+                    ResourceType: 'AWS::EC2::SecurityGroup',
+                },
+            ];
+
+            const mockEC2Client = {
+                send: jest.fn(),
+            };
+
+            mockProvider.describeStack.mockResolvedValue(mockStack);
+            mockProvider.listStackResources.mockResolvedValue(mockResources);
+            mockProvider.getEC2Client = jest.fn().mockReturnValue(mockEC2Client);
+
+            // Mock security group query for VPC ID
+            mockEC2Client.send.mockResolvedValueOnce({
+                SecurityGroups: [{ VpcId: 'vpc-123' }],
+            });
+
+            // Mock subnet query
+            mockEC2Client.send.mockResolvedValueOnce({
+                Subnets: [
+                    {
+                        SubnetId: 'subnet-private-1',
+                        MapPublicIpOnLaunch: false,
+                        Tags: [
+                            { Key: 'ManagedBy', Value: 'Frigg' },
+                            { Key: 'aws:cloudformation:logical-id', Value: 'FriggPrivateSubnet1' },
+                        ],
+                    },
+                    {
+                        SubnetId: 'subnet-private-2',
+                        MapPublicIpOnLaunch: false,
+                        Tags: [
+                            { Key: 'ManagedBy', Value: 'Frigg' },
+                            { Key: 'aws:cloudformation:logical-id', Value: 'FriggPrivateSubnet2' },
+                        ],
+                    },
+                ],
+            });
+
+            const result = await cfDiscovery.discoverFromStack('test-stack');
+
+            expect(result.privateSubnetId1).toBe('subnet-private-1');
+            expect(result.privateSubnetId2).toBe('subnet-private-2');
+            expect(mockEC2Client.send).toHaveBeenCalledTimes(2);
+        });
+
+        it('should handle EC2 subnet query errors gracefully', async () => {
+            const mockStack = {
+                StackName: 'test-stack',
+                Outputs: [],
+            };
+
+            const mockResources = [
+                {
+                    LogicalResourceId: 'FriggLambdaSecurityGroup',
+                    PhysicalResourceId: 'sg-123',
+                    ResourceType: 'AWS::EC2::SecurityGroup',
+                },
+            ];
+
+            const mockEC2Client = {
+                send: jest.fn(),
+            };
+
+            mockProvider.describeStack.mockResolvedValue(mockStack);
+            mockProvider.listStackResources.mockResolvedValue(mockResources);
+            mockProvider.getEC2Client = jest.fn().mockReturnValue(mockEC2Client);
+
+            // Mock security group query for VPC ID
+            mockEC2Client.send.mockResolvedValueOnce({
+                SecurityGroups: [{ VpcId: 'vpc-123' }],
+            });
+
+            // Mock subnet query failure
+            mockEC2Client.send.mockRejectedValueOnce(new Error('EC2 API Error'));
+
+            const result = await cfDiscovery.discoverFromStack('test-stack');
+
+            expect(result.defaultVpcId).toBe('vpc-123');
+            expect(result.privateSubnetId1).toBeUndefined();
+        });
     });
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.ec1ad4e.0",
+  "version": "2.0.0--canary.461.4116d1e.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.ec1ad4e.0",
-    "@friggframework/test": "2.0.0--canary.461.ec1ad4e.0",
+    "@friggframework/schemas": "2.0.0--canary.461.4116d1e.0",
+    "@friggframework/test": "2.0.0--canary.461.4116d1e.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.ec1ad4e.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.ec1ad4e.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.4116d1e.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.4116d1e.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": "ec1ad4ecc89d650ce9380aeed0a29831d8e2098b"
+  "gitHead": "4116d1e999b2ef801f8433755d107b34a12ad817"
 }