CUMULUS-3243:Updated granule delete logic

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+## [v15.0.x]
+
+- **CUMULUS-3243**
+ - Updated granule delete logic to delete granule which is not in DynamoDB
+
 ## [v15.0.0] 2023-03-10
 
 ### Breaking Changes

example/lambdas/python-reference-task/package.sh

@@ -20,7 +20,7 @@ cp ./*.py ./dist/
 
 cd ./dist || exit 1
 
-find . -type f -print0 | xargs -0 node ../../../../bin/zip.js lambda.zip $(ls | grep -v lambda.zip)
+node ../../../../bin/zip.js lambda.zip $(ls | grep -v lambda.zip)
 
 cd .. || exit 1
 

packages/api/lib/granule-remove-from-cmr.js

@@ -1,4 +1,3 @@
-const { GranuleNotPublished } = require('@cumulus/errors');
 const { CMR } = require('@cumulus/cmr-client');
 const log = require('@cumulus/common/log');
 const {
@@ -29,7 +28,8 @@ const models = require('../models');
 const _removeGranuleFromCmr = async (granule, collectionId) => {
   log.info(`granules.removeGranuleFromCmrByGranule granule_id: ${granule.granule_id}, colletion_id: ${collectionId}`);
   if (!granule.published || !granule.cmr_link) {
-    throw new GranuleNotPublished(`Granule ${granule.granule_id} in Collection ${collectionId} is not published to CMR, so cannot be removed from CMR`);
+    log.info(`Granule ${granule.granule_id} in Collection ${collectionId} is not published to CMR, so cannot be removed from CMR`);
+    return;
   }
 
   const cmrSettings = await cmrjsCmrUtils.getCmrSettings();

packages/api/models/granules.js

@@ -13,6 +13,7 @@ const {
   DeletePublishedGranule,
   ValidationError,
 } = require('@cumulus/errors');
+const { RecordDoesNotExist } = require('@cumulus/errors');
 const {
   generateMoveFileParams,
 } = require('@cumulus/ingest/granule');
@@ -482,6 +483,19 @@ class Granule extends Manager {
     }
     return executionDescription;
   }
+
+  async update(itemKeys, updates = {}, fieldsToDelete = []) {
+    let granule;
+    try {
+      granule = await super.update(itemKeys, updates, fieldsToDelete);
+    } catch (error) {
+      if (!(error instanceof RecordDoesNotExist)) {
+        throw error;
+      }
+      logger.info(`Granule record ${JSON.stringify(itemKeys)} does not exist.`);
+    }
+    return granule;
+  }
 }
 
 module.exports = Granule;

packages/api/src/lib/granule-delete.ts

@@ -126,11 +126,13 @@ const deleteGranuleAndFiles = async (params: {
         await granulePgModel.delete(trx, {
           cumulus_id: pgGranule.cumulus_id,
         });
-        await granuleModelClient.delete(dynamoGranule);
+        if (dynamoGranule) {
+          await granuleModelClient.delete(dynamoGranule);
+        }
         await deleteGranule({
           esClient,
-          granuleId: dynamoGranule.granuleId,
-          collectionId: dynamoGranule.collectionId,
+          granuleId: pgGranule.granule_id,
+          collectionId: granuleToPublishToSns.collectionId,
           index: process.env.ES_INDEX,
           ignore: [404],
         });
@@ -145,7 +147,7 @@ const deleteGranuleAndFiles = async (params: {
         deletedFiles: files,
       };
     } catch (error) {
-      logger.debug(`Error deleting granule with ID ${pgGranule.granule_id} or S3 files ${JSON.stringify(dynamoGranule.files)}: ${JSON.stringify(error)}`);
+      logger.debug(`Error deleting granule with ID ${pgGranule.granule_id} or S3 files ${JSON.stringify(files)}: ${JSON.stringify(error)}`);
       // Delete is idempotent, so there may not be a DynamoDB
       // record to recreate
       if (dynamoGranule) {