@friggframework/devtools 2.0.0--canary.474.86c5119.0 → 2.0.0--canary.474.898a56c.0

package/infrastructure/domains/health/infrastructure/adapters/aws-resource-detector.test.js

@@ -439,23 +439,53 @@ describe('AWSResourceDetector', () => {
     });
 
     describe('findOrphanedResources', () => {
-        it('should find orphaned RDS DBCluster', async () => {
+        const StackIdentifier = require('../../domain/value-objects/stack-identifier');
+
+        it('should find orphaned RDS DBCluster with frigg:stack tag', async () => {
+            const stackIdentifier = new StackIdentifier({
+                stackName: 'my-app-prod',
+                region: 'us-east-1',
+            });
+
+            const stackResources = [
+                {
+                    logicalId: 'MyDBCluster',
+                    physicalId: 'managed-cluster',
+                    resourceType: 'AWS::RDS::DBCluster',
+                },
+            ];
+
             mockRDSSend.mockResolvedValue({
                 DBClusters: [
                     {
+                        // Managed by CloudFormation - not orphaned
+                        DBClusterIdentifier: 'managed-cluster',
+                        DBClusterArn: 'arn:aws:rds:us-east-1:123456789012:cluster:managed-cluster',
+                        Engine: 'aurora-postgresql',
+                        Status: 'available',
+                        ClusterCreateTime: new Date('2024-01-01T00:00:00Z'),
+                        TagList: [
+                            { Key: 'aws:cloudformation:stack-name', Value: 'my-app-prod' },
+                            { Key: 'frigg:stack', Value: 'my-app-prod' },
+                        ],
+                    },
+                    {
+                        // Has frigg:stack tag but no CloudFormation tag - orphaned
                         DBClusterIdentifier: 'orphan-cluster',
                         DBClusterArn: 'arn:aws:rds:us-east-1:123456789012:cluster:orphan-cluster',
                         Engine: 'aurora-postgresql',
                         Status: 'available',
                         ClusterCreateTime: new Date('2024-01-01T00:00:00Z'),
-                        TagList: [],
+                        TagList: [
+                            { Key: 'frigg:stack', Value: 'my-app-prod' },
+                        ],
                     },
                 ],
             });
 
             const orphans = await detector.findOrphanedResources({
-                region: 'us-east-1',
-                resourceTypes: ['AWS::RDS::DBCluster'],
+                stackIdentifier,
+                stackResources,
             });
 
             expect(orphans).toHaveLength(1);
@@ -464,22 +494,49 @@ describe('AWSResourceDetector', () => {
             expect(orphans[0].reason).toContain('not managed by CloudFormation');
         });
 
-        it('should exclude specified physical IDs', async () => {
+        it('should not return resources managed by CloudFormation', async () => {
+            const stackIdentifier = new StackIdentifier({
+                stackName: 'my-app-prod',
+                region: 'us-east-1',
+            });
+
+            const stackResources = [
+                {
+                    logicalId: 'MyVPC',
+                    physicalId: 'vpc-123',
+                    resourceType: 'AWS::EC2::VPC',
+                },
+            ];
+
             mockEC2Send.mockResolvedValue({
                 Vpcs: [
-                    { VpcId: 'vpc-123', CidrBlock: '10.0.0.0/16', State: 'available', Tags: [] },
-                    { VpcId: 'vpc-456', CidrBlock: '10.1.0.0/16', State: 'available', Tags: [] },
+                    {
+                        VpcId: 'vpc-123',
+                        CidrBlock: '10.0.0.0/16',
+                        State: 'available',
+                        Tags: [
+                            { Key: 'aws:cloudformation:stack-name', Value: 'my-app-prod' },
+                            { Key: 'frigg:stack', Value: 'my-app-prod' },
+                        ],
+                    },
+                    {
+                        VpcId: 'vpc-456',
+                        CidrBlock: '10.1.0.0/16',
+                        State: 'available',
+                        Tags: [
+                            { Key: 'aws:cloudformation:stack-name', Value: 'other-stack' },
+                        ],
+                    },
                 ],
             });
 
             const orphans = await detector.findOrphanedResources({
-                region: 'us-east-1',
-                resourceTypes: ['AWS::EC2::VPC'],
-                excludePhysicalIds: ['vpc-123'],
+                stackIdentifier,
+                stackResources,
             });
 
-            expect(orphans).toHaveLength(1);
-            expect(orphans[0].physicalId).toBe('vpc-456');
+            // Should not find any orphans - both VPCs are CloudFormation-managed
+            expect(orphans).toEqual([]);
         });
     });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.474.86c5119.0",
+  "version": "2.0.0--canary.474.898a56c.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.474.86c5119.0",
-    "@friggframework/test": "2.0.0--canary.474.86c5119.0",
+    "@friggframework/schemas": "2.0.0--canary.474.898a56c.0",
+    "@friggframework/test": "2.0.0--canary.474.898a56c.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.474.86c5119.0",
-    "@friggframework/prettier-config": "2.0.0--canary.474.86c5119.0",
+    "@friggframework/eslint-config": "2.0.0--canary.474.898a56c.0",
+    "@friggframework/prettier-config": "2.0.0--canary.474.898a56c.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "86c5119f607135820a24b687fa53501345e0d6ef"
+  "gitHead": "898a56c40d5fe1b6f0603f87e4caf2a6833f046a"
 }