@friggframework/devtools 2.0.0--canary.474.ca45ad3.0 → 2.0.0--canary.474.edb48ba.0

package/infrastructure/domains/database/aurora-builder.js

@@ -400,7 +400,7 @@ class AuroraBuilder extends InfrastructureBuilder {
             Properties: {
                 Engine: 'aurora-postgresql',
                 EngineMode: 'provisioned',
-                EngineVersion: '15.5',
+                EngineVersion: dbConfig.engineVersion || '15.13', // Configurable, defaults to 15.13 (latest as of Oct 2025)
                 Port: 5432, // Explicitly set PostgreSQL port (AWS may not auto-detect)
                 DatabaseName: dbConfig.database || 'frigg',
                 MasterUsername: {

package/infrastructure/domains/security/kms-builder.js

@@ -232,14 +232,32 @@ class KmsBuilder extends InfrastructureBuilder {
         // Check for environment variable fallback flag (legacy behavior)
         const useEnvVarFallback = appDefinition.encryption?._useEnvVarFallback;
 
+        // CRITICAL FIX: Check if KMS key exists OUTSIDE of stack (orphaned resource)
+        // If key exists but not in stack, we should use it as EXTERNAL, not try to create it
+        const externalKmsKey = discoveredResources?.defaultKmsKeyId ||
+                              discoveredResources?.kmsKeyArn ||
+                              discoveredResources?.kmsKeyId;
+
         if (decisions.key.ownership === ResourceOwnership.STACK && decisions.key.physicalId) {
             // Key exists in stack - add definitions (CloudFormation idempotency)
             console.log('  → Adding KMS definitions to template (existing in stack)');
             result.resources = this.createKmsKey(appDefinition);
             result.environment.KMS_KEY_ARN = { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] };
             console.log('  ✅ KMS key resources created');
+        } else if (decisions.key.ownership === ResourceOwnership.STACK && !decisions.key.physicalId && externalKmsKey) {
+            // ORPHANED KEY FIX: Key exists externally but not in stack
+            // Use it as external instead of trying to create (would fail with "already exists")
+            console.log('  ⚠️  KMS key exists externally but not in stack - using as external resource');
+            console.log(`  → Using external KMS key: ${externalKmsKey}`);
+
+            // Format as ARN if it's just a key ID
+            const kmsArn = externalKmsKey.startsWith('arn:')
+                ? externalKmsKey
+                : `arn:aws:kms:\${self:provider.region}:\${aws:accountId}:key/${externalKmsKey}`;
+
+            result.environment.KMS_KEY_ARN = kmsArn;
         } else if (decisions.key.ownership === ResourceOwnership.STACK && !decisions.key.physicalId && !useEnvVarFallback) {
-            // Create new KMS key (only if not using env var fallback)
+            // Create new KMS key (only if not using env var fallback and no external key found)
             console.log('  → Creating new KMS key in stack');
             result.resources = this.createKmsKey(appDefinition);
             result.environment.KMS_KEY_ARN = { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] };

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.474.ca45ad3.0",
+  "version": "2.0.0--canary.474.edb48ba.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
     "@aws-sdk/client-rds": "^3.906.0",
+    "@aws-sdk/client-s3": "^3.917.0",
     "@aws-sdk/client-secrets-manager": "^3.906.0",
     "@aws-sdk/client-sts": "^3.835.0",
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.474.ca45ad3.0",
-    "@friggframework/test": "2.0.0--canary.474.ca45ad3.0",
+    "@friggframework/schemas": "2.0.0--canary.474.edb48ba.0",
+    "@friggframework/test": "2.0.0--canary.474.edb48ba.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -34,8 +35,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.474.ca45ad3.0",
-    "@friggframework/prettier-config": "2.0.0--canary.474.ca45ad3.0",
+    "@friggframework/eslint-config": "2.0.0--canary.474.edb48ba.0",
+    "@friggframework/prettier-config": "2.0.0--canary.474.edb48ba.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -67,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ca45ad3b737f85241453177ba87eb05fba6d389e"
+  "gitHead": "edb48ba0a837958952432272ef74cc5506a74756"
 }