@cumulus/aws-client 11.0.0 → 11.1.0-alpha1

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/S3.js

@@ -4,11 +4,7 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = 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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/S3ObjectStore.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = 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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/SQS.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = 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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = 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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (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": "11.0.0",
+  "version": "11.1.0-alpha1",
   "description": "Utilities for working with AWS",
   "keywords": [
     "GIBS",
@@ -43,17 +43,21 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
+    "@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",
+    "aws-sdk": "^2.585.0",
     "@cumulus/checksum": "11.0.0",
     "@cumulus/errors": "11.0.0",
     "@cumulus/logger": "11.0.0",
-    "aws-sdk": "^2.814.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": "e922ad12fd94affa6cd60a97a184a465a756c50b"
+  }
 }

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

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = 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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -22,29 +18,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) => {

package/LICENSE

@@ -1,60 +0,0 @@
-Copyright © 2020 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICE NSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
----
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-    You must give any other recipients of the Work or Derivative Works a copy of this License; and
-    You must cause any modified files to carry prominent notices stating that You changed the files; and
-    You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-    If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS