@cumulus/message 15.0.3 → 16.0.2-alpha.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/Executions.d.ts +3 -3
- package/Executions.d.ts.map +1 -1
- package/Executions.js +8 -6
- package/Executions.js.map +1 -1
- package/Granules.js +1 -1
- package/Granules.js.map +1 -1
- package/PDRs.d.ts +1 -1
- package/PDRs.js +1 -1
- package/README.md +7 -7
- package/package.json +7 -7
- package/src/Executions.ts +10 -9
- package/src/Granules.ts +1 -1
- package/src/PDRs.ts +1 -1
- package/tsconfig.tsbuildinfo +1 -1
package/Executions.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Message } from '@cumulus/types';
|
|
2
|
-
import {
|
|
2
|
+
import { ApiExecution } from '@cumulus/types/api/executions';
|
|
3
3
|
interface MessageWithPayload extends Message.CumulusMessage {
|
|
4
4
|
payload: object;
|
|
5
5
|
}
|
|
@@ -101,10 +101,10 @@ export declare const getMessageExecutionFinalPayload: (message: MessageWithPaylo
|
|
|
101
101
|
*
|
|
102
102
|
* @param {MessageWithPayload} message - A workflow message object
|
|
103
103
|
* @param {string} [updatedAt] - Optional updated timestamp to apply to record
|
|
104
|
-
* @returns {
|
|
104
|
+
* @returns {ApiExecution} An execution API record
|
|
105
105
|
*
|
|
106
106
|
* @alias module:Executions
|
|
107
107
|
*/
|
|
108
|
-
export declare const generateExecutionApiRecordFromMessage: (message: MessageWithPayload, updatedAt?: number) =>
|
|
108
|
+
export declare const generateExecutionApiRecordFromMessage: (message: MessageWithPayload, updatedAt?: number) => ApiExecution;
|
|
109
109
|
export {};
|
|
110
110
|
//# sourceMappingURL=Executions.d.ts.map
|
package/Executions.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Executions.d.ts","sourceRoot":"","sources":["src/Executions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Executions.d.ts","sourceRoot":"","sources":["src/Executions.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAkB7D,UAAU,kBAAmB,SAAQ,OAAO,CAAC,cAAc;IACzD,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,oBACX,MAAM,iBACR,MAAM,kBAOtB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,iBAAkB,MAAM,WAI1D,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,kCAAkC,iBAC/B,MAAM,kBAMrB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,YACzB,QAAQ,cAAc,WAOhC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,YAC3B,QAAQ,cAAc,WAOhC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,YACxB,QAAQ,cAAc,kBAUhC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,YAC9B,QAAQ,cAAc,KAC9B,MAAM,GAAG,SAAqD,CAAC;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,YAC1B,QAAQ,cAAc,KAC9B,MAAM,GAAG,SAAkD,CAAC;AAE/D;;;;;;;GAOG;AACH,eAAO,MAAM,kCAAkC,YACpC,kBAAkB,uBAI5B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,YACjC,kBAAkB,uBAI5B,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,qCAAqC,YACvC,kBAAkB,yBAE1B,YAkCF,CAAC"}
|
package/Executions.js
CHANGED
|
@@ -16,6 +16,7 @@ exports.generateExecutionApiRecordFromMessage = exports.getMessageExecutionFinal
|
|
|
16
16
|
const isString_1 = __importDefault(require("lodash/isString"));
|
|
17
17
|
const isNil_1 = __importDefault(require("lodash/isNil"));
|
|
18
18
|
const omitBy_1 = __importDefault(require("lodash/omitBy"));
|
|
19
|
+
const isUndefined_1 = __importDefault(require("lodash/isUndefined"));
|
|
19
20
|
const AsyncOperations_1 = require("./AsyncOperations");
|
|
20
21
|
const Collections_1 = require("./Collections");
|
|
21
22
|
const workflows_1 = require("./workflows");
|
|
@@ -168,23 +169,25 @@ exports.getMessageExecutionFinalPayload = getMessageExecutionFinalPayload;
|
|
|
168
169
|
*
|
|
169
170
|
* @param {MessageWithPayload} message - A workflow message object
|
|
170
171
|
* @param {string} [updatedAt] - Optional updated timestamp to apply to record
|
|
171
|
-
* @returns {
|
|
172
|
+
* @returns {ApiExecution} An execution API record
|
|
172
173
|
*
|
|
173
174
|
* @alias module:Executions
|
|
174
175
|
*/
|
|
175
176
|
const generateExecutionApiRecordFromMessage = (message, updatedAt = Date.now()) => {
|
|
176
177
|
const arn = (0, exports.getMessageExecutionArn)(message);
|
|
178
|
+
const name = (0, exports.getMessageExecutionName)(message);
|
|
177
179
|
if ((0, isNil_1.default)(arn))
|
|
178
180
|
throw new Error('Unable to determine execution ARN from Cumulus message');
|
|
181
|
+
if ((0, isNil_1.default)(name))
|
|
182
|
+
throw new Error('Unable to determine execution name from Cumulus message');
|
|
179
183
|
const status = (0, workflows_1.getMetaStatus)(message);
|
|
180
184
|
if (!status)
|
|
181
185
|
throw new Error('Unable to determine status from Cumulus message');
|
|
182
|
-
const now = Date.now();
|
|
183
186
|
const workflowStartTime = (0, workflows_1.getMessageWorkflowStartTime)(message);
|
|
184
187
|
const workflowStopTime = (0, workflows_1.getMessageWorkflowStopTime)(message);
|
|
185
188
|
const collectionId = (0, Collections_1.getCollectionIdFromMessage)(message);
|
|
186
189
|
const record = {
|
|
187
|
-
name
|
|
190
|
+
name,
|
|
188
191
|
cumulusVersion: (0, exports.getMessageCumulusVersion)(message),
|
|
189
192
|
arn,
|
|
190
193
|
asyncOperationId: (0, AsyncOperations_1.getMessageAsyncOperationId)(message),
|
|
@@ -196,14 +199,13 @@ const generateExecutionApiRecordFromMessage = (message, updatedAt = Date.now())
|
|
|
196
199
|
collectionId,
|
|
197
200
|
status,
|
|
198
201
|
createdAt: workflowStartTime,
|
|
199
|
-
timestamp:
|
|
202
|
+
timestamp: updatedAt,
|
|
200
203
|
updatedAt,
|
|
201
204
|
originalPayload: (0, exports.getMessageExecutionOriginalPayload)(message),
|
|
202
205
|
finalPayload: (0, exports.getMessageExecutionFinalPayload)(message),
|
|
203
206
|
duration: (0, workflows_1.getWorkflowDuration)(workflowStartTime, workflowStopTime),
|
|
204
207
|
};
|
|
205
|
-
|
|
206
|
-
return updated;
|
|
208
|
+
return (0, omitBy_1.default)(record, isUndefined_1.default);
|
|
207
209
|
};
|
|
208
210
|
exports.generateExecutionApiRecordFromMessage = generateExecutionApiRecordFromMessage;
|
|
209
211
|
//# sourceMappingURL=Executions.js.map
|
package/Executions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Executions.js","sourceRoot":"","sources":["src/Executions.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AAEb;;;;;;;;GAQG;AAEH,+DAAuC;AACvC,yDAAiC;AACjC,2DAAmC;
|
|
1
|
+
{"version":3,"file":"Executions.js","sourceRoot":"","sources":["src/Executions.ts"],"names":[],"mappings":"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"}
|
package/Granules.js
CHANGED
|
@@ -171,7 +171,7 @@ const generateGranuleApiRecord = async ({ granule, executionUrl, collectionId, p
|
|
|
171
171
|
const recordTimestamp = timestamp ?? now;
|
|
172
172
|
// Get CMR temporalInfo
|
|
173
173
|
const temporalInfo = await (0, exports.getGranuleCmrTemporalInfo)({
|
|
174
|
-
granule,
|
|
174
|
+
granule: { ...granule, status },
|
|
175
175
|
cmrTemporalInfo,
|
|
176
176
|
cmrUtils,
|
|
177
177
|
});
|
package/Granules.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Granules.js","sourceRoot":"","sources":["src/Granules.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Granules.js","sourceRoot":"","sources":["src/Granules.ts"],"names":[],"mappings":"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"}
|
package/PDRs.d.ts
CHANGED
|
@@ -115,7 +115,7 @@ export declare const getPdrPercentCompletion: (stats: PdrStats) => number;
|
|
|
115
115
|
*
|
|
116
116
|
* @param {MessageWithOptionalPayloadPdr} message - A workflow message object
|
|
117
117
|
* @param {string} [updatedAt] - Optional updated timestamp to apply to record
|
|
118
|
-
* @returns {
|
|
118
|
+
* @returns {ApiPdr} An PDR API record
|
|
119
119
|
*
|
|
120
120
|
* @alias module:Executions
|
|
121
121
|
*/
|
package/PDRs.js
CHANGED
|
@@ -137,7 +137,7 @@ exports.getPdrPercentCompletion = getPdrPercentCompletion;
|
|
|
137
137
|
*
|
|
138
138
|
* @param {MessageWithOptionalPayloadPdr} message - A workflow message object
|
|
139
139
|
* @param {string} [updatedAt] - Optional updated timestamp to apply to record
|
|
140
|
-
* @returns {
|
|
140
|
+
* @returns {ApiPdr} An PDR API record
|
|
141
141
|
*
|
|
142
142
|
* @alias module:Executions
|
|
143
143
|
*/
|
package/README.md
CHANGED
|
@@ -81,7 +81,7 @@ States cloudwatch event, which is wrapped in an SQS message.</p>
|
|
|
81
81
|
<dt><a href="#exp_module_PDRs--getPdrPercentCompletion">getPdrPercentCompletion(stats)</a> ⇒ <code>number</code> ⏏</dt>
|
|
82
82
|
<dd><p>Get the percent completion of PDR executions</p>
|
|
83
83
|
</dd>
|
|
84
|
-
<dt><a href="#exp_module_Executions--generatePdrApiRecordFromMessage">generatePdrApiRecordFromMessage(message, [updatedAt])</a> ⇒ <code>
|
|
84
|
+
<dt><a href="#exp_module_Executions--generatePdrApiRecordFromMessage">generatePdrApiRecordFromMessage(message, [updatedAt])</a> ⇒ <code>ApiPdr</code> ⏏</dt>
|
|
85
85
|
<dd><p>Generate a PDR record for the API from the message.</p>
|
|
86
86
|
</dd>
|
|
87
87
|
<dt><a href="#exp_module_Providers--getMessageProvider">getMessageProvider(message)</a> ⇒ <code>MessageProvider</code> | <code>string</code> ⏏</dt>
|
|
@@ -192,9 +192,9 @@ const Executions = require('@cumulus/message/Executions');
|
|
|
192
192
|
* [getMessageCumulusVersion(message)](#exp_module_Executions--getMessageCumulusVersion) ⇒ <code>undefined</code> \| <code>string</code> ⏏
|
|
193
193
|
* [getMessageExecutionOriginalPayload(message)](#exp_module_Executions--getMessageExecutionOriginalPayload) ⇒ <code>unknown</code> \| <code>undefined</code> ⏏
|
|
194
194
|
* [getMessageExecutionFinalPayload(message)](#exp_module_Executions--getMessageExecutionFinalPayload) ⇒ <code>unknown</code> \| <code>undefined</code> ⏏
|
|
195
|
-
* [generateExecutionApiRecordFromMessage(message, [updatedAt])](#exp_module_Executions--generateExecutionApiRecordFromMessage) ⇒ <code>
|
|
195
|
+
* [generateExecutionApiRecordFromMessage(message, [updatedAt])](#exp_module_Executions--generateExecutionApiRecordFromMessage) ⇒ <code>ApiExecution</code> ⏏
|
|
196
196
|
* _global_
|
|
197
|
-
* [generatePdrApiRecordFromMessage(message, [updatedAt])](#exp_module_Executions--generatePdrApiRecordFromMessage) ⇒ <code>
|
|
197
|
+
* [generatePdrApiRecordFromMessage(message, [updatedAt])](#exp_module_Executions--generatePdrApiRecordFromMessage) ⇒ <code>ApiPdr</code> ⏏
|
|
198
198
|
|
|
199
199
|
<a name="exp_module_Executions--buildExecutionArn"></a>
|
|
200
200
|
|
|
@@ -327,11 +327,11 @@ Get the workflow final payload, if any.
|
|
|
327
327
|
|
|
328
328
|
<a name="exp_module_Executions--generateExecutionApiRecordFromMessage"></a>
|
|
329
329
|
|
|
330
|
-
#### generateExecutionApiRecordFromMessage(message, [updatedAt]) ⇒ <code>
|
|
330
|
+
#### generateExecutionApiRecordFromMessage(message, [updatedAt]) ⇒ <code>ApiExecution</code> ⏏
|
|
331
331
|
Generate an execution record for the API from the message.
|
|
332
332
|
|
|
333
333
|
**Kind**: Exported function
|
|
334
|
-
**Returns**: <code>
|
|
334
|
+
**Returns**: <code>ApiExecution</code> - An execution API record
|
|
335
335
|
|
|
336
336
|
| Param | Type | Description |
|
|
337
337
|
| --- | --- | --- |
|
|
@@ -340,11 +340,11 @@ Generate an execution record for the API from the message.
|
|
|
340
340
|
|
|
341
341
|
<a name="exp_module_Executions--generatePdrApiRecordFromMessage"></a>
|
|
342
342
|
|
|
343
|
-
#### generatePdrApiRecordFromMessage(message, [updatedAt]) ⇒ <code>
|
|
343
|
+
#### generatePdrApiRecordFromMessage(message, [updatedAt]) ⇒ <code>ApiPdr</code> ⏏
|
|
344
344
|
Generate a PDR record for the API from the message.
|
|
345
345
|
|
|
346
346
|
**Kind**: global method of [<code>Executions</code>](#module_Executions)
|
|
347
|
-
**Returns**: <code>
|
|
347
|
+
**Returns**: <code>ApiPdr</code> - An PDR API record
|
|
348
348
|
|
|
349
349
|
| Param | Type | Description |
|
|
350
350
|
| --- | --- | --- |
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cumulus/message",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "16.0.2-alpha.0",
|
|
4
4
|
"description": "Utilities for building and parsing Cumulus messages",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"GIBS",
|
|
@@ -38,11 +38,11 @@
|
|
|
38
38
|
"author": "Cumulus Authors",
|
|
39
39
|
"license": "Apache-2.0",
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@cumulus/aws-client": "
|
|
42
|
-
"@cumulus/common": "
|
|
43
|
-
"@cumulus/errors": "
|
|
44
|
-
"@cumulus/logger": "
|
|
45
|
-
"@cumulus/types": "
|
|
41
|
+
"@cumulus/aws-client": "16.0.2-alpha.0",
|
|
42
|
+
"@cumulus/common": "16.0.2-alpha.0",
|
|
43
|
+
"@cumulus/errors": "16.0.2-alpha.0",
|
|
44
|
+
"@cumulus/logger": "16.0.2-alpha.0",
|
|
45
|
+
"@cumulus/types": "16.0.2-alpha.0",
|
|
46
46
|
"jsonpath-plus": "^3.0.0",
|
|
47
47
|
"lodash": "^4.17.21",
|
|
48
48
|
"uuid": "^8.2.0"
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@types/uuid": "^8.0.0"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "215833a8dbf46eff436099c9d056cf697df9903f"
|
|
54
54
|
}
|
package/src/Executions.ts
CHANGED
|
@@ -13,9 +13,10 @@
|
|
|
13
13
|
import isString from 'lodash/isString';
|
|
14
14
|
import isNil from 'lodash/isNil';
|
|
15
15
|
import omitBy from 'lodash/omitBy';
|
|
16
|
+
import isUndefined from 'lodash/isUndefined';
|
|
16
17
|
|
|
17
18
|
import { Message } from '@cumulus/types';
|
|
18
|
-
import {
|
|
19
|
+
import { ApiExecution } from '@cumulus/types/api/executions';
|
|
19
20
|
|
|
20
21
|
import {
|
|
21
22
|
getMessageAsyncOperationId,
|
|
@@ -206,27 +207,28 @@ export const getMessageExecutionFinalPayload = (
|
|
|
206
207
|
*
|
|
207
208
|
* @param {MessageWithPayload} message - A workflow message object
|
|
208
209
|
* @param {string} [updatedAt] - Optional updated timestamp to apply to record
|
|
209
|
-
* @returns {
|
|
210
|
+
* @returns {ApiExecution} An execution API record
|
|
210
211
|
*
|
|
211
212
|
* @alias module:Executions
|
|
212
213
|
*/
|
|
213
214
|
export const generateExecutionApiRecordFromMessage = (
|
|
214
215
|
message: MessageWithPayload,
|
|
215
216
|
updatedAt = Date.now()
|
|
216
|
-
):
|
|
217
|
+
): ApiExecution => {
|
|
217
218
|
const arn = getMessageExecutionArn(message);
|
|
219
|
+
const name = getMessageExecutionName(message);
|
|
218
220
|
if (isNil(arn)) throw new Error('Unable to determine execution ARN from Cumulus message');
|
|
221
|
+
if (isNil(name)) throw new Error('Unable to determine execution name from Cumulus message');
|
|
219
222
|
|
|
220
223
|
const status = getMetaStatus(message);
|
|
221
224
|
if (!status) throw new Error('Unable to determine status from Cumulus message');
|
|
222
225
|
|
|
223
|
-
const now = Date.now();
|
|
224
226
|
const workflowStartTime = getMessageWorkflowStartTime(message);
|
|
225
227
|
const workflowStopTime = getMessageWorkflowStopTime(message);
|
|
226
228
|
const collectionId = getCollectionIdFromMessage(message);
|
|
227
229
|
|
|
228
|
-
const record:
|
|
229
|
-
name
|
|
230
|
+
const record : ApiExecution = {
|
|
231
|
+
name,
|
|
230
232
|
cumulusVersion: getMessageCumulusVersion(message),
|
|
231
233
|
arn,
|
|
232
234
|
asyncOperationId: getMessageAsyncOperationId(message),
|
|
@@ -238,13 +240,12 @@ export const generateExecutionApiRecordFromMessage = (
|
|
|
238
240
|
collectionId,
|
|
239
241
|
status,
|
|
240
242
|
createdAt: workflowStartTime,
|
|
241
|
-
timestamp:
|
|
243
|
+
timestamp: updatedAt,
|
|
242
244
|
updatedAt,
|
|
243
245
|
originalPayload: getMessageExecutionOriginalPayload(message),
|
|
244
246
|
finalPayload: getMessageExecutionFinalPayload(message),
|
|
245
247
|
duration: getWorkflowDuration(workflowStartTime, workflowStopTime),
|
|
246
248
|
};
|
|
247
249
|
|
|
248
|
-
|
|
249
|
-
return updated;
|
|
250
|
+
return <ApiExecution>omitBy(record, isUndefined);
|
|
250
251
|
};
|
package/src/Granules.ts
CHANGED
package/src/PDRs.ts
CHANGED
|
@@ -188,7 +188,7 @@ export const getPdrPercentCompletion = (
|
|
|
188
188
|
*
|
|
189
189
|
* @param {MessageWithOptionalPayloadPdr} message - A workflow message object
|
|
190
190
|
* @param {string} [updatedAt] - Optional updated timestamp to apply to record
|
|
191
|
-
* @returns {
|
|
191
|
+
* @returns {ApiPdr} An PDR API record
|
|
192
192
|
*
|
|
193
193
|
* @alias module:Executions
|
|
194
194
|
*/
|