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

package/infrastructure/aws-discovery.js

@@ -592,37 +592,99 @@ class AWSDiscovery {
      */
     async findDefaultKmsKey() {
         try {
+            // Log AWS account and region info for verification
+            console.log(`[KMS Discovery] Running in region: ${this.region}`);
+            try {
+                const accountId = await this.getAccountId();
+                console.log(`[KMS Discovery] AWS Account ID: ${accountId}`);
+            } catch (error) {
+                console.warn('[KMS Discovery] Could not retrieve account ID:', error.message);
+            }
+
             const command = new ListKeysCommand({});
             const response = await this.kmsClient.send(command);
-            
+
             if (!response.Keys || response.Keys.length === 0) {
-                console.log('No KMS keys found in account');
+                console.log('[KMS Discovery] No KMS keys found in account');
                 return null;
             }
 
+            console.log(`[KMS Discovery] Found ${response.Keys.length} total keys in account`);
+            let keysExamined = 0;
+            let customerManagedKeys = 0;
+            let enabledKeys = 0;
+            let pendingDeletionKeys = 0;
+
             // Look for customer managed keys first
             for (const key of response.Keys) {
                 try {
                     const describeCommand = new DescribeKeyCommand({ KeyId: key.KeyId });
                     const keyDetails = await this.kmsClient.send(describeCommand);
-                    
-                    if (keyDetails.KeyMetadata && 
-                        keyDetails.KeyMetadata.KeyManager === 'CUSTOMER' &&
-                        keyDetails.KeyMetadata.KeyState === 'Enabled') {
-                        console.log(`Found customer managed KMS key: ${keyDetails.KeyMetadata.Arn}`);
-                        return keyDetails.KeyMetadata.Arn;
+                    keysExamined++;
+
+                    if (keyDetails.KeyMetadata) {
+                        const metadata = keyDetails.KeyMetadata;
+
+                        // Log detailed key information
+                        console.log(`[KMS Discovery] Key ${key.KeyId}:`, {
+                            KeyManager: metadata.KeyManager,
+                            KeyState: metadata.KeyState,
+                            Enabled: metadata.Enabled,
+                            DeletionDate: metadata.DeletionDate || 'Not scheduled for deletion',
+                            Arn: metadata.Arn
+                        });
+
+                        if (metadata.KeyManager === 'CUSTOMER') {
+                            customerManagedKeys++;
+
+                            if (metadata.KeyState === 'Enabled') {
+                                enabledKeys++;
+                            } else if (metadata.KeyState === 'PendingDeletion') {
+                                pendingDeletionKeys++;
+                                console.warn(`[KMS Discovery] Skipping key ${key.KeyId} - State: PendingDeletion, DeletionDate: ${metadata.DeletionDate}`);
+                            }
+
+                            // Explicitly check for enabled state AND absence of deletion
+                            if (metadata.KeyManager === 'CUSTOMER' &&
+                                metadata.KeyState === 'Enabled' &&
+                                !metadata.DeletionDate) {
+                                console.log(`[KMS Discovery] Found eligible customer managed KMS key: ${metadata.Arn}`);
+                                return metadata.Arn;
+                            } else if (metadata.KeyManager === 'CUSTOMER' &&
+                                      metadata.KeyState === 'Enabled' &&
+                                      metadata.DeletionDate) {
+                                // This shouldn't happen according to AWS docs, but log it if it does
+                                console.error(`[KMS Discovery] WARNING: Key ${key.KeyId} has KeyState='Enabled' but DeletionDate is set: ${metadata.DeletionDate}`);
+                            }
+                        }
                     }
                 } catch (error) {
                     // Continue to next key if we can't describe this one
-                    console.warn(`Could not describe key ${key.KeyId}:`, error.message);
+                    console.warn(`[KMS Discovery] Could not describe key ${key.KeyId}:`, error.message);
                     continue;
                 }
             }
 
-            console.log('No customer managed KMS keys found');
+            // Summary logging
+            console.log('[KMS Discovery] Summary:', {
+                totalKeys: response.Keys.length,
+                keysExamined: keysExamined,
+                customerManagedKeys: customerManagedKeys,
+                enabledKeys: enabledKeys,
+                pendingDeletionKeys: pendingDeletionKeys
+            });
+
+            if (customerManagedKeys === 0) {
+                console.log('[KMS Discovery] No customer managed KMS keys found in account');
+            } else if (enabledKeys === 0) {
+                console.warn('[KMS Discovery] Found customer managed keys but none are in Enabled state');
+            } else {
+                console.warn('[KMS Discovery] Found enabled customer managed keys but none met all criteria');
+            }
+
             return null;
         } catch (error) {
-            console.error('Error finding default KMS key:', error);
+            console.error('[KMS Discovery] Error finding default KMS key:', error);
             return null;
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.428.6b04c24.0",
+  "version": "2.0.0--canary.428.5364e8f.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.6b04c24.0",
-    "@friggframework/test": "2.0.0--canary.428.6b04c24.0",
+    "@friggframework/schemas": "2.0.0--canary.428.5364e8f.0",
+    "@friggframework/test": "2.0.0--canary.428.5364e8f.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -32,8 +32,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.428.6b04c24.0",
-    "@friggframework/prettier-config": "2.0.0--canary.428.6b04c24.0",
+    "@friggframework/eslint-config": "2.0.0--canary.428.5364e8f.0",
+    "@friggframework/prettier-config": "2.0.0--canary.428.5364e8f.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6b04c24df1e253fd23afd6acb39ec9b5ad61456f"
+  "gitHead": "5364e8f51732aa43ffbb4431fdcea2bfa69fb632"
 }