@cumulus/aws-client 9.4.0 → 9.7.1

package/Lambda.js

@@ -31,6 +31,8 @@ exports.invoke = async (name, payload, type = 'Event') => {
         FunctionName: name,
         Payload: JSON.stringify(payload),
         InvocationType: type,
-    }).promise();
+    })
+        .on('error', (error) => log.error(`Error invoking ${name}`, error))
+        .promise();
 };
 //# sourceMappingURL=Lambda.js.map

package/README.md

@@ -894,12 +894,26 @@ errors, to allow more specific handling by the caller.
 ## SQS
 
 * [SQS](#module_SQS)
+    * [.sendSQSMessage](#module_SQS.sendSQSMessage) ⇒ <code>Promise</code>
     * [.deleteSQSMessage](#module_SQS.deleteSQSMessage) ⇒ <code>Promise</code>
     * [.createQueue(QueueName)](#module_SQS.createQueue) ⇒ <code>Promise.&lt;string&gt;</code>
-    * [.sendSQSMessage(queueUrl, message)](#module_SQS.sendSQSMessage) ⇒ <code>Promise</code>
     * [.receiveSQSMessages(queueUrl, options)](#module_SQS.receiveSQSMessages) ⇒ <code>Promise.&lt;Array&gt;</code>
     * [.sqsQueueExists(queueUrl)](#module_SQS.sqsQueueExists) ⇒ <code>Promise.&lt;boolean&gt;</code>
 
+<a name="module_SQS.sendSQSMessage"></a>
+
+### SQS.sendSQSMessage ⇒ <code>Promise</code>
+Send a message to AWS SQS
+
+**Kind**: static property of [<code>SQS</code>](#module_SQS)  
+**Returns**: <code>Promise</code> - resolves when the messsage has been sent  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| queueUrl | <code>string</code> | url of the SQS queue |
+| message | <code>string</code> \| <code>Object</code> | either string or object message. If an   object it will be serialized into a JSON string. |
+| [logOverride] | <code>Logger</code> | optional Logger passed in for testing |
+
 <a name="module_SQS.deleteSQSMessage"></a>
 
 ### SQS.deleteSQSMessage ⇒ <code>Promise</code>
@@ -925,19 +939,6 @@ Create an SQS Queue.  Properly handles localstack queue URLs
 | --- | --- | --- |
 | QueueName | <code>string</code> | queue name |
 
-<a name="module_SQS.sendSQSMessage"></a>
-
-### SQS.sendSQSMessage(queueUrl, message) ⇒ <code>Promise</code>
-Send a message to AWS SQS
-
-**Kind**: static method of [<code>SQS</code>](#module_SQS)  
-**Returns**: <code>Promise</code> - resolves when the messsage has been sent  
-
-| Param | Type | Description |
-| --- | --- | --- |
-| queueUrl | <code>string</code> | url of the SQS queue |
-| message | <code>string</code> \| <code>Object</code> | either string or object message. If an   object it will be serialized into a JSON string. |
-
 <a name="module_SQS.receiveSQSMessages"></a>
 
 ### SQS.receiveSQSMessages(queueUrl, options) ⇒ <code>Promise.&lt;Array&gt;</code>

package/SQS.d.ts

@@ -1,6 +1,7 @@
 /**
  * @module SQS
  */
+import Logger from '@cumulus/logger';
 export interface SQSMessage extends AWS.SQS.Message {
     ReceiptHandle: string;
 }
@@ -28,9 +29,11 @@ export declare const getQueueAttributes: (queueName: string) => Promise<{
  * @param {string} queueUrl - url of the SQS queue
  * @param {string|Object} message - either string or object message. If an
  *   object it will be serialized into a JSON string.
+ * @param {Logger} [logOverride] - optional Logger passed in for testing
  * @returns {Promise} resolves when the messsage has been sent
+
  **/
-export declare const sendSQSMessage: (queueUrl: string, message: string | object) => Promise<import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/sqs").SendMessageResult, import("aws-sdk").AWSError>>;
+export declare const sendSQSMessage: (queueUrl: string, message: string | object, logOverride: Logger) => Promise<import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/sqs").SendMessageResult, import("aws-sdk").AWSError>>;
 declare type receiveSQSMessagesOptions = {
     numOfMessages?: number;
     visibilityTimeout?: number;

package/SQS.js

@@ -1,7 +1,4 @@
 "use strict";
-/**
- * @module SQS
- */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
@@ -26,6 +23,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sqsQueueExists = exports.deleteSQSMessage = exports.parseSQSMessageBody = exports.receiveSQSMessages = exports.sendSQSMessage = exports.getQueueAttributes = exports.deleteQueue = exports.createQueue = exports.getQueueUrlByName = exports.getQueueUrl = exports.getQueueNameFromUrl = void 0;
+/**
+ * @module SQS
+ */
+const logger_1 = __importDefault(require("@cumulus/logger"));
 const get_1 = __importDefault(require("lodash/get"));
 const isObject_1 = __importDefault(require("lodash/isObject"));
 const isString_1 = __importDefault(require("lodash/isString"));
@@ -34,6 +35,7 @@ const url = __importStar(require("url"));
 const services_1 = require("./services");
 const test_utils_1 = require("./test-utils");
 const utils_1 = require("./utils");
+const log = new logger_1.default({ sender: '@cumulus/aws-client/SQS' });
 exports.getQueueNameFromUrl = (queueUrl) => queueUrl.split('/').pop();
 exports.getQueueUrl = (sourceArn, queueName) => {
     const arnParts = sourceArn.split(':');
@@ -54,7 +56,9 @@ exports.getQueueUrlByName = async (queueName) => {
 async function createQueue(QueueName) {
     const createQueueResponse = await services_1.sqs().createQueue({
         QueueName,
-    }).promise();
+    })
+        .on('error', (error) => log.error(error))
+        .promise();
     if (test_utils_1.inTestMode()) {
         if (createQueueResponse.QueueUrl === undefined) {
             throw new Error('Did not receive a QueueUrl');
@@ -76,7 +80,9 @@ async function createQueue(QueueName) {
 exports.createQueue = createQueue;
 exports.deleteQueue = (queueUrl) => services_1.sqs().deleteQueue({
     QueueUrl: queueUrl,
-}).promise();
+})
+    .on('error', (error) => log.error(error))
+    .promise();
 exports.getQueueAttributes = async (queueName) => {
     const queueUrl = await exports.getQueueUrlByName(queueName);
     if (!queueUrl) {
@@ -97,9 +103,12 @@ exports.getQueueAttributes = async (queueName) => {
  * @param {string} queueUrl - url of the SQS queue
  * @param {string|Object} message - either string or object message. If an
  *   object it will be serialized into a JSON string.
+ * @param {Logger} [logOverride] - optional Logger passed in for testing
  * @returns {Promise} resolves when the messsage has been sent
+
  **/
-exports.sendSQSMessage = (queueUrl, message) => {
+exports.sendSQSMessage = utils_1.improveStackTrace((queueUrl, message, logOverride) => {
+    const logger = logOverride || log;
     let messageBody;
     if (isString_1.default(message))
         messageBody = message;
@@ -110,8 +119,9 @@ exports.sendSQSMessage = (queueUrl, message) => {
     return services_1.sqs().sendMessage({
         MessageBody: messageBody,
         QueueUrl: queueUrl,
-    }).promise();
-};
+    }).on('error', (error) => logger.error(error))
+        .promise();
+});
 /**
  * Receives SQS messages from a given queue. The number of messages received
  * can be set and the timeout is also adjustable.
@@ -134,7 +144,8 @@ exports.receiveSQSMessages = async (queueUrl, options) => {
         WaitTimeSeconds: options.waitTimeSeconds || 0,
         MaxNumberOfMessages: options.numOfMessages || 1,
     };
-    const messages = await services_1.sqs().receiveMessage(params).promise();
+    const messages = await services_1.sqs().receiveMessage(params)
+        .on('error', (error) => log.error(error)).promise();
     return ((_a = messages.Messages) !== null && _a !== void 0 ? _a : []);
 };
 exports.parseSQSMessageBody = (message) => JSON.parse(get_1.default(message, 'Body', get_1.default(message, 'body', '{}')));
@@ -145,7 +156,9 @@ exports.parseSQSMessageBody = (message) => JSON.parse(get_1.default(message, 'Bo
  * @param {integer} receiptHandle - the unique identifier of the sQS message
  * @returns {Promise} an AWS SQS response
  */
-exports.deleteSQSMessage = utils_1.improveStackTrace((QueueUrl, ReceiptHandle) => services_1.sqs().deleteMessage({ QueueUrl, ReceiptHandle }).promise());
+exports.deleteSQSMessage = utils_1.improveStackTrace((QueueUrl, ReceiptHandle) => services_1.sqs().deleteMessage({ QueueUrl, ReceiptHandle })
+    .on('error', (error) => log.error(error))
+    .promise());
 /**
  * Test if an SQS queue exists
  *
@@ -163,8 +176,11 @@ exports.sqsQueueExists = async (queueUrl) => {
         return true;
     }
     catch (error) {
-        if (error.code === 'AWS.SimpleQueueService.NonExistentQueue')
+        if (error.code === 'AWS.SimpleQueueService.NonExistentQueue') {
+            log.warn(`Queue ${QueueName} does not exist`);
             return false;
+        }
+        log.error(error);
         throw error;
     }
 };

package/client.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const test_utils_1 = require("./test-utils");
 const noop = () => { }; // eslint-disable-line lodash/prefer-noop
-const getRegion = () => process.env.AWS_REGION || 'us-east-1';
+const getRegion = () => process.env.AWS_DEFAULT_REGION || process.env.AWS_REGION || 'us-east-1';
 // Workaround upload hangs. See: https://github.com/andrewrk/node-s3-client/issues/74
 // @ts-ignore - AWS.util is not part of the public API and may break
 aws_sdk_1.default.util.update(aws_sdk_1.default.S3.prototype, { addExpect100Continue: noop });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/aws-client",
-  "version": "9.4.0",
+  "version": "9.7.1",
   "description": "Utilities for working with AWS",
   "keywords": [
     "GIBS",
@@ -43,9 +43,9 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/checksum": "9.4.0",
-    "@cumulus/errors": "9.4.0",
-    "@cumulus/logger": "9.4.0",
+    "@cumulus/checksum": "9.7.1",
+    "@cumulus/errors": "9.7.1",
+    "@cumulus/logger": "9.7.1",
     "aws-sdk": "^2.814.0",
     "jsonpath-plus": "^1.1.0",
     "lodash": "~4.17.20",
@@ -54,5 +54,5 @@
     "p-wait-for": "^3.1.0",
     "pump": "^3.0.0"
   },
-  "gitHead": "a1c0e94e07adf3a5d2c8df93f6f5f216f5ceafe7"
+  "gitHead": "926740ad299b43f27117fd1fd34050b3db194c71"
 }