@cumulus/ingest 13.0.1 → 13.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ingest",
-  "version": "13.0.1",
+  "version": "13.1.0",
   "description": "Ingest utilities",
   "engines": {
     "node": ">=14.19.1"
@@ -38,19 +38,19 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "13.0.1",
-    "@cumulus/common": "13.0.1",
-    "@cumulus/db": "13.0.1",
-    "@cumulus/errors": "13.0.1",
-    "@cumulus/logger": "13.0.1",
-    "@cumulus/message": "13.0.1",
-    "@cumulus/sftp-client": "13.0.1",
+    "@cumulus/aws-client": "13.1.0",
+    "@cumulus/common": "13.1.0",
+    "@cumulus/db": "13.1.0",
+    "@cumulus/errors": "13.1.0",
+    "@cumulus/logger": "13.1.0",
+    "@cumulus/message": "13.1.0",
+    "@cumulus/sftp-client": "13.1.0",
     "aws-sdk": "^2.585.0",
     "cksum": "^1.3.0",
     "delay": "^4.3.0",
     "encodeurl": "^1.0.2",
     "fs-extra": "^5.0.0",
-    "got": "^11.7.0",
+    "got": "^11.8.5",
     "is-ip": "^2.0.0",
     "is-valid-hostname": "^0.1.1",
     "jsftp": "https://github.com/jkovarik/jsftp.git#add_288",
@@ -61,10 +61,10 @@
     "tough-cookie": "^4.0.0"
   },
   "devDependencies": {
-    "@cumulus/checksum": "13.0.1",
-    "@cumulus/cmrjs": "13.0.1",
-    "@cumulus/test-data": "13.0.1",
-    "@cumulus/types": "13.0.1"
+    "@cumulus/checksum": "13.1.0",
+    "@cumulus/cmrjs": "13.1.0",
+    "@cumulus/test-data": "13.1.0",
+    "@cumulus/types": "13.1.0"
   },
-  "gitHead": "bede9d73c703b9ba1e6d16d69ecd235461ba1a15"
+  "gitHead": "1966c485551680a65e665ecb30c05a8fadad0d08"
 }

package/src/url-path-template.js

@@ -1,5 +1,6 @@
 const get = require('lodash/get');
 const moment = require('moment');
+const path = require('path');
 
 /**
 * evaluate the operation specified in template
@@ -29,6 +30,9 @@ function evaluateOperation(name, args) {
   case 'substring': {
     return String.prototype.substring.apply(String(valueStr), args.slice(1));
   }
+  case 'extractPath': {
+    return path.dirname(valueStr);
+  }
   default:
     throw new Error(`Could not support operation ${name}`);
   }
@@ -46,17 +50,21 @@ function templateReplacer(context, submatch) {
   const expressionRegex = /([^(]+)\(([^)]+)\)/;
   const matches = submatch.match(expressionRegex);
 
-  // submatch contains operation
+  // submatch contains operation and args
   if (submatch.match(expressionRegex)) {
     const name = matches[1];
     const args = matches[2].split(/\s*,\s*/);
-    const jsonPathValue = get(context, args[0], null);
+    // args[0] is either an object path or a constant
+    //   e.g. extractPath(file.path) or extractPath('/a/b/c')
+    // assume args[0] is an object path if it starts with a key of context
+    const isObjectPath = Object.keys(context).includes(args[0].split('.')[0]);
+    const jsonPathValue = get(context, args[0], isObjectPath ? undefined : args[0]);
     if (!jsonPathValue) throw new Error(`Could not resolve path ${args[0]}`);
     args[0] = jsonPathValue;
     return evaluateOperation(name, args);
   }
 
-  const jsonPathValue = get(context, submatch, null);
+  const jsonPathValue = get(context, submatch);
   if (!jsonPathValue) throw new Error(`Could not resolve path ${submatch}`);
   return jsonPathValue;
 }
@@ -70,11 +78,17 @@ function templateReplacer(context, submatch) {
 * @returns {string} - the url path for the file
 **/
 function urlPathTemplate(pathTemplate, context) {
-  const templateRegex = /{([^}]+)}/g;
+  const templateRegex = /{([^{}]+)}/g;
+
   try {
     // match: The matched substring, submatch: The parenthesized submatch string
-    return pathTemplate.replace(templateRegex, (match, submatch) =>
+    const replacedPath = pathTemplate.replace(templateRegex, (match, submatch) =>
       templateReplacer(context, submatch));
+
+    if (replacedPath.match(templateRegex)) {
+      return urlPathTemplate(replacedPath, context);
+    }
+    return replacedPath;
   } catch (error) {
     throw new Error(
       `Could not resolve path template "${pathTemplate}" with error "${error.toString()}"`