@cumulus/aws-client 10.0.0-beta.0 → 10.0.2

package/README.md

@@ -858,6 +858,7 @@ Copy an S3 object to another location in S3 using a multipart copy
 | [params.sourceObject] | <code>AWS.S3.HeadObjectOutput</code> |  | Output from https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#headObject-property |
 | [params.ACL] | <code>string</code> |  | an [S3 Canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) |
 | [params.copyTags] | <code>boolean</code> | <code>false</code> |  |
+| [params.chunkSize] | <code>number</code> |  | chunk size of the S3 multipart uploads |
 
 <a name="module_S3..moveObject"></a>
 
@@ -875,6 +876,7 @@ Move an S3 object to another location in S3
 | params.destinationKey | <code>string</code> |  |  |
 | [params.ACL] | <code>string</code> |  | an [S3 Canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) |
 | [params.copyTags] | <code>boolean</code> | <code>false</code> |  |
+| [params.chunkSize] | <code>number</code> |  | chunk size of the S3 multipart uploads |
 
 <a name="module_SNS"></a>
 

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;
 /**
@@ -320,9 +336,7 @@ exports.s3PutObjectTagging = (0, utils_1.improveStackTrace)((Bucket, Key, Taggin
  * @returns {Promise<AWS.S3.GetObjectOutput>} response from `AWS.S3.getObject()`
  *   as a Promise
  */
-const getObject = (
-// eslint-disable-next-line no-shadow
-s3Client, params) => s3Client.getObject(params).promise();
+const getObject = (s3Client, params) => s3Client.getObject(params).promise();
 exports.getObject = getObject;
 /**
  * Get an object from S3, waiting for it to exist and, if specified, have the

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-beta.0",
+  "version": "10.0.2",
   "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-beta.0",
-    "@cumulus/errors": "10.0.0-beta.0",
-    "@cumulus/logger": "10.0.0-beta.0",
+    "@cumulus/checksum": "10.0.2",
+    "@cumulus/errors": "10.0.2",
+    "@cumulus/logger": "10.0.2",
     "aws-sdk": "^2.814.0",
     "jsonpath-plus": "^1.1.0",
     "lodash": "~4.17.20",
     "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": "bc283986be627ba06a4084cabd4e01d1540d14c7"
+  "gitHead": "e678a624b5179759200b988de72292ce389f41e2"
 }

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];