@cumulus/ingest 10.1.2 → 11.1.1

package/lock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lock.d.ts","sourceRoot":"","sources":["src/lock.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,IAAI;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,IAAI,CAAA;CACnB;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,IAAI,EAAO,GACjB,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAcD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE;IACR,EAAE,EAAE,MAAM,CAAC;IACX,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC/B,EACD,QAAQ,EAAE,MAAM,EAChB,OAAO,SAAI,GACV,OAAO,CAAC,OAAO,CAAC,CAwBlB"}
+{"version":3,"file":"lock.d.ts","sourceRoot":"","sources":["src/lock.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,IAAI;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,IAAI,CAAA;CACpB;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,IAAI,EAAO,GACjB,OAAO,CAAC,MAAM,CAAC,CAoBjB;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAcD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE;IACR,EAAE,EAAE,MAAM,CAAC;IACX,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC/B,EACD,QAAQ,EAAE,MAAM,EAChB,OAAO,SAAI,GACV,OAAO,CAAC,OAAO,CAAC,CAwBlB"}

package/lock.js

@@ -41,8 +41,18 @@ const lockPrefix = 'lock';
 **/
 async function checkOldLocks(bucket, locks = []) {
     const fiveMinutesAgo = Date.now() - (5 * 60 * 1000);
-    const expiredLocks = locks.filter((lock) => lock.LastModified.getTime() < fiveMinutesAgo);
-    await Promise.all(expiredLocks.map(({ Key }) => (0, S3_1.deleteS3Object)(bucket, Key)));
+    const expiredLocks = locks.filter((lock) => {
+        if (!lock.LastModified) {
+            throw new TypeError(`Could not find LastModified on ${JSON.stringify(lock)}`);
+        }
+        return lock.LastModified.getTime() < fiveMinutesAgo;
+    });
+    await Promise.all(expiredLocks.map((lock) => {
+        if (!lock.Key) {
+            throw new TypeError(`Could not find Key on ${JSON.stringify(lock)}`);
+        }
+        return (0, S3_1.deleteS3Object)(bucket, lock.Key);
+    }));
     return locks.length - expiredLocks.length;
 }
 exports.checkOldLocks = checkOldLocks;

package/lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"lock.js","sourceRoot":"","sources":["src/lock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,+CAIgC;AAChC,yDAA2C;AAE3C,MAAM,UAAU,GAAG,MAAM,CAAC;AAO1B;;;;;;;GAOG;AACI,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,QAAgB,EAAE;IAElB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAEpD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAC/B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,cAAc,CACvD,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,IAAA,mBAAc,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAE9E,OAAO,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;AAC5C,CAAC;AAbD,sCAaC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,SAAS,CAC7B,MAAc,EACd,YAAoB;IAEpB,MAAM,KAAK,GAAG,MAAM,IAAA,oBAAe,EAAC;QAClC,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,GAAG,UAAU,IAAI,YAAY,EAAE;KACxC,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACtC,CAAC;AAVD,8BAUC;AAED,KAAK,UAAU,OAAO,CACpB,MAAc,EACd,YAAoB,EACpB,QAAgB;IAEhB,MAAM,IAAA,gBAAW,EAAC;QAChB,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,GAAG,UAAU,IAAI,YAAY,IAAI,QAAQ,EAAE;QAChD,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,YAAoB,EACpB,QAAgB;IAEhB,MAAM,IAAA,mBAAc,EAClB,MAAM,EACN,GAAG,UAAU,IAAI,YAAY,IAAI,QAAQ,EAAE,CAC5C,CAAC;AACJ,CAAC;AATD,gCASC;AAEM,KAAK,UAAU,OAAO,CAC3B,MAAc,EACd,QAGC,EACD,QAAgB,EAChB,OAAO,GAAG,CAAC;IAEX,IAAI,QAAQ,CAAC,qBAAqB,KAAK,SAAS,EAAE;QAChD,OAAO,IAAI,CAAC;KACb;IAED,+CAA+C;IAC/C,IAAI,OAAO,GAAG,GAAG,EAAE;QACjB,OAAO,KAAK,CAAC;KACd;IAED,MAAM,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,CAAC;IAE7D,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEnD,IAAI,KAAK,IAAI,qBAAqB,EAAE;QAClC,GAAG,CAAC,KAAK,CAAC,QAAQ,QAAQ,CAAC,EAAE,0CAA0C,QAAQ,CAAC,qBAAqB,qBAAqB,CAAC,CAAC;QAC5H,kCAAkC;QAClC,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,OAAO,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;KACzD;IAED,eAAe;IACf,MAAM,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC7C,OAAO,IAAI,CAAC;AACd,CAAC;AAhCD,0BAgCC"}
+{"version":3,"file":"lock.js","sourceRoot":"","sources":["src/lock.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ingest",
-  "version": "10.1.2",
+  "version": "11.1.1",
   "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.1.1",
+    "@cumulus/common": "11.1.1",
+    "@cumulus/db": "11.1.1",
+    "@cumulus/errors": "11.1.1",
+    "@cumulus/logger": "11.1.1",
+    "@cumulus/message": "11.1.1",
+    "@cumulus/sftp-client": "11.1.1",
     "aws-sdk": "^2.585.0",
     "cksum": "^1.3.0",
     "delay": "^4.3.0",
@@ -56,15 +56,15 @@
     "jsftp": "https://github.com/jkovarik/jsftp.git#add_288",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.22",
-    "moment": "2.29.1",
+    "moment": "2.29.2",
     "simplecrawler": "^1.1.9",
     "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.1.1",
+    "@cumulus/cmrjs": "11.1.1",
+    "@cumulus/test-data": "11.1.1",
+    "@cumulus/types": "11.1.1"
   },
-  "gitHead": "3b59753fa85064549b70ad8ed4a4ee213c5af313"
+  "gitHead": "07fe682da23821434372759fb1948b081da429b5"
 }

package/src/FtpProviderClient.ts

@@ -215,7 +215,7 @@ class FtpProviderClient implements ProviderClient {
     fileRemotePath: string,
     destinationBucket: string,
     destinationKey: string
-  }): Promise<{ s3uri: string, etag: string }> {
+  }): Promise<{ s3uri: string, etag?: string }> {
     const { fileRemotePath, destinationBucket, destinationKey } = params;
     const remoteUrl = `ftp://${this.host}/${fileRemotePath}`;
     const s3uri = S3.buildS3Uri(destinationBucket, destinationKey);
@@ -237,10 +237,12 @@ class FtpProviderClient implements ProviderClient {
     readable.pipe(pass);
 
     const s3Params = {
-      Bucket: destinationBucket,
-      Key: destinationKey,
-      Body: pass,
-      ContentType: lookupMimeType(destinationKey),
+      params: {
+        Bucket: destinationBucket,
+        Key: destinationKey,
+        Body: pass,
+        ContentType: lookupMimeType(destinationKey),
+      },
     };
 
     try {

package/src/HttpProviderClient.js

@@ -279,9 +279,11 @@ class HttpProviderClient {
     const { ETag: etag } = await streamS3Upload(
       uploadStream,
       {
-        Bucket: destinationBucket,
-        Key: destinationKey,
-        ContentType: contentType,
+        params: {
+          Bucket: destinationBucket,
+          Key: destinationKey,
+          ContentType: contentType,
+        },
       }
     );
 

package/src/S3ProviderClient.ts

@@ -2,7 +2,7 @@ import * as S3 from '@cumulus/aws-client/S3';
 import * as log from '@cumulus/common/log';
 import * as errors from '@cumulus/errors';
 import { basename, dirname, join } from 'path';
-import { ProviderClient, S3ProviderClientListItem } from './types';
+import { ProviderClient, S3ProviderClientListItem, isS3ObjectListItem } from './types';
 
 class S3ProviderClient implements ProviderClient {
   private readonly bucket: string;
@@ -15,9 +15,10 @@ class S3ProviderClient implements ProviderClient {
   /**
    * Download a remote file to disk
    *
-   * @param {string} remotePath - the full path to the remote file to be fetched
-   * @param {string} localPath - the full local destination file path
-   * @param {string} param.remoteAltBucket - alternate per-file bucket override to this.bucket
+   * @param {Object} params
+   * @param {string} params.remotePath - the full path to the remote file to be fetched
+   * @param {string} params.localPath - the full local destination file path
+   * @param {string} params.remoteAltBucket - alternate per-file bucket override to this.bucket
    * bucket
    * @returns {Promise<string>} - the path that the file was saved to
    */
@@ -58,14 +59,21 @@ class S3ProviderClient implements ProviderClient {
       Prefix: path,
     });
 
-    return objects.map(({ Key, Size, LastModified }) => ({
-      name: basename(Key),
-      // If the object is at the top level of the bucket, path.dirname is going
-      // to return "." as the dirname.  It should instead be undefined.
-      path: dirname(Key) === '.' ? undefined : dirname(Key),
-      size: Size,
-      time: LastModified.valueOf(),
-    }));
+    if (!objects) return [];
+
+    return objects.map((object) => {
+      if (!isS3ObjectListItem(object)) {
+        throw new TypeError(`S3 object ${object} did not have expected type`);
+      }
+      return {
+        name: basename(object.Key),
+        // If the object is at the top level of the bucket, path.dirname is going
+        // to return "." as the dirname.  It should instead be undefined.
+        path: dirname(object.Key) === '.' ? undefined : dirname(object.Key),
+        size: object.Size,
+        time: object.LastModified.valueOf(),
+      };
+    });
   }
 
   /**
@@ -129,7 +137,7 @@ class S3ProviderClient implements ProviderClient {
       });
       return { s3uri, etag };
     } catch (error) {
-      if (error.code === 'NotFound' || error.code === 'NoSuchKey') {
+      if (error.name === 'NotFound' || error.name === 'NoSuchKey') {
         const sourceUrl = S3.buildS3Uri(sourceBucket, fileRemotePath);
         throw new errors.FileNotFound(`Source file not found ${sourceUrl}`);
       }

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 {
@@ -49,8 +50,8 @@ export interface MoveFileParams {
 
 export interface VersionedObject {
   Bucket: string,
-  Key: string,
-  size: number
+  Key?: string,
+  size?: number
 }
 
 /**
@@ -106,11 +107,14 @@ export async function listVersionedObjects(
     Prefix: `${key}.v`,
   });
 
-  return s3list.map(({ Key, Size }) => ({
-    Bucket: bucket,
-    Key,
-    size: Size,
-  }));
+  if (s3list) {
+    return s3list.map(({ Key, Size }) => ({
+      Bucket: bucket,
+      Key,
+      size: Size,
+    }));
+  }
+  return [];
 }
 
 /**
@@ -283,8 +287,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 +365,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);
 }
 
 /**

package/src/lock.ts

@@ -9,8 +9,8 @@ import * as log from '@cumulus/common/log';
 const lockPrefix = 'lock';
 
 export interface Lock {
-  Key: string,
-  LastModified: Date
+  Key?: string,
+  LastModified?: Date
 }
 
 /**
@@ -28,10 +28,20 @@ export async function checkOldLocks(
   const fiveMinutesAgo = Date.now() - (5 * 60 * 1000);
 
   const expiredLocks = locks.filter(
-    (lock) => lock.LastModified.getTime() < fiveMinutesAgo
+    (lock) => {
+      if (!lock.LastModified) {
+        throw new TypeError(`Could not find LastModified on ${JSON.stringify(lock)}`);
+      }
+      return lock.LastModified.getTime() < fiveMinutesAgo;
+    }
   );
 
-  await Promise.all(expiredLocks.map(({ Key }) => deleteS3Object(bucket, Key)));
+  await Promise.all(expiredLocks.map((lock) => {
+    if (!lock.Key) {
+      throw new TypeError(`Could not find Key on ${JSON.stringify(lock)}`);
+    }
+    return deleteS3Object(bucket, lock.Key);
+  }));
 
   return locks.length - expiredLocks.length;
 }

package/src/types.ts

@@ -5,6 +5,13 @@ export interface ProviderClientListItem {
   time: number
 }
 
+export interface S3ObjectListItem {
+  Bucket: string
+  Key: string
+  LastModified: Date
+  Size: number
+}
+
 export interface FtpProviderClientListItem extends ProviderClientListItem {
   type: number
 }
@@ -34,5 +41,11 @@ export interface ProviderClient {
       destinationKey: string,
       bucket?: string,
     }
-  ): Promise<{ s3uri: string, etag: string }>
+  ): Promise<{ s3uri: string, etag?: string }>
+}
+
+export function isS3ObjectListItem(s3Object: any): s3Object is S3ObjectListItem {
+  return (s3Object as S3ObjectListItem).Key !== undefined
+    && (s3Object as S3ObjectListItem).Size !== undefined
+    && (s3Object as S3ObjectListItem).LastModified !== undefined;
 }