@friggframework/devtools 2.0.0--canary.461.b4ab96e.0 → 2.0.0--canary.461.bb7fcba.0

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

@@ -83,7 +83,36 @@ class AuroraBuilder extends InfrastructureBuilder {
         console.log(`\n[${this.name}] Configuring Aurora PostgreSQL...`);
 
         const dbConfig = appDefinition.database.postgres;
-        const management = dbConfig.management || 'discover';
+
+        // Normalize top-level managementMode
+        const globalMode = appDefinition.managementMode || 'discover';
+        const vpcIsolation = appDefinition.vpcIsolation || 'shared';
+
+        let management = dbConfig.management;
+
+        if (globalMode === 'managed') {
+            // Warn about ignored granular options
+            if (dbConfig.management) {
+                console.log(`  ⚠️  managementMode='managed' ignoring: database.postgres.management`);
+            }
+
+            // Clear granular option to prevent conflicts
+            delete appDefinition.database.postgres.management;
+
+            // Set management based on isolation strategy
+            if (vpcIsolation === 'isolated') {
+                management = 'managed';  // New VPC = new Aurora
+                console.log(`  managementMode='managed' + vpcIsolation='isolated' → creating new Aurora`);
+            } else {
+                management = 'discover';  // Shared VPC = reuse Aurora
+                appDefinition.database.postgres.autoCreateCredentials = true;
+                console.log(`  managementMode='managed' + vpcIsolation='shared' → discovering Aurora`);
+            }
+        } else if (globalMode === 'existing') {
+            management = 'existing';
+        } else {
+            management = management || 'discover';
+        }
 
         console.log(`  PostgreSQL Management Mode: ${management}`);
 

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

@@ -88,7 +88,13 @@ class KmsBuilder extends InfrastructureBuilder {
             // Use discovered KMS key
             const kmsKeyId = discoveredResources.defaultKmsKeyId || '${env:AWS_DISCOVERY_KMS_KEY_ID}';
             console.log(`  Using ${discoveredResources.defaultKmsKeyId ? 'discovered' : 'environment variable'} KMS key`);
-            result.environment.KMS_KEY_ARN = kmsKeyId;
+            
+            // Format as ARN if it's just a key ID (for IAM policies)
+            const kmsArn = kmsKeyId.startsWith('arn:') 
+                ? kmsKeyId 
+                : `arn:aws:kms:\${self:provider.region}:\${aws:accountId}:key/${kmsKeyId}`;
+            
+            result.environment.KMS_KEY_ARN = kmsArn;
         }
 
         // Add IAM permissions for Lambda role

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

@@ -366,7 +366,8 @@ describe('KmsBuilder', () => {
 
             const result = await kmsBuilder.build(appDefinition, discoveredResources);
 
-            expect(result.environment.KMS_KEY_ARN).toBe('${env:AWS_DISCOVERY_KMS_KEY_ID}');
+            // Should format env var as ARN for IAM policies
+            expect(result.environment.KMS_KEY_ARN).toBe('arn:aws:kms:${self:provider.region}:${aws:accountId}:key/${env:AWS_DISCOVERY_KMS_KEY_ID}');
         });
     });
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.b4ab96e.0",
+  "version": "2.0.0--canary.461.bb7fcba.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.b4ab96e.0",
-    "@friggframework/test": "2.0.0--canary.461.b4ab96e.0",
+    "@friggframework/schemas": "2.0.0--canary.461.bb7fcba.0",
+    "@friggframework/test": "2.0.0--canary.461.bb7fcba.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.b4ab96e.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.b4ab96e.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.bb7fcba.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.bb7fcba.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": "b4ab96e66e22c1d48bbd77bc48374b4df6c7fb0a"
+  "gitHead": "bb7fcba0918b60051c89f78ce3e4076f7823c7ef"
 }