@cumulus/common 9.7.0 → 9.9.1

package/BucketsConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 const errors_1 = require("@cumulus/errors");
-const BucketsConfigError = errors_1.createErrorType('BucketsConfigError');
+const BucketsConfigError = (0, errors_1.createErrorType)('BucketsConfigError');
 /**
  * Class representing cumulus bucket configuration.
  */

package/FileUtils.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readJsonFile = exports.readTextFile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const util_1 = require("util");
-const readFile = util_1.promisify(fs_1.default.readFile);
-exports.readTextFile = (filename) => readFile(filename, 'utf8');
-exports.readJsonFile = (filename) => exports.readTextFile(filename).then(JSON.parse);
+const readFile = (0, util_1.promisify)(fs_1.default.readFile);
+const readTextFile = (filename) => readFile(filename, 'utf8');
+exports.readTextFile = readTextFile;
+const readJsonFile = (filename) => (0, exports.readTextFile)(filename).then(JSON.parse);
+exports.readJsonFile = readJsonFile;
 //# sourceMappingURL=FileUtils.js.map

package/URLUtils.js

@@ -40,19 +40,20 @@ const isNil_1 = __importDefault(require("lodash/isNil"));
  *   path: ['path', 'to', 'file.txt']
  * }); // => 'http://example.com:8080/path/to/file.txt'
  */
-exports.buildURL = (params) => {
+const buildURL = (params) => {
     const { protocol, host, port, path = [], } = params;
-    if (isNil_1.default(protocol))
+    if ((0, isNil_1.default)(protocol))
         throw new TypeError('protocol is required');
-    if (isNil_1.default(host))
+    if ((0, isNil_1.default)(host))
         throw new TypeError('host is required');
     const url = new url_1.URL(`${protocol}://${host}`);
     if (port && protocol !== 's3')
         url.port = port;
-    if (isString_1.default(path))
+    if ((0, isString_1.default)(path))
         url.pathname = path;
     else if (path.length > 0)
-        url.pathname = url_join_1.default(...path);
+        url.pathname = (0, url_join_1.default)(...path);
     return url.toString().replace(/\/$/, '');
 };
+exports.buildURL = buildURL;
 //# sourceMappingURL=URLUtils.js.map

package/cli-utils.js

@@ -24,7 +24,7 @@ exports.findMissingOptions = findMissingOptions;
  * @returns {string} - display name
  */
 function convertCamelOptionToLongOption(optionName) {
-    return `--${kebabCase_1.default(optionName)}`;
+    return `--${(0, kebabCase_1.default)(optionName)}`;
 }
 /**
  * Convert missing required fields for display and display on console

package/cloudwatch-event.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -28,14 +28,15 @@ const util_1 = require("./util");
  * @param {AwsCloudWatchEvent} event - A Cloudwatch event
  * @returns {boolean} True if event is a Step Function event
  */
-exports.isSfExecutionEvent = (event) => event.source === 'aws.states';
+const isSfExecutionEvent = (event) => event.source === 'aws.states';
+exports.isSfExecutionEvent = isSfExecutionEvent;
 /**
  * Determine if Step Function is in a terminal state.
  *
  * @param {string} status - A Step Function execution status from a Cloudwatch event
  * @returns {boolean} True if Step Function is in terminal state.
  */
-exports.isTerminalSfStatus = util_1.isOneOf([
+exports.isTerminalSfStatus = (0, util_1.isOneOf)([
     'ABORTED',
     'SUCCEEDED',
     'FAILED',
@@ -47,7 +48,7 @@ exports.isTerminalSfStatus = util_1.isOneOf([
  * @param {Object} status - A Step Function execution status from a Cloudwatch event
  * @returns {boolean} True if Step Function is in failed state.
  */
-exports.isFailedSfStatus = util_1.isOneOf([
+exports.isFailedSfStatus = (0, util_1.isOneOf)([
     'ABORTED',
     'FAILED',
     'TIMED_OUT',
@@ -58,7 +59,8 @@ exports.isFailedSfStatus = util_1.isOneOf([
  * @param {AwsCloudWatchEvent} event - A Cloudwatch event
  * @returns {string|undefined} Step Function execution status
  */
-exports.getSfEventStatus = (event) => { var _a; return (_a = event === null || event === void 0 ? void 0 : event.detail) === null || _a === void 0 ? void 0 : _a.status; };
+const getSfEventStatus = (event) => { var _a; return (_a = event === null || event === void 0 ? void 0 : event.detail) === null || _a === void 0 ? void 0 : _a.status; };
+exports.getSfEventStatus = getSfEventStatus;
 /**
  * Get the Step Function output message from a Cloudwatch Event
  *
@@ -67,7 +69,8 @@ exports.getSfEventStatus = (event) => { var _a; return (_a = event === null || e
  * @param {string} [defaultValue] - A default value for the message, if none exists
  * @returns {string|undefined} Output message from Step Function
  */
-exports.getSfEventDetailValue = (event, field, defaultValue) => { var _a, _b; return (_b = (_a = event === null || event === void 0 ? void 0 : event.detail) === null || _a === void 0 ? void 0 : _a[field]) !== null && _b !== void 0 ? _b : defaultValue; };
+const getSfEventDetailValue = (event, field, defaultValue) => { var _a, _b; return (_b = (_a = event === null || event === void 0 ? void 0 : event.detail) === null || _a === void 0 ? void 0 : _a[field]) !== null && _b !== void 0 ? _b : defaultValue; };
+exports.getSfEventDetailValue = getSfEventDetailValue;
 /**
  * Get the Step Function output message from a Cloudwatch Event
  *
@@ -76,8 +79,8 @@ exports.getSfEventDetailValue = (event, field, defaultValue) => { var _a, _b; re
  * @param {string} defaultValue - defaultValue to fetch if no event message object is found
  * @returns {unknown} Message object from Step Function
  */
-exports.getSfEventMessageObject = (event, messageSource, defaultValue) => {
-    const message = exports.getSfEventDetailValue(event, messageSource, defaultValue);
+const getSfEventMessageObject = (event, messageSource, defaultValue) => {
+    const message = (0, exports.getSfEventDetailValue)(event, messageSource, defaultValue);
     if (message === undefined) {
         log.error('Unable to find message');
         return undefined;
@@ -90,4 +93,5 @@ exports.getSfEventMessageObject = (event, messageSource, defaultValue) => {
         return undefined;
     }
 };
+exports.getSfEventMessageObject = getSfEventMessageObject;
 //# sourceMappingURL=cloudwatch-event.js.map

package/env.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRequiredEnvVar = void 0;
 const errors_1 = require("@cumulus/errors");
-exports.getRequiredEnvVar = (name, env = process.env) => {
+const getRequiredEnvVar = (name, env = process.env) => {
     const value = env[name];
     if (typeof value === 'string')
         return value;
     throw new errors_1.MissingRequiredEnvVarError(`The ${name} environment variable must be set`);
 };
+exports.getRequiredEnvVar = getRequiredEnvVar;
 //# sourceMappingURL=env.js.map

package/execution-history.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTaskExitedEventOutput = exports.getStepExitedEvent = void 0;
-exports.getStepExitedEvent = (events, lastStepEvent) => events.find(({ type, previousEventId }) => type === 'TaskStateExited' && previousEventId === lastStepEvent.id);
-exports.getTaskExitedEventOutput = (event) => { var _a; return (_a = event === null || event === void 0 ? void 0 : event.stateExitedEventDetails) === null || _a === void 0 ? void 0 : _a.output; };
+const getStepExitedEvent = (events, lastStepEvent) => events.find(({ type, previousEventId }) => type === 'TaskStateExited' && previousEventId === lastStepEvent.id);
+exports.getStepExitedEvent = getStepExitedEvent;
+const getTaskExitedEventOutput = (event) => { var _a; return (_a = event === null || event === void 0 ? void 0 : event.stateExitedEventDetails) === null || _a === void 0 ? void 0 : _a.output; };
+exports.getTaskExitedEventOutput = getTaskExitedEventOutput;
 //# sourceMappingURL=execution-history.js.map

package/index.js

@@ -14,12 +14,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BucketsConfig = void 0;
+exports.workflows = exports.util = exports.testUtils = exports.log = exports.keyPairProvider = exports.envUtils = exports.cliUtils = exports.BucketsConfig = void 0;
 const BucketsConfig = require("./BucketsConfig");
 exports.BucketsConfig = BucketsConfig;
 exports.cliUtils = __importStar(require("./cli-utils"));

package/key-pair-provider.js

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultProvider = exports.S3KeyPairProvider = void 0;
+exports.DefaultProvider = exports.S3KeyPairProvider = exports.KMS = void 0;
 const noop_1 = __importDefault(require("lodash/noop"));
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const node_forge_1 = __importDefault(require("node-forge"));
@@ -35,7 +35,7 @@ const buildS3Client = () => {
     const options = {
         apiVersion: '2006-03-01',
     };
-    if (test_utils_1.inTestMode()) {
+    if ((0, test_utils_1.inTestMode)()) {
         options.accessKeyId = 'my-access-key-id';
         options.endpoint = `http://${getLocalStackHost()}:4572`;
         options.region = 'us-east-1';
@@ -83,7 +83,7 @@ class S3KeyPairProvider {
      * @returns {Promise.<string>} the encrypted string
      */
     static async encrypt(str, keyId = 'public.pub', bucket, stack) {
-        util_1.deprecate('@cumulus/common/key-pair-provider', '1.17.0', '@cumulus/aws-client/KMS.encrypt');
+        (0, util_1.deprecate)('@cumulus/common/key-pair-provider', '1.17.0', '@cumulus/aws-client/KMS.encrypt');
         // Download the publickey
         const pki = node_forge_1.default.pki;
         const pub = await retrieveKey(keyId, bucket, stack);
@@ -105,7 +105,7 @@ class S3KeyPairProvider {
      * @returns {Promise.<string>} the decrypted string
      */
     static async decrypt(str, keyId = 'private.pem', bucket, stack) {
-        util_1.deprecate('@cumulus/common/key-pair-provider', '1.17.0', '@cumulus/aws-client/KMS.decryptBase64String');
+        (0, util_1.deprecate)('@cumulus/common/key-pair-provider', '1.17.0', '@cumulus/aws-client/KMS.decryptBase64String');
         const pki = node_forge_1.default.pki;
         const priv = await retrieveKey(keyId, bucket, stack);
         if (!priv) {

package/kms.js

@@ -7,10 +7,10 @@ exports.KMS = void 0;
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const errors_1 = require("@cumulus/errors");
 const util_1 = require("./util");
-const KMSDecryptionFailed = errors_1.createErrorType('KMSDecryptionFailed');
+const KMSDecryptionFailed = (0, errors_1.createErrorType)('KMSDecryptionFailed');
 class KMS {
     static async encrypt(text, kmsId) {
-        util_1.deprecate('@cumulus/common/key-pair-provider', '1.17.0', '@cumulus/aws-client/KMS.encrypt');
+        (0, util_1.deprecate)('@cumulus/common/key-pair-provider', '1.17.0', '@cumulus/aws-client/KMS.encrypt');
         const params = {
             KeyId: kmsId,
             Plaintext: text,
@@ -23,7 +23,7 @@ class KMS {
         return CiphertextBlob.toString('base64');
     }
     static async decrypt(text) {
-        util_1.deprecate('@cumulus/common/key-pair-provider', '1.17.0', '@cumulus/aws-client/KMS.decryptBase64String');
+        (0, util_1.deprecate)('@cumulus/common/key-pair-provider', '1.17.0', '@cumulus/aws-client/KMS.decryptBase64String');
         const params = {
             CiphertextBlob: Buffer.from(text, 'base64'),
         };

package/log.js

@@ -101,10 +101,10 @@ function convertLogLevel(level) {
         trace: 10,
     };
     // @ts-ignore
-    if (isString_1.default(level))
+    if ((0, isString_1.default)(level))
         return mapping[level];
     // @ts-ignore
-    if (isNumber_1.default(level))
+    if ((0, isNumber_1.default)(level))
         return Object.keys(mapping).find((key) => mapping[key] === level);
     return undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/common",
-  "version": "9.7.0",
+  "version": "9.9.1",
   "description": "Common utilities used across tasks",
   "keywords": [
     "GIBS",
@@ -41,8 +41,8 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/errors": "9.7.0",
-    "@cumulus/logger": "9.7.0",
+    "@cumulus/errors": "9.9.1",
+    "@cumulus/logger": "9.9.1",
     "ajv": "^6.12.3",
     "aws-sdk": "^2.585.0",
     "follow-redirects": "^1.2.4",
@@ -63,5 +63,5 @@
     "@types/node-forge": "^0.9.5",
     "@types/url-join": "^4.0.0"
   },
-  "gitHead": "08fb2c1d9113e7be465316f950d4ac9272bd3141"
+  "gitHead": "7a6a8ce08bf67e5174c1523b4af2e00e1a3c58cc"
 }

package/sns-event.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -27,7 +27,8 @@ const log = __importStar(require("./log"));
  * @param {Object} event - A Cloudwatch event object
  * @returns {boolean} - True if event is an SNS event
  */
-exports.isSnsEvent = (event) => event.EventSource === 'aws:sns';
+const isSnsEvent = (event) => event.EventSource === 'aws:sns';
+exports.isSnsEvent = isSnsEvent;
 /**
  * Get message from SNS event.
  *
@@ -35,15 +36,16 @@ exports.isSnsEvent = (event) => event.EventSource === 'aws:sns';
  * @param {any} [defaultValue] - Default value to use for message, if none exists.
  * @returns {any} - Message from SNS event
  */
-exports.getSnsEventMessage = (event, defaultValue) => { var _a, _b; return (_b = (_a = event === null || event === void 0 ? void 0 : event.Sns) === null || _a === void 0 ? void 0 : _a.Message) !== null && _b !== void 0 ? _b : defaultValue; };
+const getSnsEventMessage = (event, defaultValue) => { var _a, _b; return (_b = (_a = event === null || event === void 0 ? void 0 : event.Sns) === null || _a === void 0 ? void 0 : _a.Message) !== null && _b !== void 0 ? _b : defaultValue; };
+exports.getSnsEventMessage = getSnsEventMessage;
 /**
  * Get message object from SNS event.
  *
  * @param {Object} event - SNS event
  * @returns {Object} - Message object from SNS event
  */
-exports.getSnsEventMessageObject = (event) => {
-    const message = exports.getSnsEventMessage(event, '{}');
+const getSnsEventMessageObject = (event) => {
+    const message = (0, exports.getSnsEventMessage)(event, '{}');
     try {
         return JSON.parse(message);
     }
@@ -52,4 +54,5 @@ exports.getSnsEventMessageObject = (event) => {
         return undefined;
     }
 };
+exports.getSnsEventMessageObject = getSnsEventMessageObject;
 //# sourceMappingURL=sns-event.js.map

package/stack.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBucketsConfigKey = void 0;
-exports.getBucketsConfigKey = (stackName) => `${stackName}/workflows/buckets.json`;
+const getBucketsConfigKey = (stackName) => `${stackName}/buckets/buckets.json`;
+exports.getBucketsConfigKey = getBucketsConfigKey;
 //# sourceMappingURL=stack.js.map

package/test-utils.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jlog = exports.findTestDataDirectory = exports.findGitRepoRootDirectory = exports.validateOutput = exports.validateConfig = exports.validateInput = exports.randomStringFromRegex = exports.randomNumber = exports.randomId = exports.randomString = exports.throwTestError = exports.inTestMode = void 0;
+exports.jlog = exports.findTestDataDirectory = exports.findGitRepoRootDirectory = exports.validateOutput = exports.validateConfig = exports.validateInput = exports.randomStringFromRegex = exports.randomNumber = exports.randomId = exports.randomString = exports.throwTestError = exports.inTestMode = exports.readJsonFixture = void 0;
 const ajv_1 = __importDefault(require("ajv"));
 const crypto_1 = __importDefault(require("crypto"));
 const path_1 = __importDefault(require("path"));
@@ -12,14 +12,16 @@ const randexp_1 = __importDefault(require("randexp"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 var FileUtils_1 = require("./FileUtils");
 Object.defineProperty(exports, "readJsonFixture", { enumerable: true, get: function () { return FileUtils_1.readJsonFile; } });
-exports.inTestMode = (env = process.env) => env.NODE_ENV === 'test';
+const inTestMode = (env = process.env) => env.NODE_ENV === 'test';
+exports.inTestMode = inTestMode;
 /**
  * Helper function to throw error for unit test exports
  * @throws {Error}
  */
-exports.throwTestError = () => {
+const throwTestError = () => {
     throw new Error('This function is only exportable when NODE_ENV === test for unit test purposes');
 };
+exports.throwTestError = throwTestError;
 /**
  * Generate a [40 character] random string
  *
@@ -27,7 +29,8 @@ exports.throwTestError = () => {
  *                 defaults to 20 to produce a 40 character string
  * @returns {string} - a random string
  */
-exports.randomString = (numBytes = 20) => crypto_1.default.randomBytes(numBytes).toString('hex');
+const randomString = (numBytes = 20) => crypto_1.default.randomBytes(numBytes).toString('hex');
+exports.randomString = randomString;
 /**
  * Postpend a [10-character] random string to input identifier.
  *
@@ -36,7 +39,8 @@ exports.randomString = (numBytes = 20) => crypto_1.default.randomBytes(numBytes)
  *                 extension. Default 5 to produce 10 characters..
  * @returns {string} - a random string
  */
-exports.randomId = (id, numBytes = 5) => `${id}${exports.randomString(numBytes)}`;
+const randomId = (id, numBytes = 5) => `${id}${exports.randomString(numBytes)}`;
+exports.randomId = randomId;
 /**
  * Generate a random for the given scale.
  *
@@ -45,14 +49,16 @@ exports.randomId = (id, numBytes = 5) => `${id}${exports.randomString(numBytes)}
  * @param {number} scale - scale for the random number. Defaults to 10.
  * @returns {number} - a random number
  */
-exports.randomNumber = (scale = 10) => Math.ceil(Math.random() * scale);
+const randomNumber = (scale = 10) => Math.ceil(Math.random() * scale);
+exports.randomNumber = randomNumber;
 /**
  * Create a random granule id from the regular expression
  *
  * @param {string} regex - regular expression string
  * @returns {string} - random granule id
  */
-exports.randomStringFromRegex = (regex) => new randexp_1.default(regex).gen();
+const randomStringFromRegex = (regex) => new randexp_1.default(regex).gen();
+exports.randomStringFromRegex = randomStringFromRegex;
 /**
  * Validate an object using json-schema
  *

package/util.js

@@ -18,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -67,7 +67,8 @@ exports.deprecate = (() => {
  *
  * @alias module:util
  */
-exports.removeNilProperties = (obj) => omitBy_1.default(obj, isNil_1.default);
+const removeNilProperties = (obj) => (0, omitBy_1.default)(obj, isNil_1.default);
+exports.removeNilProperties = removeNilProperties;
 /**
  * Test if a value is included in a list of items
  *
@@ -80,5 +81,5 @@ exports.removeNilProperties = (obj) => omitBy_1.default(obj, isNil_1.default);
  * @alias module:util
  * @kind function
  */
-exports.isOneOf = curry_1.default((collection, val) => collection.includes(val), 2);
+exports.isOneOf = (0, curry_1.default)((collection, val) => collection.includes(val), 2);
 //# sourceMappingURL=util.js.map

package/workflows.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkflowsListKeyPrefix = exports.getWorkflowFileKey = exports.workflowTemplateUri = exports.templateKey = void 0;
-exports.templateKey = (stack) => `${stack}/workflow_template.json`;
-exports.workflowTemplateUri = (bucket, stack) => `s3://${bucket}/${exports.templateKey(stack)}`;
-exports.getWorkflowFileKey = (stackName, workflowName) => `${stackName}/workflows/${workflowName}.json`;
-exports.getWorkflowsListKeyPrefix = (stackName) => `${stackName}/workflows/`;
+const templateKey = (stack) => `${stack}/workflow_template.json`;
+exports.templateKey = templateKey;
+const workflowTemplateUri = (bucket, stack) => `s3://${bucket}/${(0, exports.templateKey)(stack)}`;
+exports.workflowTemplateUri = workflowTemplateUri;
+const getWorkflowFileKey = (stackName, workflowName) => `${stackName}/workflows/${workflowName}.json`;
+exports.getWorkflowFileKey = getWorkflowFileKey;
+const getWorkflowsListKeyPrefix = (stackName) => `${stackName}/workflows/`;
+exports.getWorkflowsListKeyPrefix = getWorkflowsListKeyPrefix;
 //# sourceMappingURL=workflows.js.map