From 92f8987039296b6a9043dc37376ec3e5e736d615 Mon Sep 17 00:00:00 2001
From: jennyhliu <34660846+jennyhliu@users.noreply.github.com>
Date: Thu, 18 May 2023 17:18:08 -0400
Subject: [PATCH 1/7] CUMULUS-3223: Fix failed granule stuck in queued (#3373)

* CUMULUS-3223:Fix failed granule stuck in queued

* skip sqsQueueExists test

* update getGranuleTemporalInfo

* update test match schema

* update getGranuleTemporalInfo

* remove extra await

* remove skip sqsQueueExists

* update `@cumulus/cumulus-message-adapter-js` to `2.0.5`

* update sfEventSqsToDbRecords to return partial batch failure

* fix typo

* handle process error seperately, multiple message test

* update test to process multiple messages
---
 CHANGELOG.md                                  |  10 ++
 .../ingestGranule/IngestGranuleFailureSpec.js |  28 +++-
 .../sf-event-sqs-to-db-records/index.js       |  20 ++-
 .../sf-event-sqs-to-db-records/test-index.js  | 124 +++++++++++++++---
 packages/cmrjs/src/cmr-utils.js               |   9 +-
 .../cmrjs/tests/cmr-utils/test-cmr-utils.js   |  12 ++
 packages/ingest/src/granule.ts                |   2 +-
 packages/message/src/Granules.ts              |   2 +-
 tasks/add-missing-file-checksums/package.json |   2 +-
 tasks/discover-granules/package.json          |   2 +-
 tasks/discover-pdrs/package.json              |   2 +-
 tasks/files-to-granules/package.json          |   2 +-
 tasks/hello-world/package.json                |   2 +-
 tasks/hyrax-metadata-updates/package.json     |   2 +-
 tasks/lzards-backup/package.json              |   2 +-
 tasks/move-granules/package.json              |   2 +-
 tasks/parse-pdr/package.json                  |   2 +-
 tasks/pdr-status-check/package.json           |   2 +-
 tasks/post-to-cmr/package.json                |   2 +-
 tasks/queue-granules/package.json             |   2 +-
 tasks/queue-pdrs/package.json                 |   2 +-
 tasks/queue-workflow/package.json             |   2 +-
 tasks/sf-sqs-report/package.json              |   2 +-
 tasks/sync-granule/package.json               |   2 +-
 tasks/test-processing/package.json            |   2 +-
 .../package.json                              |   2 +-
 .../package.json                              |   2 +-
 .../archive/sf_event_sqs_to_db_records.tf     |   1 +
 28 files changed, 192 insertions(+), 54 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e141a8171b2..d3d74904ea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+## [v15.0.4] 2023-06-23
+
+### Fixed
+
+- **CUMULUS-3223**
+  - Update `@cumulus/cmrjs/cmr-utils.getGranuleTemporalInfo` to handle the error when the cmr file s3url is not available
+  - Update `sfEventSqsToDbRecords` lambda to return [partial batch failure](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html#services-sqs-batchfailurereporting),
+    and only reprocess messages when cumulus message can't be retrieved from the execution events.
+  - Update `@cumulus/cumulus-message-adapter-js` to `2.0.5` for all cumulus tasks
+
 ## [v15.0.3] 2023-04-28
 
 ### Fixed
diff --git a/example/spec/parallel/ingestGranule/IngestGranuleFailureSpec.js b/example/spec/parallel/ingestGranule/IngestGranuleFailureSpec.js
index aea8b95d869..28dafdb4e44 100644
--- a/example/spec/parallel/ingestGranule/IngestGranuleFailureSpec.js
+++ b/example/spec/parallel/ingestGranule/IngestGranuleFailureSpec.js
@@ -72,15 +72,22 @@ describe('The Ingest Granule failure workflow', () => {
       inputPayload = await setupTestGranuleForIngest(config.bucket, inputPayloadJson, granuleRegex, testSuffix, testDataFolder);
       pdrFilename = inputPayload.pdr.name;
 
-      // add a non-existent file to input payload to cause lambda error
+      // add a file with invalid schema (missing path field), and a non-existent file to input payload.
+      // .cmr.json is for testing retrieving cmr information when granule is failed
       inputPayload.granules[0].files = [
         {
-          name: 'non-existent-file',
-          key: 'non-existent-path/non-existent-file',
+          key: 'no-path-field/no-path-field-file',
           bucket: config.bucket,
+          name: 'no-path-field-file',
         },
+        {
+          name: 'non-existent-file.cmr.json',
+          path: 'non-existent-path',
+        },
+        ...inputPayload.granules[0].files,
       ];
 
+      console.log(`testSuffix: ${testSuffix}, granuleId: ${inputPayload.granules[0].granuleId}`);
       workflowExecution = await buildAndExecuteWorkflow(
         config.stackName,
         config.bucket,
@@ -91,6 +98,7 @@ describe('The Ingest Granule failure workflow', () => {
       );
     } catch (error) {
       beforeAllFailed = true;
+      console.log('IngestGranuleFailure beforeAll caught error', error);
       throw error;
     }
   });
@@ -219,7 +227,7 @@ describe('The Ingest Granule failure workflow', () => {
       expect(JSON.parse(execution.error.Cause)).toEqual(JSON.parse(syncGranFailedDetail.cause));
     });
 
-    it('fails the granule with an error object', async () => {
+    it('fails the granule with a list of errors', async () => {
       await waitForApiStatus(
         getGranule,
         {
@@ -235,8 +243,16 @@ describe('The Ingest Granule failure workflow', () => {
       });
 
       expect(granule.status).toBe('failed');
-      expect(granule.error.Error).toBeDefined();
-      expect(granule.error.Cause).toBeDefined();
+      console.log('IngestGranuleFailure granule.error', granule.error);
+      const errors = JSON.parse(granule.error.errors || []);
+      expect(errors.length).toBeGreaterThanOrEqual(2);
+      errors.forEach((error) => {
+        const isSchemaValidationError = (error.Error === 'CumulusMessageAdapterExecutionError') &&
+          error.Cause.includes('jsonschema.exceptions.ValidationError');
+        const isPostgresWriteError = error.Error.includes('Failed writing files to PostgreSQL') &&
+          error.Cause.includes('null value in column "bucket" violates not-null constraint');
+        expect(isSchemaValidationError || isPostgresWriteError).toBeTrue();
+      });
     });
   });
 });
diff --git a/packages/api/lambdas/sf-event-sqs-to-db-records/index.js b/packages/api/lambdas/sf-event-sqs-to-db-records/index.js
index 1377cf42a52..bedc6986e8e 100644
--- a/packages/api/lambdas/sf-event-sqs-to-db-records/index.js
+++ b/packages/api/lambdas/sf-event-sqs-to-db-records/index.js
@@ -92,14 +92,16 @@ const writeRecords = async ({
     ),
   ]);
 
-  if (!shouldWriteExecutionToPostgres({
+  const fieldsToMeetRequirements = {
     messageCollectionNameVersion,
     collectionCumulusId,
     messageAsyncOperationId,
     asyncOperationCumulusId,
     messageParentExecutionArn,
     parentExecutionCumulusId,
-  })) {
+  };
+  if (!shouldWriteExecutionToPostgres(fieldsToMeetRequirements)) {
+    log.debug(`Could not satisfy requirements for writing records, fieldsToMeetRequirements: ${JSON.stringify(fieldsToMeetRequirements)}`);
     throw new UnmetRequirementsError('Could not satisfy requirements for writing records to PostgreSQL. No records written to the database.');
   }
 
@@ -142,11 +144,17 @@ const handler = async (event) => {
   });
 
   const sqsMessages = get(event, 'Records', []);
+  const batchItemFailures = [];
 
-  return await Promise.all(sqsMessages.map(async (message) => {
+  await Promise.all(sqsMessages.map(async (message) => {
+    let cumulusMessage;
     const executionEvent = parseSQSMessageBody(message);
-    const cumulusMessage = await getCumulusMessageFromExecutionEvent(executionEvent);
-
+    try {
+      cumulusMessage = await getCumulusMessageFromExecutionEvent(executionEvent);
+    } catch (error) {
+      log.error(`Writing message failed on getting message from execution event: ${JSON.stringify(message)}`, error);
+      return batchItemFailures.push({ itemIdentifier: message.messageId });
+    }
     try {
       return await writeRecords({ ...event, cumulusMessage, knex });
     } catch (error) {
@@ -154,6 +162,8 @@ const handler = async (event) => {
       return sendSQSMessage(process.env.DeadLetterQueue, message);
     }
   }));
+
+  return { batchItemFailures };
 };
 
 module.exports = {
diff --git a/packages/api/tests/lambdas/sf-event-sqs-to-db-records/test-index.js b/packages/api/tests/lambdas/sf-event-sqs-to-db-records/test-index.js
index 2de6e8eea53..0a392493f3d 100644
--- a/packages/api/tests/lambdas/sf-event-sqs-to-db-records/test-index.js
+++ b/packages/api/tests/lambdas/sf-event-sqs-to-db-records/test-index.js
@@ -38,20 +38,40 @@ const {
 const {
   constructCollectionId,
 } = require('@cumulus/message/Collections');
+<<<<<<< HEAD
 
 const Execution = require('../../../models/executions');
 const Granule = require('../../../models/granules');
 const Pdr = require('../../../models/pdrs');
+=======
+const {
+  getMessageExecutionParentArn,
+} = require('@cumulus/message/Executions');
+const { createSqsQueues, getSqsQueueMessageCounts } = require('../../../lib/testUtils');
+const {
+  writeRecords,
+} = require('../../../lambdas/sf-event-sqs-to-db-records');
+>>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
 
 const {
   handler,
   writeRecords,
 } = proxyquire('../../../lambdas/sf-event-sqs-to-db-records', {
+<<<<<<< HEAD
   '@cumulus/aws-client/SQS': {
     sendSQSMessage: (queue, message) => Promise.resolve([queue, message]),
   },
   '@cumulus/aws-client/StepFunctions': {
     describeExecution: () => Promise.resolve({}),
+=======
+  '@cumulus/message/Executions': {
+    getMessageExecutionParentArn: (cumulusMessage) => {
+      if (cumulusMessage.fail === true) {
+        throw new Error('Intentional failure: test case');
+      }
+      return getMessageExecutionParentArn(cumulusMessage);
+    },
+>>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
   },
 });
 
@@ -68,29 +88,32 @@ const loadFixture = (filename) =>
     )
   );
 
-let fixture;
-
 const runHandler = async ({
-  cumulusMessage = {},
+  fixture,
+  cumulusMessages = [{}],
   stateMachineArn,
   executionArn,
   executionName,
   testDbName,
   ...additionalParams
 }) => {
-  fixture.resources = [executionArn];
-  fixture.detail.executionArn = executionArn;
-  fixture.detail.stateMachineArn = stateMachineArn;
-  fixture.detail.name = executionName;
-
-  fixture.detail.input = JSON.stringify(cumulusMessage);
+  const eventRecords = cumulusMessages.map((cumulusMessage) => {
+    const eventFixture = { ...fixture };
+    eventFixture.resources = [executionArn];
+    eventFixture.detail.executionArn = executionArn;
+    eventFixture.detail.stateMachineArn = stateMachineArn;
+    eventFixture.detail.name = executionName;
+    eventFixture.detail.input = JSON.stringify(cumulusMessage);
+    return {
+      messageId: cryptoRandomString({ length: 10 }),
+      eventSource: 'aws:sqs',
+      body: JSON.stringify(eventFixture),
+    };
+  });
 
   const sqsEvent = {
     ...additionalParams,
-    Records: [{
-      eventSource: 'aws:sqs',
-      body: JSON.stringify(fixture),
-    }],
+    Records: eventRecords,
     env: {
       ...localStackConnectionEnv,
       PG_DATABASE: testDbName,
@@ -151,6 +174,7 @@ test.before(async (t) => {
   t.context.pdrPgModel = new PdrPgModel();
   t.context.providerPgModel = new ProviderPgModel();
 
+<<<<<<< HEAD
   process.env.ExecutionsTable = randomString();
   process.env.GranulesTable = randomString();
   process.env.PdrsTable = randomString();
@@ -177,6 +201,9 @@ test.before(async (t) => {
   t.context.pdrModel = pdrModel;
 
   fixture = await loadFixture('execution-running-event.json');
+=======
+  t.context.fixture = await loadFixture('execution-running-event.json');
+>>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
 
   const executionsTopicName = cryptoRandomString({ length: 10 });
   const pdrsTopicName = cryptoRandomString({ length: 10 });
@@ -204,11 +231,9 @@ test.beforeEach(async (t) => {
   process.env.granule_sns_topic_arn = TopicArn;
   t.context.TopicArn = TopicArn;
 
-  const QueueName = cryptoRandomString({ length: 10 });
-  const { QueueUrl } = await sqs().createQueue({ QueueName }).promise();
-  t.context.QueueUrl = QueueUrl;
+  t.context.queues = await createSqsQueues(cryptoRandomString({ length: 10 }));
   const getQueueAttributesResponse = await sqs().getQueueAttributes({
-    QueueUrl,
+    QueueUrl: t.context.queues.queueUrl,
     AttributeNames: ['QueueArn'],
   }).promise();
   const QueueArn = getQueueAttributesResponse.Attributes.QueueArn;
@@ -224,11 +249,13 @@ test.beforeEach(async (t) => {
     Token: SubscriptionArn,
   }).promise();
 
+  process.env.DeadLetterQueue = t.context.queues.deadLetterQueueUrl;
+
   const stateMachineName = cryptoRandomString({ length: 5 });
-  t.context.stateMachineArn = `arn:aws:states:${fixture.region}:${fixture.account}:stateMachine:${stateMachineName}`;
+  t.context.stateMachineArn = `arn:aws:states:${t.context.fixture.region}:${t.context.fixture.account}:stateMachine:${stateMachineName}`;
 
   t.context.executionName = cryptoRandomString({ length: 5 });
-  t.context.executionArn = `arn:aws:states:${fixture.region}:${fixture.account}:execution:${stateMachineName}:${t.context.executionName}`;
+  t.context.executionArn = `arn:aws:states:${t.context.fixture.region}:${t.context.fixture.account}:execution:${stateMachineName}:${t.context.executionName}`;
 
   t.context.provider = {
     id: `provider${cryptoRandomString({ length: 5 })}`,
@@ -281,6 +308,11 @@ test.beforeEach(async (t) => {
     });
 });
 
+test.afterEach.always(async (t) => {
+  await sqs().deleteQueue({ QueueUrl: t.context.queues.queueUrl }).promise();
+  await sqs().deleteQueue({ QueueUrl: t.context.queues.deadLetterQueueUrl }).promise();
+});
+
 test.after.always(async (t) => {
   const {
     executionModel,
@@ -408,6 +440,7 @@ test.serial('writeRecords() writes records to Dynamo and PostgreSQL', async (t)
   );
 });
 
+<<<<<<< HEAD
 test('Lambda sends message to DLQ when writeRecords() throws an error', async (t) => {
   // make execution write throw an error
   const fakeExecutionModel = {
@@ -416,15 +449,66 @@ test('Lambda sends message to DLQ when writeRecords() throws an error', async (t
     },
   };
 
+=======
+test.serial('Lambda sends message to DLQ when writeRecords() throws an error', async (t) => {
+>>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
   const {
     handlerResponse,
     sqsEvent,
   } = await runHandler({
     ...t.context,
+<<<<<<< HEAD
     executionModel: fakeExecutionModel,
+=======
+    cumulusMessages: [{ fail: true }],
+>>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
   });
 
-  t.is(handlerResponse[0][1].body, sqsEvent.Records[0].body);
+  t.is(handlerResponse.batchItemFailures.length, 0);
+  const {
+    numberOfMessagesAvailable,
+    numberOfMessagesNotVisible,
+  } = await getSqsQueueMessageCounts(t.context.queues.deadLetterQueueUrl);
+  t.is(numberOfMessagesAvailable, 1);
+  t.is(numberOfMessagesNotVisible, 0);
+  const { Messages } = await sqs()
+    .receiveMessage({
+      QueueUrl: t.context.queues.deadLetterQueueUrl,
+      WaitTimeSeconds: 10,
+    })
+    .promise();
+  const dlqMessage = JSON.parse(Messages[0].Body);
+  t.deepEqual(dlqMessage, sqsEvent.Records[0]);
+});
+
+test.serial('Lambda returns partial batch response to reprocess messages when getCumulusMessageFromExecutionEvent() throws an error', async (t) => {
+  const {
+    handlerResponse,
+    sqsEvent,
+  } = await runHandler({
+    ...t.context,
+    cumulusMessages: [null],
+  });
+
+  t.is(handlerResponse.batchItemFailures.length, 1);
+  t.is(handlerResponse.batchItemFailures[0].itemIdentifier, sqsEvent.Records[0].messageId);
+});
+
+test.serial('Lambda processes multiple messages', async (t) => {
+  const {
+    handlerResponse,
+  } = await runHandler({
+    ...t.context,
+    cumulusMessages: [{ fail: true }, null, t.context.cumulusMessage, null, { fail: true }],
+  });
+
+  const {
+    numberOfMessagesAvailable,
+    numberOfMessagesNotVisible,
+  } = await getSqsQueueMessageCounts(t.context.queues.deadLetterQueueUrl);
+  t.is(numberOfMessagesAvailable, 2);
+  t.is(numberOfMessagesNotVisible, 0);
+  t.is(handlerResponse.batchItemFailures.length, 2);
 });
 
 test.serial('writeRecords() discards an out of order message that is older than an existing message without error or write', async (t) => {
diff --git a/packages/cmrjs/src/cmr-utils.js b/packages/cmrjs/src/cmr-utils.js
index 55986c98a9b..3c8ad44059e 100644
--- a/packages/cmrjs/src/cmr-utils.js
+++ b/packages/cmrjs/src/cmr-utils.js
@@ -1090,8 +1090,13 @@ async function getUserAccessibleBuckets(edlUser, cmrProvider = process.env.cmr_p
  *    available.
  */
 async function getGranuleTemporalInfo(granule) {
-  const cmrFile = granuleToCmrFileObject(granule);
-  if (cmrFile.length === 0) return {};
+  let cmrFile = [];
+  try {
+    cmrFile = granuleToCmrFileObject(granule);
+  } catch (error) {
+    log.debug(`getGranuleTemporalInfo failed to granuleToCmrFileObject ${JSON.stringify(granule)}, ${error.message}`);
+  }
+  if (cmrFile === undefined || cmrFile.length === 0) return {};
 
   const cmrFilename = getS3UrlOfFile(cmrFile[0]);
 
diff --git a/packages/cmrjs/tests/cmr-utils/test-cmr-utils.js b/packages/cmrjs/tests/cmr-utils/test-cmr-utils.js
index fc5b1d6d05e..7a4bf55937a 100644
--- a/packages/cmrjs/tests/cmr-utils/test-cmr-utils.js
+++ b/packages/cmrjs/tests/cmr-utils/test-cmr-utils.js
@@ -941,6 +941,18 @@ test.serial('getGranuleTemporalInfo returns temporal information from granule CM
   }
 });
 
+test.serial('getGranuleTemporalInfo returns empty object if cmr file s3 url is not available', async (t) => {
+  const temporalInfo = await getGranuleTemporalInfo({
+    granuleId: 'testGranuleId',
+    files: [{
+      path: 'path',
+      name: 'test.cmr_iso.xml',
+    }],
+  });
+
+  t.deepEqual(temporalInfo, {});
+});
+
 test.serial('generateFileUrl generates correct url for cmrGranuleUrlType distribution', (t) => {
   const filename = 's3://fake-bucket/folder/key.txt';
   const distEndpoint = 'www.example.com/';
diff --git a/packages/ingest/src/granule.ts b/packages/ingest/src/granule.ts
index c027ad9222e..43f24ca4ca8 100644
--- a/packages/ingest/src/granule.ts
+++ b/packages/ingest/src/granule.ts
@@ -344,7 +344,7 @@ export function generateMoveFileParams(
     } else if (file.filename) {
       source = S3.parseS3Uri(file.filename);
     } else {
-      throw new Error(`Unable to determine location of file: ${JSON.stringify(file)}`);
+      throw new Error(`granule.generateMoveFileParams unable to determine location of file: ${JSON.stringify(file)}`);
     }
 
     const targetKey = destination.filepath
diff --git a/packages/message/src/Granules.ts b/packages/message/src/Granules.ts
index d1383602076..9478b0e8164 100644
--- a/packages/message/src/Granules.ts
+++ b/packages/message/src/Granules.ts
@@ -275,7 +275,7 @@ export const generateGranuleApiRecord = async ({
 
   // Get CMR temporalInfo
   const temporalInfo = await getGranuleCmrTemporalInfo({
-    granule,
+    granule: { ...granule, status },
     cmrTemporalInfo,
     cmrUtils,
   });
diff --git a/tasks/add-missing-file-checksums/package.json b/tasks/add-missing-file-checksums/package.json
index b32ad653f6c..245a21f7a7f 100644
--- a/tasks/add-missing-file-checksums/package.json
+++ b/tasks/add-missing-file-checksums/package.json
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4"
+    "@cumulus/cumulus-message-adapter-js": "2.0.5"
   },
   "devDependencies": {
     "@cumulus/schemas": "15.0.3",
diff --git a/tasks/discover-granules/package.json b/tasks/discover-granules/package.json
index 634ca95dd4c..c5270eca329 100644
--- a/tasks/discover-granules/package.json
+++ b/tasks/discover-granules/package.json
@@ -36,7 +36,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/api-client": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/ingest": "15.0.3",
     "@cumulus/logger": "15.0.3",
     "got": "^11.8.5",
diff --git a/tasks/discover-pdrs/package.json b/tasks/discover-pdrs/package.json
index c4a2b356629..01facd7f272 100644
--- a/tasks/discover-pdrs/package.json
+++ b/tasks/discover-pdrs/package.json
@@ -35,7 +35,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/ingest": "15.0.3",
     "lodash": "^4.17.21",
     "p-filter": "^2.1.0"
diff --git a/tasks/files-to-granules/package.json b/tasks/files-to-granules/package.json
index 1071f07dda3..2b5c1b2114a 100644
--- a/tasks/files-to-granules/package.json
+++ b/tasks/files-to-granules/package.json
@@ -33,7 +33,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/tasks/hello-world/package.json b/tasks/hello-world/package.json
index 15949f52dfe..e9140c7054a 100644
--- a/tasks/hello-world/package.json
+++ b/tasks/hello-world/package.json
@@ -34,6 +34,6 @@
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4"
+    "@cumulus/cumulus-message-adapter-js": "2.0.5"
   }
 }
diff --git a/tasks/hyrax-metadata-updates/package.json b/tasks/hyrax-metadata-updates/package.json
index 1b980fa8333..855d7e24485 100644
--- a/tasks/hyrax-metadata-updates/package.json
+++ b/tasks/hyrax-metadata-updates/package.json
@@ -42,7 +42,7 @@
     "@cumulus/cmr-client": "15.0.3",
     "@cumulus/cmrjs": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/errors": "15.0.3",
     "libxmljs": "^0.19.7",
     "lodash": "^4.17.21",
diff --git a/tasks/lzards-backup/package.json b/tasks/lzards-backup/package.json
index 3aa98d29275..5a4604a0061 100644
--- a/tasks/lzards-backup/package.json
+++ b/tasks/lzards-backup/package.json
@@ -45,7 +45,7 @@
     "@cumulus/api-client": "15.0.3",
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/db": "15.0.3",
     "@cumulus/distribution-utils": "15.0.3",
     "@cumulus/launchpad-auth": "15.0.3",
diff --git a/tasks/move-granules/package.json b/tasks/move-granules/package.json
index a1fc8be4384..3278b8bc01b 100644
--- a/tasks/move-granules/package.json
+++ b/tasks/move-granules/package.json
@@ -41,7 +41,7 @@
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/cmrjs": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/distribution-utils": "15.0.3",
     "@cumulus/errors": "15.0.3",
     "@cumulus/ingest": "15.0.3",
diff --git a/tasks/parse-pdr/package.json b/tasks/parse-pdr/package.json
index fc41afc35f7..203fa89a9ff 100644
--- a/tasks/parse-pdr/package.json
+++ b/tasks/parse-pdr/package.json
@@ -34,7 +34,7 @@
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/collection-config-store": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/errors": "15.0.3",
     "@cumulus/ingest": "15.0.3",
     "@cumulus/pvl": "15.0.3",
diff --git a/tasks/pdr-status-check/package.json b/tasks/pdr-status-check/package.json
index a49d06425f2..c6d01f3123b 100644
--- a/tasks/pdr-status-check/package.json
+++ b/tasks/pdr-status-check/package.json
@@ -34,7 +34,7 @@
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/errors": "15.0.3"
   }
 }
diff --git a/tasks/post-to-cmr/package.json b/tasks/post-to-cmr/package.json
index 29ac982a755..ba8d9fb8d98 100644
--- a/tasks/post-to-cmr/package.json
+++ b/tasks/post-to-cmr/package.json
@@ -36,7 +36,7 @@
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/cmrjs": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/errors": "15.0.3",
     "@cumulus/launchpad-auth": "15.0.3",
     "lodash": "^4.17.21"
diff --git a/tasks/queue-granules/package.json b/tasks/queue-granules/package.json
index 0300ca56b8f..60474cb5aa3 100644
--- a/tasks/queue-granules/package.json
+++ b/tasks/queue-granules/package.json
@@ -35,7 +35,7 @@
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/collection-config-store": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/ingest": "15.0.3",
     "@cumulus/message": "15.0.3",
     "lodash": "^4.17.21",
diff --git a/tasks/queue-pdrs/package.json b/tasks/queue-pdrs/package.json
index 9b24a695b86..87f643e294a 100644
--- a/tasks/queue-pdrs/package.json
+++ b/tasks/queue-pdrs/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/ingest": "15.0.3",
     "@cumulus/message": "15.0.3",
     "lodash": "^4.17.21"
diff --git a/tasks/queue-workflow/package.json b/tasks/queue-workflow/package.json
index 80b411dd169..2288d2b50e4 100644
--- a/tasks/queue-workflow/package.json
+++ b/tasks/queue-workflow/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/ingest": "15.0.3",
     "@cumulus/message": "15.0.3",
     "lodash": "^4.17.21"
diff --git a/tasks/sf-sqs-report/package.json b/tasks/sf-sqs-report/package.json
index 9205dd29d43..9bb76411095 100644
--- a/tasks/sf-sqs-report/package.json
+++ b/tasks/sf-sqs-report/package.json
@@ -33,7 +33,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/tasks/sync-granule/package.json b/tasks/sync-granule/package.json
index 0a778a12720..03e1db3e1c8 100644
--- a/tasks/sync-granule/package.json
+++ b/tasks/sync-granule/package.json
@@ -40,7 +40,7 @@
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/collection-config-store": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/errors": "15.0.3",
     "@cumulus/ingest": "15.0.3",
     "@cumulus/message": "15.0.3",
diff --git a/tasks/test-processing/package.json b/tasks/test-processing/package.json
index abfe4cb39f4..092992ec220 100644
--- a/tasks/test-processing/package.json
+++ b/tasks/test-processing/package.json
@@ -22,7 +22,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/integration-tests": "15.0.3"
   }
 }
diff --git a/tasks/update-cmr-access-constraints/package.json b/tasks/update-cmr-access-constraints/package.json
index b0bf24085e3..84206084cb6 100644
--- a/tasks/update-cmr-access-constraints/package.json
+++ b/tasks/update-cmr-access-constraints/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@cumulus/aws-client": "15.0.3",
     "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "lodash": "^4.17.5"
   },
   "devDependencies": {
diff --git a/tasks/update-granules-cmr-metadata-file-links/package.json b/tasks/update-granules-cmr-metadata-file-links/package.json
index 1f058987993..935e11b45c6 100644
--- a/tasks/update-granules-cmr-metadata-file-links/package.json
+++ b/tasks/update-granules-cmr-metadata-file-links/package.json
@@ -40,7 +40,7 @@
   "dependencies": {
     "@cumulus/cmrjs": "15.0.3",
     "@cumulus/common": "15.0.3",
-    "@cumulus/cumulus-message-adapter-js": "2.0.4",
+    "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "@cumulus/distribution-utils": "15.0.3",
     "lodash": "^4.17.15"
   },
diff --git a/tf-modules/archive/sf_event_sqs_to_db_records.tf b/tf-modules/archive/sf_event_sqs_to_db_records.tf
index b599a965605..649b1f51a52 100644
--- a/tf-modules/archive/sf_event_sqs_to_db_records.tf
+++ b/tf-modules/archive/sf_event_sqs_to_db_records.tf
@@ -161,6 +161,7 @@ resource "aws_sqs_queue_policy" "sf_event_sqs_to_db_records_input_queue_policy"
 resource "aws_lambda_event_source_mapping" "sf_event_sqs_to_db_records_mapping" {
   event_source_arn = aws_sqs_queue.sf_event_sqs_to_db_records_input_queue.arn
   function_name    = aws_lambda_function.sf_event_sqs_to_db_records.arn
+  function_response_types = ["ReportBatchItemFailures"]
 }
 
 resource "aws_sqs_queue" "sf_event_sqs_to_db_records_dead_letter_queue" {

From 5d012d9390a904aa605a2696408cd4d53721c94a Mon Sep 17 00:00:00 2001
From: Naga Nages <66387215+Nnaga1@users.noreply.github.com>
Date: Wed, 29 Mar 2023 17:02:04 -0400
Subject: [PATCH 2/7] [Cumulus-3115] - DiscoverGranules 'skip' or 'error'
 duplicate handling will enter a retry loop if the Cumulus API returns a 404
 (#3298)

* first commit

* changelog entry

* feedback

* small change

* PR feedback

* fixing CI issues

* fixing previous changes that were wrong

* fixing unit test

* fixing CI issues

* fixing units

* fixing CI failures

* Changelog

* fixing TS

* fixing ingestGranule test failure

* fixing clause

* added test for expectedStatusCodes

* PR feedback

* fixing tests

* reverting code block back to master

* fixing expectedStatusCodes

* reverting changes

* fixing tests

* PR feedback
---
 CHANGELOG.md                                  |  3 ++
 example/config.yml                            |  3 ++
 .../ingestGranule/IngestGranuleSuccessSpec.js |  1 -
 packages/api-client/src/granules.ts           | 26 ++++++++++------
 packages/api-client/tests/test-granules.js    | 31 +++++++++++++++++++
 tasks/discover-granules/index.js              |  8 +++--
 tasks/discover-granules/tests/index.js        | 21 ++++++++++---
 7 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3d74904ea5..73e0a54f9b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 
+- **CUMULUS-3115**
+  - Fixed DiscoverGranules' workflow's duplicateHandling when set to `skip` or `error` to stop retrying
+    after receiving a 404 Not Found Response Error from the `cumulus-api`.
 - **CUMULUS-3223**
   - Update `@cumulus/cmrjs/cmr-utils.getGranuleTemporalInfo` to handle the error when the cmr file s3url is not available
   - Update `sfEventSqsToDbRecords` lambda to return [partial batch failure](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html#services-sqs-batchfailurereporting),
diff --git a/example/config.yml b/example/config.yml
index 2e48a2e9f21..e336e714541 100644
--- a/example/config.yml
+++ b/example/config.yml
@@ -34,3 +34,6 @@ vkn-tf:
 
 np:
   bucket: npauzenga-internal
+
+nnaga-tf:
+  bucket: nnaga-internal
diff --git a/example/spec/parallel/ingestGranule/IngestGranuleSuccessSpec.js b/example/spec/parallel/ingestGranule/IngestGranuleSuccessSpec.js
index 3724e8a8fd7..bdee1b8ff51 100644
--- a/example/spec/parallel/ingestGranule/IngestGranuleSuccessSpec.js
+++ b/example/spec/parallel/ingestGranule/IngestGranuleSuccessSpec.js
@@ -1275,7 +1275,6 @@ describe('The S3 Ingest Granules workflow', () => {
           await getGranule({
             prefix: config.stackName,
             granuleId: inputPayload.granules[0].granuleId,
-            expectedStatusCodes: 404,
           });
         } catch (error) {
           granuleResponseError = error;
diff --git a/packages/api-client/src/granules.ts b/packages/api-client/src/granules.ts
index 644d32ad06e..e5ef16022d1 100644
--- a/packages/api-client/src/granules.ts
+++ b/packages/api-client/src/granules.ts
@@ -17,19 +17,23 @@ type AssociateExecutionRequest = {
 /**
  * GET raw response from /granules/{granuleName}
  *
- * @param {Object} params             - params
- * @param {string} params.prefix      - the prefix configured for the stack
- * @param {string} params.granuleId   - a granule ID
- * @param {Object} [params.query]     - query to pass the API lambda
- * @param {Function} params.callback  - async function to invoke the api lambda
- *                                      that takes a prefix / user payload.  Defaults
- *                                      to cumulusApiClient.invokeApifunction to invoke the
- *                                      api lambda
- * @returns {Promise<Object>}         - the granule fetched by the API
+ * @param {Object} params                                - params
+ * @param {string} params.prefix                         - the prefix configured for the stack
+ * @param {string} params.granuleId                      - a granule ID
+ * @param {Object} [params.query]                        - query to pass the API lambda
+ * @param {number[] | number} params.expectedStatusCodes - the statusCodes which the granule API is
+ *                                                         is expecting for the invokeApi Response,
+ *                                                         default is 200
+ * @param {Function} params.callback                     - async function to invoke the api lambda
+ *                                                         that takes a prefix / user payload,
+ *                                                         cumulusApiClient.invokeApifunction
+ *                                                         is the default to invoke the api lambda
+ * @returns {Promise<Object>}                            - the granule fetched by the API
  */
 export const getGranuleResponse = async (params: {
   prefix: string,
   granuleId: GranuleId,
+  expectedStatusCodes?: number[] | number,
   query?: { [key: string]: string },
   callback?: InvokeApiFunction
 }): Promise<ApiGatewayLambdaHttpProxyResponse> => {
@@ -37,17 +41,19 @@ export const getGranuleResponse = async (params: {
     prefix,
     granuleId,
     query,
+    expectedStatusCodes,
     callback = invokeApi,
   } = params;
 
   return await callback({
-    prefix: prefix,
+    prefix,
     payload: {
       httpMethod: 'GET',
       resource: '/{proxy+}',
       path: `/granules/${granuleId}`,
       ...(query && { queryStringParameters: query }),
     },
+    expectedStatusCodes,
   });
 };
 
diff --git a/packages/api-client/tests/test-granules.js b/packages/api-client/tests/test-granules.js
index d405d3dd3d2..d8386abf778 100644
--- a/packages/api-client/tests/test-granules.js
+++ b/packages/api-client/tests/test-granules.js
@@ -18,6 +18,7 @@ test('getGranule calls the callback with the expected object', async (t) => {
       resource: '/{proxy+}',
       path: `/granules/${t.context.granuleId}`,
     },
+    expectedStatusCodes: undefined,
   };
 
   const callback = (configObject) => {
@@ -36,6 +37,35 @@ test('getGranule calls the callback with the expected object', async (t) => {
   }));
 });
 
+test('getGranule calls the callback with the expected status codes', async (t) => {
+  const expected = {
+    prefix: t.context.testPrefix,
+    payload: {
+      httpMethod: 'GET',
+      resource: '/{proxy+}',
+      path: `/granules/${t.context.granuleId}`,
+    },
+    expectedStatusCodes: [404, 200],
+  };
+
+  const callback = (configObject) => {
+    t.deepEqual(configObject, expected);
+    return Promise.resolve({
+      body: JSON.stringify({
+        granuleId: t.context.granuleId,
+        expectedStatusCodes: [404, 200],
+      }),
+    });
+  };
+
+  await t.notThrowsAsync(granulesApi.getGranule({
+    callback,
+    prefix: t.context.testPrefix,
+    granuleId: t.context.granuleId,
+    expectedStatusCodes: [404, 200],
+  }));
+});
+
 test('getGranule calls the callback with the expected object when there is query param', async (t) => {
   const query = { getRecoveryStatus: true };
   const expected = {
@@ -46,6 +76,7 @@ test('getGranule calls the callback with the expected object when there is query
       path: `/granules/${t.context.granuleId}`,
       queryStringParameters: query,
     },
+    expectedStatusCodes: undefined,
   };
 
   const callback = (configObject) => {
diff --git a/tasks/discover-granules/index.js b/tasks/discover-granules/index.js
index 27a54cde7dd..3ab440dd625 100644
--- a/tasks/discover-granules/index.js
+++ b/tasks/discover-granules/index.js
@@ -203,13 +203,11 @@ const checkGranuleHasNoDuplicate = async (granuleId, duplicateHandling) => {
   try {
     response = await granules.getGranuleResponse({
       prefix: process.env.STACKNAME,
+      expectedStatusCodes: [200, 404],
       granuleId,
     });
   } catch (error) {
     const responseError = error;
-    if (responseError.statusCode === 404) {
-      return granuleId;
-    }
     throw new Error(`Unexpected error from Private API lambda: ${responseError.message}`);
   }
 
@@ -220,6 +218,10 @@ const checkGranuleHasNoDuplicate = async (granuleId, duplicateHandling) => {
     return false;
   }
 
+  if (response.statusCode === 404) {
+    return granuleId;
+  }
+
   throw new Error(`Unexpected return from Private API lambda: ${JSON.stringify(response)}`);
 };
 
diff --git a/tasks/discover-granules/tests/index.js b/tasks/discover-granules/tests/index.js
index 79a09e2459c..4e060bf5c2f 100644
--- a/tasks/discover-granules/tests/index.js
+++ b/tasks/discover-granules/tests/index.js
@@ -62,11 +62,10 @@ const fakeGranulesModule = {
       });
     }
 
-    throw new CumulusApiClientError(
-      'API error',
-      404,
-      'Not Found'
-    );
+    return Promise.resolve({
+      statusCode: 404,
+      body: '{"Granule Not Found"}',
+    });
   },
 };
 
@@ -410,6 +409,18 @@ test('checkGranuleHasNoDuplicate throws an error on an unexpected API lambda ret
   t.true(error.message.startsWith('Unexpected return from Private API lambda'));
 });
 
+test('checkGranuleHasNoDuplicate does not enter a retry loop when a granule exists and duplicateHandling is set to skip',
+  async (t) => {
+    t.notThrowsAsync(checkGranuleHasNoDuplicate('duplicate', 'skip'));
+    t.false(await (checkGranuleHasNoDuplicate('duplicate', 'skip')));
+  });
+
+test('checkGranuleHasNoDuplicate does not enter a retry loop when a granule exists and duplicateHandling is set to error',
+  async (t) => {
+    const error = await t.throwsAsync(checkGranuleHasNoDuplicate('duplicate', 'error'));
+    t.false(error.message.includes('Attempt 3 failed'));
+  });
+
 test.serial('discover granules uses default concurrency of 3', async (t) => {
   const { event } = t.context;
 

From a50460e0cdc83ce11f7a9636f6ab94a6b7f38692 Mon Sep 17 00:00:00 2001
From: Jennifer Tran <12633533+botanical@users.noreply.github.com>
Date: Wed, 24 May 2023 10:32:20 -0700
Subject: [PATCH 3/7] Update deployment docs to exclude ACL setting (#3388)

---
 CHANGELOG.md              | 4 ++++
 docs/deployment/README.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73e0a54f9b9..e2da9254ca4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [v15.0.4] 2023-06-23
 
+### Changed
+
+- **CUMULUS-3307**
+  - Pinned cumulus dependency on `pg` to `v8.10.x`
 ### Fixed
 
 - **CUMULUS-3115**
diff --git a/docs/deployment/README.md b/docs/deployment/README.md
index b8735cbf7b1..18403013946 100644
--- a/docs/deployment/README.md
+++ b/docs/deployment/README.md
@@ -523,7 +523,7 @@ Deploy your dashboard to S3 bucket from the `cumulus-dashboard` directory:
 Using AWS CLI:
 
 ```bash
-  aws s3 sync dist s3://<prefix>-dashboard --acl public-read
+  aws s3 sync dist s3://<prefix>-dashboard
 ```
 
 From the S3 Console:

From 9119998e540233bc31c5e93e86aba83881e2da1b Mon Sep 17 00:00:00 2001
From: jennyhliu <jenny.h.liu@nasa.gov>
Date: Fri, 23 Jun 2023 12:41:35 -0400
Subject: [PATCH 4/7] update pg to 8.10.x, cherry-pick did not pickup changes

---
 lambdas/data-migration1/package.json               | 2 +-
 lambdas/data-migration2/package.json               | 2 +-
 lambdas/db-migration/package.json                  | 2 +-
 lambdas/db-provision-user-database/package.json    | 2 +-
 lambdas/postgres-migration-count-tool/package.json | 2 +-
 package.json                                       | 2 +-
 packages/db/package.json                           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lambdas/data-migration1/package.json b/lambdas/data-migration1/package.json
index 6f7abb05007..e8a8414eceb 100644
--- a/lambdas/data-migration1/package.json
+++ b/lambdas/data-migration1/package.json
@@ -34,7 +34,7 @@
     "@cumulus/types": "15.0.3",
     "knex": "2.4.1",
     "lodash": "^4.17.21",
-    "pg": "^8.3.0"
+    "pg": "~8.10"
   },
   "devDependencies": {
     "@cumulus/test-data": "15.0.3"
diff --git a/lambdas/data-migration2/package.json b/lambdas/data-migration2/package.json
index 50021c27124..81c2d95456a 100644
--- a/lambdas/data-migration2/package.json
+++ b/lambdas/data-migration2/package.json
@@ -40,7 +40,7 @@
     "knex": "2.4.1",
     "lodash": "^4.17.21",
     "p-map": "^4.0.0",
-    "pg": "^8.3.0"
+    "pg": "~8.10"
   },
   "devDependencies": {
     "@cumulus/test-data": "15.0.3"
diff --git a/lambdas/db-migration/package.json b/lambdas/db-migration/package.json
index 89fe368331f..15ce7b6ad7c 100644
--- a/lambdas/db-migration/package.json
+++ b/lambdas/db-migration/package.json
@@ -22,6 +22,6 @@
   "dependencies": {
     "@cumulus/db": "15.0.3",
     "knex": "2.4.1",
-    "pg": "^8.3.0"
+    "pg": "~8.10"
   }
 }
diff --git a/lambdas/db-provision-user-database/package.json b/lambdas/db-provision-user-database/package.json
index 2c7de7eee10..626c5cdaffd 100644
--- a/lambdas/db-provision-user-database/package.json
+++ b/lambdas/db-provision-user-database/package.json
@@ -27,7 +27,7 @@
     "@cumulus/common": "15.0.3",
     "@cumulus/db": "15.0.3",
     "knex": "2.4.1",
-    "pg": "^8.3.0"
+    "pg": "~8.10"
   },
   "devDependencies": {
     "@types/pg": "^7.14.4"
diff --git a/lambdas/postgres-migration-count-tool/package.json b/lambdas/postgres-migration-count-tool/package.json
index 41d12eb6120..5480d68459f 100644
--- a/lambdas/postgres-migration-count-tool/package.json
+++ b/lambdas/postgres-migration-count-tool/package.json
@@ -31,6 +31,6 @@
     "@cumulus/types": "15.0.3",
     "knex": "2.4.1",
     "p-map": "^4.0.0",
-    "pg": "^8.3.0"
+    "pg": "~8.10"
   }
 }
diff --git a/package.json b/package.json
index 55b17db6beb..e9f2c947713 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "p-timeout": "^3.2.0",
     "p-wait-for": "^3.1.0",
     "parallel": "^1.2.0",
-    "pg": "^8.3.0",
+    "pg": "~8.10",
     "proxyquire": "^2.1.3",
     "retry": "^0.12.0",
     "rewire": "^6.0.0",
diff --git a/packages/db/package.json b/packages/db/package.json
index 5b0fe73aded..da3014b3855 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -39,7 +39,7 @@
     "is-valid-hostname": "1.0.2",
     "knex": "2.4.1",
     "lodash": "^4.17.21",
-    "pg": "^8.3.0",
+    "pg": "~8.10",
     "snake-camel": "^1.0.6",
     "uuid": "8.3.2"
   },

From 44031a85fe09d9c021c5021d765ac61c5271e94d Mon Sep 17 00:00:00 2001
From: jennyhliu <jenny.h.liu@nasa.gov>
Date: Fri, 23 Jun 2023 13:38:08 -0400
Subject: [PATCH 5/7] resolve merge for #3373

---
 .../sf-event-sqs-to-db-records/test-index.js  | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/packages/api/tests/lambdas/sf-event-sqs-to-db-records/test-index.js b/packages/api/tests/lambdas/sf-event-sqs-to-db-records/test-index.js
index 0a392493f3d..908c24a1ef9 100644
--- a/packages/api/tests/lambdas/sf-event-sqs-to-db-records/test-index.js
+++ b/packages/api/tests/lambdas/sf-event-sqs-to-db-records/test-index.js
@@ -38,32 +38,25 @@ const {
 const {
   constructCollectionId,
 } = require('@cumulus/message/Collections');
-<<<<<<< HEAD
+const {
+  getMessageExecutionParentArn,
+} = require('@cumulus/message/Executions');
 
 const Execution = require('../../../models/executions');
 const Granule = require('../../../models/granules');
 const Pdr = require('../../../models/pdrs');
-=======
-const {
-  getMessageExecutionParentArn,
-} = require('@cumulus/message/Executions');
+
 const { createSqsQueues, getSqsQueueMessageCounts } = require('../../../lib/testUtils');
 const {
   writeRecords,
 } = require('../../../lambdas/sf-event-sqs-to-db-records');
->>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
 
 const {
   handler,
-  writeRecords,
 } = proxyquire('../../../lambdas/sf-event-sqs-to-db-records', {
-<<<<<<< HEAD
-  '@cumulus/aws-client/SQS': {
-    sendSQSMessage: (queue, message) => Promise.resolve([queue, message]),
-  },
   '@cumulus/aws-client/StepFunctions': {
     describeExecution: () => Promise.resolve({}),
-=======
+  },
   '@cumulus/message/Executions': {
     getMessageExecutionParentArn: (cumulusMessage) => {
       if (cumulusMessage.fail === true) {
@@ -71,7 +64,6 @@ const {
       }
       return getMessageExecutionParentArn(cumulusMessage);
     },
->>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
   },
 });
 
@@ -174,7 +166,6 @@ test.before(async (t) => {
   t.context.pdrPgModel = new PdrPgModel();
   t.context.providerPgModel = new ProviderPgModel();
 
-<<<<<<< HEAD
   process.env.ExecutionsTable = randomString();
   process.env.GranulesTable = randomString();
   process.env.PdrsTable = randomString();
@@ -200,10 +191,7 @@ test.before(async (t) => {
   await pdrModel.createTable();
   t.context.pdrModel = pdrModel;
 
-  fixture = await loadFixture('execution-running-event.json');
-=======
   t.context.fixture = await loadFixture('execution-running-event.json');
->>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
 
   const executionsTopicName = cryptoRandomString({ length: 10 });
   const pdrsTopicName = cryptoRandomString({ length: 10 });
@@ -440,28 +428,20 @@ test.serial('writeRecords() writes records to Dynamo and PostgreSQL', async (t)
   );
 });
 
-<<<<<<< HEAD
-test('Lambda sends message to DLQ when writeRecords() throws an error', async (t) => {
+test.serial('Lambda sends message to DLQ when writeRecords() throws an error', async (t) => {
   // make execution write throw an error
   const fakeExecutionModel = {
     storeExecution: () => {
       throw new Error('execution Dynamo error');
     },
   };
-
-=======
-test.serial('Lambda sends message to DLQ when writeRecords() throws an error', async (t) => {
->>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
   const {
     handlerResponse,
     sqsEvent,
   } = await runHandler({
     ...t.context,
-<<<<<<< HEAD
     executionModel: fakeExecutionModel,
-=======
     cumulusMessages: [{ fail: true }],
->>>>>>> 0d4bf26889 (CUMULUS-3223: Fix failed granule stuck in queued (#3373))
   });
 
   t.is(handlerResponse.batchItemFailures.length, 0);

From 8a29c48720a20288f66b8becbae8398665910529 Mon Sep 17 00:00:00 2001
From: jennyhliu <jenny.h.liu@nasa.gov>
Date: Fri, 23 Jun 2023 16:20:40 -0400
Subject: [PATCH 6/7] update version to 15.0.4

---
 CHANGELOG.md                                  |  4 +-
 example/lambdas/asyncOperations/package.json  |  2 +-
 .../ftpPopulateTestLambda/package.json        | 14 ++---
 example/lambdas/lzardsClientTest/package.json |  6 +--
 .../lambdas/python-processing/package.json    |  2 +-
 .../python-reference-activity/package.json    |  2 +-
 .../python-reference-task/package.json        |  2 +-
 example/lambdas/s3AccessTest/package.json     |  2 +-
 example/lambdas/snsS3Test/package.json        |  2 +-
 example/lambdas/versionUpTest/package.json    |  2 +-
 example/package.json                          | 52 +++++++++----------
 example/scripts/generate_ingest/package.json  |  6 +--
 example/scripts/lib/package.json              |  2 +-
 lambdas/data-migration1/package.json          | 18 +++----
 lambdas/data-migration2/package.json          | 20 +++----
 lambdas/db-migration/package.json             |  4 +-
 .../db-provision-user-database/package.json   |  6 +--
 .../package.json                              | 12 ++---
 .../package.json                              | 18 +++----
 lambdas/sqs-message-remover/package.json      | 10 ++--
 lerna.json                                    |  2 +-
 packages/api-client/package.json              |  8 +--
 packages/api/ecs/async-operation/package.json | 10 ++--
 packages/api/package.json                     | 44 ++++++++--------
 packages/async-operations/package.json        | 16 +++---
 packages/aws-client/package.json              |  8 +--
 packages/checksum/package.json                |  2 +-
 packages/cmr-client/package.json              | 10 ++--
 packages/cmrjs/package.json                   | 16 +++---
 packages/collection-config-store/package.json |  8 +--
 packages/common/package.json                  |  8 +--
 packages/db/package.json                      | 14 ++---
 packages/distribution-utils/package.json      |  8 +--
 packages/errors/package.json                  |  2 +-
 packages/es-client/package.json               | 14 ++---
 packages/ingest/package.json                  | 24 ++++-----
 packages/integration-tests/package.json       | 22 ++++----
 packages/launchpad-auth/package.json          |  6 +--
 packages/logger/package.json                  |  2 +-
 packages/lzards-api-client/package.json       | 12 ++---
 packages/message/package.json                 | 12 ++---
 packages/oauth-client/package.json            |  2 +-
 packages/object-store/package.json            |  4 +-
 packages/pvl/package.json                     |  2 +-
 packages/s3-credentials-endpoint/package.json | 14 ++---
 packages/schemas/package.json                 |  2 +-
 packages/sftp-client/package.json             | 10 ++--
 packages/tea-map-cache/package.json           |  6 +--
 packages/test-data/package.json               |  2 +-
 packages/tf-inventory/package.json            |  6 +--
 packages/types/package.json                   |  2 +-
 tasks/add-missing-file-checksums/package.json |  8 +--
 tasks/discover-granules/package.json          | 12 ++---
 tasks/discover-pdrs/package.json              | 10 ++--
 tasks/files-to-granules/package.json          |  8 +--
 tasks/hello-world/package.json                |  6 +--
 tasks/hyrax-metadata-updates/package.json     | 14 ++---
 tasks/lzards-backup/package.json              | 24 ++++-----
 tasks/move-granules/package.json              | 18 +++----
 tasks/parse-pdr/package.json                  | 18 +++----
 tasks/pdr-status-check/package.json           |  8 +--
 tasks/post-to-cmr/package.json                | 16 +++---
 tasks/queue-granules/package.json             | 14 ++---
 tasks/queue-pdrs/package.json                 | 10 ++--
 tasks/queue-workflow/package.json             | 10 ++--
 tasks/sf-sqs-report/package.json              |  6 +--
 tasks/sync-granule/package.json               | 18 +++----
 tasks/test-processing/package.json            |  6 +--
 .../package.json                              | 10 ++--
 .../package.json                              | 12 ++---
 tf-modules/ingest/package.json                |  2 +-
 .../cumulus-test-cleanup/package.json         |  2 +-
 tf-modules/s3-replicator/package.json         |  2 +-
 73 files changed, 360 insertions(+), 358 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2da9254ca4..11e045df7a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 - **CUMULUS-3307**
   - Pinned cumulus dependency on `pg` to `v8.10.x`
+
 ### Fixed
 
 - **CUMULUS-3115**
@@ -6930,7 +6931,8 @@ Note: There was an issue publishing 1.12.0. Upgrade to 1.12.1.
 
 ## [v1.0.0] - 2018-02-23
 
-[unreleased]: https://github.com/nasa/cumulus/compare/v15.0.3...HEAD
+[unreleased]: https://github.com/nasa/cumulus/compare/v15.0.4...HEAD
+[v15.0.4]: https://github.com/nasa/cumulus/compare/v15.0.3...v15.0.4
 [v15.0.3]: https://github.com/nasa/cumulus/compare/v15.0.2...v15.0.3
 [v15.0.2]: https://github.com/nasa/cumulus/compare/v15.0.1...v15.0.2
 [v15.0.1]: https://github.com/nasa/cumulus/compare/v15.0.0...v15.0.1
diff --git a/example/lambdas/asyncOperations/package.json b/example/lambdas/asyncOperations/package.json
index 29a543b9551..04e5e74eb85 100644
--- a/example/lambdas/asyncOperations/package.json
+++ b/example/lambdas/asyncOperations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-async-operations",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "AsyncOperations Test Lambda",
   "main": "index.js",
   "private": true,
diff --git a/example/lambdas/ftpPopulateTestLambda/package.json b/example/lambdas/ftpPopulateTestLambda/package.json
index e8744119138..de631a0999d 100644
--- a/example/lambdas/ftpPopulateTestLambda/package.json
+++ b/example/lambdas/ftpPopulateTestLambda/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ftp-populate-test-lambda",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "FTP Population Utility Lambda",
   "main": "index.js",
   "private": true,
@@ -19,12 +19,12 @@
     "access": "private"
   },
   "dependencies": {
-    "@cumulus/api": "15.0.3",
-    "@cumulus/api-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/integration-tests": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/test-data": "15.0.3",
+    "@cumulus/api": "15.0.4",
+    "@cumulus/api-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/integration-tests": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/test-data": "15.0.4",
     "aws-sdk": "^2.585.0",
     "fs-extra": "^9.0.0",
     "jsftp": "https://github.com/jkovarik/jsftp.git#add_288",
diff --git a/example/lambdas/lzardsClientTest/package.json b/example/lambdas/lzardsClientTest/package.json
index 8c8c40a9b3d..cf5f270ad7e 100644
--- a/example/lambdas/lzardsClientTest/package.json
+++ b/example/lambdas/lzardsClientTest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-lzards-api-lambda",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "LZARDS API Client Test Lambda",
   "private": true,
   "engines": {
@@ -20,7 +20,7 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/lzards-api-client": "15.0.3"
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/lzards-api-client": "15.0.4"
   }
 }
diff --git a/example/lambdas/python-processing/package.json b/example/lambdas/python-processing/package.json
index 2651258108d..0d21d02f4a8 100644
--- a/example/lambdas/python-processing/package.json
+++ b/example/lambdas/python-processing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/python-process-activity",
   "private": true,
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Python reference activity",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-activity",
   "repository": {
diff --git a/example/lambdas/python-reference-activity/package.json b/example/lambdas/python-reference-activity/package.json
index e02e0f2f55b..336b8478390 100644
--- a/example/lambdas/python-reference-activity/package.json
+++ b/example/lambdas/python-reference-activity/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/python-reference-activity",
   "private": true,
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Python reference activity",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-activity",
   "repository": {
diff --git a/example/lambdas/python-reference-task/package.json b/example/lambdas/python-reference-task/package.json
index c15e6c9cf23..2274c5e95a4 100644
--- a/example/lambdas/python-reference-task/package.json
+++ b/example/lambdas/python-reference-task/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/python-reference-task",
   "private": true,
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Python reference task",
   "main": "index.js",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/lambdas/python-reference-task",
diff --git a/example/lambdas/s3AccessTest/package.json b/example/lambdas/s3AccessTest/package.json
index a7fbeee193b..a6c11c46b57 100644
--- a/example/lambdas/s3AccessTest/package.json
+++ b/example/lambdas/s3AccessTest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-s3-access",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "S3 Access Test Lambda",
   "main": "index.js",
   "private": true,
diff --git a/example/lambdas/snsS3Test/package.json b/example/lambdas/snsS3Test/package.json
index 15c3adc7f8a..8e89ace903c 100644
--- a/example/lambdas/snsS3Test/package.json
+++ b/example/lambdas/snsS3Test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-sns-s3",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "SNS to S3 Test Lambda",
   "main": "index.js",
   "private": true,
diff --git a/example/lambdas/versionUpTest/package.json b/example/lambdas/versionUpTest/package.json
index 6da9f0923d5..f98cb7a0826 100644
--- a/example/lambdas/versionUpTest/package.json
+++ b/example/lambdas/versionUpTest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-version-up",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Version Up Test Lambda",
   "main": "index.js",
   "private": true,
diff --git a/example/package.json b/example/package.json
index c9c02c816e0..8079d55238a 100644
--- a/example/package.json
+++ b/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/cumulus-integration-tests",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Cumulus Integration Test Deployment",
   "private": true,
   "main": "index.js",
@@ -44,32 +44,32 @@
     ]
   },
   "dependencies": {
-    "@cumulus/api": "15.0.3",
-    "@cumulus/api-client": "15.0.3",
-    "@cumulus/async-operations": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/checksum": "15.0.3",
-    "@cumulus/cmr-client": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/discover-granules": "15.0.3",
-    "@cumulus/discover-pdrs": "15.0.3",
-    "@cumulus/files-to-granules": "15.0.3",
-    "@cumulus/hello-world": "15.0.3",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/integration-tests": "15.0.3",
-    "@cumulus/message": "15.0.3",
-    "@cumulus/move-granules": "15.0.3",
-    "@cumulus/parse-pdr": "15.0.3",
-    "@cumulus/pdr-status-check": "15.0.3",
-    "@cumulus/post-to-cmr": "15.0.3",
-    "@cumulus/queue-granules": "15.0.3",
-    "@cumulus/queue-pdrs": "15.0.3",
-    "@cumulus/sf-sqs-report": "15.0.3",
-    "@cumulus/sync-granule": "15.0.3",
-    "@cumulus/test-processing": "15.0.3"
+    "@cumulus/api": "15.0.4",
+    "@cumulus/api-client": "15.0.4",
+    "@cumulus/async-operations": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/checksum": "15.0.4",
+    "@cumulus/cmr-client": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/discover-granules": "15.0.4",
+    "@cumulus/discover-pdrs": "15.0.4",
+    "@cumulus/files-to-granules": "15.0.4",
+    "@cumulus/hello-world": "15.0.4",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/integration-tests": "15.0.4",
+    "@cumulus/message": "15.0.4",
+    "@cumulus/move-granules": "15.0.4",
+    "@cumulus/parse-pdr": "15.0.4",
+    "@cumulus/pdr-status-check": "15.0.4",
+    "@cumulus/post-to-cmr": "15.0.4",
+    "@cumulus/queue-granules": "15.0.4",
+    "@cumulus/queue-pdrs": "15.0.4",
+    "@cumulus/sf-sqs-report": "15.0.4",
+    "@cumulus/sync-granule": "15.0.4",
+    "@cumulus/test-processing": "15.0.4"
   },
   "devDependencies": {
-    "@cumulus/test-data": "15.0.3"
+    "@cumulus/test-data": "15.0.4"
   }
 }
diff --git a/example/scripts/generate_ingest/package.json b/example/scripts/generate_ingest/package.json
index 93700ec7f20..7d134497334 100644
--- a/example/scripts/generate_ingest/package.json
+++ b/example/scripts/generate_ingest/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/generate_ingest",
   "private": true,
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Script to generate test data for scaled ingest",
   "keywords": [
     "GIBS",
@@ -22,8 +22,8 @@
     "directory": "packages/types"
   },
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3"
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4"
   },
   "author": "Cumulus Authors",
   "license": "Apache-2.0"
diff --git a/example/scripts/lib/package.json b/example/scripts/lib/package.json
index da26b589ac9..d6e6fe9223c 100644
--- a/example/scripts/lib/package.json
+++ b/example/scripts/lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/example-lib",
   "private": true,
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "example project libs",
   "homepage": "https://github.com/nasa/cumulus/tree/master/example/scripts/lib",
   "engines": {
diff --git a/lambdas/data-migration1/package.json b/lambdas/data-migration1/package.json
index e8a8414eceb..8e7ad3362d9 100644
--- a/lambdas/data-migration1/package.json
+++ b/lambdas/data-migration1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/data-migration1",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Lambda function used for doing data migrations",
   "license": "Apache-2.0",
   "engines": {
@@ -25,18 +25,18 @@
     "timeout": "15m"
   },
   "dependencies": {
-    "@cumulus/api": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/db": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/types": "15.0.3",
+    "@cumulus/api": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/db": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/types": "15.0.4",
     "knex": "2.4.1",
     "lodash": "^4.17.21",
     "pg": "~8.10"
   },
   "devDependencies": {
-    "@cumulus/test-data": "15.0.3"
+    "@cumulus/test-data": "15.0.4"
   }
 }
diff --git a/lambdas/data-migration2/package.json b/lambdas/data-migration2/package.json
index 81c2d95456a..889d0958611 100644
--- a/lambdas/data-migration2/package.json
+++ b/lambdas/data-migration2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/data-migration2",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Lambda function used for doing data migrations intended to be executed after data-migration1.",
   "license": "Apache-2.0",
   "engines": {
@@ -28,14 +28,14 @@
     "@aws-sdk/client-dynamodb": "^3.58.0",
     "@aws-sdk/lib-dynamodb": "^3.58.0",
     "@aws-sdk/util-dynamodb": "^3.58.0",
-    "@cumulus/api": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/db": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/message": "15.0.3",
-    "@cumulus/types": "15.0.3",
+    "@cumulus/api": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/db": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/message": "15.0.4",
+    "@cumulus/types": "15.0.4",
     "JSONStream": "1.3.5",
     "knex": "2.4.1",
     "lodash": "^4.17.21",
@@ -43,6 +43,6 @@
     "pg": "~8.10"
   },
   "devDependencies": {
-    "@cumulus/test-data": "15.0.3"
+    "@cumulus/test-data": "15.0.4"
   }
 }
diff --git a/lambdas/db-migration/package.json b/lambdas/db-migration/package.json
index 15ce7b6ad7c..12c8e5549ba 100644
--- a/lambdas/db-migration/package.json
+++ b/lambdas/db-migration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db-migration-lambda",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Lambda function used for deploying DB migrations",
   "license": "Apache-2.0",
   "engines": {
@@ -20,7 +20,7 @@
     "tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles"
   },
   "dependencies": {
-    "@cumulus/db": "15.0.3",
+    "@cumulus/db": "15.0.4",
     "knex": "2.4.1",
     "pg": "~8.10"
   }
diff --git a/lambdas/db-provision-user-database/package.json b/lambdas/db-provision-user-database/package.json
index 626c5cdaffd..b8353d5893f 100644
--- a/lambdas/db-provision-user-database/package.json
+++ b/lambdas/db-provision-user-database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db-provision-user-database-lambda",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Lambda function used for provisioning user databases",
   "engines": {
     "node": ">=16.19.0"
@@ -24,8 +24,8 @@
     "timeout": "2m"
   },
   "dependencies": {
-    "@cumulus/common": "15.0.3",
-    "@cumulus/db": "15.0.3",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/db": "15.0.4",
     "knex": "2.4.1",
     "pg": "~8.10"
   },
diff --git a/lambdas/postgres-migration-async-operation/package.json b/lambdas/postgres-migration-async-operation/package.json
index 696c243ebd1..964d9327431 100644
--- a/lambdas/postgres-migration-async-operation/package.json
+++ b/lambdas/postgres-migration-async-operation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/postgres-migration-async-operation",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Lambda function used to start an ECS task to run data-migrations2 lambda",
   "license": "Apache-2.0",
   "engines": {
@@ -28,12 +28,12 @@
     "timeout": "15m"
   },
   "dependencies": {
-    "@cumulus/api": "15.0.3",
-    "@cumulus/async-operations": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/types": "15.0.3"
+    "@cumulus/api": "15.0.4",
+    "@cumulus/async-operations": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/types": "15.0.4"
   },
   "devDependencies": {
-    "@cumulus/test-data": "15.0.3"
+    "@cumulus/test-data": "15.0.4"
   }
 }
diff --git a/lambdas/postgres-migration-count-tool/package.json b/lambdas/postgres-migration-count-tool/package.json
index 5480d68459f..04adfae1d37 100644
--- a/lambdas/postgres-migration-count-tool/package.json
+++ b/lambdas/postgres-migration-count-tool/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/postgres-reconcile",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Lambda function used for generating counts between Dynamo/ES and Postgres",
   "license": "Apache-2.0",
   "engines": {
@@ -21,14 +21,14 @@
     "tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles"
   },
   "dependencies": {
-    "@cumulus/api": "15.0.3",
-    "@cumulus/api-client": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/db": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/message": "15.0.3",
-    "@cumulus/types": "15.0.3",
+    "@cumulus/api": "15.0.4",
+    "@cumulus/api-client": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/db": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/message": "15.0.4",
+    "@cumulus/types": "15.0.4",
     "knex": "2.4.1",
     "p-map": "^4.0.0",
     "pg": "~8.10"
diff --git a/lambdas/sqs-message-remover/package.json b/lambdas/sqs-message-remover/package.json
index 3c954f7aa87..87e8abc939b 100644
--- a/lambdas/sqs-message-remover/package.json
+++ b/lambdas/sqs-message-remover/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/sqs-message-remover-lambda",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Remove processed messages from SQS queues",
   "main": "src/index.js",
   "private": true,
@@ -36,10 +36,10 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "lodash": "^4.17.21"
   }
 }
diff --git a/lerna.json b/lerna.json
index 099fb336705..4d22063fa48 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "3.20.2",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "packages": [
     "example",
     "example/lambdas/*",
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index f77d750458d..0f480a8c201 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/api-client",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "API client for working with the Cumulus archive API",
   "keywords": [
     "GIBS",
@@ -38,11 +38,11 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "p-retry": "^2.0.0"
   },
   "devDependencies": {
-    "@cumulus/types": "15.0.3"
+    "@cumulus/types": "15.0.4"
   }
 }
diff --git a/packages/api/ecs/async-operation/package.json b/packages/api/ecs/async-operation/package.json
index 684a8f3f438..a3ff82f3ba3 100644
--- a/packages/api/ecs/async-operation/package.json
+++ b/packages/api/ecs/async-operation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ecs-async-operation",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "The docker image for running async operations",
   "keywords": [
     "NASA",
@@ -20,10 +20,10 @@
     "test": "../../../../node_modules/.bin/ava"
   },
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/db": "15.0.3",
-    "@cumulus/es-client": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/db": "15.0.4",
+    "@cumulus/es-client": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "aws-sdk": "^2.585.0",
     "crypto-random-string": "^3.2.0",
     "got": "^11.8.5",
diff --git a/packages/api/package.json b/packages/api/package.json
index f885d309bd5..7cc1d29801c 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/api",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Lambda functions for handling all daac's API operations",
   "main": "index.js",
   "engines": {
@@ -52,26 +52,26 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/api-client": "15.0.3",
-    "@cumulus/async-operations": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cmr-client": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/collection-config-store": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/db": "15.0.3",
-    "@cumulus/distribution-utils": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/es-client": "15.0.3",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/launchpad-auth": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/message": "15.0.3",
-    "@cumulus/oauth-client": "15.0.3",
-    "@cumulus/object-store": "15.0.3",
-    "@cumulus/pvl": "15.0.3",
-    "@cumulus/sftp-client": "15.0.3",
-    "@cumulus/types": "15.0.3",
+    "@cumulus/api-client": "15.0.4",
+    "@cumulus/async-operations": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/cmr-client": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/collection-config-store": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/db": "15.0.4",
+    "@cumulus/distribution-utils": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/es-client": "15.0.4",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/launchpad-auth": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/message": "15.0.4",
+    "@cumulus/oauth-client": "15.0.4",
+    "@cumulus/object-store": "15.0.4",
+    "@cumulus/pvl": "15.0.4",
+    "@cumulus/sftp-client": "15.0.4",
+    "@cumulus/types": "15.0.4",
     "@mapbox/dyno": "^1.4.2",
     "aggregate-error": "^3.1.0",
     "ajv": "^6.12.3",
@@ -122,6 +122,6 @@
     }
   },
   "devDependencies": {
-    "@cumulus/test-data": "15.0.3"
+    "@cumulus/test-data": "15.0.4"
   }
 }
diff --git a/packages/async-operations/package.json b/packages/async-operations/package.json
index 1a75c99bbdf..2707d0e7ab1 100644
--- a/packages/async-operations/package.json
+++ b/packages/async-operations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/async-operations",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Cumulus Core internal async operations module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -28,17 +28,17 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/db": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/es-client": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/types": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/db": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/es-client": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/types": "15.0.4",
     "knex": "2.4.1",
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@cumulus/common": "15.0.3",
+    "@cumulus/common": "15.0.4",
     "@types/aws-sdk": "2.7.0",
     "@types/uuid": "^8.0.0"
   }
diff --git a/packages/aws-client/package.json b/packages/aws-client/package.json
index d760f800bc4..95d306255c6 100644
--- a/packages/aws-client/package.json
+++ b/packages/aws-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/aws-client",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Utilities for working with AWS",
   "keywords": [
     "GIBS",
@@ -52,9 +52,9 @@
     "@aws-sdk/s3-request-presigner": "^3.58.0",
     "@aws-sdk/signature-v4-crt": "^3.58.0",
     "@aws-sdk/types": "^3.58.0",
-    "@cumulus/checksum": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/checksum": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "aws-sdk": "^2.585.0",
     "jsonpath-plus": "^1.1.0",
     "lodash": "~4.17.21",
diff --git a/packages/checksum/package.json b/packages/checksum/package.json
index 5a3d2f24fca..1a19db82eac 100644
--- a/packages/checksum/package.json
+++ b/packages/checksum/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/checksum",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Cumulus checksum utilities",
   "engines": {
     "node": ">=16.19.0"
diff --git a/packages/cmr-client/package.json b/packages/cmr-client/package.json
index 3b5a121700f..8c9aaace650 100644
--- a/packages/cmr-client/package.json
+++ b/packages/cmr-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/cmr-client",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Node.js client to NASA's Common Metadata Repository (CMR) API.",
   "engines": {
     "node": ">=16.19.0"
@@ -34,10 +34,10 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "got": "^11.8.5",
     "jsonwebtoken": "^9.0.0",
     "lodash": "^4.17.21",
diff --git a/packages/cmrjs/package.json b/packages/cmrjs/package.json
index 65d9d067d4d..c19fc1ff192 100644
--- a/packages/cmrjs/package.json
+++ b/packages/cmrjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/cmrjs",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A node SDK for CMR",
   "engines": {
     "node": ">=16.19.0"
@@ -33,13 +33,13 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cmr-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/distribution-utils": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/launchpad-auth": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/cmr-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/distribution-utils": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/launchpad-auth": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "got": "^11.8.1",
     "js2xmlparser": "^4.0.0",
     "lodash": "^4.17.21",
diff --git a/packages/collection-config-store/package.json b/packages/collection-config-store/package.json
index 356dfbefb0a..69c0aacd288 100644
--- a/packages/collection-config-store/package.json
+++ b/packages/collection-config-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/collection-config-store",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Utility for persisting collection configuration to S3 and retrieving it",
   "keywords": [
     "CUMULUS",
@@ -32,8 +32,8 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/message": "15.0.3"
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/message": "15.0.4"
   }
 }
diff --git a/packages/common/package.json b/packages/common/package.json
index d919d79233b..cabd3f71c1c 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/common",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Common utilities used across tasks",
   "keywords": [
     "GIBS",
@@ -43,9 +43,9 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.58.0",
     "@aws-sdk/signature-v4-crt": "^3.58.0",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "ajv": "^6.12.3",
     "aws-sdk": "^2.585.0",
     "follow-redirects": "^1.2.4",
diff --git a/packages/db/package.json b/packages/db/package.json
index da3014b3855..c1b60e4ffd8 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Utilities for working with the Cumulus DB",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -29,12 +29,12 @@
     "node": ">=16.19.0"
   },
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/message": "15.0.3",
-    "@cumulus/types": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/message": "15.0.4",
+    "@cumulus/types": "15.0.4",
     "crypto-random-string": "^3.2.0",
     "is-valid-hostname": "1.0.2",
     "knex": "2.4.1",
diff --git a/packages/distribution-utils/package.json b/packages/distribution-utils/package.json
index cbec92e2b28..aa3a193aa0b 100644
--- a/packages/distribution-utils/package.json
+++ b/packages/distribution-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/distribution-utils",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Cumulus Distribution utilities",
   "keywords": [
     "CUMULUS"
@@ -33,9 +33,9 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/errors": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/errors": "15.0.4",
     "url-join": "^1.1.0"
   },
   "devDependencies": {
diff --git a/packages/errors/package.json b/packages/errors/package.json
index d429a32dc66..88cbfe47ff4 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/errors",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Provides error classes for Cumulus",
   "keywords": [
     "GIBS",
diff --git a/packages/es-client/package.json b/packages/es-client/package.json
index 826845e0e51..690167cb6b9 100644
--- a/packages/es-client/package.json
+++ b/packages/es-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/es-client",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Utilities for working with Elasticsearch",
   "keywords": [
     "CUMULUS",
@@ -30,10 +30,10 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/common": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/message": "15.0.3",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/message": "15.0.4",
     "@elastic/elasticsearch": "^5.6.20",
     "aws-elasticsearch-connector": "8.2.0",
     "aws-sdk": "^2.585.0",
@@ -42,8 +42,8 @@
     "p-limit": "^1.2.0"
   },
   "devDependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/test-data": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/test-data": "15.0.4",
     "p-each-series": "^2.1.0"
   }
 }
diff --git a/packages/ingest/package.json b/packages/ingest/package.json
index 9337ab38c9d..ab41895b576 100644
--- a/packages/ingest/package.json
+++ b/packages/ingest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ingest",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Ingest utilities",
   "engines": {
     "node": ">=16.19.0"
@@ -38,13 +38,13 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/db": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/message": "15.0.3",
-    "@cumulus/sftp-client": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/db": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/message": "15.0.4",
+    "@cumulus/sftp-client": "15.0.4",
     "aws-sdk": "^2.585.0",
     "cksum": "^1.3.0",
     "encodeurl": "^1.0.2",
@@ -60,9 +60,9 @@
     "tough-cookie": "~4.0.0"
   },
   "devDependencies": {
-    "@cumulus/checksum": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/test-data": "15.0.3",
-    "@cumulus/types": "15.0.3"
+    "@cumulus/checksum": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/test-data": "15.0.4",
+    "@cumulus/types": "15.0.4"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 5110524f5b4..6181935b922 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/integration-tests",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Integration tests",
   "bin": {
     "cumulus-test": "./bin/cli.js"
@@ -28,16 +28,16 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/api": "15.0.3",
-    "@cumulus/api-client": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cmr-client": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/launchpad-auth": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/message": "15.0.3",
-    "@cumulus/oauth-client": "15.0.3",
+    "@cumulus/api": "15.0.4",
+    "@cumulus/api-client": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/cmr-client": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/launchpad-auth": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/message": "15.0.4",
+    "@cumulus/oauth-client": "15.0.4",
     "aws-sdk": "^2.585.0",
     "base-64": "^0.1.0",
     "commander": "^2.15.0",
diff --git a/packages/launchpad-auth/package.json b/packages/launchpad-auth/package.json
index f91e4cbd458..50c39820605 100644
--- a/packages/launchpad-auth/package.json
+++ b/packages/launchpad-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/launchpad-auth",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Utilities for authentication with Launchpad",
   "keywords": [
     "CUMULUS",
@@ -37,8 +37,8 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "got": "^11.8.5",
     "lodash": "^4.17.21",
     "uuid": "^3.2.1"
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 0ac6c131991..fe73597a645 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/logger",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A log library for use on Cumulus",
   "keywords": [
     "GIBS",
diff --git a/packages/lzards-api-client/package.json b/packages/lzards-api-client/package.json
index c444436fde4..59a5c3d6957 100644
--- a/packages/lzards-api-client/package.json
+++ b/packages/lzards-api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/lzards-api-client",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Node.js client to NASA's Level Zero and Repositories Data Store (LZARDS) API.",
   "engines": {
     "node": ">=16.19.0"
@@ -33,11 +33,11 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/launchpad-auth": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/launchpad-auth": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "got": "^11.8.5",
     "lodash": "^4.17.21"
   }
diff --git a/packages/message/package.json b/packages/message/package.json
index 3daa02d9fee..410fdcbbf92 100644
--- a/packages/message/package.json
+++ b/packages/message/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/message",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Utilities for building and parsing Cumulus messages",
   "keywords": [
     "GIBS",
@@ -38,11 +38,11 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/types": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/types": "15.0.4",
     "jsonpath-plus": "^3.0.0",
     "lodash": "^4.17.21",
     "uuid": "^8.2.0"
diff --git a/packages/oauth-client/package.json b/packages/oauth-client/package.json
index d9aa09697ce..bad3be0f588 100644
--- a/packages/oauth-client/package.json
+++ b/packages/oauth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/oauth-client",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A generic auth client",
   "homepage": "https://github.com/nasa/cumulus/tree/master/packages/oauth-client#readme",
   "repository": {
diff --git a/packages/object-store/package.json b/packages/object-store/package.json
index f62afb584a2..d9723c77035 100644
--- a/packages/object-store/package.json
+++ b/packages/object-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/object-store",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Utilities for managing object stores",
   "keywords": [
     "GIBS",
@@ -39,6 +39,6 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3"
+    "@cumulus/aws-client": "15.0.4"
   }
 }
diff --git a/packages/pvl/package.json b/packages/pvl/package.json
index 8b056ec6dc1..956d638e8b3 100644
--- a/packages/pvl/package.json
+++ b/packages/pvl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/pvl",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Parse and serialize Parameter Value Language, a data markup language used by NASA",
   "main": "index.js",
   "engine": {
diff --git a/packages/s3-credentials-endpoint/package.json b/packages/s3-credentials-endpoint/package.json
index 44e2885bf83..dbe10b75b81 100644
--- a/packages/s3-credentials-endpoint/package.json
+++ b/packages/s3-credentials-endpoint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/s3-credentials-endpoint",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "An API Gateway Lambda to return AWS credentials for fetching objects from S3",
   "license": "Apache-2.0",
   "engines": {
@@ -17,12 +17,12 @@
     "timeout": "15m"
   },
   "dependencies": {
-    "@cumulus/api": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/oauth-client": "15.0.3",
+    "@cumulus/api": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/oauth-client": "15.0.4",
     "aws-serverless-express": "^3.3.6",
     "body-parser": "^1.19.0",
     "cookie-parser": "^1.4.4",
diff --git a/packages/schemas/package.json b/packages/schemas/package.json
index e6c7dca68dc..e0e66e974d0 100644
--- a/packages/schemas/package.json
+++ b/packages/schemas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/schemas",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Helpers for managing Cumulus task schemas",
   "homepage": "https://github.com/nasa/cumulus/tree/master/packages/schemas",
   "repository": {
diff --git a/packages/sftp-client/package.json b/packages/sftp-client/package.json
index 7f31d06f876..2b4c990a031 100644
--- a/packages/sftp-client/package.json
+++ b/packages/sftp-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/sftp-client",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "A Promise-based SFTP client",
   "keywords": [
     "GIBS",
@@ -36,16 +36,16 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.27",
     "ssh2": "^1.0.0",
     "ssh2-sftp-client": "^7.0.4"
   },
   "devDependencies": {
-    "@cumulus/checksum": "15.0.3",
-    "@cumulus/test-data": "15.0.3",
+    "@cumulus/checksum": "15.0.4",
+    "@cumulus/test-data": "15.0.4",
     "@types/ssh2-sftp-client": "^7.0.0"
   }
 }
diff --git a/packages/tea-map-cache/package.json b/packages/tea-map-cache/package.json
index 0dc140c3b2a..abf59a24a83 100644
--- a/packages/tea-map-cache/package.json
+++ b/packages/tea-map-cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/tea-map-cache",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Tea Bucket Map Cache Writer",
   "main": "index.js",
   "engines": {
@@ -27,8 +27,8 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "got": "^11.8.5",
     "p-retry": "^4.2.0"
   },
diff --git a/packages/test-data/package.json b/packages/test-data/package.json
index 637ca4d3773..8b1080fa2ac 100644
--- a/packages/test-data/package.json
+++ b/packages/test-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-data",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Includes the test data for various packages",
   "keywords": [
     "GIBS",
diff --git a/packages/tf-inventory/package.json b/packages/tf-inventory/package.json
index 52c0404b886..a744f28c8a6 100644
--- a/packages/tf-inventory/package.json
+++ b/packages/tf-inventory/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/tf-inventory",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Package to help keep track of what resources are managed by Terraform in the AWS account",
   "main": "index.js",
   "engines": {
@@ -30,11 +30,11 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
     "commander": "^4.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@cumulus/common": "15.0.3"
+    "@cumulus/common": "15.0.4"
   }
 }
diff --git a/packages/types/package.json b/packages/types/package.json
index 81ca2b195ee..2cf12524b78 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/types",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "TypeScript definitions for working with Cumulus data structures",
   "keywords": [
     "GIBS",
diff --git a/tasks/add-missing-file-checksums/package.json b/tasks/add-missing-file-checksums/package.json
index 245a21f7a7f..f123027c8bd 100644
--- a/tasks/add-missing-file-checksums/package.json
+++ b/tasks/add-missing-file-checksums/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/add-missing-file-checksums",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Add checksums to files in S3 which don't have one",
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
@@ -42,12 +42,12 @@
     }
   },
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5"
   },
   "devDependencies": {
-    "@cumulus/schemas": "15.0.3",
-    "@cumulus/types": "15.0.3",
+    "@cumulus/schemas": "15.0.4",
+    "@cumulus/types": "15.0.4",
     "@types/aws-lambda": "^8.10.58"
   }
 }
diff --git a/tasks/discover-granules/package.json b/tasks/discover-granules/package.json
index c5270eca329..ecd5251a66b 100644
--- a/tasks/discover-granules/package.json
+++ b/tasks/discover-granules/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/discover-granules",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Discover Granules in FTP/HTTP/HTTPS/SFTP/S3 endpoints",
   "main": "index.js",
   "directories": {
@@ -35,16 +35,16 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/api-client": "15.0.3",
+    "@cumulus/api-client": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/logger": "15.0.3",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/logger": "15.0.4",
     "got": "^11.8.5",
     "lodash": "^4.17.21",
     "p-map": "^4.0.0"
   },
   "devDependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3"
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4"
   }
 }
diff --git a/tasks/discover-pdrs/package.json b/tasks/discover-pdrs/package.json
index 01facd7f272..d807919252c 100644
--- a/tasks/discover-pdrs/package.json
+++ b/tasks/discover-pdrs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/discover-pdrs",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Discover PDRs in FTP and HTTP endpoints",
   "main": "index.js",
   "directories": {
@@ -34,14 +34,14 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/ingest": "15.0.3",
+    "@cumulus/ingest": "15.0.4",
     "lodash": "^4.17.21",
     "p-filter": "^2.1.0"
   },
   "devDependencies": {
-    "@cumulus/common": "15.0.3",
-    "@cumulus/errors": "15.0.3"
+    "@cumulus/common": "15.0.4",
+    "@cumulus/errors": "15.0.4"
   }
 }
diff --git a/tasks/files-to-granules/package.json b/tasks/files-to-granules/package.json
index 2b5c1b2114a..844323bf911 100644
--- a/tasks/files-to-granules/package.json
+++ b/tasks/files-to-granules/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/files-to-granules",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Converts array-of-files input into a granules object by extracting granuleId from filename",
   "main": "index.js",
   "directories": {
@@ -32,12 +32,12 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@cumulus/common": "15.0.3",
-    "@cumulus/schemas": "15.0.3"
+    "@cumulus/common": "15.0.4",
+    "@cumulus/schemas": "15.0.4"
   }
 }
diff --git a/tasks/hello-world/package.json b/tasks/hello-world/package.json
index e9140c7054a..a2d2e12a148 100644
--- a/tasks/hello-world/package.json
+++ b/tasks/hello-world/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/hello-world",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Example task",
   "main": "index.js",
   "directories": {
@@ -32,8 +32,8 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5"
   }
 }
diff --git a/tasks/hyrax-metadata-updates/package.json b/tasks/hyrax-metadata-updates/package.json
index 855d7e24485..5e93defabea 100644
--- a/tasks/hyrax-metadata-updates/package.json
+++ b/tasks/hyrax-metadata-updates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/hyrax-metadata-updates",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Update granule metadata with hooks to OPeNDAP URL",
   "main": "index.js",
   "directories": {
@@ -38,18 +38,18 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cmr-client": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/cmr-client": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/errors": "15.0.3",
+    "@cumulus/errors": "15.0.4",
     "libxmljs": "^0.19.7",
     "lodash": "^4.17.21",
     "xml2js": "0.5.0"
   },
   "devDependencies": {
-    "@cumulus/schemas": "15.0.3",
+    "@cumulus/schemas": "15.0.4",
     "jsonwebtoken": "^9.0.0",
     "nock": "^12.0.1",
     "rewire": "^6.0.0"
diff --git a/tasks/lzards-backup/package.json b/tasks/lzards-backup/package.json
index 5a4604a0061..4d019bcb03a 100644
--- a/tasks/lzards-backup/package.json
+++ b/tasks/lzards-backup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/lzards-backup",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Run LZARDS backup",
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
@@ -42,20 +42,20 @@
     }
   },
   "dependencies": {
-    "@cumulus/api-client": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/api-client": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/db": "15.0.3",
-    "@cumulus/distribution-utils": "15.0.3",
-    "@cumulus/launchpad-auth": "15.0.3",
-    "@cumulus/logger": "15.0.3",
-    "@cumulus/lzards-api-client": "15.0.3",
-    "@cumulus/message": "15.0.3",
+    "@cumulus/db": "15.0.4",
+    "@cumulus/distribution-utils": "15.0.4",
+    "@cumulus/launchpad-auth": "15.0.4",
+    "@cumulus/logger": "15.0.4",
+    "@cumulus/lzards-api-client": "15.0.4",
+    "@cumulus/message": "15.0.4",
     "got": "^11.8.5"
   },
   "devDependencies": {
-    "@cumulus/schemas": "15.0.3",
-    "@cumulus/types": "15.0.3"
+    "@cumulus/schemas": "15.0.4",
+    "@cumulus/types": "15.0.4"
   }
 }
diff --git a/tasks/move-granules/package.json b/tasks/move-granules/package.json
index 3278b8bc01b..8b10700ae59 100644
--- a/tasks/move-granules/package.json
+++ b/tasks/move-granules/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/move-granules",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Move granule files from staging to final location",
   "main": "index.js",
   "directories": {
@@ -38,17 +38,17 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/distribution-utils": "15.0.3",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/message": "15.0.3",
+    "@cumulus/distribution-utils": "15.0.4",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/message": "15.0.4",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@cumulus/schemas": "15.0.3"
+    "@cumulus/schemas": "15.0.4"
   }
 }
diff --git a/tasks/parse-pdr/package.json b/tasks/parse-pdr/package.json
index 203fa89a9ff..0513d820863 100644
--- a/tasks/parse-pdr/package.json
+++ b/tasks/parse-pdr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/parse-pdr",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Download and Parse a given PDR",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -30,17 +30,17 @@
     "timeout": "15m"
   },
   "dependencies": {
-    "@cumulus/api-client": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/collection-config-store": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/api-client": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/collection-config-store": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/pvl": "15.0.3",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/pvl": "15.0.4",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@cumulus/test-data": "15.0.3"
+    "@cumulus/test-data": "15.0.4"
   }
 }
diff --git a/tasks/pdr-status-check/package.json b/tasks/pdr-status-check/package.json
index c6d01f3123b..a96dcee634f 100644
--- a/tasks/pdr-status-check/package.json
+++ b/tasks/pdr-status-check/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/pdr-status-check",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Checks execution status of granules in a PDR",
   "main": "index.js",
   "directories": {
@@ -32,9 +32,9 @@
     "timeout": "15m"
   },
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/errors": "15.0.3"
+    "@cumulus/errors": "15.0.4"
   }
 }
diff --git a/tasks/post-to-cmr/package.json b/tasks/post-to-cmr/package.json
index ba8d9fb8d98..ddb0c2c5814 100644
--- a/tasks/post-to-cmr/package.json
+++ b/tasks/post-to-cmr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/post-to-cmr",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Post a given granule to CMR",
   "main": "index.js",
   "directories": {
@@ -33,16 +33,16 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/launchpad-auth": "15.0.3",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/launchpad-auth": "15.0.4",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@cumulus/cmr-client": "15.0.3",
-    "@cumulus/schemas": "15.0.3"
+    "@cumulus/cmr-client": "15.0.4",
+    "@cumulus/schemas": "15.0.4"
   }
 }
diff --git a/tasks/queue-granules/package.json b/tasks/queue-granules/package.json
index 60474cb5aa3..9859e0b939f 100644
--- a/tasks/queue-granules/package.json
+++ b/tasks/queue-granules/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/queue-granules",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Add discovered granules to the queue",
   "main": "index.js",
   "directories": {
@@ -31,13 +31,13 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/api-client": "15.0.3",
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/collection-config-store": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/api-client": "15.0.4",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/collection-config-store": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/message": "15.0.3",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/message": "15.0.4",
     "lodash": "^4.17.21",
     "p-map": "^4.0.0"
   }
diff --git a/tasks/queue-pdrs/package.json b/tasks/queue-pdrs/package.json
index 87f643e294a..3caf639b74b 100644
--- a/tasks/queue-pdrs/package.json
+++ b/tasks/queue-pdrs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/queue-pdrs",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Add discovered PDRs to a queue",
   "main": "index.js",
   "directories": {
@@ -31,11 +31,11 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/message": "15.0.3",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/message": "15.0.4",
     "lodash": "^4.17.21"
   }
 }
diff --git a/tasks/queue-workflow/package.json b/tasks/queue-workflow/package.json
index 2288d2b50e4..adbb5576eb8 100644
--- a/tasks/queue-workflow/package.json
+++ b/tasks/queue-workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/queue-workflow",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Add workflow to the queue",
   "main": "index.js",
   "directories": {
@@ -31,11 +31,11 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/message": "15.0.3",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/message": "15.0.4",
     "lodash": "^4.17.21"
   }
 }
diff --git a/tasks/sf-sqs-report/package.json b/tasks/sf-sqs-report/package.json
index 9bb76411095..4ae046b77d7 100644
--- a/tasks/sf-sqs-report/package.json
+++ b/tasks/sf-sqs-report/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/sf-sqs-report",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Sends an incoming Cumulus message to SQS",
   "main": "index.js",
   "directories": {
@@ -32,11 +32,11 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@cumulus/common": "15.0.3"
+    "@cumulus/common": "15.0.4"
   }
 }
diff --git a/tasks/sync-granule/package.json b/tasks/sync-granule/package.json
index 03e1db3e1c8..e23932738e9 100644
--- a/tasks/sync-granule/package.json
+++ b/tasks/sync-granule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/sync-granule",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Download a given granule",
   "main": "index.js",
   "directories": {
@@ -37,19 +37,19 @@
     "timeout": "15m"
   },
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/collection-config-store": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/collection-config-store": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/errors": "15.0.3",
-    "@cumulus/ingest": "15.0.3",
-    "@cumulus/message": "15.0.3",
+    "@cumulus/errors": "15.0.4",
+    "@cumulus/ingest": "15.0.4",
+    "@cumulus/message": "15.0.4",
     "lodash": "^4.17.21",
     "p-map": "^2.1.0",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
-    "@cumulus/schemas": "15.0.3",
-    "@cumulus/test-data": "15.0.3"
+    "@cumulus/schemas": "15.0.4",
+    "@cumulus/test-data": "15.0.4"
   }
 }
diff --git a/tasks/test-processing/package.json b/tasks/test-processing/package.json
index 092992ec220..bb48b156594 100644
--- a/tasks/test-processing/package.json
+++ b/tasks/test-processing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/test-processing",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Fake processing task used for integration tests",
   "main": "index.js",
   "homepage": "https://github.com/nasa/cumulus/tree/master/tasks/test-processing",
@@ -21,8 +21,8 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/integration-tests": "15.0.3"
+    "@cumulus/integration-tests": "15.0.4"
   }
 }
diff --git a/tasks/update-cmr-access-constraints/package.json b/tasks/update-cmr-access-constraints/package.json
index 84206084cb6..69fab6802e0 100644
--- a/tasks/update-cmr-access-constraints/package.json
+++ b/tasks/update-cmr-access-constraints/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/update-cmr-access-constraints",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Updates CMR metadata to set access constraints",
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
@@ -34,13 +34,13 @@
     "verbose": true
   },
   "dependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/cmrjs": "15.0.3",
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/cmrjs": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
     "lodash": "^4.17.5"
   },
   "devDependencies": {
-    "@cumulus/common": "15.0.3",
-    "@cumulus/schemas": "15.0.3"
+    "@cumulus/common": "15.0.4",
+    "@cumulus/schemas": "15.0.4"
   }
 }
diff --git a/tasks/update-granules-cmr-metadata-file-links/package.json b/tasks/update-granules-cmr-metadata-file-links/package.json
index 935e11b45c6..41a66b7429f 100644
--- a/tasks/update-granules-cmr-metadata-file-links/package.json
+++ b/tasks/update-granules-cmr-metadata-file-links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/update-granules-cmr-metadata-file-links",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Update CMR metadata files with correct online access urls and etags and transfer etag info to granules' CMR files",
   "main": "index.js",
   "directories": {
@@ -38,14 +38,14 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/cmrjs": "15.0.3",
-    "@cumulus/common": "15.0.3",
+    "@cumulus/cmrjs": "15.0.4",
+    "@cumulus/common": "15.0.4",
     "@cumulus/cumulus-message-adapter-js": "2.0.5",
-    "@cumulus/distribution-utils": "15.0.3",
+    "@cumulus/distribution-utils": "15.0.4",
     "lodash": "^4.17.15"
   },
   "devDependencies": {
-    "@cumulus/aws-client": "15.0.3",
-    "@cumulus/schemas": "15.0.3"
+    "@cumulus/aws-client": "15.0.4",
+    "@cumulus/schemas": "15.0.4"
   }
 }
diff --git a/tf-modules/ingest/package.json b/tf-modules/ingest/package.json
index c6552f738b2..a17b56875c1 100644
--- a/tf-modules/ingest/package.json
+++ b/tf-modules/ingest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ingest-module",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Terraform module for data ingest related functionality",
   "engines": {
     "node": ">=16.19.0"
diff --git a/tf-modules/internal/cumulus-test-cleanup/package.json b/tf-modules/internal/cumulus-test-cleanup/package.json
index c4320c870c8..aa9b48a3801 100644
--- a/tf-modules/internal/cumulus-test-cleanup/package.json
+++ b/tf-modules/internal/cumulus-test-cleanup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/cumulus-test-cleanup",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Nightly cron job for cleaning up integration test artifacts",
   "main": "index.js",
   "engines": {
diff --git a/tf-modules/s3-replicator/package.json b/tf-modules/s3-replicator/package.json
index 3638c4fb656..e3ad7d146ad 100644
--- a/tf-modules/s3-replicator/package.json
+++ b/tf-modules/s3-replicator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/s3-replicator",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Replicate S3 Events to alternate bucket. Solves same-region replication.",
   "main": "index.js",
   "engines": {

From 9251d6d7a91d595b0c2184a6e4bbd473553b393c Mon Sep 17 00:00:00 2001
From: Jonathan Kovarik <kovarik@nsidc.org>
Date: Thu, 1 Jun 2023 14:37:22 -0600
Subject: [PATCH 7/7] CUMULUS-3135 - Update integration test scripts to fail on
 test timeout (#3401)

* Update integration test scripts to fail on test timeout

* Fixup

* Fixup

* Update script interpreter for test runs

* Fix script

* Fixup

* Fixup

* Update timeout pass/fail conditional
---
 CHANGELOG.md                      |  4 ++++
 example/scripts/run_test.sh       | 18 +++++++++++-------
 example/scripts/tests-parallel.sh |  3 ++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11e045df7a4..147d2f13504 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - **CUMULUS-3115**
   - Fixed DiscoverGranules' workflow's duplicateHandling when set to `skip` or `error` to stop retrying
     after receiving a 404 Not Found Response Error from the `cumulus-api`.
+- **CUMULUS-3315**
+  - Update CI scripts to use shell logic/GNU timeout to bound test timeouts
+    instead of NPM `parallel` package, as timeouts were not resulting in
+    integration test failure
 - **CUMULUS-3223**
   - Update `@cumulus/cmrjs/cmr-utils.getGranuleTemporalInfo` to handle the error when the cmr file s3url is not available
   - Update `sfEventSqsToDbRecords` lambda to return [partial batch failure](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html#services-sqs-batchfailurereporting),
diff --git a/example/scripts/run_test.sh b/example/scripts/run_test.sh
index 6ddd12f1e8e..9ac88e0e8fd 100755
--- a/example/scripts/run_test.sh
+++ b/example/scripts/run_test.sh
@@ -2,22 +2,26 @@
 
 set +e
 
-specName=$(echo "$2" | rev | cut -d'/' -f 1 | cut -d'.' -f 2 | rev)
+specName=$(echo "$3" | rev | cut -d'/' -f 1 | cut -d'.' -f 2 | rev)
 outputPath="${1}/${specName}-running.txt"
+testTimeout=$2
 
 TIMESTAMP=$(date "+%Y-%m-%dT%H:%M:%S")
-echo "$TIMESTAMP ../node_modules/.bin/jasmine $2 STARTED"
-
-../node_modules/.bin/jasmine --no-color "$2" > "$outputPath" 2>&1
+echo "$TIMESTAMP ../node_modules/.bin/jasmine $3 STARTED"
+timeout "$testTimeout" ../node_modules/.bin/jasmine --no-color "$3" > "$outputPath" 2>&1
 result=$?
 
 TIMESTAMP=$(date "+%Y-%m-%dT%H:%M:%S")
 if [ "$result" -eq "0" ]; then
-  echo "$TIMESTAMP ../node_modules/.bin/jasmine $2 PASSED"
+  echo "$TIMESTAMP ../node_modules/.bin/jasmine $3 PASSED"
   mv "$outputPath" "$1/${specName}-passed.txt"
+elif { [ "$result" -gt "124" ] && [ "$result" -lt "128" ] ;} || [ "$result" -eq "137" ]; then
+  echo "$TIMESTAMP ../node_modules/.bin/jasmine $3 FAILED -- TIMEOUT"
+  mv "$outputPath" "$1/${specName}-failed.txt"
+  result=1
 else
-  echo "$TIMESTAMP ../node_modules/.bin/jasmine $2 FAILED"
+  echo "$TIMESTAMP ../node_modules/.bin/jasmine $3 FAILED"
   mv "$outputPath" "$1/${specName}-failed.txt"
 fi
 
-exit $result
+exit $result
\ No newline at end of file
diff --git a/example/scripts/tests-parallel.sh b/example/scripts/tests-parallel.sh
index 7e017cede76..e882eea1c48 100755
--- a/example/scripts/tests-parallel.sh
+++ b/example/scripts/tests-parallel.sh
@@ -10,11 +10,12 @@ DOT_PID="$!"
 
 TESTS=$(find spec/parallel -type f -name '*spec.js' -or -name '*Spec.js')
 testOutputDir=scripts/test_output
+testTimeout=1200
 
 rm -r -f $testOutputDir
 mkdir -p $testOutputDir
 
-echo "" | ../node_modules/.bin/parallel -j "${INTEGRATION_CONCURRENCY:=0}" --timeout 1200 sh scripts/run_test.sh  $testOutputDir ::: $TESTS
+echo "" | ../node_modules/.bin/parallel -j "${INTEGRATION_CONCURRENCY:=0}" sh scripts/run_test.sh  $testOutputDir $testTimeout ::: $TESTS
 result=$?
 echo parallel tests complete: $result suite failures