@cumulus/aws-client 10.1.2 → 11.1.0

package/DynamoDb.d.ts

@@ -2,31 +2,34 @@
  * @module DynamoDb
  */
 import pRetry from 'p-retry';
-import { DocumentClient } from 'aws-sdk/lib/dynamodb/document_client';
+import { CreateTableInput, DeleteTableInput, ScanInput } from '@aws-sdk/client-dynamodb';
+import { DynamoDBDocument, GetCommandInput, ScanCommandInput, ScanCommandOutput } from '@aws-sdk/lib-dynamodb';
 /**
  * Call DynamoDb client get
  *
- * See [DocumentClient.get()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#get-property)
+ * See [DocumentClient.get()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html)
  * for descriptions of `params` and the return data.
  *
  * @param {Object} params
  * @param {string} params.tableName - Table name to read
- * @param {AWS.DynamoDB.DocumentClient.Key} params.item - Key identifying object to get
- * @param {AWS.DynamoDB.DocumentClient} params.client - Instance of a DynamoDb DocumentClient
+ * @param {GetCommandInput.Key} params.item - Key identifying object to get
+ * @param {DynamoDBDocument} params.client - Instance of a DynamoDb DocumentClient
  * @param {Object} params.getParams - Additional parameters for DocumentClient.get()
  * @returns {Promise<Object>}
  * @throws {RecordDoesNotExist} if a record cannot be found
  */
 export declare const get: (params: {
     tableName: string;
-    item: AWS.DynamoDB.DocumentClient.Key;
-    client: AWS.DynamoDB.DocumentClient;
-    getParams?: object | undefined;
-}) => Promise<DocumentClient.AttributeMap>;
+    item: GetCommandInput['Key'];
+    client: DynamoDBDocument;
+    getParams?: object;
+}) => Promise<{
+    [key: string]: any;
+}>;
 /**
  * Call DynamoDb client scan
  *
- * See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#scan-property)
+ * See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html)
  * for descriptions of `params` and the return data.
  *
  * @param {Object} params
@@ -34,59 +37,59 @@ export declare const get: (params: {
  */
 export declare const scan: (params: {
     tableName: string;
-    client: AWS.DynamoDB.DocumentClient;
+    client: DynamoDBDocument;
     query?: {
         filter?: string | undefined;
-        names?: DocumentClient.ExpressionAttributeNameMap | undefined;
-        values?: DocumentClient.ExpressionAttributeValueMap | undefined;
+        names?: ScanInput['ExpressionAttributeNames'];
+        values?: ScanCommandInput['ExpressionAttributeValues'];
     } | undefined;
     fields?: string | undefined;
     limit?: number | undefined;
     select: string;
-    startKey?: DocumentClient.Key | undefined;
-}) => Promise<import("aws-sdk/lib/request").PromiseResult<DocumentClient.ScanOutput, import("aws-sdk").AWSError>>;
+    startKey?: ScanInput['ExclusiveStartKey'];
+}) => Promise<ScanCommandOutput>;
 /**
  * Do a parallel scan of DynamoDB table using a document client.
  *
  * See https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.ParallelScan.
- * See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#scan-property).
+ * See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html).
  *
  * @param {Object} params
  * @param {number} params.totalSegments
  *   Total number of segments to divide table into for parallel scanning
- * @param {DocumentClient.ScanInput} params.scanParams
+ * @param {ScanInput} params.scanParams
  *   Params for the DynamoDB client scan operation
  *   See https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html
  * @param {function} params.processItemsFunc - Function used to process returned items by scan
- * @param {DocumentClient} [params.dynamoDbClient] - Instance of Dynamo DB document client
+ * @param {DynamoDBDocument} [params.dynamoDbClient] - Instance of Dynamo DB document client
  * @param {pRetry.Options} [params.retryOptions] - Retry options for scan operations
  * @returns {Promise}
  */
 export declare const parallelScan: (params: {
     totalSegments: number;
-    scanParams: DocumentClient.ScanInput;
-    processItemsFunc: (items: DocumentClient.ItemList) => Promise<void>;
-    dynamoDbClient?: DocumentClient | undefined;
+    scanParams: ScanCommandInput;
+    processItemsFunc: (items: ScanCommandOutput['Items']) => Promise<void>;
+    dynamoDbClient: DynamoDBDocument;
     retryOptions?: pRetry.Options | undefined;
 }) => Promise<void[]>;
 /**
  * Create a DynamoDB table and then wait for the table to exist
  *
  * @param {Object} params - the same params that you would pass to AWS.createTable
- *   See https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#createTable-property
+ *   See https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-dynamodb/classes/dynamodb.html#createtable
  * @returns {Promise<Object>} the output of the createTable call
  *
  * @static
  */
-export declare function createAndWaitForDynamoDbTable(params: AWS.DynamoDB.CreateTableInput): Promise<import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/dynamodb").CreateTableOutput, import("aws-sdk").AWSError>>;
+export declare function createAndWaitForDynamoDbTable(params: CreateTableInput): Promise<import("@aws-sdk/client-dynamodb").CreateTableCommandOutput>;
 /**
  * Delete a DynamoDB table and then wait for the table to not exist
  *
  * @param {Object} params - the same params that you would pass to AWS.deleteTable
- *   See https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#deleteTable-property
+ *   See https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-dynamodb/classes/dynamodb.html#deletetable
  * @returns {Promise}
  *
  * @static
  */
-export declare function deleteAndWaitForDynamoDbTableNotExists(params: AWS.DynamoDB.DeleteTableInput): Promise<import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/dynamodb").DescribeTableOutput, import("aws-sdk").AWSError>>;
+export declare function deleteAndWaitForDynamoDbTableNotExists(params: DeleteTableInput): Promise<void>;
 //# sourceMappingURL=DynamoDb.d.ts.map

package/DynamoDb.js

@@ -10,38 +10,40 @@ exports.deleteAndWaitForDynamoDbTableNotExists = exports.createAndWaitForDynamoD
 const p_map_1 = __importDefault(require("p-map"));
 const p_retry_1 = __importDefault(require("p-retry"));
 const range_1 = __importDefault(require("lodash/range"));
+const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const errors_1 = require("@cumulus/errors");
 const services_1 = require("./services");
 const utils_1 = require("./utils");
 /**
  * Call DynamoDb client get
  *
- * See [DocumentClient.get()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#get-property)
+ * See [DocumentClient.get()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html)
  * for descriptions of `params` and the return data.
  *
  * @param {Object} params
  * @param {string} params.tableName - Table name to read
- * @param {AWS.DynamoDB.DocumentClient.Key} params.item - Key identifying object to get
- * @param {AWS.DynamoDB.DocumentClient} params.client - Instance of a DynamoDb DocumentClient
+ * @param {GetCommandInput.Key} params.item - Key identifying object to get
+ * @param {DynamoDBDocument} params.client - Instance of a DynamoDb DocumentClient
  * @param {Object} params.getParams - Additional parameters for DocumentClient.get()
  * @returns {Promise<Object>}
  * @throws {RecordDoesNotExist} if a record cannot be found
  */
-exports.get = (0, utils_1.improveStackTrace)(async (params) => {
+const get = async (params) => {
     const { client, getParams = {}, item, tableName, } = params;
     const getResponse = await client.get({
         ...getParams,
         TableName: tableName,
         Key: item,
-    }).promise();
+    });
     if (getResponse.Item)
         return getResponse.Item;
     throw new errors_1.RecordDoesNotExist(`No record found for ${JSON.stringify(item)} in ${tableName}`);
-});
+};
+exports.get = get;
 /**
  * Call DynamoDb client scan
  *
- * See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#scan-property)
+ * See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html)
  * for descriptions of `params` and the return data.
  *
  * @param {Object} params
@@ -73,7 +75,7 @@ exports.scan = (0, utils_1.improveStackTrace)(async (params) => {
     if (startKey) {
         scanParams.ExclusiveStartKey = startKey;
     }
-    const response = await client.scan(scanParams).promise();
+    const response = await client.scan(scanParams);
     // recursively go through all the records
     if (response.LastEvaluatedKey) {
         const more = await (0, exports.scan)({
@@ -98,21 +100,21 @@ exports.scan = (0, utils_1.improveStackTrace)(async (params) => {
  * Do a parallel scan of DynamoDB table using a document client.
  *
  * See https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.ParallelScan.
- * See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#scan-property).
+ * See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html).
  *
  * @param {Object} params
  * @param {number} params.totalSegments
  *   Total number of segments to divide table into for parallel scanning
- * @param {DocumentClient.ScanInput} params.scanParams
+ * @param {ScanInput} params.scanParams
  *   Params for the DynamoDB client scan operation
  *   See https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html
  * @param {function} params.processItemsFunc - Function used to process returned items by scan
- * @param {DocumentClient} [params.dynamoDbClient] - Instance of Dynamo DB document client
+ * @param {DynamoDBDocument} [params.dynamoDbClient] - Instance of Dynamo DB document client
  * @param {pRetry.Options} [params.retryOptions] - Retry options for scan operations
  * @returns {Promise}
  */
 const parallelScan = async (params) => {
-    const { totalSegments, scanParams, processItemsFunc, dynamoDbClient = (0, services_1.dynamodbDocClient)(), retryOptions, } = params;
+    const { totalSegments, scanParams, processItemsFunc, dynamoDbClient, retryOptions, } = params;
     return await (0, p_map_1.default)((0, range_1.default)(totalSegments), async (_, segmentIndex) => {
         let exclusiveStartKey;
         const segmentScanParams = {
@@ -122,7 +124,7 @@ const parallelScan = async (params) => {
         };
         /* eslint-disable no-await-in-loop */
         do {
-            const { Items = [], LastEvaluatedKey, } = await (0, p_retry_1.default)(() => dynamoDbClient.scan(segmentScanParams).promise(), retryOptions);
+            const { Items = [], LastEvaluatedKey, } = await (0, p_retry_1.default)(() => dynamoDbClient.scan(segmentScanParams), retryOptions);
             exclusiveStartKey = LastEvaluatedKey;
             segmentScanParams.ExclusiveStartKey = exclusiveStartKey;
             await processItemsFunc(Items);
@@ -138,14 +140,19 @@ exports.parallelScan = parallelScan;
  * Create a DynamoDB table and then wait for the table to exist
  *
  * @param {Object} params - the same params that you would pass to AWS.createTable
- *   See https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#createTable-property
+ *   See https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-dynamodb/classes/dynamodb.html#createtable
  * @returns {Promise<Object>} the output of the createTable call
  *
  * @static
  */
 async function createAndWaitForDynamoDbTable(params) {
-    const createTableResult = await (0, services_1.dynamodb)().createTable(params).promise();
-    await (0, services_1.dynamodb)().waitFor('tableExists', { TableName: params.TableName }).promise();
+    const dynamoDbClient = (0, services_1.dynamodb)();
+    const createTableResult = await dynamoDbClient.createTable(params);
+    await (0, client_dynamodb_1.waitUntilTableExists)({
+        client: dynamoDbClient,
+        minDelay: 1,
+        maxWaitTime: 3,
+    }, { TableName: params.TableName });
     return createTableResult;
 }
 exports.createAndWaitForDynamoDbTable = createAndWaitForDynamoDbTable;
@@ -153,14 +160,19 @@ exports.createAndWaitForDynamoDbTable = createAndWaitForDynamoDbTable;
  * Delete a DynamoDB table and then wait for the table to not exist
  *
  * @param {Object} params - the same params that you would pass to AWS.deleteTable
- *   See https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#deleteTable-property
+ *   See https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-dynamodb/classes/dynamodb.html#deletetable
  * @returns {Promise}
  *
  * @static
  */
 async function deleteAndWaitForDynamoDbTableNotExists(params) {
-    await (0, services_1.dynamodb)().deleteTable(params).promise();
-    return (0, services_1.dynamodb)().waitFor('tableNotExists', { TableName: params.TableName }).promise();
+    const dynamoDbClient = (0, services_1.dynamodb)();
+    await dynamoDbClient.deleteTable(params);
+    await (0, client_dynamodb_1.waitUntilTableNotExists)({
+        client: dynamoDbClient,
+        minDelay: 1,
+        maxWaitTime: 3,
+    }, { TableName: params.TableName });
 }
 exports.deleteAndWaitForDynamoDbTableNotExists = deleteAndWaitForDynamoDbTableNotExists;
 //# sourceMappingURL=DynamoDb.js.map

package/DynamoDbSearchQueue.js

@@ -83,12 +83,17 @@ class DynamoDbSearchQueue {
     async fetchItems() {
         let response;
         do {
-            response = await this.dynamodbDocClient[this.searchType](this.params).promise(); // eslint-disable-line no-await-in-loop, max-len
-            if (response.LastEvaluatedKey)
+            if (this.searchType === 'scan') {
+                response = await this.dynamodbDocClient.scan(this.params); // eslint-disable-line no-await-in-loop, max-len
+            }
+            else if (this.searchType === 'query') {
+                response = await this.dynamodbDocClient.query(this.params); // eslint-disable-line no-await-in-loop, max-len
+            }
+            if (response === null || response === void 0 ? void 0 : response.LastEvaluatedKey)
                 this.params.ExclusiveStartKey = response.LastEvaluatedKey;
-        } while ((response.Items || []).length === 0 && response.LastEvaluatedKey);
-        this.items = (response.Items || []);
-        if (!response.LastEvaluatedKey)
+        } while (((response === null || response === void 0 ? void 0 : response.Items) || []).length === 0 && (response === null || response === void 0 ? void 0 : response.LastEvaluatedKey));
+        this.items = ((response === null || response === void 0 ? void 0 : response.Items) || []);
+        if (!(response === null || response === void 0 ? void 0 : response.LastEvaluatedKey))
             this.items.push(null);
     }
 }

package/README.md

@@ -143,41 +143,19 @@ Create a CloudWatch Events rule
 
 * [DynamoDb](#module_DynamoDb)
     * _static_
-        * [.get](#module_DynamoDb.get) ⇒ <code>Promise.&lt;Object&gt;</code>
         * [.scan](#module_DynamoDb.scan) ⇒ <code>Promise.&lt;Object&gt;</code>
         * [.createAndWaitForDynamoDbTable(params)](#module_DynamoDb.createAndWaitForDynamoDbTable) ⇒ <code>Promise.&lt;Object&gt;</code>
         * [.deleteAndWaitForDynamoDbTableNotExists(params)](#module_DynamoDb.deleteAndWaitForDynamoDbTableNotExists) ⇒ <code>Promise</code>
     * _inner_
+        * [~get(params)](#module_DynamoDb..get) ⇒ <code>Promise.&lt;Object&gt;</code>
         * [~parallelScan(params)](#module_DynamoDb..parallelScan) ⇒ <code>Promise</code>
 
-<a name="module_DynamoDb.get"></a>
-
-### DynamoDb.get ⇒ <code>Promise.&lt;Object&gt;</code>
-Call DynamoDb client get
-
-See [DocumentClient.get()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#get-property)
-for descriptions of `params` and the return data.
-
-**Kind**: static property of [<code>DynamoDb</code>](#module_DynamoDb)  
-**Throws**:
-
-- <code>RecordDoesNotExist</code> if a record cannot be found
-
-
-| Param | Type | Description |
-| --- | --- | --- |
-| params | <code>Object</code> |  |
-| params.tableName | <code>string</code> | Table name to read |
-| params.item | <code>AWS.DynamoDB.DocumentClient.Key</code> | Key identifying object to get |
-| params.client | <code>AWS.DynamoDB.DocumentClient</code> | Instance of a DynamoDb DocumentClient |
-| params.getParams | <code>Object</code> | Additional parameters for DocumentClient.get() |
-
 <a name="module_DynamoDb.scan"></a>
 
 ### DynamoDb.scan ⇒ <code>Promise.&lt;Object&gt;</code>
 Call DynamoDb client scan
 
-See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#scan-property)
+See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html)
 for descriptions of `params` and the return data.
 
 **Kind**: static property of [<code>DynamoDb</code>](#module_DynamoDb)  
@@ -196,7 +174,7 @@ Create a DynamoDB table and then wait for the table to exist
 
 | Param | Type | Description |
 | --- | --- | --- |
-| params | <code>Object</code> | the same params that you would pass to AWS.createTable   See https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#createTable-property |
+| params | <code>Object</code> | the same params that you would pass to AWS.createTable   See https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-dynamodb/classes/dynamodb.html#createtable |
 
 <a name="module_DynamoDb.deleteAndWaitForDynamoDbTableNotExists"></a>
 
@@ -207,7 +185,29 @@ Delete a DynamoDB table and then wait for the table to not exist
 
 | Param | Type | Description |
 | --- | --- | --- |
-| params | <code>Object</code> | the same params that you would pass to AWS.deleteTable   See https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#deleteTable-property |
+| params | <code>Object</code> | the same params that you would pass to AWS.deleteTable   See https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-dynamodb/classes/dynamodb.html#deletetable |
+
+<a name="module_DynamoDb..get"></a>
+
+### DynamoDb~get(params) ⇒ <code>Promise.&lt;Object&gt;</code>
+Call DynamoDb client get
+
+See [DocumentClient.get()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html)
+for descriptions of `params` and the return data.
+
+**Kind**: inner method of [<code>DynamoDb</code>](#module_DynamoDb)  
+**Throws**:
+
+- <code>RecordDoesNotExist</code> if a record cannot be found
+
+
+| Param | Type | Description |
+| --- | --- | --- |
+| params | <code>Object</code> |  |
+| params.tableName | <code>string</code> | Table name to read |
+| params.item | <code>GetCommandInput.Key</code> | Key identifying object to get |
+| params.client | <code>DynamoDBDocument</code> | Instance of a DynamoDb DocumentClient |
+| params.getParams | <code>Object</code> | Additional parameters for DocumentClient.get() |
 
 <a name="module_DynamoDb..parallelScan"></a>
 
@@ -215,7 +215,7 @@ Delete a DynamoDB table and then wait for the table to not exist
 Do a parallel scan of DynamoDB table using a document client.
 
 See https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.ParallelScan.
-See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#scan-property).
+See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_lib_dynamodb.html).
 
 **Kind**: inner method of [<code>DynamoDb</code>](#module_DynamoDb)  
 
@@ -223,9 +223,9 @@ See [DocumentClient.scan()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/
 | --- | --- | --- |
 | params | <code>Object</code> |  |
 | params.totalSegments | <code>number</code> | Total number of segments to divide table into for parallel scanning |
-| params.scanParams | <code>DocumentClient.ScanInput</code> | Params for the DynamoDB client scan operation   See https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html |
+| params.scanParams | <code>ScanInput</code> | Params for the DynamoDB client scan operation   See https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html |
 | params.processItemsFunc | <code>function</code> | Function used to process returned items by scan |
-| [params.dynamoDbClient] | <code>DocumentClient</code> | Instance of Dynamo DB document client |
+| [params.dynamoDbClient] | <code>DynamoDBDocument</code> | Instance of Dynamo DB document client |
 | [params.retryOptions] | <code>pRetry.Options</code> | Retry options for scan operations |
 
 <a name="module_KMS"></a>

package/SNS.js

@@ -31,7 +31,7 @@ const publishSnsMessage = async (snsTopicArn, message, retryOptions = {}) => awa
     }).promise();
 }, {
     maxTimeout: 5000,
-    onFailedAttempt: (err) => log.debug(`publishSnsMessage('${snsTopicArn}', '${message}') failed with ${err.retriesLeft} retries left: ${err.message}`),
+    onFailedAttempt: (err) => log.debug(`publishSnsMessage('${snsTopicArn}', '${JSON.stringify(message)}') failed with ${err.retriesLeft} retries left: ${JSON.stringify(err)}`),
     ...retryOptions,
 });
 exports.publishSnsMessage = publishSnsMessage;

package/client.d.ts

@@ -1,4 +1,4 @@
-import AWS from 'aws-sdk';
+import { AWSClientTypes } from './types';
 /**
  * Return a function which, when called, will return an AWS service object
  *
@@ -14,6 +14,6 @@ import AWS from 'aws-sdk';
  *
  * @private
  */
-declare const awsClient: <T extends AWS.Service | AWS.DynamoDB.DocumentClient>(Service: new (params: object) => T, version?: string | undefined, serviceOptions?: object | undefined) => (options?: object | undefined) => T;
+declare const awsClient: <T extends AWSClientTypes>(Service: new (params: object) => T, version?: string | undefined, serviceOptions?: object | undefined) => (params?: object | undefined) => T;
 export = awsClient;
 //# sourceMappingURL=client.d.ts.map

package/client.js

@@ -3,21 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
+const mem_1 = __importDefault(require("mem"));
 const test_utils_1 = require("./test-utils");
+const utils_1 = require("./utils");
 const noop = () => { }; // eslint-disable-line lodash/prefer-noop
 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 });
 aws_sdk_1.default.config.setPromisesDependency(Promise);
-const memoize = (fn) => {
-    let memo;
-    return (options) => {
-        if (!memo)
-            memo = fn(options);
-        return memo;
-    };
+const buildServiceClient = (Service, options) => {
+    if ((0, test_utils_1.inTestMode)()) {
+        return new Service((0, test_utils_1.getLocalstackAwsClientOptions)(Service, options));
+    }
+    return new Service(options);
 };
+const getMemoizedClient = (0, mem_1.default)(buildServiceClient, {
+    cacheKey: (arguments_) => `${(0, utils_1.getServiceIdentifer)(arguments_[0])}${JSON.stringify(arguments_[1])}`,
+});
+const getServiceClient = (Service, options = {}) => (overrides) => getMemoizedClient(Service, Object.assign(options, overrides));
 /**
  * Return a function which, when called, will return an AWS service object
  *
@@ -44,11 +48,10 @@ const awsClient = (Service, version, serviceOptions) => {
         // @ts-ignore - serviceIdentifier is not part of the public API and may break at any time
         if (aws_sdk_1.default.DynamoDB.DocumentClient.serviceIdentifier === undefined) {
             // @ts-ignore - serviceIdentifier is not part of the public API and may break at any time
-            aws_sdk_1.default.DynamoDB.DocumentClient.serviceIdentifier = 'dynamodb';
+            aws_sdk_1.default.DynamoDB.DocumentClient.serviceIdentifier = 'dynamodbclient';
         }
-        return memoize((o) => (0, test_utils_1.testAwsClient)(Service, Object.assign(options, o)));
     }
-    return memoize((o) => new Service(Object.assign(options, o)));
+    return getServiceClient(Service, options);
 };
 module.exports = awsClient;
 //# sourceMappingURL=client.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/aws-client",
-  "version": "10.1.2",
+  "version": "11.1.0",
   "description": "Utilities for working with AWS",
   "keywords": [
     "GIBS",
@@ -43,17 +43,22 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/checksum": "10.1.2",
-    "@cumulus/errors": "10.1.2",
-    "@cumulus/logger": "10.1.2",
-    "aws-sdk": "^2.814.0",
+    "@aws-sdk/client-dynamodb": "^3.53.0",
+    "@aws-sdk/client-dynamodb-streams": "^3.53.0",
+    "@aws-sdk/lib-dynamodb": "^3.53.0",
+    "@aws-sdk/types": "^3.53.0",
+    "@cumulus/checksum": "11.1.0",
+    "@cumulus/errors": "11.1.0",
+    "@cumulus/logger": "11.1.0",
+    "aws-sdk": "^2.585.0",
     "jsonpath-plus": "^1.1.0",
     "lodash": "~4.17.21",
+    "mem": "^8.0.2",
     "p-map": "^1.2.0",
     "p-retry": "^4.2.0",
     "p-timeout": "^4.1.0",
     "p-wait-for": "^3.2.0",
     "pump": "^3.0.0"
   },
-  "gitHead": "3b59753fa85064549b70ad8ed4a4ee213c5af313"
+  "gitHead": "a846e319e143684ebc408e35f8b51cc1a7195391"
 }

package/services.d.ts

@@ -1,23 +1,26 @@
+import { DynamoDB } from '@aws-sdk/client-dynamodb';
+import { DynamoDBStreamsClient } from '@aws-sdk/client-dynamodb-streams';
+import { DynamoDBDocument, TranslateConfig } from '@aws-sdk/lib-dynamodb';
 import * as AWS from 'aws-sdk';
-export declare const apigateway: (options?: object | undefined) => AWS.APIGateway;
-export declare const ecs: (options?: object | undefined) => AWS.ECS;
-export declare const ec2: (options?: object | undefined) => AWS.EC2;
-export declare const s3: (options?: object | undefined) => AWS.S3;
-export declare const kinesis: (options?: object | undefined) => AWS.Kinesis;
-export declare const lambda: (options?: object | undefined) => AWS.Lambda;
-export declare const sqs: (options?: object | undefined) => AWS.SQS;
-export declare const cloudwatchevents: (options?: object | undefined) => AWS.CloudWatchEvents;
-export declare const cloudwatchlogs: (options?: object | undefined) => AWS.CloudWatchLogs;
-export declare const cloudwatch: (options?: object | undefined) => AWS.CloudWatch;
-export declare const dynamodb: (options?: object | undefined) => AWS.DynamoDB;
-export declare const dynamodbstreams: (options?: object | undefined) => AWS.DynamoDBStreams;
-export declare const dynamodbDocClient: (options?: object | undefined) => AWS.DynamoDB.DocumentClient;
-export declare const sfn: (options?: object | undefined) => AWS.StepFunctions;
-export declare const cf: (options?: object | undefined) => AWS.CloudFormation;
-export declare const sns: (options?: object | undefined) => AWS.SNS;
-export declare const secretsManager: (options?: object | undefined) => AWS.SecretsManager;
-export declare const systemsManager: (options?: object | undefined) => AWS.SSM;
-export declare const kms: (options?: object | undefined) => AWS.KMS;
-export declare const es: (options?: object | undefined) => AWS.ES;
-export declare const sts: (options?: object | undefined) => AWS.STS;
+export declare const apigateway: (params?: object | undefined) => AWS.APIGateway;
+export declare const ecs: (params?: object | undefined) => AWS.ECS;
+export declare const ec2: (params?: object | undefined) => AWS.EC2;
+export declare const s3: (params?: object | undefined) => AWS.S3;
+export declare const kinesis: (params?: object | undefined) => AWS.Kinesis;
+export declare const lambda: (params?: object | undefined) => AWS.Lambda;
+export declare const sqs: (params?: object | undefined) => AWS.SQS;
+export declare const cloudwatchevents: (params?: object | undefined) => AWS.CloudWatchEvents;
+export declare const cloudwatchlogs: (params?: object | undefined) => AWS.CloudWatchLogs;
+export declare const cloudwatch: (params?: object | undefined) => AWS.CloudWatch;
+export declare const dynamodb: (params?: object | undefined) => DynamoDB;
+export declare const dynamodbstreams: (params?: object | undefined) => DynamoDBStreamsClient;
+export declare const dynamodbDocClient: (docClientOptions?: TranslateConfig | undefined, dynamoOptions?: object | undefined) => DynamoDBDocument;
+export declare const sfn: (params?: object | undefined) => AWS.StepFunctions;
+export declare const cf: (params?: object | undefined) => AWS.CloudFormation;
+export declare const sns: (params?: object | undefined) => AWS.SNS;
+export declare const secretsManager: (params?: object | undefined) => AWS.SecretsManager;
+export declare const systemsManager: (params?: object | undefined) => AWS.SSM;
+export declare const kms: (params?: object | undefined) => AWS.KMS;
+export declare const es: (params?: object | undefined) => AWS.ES;
+export declare const sts: (params?: object | undefined) => AWS.STS;
 //# sourceMappingURL=services.d.ts.map

package/services.js

@@ -22,29 +22,36 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sts = exports.es = exports.kms = exports.systemsManager = exports.secretsManager = exports.sns = exports.cf = exports.sfn = exports.dynamodbDocClient = exports.dynamodbstreams = exports.dynamodb = exports.cloudwatch = exports.cloudwatchlogs = exports.cloudwatchevents = exports.sqs = exports.lambda = exports.kinesis = exports.s3 = exports.ec2 = exports.ecs = exports.apigateway = void 0;
+const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
+const client_dynamodb_streams_1 = require("@aws-sdk/client-dynamodb-streams");
+const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
 const AWS = __importStar(require("aws-sdk"));
-const awsClient = require("./client");
-exports.apigateway = awsClient(AWS.APIGateway, '2015-07-09');
-exports.ecs = awsClient(AWS.ECS, '2014-11-13');
-exports.ec2 = awsClient(AWS.EC2, '2016-11-15');
-exports.s3 = awsClient(AWS.S3, '2006-03-01');
-exports.kinesis = awsClient(AWS.Kinesis, '2013-12-02');
-exports.lambda = awsClient(AWS.Lambda, '2015-03-31');
-exports.sqs = awsClient(AWS.SQS, '2012-11-05');
-exports.cloudwatchevents = awsClient(AWS.CloudWatchEvents, '2014-02-03');
-exports.cloudwatchlogs = awsClient(AWS.CloudWatchLogs, '2014-03-28');
-exports.cloudwatch = awsClient(AWS.CloudWatch, '2010-08-01');
-exports.dynamodb = awsClient(AWS.DynamoDB, '2012-08-10');
-exports.dynamodbstreams = awsClient(AWS.DynamoDBStreams, '2012-08-10');
-exports.dynamodbDocClient = awsClient(AWS.DynamoDB.DocumentClient, '2012-08-10');
-exports.sfn = awsClient(AWS.StepFunctions, '2016-11-23');
-exports.cf = awsClient(AWS.CloudFormation, '2010-05-15');
-exports.sns = awsClient(AWS.SNS, '2010-03-31');
-exports.secretsManager = awsClient(AWS.SecretsManager, '2017-10-17');
-exports.systemsManager = awsClient(AWS.SSM, '2017-10-17');
-exports.kms = awsClient(AWS.KMS, '2014-11-01');
-exports.es = awsClient(AWS.ES, '2015-01-01');
-exports.sts = awsClient(AWS.STS, '2011-06-15');
+const client_1 = __importDefault(require("./client"));
+exports.apigateway = (0, client_1.default)(AWS.APIGateway, '2015-07-09');
+exports.ecs = (0, client_1.default)(AWS.ECS, '2014-11-13');
+exports.ec2 = (0, client_1.default)(AWS.EC2, '2016-11-15');
+exports.s3 = (0, client_1.default)(AWS.S3, '2006-03-01');
+exports.kinesis = (0, client_1.default)(AWS.Kinesis, '2013-12-02');
+exports.lambda = (0, client_1.default)(AWS.Lambda, '2015-03-31');
+exports.sqs = (0, client_1.default)(AWS.SQS, '2012-11-05');
+exports.cloudwatchevents = (0, client_1.default)(AWS.CloudWatchEvents, '2014-02-03');
+exports.cloudwatchlogs = (0, client_1.default)(AWS.CloudWatchLogs, '2014-03-28');
+exports.cloudwatch = (0, client_1.default)(AWS.CloudWatch, '2010-08-01');
+exports.dynamodb = (0, client_1.default)(client_dynamodb_1.DynamoDB, '2012-08-10');
+exports.dynamodbstreams = (0, client_1.default)(client_dynamodb_streams_1.DynamoDBStreamsClient, '2012-08-10');
+const dynamodbDocClient = (docClientOptions, dynamoOptions) => lib_dynamodb_1.DynamoDBDocument.from((0, client_1.default)(client_dynamodb_1.DynamoDB, '2012-08-10')(dynamoOptions), docClientOptions);
+exports.dynamodbDocClient = dynamodbDocClient;
+exports.sfn = (0, client_1.default)(AWS.StepFunctions, '2016-11-23');
+exports.cf = (0, client_1.default)(AWS.CloudFormation, '2010-05-15');
+exports.sns = (0, client_1.default)(AWS.SNS, '2010-03-31');
+exports.secretsManager = (0, client_1.default)(AWS.SecretsManager, '2017-10-17');
+exports.systemsManager = (0, client_1.default)(AWS.SSM, '2017-10-17');
+exports.kms = (0, client_1.default)(AWS.KMS, '2014-11-01');
+exports.es = (0, client_1.default)(AWS.ES, '2015-01-01');
+exports.sts = (0, client_1.default)(AWS.STS, '2011-06-15');
 //# sourceMappingURL=services.js.map

package/test-utils.d.ts

@@ -1,4 +1,4 @@
-import * as AWS from 'aws-sdk';
+import { AWSClientTypes } from './types';
 export declare const inTestMode: () => boolean;
 declare const localStackPorts: {
     stepfunctions: number;
@@ -7,7 +7,11 @@ declare const localStackPorts: {
     cloudwatch: number;
     cloudwatchevents: number;
     cloudwatchlogs: number;
-    dynamodb: number;
+    DynamoDB: number;
+    DynamoDBClient: number;
+    DynamoDBStreamsClient: number;
+    ec2: number;
+    ecs: number;
     es: number;
     firehose: number;
     iam: number;
@@ -33,6 +37,20 @@ declare const localStackPorts: {
  * @private
  */
 export declare function getLocalstackEndpoint(identifier: keyof typeof localStackPorts): string;
+/**
+ * Create an AWS service object that talks to LocalStack.
+ *
+ * This function expects that the LOCALSTACK_HOST environment variable will be set.
+ *
+ * @param {Function} Service - an AWS service object constructor function
+ * @param {Object} options - options to pass to the service object constructor function
+ * @returns {Object} an AWS service object
+ *
+ * @private
+ */
+export declare function localStackAwsClientOptions<T>(Service: new (params: object) => T, options?: object): {
+    [key: string]: unknown;
+};
 /**
  * Create an AWS service object that does not actually talk to AWS.
  *
@@ -42,7 +60,7 @@ export declare function getLocalstackEndpoint(identifier: keyof typeof localStac
  *
  * @private
  */
-export declare function testAwsClient<T extends AWS.Service | AWS.DynamoDB.DocumentClient>(Service: new (params: object) => T, options: object): T;
+export declare function getLocalstackAwsClientOptions<T extends AWSClientTypes>(Service: new (params: object) => T, options?: object): object;
 /**
  * Return a function that throws a ThrottlingException the first time it is called, then returns as
  * normal any other times.

package/test-utils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throttleOnce = exports.testAwsClient = exports.getLocalstackEndpoint = exports.inTestMode = void 0;
+exports.throttleOnce = exports.getLocalstackAwsClientOptions = exports.localStackAwsClientOptions = exports.getLocalstackEndpoint = exports.inTestMode = void 0;
 const errors_1 = require("@cumulus/errors");
+const utils_1 = require("./utils");
 const inTestMode = () => process.env.NODE_ENV === 'test';
 exports.inTestMode = inTestMode;
 // From https://github.com/localstack/localstack/blob/master/README.md
@@ -12,7 +13,11 @@ const localStackPorts = {
     cloudwatch: 4566,
     cloudwatchevents: 4566,
     cloudwatchlogs: 4566,
-    dynamodb: 4566,
+    DynamoDB: 4566,
+    DynamoDBClient: 4566,
+    DynamoDBStreamsClient: 4566,
+    ec2: 4566,
+    ecs: 4566,
     es: 4566,
     firehose: 4566,
     iam: 4566,
@@ -68,23 +73,25 @@ exports.getLocalstackEndpoint = getLocalstackEndpoint;
  *
  * @private
  */
-function localStackAwsClient(Service, options) {
+function localStackAwsClientOptions(Service, options = {}) {
     if (!process.env.LOCALSTACK_HOST) {
         throw new Error('The LOCALSTACK_HOST environment variable is not set.');
     }
-    // @ts-ignore
-    const serviceIdentifier = Service.serviceIdentifier;
+    const serviceIdentifier = (0, utils_1.getServiceIdentifer)(Service);
     const localStackOptions = {
         ...options,
-        accessKeyId: 'my-access-key-id',
-        secretAccessKey: 'my-secret-access-key',
+        credentials: {
+            accessKeyId: 'my-access-key-id',
+            secretAccessKey: 'my-secret-access-key',
+        },
         region: 'us-east-1',
         endpoint: getLocalstackEndpoint(serviceIdentifier),
     };
-    if (serviceIdentifier === 's3')
+    if (serviceIdentifier.toLowerCase() === 's3')
         localStackOptions.s3ForcePathStyle = true;
-    return new Service(localStackOptions);
+    return localStackOptions;
 }
+exports.localStackAwsClientOptions = localStackAwsClientOptions;
 /**
  * Create an AWS service object that does not actually talk to AWS.
  *
@@ -94,15 +101,14 @@ function localStackAwsClient(Service, options) {
  *
  * @private
  */
-function testAwsClient(Service, options) {
-    // @ts-ignore
-    const serviceIdentifier = Service.serviceIdentifier;
+function getLocalstackAwsClientOptions(Service, options) {
+    const serviceIdentifier = (0, utils_1.getServiceIdentifer)(Service);
     if (localstackSupportedService(serviceIdentifier)) {
-        return localStackAwsClient(Service, options);
+        return localStackAwsClientOptions(Service, options);
     }
     return {};
 }
-exports.testAwsClient = testAwsClient;
+exports.getLocalstackAwsClientOptions = getLocalstackAwsClientOptions;
 /**
  * Return a function that throws a ThrottlingException the first time it is called, then returns as
  * normal any other times.

package/types.d.ts

@@ -0,0 +1,5 @@
+import * as AWS from 'aws-sdk';
+import { DynamoDBStreamsClient } from '@aws-sdk/client-dynamodb-streams';
+import { DynamoDB, DynamoDBClient } from '@aws-sdk/client-dynamodb';
+export declare type AWSClientTypes = DynamoDB | DynamoDBClient | DynamoDBStreamsClient | AWS.Service | AWS.DynamoDB.DocumentClient;
+//# sourceMappingURL=types.d.ts.map

package/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/utils.d.ts

@@ -1,4 +1,5 @@
 import pRetry from 'p-retry';
+export declare const getServiceIdentifer: (service: any) => any;
 export declare const setErrorStack: (error: Error, newStack: string) => void;
 /**
  * Wrap a function and provide a better stack trace

package/utils.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retryOnThrottlingException = exports.improveStackTrace = exports.setErrorStack = void 0;
+exports.retryOnThrottlingException = exports.improveStackTrace = exports.setErrorStack = exports.getServiceIdentifer = void 0;
 const p_retry_1 = __importDefault(require("p-retry"));
 const errors_1 = require("@cumulus/errors");
+const getServiceIdentifer = (service) => service.serviceIdentifier || service.name;
+exports.getServiceIdentifer = getServiceIdentifer;
 // Replace the stack of an error
 // Note: This mutates the error that was passed in.
 const setErrorStack = (error, newStack) => {