@friggframework/devtools 2.0.0--canary.461.d885809.0 → 2.0.0--canary.461.39132db.0

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

@@ -90,6 +90,15 @@ async function gatherDiscoveredResources(appDefinition) {
             return stackResources;
         }
 
+        // In isolated mode, ONLY use CloudFormation discovery for this stage's stack
+        // Do NOT fall back to AWS API discovery (which finds resources from other stages)
+        if (appDefinition.managementMode === 'managed' && appDefinition.vpcIsolation === 'isolated') {
+            console.log('  ℹ Isolated mode: only discovering resources from this stage\'s stack');
+            console.log('  ℹ No existing stack resources found - will create fresh infrastructure');
+            console.log('✅ Cloud resource discovery completed successfully!');
+            return {};
+        }
+
         // Fallback to AWS API discovery (fresh deployment, stack not found, or stack has no useful data)
         if (stackResources && !hasSomeUsefulData) {
             console.log('  ℹ Stack found but contains no usable resources - running AWS API discovery...');

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

@@ -406,5 +406,80 @@ describe('Resource Discovery', () => {
             );
         });
     });
+
+    describe('Isolated Mode Discovery', () => {
+        beforeEach(() => {
+            // Mock CloudFormation discovery
+            jest.mock('./cloudformation-discovery');
+            const { CloudFormationDiscovery } = require('./cloudformation-discovery');
+            CloudFormationDiscovery.mockImplementation(() => ({
+                discoverFromStack: jest.fn().mockResolvedValue({}), // No stack found
+            }));
+        });
+
+        it('should return empty results for isolated mode (prevents cross-stage contamination)', async () => {
+            const appDefinition = {
+                name: 'test-app',
+                managementMode: 'managed',
+                vpcIsolation: 'isolated',
+                vpc: { enable: true },
+                database: { postgres: { enable: true } },
+            };
+
+            process.env.SLS_STAGE = 'dev';
+
+            const result = await gatherDiscoveredResources(appDefinition);
+
+            // Should return empty (no discovery)
+            expect(result).toEqual({});
+            
+            // Should NOT call AWS API discovery
+            expect(mockVpcDiscovery.discover).not.toHaveBeenCalled();
+            expect(mockAuroraDiscovery.discover).not.toHaveBeenCalled();
+        });
+
+        it('should still use CloudFormation discovery in isolated mode for redeployments', async () => {
+            const { CloudFormationDiscovery } = require('./cloudformation-discovery');
+            const mockCfDiscover = jest.fn().mockResolvedValue({
+                defaultVpcId: 'vpc-stage-specific',
+                auroraClusterId: 'cluster-stage-specific',
+            });
+
+            CloudFormationDiscovery.mockImplementation(() => ({
+                discoverFromStack: mockCfDiscover,
+            }));
+
+            const appDefinition = {
+                name: 'test-app',
+                managementMode: 'managed',
+                vpcIsolation: 'isolated',
+                vpc: { enable: true },
+            };
+
+            process.env.SLS_STAGE = 'dev';
+
+            const result = await gatherDiscoveredResources(appDefinition);
+
+            // Should call CloudFormation discovery for stage-specific stack
+            expect(mockCfDiscover).toHaveBeenCalledWith('test-app-dev');
+            
+            // If CF finds resources, use them (redeployment scenario)
+            expect(result.defaultVpcId).toBe('vpc-stage-specific');
+        });
+
+        it('should use AWS API discovery in shared mode', async () => {
+            const appDefinition = {
+                name: 'test-app',
+                managementMode: 'managed',
+                vpcIsolation: 'shared',  // NOT isolated
+                vpc: { enable: true },
+            };
+
+            await gatherDiscoveredResources(appDefinition);
+
+            // Should call AWS API discovery (shared mode finds resources across stages)
+            expect(mockVpcDiscovery.discover).toHaveBeenCalled();
+        });
+    });
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.d885809.0",
+  "version": "2.0.0--canary.461.39132db.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.d885809.0",
-    "@friggframework/test": "2.0.0--canary.461.d885809.0",
+    "@friggframework/schemas": "2.0.0--canary.461.39132db.0",
+    "@friggframework/test": "2.0.0--canary.461.39132db.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.d885809.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.d885809.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.39132db.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.39132db.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": "d8858090c719e05e3bd548c092844430f728ff05"
+  "gitHead": "39132dbc3da9052429c0ce6fe1f32f50be162b89"
 }