@friggframework/devtools 2.0.0--canary.490.de9ed00.0 → 2.0.0--canary.490.71c435d.0

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

@@ -398,19 +398,33 @@ describe('VpcBuilder', () => {
             expect(result.resources.FriggS3VPCEndpoint.Properties.VpcId).toBe('vpc-123');
         });
 
-        it('should reuse stack-managed VPC endpoints without creating CloudFormation resources', async () => {
+        it('should add stack-managed VPC endpoints back to template to prevent deletion', async () => {
             const appDefinition = {
-                vpc: { enable: true, enableVPCEndpoints: true },
+                vpc: { enable: true },
                 encryption: { fieldLevelEncryptionMethod: 'kms' },
-                database: { postgres: { enable: true } },
             };
+            
+            // Structured discovery from CloudFormation
             const discoveredResources = {
+                fromCloudFormationStack: true,
+                stackName: 'test-stack',
+                existingLogicalIds: [
+                    'FriggLambdaSecurityGroup',
+                    'FriggLambdaRouteTable',
+                    'FriggS3VPCEndpoint',
+                    'FriggDynamoDBVPCEndpoint',
+                    'FriggKMSVPCEndpoint',
+                    'FriggSecretsManagerVPCEndpoint',
+                    'FriggSQSVPCEndpoint'
+                ],
                 defaultVpcId: 'vpc-123',
                 privateSubnetId1: 'subnet-1',
                 privateSubnetId2: 'subnet-2',
-                // VPC endpoints from CloudFormation stack (string IDs)
+                routeTableId: 'rtb-123',
+                lambdaSecurityGroupId: 'sg-123',
+                // VPC endpoints discovered in stack
                 s3VpcEndpointId: 'vpce-s3-stack',
-                dynamoDbVpcEndpointId: 'vpce-ddb-stack',
+                dynamodbVpcEndpointId: 'vpce-ddb-stack',
                 kmsVpcEndpointId: 'vpce-kms-stack',
                 secretsManagerVpcEndpointId: 'vpce-sm-stack',
                 sqsVpcEndpointId: 'vpce-sqs-stack',
@@ -418,15 +432,30 @@ describe('VpcBuilder', () => {
 
             const result = await vpcBuilder.build(appDefinition, discoveredResources);
 
-            // Should NOT create CloudFormation resources (reuse stack endpoints)
-            expect(result.resources.FriggS3VPCEndpoint).toBeUndefined();
-            expect(result.resources.FriggDynamoDBVPCEndpoint).toBeUndefined();
-            expect(result.resources.FriggKMSVPCEndpoint).toBeUndefined();
-            expect(result.resources.FriggSecretsManagerVPCEndpoint).toBeUndefined();
-            expect(result.resources.FriggSQSVPCEndpoint).toBeUndefined();
+            // CRITICAL: Must RE-ADD stack-managed endpoints to template or CloudFormation will DELETE them
+            expect(result.resources.FriggS3VPCEndpoint).toBeDefined();
+            expect(result.resources.FriggS3VPCEndpoint.Type).toBe('AWS::EC2::VPCEndpoint');
+            expect(result.resources.FriggS3VPCEndpoint.Properties.VpcEndpointType).toBe('Gateway');
+            
+            expect(result.resources.FriggDynamoDBVPCEndpoint).toBeDefined();
+            expect(result.resources.FriggDynamoDBVPCEndpoint.Type).toBe('AWS::EC2::VPCEndpoint');
+            expect(result.resources.FriggDynamoDBVPCEndpoint.Properties.VpcEndpointType).toBe('Gateway');
+            
+            expect(result.resources.FriggKMSVPCEndpoint).toBeDefined();
+            expect(result.resources.FriggKMSVPCEndpoint.Type).toBe('AWS::EC2::VPCEndpoint');
+            expect(result.resources.FriggKMSVPCEndpoint.Properties.VpcEndpointType).toBe('Interface');
+            
+            expect(result.resources.FriggSecretsManagerVPCEndpoint).toBeDefined();
+            expect(result.resources.FriggSecretsManagerVPCEndpoint.Type).toBe('AWS::EC2::VPCEndpoint');
+            expect(result.resources.FriggSecretsManagerVPCEndpoint.Properties.VpcEndpointType).toBe('Interface');
+            
+            expect(result.resources.FriggSQSVPCEndpoint).toBeDefined();
+            expect(result.resources.FriggSQSVPCEndpoint.Type).toBe('AWS::EC2::VPCEndpoint');
+            expect(result.resources.FriggSQSVPCEndpoint.Properties.VpcEndpointType).toBe('Interface');
 
-            // Should still NOT create VPC Endpoint Security Group
-            expect(result.resources.FriggVPCEndpointSecurityGroup).toBeUndefined();
+            // Should create VPC Endpoint Security Group for interface endpoints
+            expect(result.resources.FriggVPCEndpointSecurityGroup).toBeDefined();
+            expect(result.resources.FriggVPCEndpointSecurityGroup.Type).toBe('AWS::EC2::SecurityGroup');
         });
 
         it('should create VPC endpoints when discovered from AWS but not stack', async () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.490.de9ed00.0",
+  "version": "2.0.0--canary.490.71c435d.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.de9ed00.0",
-    "@friggframework/schemas": "2.0.0--canary.490.de9ed00.0",
-    "@friggframework/test": "2.0.0--canary.490.de9ed00.0",
+    "@friggframework/core": "2.0.0--canary.490.71c435d.0",
+    "@friggframework/schemas": "2.0.0--canary.490.71c435d.0",
+    "@friggframework/test": "2.0.0--canary.490.71c435d.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.de9ed00.0",
-    "@friggframework/prettier-config": "2.0.0--canary.490.de9ed00.0",
+    "@friggframework/eslint-config": "2.0.0--canary.490.71c435d.0",
+    "@friggframework/prettier-config": "2.0.0--canary.490.71c435d.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": "de9ed004fd58650d6be0a619a3fcd02cc35b7c6d"
+  "gitHead": "71c435df870654de6b8f2594674ac35c32c2bd93"
 }