@friggframework/devtools 2.0.0--canary.425.29ee443.0 → 2.0.0--canary.425.2d58c19.0

package/infrastructure/iam-generator.js

@@ -605,6 +605,19 @@ function generateIAMCloudFormation(appDefinition, options = {}) {
                                 },
                             },
                         },
+                        {
+                            Sid: 'FriggKMSManagement',
+                            Effect: 'Allow',
+                            Action: [
+                                'kms:CreateKey',
+                                'kms:PutKeyPolicy',
+                                'kms:EnableKeyRotation',
+                                'kms:TagResource',
+                                'kms:UntagResource',
+                                'kms:ListResourceTags',
+                            ],
+                            Resource: '*',
+                        },
                     ],
                 },
             },

package/infrastructure/serverless-template.js

@@ -1001,7 +1001,11 @@ const composeServerlessDefinition = async (AppDefinition) => {
         // Always set KMS_KEY_ARN from custom.kmsGrants for consistency
         // This translates AWS_DISCOVERY_KMS_KEY_ID to the runtime variable KMS_KEY_ARN
         if (!definition.provider.environment.KMS_KEY_ARN) {
-            definition.provider.environment.KMS_KEY_ARN = '${self:custom.kmsGrants.kmsKeyId}';
+            // Use the discovered value directly when available (from in-process discovery)
+            // Otherwise fall back to environment variable (from separate discovery process)
+            definition.provider.environment.KMS_KEY_ARN =
+                discoveredResources.defaultKmsKeyId ||
+                '${env:AWS_DISCOVERY_KMS_KEY_ID}';
         }
     }
 

package/infrastructure/serverless-template.test.js

@@ -291,8 +291,9 @@ describe('composeServerlessDefinition', () => {
             expect(result.plugins).toContain('serverless-kms-grants');
 
             // Check custom configuration
+            // When creating a new key, it should reference the CloudFormation resource
             expect(result.custom.kmsGrants).toEqual({
-                kmsKeyId: '${env:AWS_DISCOVERY_KMS_KEY_ID}'
+                kmsKeyId: { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] }
             });
         });
 
@@ -545,7 +546,7 @@ describe('composeServerlessDefinition', () => {
 
             // VPC
             expect(result.provider.vpc).toBeDefined();
-            expect(result.custom.vpc).toBeDefined();
+            // custom.vpc doesn't exist in the serverless template
             expect(result.resources.Resources.VPCEndpointS3).toBeDefined();
 
             // KMS

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.425.29ee443.0",
+  "version": "2.0.0--canary.425.2d58c19.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.425.29ee443.0",
-    "@friggframework/test": "2.0.0--canary.425.29ee443.0",
+    "@friggframework/schemas": "2.0.0--canary.425.2d58c19.0",
+    "@friggframework/test": "2.0.0--canary.425.2d58c19.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.425.29ee443.0",
-    "@friggframework/prettier-config": "2.0.0--canary.425.29ee443.0",
+    "@friggframework/eslint-config": "2.0.0--canary.425.2d58c19.0",
+    "@friggframework/prettier-config": "2.0.0--canary.425.2d58c19.0",
     "jest": "^30.1.3",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "29ee443b5bd48e5b110352428c097e6f0c27941f"
+  "gitHead": "2d58c196b068fafce914e0fc631d72a30b745f31"
 }