@cumulus/move-granules 11.1.2 → 11.1.3

package/dist/schemas/config.json

@@ -59,6 +59,15 @@
               "url_path": { "type": "string" }
             }
           }
+        },
+        "meta": {
+          "title": "Optional Metadata for the Collection",
+          "type": "object",
+          "additionalProperties": true,
+          "granuleMetadataFileExtension": {
+            "description": "Set to the file extension for task to look for the granule metadata information. If none is specified, the granule CMR metadata or ISO metadata file is used",
+            "type": "string"
+          }
         }
       }
     },

package/index.js

@@ -27,6 +27,7 @@ const {
 const BucketsConfig = require('@cumulus/common/BucketsConfig');
 
 const { urlPathTemplate } = require('@cumulus/ingest/url-path-template');
+const { isFileExtensionMatched } = require('@cumulus/message/utils');
 const log = require('@cumulus/common/log');
 
 const MB = 1024 * 1024;
@@ -261,12 +262,21 @@ async function moveGranules(event) {
     ? config.s3MultipartChunksizeMb : process.env.default_s3_multipart_chunksize_mb;
 
   const duplicateHandling = duplicateHandlingType(event);
+  const granuleMetadataFileExtension = get(config, 'collection.meta.granuleMetadataFileExtension');
 
-  log.debug(`moveGranules config duplicateHandling: ${duplicateHandling}, moveStagedFiles: ${moveStagedFiles}, s3MultipartChunksizeMb: ${s3MultipartChunksizeMb}`);
+  log.debug(`moveGranules config duplicateHandling: ${duplicateHandling}, `
+    + `moveStagedFiles: ${moveStagedFiles}, `
+    + `s3MultipartChunksizeMb: ${s3MultipartChunksizeMb}, `
+    + `granuleMetadataFileExtension ${granuleMetadataFileExtension}`);
 
-  const granulesInput = event.input.granules;
+  let filterFunc;
+  if (granuleMetadataFileExtension) {
+    filterFunc = (fileobject) => isFileExtensionMatched(fileobject, granuleMetadataFileExtension);
+  } else {
+    filterFunc = (fileobject) => isCMRFile(fileobject) || isISOFile(fileobject);
+  }
 
-  const filterFunc = (fileobject) => isCMRFile(fileobject) || isISOFile(fileobject);
+  const granulesInput = event.input.granules;
   const cmrFiles = granulesToCmrFileObjects(granulesInput, filterFunc);
   const granulesByGranuleId = keyBy(granulesInput, 'granuleId');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/move-granules",
-  "version": "11.1.2",
+  "version": "11.1.3",
   "description": "Move granule files from staging to final location",
   "main": "index.js",
   "directories": {
@@ -38,17 +38,18 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "11.1.2",
-    "@cumulus/cmrjs": "11.1.2",
-    "@cumulus/common": "11.1.2",
+    "@cumulus/aws-client": "11.1.3",
+    "@cumulus/cmrjs": "11.1.3",
+    "@cumulus/common": "11.1.3",
     "@cumulus/cumulus-message-adapter-js": "2.0.4",
-    "@cumulus/distribution-utils": "11.1.2",
-    "@cumulus/errors": "11.1.2",
-    "@cumulus/ingest": "11.1.2",
+    "@cumulus/distribution-utils": "11.1.3",
+    "@cumulus/errors": "11.1.3",
+    "@cumulus/ingest": "11.1.3",
+    "@cumulus/message": "11.1.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@cumulus/schemas": "11.1.2"
+    "@cumulus/schemas": "11.1.3"
   },
-  "gitHead": "98ba3b1f617e8e531a3bfaa490f2a125da78df9f"
+  "gitHead": "f7c66a63c812c2762da6a366e252e05e3fb8b35d"
 }

package/schemas/config.json

@@ -59,6 +59,15 @@
               "url_path": { "type": "string" }
             }
           }
+        },
+        "meta": {
+          "title": "Optional Metadata for the Collection",
+          "type": "object",
+          "additionalProperties": true,
+          "granuleMetadataFileExtension": {
+            "description": "Set to the file extension for task to look for the granule metadata information. If none is specified, the granule CMR metadata or ISO metadata file is used",
+            "type": "string"
+          }
         }
       }
     },