@cumulus/aws-client 10.0.0 → 10.1.1

package/S3.js

@@ -4,7 +4,11 @@
  */
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -32,6 +36,7 @@ const path_1 = __importDefault(require("path"));
 const p_map_1 = __importDefault(require("p-map"));
 const p_retry_1 = __importDefault(require("p-retry"));
 const p_wait_for_1 = __importDefault(require("p-wait-for"));
+const p_timeout_1 = __importDefault(require("p-timeout"));
 const pump_1 = __importDefault(require("pump"));
 const querystring_1 = __importDefault(require("querystring"));
 const stream_1 = require("stream");
@@ -166,7 +171,18 @@ exports.s3ObjectExists = s3ObjectExists;
  */
 const waitForObjectToExist = async (params) => {
     const { bucket, key, interval = 1000, timeout = 30 * 1000, } = params;
-    return await (0, p_wait_for_1.default)(() => (0, exports.s3ObjectExists)({ Bucket: bucket, Key: key }), { interval, timeout });
+    try {
+        await (0, p_wait_for_1.default)(() => (0, exports.s3ObjectExists)({ Bucket: bucket, Key: key }), { interval, timeout });
+    }
+    catch (error) {
+        if (error instanceof p_timeout_1.default) {
+            log.error(`Timed out after ${timeout}ms waiting for existence of s3://${bucket}/${key}`);
+        }
+        else {
+            log.error(`Unexpected error while waiting for existence of s3://${bucket}/${key}: ${error}`);
+        }
+        throw error;
+    }
 };
 exports.waitForObjectToExist = waitForObjectToExist;
 /**

package/S3ObjectStore.js

@@ -1,7 +1,11 @@
 "use strict";
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/SQS.d.ts

@@ -2,6 +2,7 @@
  * @module SQS
  */
 import Logger from '@cumulus/logger';
+import { SQSRecord } from 'aws-lambda';
 export interface SQSMessage extends AWS.SQS.Message {
     ReceiptHandle: string;
 }
@@ -52,7 +53,9 @@ declare type ReceiveSQSMessagesOptions = {
  * @returns {Promise<Array>} an array of messages
  */
 export declare const receiveSQSMessages: (queueUrl: string, options: ReceiveSQSMessagesOptions) => Promise<SQSMessage[]>;
-export declare const parseSQSMessageBody: (message: any) => unknown;
+export declare const parseSQSMessageBody: (message: SQSRecord | AWS.SQS.Message) => {
+    [key: string]: any;
+};
 /**
  * Delete a given SQS message from a given queue.
  *

package/SQS.js

@@ -1,7 +1,11 @@
 "use strict";
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/index.js

@@ -1,7 +1,11 @@
 "use strict";
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/aws-client",
-  "version": "10.0.0",
+  "version": "10.1.1",
   "description": "Utilities for working with AWS",
   "keywords": [
     "GIBS",
@@ -43,16 +43,17 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/checksum": "10.0.0",
-    "@cumulus/errors": "10.0.0",
-    "@cumulus/logger": "10.0.0",
+    "@cumulus/checksum": "10.1.1",
+    "@cumulus/errors": "10.1.1",
+    "@cumulus/logger": "10.1.1",
     "aws-sdk": "^2.814.0",
     "jsonpath-plus": "^1.1.0",
-    "lodash": "~4.17.20",
+    "lodash": "~4.17.21",
     "p-map": "^1.2.0",
     "p-retry": "^4.2.0",
-    "p-wait-for": "^3.1.0",
+    "p-timeout": "^4.1.0",
+    "p-wait-for": "^3.2.0",
     "pump": "^3.0.0"
   },
-  "gitHead": "7c6d2d1cd79b57d6943bbc3d898d0cf975b543b1"
+  "gitHead": "b34bda5035263c74c8341b25abfb033226a27387"
 }

package/services.js

@@ -1,7 +1,11 @@
 "use strict";
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/test-utils.js

@@ -6,28 +6,28 @@ const inTestMode = () => process.env.NODE_ENV === 'test';
 exports.inTestMode = inTestMode;
 // From https://github.com/localstack/localstack/blob/master/README.md
 const localStackPorts = {
-    stepfunctions: 4585,
-    apigateway: 4567,
-    cloudformation: 4581,
-    cloudwatch: 4582,
-    cloudwatchevents: 4582,
-    cloudwatchlogs: 4586,
-    dynamodb: 4564,
-    es: 4571,
-    firehose: 4573,
-    iam: 4593,
-    kinesis: 4568,
-    kms: 4599,
-    lambda: 4574,
-    redshift: 4577,
-    route53: 4580,
-    s3: 4572,
-    secretsmanager: 4584,
-    ses: 4579,
-    sns: 4575,
-    sqs: 4576,
-    ssm: 4583,
-    sts: 4592,
+    stepfunctions: 4566,
+    apigateway: 4566,
+    cloudformation: 4566,
+    cloudwatch: 4566,
+    cloudwatchevents: 4566,
+    cloudwatchlogs: 4566,
+    dynamodb: 4566,
+    es: 4566,
+    firehose: 4566,
+    iam: 4566,
+    kinesis: 4566,
+    kms: 4566,
+    lambda: 4566,
+    redshift: 4566,
+    route53: 4566,
+    s3: 4566,
+    secretsmanager: 4566,
+    ses: 4566,
+    sns: 4566,
+    sqs: 4566,
+    ssm: 4566,
+    sts: 4566,
 };
 /**
  * Test if a given AWS service is supported by LocalStack.