@cumulus/ingest 9.4.0 → 9.7.1
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/package.json +13 -12
- package/queue.d.ts +1 -1
- package/queue.d.ts.map +1 -1
- package/queue.js +2 -6
- package/queue.js.map +1 -1
- package/src/queue.js +2 -6
- package/src/util.ts +6 -1
- package/util.d.ts.map +1 -1
- package/util.js +4 -1
- package/util.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cumulus/ingest",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.7.1",
|
|
4
4
|
"description": "Ingest utilities",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=12.18.0"
|
|
@@ -38,12 +38,13 @@
|
|
|
38
38
|
"author": "Cumulus Authors",
|
|
39
39
|
"license": "Apache-2.0",
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@cumulus/aws-client": "9.
|
|
42
|
-
"@cumulus/common": "9.
|
|
43
|
-
"@cumulus/db": "9.
|
|
44
|
-
"@cumulus/errors": "9.
|
|
45
|
-
"@cumulus/
|
|
46
|
-
"@cumulus/
|
|
41
|
+
"@cumulus/aws-client": "9.7.1",
|
|
42
|
+
"@cumulus/common": "9.7.1",
|
|
43
|
+
"@cumulus/db": "9.7.1",
|
|
44
|
+
"@cumulus/errors": "9.7.1",
|
|
45
|
+
"@cumulus/logger": "9.7.1",
|
|
46
|
+
"@cumulus/message": "9.7.1",
|
|
47
|
+
"@cumulus/sftp-client": "9.7.1",
|
|
47
48
|
"aws-sdk": "^2.585.0",
|
|
48
49
|
"cksum": "^1.3.0",
|
|
49
50
|
"delay": "^4.3.0",
|
|
@@ -60,10 +61,10 @@
|
|
|
60
61
|
"tough-cookie": "^4.0.0"
|
|
61
62
|
},
|
|
62
63
|
"devDependencies": {
|
|
63
|
-
"@cumulus/checksum": "9.
|
|
64
|
-
"@cumulus/cmrjs": "9.
|
|
65
|
-
"@cumulus/test-data": "9.
|
|
66
|
-
"@cumulus/types": "9.
|
|
64
|
+
"@cumulus/checksum": "9.7.1",
|
|
65
|
+
"@cumulus/cmrjs": "9.7.1",
|
|
66
|
+
"@cumulus/test-data": "9.7.1",
|
|
67
|
+
"@cumulus/types": "9.7.1"
|
|
67
68
|
},
|
|
68
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "926740ad299b43f27117fd1fd34050b3db194c71"
|
|
69
70
|
}
|
package/queue.d.ts
CHANGED
|
@@ -43,7 +43,7 @@ export function enqueueParsePdrMessage({ collection, parentExecutionArn, parsePd
|
|
|
43
43
|
* @param {Object} [params.additionalCustomMeta] - additional object to merge into meta object
|
|
44
44
|
* @returns {Promise} - resolves when the message has been enqueued
|
|
45
45
|
*/
|
|
46
|
-
export function enqueueGranuleIngestMessage({ collection,
|
|
46
|
+
export function enqueueGranuleIngestMessage({ collection, granules, granuleIngestWorkflow, parentExecutionArn, pdr, provider, stack, systemBucket, queueUrl, executionNamePrefix, additionalCustomMeta, }: {
|
|
47
47
|
granule: Object;
|
|
48
48
|
queueUrl: string;
|
|
49
49
|
granuleIngestMessageTemplateUri: string;
|
package/queue.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["src/queue.js"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;;;GAgBG;AACH;IAb0B,GAAG,EAAlB,MAAM;IACS,QAAQ,EAAvB,MAAM;IACS,0BAA0B,EAAzC,MAAM;IAES,QAAQ,EAAvB,MAAM;IACS,UAAU,EAAzB,MAAM;IAES,kBAAkB,EAAjC,MAAM;IACU,mBAAmB,EAAnC,MAAM;IAEU,oBAAoB,EAApC,MAAM;iBA+ChB;AAGD;;;;;;;;;;;;;;;;;GAiBG;AACH;IAd0B,OAAO,EAAtB,MAAM;IACS,QAAQ,EAAvB,MAAM;IACS,+BAA+B,EAA9C,MAAM;IAES,QAAQ,EAAvB,MAAM;IACS,UAAU,EAAzB,MAAM;IAES,GAAG,EAAlB,MAAM;IACS,kBAAkB,EAAjC,MAAM;IACU,mBAAmB,EAAnC,MAAM;IAEU,oBAAoB,EAApC,MAAM;
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["src/queue.js"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;;;GAgBG;AACH;IAb0B,GAAG,EAAlB,MAAM;IACS,QAAQ,EAAvB,MAAM;IACS,0BAA0B,EAAzC,MAAM;IAES,QAAQ,EAAvB,MAAM;IACS,UAAU,EAAzB,MAAM;IAES,kBAAkB,EAAjC,MAAM;IACU,mBAAmB,EAAnC,MAAM;IAEU,oBAAoB,EAApC,MAAM;iBA+ChB;AAGD;;;;;;;;;;;;;;;;;GAiBG;AACH;IAd0B,OAAO,EAAtB,MAAM;IACS,QAAQ,EAAvB,MAAM;IACS,+BAA+B,EAA9C,MAAM;IAES,QAAQ,EAAvB,MAAM;IACS,UAAU,EAAzB,MAAM;IAES,GAAG,EAAlB,MAAM;IACS,kBAAkB,EAAjC,MAAM;IACU,mBAAmB,EAAnC,MAAM;IAEU,oBAAoB,EAApC,MAAM;iBAoDhB;AAGD;;;;;;;;;;;;;;GAcG;AACH;IAX0B,QAAQ,EAAvB,MAAM;IACS,aAAa,EAA5B,MAAM;IACU,QAAQ,EAAxB,MAAM;IACS,QAAQ,EAAvB,MAAM;IACS,UAAU,EAAzB,MAAM;IAES,kBAAkB,EAAjC,MAAM;IACU,mBAAmB,EAAnC,MAAM;iBAqDhB"}
|
package/queue.js
CHANGED
|
@@ -64,14 +64,10 @@ module.exports.enqueueParsePdrMessage = enqueueParsePdrMessage;
|
|
|
64
64
|
* @param {Object} [params.additionalCustomMeta] - additional object to merge into meta object
|
|
65
65
|
* @returns {Promise} - resolves when the message has been enqueued
|
|
66
66
|
*/
|
|
67
|
-
async function enqueueGranuleIngestMessage({ collection,
|
|
67
|
+
async function enqueueGranuleIngestMessage({ collection, granules, granuleIngestWorkflow, parentExecutionArn, pdr, provider, stack, systemBucket, queueUrl, executionNamePrefix, additionalCustomMeta = {}, }) {
|
|
68
68
|
const messageTemplate = await getJsonS3Object(systemBucket, templateKey(stack));
|
|
69
69
|
const { arn: ingestGranuleArn } = await getJsonS3Object(systemBucket, getWorkflowFileKey(stack, granuleIngestWorkflow));
|
|
70
|
-
const payload = {
|
|
71
|
-
granules: [
|
|
72
|
-
granule,
|
|
73
|
-
],
|
|
74
|
-
};
|
|
70
|
+
const payload = { granules };
|
|
75
71
|
const workflow = {
|
|
76
72
|
name: granuleIngestWorkflow,
|
|
77
73
|
arn: ingestGranuleArn,
|
package/queue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["src/queue.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAC9D,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAE9D,MAAM,EAAE,6BAA6B,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAC5E,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;AAErE,MAAM,EACJ,kBAAkB,EAClB,WAAW,GACZ,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AAEzC;;;;;;;;;;;;;;;;GAgBG;AACH,KAAK,UAAU,sBAAsB,CAAC,EACpC,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,GAAG,EACH,QAAQ,EACR,KAAK,EACL,YAAY,EACZ,QAAQ,EACR,mBAAmB,EACnB,oBAAoB,GAAG,EAAE,GAC1B;IACC,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAChF,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,MAAM,eAAe,CAChD,YAAY,EACZ,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAC5C,CAAC;IACF,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;IACxB,MAAM,QAAQ,GAAG;QACf,IAAI,EAAE,gBAAgB;QACtB,GAAG,EAAE,WAAW;KACjB,CAAC;IAEF,MAAM,OAAO,GAAG,6BAA6B,CAAC;QAC5C,eAAe;QACf,kBAAkB;QAClB,OAAO;QACP,QAAQ;QACR,UAAU,EAAE;YACV,GAAG,oBAAoB;YACvB,UAAU;YACV,QAAQ;SACT;QACD,mBAAmB;KACpB,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,iBAAiB,CAC3B,OAAO,CAAC,YAAY,CAAC,aAAa,EAClC,OAAO,CAAC,YAAY,CAAC,cAAc,CACpC,CAAC;IAEF,MAAM,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAExC,OAAO,GAAG,CAAC;AACb,CAAC;AACD,MAAM,CAAC,OAAO,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;AAE/D;;;;;;;;;;;;;;;;;GAiBG;AACH,KAAK,UAAU,2BAA2B,CAAC,EACzC,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["src/queue.js"],"names":[],"mappings":"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"}
|
package/src/queue.js
CHANGED
|
@@ -95,7 +95,7 @@ module.exports.enqueueParsePdrMessage = enqueueParsePdrMessage;
|
|
|
95
95
|
*/
|
|
96
96
|
async function enqueueGranuleIngestMessage({
|
|
97
97
|
collection,
|
|
98
|
-
|
|
98
|
+
granules,
|
|
99
99
|
granuleIngestWorkflow,
|
|
100
100
|
parentExecutionArn,
|
|
101
101
|
pdr,
|
|
@@ -112,11 +112,7 @@ async function enqueueGranuleIngestMessage({
|
|
|
112
112
|
getWorkflowFileKey(stack, granuleIngestWorkflow)
|
|
113
113
|
);
|
|
114
114
|
|
|
115
|
-
const payload = {
|
|
116
|
-
granules: [
|
|
117
|
-
granule,
|
|
118
|
-
],
|
|
119
|
-
};
|
|
115
|
+
const payload = { granules };
|
|
120
116
|
|
|
121
117
|
const workflow = {
|
|
122
118
|
name: granuleIngestWorkflow,
|
package/src/util.ts
CHANGED
|
@@ -2,12 +2,17 @@ import mime from 'mime-types';
|
|
|
2
2
|
import * as KMS from '@cumulus/aws-client/KMS';
|
|
3
3
|
import { S3KeyPairProvider } from '@cumulus/common/key-pair-provider';
|
|
4
4
|
|
|
5
|
+
import Logger from '@cumulus/logger';
|
|
6
|
+
|
|
7
|
+
const logger = new Logger({ sender: '@cumulus/ingest/util' });
|
|
8
|
+
|
|
5
9
|
export const decrypt = async (
|
|
6
10
|
ciphertext: string
|
|
7
11
|
): Promise<string | undefined> => {
|
|
8
12
|
try {
|
|
9
13
|
return await KMS.decryptBase64String(ciphertext);
|
|
10
|
-
} catch (
|
|
14
|
+
} catch (error) {
|
|
15
|
+
logger.error('Could not decrypt secret with KMS', error);
|
|
11
16
|
return S3KeyPairProvider.decrypt(ciphertext);
|
|
12
17
|
}
|
|
13
18
|
};
|
package/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["src/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["src/util.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,OAAO,eACN,MAAM,KACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAO5B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE9D"}
|
package/util.js
CHANGED
|
@@ -26,11 +26,14 @@ exports.lookupMimeType = exports.decrypt = void 0;
|
|
|
26
26
|
const mime_types_1 = __importDefault(require("mime-types"));
|
|
27
27
|
const KMS = __importStar(require("@cumulus/aws-client/KMS"));
|
|
28
28
|
const key_pair_provider_1 = require("@cumulus/common/key-pair-provider");
|
|
29
|
+
const logger_1 = __importDefault(require("@cumulus/logger"));
|
|
30
|
+
const logger = new logger_1.default({ sender: '@cumulus/ingest/util' });
|
|
29
31
|
exports.decrypt = async (ciphertext) => {
|
|
30
32
|
try {
|
|
31
33
|
return await KMS.decryptBase64String(ciphertext);
|
|
32
34
|
}
|
|
33
|
-
catch (
|
|
35
|
+
catch (error) {
|
|
36
|
+
logger.error('Could not decrypt secret with KMS', error);
|
|
34
37
|
return key_pair_provider_1.S3KeyPairProvider.decrypt(ciphertext);
|
|
35
38
|
}
|
|
36
39
|
};
|
package/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["src/util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA8B;AAC9B,6DAA+C;AAC/C,yEAAsE;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["src/util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA8B;AAC9B,6DAA+C;AAC/C,yEAAsE;AAEtE,6DAAqC;AAErC,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;AAEjD,QAAA,OAAO,GAAG,KAAK,EAC1B,UAAkB,EACW,EAAE;IAC/B,IAAI;QACF,OAAO,MAAM,GAAG,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;KAClD;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO,qCAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KAC9C;AACH,CAAC,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,GAAW;IACxC,OAAO,oBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC;AACvC,CAAC;AAFD,wCAEC"}
|