@cumulus/async-operations 18.2.2 → 18.3.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/dist/async_operations.d.ts +4 -5
- package/dist/async_operations.d.ts.map +1 -1
- package/dist/async_operations.js +6 -5
- package/dist/async_operations.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +14 -12
- package/src/async_operations.ts +9 -11
- package/tests/test-async_operations.js +12 -10
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import {
|
|
3
|
+
import { RunTaskCommandOutput } from '@aws-sdk/client-ecs';
|
|
4
4
|
import { FunctionConfiguration } from '@aws-sdk/client-lambda';
|
|
5
5
|
import { ApiAsyncOperation, AsyncOperationType } from '@cumulus/types/api/async_operations';
|
|
6
|
-
import type { AWSError } from 'aws-sdk/lib/error';
|
|
7
|
-
import type { PromiseResult } from 'aws-sdk/lib/request';
|
|
8
6
|
import type { AsyncOperationPgModelObject } from './types';
|
|
9
|
-
declare
|
|
7
|
+
declare const EsClient: any;
|
|
8
|
+
declare type StartEcsTaskReturnType = Promise<RunTaskCommandOutput>;
|
|
10
9
|
export declare const getLambdaConfiguration: (functionName: string) => Promise<FunctionConfiguration>;
|
|
11
10
|
export declare const getLambdaEnvironmentVariables: (configuration: FunctionConfiguration) => Record<string, string>[];
|
|
12
11
|
/**
|
|
@@ -44,7 +43,7 @@ export declare const createAsyncOperation: (params: {
|
|
|
44
43
|
stackName: string;
|
|
45
44
|
systemBucket: string;
|
|
46
45
|
knexConfig?: NodeJS.ProcessEnv;
|
|
47
|
-
esClient?:
|
|
46
|
+
esClient?: typeof EsClient;
|
|
48
47
|
asyncOperationPgModel?: AsyncOperationPgModelObject;
|
|
49
48
|
}) => Promise<Partial<ApiAsyncOperation>>;
|
|
50
49
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async_operations.d.ts","sourceRoot":"","sources":["../src/async_operations.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"async_operations.d.ts","sourceRoot":"","sources":["../src/async_operations.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,qBAAqB,EAAmC,MAAM,wBAAwB,CAAC;AAWhG,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAG5F,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAMjB,QAAA,MACe,QAAQ,KACiB,CAAC;AAIzC,aAAK,sBAAsB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE5D,eAAO,MAAM,sBAAsB,iBACnB,MAAM,KACnB,QAAQ,qBAAqB,CAE7B,CAAC;AAEJ,eAAO,MAAM,6BAA6B,kBACzB,qBAAqB,KACnC,OAAO,MAAM,EAAE,MAAM,CAAC,EAKxB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,YAAY;kCAUO,MAAM;aAC3B,MAAM;sBACG,MAAM;gBACZ,MAAM;QACd,MAAM;mBACK,MAAM;gBACT,MAAM;;4BAsCnB,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB;IACN,YAAY,EAAE,iBAAiB,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;IAC/B,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,qBAAqB,CAAC,EAAE,2BAA2B,CAAA;CACpD,KACA,QAAQ,QAAQ,iBAAiB,CAAC,CAsBpC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,mBAAmB,WACtB;IACN,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4BAA4B,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,kBAAkB,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,gBAAgB,CAAC,EAAE,MAAM,sBAAsB,CAAA;CAChD,KACA,QAAQ,QAAQ,iBAAiB,CAAC,CAqFpC,CAAC"}
|
package/dist/async_operations.js
CHANGED
|
@@ -4,17 +4,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.startAsyncOperation = exports.createAsyncOperation = exports.startECSTask = exports.getLambdaEnvironmentVariables = exports.getLambdaConfiguration = void 0;
|
|
7
|
+
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
7
8
|
const services_1 = require("@cumulus/aws-client/services");
|
|
8
9
|
const db_1 = require("@cumulus/db");
|
|
9
10
|
const logger_1 = __importDefault(require("@cumulus/logger"));
|
|
10
11
|
const uuid_1 = require("uuid");
|
|
11
12
|
const { EcsStartTaskError, MissingRequiredArgument } = require('@cumulus/errors');
|
|
12
13
|
const { indexAsyncOperation, } = require('@cumulus/es-client/indexer');
|
|
13
|
-
const {
|
|
14
|
+
const { getEsClient, EsClient, } = require('@cumulus/es-client/search');
|
|
14
15
|
const logger = new logger_1.default({ sender: '@cumulus/async-operation' });
|
|
15
|
-
const getLambdaConfiguration = async (functionName) => (0, services_1.lambda)().
|
|
16
|
+
const getLambdaConfiguration = async (functionName) => (0, services_1.lambda)().send(new client_lambda_1.GetFunctionConfigurationCommand({
|
|
16
17
|
FunctionName: functionName,
|
|
17
|
-
});
|
|
18
|
+
}));
|
|
18
19
|
exports.getLambdaConfiguration = getLambdaConfiguration;
|
|
19
20
|
const getLambdaEnvironmentVariables = (configuration) => Object.entries(configuration?.Environment?.Variables ?? {}).map((obj) => ({
|
|
20
21
|
name: obj[0],
|
|
@@ -73,11 +74,11 @@ const startECSTask = async ({ asyncOperationTaskDefinition, cluster, callerLambd
|
|
|
73
74
|
},
|
|
74
75
|
],
|
|
75
76
|
},
|
|
76
|
-
})
|
|
77
|
+
});
|
|
77
78
|
};
|
|
78
79
|
exports.startECSTask = startECSTask;
|
|
79
80
|
const createAsyncOperation = async (params) => {
|
|
80
|
-
const { createObject, stackName, systemBucket, knexConfig = process.env, esClient = await
|
|
81
|
+
const { createObject, stackName, systemBucket, knexConfig = process.env, esClient = await getEsClient(), asyncOperationPgModel = new db_1.AsyncOperationPgModel(), } = params;
|
|
81
82
|
if (!stackName)
|
|
82
83
|
throw new TypeError('stackName is required');
|
|
83
84
|
if (!systemBucket)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async_operations.js","sourceRoot":"","sources":["../src/async_operations.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"async_operations.js","sourceRoot":"","sources":["../src/async_operations.ts"],"names":[],"mappings":"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"}
|