@friggframework/devtools 2.0.0--canary.428.7665532.0 → 2.0.0--canary.428.6b04c24.0

package/infrastructure/aws-discovery.js

@@ -510,6 +510,8 @@ class AWSDiscovery {
                             console.warn('This is a Frigg-managed NAT Gateway that may have been misconfigured by route table changes');
                             console.warn('Consider enabling selfHeal: true to fix this automatically');
                             // Return it anyway if it's Frigg-managed - we can fix the routes
+                            // Mark that it's in a private subnet
+                            natGateway._isInPrivateSubnet = true;
                             return natGateway;
                         } else {
                             console.warn('NAT Gateways MUST be placed in public subnets with Internet Gateway routes');
@@ -520,11 +522,13 @@ class AWSDiscovery {
 
                     if (isFriggNat) {
                         console.log(`Found existing Frigg-managed NAT Gateway: ${natGateway.NatGatewayId}`);
+                        natGateway._isInPrivateSubnet = false;
                         return natGateway;
                     }
 
                     // Return first valid NAT Gateway that's in a public subnet
                     console.log(`Found existing NAT Gateway in public subnet: ${natGateway.NatGatewayId}`);
+                    natGateway._isInPrivateSubnet = false;
                     return natGateway;
                 }
 
@@ -888,9 +892,13 @@ class AWSDiscovery {
             const existingNatGateway = await this.findExistingNatGateway(vpc.VpcId);
             let natGatewayId = null;
             let elasticIpAllocationId = null;
-            
+            let natGatewayInPrivateSubnet = false;
+
             if (existingNatGateway) {
                 natGatewayId = existingNatGateway.NatGatewayId;
+                // Check if NAT Gateway is in a private subnet (from our detection)
+                natGatewayInPrivateSubnet = existingNatGateway._isInPrivateSubnet || false;
+
                 // Get the EIP allocation ID from the NAT Gateway
                 if (existingNatGateway.NatGatewayAddresses && existingNatGateway.NatGatewayAddresses.length > 0) {
                     elasticIpAllocationId = existingNatGateway.NatGatewayAddresses[0].AllocationId;
@@ -949,9 +957,18 @@ class AWSDiscovery {
                 defaultKmsKeyId: kmsKeyArn,
                 existingNatGatewayId: natGatewayId,
                 existingElasticIpAllocationId: elasticIpAllocationId,
+                natGatewayInPrivateSubnet: natGatewayInPrivateSubnet,
                 subnetConversionRequired: subnetStatus.requiresConversion,
-                privateSubnetsWithWrongRoutes: subnetStatus.requiresConversion ?
-                    [privateSubnets[0]?.SubnetId, privateSubnets[1]?.SubnetId].filter(Boolean) : []
+                privateSubnetsWithWrongRoutes: (() => {
+                    const wrongRoutes = [];
+                    if (subnetStatus.subnet1NeedsConversion && privateSubnets[0]) {
+                        wrongRoutes.push(privateSubnets[0].SubnetId);
+                    }
+                    if (subnetStatus.subnet2NeedsConversion && privateSubnets[1]) {
+                        wrongRoutes.push(privateSubnets[1].SubnetId);
+                    }
+                    return wrongRoutes;
+                })()
             };
         } catch (error) {
             console.error('Error discovering AWS resources:', error);

package/infrastructure/aws-discovery.test.js

@@ -1,446 +1,545 @@
-const AWS = require('aws-sdk');
+const { mockClient } = require('aws-sdk-client-mock');
 const { AWSDiscovery } = require('./aws-discovery');
 
-// Mock AWS SDK
-jest.mock('@aws-sdk/client-ec2');
-jest.mock('@aws-sdk/client-kms');
-jest.mock('@aws-sdk/client-sts');
-
-const { EC2Client, DescribeVpcsCommand, DescribeSubnetsCommand, DescribeSecurityGroupsCommand, DescribeRouteTablesCommand } = require('@aws-sdk/client-ec2');
-const { KMSClient, ListKeysCommand, DescribeKeyCommand } = require('@aws-sdk/client-kms');
-const { STSClient, GetCallerIdentityCommand } = require('@aws-sdk/client-sts');
+// Import AWS SDK commands
+const {
+    EC2Client,
+    DescribeVpcsCommand,
+    DescribeSubnetsCommand,
+    DescribeSecurityGroupsCommand,
+    DescribeRouteTablesCommand,
+    DescribeNatGatewaysCommand,
+    DescribeAddressesCommand
+} = require('@aws-sdk/client-ec2');
+const {
+    KMSClient,
+    ListKeysCommand,
+    DescribeKeyCommand
+} = require('@aws-sdk/client-kms');
+const {
+    STSClient,
+    GetCallerIdentityCommand
+} = require('@aws-sdk/client-sts');
+
+// Create mock clients
+const ec2Mock = mockClient(EC2Client);
+const kmsMock = mockClient(KMSClient);
+const stsMock = mockClient(STSClient);
 
 describe('AWSDiscovery', () => {
     let discovery;
-    let mockEC2Send;
-    let mockKMSSend;
-    let mockSTSSend;
 
     beforeEach(() => {
+        // Reset all mocks before each test
+        ec2Mock.reset();
+        kmsMock.reset();
+        stsMock.reset();
+
         discovery = new AWSDiscovery('us-east-1');
-        
-        // Create mock send functions
-        mockEC2Send = jest.fn();
-        mockKMSSend = jest.fn();
-        mockSTSSend = jest.fn();
-        
-        // Mock the client constructors and send methods
-        EC2Client.mockImplementation(() => ({
-            send: mockEC2Send
-        }));
-        
-        KMSClient.mockImplementation(() => ({
-            send: mockKMSSend
-        }));
-        
-        STSClient.mockImplementation(() => ({
-            send: mockSTSSend
-        }));
-
-        // Reset mocks
-        jest.clearAllMocks();
     });
 
     describe('getAccountId', () => {
         it('should return AWS account ID', async () => {
             const mockAccountId = '123456789012';
-            mockSTSSend.mockResolvedValue({
+            stsMock.on(GetCallerIdentityCommand).resolves({
                 Account: mockAccountId
             });
 
-            const result = await discovery.getAccountId();
-
-            expect(result).toBe(mockAccountId);
-            expect(mockSTSSend).toHaveBeenCalledWith(expect.any(GetCallerIdentityCommand));
+            const accountId = await discovery.getAccountId();
+            expect(accountId).toBe(mockAccountId);
         });
 
         it('should throw error when STS call fails', async () => {
-            const error = new Error('STS Error');
-            mockSTSSend.mockRejectedValue(error);
+            stsMock.on(GetCallerIdentityCommand).rejects(new Error('STS error'));
 
-            await expect(discovery.getAccountId()).rejects.toThrow('STS Error');
+            await expect(discovery.getAccountId()).rejects.toThrow('STS error');
         });
     });
 
     describe('findDefaultVpc', () => {
-        it('should return default VPC when found', async () => {
-            const mockVpc = {
-                VpcId: 'vpc-12345678',
-                IsDefault: true,
-                State: 'available'
-            };
+        it('should return default VPC when available', async () => {
+            const mockVpc = { VpcId: 'vpc-12345678', IsDefault: true };
+            ec2Mock.on(DescribeVpcsCommand).resolves({
+                Vpcs: [mockVpc]
+            });
 
-            mockEC2Send.mockResolvedValue({
+            const vpc = await discovery.findDefaultVpc();
+            expect(vpc).toEqual(mockVpc);
+        });
+
+        it('should return first VPC when no default VPC exists', async () => {
+            const mockVpc = { VpcId: 'vpc-12345678', IsDefault: false };
+            ec2Mock.on(DescribeVpcsCommand).resolves({
                 Vpcs: [mockVpc]
             });
 
-            const result = await discovery.findDefaultVpc();
+            const vpc = await discovery.findDefaultVpc();
+            expect(vpc).toEqual(mockVpc);
+        });
 
-            expect(result).toEqual(mockVpc);
-            expect(mockEC2Send).toHaveBeenCalledWith(expect.objectContaining({
-                input: {
-                    Filters: [{
-                        Name: 'is-default',
-                        Values: ['true']
-                    }]
-                }
-            }));
+        it('should throw error when no VPCs found', async () => {
+            ec2Mock.on(DescribeVpcsCommand).resolves({
+                Vpcs: []
+            });
+
+            await expect(discovery.findDefaultVpc()).rejects.toThrow('No VPC found in the account');
         });
+    });
 
-        it('should return first available VPC when no default VPC exists', async () => {
-            const mockVpc = {
-                VpcId: 'vpc-87654321',
-                IsDefault: false,
-                State: 'available'
-            };
+    describe('isSubnetPrivate', () => {
+        const mockVpcId = 'vpc-12345678';
+        const mockSubnetId = 'subnet-12345678';
 
-            mockEC2Send
-                .mockResolvedValueOnce({ Vpcs: [] }) // No default VPC
-                .mockResolvedValueOnce({ Vpcs: [mockVpc] }); // All VPCs
+        it('should return true for private subnet', async () => {
+            // Mock subnet lookup first
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: [{ SubnetId: mockSubnetId, VpcId: mockVpcId }]
+            });
 
-            const result = await discovery.findDefaultVpc();
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [{ SubnetId: mockSubnetId }],
+                    Routes: [
+                        { GatewayId: 'local', DestinationCidrBlock: '10.0.0.0/16' }
+                    ]
+                }]
+            });
 
-            expect(result).toEqual(mockVpc);
-            expect(mockEC2Send).toHaveBeenCalledTimes(2);
+            const isPrivate = await discovery.isSubnetPrivate(mockSubnetId, mockVpcId);
+            expect(isPrivate).toBe(true);
         });
 
-        it('should throw error when no VPCs found', async () => {
-            mockEC2Send
-                .mockResolvedValueOnce({ Vpcs: [] }) // No default VPC
-                .mockResolvedValueOnce({ Vpcs: [] }); // No VPCs at all
+        it('should return false for public subnet', async () => {
+            // Mock subnet lookup first
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: [{ SubnetId: mockSubnetId, VpcId: mockVpcId }]
+            });
 
-            await expect(discovery.findDefaultVpc()).rejects.toThrow('No VPC found in the account');
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [{ SubnetId: mockSubnetId }],
+                    Routes: [
+                        { GatewayId: 'igw-12345', DestinationCidrBlock: '0.0.0.0/0' }
+                    ]
+                }]
+            });
+
+            const isPrivate = await discovery.isSubnetPrivate(mockSubnetId, mockVpcId);
+            expect(isPrivate).toBe(false);
         });
     });
 
     describe('findPrivateSubnets', () => {
         const mockVpcId = 'vpc-12345678';
 
-        it('should return private subnets when found', async () => {
+        it('should return private subnets', async () => {
             const mockSubnets = [
-                { SubnetId: 'subnet-private-1', VpcId: mockVpcId, AvailabilityZone: 'us-east-1a' },
-                { SubnetId: 'subnet-private-2', VpcId: mockVpcId, AvailabilityZone: 'us-east-1b' }
+                { SubnetId: 'subnet-private-1', AvailabilityZone: 'us-east-1a' },
+                { SubnetId: 'subnet-private-2', AvailabilityZone: 'us-east-1b' }
             ];
 
-            mockEC2Send
-                .mockResolvedValueOnce({ Subnets: mockSubnets }) // DescribeSubnets
-                .mockResolvedValueOnce({ // Check subnet-private-1
-                    Subnets: [{ SubnetId: 'subnet-private-1', VpcId: mockVpcId }]
-                })
-                .mockResolvedValueOnce({ // Route tables for private-1
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-private-1' }],
-                        Routes: [{ GatewayId: 'local' }] // No IGW = private
-                    }]
-                })
-                .mockResolvedValueOnce({ // Check subnet-private-2
-                    Subnets: [{ SubnetId: 'subnet-private-2', VpcId: mockVpcId }]
-                })
-                .mockResolvedValueOnce({ // Route tables for private-2
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-private-2' }],
-                        Routes: [{ GatewayId: 'local' }] // No IGW = private
-                    }]
-                });
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: mockSubnets
+            });
 
-            const result = await discovery.findPrivateSubnets(mockVpcId, false);
+            // Mock route tables - no IGW routes (private)
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [
+                        { SubnetId: 'subnet-private-1' },
+                        { SubnetId: 'subnet-private-2' }
+                    ],
+                    Routes: [
+                        { GatewayId: 'local', DestinationCidrBlock: '10.0.0.0/16' }
+                    ]
+                }]
+            });
 
-            expect(result).toHaveLength(2);
-            expect(result[0].SubnetId).toBe('subnet-private-1');
-            expect(result[1].SubnetId).toBe('subnet-private-2');
+            const subnets = await discovery.findPrivateSubnets(mockVpcId);
+            expect(subnets).toEqual(mockSubnets);
         });
 
-        it('should handle all public subnets with autoConvert enabled', async () => {
+        it('should throw error when no private subnets found and autoConvert is false', async () => {
             const mockSubnets = [
-                { SubnetId: 'subnet-public-1', VpcId: mockVpcId, AvailabilityZone: 'us-east-1a' },
-                { SubnetId: 'subnet-public-2', VpcId: mockVpcId, AvailabilityZone: 'us-east-1b' },
-                { SubnetId: 'subnet-public-3', VpcId: mockVpcId, AvailabilityZone: 'us-east-1c' }
+                { SubnetId: 'subnet-public-1', AvailabilityZone: 'us-east-1a' },
+                { SubnetId: 'subnet-public-2', AvailabilityZone: 'us-east-1b' },
+                { SubnetId: 'subnet-public-3', AvailabilityZone: 'us-east-1c' }
             ];
 
-            // Mock all subnets as public
-            mockEC2Send
-                .mockResolvedValueOnce({ Subnets: mockSubnets }) // DescribeSubnets
-                .mockResolvedValueOnce({ Subnets: [{ SubnetId: 'subnet-public-1', VpcId: mockVpcId }] })
-                .mockResolvedValueOnce({ // Route table for public-1
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-public-1' }],
-                        Routes: [{ GatewayId: 'igw-12345' }] // IGW = public
-                    }]
-                })
-                .mockResolvedValueOnce({ Subnets: [{ SubnetId: 'subnet-public-2', VpcId: mockVpcId }] })
-                .mockResolvedValueOnce({ // Route table for public-2
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-public-2' }],
-                        Routes: [{ GatewayId: 'igw-12345' }] // IGW = public
-                    }]
-                })
-                .mockResolvedValueOnce({ Subnets: [{ SubnetId: 'subnet-public-3', VpcId: mockVpcId }] })
-                .mockResolvedValueOnce({ // Route table for public-3
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-public-3' }],
-                        Routes: [{ GatewayId: 'igw-12345' }] // IGW = public
-                    }]
-                });
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: mockSubnets
+            });
 
-            // With autoConvert=true, should return subnets to be converted
-            const result = await discovery.findPrivateSubnets(mockVpcId, true);
+            // Mock route tables - has IGW routes (public)
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [
+                        { SubnetId: 'subnet-public-1' },
+                        { SubnetId: 'subnet-public-2' },
+                        { SubnetId: 'subnet-public-3' }
+                    ],
+                    Routes: [
+                        { GatewayId: 'igw-12345', DestinationCidrBlock: '0.0.0.0/0' }
+                    ]
+                }]
+            });
 
-            expect(result).toHaveLength(2);
-            // Should return subnets 2 and 3 for conversion (keeping 1 as public for NAT)
-            expect(result[0].SubnetId).toBe('subnet-public-2');
-            expect(result[1].SubnetId).toBe('subnet-public-3');
+            await expect(discovery.findPrivateSubnets(mockVpcId, false))
+                .rejects.toThrow('No private subnets found in VPC');
         });
 
-        it('should throw error when all subnets are public and autoConvert is false', async () => {
+        it('should return public subnets with warning when autoConvert is true', async () => {
             const mockSubnets = [
-                { SubnetId: 'subnet-public-1', VpcId: mockVpcId, AvailabilityZone: 'us-east-1a' },
-                { SubnetId: 'subnet-public-2', VpcId: mockVpcId, AvailabilityZone: 'us-east-1b' }
+                { SubnetId: 'subnet-public-1', AvailabilityZone: 'us-east-1a' },
+                { SubnetId: 'subnet-public-2', AvailabilityZone: 'us-east-1b' }
             ];
 
-            mockEC2Send
-                .mockResolvedValueOnce({ Subnets: mockSubnets })
-                .mockResolvedValueOnce({ Subnets: [{ SubnetId: 'subnet-public-1', VpcId: mockVpcId }] })
-                .mockResolvedValueOnce({ // Public route table
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-public-1' }],
-                        Routes: [{ GatewayId: 'igw-12345' }]
-                    }]
-                })
-                .mockResolvedValueOnce({ Subnets: [{ SubnetId: 'subnet-public-2', VpcId: mockVpcId }] })
-                .mockResolvedValueOnce({ // Public route table
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-public-2' }],
-                        Routes: [{ GatewayId: 'igw-12345' }]
-                    }]
-                });
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: mockSubnets
+            });
+
+            // Mock route tables - has IGW routes (public)
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [
+                        { SubnetId: 'subnet-public-1' },
+                        { SubnetId: 'subnet-public-2' }
+                    ],
+                    Routes: [
+                        { GatewayId: 'igw-12345', DestinationCidrBlock: '0.0.0.0/0' }
+                    ]
+                }]
+            });
 
-            await expect(discovery.findPrivateSubnets(mockVpcId, false)).rejects.toThrow(
-                `No private subnets found in VPC ${mockVpcId}`
-            );
+            const subnets = await discovery.findPrivateSubnets(mockVpcId, true);
+            expect(subnets).toHaveLength(2);
+            expect(subnets[0].SubnetId).toBe('subnet-public-1');
         });
+    });
 
-        it('should handle mixed private/public subnets correctly', async () => {
-            const mockSubnets = [
-                { SubnetId: 'subnet-private-1', VpcId: mockVpcId, AvailabilityZone: 'us-east-1a' },
-                { SubnetId: 'subnet-public-1', VpcId: mockVpcId, AvailabilityZone: 'us-east-1b' },
-                { SubnetId: 'subnet-public-2', VpcId: mockVpcId, AvailabilityZone: 'us-east-1c' }
-            ];
+    describe('findPublicSubnets', () => {
+        const mockVpcId = 'vpc-12345678';
 
-            mockEC2Send
-                .mockResolvedValueOnce({ Subnets: mockSubnets })
-                .mockResolvedValueOnce({ Subnets: [{ SubnetId: 'subnet-private-1', VpcId: mockVpcId }] })
-                .mockResolvedValueOnce({ // Private route table
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-private-1' }],
-                        Routes: [{ GatewayId: 'local' }] // No IGW
-                    }]
-                })
-                .mockResolvedValueOnce({ Subnets: [{ SubnetId: 'subnet-public-1', VpcId: mockVpcId }] })
-                .mockResolvedValueOnce({ // Public route table
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-public-1' }],
-                        Routes: [{ GatewayId: 'igw-12345' }]
-                    }]
-                })
-                .mockResolvedValueOnce({ Subnets: [{ SubnetId: 'subnet-public-2', VpcId: mockVpcId }] })
-                .mockResolvedValueOnce({ // Public route table
-                    RouteTables: [{
-                        Associations: [{ SubnetId: 'subnet-public-2' }],
-                        Routes: [{ GatewayId: 'igw-12345' }]
-                    }]
-                });
+        it('should return public subnet', async () => {
+            const mockSubnet = { SubnetId: 'subnet-public-1' };
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: [mockSubnet]
+            });
 
-            const result = await discovery.findPrivateSubnets(mockVpcId, false);
+            // Mock route table check to show it's public
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [{ SubnetId: 'subnet-public-1' }],
+                    Routes: [{ GatewayId: 'igw-12345' }] // Has IGW = public
+                }]
+            });
 
-            expect(result).toHaveLength(2);
-            // Should return the one private and one public subnet for HA
-            expect(result[0].SubnetId).toBe('subnet-private-1');
-            expect(result[1].SubnetId).toBe('subnet-public-1');
+            const subnet = await discovery.findPublicSubnets(mockVpcId);
+            expect(subnet).toEqual(mockSubnet);
         });
 
         it('should throw error when no subnets found', async () => {
-            mockEC2Send.mockResolvedValue({ Subnets: [] });
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: []
+            });
 
-            await expect(discovery.findPrivateSubnets(mockVpcId)).rejects.toThrow(`No subnets found in VPC ${mockVpcId}`);
+            await expect(discovery.findPublicSubnets(mockVpcId))
+                .rejects.toThrow('No subnets found in VPC');
         });
     });
 
-    describe('isSubnetPrivate', () => {
-        const mockSubnetId = 'subnet-12345678';
+    describe('findDefaultSecurityGroup', () => {
         const mockVpcId = 'vpc-12345678';
 
-        it('should return false for public subnet (has IGW route)', async () => {
-            mockEC2Send
-                .mockResolvedValueOnce({ // DescribeSubnets
-                    Subnets: [{ SubnetId: mockSubnetId, VpcId: mockVpcId }]
-                })
-                .mockResolvedValueOnce({ // DescribeRouteTables
-                    RouteTables: [{
-                        Associations: [{ SubnetId: mockSubnetId }],
-                        Routes: [{
-                            GatewayId: 'igw-12345678',
-                            DestinationCidrBlock: '0.0.0.0/0'
-                        }]
-                    }]
-                });
+        it('should return default security group', async () => {
+            const mockSecurityGroup = {
+                GroupId: 'sg-12345678',
+                GroupName: 'default'
+            };
 
-            const result = await discovery.isSubnetPrivate(mockSubnetId);
+            ec2Mock.on(DescribeSecurityGroupsCommand).resolves({
+                SecurityGroups: [mockSecurityGroup]
+            });
 
-            expect(result).toBe(false);
+            const sg = await discovery.findDefaultSecurityGroup(mockVpcId);
+            expect(sg).toEqual(mockSecurityGroup);
         });
 
-        it('should return true for private subnet (no IGW route)', async () => {
-            mockEC2Send
-                .mockResolvedValueOnce({ // DescribeSubnets
-                    Subnets: [{ SubnetId: mockSubnetId, VpcId: mockVpcId }]
-                })
-                .mockResolvedValueOnce({ // DescribeRouteTables
-                    RouteTables: [{
-                        Associations: [{ SubnetId: mockSubnetId }],
-                        Routes: [{
-                            GatewayId: 'local',
-                            DestinationCidrBlock: '10.0.0.0/16'
-                        }]
-                    }]
-                });
+        it('should throw error when no default security group found', async () => {
+            ec2Mock.on(DescribeSecurityGroupsCommand).resolves({
+                SecurityGroups: []
+            });
+
+            await expect(discovery.findDefaultSecurityGroup(mockVpcId))
+                .rejects.toThrow('No security group found for VPC');
+        });
+    });
+
+    describe('findPrivateRouteTable', () => {
+        const mockVpcId = 'vpc-12345678';
+
+        it('should return private route table', async () => {
+            const mockRouteTable = {
+                RouteTableId: 'rtb-12345678',
+                Routes: [
+                    { GatewayId: 'local', DestinationCidrBlock: '10.0.0.0/16' }
+                ]
+            };
 
-            const result = await discovery.isSubnetPrivate(mockSubnetId);
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [mockRouteTable]
+            });
 
-            expect(result).toBe(true);
+            const rt = await discovery.findPrivateRouteTable(mockVpcId);
+            expect(rt).toEqual(mockRouteTable);
         });
 
-        it('should use main route table if no explicit association', async () => {
-            mockEC2Send
-                .mockResolvedValueOnce({ // DescribeSubnets
-                    Subnets: [{ SubnetId: mockSubnetId, VpcId: mockVpcId }]
-                })
-                .mockResolvedValueOnce({ // DescribeRouteTables
-                    RouteTables: [{
-                        Associations: [{ Main: true }], // Main route table
-                        Routes: [{
-                            GatewayId: 'igw-12345678',
-                            DestinationCidrBlock: '0.0.0.0/0'
-                        }]
-                    }]
-                });
+        it('should return first route table when no private route table found', async () => {
+            const mockRouteTable = {
+                RouteTableId: 'rtb-12345678',
+                Routes: [
+                    { GatewayId: 'igw-12345', DestinationCidrBlock: '0.0.0.0/0' }
+                ]
+            };
 
-            const result = await discovery.isSubnetPrivate(mockSubnetId);
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [mockRouteTable]
+            });
 
-            expect(result).toBe(false); // Public because main route has IGW
+            const rt = await discovery.findPrivateRouteTable(mockVpcId);
+            expect(rt).toEqual(mockRouteTable);
         });
+    });
 
-        it('should default to private on error', async () => {
-            mockEC2Send
-                .mockResolvedValueOnce({ // DescribeSubnets
-                    Subnets: [{ SubnetId: mockSubnetId, VpcId: mockVpcId }]
-                })
-                .mockRejectedValue(new Error('Route table error'));
+    describe('findDefaultKmsKey', () => {
+        it('should return default KMS key ARN', async () => {
+            const mockKeyId = '12345678-1234-1234-1234-123456789012';
+            const mockKeyArn = `arn:aws:kms:us-east-1:123456789012:key/${mockKeyId}`;
+
+            kmsMock.on(ListKeysCommand).resolves({
+                Keys: [{ KeyId: mockKeyId }]
+            });
 
-            const result = await discovery.isSubnetPrivate(mockSubnetId);
+            kmsMock.on(DescribeKeyCommand).resolves({
+                KeyMetadata: {
+                    Arn: mockKeyArn,
+                    KeyManager: 'CUSTOMER',
+                    KeyState: 'Enabled'
+                }
+            });
 
-            expect(result).toBe(true);
+            const keyArn = await discovery.findDefaultKmsKey();
+            expect(keyArn).toBe(mockKeyArn);
         });
 
-        it('should throw error when subnet not found', async () => {
-            mockEC2Send.mockResolvedValueOnce({ Subnets: [] });
+        it('should return null when no AWS-managed keys found', async () => {
+            kmsMock.on(ListKeysCommand).resolves({
+                Keys: []
+            });
 
-            await expect(discovery.isSubnetPrivate(mockSubnetId)).rejects.toThrow(
-                `Subnet ${mockSubnetId} not found`
-            );
+            const keyArn = await discovery.findDefaultKmsKey();
+            expect(keyArn).toBeNull();
         });
     });
 
-    describe('findDefaultSecurityGroup', () => {
+    describe('findAvailableElasticIP', () => {
+        it('should return available Elastic IP', async () => {
+            const mockElasticIP = {
+                AllocationId: 'eipalloc-12345',
+                PublicIp: '52.1.2.3'
+            };
+
+            ec2Mock.on(DescribeAddressesCommand).resolves({
+                Addresses: [mockElasticIP]
+            });
+
+            const eip = await discovery.findAvailableElasticIP();
+            expect(eip).toEqual(mockElasticIP);
+        });
+
+        it('should return null when no available Elastic IPs', async () => {
+            ec2Mock.on(DescribeAddressesCommand).resolves({
+                Addresses: []
+            });
+
+            const eip = await discovery.findAvailableElasticIP();
+            expect(eip).toBeNull();
+        });
+    });
+
+    describe('findExistingNatGateway', () => {
         const mockVpcId = 'vpc-12345678';
 
-        it('should return Frigg security group when found', async () => {
-            const mockFriggSg = {
-                GroupId: 'sg-frigg-123',
-                GroupName: 'frigg-lambda-sg',
-                VpcId: mockVpcId
+        beforeEach(() => {
+            // Create a fresh discovery instance for each test
+            discovery = new AWSDiscovery('us-east-1');
+        });
+
+        it('should return NAT Gateway in public subnet', async () => {
+            const mockNatGateway = {
+                NatGatewayId: 'nat-12345678',
+                SubnetId: 'subnet-public-1',
+                State: 'available',
+                NatGatewayAddresses: [{ AllocationId: 'eipalloc-12345' }],
+                Tags: []
             };
 
-            mockEC2Send.mockResolvedValue({
-                SecurityGroups: [mockFriggSg]
+            ec2Mock.on(DescribeNatGatewaysCommand).resolves({
+                NatGateways: [mockNatGateway]
             });
 
-            const result = await discovery.findDefaultSecurityGroup(mockVpcId);
+            // Mock subnet lookup
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: [{ SubnetId: 'subnet-public-1', VpcId: mockVpcId }]
+            });
 
-            expect(result).toEqual(mockFriggSg);
-            expect(mockEC2Send).toHaveBeenCalledWith(expect.objectContaining({
-                input: {
-                    Filters: [
-                        { Name: 'vpc-id', Values: [mockVpcId] },
-                        { Name: 'group-name', Values: ['frigg-lambda-sg'] }
-                    ]
-                }
-            }));
+            // Mock route table - has IGW (public)
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [{ SubnetId: 'subnet-public-1' }],
+                    Routes: [{ GatewayId: 'igw-12345' }]
+                }]
+            });
+
+            const result = await discovery.findExistingNatGateway(mockVpcId);
+
+            expect(result).toBeDefined();
+            expect(result.NatGatewayId).toBe('nat-12345678');
+            expect(result._isInPrivateSubnet).toBe(false);
         });
 
-        it('should fallback to default security group', async () => {
-            const mockDefaultSg = {
-                GroupId: 'sg-default-123',
-                GroupName: 'default',
-                VpcId: mockVpcId
+        it('should detect NAT Gateway in private subnet', async () => {
+            const mockNatGateway = {
+                NatGatewayId: 'nat-12345678',
+                SubnetId: 'subnet-private-1',
+                State: 'available',
+                NatGatewayAddresses: [{ AllocationId: 'eipalloc-12345' }],
+                Tags: [
+                    { Key: 'ManagedBy', Value: 'Frigg' }
+                ]
             };
 
-            mockEC2Send
-                .mockResolvedValueOnce({ SecurityGroups: [] }) // No Frigg SG
-                .mockResolvedValueOnce({ SecurityGroups: [mockDefaultSg] }); // Default SG
+            ec2Mock.on(DescribeNatGatewaysCommand).resolves({
+                NatGateways: [mockNatGateway]
+            });
 
-            const result = await discovery.findDefaultSecurityGroup(mockVpcId);
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: [{ SubnetId: 'subnet-private-1', VpcId: mockVpcId }]
+            });
 
-            expect(result).toEqual(mockDefaultSg);
-            expect(mockEC2Send).toHaveBeenCalledTimes(2);
-        });
+            // Mock route table - no IGW (private)
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [{ SubnetId: 'subnet-private-1' }],
+                    Routes: [{ GatewayId: 'local' }]
+                }]
+            });
 
-        it('should throw error when no security groups found', async () => {
-            mockEC2Send.mockResolvedValue({ SecurityGroups: [] });
+            const result = await discovery.findExistingNatGateway(mockVpcId);
 
-            await expect(discovery.findDefaultSecurityGroup(mockVpcId)).rejects.toThrow(`No security group found for VPC ${mockVpcId}`);
+            expect(result).toBeDefined();
+            expect(result.NatGatewayId).toBe('nat-12345678');
+            expect(result._isInPrivateSubnet).toBe(true);
         });
-    });
 
-    describe('findDefaultKmsKey', () => {
-        it('should return customer managed key when found', async () => {
-            const mockKeyId = 'key-12345678';
-            const mockKeyArn = 'arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012';
+        it('should skip non-Frigg NAT Gateway in private subnet', async () => {
+            const mockNatGateways = [
+                {
+                    NatGatewayId: 'nat-other-12345',
+                    SubnetId: 'subnet-private-1',
+                    State: 'available',
+                    Tags: [] // No Frigg tags
+                },
+                {
+                    NatGatewayId: 'nat-good-12345',
+                    SubnetId: 'subnet-public-1',
+                    State: 'available',
+                    Tags: []
+                }
+            ];
+
+            ec2Mock.on(DescribeNatGatewaysCommand).resolves({
+                NatGateways: mockNatGateways
+            });
 
-            mockKMSSend
-                .mockResolvedValueOnce({ // ListKeys
-                    Keys: [{ KeyId: mockKeyId }]
+            // First call for subnet-private-1
+            ec2Mock.on(DescribeSubnetsCommand)
+                .resolvesOnce({
+                    Subnets: [{ SubnetId: 'subnet-private-1', VpcId: mockVpcId }]
                 })
-                .mockResolvedValueOnce({ // DescribeKey
-                    KeyMetadata: {
-                        KeyId: mockKeyId,
-                        Arn: mockKeyArn,
-                        KeyManager: 'CUSTOMER',
-                        KeyState: 'Enabled'
-                    }
+                // Second call for subnet-public-1
+                .resolvesOnce({
+                    Subnets: [{ SubnetId: 'subnet-public-1', VpcId: mockVpcId }]
                 });
 
-            mockSTSSend.mockResolvedValue({ Account: '123456789012' });
+            // First call for private subnet route table
+            ec2Mock.on(DescribeRouteTablesCommand)
+                .resolvesOnce({
+                    RouteTables: [{
+                        Associations: [{ SubnetId: 'subnet-private-1' }],
+                        Routes: [{ GatewayId: 'local' }] // Private
+                    }]
+                })
+                // Second call for public subnet route table
+                .resolvesOnce({
+                    RouteTables: [{
+                        Associations: [{ SubnetId: 'subnet-public-1' }],
+                        Routes: [{ GatewayId: 'igw-12345' }] // Public
+                    }]
+                });
 
-            const result = await discovery.findDefaultKmsKey();
+            const result = await discovery.findExistingNatGateway(mockVpcId);
 
-            expect(result).toBe(mockKeyArn);
+            expect(result).toBeDefined();
+            expect(result.NatGatewayId).toBe('nat-good-12345');
+            expect(result._isInPrivateSubnet).toBe(false);
         });
 
-        it('should return wildcard pattern when no customer keys found', async () => {
-            mockKMSSend.mockResolvedValue({ Keys: [] });
-            mockSTSSend.mockResolvedValue({ Account: '123456789012' });
+        it('should prioritize Frigg-managed NAT Gateways', async () => {
+            const mockNatGateways = [
+                {
+                    NatGatewayId: 'nat-other-12345',
+                    SubnetId: 'subnet-public-1',
+                    State: 'available',
+                    Tags: []
+                },
+                {
+                    NatGatewayId: 'nat-frigg-12345',
+                    SubnetId: 'subnet-public-2',
+                    State: 'available',
+                    Tags: [{ Key: 'ManagedBy', Value: 'Frigg' }]
+                }
+            ];
+
+            ec2Mock.on(DescribeNatGatewaysCommand).resolves({
+                NatGateways: mockNatGateways
+            });
 
-            const result = await discovery.findDefaultKmsKey();
+            ec2Mock.on(DescribeSubnetsCommand).resolves({
+                Subnets: [{ SubnetId: 'subnet-public-2', VpcId: mockVpcId }]
+            });
 
-            expect(result).toBe('arn:aws:kms:us-east-1:123456789012:key/*');
-        });
+            ec2Mock.on(DescribeRouteTablesCommand).resolves({
+                RouteTables: [{
+                    Associations: [{ SubnetId: 'subnet-public-2' }],
+                    Routes: [{ GatewayId: 'igw-12345' }] // Public
+                }]
+            });
+
+            const result = await discovery.findExistingNatGateway(mockVpcId);
 
-        it('should return fallback on error', async () => {
-            mockKMSSend.mockRejectedValue(new Error('KMS Error'));
+            expect(result).toBeDefined();
+            expect(result.NatGatewayId).toBe('nat-frigg-12345');
+            expect(result._isInPrivateSubnet).toBe(false);
+        });
 
-            const result = await discovery.findDefaultKmsKey();
+        it('should return null when no NAT Gateways found', async () => {
+            ec2Mock.on(DescribeNatGatewaysCommand).resolves({
+                NatGateways: []
+            });
 
-            expect(result).toBe('*');
+            const result = await discovery.findExistingNatGateway(mockVpcId);
+            expect(result).toBeNull();
         });
     });
 
@@ -457,7 +556,9 @@ describe('AWSDiscovery', () => {
             const mockKmsArn = 'arn:aws:kms:us-east-1:123456789012:key/12345678';
             const mockNatGateway = {
                 NatGatewayId: 'nat-12345678',
-                NatGatewayAddresses: [{ AllocationId: 'eipalloc-12345' }]
+                SubnetId: 'subnet-public-1',
+                NatGatewayAddresses: [{ AllocationId: 'eipalloc-12345' }],
+                _isInPrivateSubnet: false
             };
 
             // Mock all the discovery methods
@@ -484,6 +585,7 @@ describe('AWSDiscovery', () => {
                 defaultKmsKeyId: mockKmsArn,
                 existingNatGatewayId: 'nat-12345678',
                 existingElasticIpAllocationId: 'eipalloc-12345',
+                natGatewayInPrivateSubnet: false,
                 subnetConversionRequired: false,
                 privateSubnetsWithWrongRoutes: []
             });
@@ -517,8 +619,10 @@ describe('AWSDiscovery', () => {
             jest.spyOn(discovery, 'findExistingNatGateway').mockResolvedValue(null);
             jest.spyOn(discovery, 'findAvailableElasticIP').mockResolvedValue(null);
             jest.spyOn(discovery, 'isSubnetPrivate')
-                .mockResolvedValueOnce(false) // subnet-1 is actually public
-                .mockResolvedValueOnce(true); // subnet-2 is private
+                .mockImplementation((subnetId) => {
+                    // subnet-1 is public, subnet-2 is private
+                    return Promise.resolve(subnetId === 'subnet-2');
+                });
 
             const result = await discovery.discoverResources({ selfHeal: true });
 
@@ -560,15 +664,54 @@ describe('AWSDiscovery', () => {
             });
         });
 
+        it('should detect NAT Gateway in private subnet in discoverResources', async () => {
+            const mockVpc = { VpcId: 'vpc-12345678' };
+            const mockSubnets = [
+                { SubnetId: 'subnet-1' },
+                { SubnetId: 'subnet-2' }
+            ];
+            const mockPublicSubnet = { SubnetId: 'subnet-public-1' };
+            const mockSecurityGroup = { GroupId: 'sg-12345678' };
+            const mockRouteTable = { RouteTableId: 'rtb-12345678' };
+            const mockNatGateway = {
+                NatGatewayId: 'nat-12345678',
+                NatGatewayAddresses: [{ AllocationId: 'eipalloc-12345' }],
+                _isInPrivateSubnet: true // NAT is in private subnet
+            };
+
+            jest.spyOn(discovery, 'findDefaultVpc').mockResolvedValue(mockVpc);
+            jest.spyOn(discovery, 'findPrivateSubnets').mockResolvedValue(mockSubnets);
+            jest.spyOn(discovery, 'findPublicSubnets').mockResolvedValue(mockPublicSubnet);
+            jest.spyOn(discovery, 'findDefaultSecurityGroup').mockResolvedValue(mockSecurityGroup);
+            jest.spyOn(discovery, 'findPrivateRouteTable').mockResolvedValue(mockRouteTable);
+            jest.spyOn(discovery, 'findDefaultKmsKey').mockResolvedValue(null);
+            jest.spyOn(discovery, 'findExistingNatGateway').mockResolvedValue(mockNatGateway);
+            jest.spyOn(discovery, 'isSubnetPrivate')
+                .mockResolvedValueOnce(true)
+                .mockResolvedValueOnce(true);
+
+            const result = await discovery.discoverResources();
+
+            expect(result).toMatchObject({
+                defaultVpcId: 'vpc-12345678',
+                existingNatGatewayId: 'nat-12345678',
+                natGatewayInPrivateSubnet: true, // Should be true
+                subnetConversionRequired: false,
+                privateSubnetsWithWrongRoutes: []
+            });
+        });
+
         it('should handle single subnet scenario', async () => {
             const mockVpc = { VpcId: 'vpc-12345678' };
             const mockSubnets = [{ SubnetId: 'subnet-1' }]; // Only one subnet
+            const mockPublicSubnet = { SubnetId: 'subnet-public-1' };
             const mockSecurityGroup = { GroupId: 'sg-12345678' };
             const mockRouteTable = { RouteTableId: 'rtb-12345678' };
             const mockKmsArn = 'arn:aws:kms:us-east-1:123456789012:key/12345678';
 
             jest.spyOn(discovery, 'findDefaultVpc').mockResolvedValue(mockVpc);
             jest.spyOn(discovery, 'findPrivateSubnets').mockResolvedValue(mockSubnets);
+            jest.spyOn(discovery, 'findPublicSubnets').mockResolvedValue(mockPublicSubnet);
             jest.spyOn(discovery, 'findDefaultSecurityGroup').mockResolvedValue(mockSecurityGroup);
             jest.spyOn(discovery, 'findPrivateRouteTable').mockResolvedValue(mockRouteTable);
             jest.spyOn(discovery, 'findDefaultKmsKey').mockResolvedValue(mockKmsArn);

package/infrastructure/test-subnet-logic.js

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+/**
+ * Test script to verify subnet detection and classification logic
+ */
+
+const { AWSDiscovery } = require('./aws-discovery');
+
+async function testSubnetLogic() {
+    console.log('🧪 Testing Subnet Detection and Classification Logic');
+    console.log('═'.repeat(60));
+
+    try {
+        const discovery = new AWSDiscovery();
+
+        // Test with selfHeal enabled
+        console.log('\n📋 Testing with selfHeal: true');
+        console.log('-'.repeat(40));
+
+        const resources = await discovery.discoverResources({ selfHeal: true });
+
+        console.log('\n📊 Results:');
+        console.log(`  VPC ID: ${resources.defaultVpcId}`);
+        console.log(`  Private Subnet 1: ${resources.privateSubnetId1}`);
+        console.log(`  Private Subnet 2: ${resources.privateSubnetId2}`);
+        console.log(`  Public Subnet: ${resources.publicSubnetId}`);
+        console.log(`  Conversion Required: ${resources.subnetConversionRequired}`);
+
+        if (resources.privateSubnetsWithWrongRoutes && resources.privateSubnetsWithWrongRoutes.length > 0) {
+            console.log(`\n⚠️  Subnets needing conversion:`);
+            resources.privateSubnetsWithWrongRoutes.forEach(subnet => {
+                console.log(`    - ${subnet}`);
+            });
+        }
+
+        console.log('\n✅ Test completed successfully!');
+
+    } catch (error) {
+        console.error('\n❌ Test failed:', error.message);
+        console.error('\nStack trace:', error.stack);
+        process.exit(1);
+    }
+}
+
+// Run the test
+testSubnetLogic().catch(error => {
+    console.error('Unhandled error:', error);
+    process.exit(1);
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.428.7665532.0",
+  "version": "2.0.0--canary.428.6b04c24.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -9,8 +9,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.428.7665532.0",
-    "@friggframework/test": "2.0.0--canary.428.7665532.0",
+    "@friggframework/schemas": "2.0.0--canary.428.6b04c24.0",
+    "@friggframework/test": "2.0.0--canary.428.6b04c24.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -32,8 +32,10 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.428.7665532.0",
-    "@friggframework/prettier-config": "2.0.0--canary.428.7665532.0",
+    "@friggframework/eslint-config": "2.0.0--canary.428.6b04c24.0",
+    "@friggframework/prettier-config": "2.0.0--canary.428.6b04c24.0",
+    "aws-sdk-client-mock": "^4.1.0",
+    "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
@@ -66,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7665532bd0d3fa2968e2575d9f9e79dd3d119375"
+  "gitHead": "6b04c24df1e253fd23afd6acb39ec9b5ad61456f"
 }