@friggframework/devtools 2.0.0--canary.425.06986ff.0 → 2.0.0--canary.425.1dfec23.0

package/infrastructure/__tests__/fixtures/mock-aws-resources.js

@@ -281,7 +281,7 @@ const mockEnvironmentVariables = {
     AWS_DISCOVERY_SUBNET_ID_1: mockSubnets[0].SubnetId,
     AWS_DISCOVERY_SUBNET_ID_2: mockSubnets[1].SubnetId,
     AWS_DISCOVERY_ROUTE_TABLE_ID: mockRouteTables[0].RouteTableId,
-    AWS_DISCOVERY_KMS_KEY_ID: mockKmsKeyMetadata.Arn
+    AWS_DISCOVERY_KMS_KEY_ID:mockKmsKeyMetadata.Arn
 };
 
 // Fallback environment variables for error scenarios
@@ -291,7 +291,7 @@ const mockFallbackEnvironmentVariables = {
     AWS_DISCOVERY_SUBNET_ID_1: 'subnet-fallback-1',
     AWS_DISCOVERY_SUBNET_ID_2: 'subnet-fallback-2',
     AWS_DISCOVERY_ROUTE_TABLE_ID: 'rtb-fallback',
-    AWS_DISCOVERY_KMS_KEY_ID: 'arn:aws:kms:*:*:key/*'
+    AWS_DISCOVERY_KMS_KEY_ID:'arn:aws:kms:*:*:key/*'
 };
 
 // Mock AWS SDK responses

package/infrastructure/build-time-discovery.js

@@ -159,7 +159,7 @@ class BuildTimeDiscovery {
                 AWS_DISCOVERY_SUBNET_ID_2: resources.privateSubnetId2,
                 AWS_DISCOVERY_PUBLIC_SUBNET_ID: resources.publicSubnetId,
                 AWS_DISCOVERY_ROUTE_TABLE_ID: resources.privateRouteTableId,
-                AWS_DISCOVERY_KMS_KEY_ID: resources.defaultKmsKeyId
+                AWS_DISCOVERY_KMS_KEY_ID: resources.defaultKmsKeyId  // Keep consistent naming convention (even though it's an ARN)
             };
             
             // Set environment variables for serverless to use

package/infrastructure/integration.test.js

@@ -67,7 +67,7 @@ describe('VPC/KMS/SSM Integration Tests', () => {
             process.env.AWS_DISCOVERY_SUBNET_ID_1 = discoveredResources.privateSubnetId1;
             process.env.AWS_DISCOVERY_SUBNET_ID_2 = discoveredResources.privateSubnetId2;
             process.env.AWS_DISCOVERY_ROUTE_TABLE_ID = discoveredResources.privateRouteTableId;
-            process.env.AWS_DISCOVERY_KMS_KEY_ID = discoveredResources.defaultKmsKeyId;
+            process.env.AWS_DISCOVERY_KMS_KEY_ID =discoveredResources.defaultKmsKeyId;
 
             // Generate serverless configuration
             const serverlessConfig = composeServerlessDefinition(appDefinition);
@@ -177,7 +177,7 @@ describe('VPC/KMS/SSM Integration Tests', () => {
                 integrations: []
             };
 
-            process.env.AWS_DISCOVERY_KMS_KEY_ID = mockAWSResources.defaultKmsKeyId;
+            process.env.AWS_DISCOVERY_KMS_KEY_ID =mockAWSResources.defaultKmsKeyId;
 
             const serverlessConfig = composeServerlessDefinition(appDefinition);
 
@@ -302,7 +302,7 @@ describe('VPC/KMS/SSM Integration Tests', () => {
             process.env.AWS_DISCOVERY_SECURITY_GROUP_ID = mockAWSResources.defaultSecurityGroupId;
             process.env.AWS_DISCOVERY_SUBNET_ID_1 = mockAWSResources.privateSubnetId1;
             process.env.AWS_DISCOVERY_SUBNET_ID_2 = mockAWSResources.privateSubnetId2;
-            process.env.AWS_DISCOVERY_KMS_KEY_ID = mockAWSResources.defaultKmsKeyId;
+            process.env.AWS_DISCOVERY_KMS_KEY_ID =mockAWSResources.defaultKmsKeyId;
 
             // In a real deployment, serverless framework would resolve these environment variables
             // For testing, we can verify the placeholders are correctly formatted

package/infrastructure/serverless-template.js

@@ -901,8 +901,7 @@ const composeServerlessDefinition = async (AppDefinition) => {
                 Resource: [discoveredResources.defaultKmsKeyId],
             });
 
-            definition.provider.environment.KMS_KEY_ARN =
-                discoveredResources.defaultKmsKeyId;
+            // KMS_KEY_ARN will be set later from custom.kmsGrants for consistency
         } else {
             // No existing key found - check if we should create one or error
             if (AppDefinition.encryption?.createResourceIfNoneFound === true) {
@@ -998,6 +997,16 @@ const composeServerlessDefinition = async (AppDefinition) => {
                     '${env:AWS_DISCOVERY_KMS_KEY_ID}',
             };
         }
+
+        // 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) {
+            // 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}';
+        }
     }
 
     // VPC Configuration based on App Definition

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.06986ff.0",
+  "version": "2.0.0--canary.425.1dfec23.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.06986ff.0",
-    "@friggframework/test": "2.0.0--canary.425.06986ff.0",
+    "@friggframework/schemas": "2.0.0--canary.425.1dfec23.0",
+    "@friggframework/test": "2.0.0--canary.425.1dfec23.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.06986ff.0",
-    "@friggframework/prettier-config": "2.0.0--canary.425.06986ff.0",
+    "@friggframework/eslint-config": "2.0.0--canary.425.1dfec23.0",
+    "@friggframework/prettier-config": "2.0.0--canary.425.1dfec23.0",
     "jest": "^30.1.3",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "06986fff8607c98e3157e5a219716c53276b065e"
+  "gitHead": "1dfec23b99101cc38c651a6e2dff99c67b346b72"
 }