@cumulus/message 21.3.1-alpha.0 → 21.3.2-testlerna.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/DeadLetterMessage.js +2 -2
- package/DeadLetterMessage.js.map +1 -1
- package/package.json +9 -10
- package/src/DeadLetterMessage.ts +2 -2
- package/tsconfig.tsbuildinfo +1 -1
package/DeadLetterMessage.js
CHANGED
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getDLAFailureKey = exports.getDLAKey = exports.extractFileName = exports.extractDateString = exports.getDLARootKey = exports.hoistCumulusMessageDetails = exports.unwrapDeadLetterCumulusMessage = exports.isDLQRecordLike = void 0;
|
|
7
7
|
const moment_1 = __importDefault(require("moment"));
|
|
8
|
-
const
|
|
8
|
+
const uuid_1 = require("uuid");
|
|
9
9
|
const Lambda_1 = require("@cumulus/aws-client/Lambda");
|
|
10
10
|
const SQS_1 = require("@cumulus/aws-client/SQS");
|
|
11
11
|
const logger_1 = __importDefault(require("@cumulus/logger"));
|
|
@@ -140,7 +140,7 @@ exports.extractDateString = extractDateString;
|
|
|
140
140
|
const extractFileName = (message) => {
|
|
141
141
|
// get token after the last / or :
|
|
142
142
|
const executionName = message.executionArn ? message.executionArn.split(/[/:]/).pop() : 'unknown';
|
|
143
|
-
return `${executionName}-${(0,
|
|
143
|
+
return `${executionName}-${(0, uuid_1.v4)()}`;
|
|
144
144
|
};
|
|
145
145
|
exports.extractFileName = extractFileName;
|
|
146
146
|
const getDLAKey = (stackName, message) => {
|
package/DeadLetterMessage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeadLetterMessage.js","sourceRoot":"","sources":["src/DeadLetterMessage.ts"],"names":[],"mappings":";;;;;;AAEA,oDAA4B;AAE5B
|
|
1
|
+
{"version":3,"file":"DeadLetterMessage.js","sourceRoot":"","sources":["src/DeadLetterMessage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cumulus/message",
|
|
3
|
-
"version": "21.3.
|
|
3
|
+
"version": "21.3.2-testlerna.0",
|
|
4
4
|
"description": "Utilities for building and parsing Cumulus messages",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"GIBS",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"test": "../../node_modules/.bin/ava",
|
|
25
25
|
"test:ci": "../../scripts/run_package_ci_unit.sh",
|
|
26
26
|
"test:coverage": "../../node_modules/.bin/nyc npm test",
|
|
27
|
-
"
|
|
27
|
+
"build": "npm run tsc",
|
|
28
28
|
"tsc": "../../node_modules/.bin/tsc",
|
|
29
29
|
"tsc:listEmittedFiles": "../../node_modules/.bin/tsc --listEmittedFiles",
|
|
30
30
|
"watch-test": "../../node_modules/.bin/tsc-watch --onsuccess 'npm test'",
|
|
@@ -41,17 +41,16 @@
|
|
|
41
41
|
"author": "Cumulus Authors",
|
|
42
42
|
"license": "Apache-2.0",
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@cumulus/aws-client": "21.3.
|
|
45
|
-
"@cumulus/common": "21.3.
|
|
46
|
-
"@cumulus/errors": "21.3.
|
|
47
|
-
"@cumulus/logger": "21.3.
|
|
48
|
-
"@cumulus/types": "21.3.
|
|
44
|
+
"@cumulus/aws-client": "21.3.2-testlerna.0",
|
|
45
|
+
"@cumulus/common": "21.3.2-testlerna.0",
|
|
46
|
+
"@cumulus/errors": "21.3.2-testlerna.0",
|
|
47
|
+
"@cumulus/logger": "21.3.2-testlerna.0",
|
|
48
|
+
"@cumulus/types": "21.3.2-testlerna.0",
|
|
49
49
|
"jsonpath-plus": "^10.0.0",
|
|
50
|
-
"lodash": "^4.17.21"
|
|
51
|
-
"uuidv4": "^6.2.13"
|
|
50
|
+
"lodash": "^4.17.21"
|
|
52
51
|
},
|
|
53
52
|
"devDependencies": {
|
|
54
53
|
"@types/uuid": "^8.0.0"
|
|
55
54
|
},
|
|
56
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "ef6577b6caec96a20df8ccff293a9436db32a482"
|
|
57
56
|
}
|
package/src/DeadLetterMessage.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { SQSRecord } from 'aws-lambda';
|
|
3
3
|
import moment from 'moment';
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
6
6
|
import { isEventBridgeEvent, StepFunctionEventBridgeEvent } from '@cumulus/aws-client/Lambda';
|
|
7
7
|
import { parseSQSMessageBody, isSQSRecordLike } from '@cumulus/aws-client/SQS';
|
|
8
8
|
import { CumulusMessage } from '@cumulus/types/message';
|
|
@@ -181,7 +181,7 @@ export const extractDateString = (message: DLARecord): string => (
|
|
|
181
181
|
export const extractFileName = (message: DLARecord): string => {
|
|
182
182
|
// get token after the last / or :
|
|
183
183
|
const executionName = message.executionArn ? message.executionArn.split(/[/:]/).pop() : 'unknown';
|
|
184
|
-
return `${executionName}-${
|
|
184
|
+
return `${executionName}-${uuidv4()}`;
|
|
185
185
|
};
|
|
186
186
|
|
|
187
187
|
export const getDLAKey = (stackName: string, message: DLARecord): string => {
|