@friggframework/devtools 2.0.0-next.22 → 2.0.0-next.24

package/infrastructure/serverless-template.js

@@ -7,7 +7,7 @@ const findNodeModulesPath = () => {
         // Method 1: Try to find node_modules by traversing up from current directory
         let currentDir = process.cwd();
         let nodeModulesPath = null;
-        
+
         // Traverse up to 5 levels to find node_modules
         for (let i = 0; i < 5; i++) {
             const potentialPath = path.join(currentDir, 'node_modules');
@@ -24,7 +24,7 @@ const findNodeModulesPath = () => {
             }
             currentDir = parentDir;
         }
-        
+
         // Method 2: If method 1 fails, try using npm root command
         if (!nodeModulesPath) {
             try {
@@ -39,7 +39,7 @@ const findNodeModulesPath = () => {
                 console.error('Error executing npm root:', npmError);
             }
         }
-        
+
         // Method 3: If all else fails, check for a package.json and assume node_modules is adjacent
         if (!nodeModulesPath) {
             currentDir = process.cwd();
@@ -62,11 +62,11 @@ const findNodeModulesPath = () => {
                 currentDir = parentDir;
             }
         }
-        
+
         if (nodeModulesPath) {
             return nodeModulesPath;
         }
-        
+
         console.warn('Could not find node_modules path, falling back to default');
         return path.resolve(process.cwd(), '../node_modules');
     } catch (error) {
@@ -80,7 +80,7 @@ const modifyHandlerPaths = (functions) => {
     // Check if we're running in offline mode
     const isOffline = process.argv.includes('offline');
     console.log('isOffline', isOffline);
-    
+
     if (!isOffline) {
         console.log('Not in offline mode, skipping handler path modification');
         return functions;
@@ -88,7 +88,7 @@ const modifyHandlerPaths = (functions) => {
 
     const nodeModulesPath = findNodeModulesPath();
     const modifiedFunctions = { ...functions };
-    
+
     for (const functionName of Object.keys(modifiedFunctions)) {
         console.log('functionName', functionName);
         const functionDef = modifiedFunctions[functionName];
@@ -98,7 +98,7 @@ const modifyHandlerPaths = (functions) => {
             console.log(`Updated handler for ${functionName}: ${functionDef.handler}`);
         }
     }
-    
+
     return modifiedFunctions;
 };
 
@@ -129,6 +129,28 @@ const composeServerlessDefinition = (AppDefinition) => {
                         Ref: 'InternalErrorBridgeTopic',
                     },
                 },
+                {
+                    Effect: 'Allow',
+                    Action: [
+                        'sqs:SendMessage',
+                        'sqs:SendMessageBatch',
+                        'sqs:GetQueueUrl',
+                        'sqs:GetQueueAttributes'
+                    ],
+                    Resource: [
+                        {
+                            'Fn::GetAtt': ['InternalErrorQueue', 'Arn']
+                        },
+                        {
+                            'Fn::Join': [
+                                ':',
+                                [
+                                    'arn:aws:sqs:${self:provider.region}:*:${self:service}--${self:provider.stage}-*Queue'
+                                ]
+                            ]
+                        }
+                    ],
+                }
             ],
         },
         plugins: [
@@ -307,6 +329,30 @@ const composeServerlessDefinition = (AppDefinition) => {
         },
     };
 
+    // KMS Configuration based on App Definition
+    if (AppDefinition.encryption?.useDefaultKMSForFieldLevelEncryption === true) {
+        // Add KMS IAM permissions
+        definition.provider.iamRoleStatements.push({
+            Effect: 'Allow',
+            Action: [
+                'kms:GenerateDataKey',
+                'kms:Decrypt'
+            ],
+            Resource: ['${self:custom.kmsGrants.kmsKeyId}']
+        });
+
+        // Add KMS_KEY_ARN environment variable for Frigg Encrypt module
+        definition.provider.environment.KMS_KEY_ARN = '${self:custom.kmsGrants.kmsKeyId}';
+
+        // Add serverless-kms-grants plugin
+        definition.plugins.push('serverless-kms-grants');
+
+        // Configure KMS grants with default key
+        definition.custom.kmsGrants = {
+            kmsKeyId: '*'
+        };
+    }
+
     // Add integration-specific functions and resources
     for (const integration of AppDefinition.integrations) {
         const integrationName = integration.Definition.name;
@@ -326,9 +372,8 @@ const composeServerlessDefinition = (AppDefinition) => {
         };
 
         // Add SQS Queue for the integration
-        const queueReference = `${
-            integrationName.charAt(0).toUpperCase() + integrationName.slice(1)
-        }Queue`;
+        const queueReference = `${integrationName.charAt(0).toUpperCase() + integrationName.slice(1)
+            }Queue`;
         const queueName = `\${self:service}--\${self:provider.stage}-${queueReference}`;
         definition.resources.Resources[queueReference] = {
             Type: 'AWS::SQS::Queue',
@@ -376,7 +421,7 @@ const composeServerlessDefinition = (AppDefinition) => {
 
     // Modify handler paths to point to the correct node_modules location
     definition.functions = modifyHandlerPaths(definition.functions);
-    
+
     return definition;
 };
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.22",
+  "version": "2.0.0-next.24",
   "dependencies": {
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/test": "2.0.0-next.22",
+    "@friggframework/test": "2.0.0-next.24",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -27,12 +27,13 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.22",
-    "@friggframework/prettier-config": "2.0.0-next.22",
+    "@friggframework/eslint-config": "2.0.0-next.24",
+    "@friggframework/prettier-config": "2.0.0-next.24",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
     "serverless-jetpack": "^0.11.2",
+    "serverless-kms-grants": "^1.0.0",
     "serverless-offline": "^13.8.0",
     "serverless-offline-sqs": "^8.0.0",
     "serverless-plugin-monorepo": "^0.11.0"
@@ -59,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "14387b68e349c32da618751925a01b4b3ab37796"
+  "gitHead": "b1a00897238f7734a67342a3f72f1e9b6504800f"
 }