@friggframework/devtools 2.0.0-next.30 → 2.0.0-next.32

package/infrastructure/serverless-template.js

@@ -724,37 +724,53 @@ const composeServerlessDefinition = async (AppDefinition) => {
 
     // KMS Configuration based on App Definition
     if (AppDefinition.encryption?.useDefaultKMSForFieldLevelEncryption === true) {
-        // Provision a dedicated KMS key and wire it automatically
-        definition.resources.Resources.FriggKMSKey = {
-            Type: 'AWS::KMS::Key',
-            Properties: {
-                EnableKeyRotation: true,
-                KeyPolicy: {
-                    Version: '2012-10-17',
-                    Statement: [
-                        {
-                            Sid: 'AllowRootAccountAdmin',
-                            Effect: 'Allow',
-                            Principal: { AWS: { 'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:root' } },
-                            Action: 'kms:*',
-                            Resource: '*'
-                        }
-                    ]
+        // Check if a KMS key was discovered
+        if (discoveredResources.defaultKmsKeyId) {
+            // Use the existing discovered KMS key
+            console.log(`Using existing KMS key: ${discoveredResources.defaultKmsKeyId}`);
+            
+            definition.provider.iamRoleStatements.push({
+                Effect: 'Allow',
+                Action: ['kms:GenerateDataKey', 'kms:Decrypt'],
+                Resource: [discoveredResources.defaultKmsKeyId]
+            });
+
+            definition.provider.environment.KMS_KEY_ARN = discoveredResources.defaultKmsKeyId;
+        } else {
+            // No existing key found, provision a dedicated KMS key
+            console.log('No existing KMS key found, creating a new one...');
+            
+            definition.resources.Resources.FriggKMSKey = {
+                Type: 'AWS::KMS::Key',
+                Properties: {
+                    EnableKeyRotation: true,
+                    KeyPolicy: {
+                        Version: '2012-10-17',
+                        Statement: [
+                            {
+                                Sid: 'AllowRootAccountAdmin',
+                                Effect: 'Allow',
+                                Principal: { AWS: { 'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:root' } },
+                                Action: 'kms:*',
+                                Resource: '*'
+                            }
+                        ]
+                    }
                 }
-            }
-        };
+            };
 
-        definition.provider.iamRoleStatements.push({
-            Effect: 'Allow',
-            Action: ['kms:GenerateDataKey', 'kms:Decrypt'],
-            Resource: [{ 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] }]
-        });
+            definition.provider.iamRoleStatements.push({
+                Effect: 'Allow',
+                Action: ['kms:GenerateDataKey', 'kms:Decrypt'],
+                Resource: [{ 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] }]
+            });
 
-        definition.provider.environment.KMS_KEY_ARN = { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] };
+            definition.provider.environment.KMS_KEY_ARN = { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] };
+        }
 
         definition.plugins.push('serverless-kms-grants');
 
-        // Configure KMS grants with discovered default key
+        // Configure KMS grants with discovered default key or environment variable
         definition.custom.kmsGrants = {
             kmsKeyId: discoveredResources.defaultKmsKeyId || '${env:AWS_DISCOVERY_KMS_KEY_ID}'
         };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.30",
+  "version": "2.0.0-next.32",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -9,7 +9,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/test": "2.0.0-next.30",
+    "@friggframework/schemas": "2.0.0-next.32",
+    "@friggframework/test": "2.0.0-next.32",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -31,8 +32,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.30",
-    "@friggframework/prettier-config": "2.0.0-next.30",
+    "@friggframework/eslint-config": "2.0.0-next.32",
+    "@friggframework/prettier-config": "2.0.0-next.32",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
@@ -64,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5c1c0838a8e2d0d77e557ce11d9ad0899c3f464d"
+  "gitHead": "6996c771d5f29b243d836c74533d3b7b8ab598b9"
 }