@cumulus/ingest 10.1.2 → 11.0.0

package/granule.d.ts

@@ -1,4 +1,4 @@
-import { DuplicateHandling } from '@cumulus/types';
+import { ApiFile, DuplicateHandling } from '@cumulus/types';
 import { FilePgModel, Knex } from '@cumulus/db';
 export interface EventWithDuplicateHandling {
     config: {
@@ -19,6 +19,7 @@ export interface File {
     fileName?: string;
     name?: string;
     filename?: string;
+    size?: string;
 }
 export interface MovedGranuleFile {
     bucket: string;
@@ -136,6 +137,14 @@ export declare function handleDuplicateFile(params: {
     };
     moveGranuleFileWithVersioningFunction?: Function;
 }): Promise<VersionedObject[]>;
+/**
+ * Get the name of the file from the following properties (in order of preference):
+ * 1. fileName (e.g. 'granuleFileNamec.md')
+ * 2. name (e.g. 'granuleFileName.md')
+ * 3. key (e.g. 'stackname/filepath/granuleFileName.md')
+ * @param {File} file - file object with the above properties
+ * @returns {string | undefined} - The file name as a string or undefined
+ */
 export declare const getNameOfFile: (file: File) => string | undefined;
 /**
  * For each source file, see if there is a destination and generate the source
@@ -155,35 +164,15 @@ export declare function generateMoveFileParams(sourceFiles: File[], destinations
     regex: string | RegExp;
 }[]): MoveFileParams[];
 /**
- * Moves granule files from one S3 location to another.
- *
- * @param {Array<Object>} sourceFiles - array of file objects, they are updated with destination
- * location after the files are moved
- * @param {string} sourceFiles.name - file name
- * @param {string} sourceFiles.bucket - current bucket of file
- * @param {string} sourceFiles.key - current S3 key of file
- * @param {Array<Object>} destinations - array of objects defining the destination of granule files
- * @param {string} destinations.regex - regex for matching filepath of file to new destination
- * @param {string} destinations.bucket - aws bucket of the destination
- * @param {string} destinations.filepath - file path/directory on the bucket for the destination
- * @returns {Promise<Array>} returns array of source files updated with new locations.
- */
-export declare function moveGranuleFiles(sourceFiles: File[], destinations: {
-    regex: string;
-    bucket: string;
-    filepath: string;
-}[]): Promise<MovedGranuleFile[]>;
-/**
-* Moves a granule file and updates the postgres database accordingly
+* Moves a granule file and updates the datastore accordingly
 * @summary Moves a granule file record according to MoveFileParams and updates database accordingly
 * @param {MoveFileParams} moveFileParam - Parameter object describing the move operation
 * @param {FilePgModel} filesPgModel - FilePgModel instance
 * @param {Knex.Transaction | Knex} trx - Knex transaction or (optionally) Knex object
 * @param {number | undefined } postgresCumulusGranuleId - postgres internal granule id
-* @param {boolean} writeToPostgres - explicit flag to enable/disable postgres database updates
-* @returns {ReturnValueDataTypeHere} Brief description of the returning value here.
+* @returns {Promise<Object>} - Returns object of type Omit<ApiFile, 'granuleId>>
 */
-export declare function moveGranuleFile(moveFileParam: MoveFileParams, filesPgModel: FilePgModel, trx: Knex.Transaction | Knex, postgresCumulusGranuleId: number | undefined, writeToPostgres?: boolean): Promise<MovedGranuleFile>;
+export declare function moveGranuleFile(moveFileParam: MoveFileParams, filesPgModel: FilePgModel, trx: Knex.Transaction | Knex, postgresCumulusGranuleId: number | undefined): Promise<Omit<ApiFile, 'granuleId'>>;
 /**
  * Returns the input filename stripping off any versioned timestamp.
  *

package/granule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"granule.d.ts","sourceRoot":"","sources":["src/granule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"granule.d.ts","sourceRoot":"","sources":["src/granule.ts"],"names":[],"mappings":"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"}

package/granule.js

@@ -26,13 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.duplicateHandlingType = exports.unversionFilename = exports.moveGranuleFile = exports.moveGranuleFiles = exports.generateMoveFileParams = exports.getNameOfFile = exports.handleDuplicateFile = exports.moveGranuleFileWithVersioning = exports.listVersionedObjects = exports.renameS3FileWithTimestamp = void 0;
+exports.duplicateHandlingType = exports.unversionFilename = exports.moveGranuleFile = exports.generateMoveFileParams = exports.getNameOfFile = exports.handleDuplicateFile = exports.moveGranuleFileWithVersioning = exports.listVersionedObjects = exports.renameS3FileWithTimestamp = void 0;
 const errors = __importStar(require("@cumulus/errors"));
 const moment_1 = __importDefault(require("moment"));
 const services_1 = require("@cumulus/aws-client/services");
 const S3 = __importStar(require("@cumulus/aws-client/S3"));
 const log = __importStar(require("@cumulus/common/log"));
-const util_1 = require("@cumulus/common/util");
+const db_1 = require("@cumulus/db");
+const errors_1 = require("@cumulus/errors");
 /**
   * rename s3 file with timestamp
   *
@@ -215,7 +216,22 @@ async function handleDuplicateFile(params) {
     return [];
 }
 exports.handleDuplicateFile = handleDuplicateFile;
-const getNameOfFile = (file) => { var _a; return (_a = file.fileName) !== null && _a !== void 0 ? _a : file.name; };
+/**
+ * Get the name of the file from the following properties (in order of preference):
+ * 1. fileName (e.g. 'granuleFileNamec.md')
+ * 2. name (e.g. 'granuleFileName.md')
+ * 3. key (e.g. 'stackname/filepath/granuleFileName.md')
+ * @param {File} file - file object with the above properties
+ * @returns {string | undefined} - The file name as a string or undefined
+ */
+const getNameOfFile = (file) => {
+    var _a, _b;
+    const fileName = (_a = file.fileName) !== null && _a !== void 0 ? _a : file.name;
+    if (!fileName) {
+        return (_b = file.key) === null || _b === void 0 ? void 0 : _b.split('/').pop();
+    }
+    return fileName;
+};
 exports.getNameOfFile = getNameOfFile;
 /**
  * For each source file, see if there is a destination and generate the source
@@ -266,129 +282,59 @@ function generateMoveFileParams(sourceFiles, destinations) {
 }
 exports.generateMoveFileParams = generateMoveFileParams;
 /**
- * Moves granule files from one S3 location to another.
- *
- * @param {Array<Object>} sourceFiles - array of file objects, they are updated with destination
- * location after the files are moved
- * @param {string} sourceFiles.name - file name
- * @param {string} sourceFiles.bucket - current bucket of file
- * @param {string} sourceFiles.key - current S3 key of file
- * @param {Array<Object>} destinations - array of objects defining the destination of granule files
- * @param {string} destinations.regex - regex for matching filepath of file to new destination
- * @param {string} destinations.bucket - aws bucket of the destination
- * @param {string} destinations.filepath - file path/directory on the bucket for the destination
- * @returns {Promise<Array>} returns array of source files updated with new locations.
- */
-async function moveGranuleFiles(sourceFiles, destinations) {
-    (0, util_1.deprecate)('@cumulus/ingest/moveGranuleFiles', '9.0.0');
-    const moveFileParams = generateMoveFileParams(sourceFiles, destinations);
-    const movedGranuleFiles = [];
-    const moveFileRequests = moveFileParams.map(async (moveFileParam) => {
-        const { source, target, file } = moveFileParam;
-        if (source && target) {
-            log.debug('moveGranuleFiles', source, target);
-            await S3.moveObject({
-                sourceBucket: source.Bucket,
-                sourceKey: source.Key,
-                destinationBucket: target.Bucket,
-                destinationKey: target.Key,
-                copyTags: true,
-            });
-            movedGranuleFiles.push({
-                bucket: target.Bucket,
-                key: target.Key,
-                name: (0, exports.getNameOfFile)(file),
-            });
-        }
-        else {
-            let fileBucket;
-            let fileKey;
-            if (file.bucket && file.key) {
-                fileBucket = file.bucket;
-                fileKey = file.key;
-            }
-            else if (file.filename) {
-                const parsed = S3.parseS3Uri(file.filename);
-                fileBucket = parsed.Bucket;
-                fileKey = parsed.Key;
-            }
-            else {
-                throw new Error(`Unable to determine location of file: ${JSON.stringify(file)}`);
-            }
-            movedGranuleFiles.push({
-                bucket: fileBucket,
-                key: fileKey,
-                name: (0, exports.getNameOfFile)(file),
-            });
-        }
-    });
-    await Promise.all(moveFileRequests);
-    return movedGranuleFiles;
-}
-exports.moveGranuleFiles = moveGranuleFiles;
-/**
-* Moves a granule file and updates the postgres database accordingly
+* Moves a granule file and updates the datastore accordingly
 * @summary Moves a granule file record according to MoveFileParams and updates database accordingly
 * @param {MoveFileParams} moveFileParam - Parameter object describing the move operation
 * @param {FilePgModel} filesPgModel - FilePgModel instance
 * @param {Knex.Transaction | Knex} trx - Knex transaction or (optionally) Knex object
 * @param {number | undefined } postgresCumulusGranuleId - postgres internal granule id
-* @param {boolean} writeToPostgres - explicit flag to enable/disable postgres database updates
-* @returns {ReturnValueDataTypeHere} Brief description of the returning value here.
+* @returns {Promise<Object>} - Returns object of type Omit<ApiFile, 'granuleId>>
 */
-async function moveGranuleFile(moveFileParam, filesPgModel, trx, postgresCumulusGranuleId, writeToPostgres = true) {
+async function moveGranuleFile(moveFileParam, filesPgModel, trx, postgresCumulusGranuleId) {
     const { source, target, file } = moveFileParam;
-    if (moveFileParam.source && moveFileParam.target) {
+    if (source && target) {
         log.debug('moveGranuleS3Object', source, target);
-        if (writeToPostgres) {
-            if (!postgresCumulusGranuleId) {
-                throw new Error('postgresCumulusGranuleId must be defined to move granule file if writeToPostgres is true');
-            }
-            const cumulusId = await filesPgModel.getRecordCumulusId(trx, {
-                granule_cumulus_id: postgresCumulusGranuleId,
-                bucket: moveFileParam.source.Bucket,
-                key: moveFileParam.source.Key,
-            });
-            await filesPgModel.update(trx, {
-                cumulus_id: cumulusId,
-            }, {
-                bucket: moveFileParam.target.Bucket,
-                key: moveFileParam.target.Key,
-                file_name: (0, exports.getNameOfFile)(file),
-            });
+        if (!postgresCumulusGranuleId) {
+            throw new Error('postgresCumulusGranuleId must be defined to move granule file if writeToPostgres is true');
+        }
+        const updatedPgRecords = await filesPgModel.update(trx, {
+            granule_cumulus_id: postgresCumulusGranuleId,
+            bucket: source.Bucket,
+            key: source.Key,
+        }, {
+            bucket: target.Bucket,
+            key: target.Key,
+            file_name: (0, exports.getNameOfFile)(file),
+        }, ['*']);
+        if (updatedPgRecords.length !== 1) {
+            throw new errors_1.RecordDoesNotExist('Attempted to update granule on move, but granule does not exist');
         }
+        const updatedPgRecord = updatedPgRecords[0];
         await S3.moveObject({
-            sourceBucket: moveFileParam.source.Bucket,
-            sourceKey: moveFileParam.source.Key,
-            destinationBucket: moveFileParam.target.Bucket,
-            destinationKey: moveFileParam.target.Key,
+            sourceBucket: source.Bucket,
+            sourceKey: source.Key,
+            destinationBucket: target.Bucket,
+            destinationKey: target.Key,
             copyTags: true,
         });
         return {
-            bucket: moveFileParam.target.Bucket,
-            key: moveFileParam.target.Key,
-            name: (0, exports.getNameOfFile)(file),
+            ...(0, db_1.translatePostgresFileToApiFile)(updatedPgRecord),
+            bucket: target.Bucket,
+            key: target.Key,
+            fileName: (0, exports.getNameOfFile)({ key: target.Key }),
         };
     }
-    let fileBucket;
-    let fileKey;
-    if (file.bucket && file.key) {
-        fileBucket = file.bucket;
-        fileKey = file.key;
-    }
-    else if (file.filename) {
+    if (!(file.bucket || file.key) && file.filename) {
         const parsed = S3.parseS3Uri(file.filename);
-        fileBucket = parsed.Bucket;
-        fileKey = parsed.Key;
-    }
-    else {
-        throw new Error(`Unable to determine location of file: ${JSON.stringify(file)}`);
+        file.bucket = parsed.Bucket;
+        file.key = parsed.Key;
     }
-    return {
-        bucket: fileBucket,
-        key: fileKey,
-        name: (0, exports.getNameOfFile)(file),
-    };
+    const postgresFileRecord = await filesPgModel.get(trx, {
+        granule_cumulus_id: postgresCumulusGranuleId,
+        bucket: file.bucket,
+        key: file.key,
+    });
+    return (0, db_1.translatePostgresFileToApiFile)(postgresFileRecord);
 }
 exports.moveGranuleFile = moveGranuleFile;
 /**

package/granule.js.map

@@ -1 +1 @@
-{"version":3,"file":"granule.js","sourceRoot":"","sources":["src/granule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"granule.js","sourceRoot":"","sources":["src/granule.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ingest",
-  "version": "10.1.2",
+  "version": "11.0.0",
   "description": "Ingest utilities",
   "engines": {
     "node": ">=12.18.0"
@@ -38,13 +38,13 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "10.1.2",
-    "@cumulus/common": "10.1.2",
-    "@cumulus/db": "10.1.2",
-    "@cumulus/errors": "10.1.2",
-    "@cumulus/logger": "10.1.2",
-    "@cumulus/message": "10.1.2",
-    "@cumulus/sftp-client": "10.1.2",
+    "@cumulus/aws-client": "11.0.0",
+    "@cumulus/common": "11.0.0",
+    "@cumulus/db": "11.0.0",
+    "@cumulus/errors": "11.0.0",
+    "@cumulus/logger": "11.0.0",
+    "@cumulus/message": "11.0.0",
+    "@cumulus/sftp-client": "11.0.0",
     "aws-sdk": "^2.585.0",
     "cksum": "^1.3.0",
     "delay": "^4.3.0",
@@ -61,10 +61,10 @@
     "tough-cookie": "^4.0.0"
   },
   "devDependencies": {
-    "@cumulus/checksum": "10.1.2",
-    "@cumulus/cmrjs": "10.1.2",
-    "@cumulus/test-data": "10.1.2",
-    "@cumulus/types": "10.1.2"
+    "@cumulus/checksum": "11.0.0",
+    "@cumulus/cmrjs": "11.0.0",
+    "@cumulus/test-data": "11.0.0",
+    "@cumulus/types": "11.0.0"
   },
-  "gitHead": "3b59753fa85064549b70ad8ed4a4ee213c5af313"
+  "gitHead": "e922ad12fd94affa6cd60a97a184a465a756c50b"
 }

package/src/granule.ts

@@ -3,9 +3,9 @@ import moment from 'moment';
 import { s3 } from '@cumulus/aws-client/services';
 import * as S3 from '@cumulus/aws-client/S3';
 import * as log from '@cumulus/common/log';
-import { deprecate } from '@cumulus/common/util';
-import { DuplicateHandling } from '@cumulus/types';
-import { FilePgModel, Knex } from '@cumulus/db';
+import { ApiFile, DuplicateHandling } from '@cumulus/types';
+import { FilePgModel, translatePostgresFileToApiFile, Knex } from '@cumulus/db';
+import { RecordDoesNotExist } from '@cumulus/errors';
 
 export interface EventWithDuplicateHandling {
   config: {
@@ -26,7 +26,8 @@ export interface File {
   key?: string,
   fileName?: string,
   name?: string,
-  filename?: string
+  filename?: string,
+  size?: string
 }
 
 export interface MovedGranuleFile {
@@ -283,8 +284,23 @@ export async function handleDuplicateFile(params: {
   return [];
 }
 
-export const getNameOfFile = (file: File): string | undefined =>
-  file.fileName ?? file.name;
+/**
+ * Get the name of the file from the following properties (in order of preference):
+ * 1. fileName (e.g. 'granuleFileNamec.md')
+ * 2. name (e.g. 'granuleFileName.md')
+ * 3. key (e.g. 'stackname/filepath/granuleFileName.md')
+ * @param {File} file - file object with the above properties
+ * @returns {string | undefined} - The file name as a string or undefined
+ */
+export const getNameOfFile = (file: File): string | undefined => {
+  const fileName = file.fileName ?? file.name;
+
+  if (!fileName) {
+    return file.key?.split('/').pop();
+  }
+
+  return fileName;
+};
 
 /**
  * For each source file, see if there is a destination and generate the source
@@ -346,149 +362,74 @@ export function generateMoveFileParams(
 }
 
 /**
- * Moves granule files from one S3 location to another.
- *
- * @param {Array<Object>} sourceFiles - array of file objects, they are updated with destination
- * location after the files are moved
- * @param {string} sourceFiles.name - file name
- * @param {string} sourceFiles.bucket - current bucket of file
- * @param {string} sourceFiles.key - current S3 key of file
- * @param {Array<Object>} destinations - array of objects defining the destination of granule files
- * @param {string} destinations.regex - regex for matching filepath of file to new destination
- * @param {string} destinations.bucket - aws bucket of the destination
- * @param {string} destinations.filepath - file path/directory on the bucket for the destination
- * @returns {Promise<Array>} returns array of source files updated with new locations.
- */
-export async function moveGranuleFiles(
-  sourceFiles: File[],
-  destinations: {
-    regex: string,
-    bucket: string,
-    filepath: string
-  }[]
-): Promise<MovedGranuleFile[]> {
-  deprecate(
-    '@cumulus/ingest/moveGranuleFiles',
-    '9.0.0'
-  );
-  const moveFileParams = generateMoveFileParams(sourceFiles, destinations);
-  const movedGranuleFiles: MovedGranuleFile[] = [];
-  const moveFileRequests = moveFileParams.map(
-    async (moveFileParam) => {
-      const { source, target, file } = moveFileParam;
-
-      if (source && target) {
-        log.debug('moveGranuleFiles', source, target);
-
-        await S3.moveObject({
-          sourceBucket: source.Bucket,
-          sourceKey: source.Key,
-          destinationBucket: target.Bucket,
-          destinationKey: target.Key,
-          copyTags: true,
-        });
-
-        movedGranuleFiles.push({
-          bucket: target.Bucket,
-          key: target.Key,
-          name: getNameOfFile(file),
-        });
-      } else {
-        let fileBucket;
-        let fileKey;
-        if (file.bucket && file.key) {
-          fileBucket = file.bucket;
-          fileKey = file.key;
-        } else if (file.filename) {
-          const parsed = S3.parseS3Uri(file.filename);
-          fileBucket = parsed.Bucket;
-          fileKey = parsed.Key;
-        } else {
-          throw new Error(`Unable to determine location of file: ${JSON.stringify(file)}`);
-        }
-
-        movedGranuleFiles.push({
-          bucket: fileBucket,
-          key: fileKey,
-          name: getNameOfFile(file),
-        });
-      }
-    }
-  );
-  await Promise.all(moveFileRequests);
-  return movedGranuleFiles;
-}
-/**
-* Moves a granule file and updates the postgres database accordingly
+* Moves a granule file and updates the datastore accordingly
 * @summary Moves a granule file record according to MoveFileParams and updates database accordingly
 * @param {MoveFileParams} moveFileParam - Parameter object describing the move operation
 * @param {FilePgModel} filesPgModel - FilePgModel instance
 * @param {Knex.Transaction | Knex} trx - Knex transaction or (optionally) Knex object
 * @param {number | undefined } postgresCumulusGranuleId - postgres internal granule id
-* @param {boolean} writeToPostgres - explicit flag to enable/disable postgres database updates
-* @returns {ReturnValueDataTypeHere} Brief description of the returning value here.
+* @returns {Promise<Object>} - Returns object of type Omit<ApiFile, 'granuleId>>
 */
 export async function moveGranuleFile(
   moveFileParam: MoveFileParams,
   filesPgModel: FilePgModel,
   trx: Knex.Transaction | Knex,
-  postgresCumulusGranuleId: number | undefined,
-  writeToPostgres: boolean = true
-): Promise<MovedGranuleFile> {
+  postgresCumulusGranuleId: number | undefined
+): Promise<Omit<ApiFile, 'granuleId'>> {
   const { source, target, file } = moveFileParam;
-  if (moveFileParam.source && moveFileParam.target) {
+
+  if (source && target) {
     log.debug('moveGranuleS3Object', source, target);
-    if (writeToPostgres) {
-      if (!postgresCumulusGranuleId) {
-        throw new Error('postgresCumulusGranuleId must be defined to move granule file if writeToPostgres is true');
-      }
-      const cumulusId = await filesPgModel.getRecordCumulusId(trx, {
+    if (!postgresCumulusGranuleId) {
+      throw new Error('postgresCumulusGranuleId must be defined to move granule file if writeToPostgres is true');
+    }
+    const updatedPgRecords = await filesPgModel.update(
+      trx,
+      {
         granule_cumulus_id: postgresCumulusGranuleId,
-        bucket: moveFileParam.source.Bucket,
-        key: moveFileParam.source.Key,
-      });
-      await filesPgModel.update(trx, {
-        cumulus_id: cumulusId,
+        bucket: source.Bucket,
+        key: source.Key,
       },
       {
-        bucket: moveFileParam.target.Bucket,
-        key: moveFileParam.target.Key,
+        bucket: target.Bucket,
+        key: target.Key,
         file_name: getNameOfFile(file),
-      });
+      }, ['*']
+    );
+    if (updatedPgRecords.length !== 1) {
+      throw new RecordDoesNotExist('Attempted to update granule on move, but granule does not exist');
     }
+    const updatedPgRecord = updatedPgRecords[0];
+
     await S3.moveObject({
-      sourceBucket: moveFileParam.source.Bucket,
-      sourceKey: moveFileParam.source.Key,
-      destinationBucket: moveFileParam.target.Bucket,
-      destinationKey: moveFileParam.target.Key,
+      sourceBucket: source.Bucket,
+      sourceKey: source.Key,
+      destinationBucket: target.Bucket,
+      destinationKey: target.Key,
       copyTags: true,
     });
 
     return {
-      bucket: moveFileParam.target.Bucket,
-      key: moveFileParam.target.Key,
-      name: getNameOfFile(file),
+      ...translatePostgresFileToApiFile(updatedPgRecord),
+      bucket: target.Bucket,
+      key: target.Key,
+      fileName: getNameOfFile({ key: target.Key }),
     };
   }
-  let fileBucket;
-  let fileKey;
-  if (file.bucket && file.key) {
-    fileBucket = file.bucket;
-    fileKey = file.key;
-  } else if (file.filename) {
+
+  if (!(file.bucket || file.key) && file.filename) {
     const parsed = S3.parseS3Uri(file.filename);
-    fileBucket = parsed.Bucket;
-    fileKey = parsed.Key;
-  } else {
-    throw new Error(
-      `Unable to determine location of file: ${JSON.stringify(file)}`
-    );
+    file.bucket = parsed.Bucket;
+    file.key = parsed.Key;
   }
-  return {
-    bucket: fileBucket,
-    key: fileKey,
-    name: getNameOfFile(file),
-  };
+
+  const postgresFileRecord = await filesPgModel.get(trx, {
+    granule_cumulus_id: postgresCumulusGranuleId,
+    bucket: file.bucket,
+    key: file.key,
+  });
+
+  return translatePostgresFileToApiFile(postgresFileRecord);
 }
 
 /**