@friggframework/devtools 2.0.0--canary.461.39e4094.0 → 2.0.0--canary.461.6096bdb.0

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

@@ -233,7 +233,14 @@ class VpcBuilder extends InfrastructureBuilder {
             existingEndpoints.kms || existingEndpoints.secretsManager || existingEndpoints.sqs;
 
         if (appDefinition.vpc.enableVPCEndpoints !== false) {
-            if (vpcManagement === 'create-new') {
+            // Check if resources came from CloudFormation stack
+            const fromCfStack = discoveredResources.fromCloudFormationStack === true;
+            const existingLogicalIds = discoveredResources.existingLogicalIds || [];
+
+            if (fromCfStack && existingLogicalIds.length > 0 && allEndpointsExist) {
+                console.log('  All VPC endpoints exist in CloudFormation stack - skipping creation');
+                // Skip VPC endpoint creation entirely
+            } else if (vpcManagement === 'create-new') {
                 // Always create in create-new mode
                 this.buildVpcEndpoints(appDefinition, discoveredResources, result, existingEndpoints);
             } else if (vpcManagement === 'discover') {
@@ -418,6 +425,27 @@ class VpcBuilder extends InfrastructureBuilder {
 
         result.vpcId = discoveredResources.defaultVpcId;
 
+        // Check if resources came from CloudFormation stack
+        const fromCfStack = discoveredResources.fromCloudFormationStack === true;
+        const existingLogicalIds = discoveredResources.existingLogicalIds || [];
+
+        if (fromCfStack && existingLogicalIds.length > 0) {
+            console.log(`  ✓ VPC discovered from CloudFormation stack: ${discoveredResources.stackName}`);
+            console.log(`  ✓ Found ${existingLogicalIds.length} existing resources in stack`);
+            console.log('  ℹ Skipping resource creation - will reuse existing CloudFormation resources');
+
+            // Set security group IDs from discovered resources
+            if (discoveredResources.securityGroupId) {
+                result.vpcConfig.securityGroupIds = [discoveredResources.securityGroupId];
+            }
+
+            // Don't create any new resources - they already exist in the CF stack
+            return;
+        }
+
+        // VPC discovered from AWS API (not from CF stack) - create needed resources
+        console.log('  ℹ VPC discovered from AWS API - will create Lambda security group');
+
         // Create a Lambda security group in the discovered VPC
         // This is needed even in discover mode so other resources can reference it
         result.resources.FriggLambdaSecurityGroup = {
@@ -695,6 +723,15 @@ class VpcBuilder extends InfrastructureBuilder {
 
         console.log(`  NAT Gateway Management: ${natManagement}`);
 
+        // Check if resources came from CloudFormation stack
+        const fromCfStack = discoveredResources.fromCloudFormationStack === true;
+        const existingLogicalIds = discoveredResources.existingLogicalIds || [];
+
+        if (fromCfStack && existingLogicalIds.length > 0) {
+            console.log('    Skipping NAT Gateway - will reuse from CloudFormation stack');
+            return;
+        }
+
         // Check if we should create NAT Gateway
         const needsNatGateway = natManagement === 'createAndManage' ||
             discoveredResources.needsNewNatGateway === true;

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

@@ -22,7 +22,7 @@ class CloudFormationDiscovery {
 
     /**
      * Discover resources from an existing CloudFormation stack
-     * 
+     *
      * @param {string} stackName - Name of the CloudFormation stack
      * @returns {Promise<Object|null>} Discovered resources or null if stack doesn't exist
      */
@@ -35,7 +35,12 @@ class CloudFormationDiscovery {
             const resources = await this.provider.listStackResources(stackName);
 
             // Extract discovered resources from outputs and resources
-            const discovered = {};
+            const discovered = {
+                // Metadata to indicate resources came from CloudFormation stack
+                fromCloudFormationStack: true,
+                stackName: stackName,
+                existingLogicalIds: []
+            };
 
             // Extract from outputs
             if (stack.Outputs && stack.Outputs.length > 0) {
@@ -46,6 +51,11 @@ class CloudFormationDiscovery {
             // Always call this even if resources is empty, as it may query AWS for resources
             await this._extractFromResources(resources || [], discovered);
 
+            // Clean up metadata if no resources were discovered
+            if (discovered.existingLogicalIds.length === 0) {
+                delete discovered.existingLogicalIds;
+            }
+
             return discovered;
         } catch (error) {
             // Stack doesn't exist - return null to trigger fallback discovery
@@ -103,16 +113,26 @@ class CloudFormationDiscovery {
 
     /**
      * Extract discovered resources from CloudFormation stack resources
-     * 
+     *
      * @private
      * @param {Array} resources - CloudFormation stack resources
      * @param {Object} discovered - Object to populate with discovered resources
      */
     async _extractFromResources(resources, discovered) {
         console.log(`  DEBUG: Processing ${resources.length} CloudFormation resources...`);
+
+        // Initialize existingLogicalIds array if not present
+        if (!discovered.existingLogicalIds) {
+            discovered.existingLogicalIds = [];
+        }
         for (const resource of resources) {
             const { LogicalResourceId, PhysicalResourceId, ResourceType } = resource;
 
+            // Track Frigg-managed resources by logical ID
+            if (LogicalResourceId.startsWith('Frigg') || LogicalResourceId.includes('Migration')) {
+                discovered.existingLogicalIds.push(LogicalResourceId);
+            }
+
             // Debug Aurora detection
             if (LogicalResourceId.includes('Aurora')) {
                 console.log(`  DEBUG: Found Aurora resource: ${LogicalResourceId} (${ResourceType})`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.39e4094.0",
+  "version": "2.0.0--canary.461.6096bdb.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.39e4094.0",
-    "@friggframework/test": "2.0.0--canary.461.39e4094.0",
+    "@friggframework/schemas": "2.0.0--canary.461.6096bdb.0",
+    "@friggframework/test": "2.0.0--canary.461.6096bdb.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.39e4094.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.39e4094.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.6096bdb.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.6096bdb.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": "39e40947472c29e3847fa53dad03ab1354568e56"
+  "gitHead": "6096bdbabd54fc3f32a2fce0975467f69aaf273d"
 }