serverless-plugin-warmup 7.0.2 → 7.3.0

package/.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

package/README.md

@@ -44,6 +44,7 @@ custom:
       events:
         - schedule: cron(0/5 8-17 ? * MON-FRI *)
       concurrency: 10
+      verbose: true
       logRetentionInDays: 10
     outOfOfficeHoursWarmer:
       enabled: true
@@ -52,6 +53,7 @@ custom:
         - schedule: cron(0/5 18-23 ? * MON-FRI *)
         - schedule: cron(0/5 * ? * SAT-SUN *)
       concurrency: 1
+      verbose: false
     testWarmer:
       enabled: false
 ```
@@ -66,10 +68,12 @@ The options are the same for all the warmers:
 * **vpc** The VPC and subnets in which to deploy. Can be any [Serverless VPC configuration](https://serverless.com/framework/docs/providers/aws/guide/functions#vpc-configuration) or be set to `false` in order to deploy the warmup function outside of a VPC (defaults to the vpc in the provider)
 * **memorySize** The memory to be assigned to the warmer lambda (defaults to `128`)
 * **events** The event that triggers the warmer lambda. Can be any [Serverless event](https://serverless.com/framework/docs/providers/aws/events/) (defaults to `- schedule: rate(5 minutes)`)
+* **architecture**  The [instruction set to use for the lambda](https://www.serverless.com/framework/docs/providers/aws/guide/functions#instruction-set-architecture) (defaults to `arm64`)
 * **package** The package configuration. Can be any [Serverless package configuration](https://serverless.com/framework/docs/providers/aws/guide/packaging#package-configuration) (defaults to `{ individually: true, patterns: ['!**', '.warmup/${warmerName}/**'] }`)
 * **timeout** How many seconds until the warmer lambda times out. (defaults to `10`)
 * **environment** Can be used to set environment variables in the warmer lambda. You can also unset variables configured at the provider by setting them to undefined. However, you should almost never have to change the default. (defaults to unset all package level environment variables. )
 * **tracing** Specify whether to enable/disable tracing at the function level. When tracing is enabled, warmer functions will use NPM to install the X-Ray client and use it to trace requests (It takes any of the values supported by serverless as `boolean`, `Active`or `PassThrough` and defaults to the provider-level setting)
+* **verbose** If set to false, it disables the console.logs placed on this warmer lambda (defaults to `true`)
 * **logRetentionInDays** Set the retention time in days for the log group associated to this warmer lamba
 * **prewarm** If set to true, it warms up your lambdas right after deploying (defaults to `false`)
 
@@ -106,6 +110,7 @@ custom:
           - ./**
       timeout: 20
       tracing: true
+      verbose: false # Disable the logs
       logRetentionInDays: 10
       prewarm: true # Run WarmUp immediately after a deploymentlambda
       clientContext:
@@ -251,7 +256,7 @@ The permissions can also be added to all lambdas using setting the role to `IamR
 ```yaml
 provider:
   name: aws
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   iamRoleStatements:
     - Effect: 'Allow'
       Action:
@@ -263,6 +268,7 @@ custom:
     default:
       enabled: true
       role: IamRoleLambdaExecution
+      architecture: 'arm64'
 ```
 
 If setting `prewarm` to `true`, the deployment user used by the AWS CLI and the Serverless framework also needs permissions to invoke the warmer.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-warmup",
-  "version": "7.0.2",
+  "version": "7.3.0",
   "description": "Keep your lambdas warm during winter.",
   "main": "src/index.js",
   "scripts": {
@@ -34,7 +34,7 @@
     "eslint": "^8.5.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.24.2",
-    "husky": "^7.0.2",
-    "jest": "^27.5.0"
+    "husky": "^8.0.1",
+    "jest": "^28.1.3"
   }
 }

package/src/config.js

@@ -20,6 +20,9 @@ function getWarmerConfig(config, defaultOpts) {
     vpc: config.vpc === false ? { securityGroupIds: [], subnetIds: [] }
       : (config.vpc !== undefined ? config.vpc : defaultOpts.vpc),
     events: (Array.isArray(config.events)) ? config.events : defaultOpts.events,
+    architecture: (config.architecture !== undefined)
+      ? config.architecture
+      : defaultOpts.architecture,
     package: typeof config.package === 'object'
       ? {
         individually: (config.package.individually !== undefined)
@@ -41,6 +44,7 @@ function getWarmerConfig(config, defaultOpts) {
       ? config.environment
       : defaultOpts.environment,
     tracing: (config.tracing !== undefined) ? config.tracing : defaultOpts.tracing,
+    verbose: (config.verbose !== undefined) ? config.verbose : defaultOpts.verbose,
     logRetentionInDays: (config.logRetentionInDays !== undefined)
       ? config.logRetentionInDays
       : defaultOpts.logRetentionInDays,
@@ -151,6 +155,7 @@ function getConfigsByWarmer({ service, classes }, stage) {
     timeout: 10,
     environment: Object.keys(service.provider.environment || [])
       .reduce((obj, k) => ({ ...obj, [k]: undefined }), {}),
+    verbose: true,
     prewarm: false,
   });
 

package/src/index.js

@@ -204,6 +204,7 @@ class WarmUp {
     await createWarmUpFunctionArtifact(
       warmerConfig.functions,
       warmerConfig.tracing,
+      warmerConfig.verbose,
       this.provider.getRegion(),
       handlerFolder,
     );

package/src/schema.js

@@ -94,6 +94,7 @@ function extendServerlessSchema(serverless) {
         additionalProperties: false,
       },
     },
+    architecture: { enum: ['arm64', 'x86_64'] },
     package: {
       type: 'object',
       properties: {
@@ -107,6 +108,7 @@ function extendServerlessSchema(serverless) {
     timeout: { $ref: '#/definitions/awsLambdaTimeout' },
     environment: { $ref: '#/definitions/awsLambdaEnvironment' },
     tracing: { $ref: '#/definitions/awsLambdaTracing' },
+    verbose: { type: 'boolean' },
     logRetentionInDays: {
       type: 'number',
       enum: [1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 3653],

package/src/warmer.js

@@ -94,7 +94,7 @@ function addWarmUpFunctionRoleToResources(service, stage, warmerName, warmerConf
                   'lambda:InvokeFunction',
                 ],
                 Resource: warmerConfig.functions.map((fn) => ({
-                  'Fn::Sub': `arn:\${AWS::Partition}:lambda:\${AWS::Region}:\${AWS::AccountId}:function:${fn.name}`,
+                  'Fn::Sub': `arn:\${AWS::Partition}:lambda:\${AWS::Region}:\${AWS::AccountId}:function:${fn.name}*`,
                 })),
               },
               {
@@ -125,7 +125,7 @@ function addWarmUpFunctionRoleToResources(service, stage, warmerName, warmerConf
  *
  * @return {Promise}
  * */
-async function createWarmUpFunctionArtifact(functions, tracing, region, handlerFolder) {
+async function createWarmUpFunctionArtifact(functions, tracing, verbose, region, handlerFolder) {
   const warmUpFunction = `'use strict';
 
 /** Generated by Serverless WarmUp Plugin **/
@@ -143,28 +143,32 @@ const lambda = new AWS.Lambda({
 });
 const functions = ${JSON.stringify(functions, null, '  ')};
 
+function logVerbose(str) {
+  ${verbose ? 'console.log(str);' : ''}
+}
+
 function getConcurrency(func, envVars) {
   const functionConcurrency = envVars[\`WARMUP_CONCURRENCY_\${func.name.toUpperCase().replace(/-/g, '_')}\`];
 
   if (functionConcurrency) {
     const concurrency = parseInt(functionConcurrency);
-    console.log(\`Warming up function: \${func.name} with concurrency: \${concurrency} (from function-specific environment variable)\`);
+    logVerbose(\`Warming up function: \${func.name} with concurrency: \${concurrency} (from function-specific environment variable)\`);
     return concurrency;
   }
 
   if (envVars.WARMUP_CONCURRENCY) {
     const concurrency = parseInt(envVars.WARMUP_CONCURRENCY);
-    console.log(\`Warming up function: \${func.name} with concurrency: \${concurrency} (from global environment variable)\`);
+    logVerbose(\`Warming up function: \${func.name} with concurrency: \${concurrency} (from global environment variable)\`);
     return concurrency;
   }
 
   const concurrency = parseInt(func.config.concurrency);
-  console.log(\`Warming up function: \${func.name} with concurrency: \${concurrency}\`);
+  logVerbose(\`Warming up function: \${func.name} with concurrency: \${concurrency}\`);
   return concurrency;
 }
 
 module.exports.warmUp = async (event, context) => {
-  console.log('Warm Up Start');
+  logVerbose('Warm Up Start');
 
   const invokes = await Promise.all(functions.map(async (func) => {
     const concurrency = getConcurrency(func, process.env);
@@ -186,15 +190,15 @@ module.exports.warmUp = async (event, context) => {
 
     try {
       await Promise.all(Array(concurrency).fill(0).map(async () => await lambda.invoke(params).promise()));
-      console.log(\`Warm Up Invoke Success: \${func.name}\`);
+      logVerbose(\`Warm Up Invoke Success: \${func.name}\`);
       return true;
     } catch (e) {
-      console.log(\`Warm Up Invoke Error: \${func.name}\`, e);
+      console.error(\`Warm Up Invoke Error: \${func.name}\`, e);
       return false;
     }
   }));
 
-  console.log(\`Warm Up Finished with \${invokes.filter(r => !r).length} invoke errors\`);
+  logVerbose(\`Warm Up Finished with \${invokes.filter(r => !r).length} invoke errors\`);
 }`;
 
   /** Write warm up file */
@@ -218,7 +222,8 @@ function addWarmUpFunctionToService(service, warmerName, warmerConfig) {
     handler: warmerConfig.pathHandler.split(path.sep).join(path.posix.sep),
     memorySize: warmerConfig.memorySize,
     name: warmerConfig.name,
-    runtime: 'nodejs14.x',
+    ...(warmerConfig.architecture ? { architecture: warmerConfig.architecture } : {}),
+    runtime: 'nodejs16.x',
     package: warmerConfig.package,
     timeout: warmerConfig.timeout,
     ...(Object.keys(warmerConfig.environment).length