@comicrelief/lambda-wrapper 1.8.2 → 1.10.0

package/README.md

@@ -1,6 +1,6 @@
 # Lambda Wrapper
 
-[![CircleCI](https://circleci.com/gh/comicrelief/lambda-wrapper.svg?style=svg&circle-token=7db6e0ff0526bd635424f303fd4ffffc7ea05aed)](https://circleci.com/gh/comicrelief/lambda-wrapper)
+![GitHub Actions](https://github.com/comicrelief/lambda-wrapper/actions/workflows/main.yml/badge.svg)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![semantic-release](https://badge.fury.io/js/%40comicrelief%2Flambda-wrapper.svg)](https://www.npmjs.com/package/@comicrelief/lambda-wrapper)
 
@@ -82,10 +82,16 @@ The URL is likely to be your localhost URL and the next available port from the
 Use this mode by setting `LAMBDA_WRAPPER_OFFLINE_SQS_MODE=local`. Messages will still be sent to an SQS queue, but using a locally simulated version instead of AWS. This allows you to test your service using a tool like Localstack.
 
 By default, messages will be sent to a SQS service running on `localhost:4576`. If you need to change the hostname, you can set `process.env.LAMBDA_WRAPPER_OFFLINE_SQS_HOST`.
+Also, if you need to change the port, you can set `process.env.LAMBDA_WRAPPER_OFFLINE_SQS_PORT`.
 
 ### AWS SQS mode
 
-Use this mode by setting `LAMBDA_WRAPPER_OFFLINE_SQS_MODE=aws`. Messages will be sent to the real queue in AWS. This is useful for running end-to-end tests where a message is sent to a queue and eventually appears in an external data store.
+Use this mode by setting `LAMBDA_WRAPPER_OFFLINE_SQS_MODE=aws`. Messages will be sent to the real queue in AWS. This mode is useful when a queue is consumed by an external service, rather than another function in the service under test.
+
+In order for queue URLs to be correctly constructed, you must either:
+
+- set `AWS_ACCOUNT_ID` to the account ID that hosts your queue; or
+- invoke offline functions via the Lambda API, passing a context that contains a realistic `invokedFunctionArn` including the account ID.
 
 ## Semantic release
 

package/dist/Service/Logger.service.js

@@ -245,7 +245,7 @@ class LoggerService extends _DependencyAware.default {
 
   label(descriptor, silent = false) {
     if (typeof process.env.EPSAGON_TOKEN === 'string' && process.env.EPSAGON_TOKEN !== 'undefined' && typeof process.env.EPSAGON_SERVICE_NAME === 'string' && process.env.EPSAGON_SERVICE_NAME !== 'undefined') {
-      _epsagon.default.label(descriptor);
+      _epsagon.default.label(descriptor, true);
     }
 
     if (silent === false) {

package/dist/Service/SQS.service.js

@@ -87,17 +87,20 @@ class SQSService extends _DependencyAware.default {
    */
   constructor(di) {
     super(di);
+    const {
+      LAMBDA_WRAPPER_OFFLINE_SQS_HOST: offlineHost = 'localhost',
+      LAMBDA_WRAPPER_OFFLINE_SQS_PORT: offlinePort = '4576',
+      LAMBDA_WRAPPER_OFFLINE_SQS_MODE: offlineMode = SQS_OFFLINE_MODES.DIRECT,
+      AWS_ACCOUNT_ID,
+      REGION
+    } = process.env;
     const container = this.getContainer();
     const context = container.getContext();
     const queues = container.getConfiguration('QUEUES');
+    const accountId = context && context.invokedFunctionArn && _alai.default.parse(context) || AWS_ACCOUNT_ID;
     this.queues = {};
     this.$lambda = null;
     this.$sqs = null;
-    const {
-      LAMBDA_WRAPPER_OFFLINE_SQS_HOST: offlineHost = 'localhost',
-      LAMBDA_WRAPPER_OFFLINE_SQS_MODE: offlineMode = SQS_OFFLINE_MODES.DIRECT,
-      REGION
-    } = process.env;
 
     if (container.isOffline && !Object.values(SQS_OFFLINE_MODES).includes(offlineMode)) {
       throw new Error(`Invalid LAMBDA_WRAPPER_OFFLINE_SQS_MODE: ${offlineMode}\n` + `Please use one of: ${Object.values(SQS_OFFLINE_MODES).join(', ')}`);
@@ -108,10 +111,10 @@ class SQSService extends _DependencyAware.default {
       Object.keys(queues).forEach(queueDefinition => {
         if (container.isOffline && offlineMode === SQS_OFFLINE_MODES.LOCAL) {
           // custom URL when using an offline SQS service such as Localstack
-          this.queues[queueDefinition] = `http://${offlineHost}:4576/queue/${queues[queueDefinition]}`;
+          this.queues[queueDefinition] = `http://${offlineHost}:${offlinePort}/queue/${queues[queueDefinition]}`;
         } else {
           // default AWS queue URL
-          this.queues[queueDefinition] = `https://sqs.${REGION}.amazonaws.com/${_alai.default.parse(context)}/${queues[queueDefinition]}`;
+          this.queues[queueDefinition] = `https://sqs.${REGION}.amazonaws.com/${accountId}/${queues[queueDefinition]}`;
         }
       });
     }

package/dist/Wrapper/LambdaWrapper.js

@@ -24,8 +24,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param outcome
  */
 const handleSuccess = (di, outcome) => {
-  const logger = di.get(_Dependencies.DEFINITIONS.LOGGER);
-  logger.metric('lambda.statusCode', outcome.statusCode || 200);
+  const logger = di.get(_Dependencies.DEFINITIONS.LOGGER); // Outcome may be undefined as not all lambdas have a return value.
+
+  logger.metric('lambda.statusCode', outcome && outcome.statusCode || 200);
   return outcome;
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comicrelief/lambda-wrapper",
-  "version": "1.8.2",
+  "version": "1.10.0",
   "description": "Lambda wrapper for all Comic Relief Serverless Projects",
   "main": "dist/index.js",
   "scripts": {