@cumulus/async-operations 18.2.2 → 18.3.0

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@cumulus/async-operations",
-  "version": "18.2.2",
+  "version": "18.3.0",
   "description": "Cumulus Core internal async operations module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "engines": {
-    "node": ">=16.19.0"
+    "node": ">=20.12.2"
   },
   "scripts": {
     "clean": "git clean -d -x -e node_modules -f",
     "test": "../../node_modules/.bin/ava",
+    "test:ci": "../../scripts/run_package_ci_unit.sh",
     "test:coverage": "../../node_modules/.bin/nyc npm test",
     "prepare": "npm run tsc",
     "tsc": "../../node_modules/.bin/tsc",
@@ -22,27 +23,28 @@
     "files": [
       "tests/**/*.js"
     ],
-    "fail-fast": true,
+    "failFast": true,
     "verbose": true,
     "timeout": "2m"
   },
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/client-lambda": "^3.447.0",
-    "@cumulus/aws-client": "18.2.2",
-    "@cumulus/db": "18.2.2",
-    "@cumulus/errors": "18.2.2",
-    "@cumulus/es-client": "18.2.2",
-    "@cumulus/logger": "18.2.2",
-    "@cumulus/types": "18.2.2",
+    "@aws-sdk/client-ecs": "^3.477.0",
+    "@aws-sdk/client-lambda": "^3.529.1",
+    "@cumulus/aws-client": "18.3.0",
+    "@cumulus/db": "18.3.0",
+    "@cumulus/errors": "18.3.0",
+    "@cumulus/es-client": "18.3.0",
+    "@cumulus/logger": "18.3.0",
+    "@cumulus/types": "18.3.0",
     "knex": "2.4.1",
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@cumulus/common": "18.2.2",
+    "@cumulus/common": "18.3.0",
     "@types/aws-sdk": "2.7.0",
     "@types/uuid": "^8.0.0"
   },
-  "gitHead": "d2f030f1d77b6d3072cb20f84261b10a7b160620"
+  "gitHead": "e8731c150ac49c1bab058183a7a5d91464e1701c"
 }

package/src/async_operations.ts

@@ -1,6 +1,6 @@
-import { ECS } from 'aws-sdk';
+import { RunTaskCommandOutput } from '@aws-sdk/client-ecs';
 import { Knex } from 'knex';
-import { FunctionConfiguration } from '@aws-sdk/client-lambda';
+import { FunctionConfiguration, GetFunctionConfigurationCommand } from '@aws-sdk/client-lambda';
 import { ecs, s3, lambda } from '@cumulus/aws-client/services';
 
 import {
@@ -13,8 +13,6 @@ import {
 import Logger from '@cumulus/logger';
 import { ApiAsyncOperation, AsyncOperationType } from '@cumulus/types/api/async_operations';
 import { v4 as uuidv4 } from 'uuid';
-import type { AWSError } from 'aws-sdk/lib/error';
-import type { PromiseResult } from 'aws-sdk/lib/request';
 
 import type {
   AsyncOperationPgModelObject,
@@ -25,18 +23,18 @@ const {
   indexAsyncOperation,
 } = require('@cumulus/es-client/indexer');
 const {
-  Search,
+  getEsClient, EsClient,
 } = require('@cumulus/es-client/search');
 
 const logger = new Logger({ sender: '@cumulus/async-operation' });
 
-type StartEcsTaskReturnType = Promise<PromiseResult<ECS.RunTaskResponse, AWSError>>;
+type StartEcsTaskReturnType = Promise<RunTaskCommandOutput>;
 
 export const getLambdaConfiguration = async (
   functionName: string
-): Promise<FunctionConfiguration> => lambda().getFunctionConfiguration({
+): Promise<FunctionConfiguration> => lambda().send(new GetFunctionConfigurationCommand({
   FunctionName: functionName,
-});
+}));
 
 export const getLambdaEnvironmentVariables = (
   configuration: FunctionConfiguration
@@ -120,7 +118,7 @@ export const startECSTask = async ({
         },
       ],
     },
-  }).promise();
+  });
 };
 
 export const createAsyncOperation = async (
@@ -129,7 +127,7 @@ export const createAsyncOperation = async (
     stackName: string,
     systemBucket: string,
     knexConfig?: NodeJS.ProcessEnv,
-    esClient?: object,
+    esClient?: typeof EsClient,
     asyncOperationPgModel?: AsyncOperationPgModelObject
   }
 ): Promise<Partial<ApiAsyncOperation>> => {
@@ -138,7 +136,7 @@ export const createAsyncOperation = async (
     stackName,
     systemBucket,
     knexConfig = process.env,
-    esClient = await Search.es(),
+    esClient = await getEsClient(),
     asyncOperationPgModel = new AsyncOperationPgModel(),
   } = params;
 

package/tests/test-async_operations.js

@@ -7,6 +7,9 @@ const sinon = require('sinon');
 const omit = require('lodash/omit');
 
 const { v4: uuidv4 } = require('uuid');
+const { mockClient } = require('aws-sdk-client-mock');
+const { GetFunctionConfigurationCommand } = require('@aws-sdk/client-lambda');
+
 const { ecs, lambda, s3 } = require('@cumulus/aws-client/services');
 const { getJsonS3Object, recursivelyDeleteS3Bucket } = require('@cumulus/aws-client/S3');
 // eslint-disable-next-line node/no-unpublished-require
@@ -65,12 +68,8 @@ test.before(async (t) => {
   ecsClient = ecs();
   ecsClient.runTask = (params) => {
     stubbedEcsRunTaskParams = params;
-    return {
-      promise: () => {
-        if (!stubbedEcsRunTaskResult) return Promise.reject(new Error('stubbedEcsRunTaskResult has not yet been set'));
-        return Promise.resolve(stubbedEcsRunTaskResult);
-      },
-    };
+    if (!stubbedEcsRunTaskResult) return Promise.reject(new Error('stubbedEcsRunTaskResult has not yet been set'));
+    return Promise.resolve(stubbedEcsRunTaskResult);
   };
 
   t.context.functionConfig = {
@@ -81,10 +80,10 @@ test.before(async (t) => {
     },
   };
 
-  sinon.stub(lambda(), 'getFunctionConfiguration').returns(
+  const mockLambdaClient = mockClient(lambda()).onAnyCommand().rejects();
+  mockLambdaClient.on(GetFunctionConfigurationCommand).resolves(
     Promise.resolve(t.context.functionConfig)
   );
-
   t.context.asyncOperationPgModel = new AsyncOperationPgModel();
 });
 
@@ -526,8 +525,11 @@ test.serial('createAsyncOperation() does not write to Elasticsearch if writing t
 test.serial('createAsyncOperation() does not write to PostgreSQL if writing to Elasticsearch fails', async (t) => {
   const { id, createObject } = t.context;
   const fakeEsClient = {
-    index: () => {
-      throw new Error('ES something bad');
+    initializeEsClient: () => Promise.resolve(),
+    client: {
+      index: () => {
+        throw new Error('ES something bad');
+      },
     },
   };