remove aws-sdk usage (#650)

* remove aws-sdk usage

* fix type problems

* opensearch 2.11 in ci

* use localstack 3

* changelog

Author: Phil Varner

.github/workflows/push.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       localstack:
-        image: localstack/localstack
+        image: localstack/localstack:3
         env:
           SERVICES: s3,sns,sqs
         ports:
@@ -28,7 +28,7 @@ jobs:
           cache-dependency-path: package.json
       - uses: ankane/setup-opensearch@v1
         with:
-          opensearch-version: 2.7
+          opensearch-version: 2.11
       - name: Upgrade npm
         run: npm install -g npm@8.19.4
       - name: Install dependencies

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased] - TBD
+
+### Added
+
+- Better error handling when create_index fails.
+
+### Fixed
+
+- Removed usages of aws-sdk that were missed in 3.0.0.
+
 ## [3.1.0] - 2023-11-28
 
 ### Added
@@ -386,7 +396,7 @@ Initial release, forked from [sat-api](https://github.com/sat-utils/sat-api/tree
 
 Compliant with STAC 0.9.0
 
-<!-- [Unreleased]: https://github.com/stac-utils/stac-api/compare/v2.4.0...main -->
+[Unreleased]: https://github.com/stac-utils/stac-api/compare/v2.4.0...main
 [3.1.0]: https://github.com/stac-utils/stac-api/compare/v3.0.0...v3.1.0
 [3.0.0]: https://github.com/stac-utils/stac-api/compare/v2.4.0...v3.0.0
 [2.4.0]: https://github.com/stac-utils/stac-api/compare/v2.3.0...v2.4.0

docker-compose.yml

@@ -8,8 +8,9 @@ services:
     volumes:
       - ./opensearch/config/opensearch.yml:/usr/share/opensearch/config/opensearch.yml
   localstack:
-    image: localstack/localstack:2.1.0
+    image: localstack/localstack:3
     ports:
-      - "127.0.0.1:4566:4566"
+      - "127.0.0.1:4566:4566" # LocalStack Gateway
+      - "127.0.0.1:4510-4559:4510-4559"  # external services port range
     environment:
       - SERVICES=s3,sns,sqs

src/lambdas/api/index.js

@@ -8,7 +8,7 @@
 
 import { z } from 'zod'
 import serverless from 'serverless-http'
-import { Lambda } from 'aws-sdk'
+import { Lambda } from '@aws-sdk/client-lambda'
 import { app } from './app.js'
 import _default from './types.js'
 import logger from '../../lib/logger.js'
@@ -70,20 +70,20 @@ const logZodParseError = (data, error) => {
  * @returns {Promise<APIGatewayProxyEvent|APIGatewayProxyResult>}
  */
 const invokePreHook = async (lambda, preHook, payload) => {
-  /** @type {Lambda.InvocationResponse} */
+  /** @type {import("@aws-sdk/client-lambda").InvocationResponse} */
   let invocationResponse
   try {
     invocationResponse = await lambda.invoke({
       FunctionName: preHook,
       Payload: JSON.stringify(payload)
-    }).promise()
+    })
   } catch (error) {
     logger.error('Failed to invoke pre-hook lambda:', error)
     return internalServerError
   }
 
   // I've never seen this happen but, according to the TypeScript type definitions
-  // provided by AWS, `Lambda.InvocationResponse.Payload` could be `undefined`.
+  // provided by AWS, `InvocationResponse.Payload` could be `undefined`.
   if (invocationResponse.Payload === undefined) {
     logger.error('Undefined Payload returned from pre-hook lambda')
     return internalServerError
@@ -117,20 +117,20 @@ const invokePreHook = async (lambda, preHook, payload) => {
  * @returns {Promise<APIGatewayProxyResult>}
  */
 const invokePostHook = async (lambda, postHook, payload) => {
-  /** @type {Lambda.InvocationResponse} */
+  /** @type {import("@aws-sdk/client-lambda").InvocationResponse} */
   let invocationResponse
   try {
     invocationResponse = await lambda.invoke({
       FunctionName: postHook,
       Payload: JSON.stringify(payload)
-    }).promise()
+    })
   } catch (error) {
     logger.error('Failed to invoke post-hook lambda:', error)
     return internalServerError
   }
 
   // I've never seen this happen but, according to the TypeScript type definitions
-  // provided by AWS, `Lambda.InvocationResponse.Payload` could be `undefined`.
+  // provided by AWS, `InvocationResponse.Payload` could be `undefined`.
   if (invocationResponse.Payload === undefined) {
     logger.error('Undefined Payload returned from post-hook lambda')
     return internalServerError

src/lambdas/api/webpack.config.js

@@ -20,9 +20,6 @@ export default {
     filename: 'index.js',
     path: resolve(__dirname, '..', '..', '..', 'dist', 'api')
   },
-  externals: [
-    'aws-sdk'
-  ],
   devtool,
   resolve: {
     extensions: ["", ".webpack.js", ".web.js", ".ts", ".js"],

src/lambdas/ingest/webpack.config.js

@@ -19,9 +19,6 @@ export default {
     filename: 'index.js',
     path: resolve(__dirname, '..', '..', '..', 'dist', 'ingest')
   },
-  externals: [
-    'aws-sdk'
-  ],
   devtool,
   resolve: {
     extensions: ["", ".webpack.js", ".web.js", ".ts", ".js"],

src/lambdas/post-hook/webpack.config.js

@@ -19,9 +19,6 @@ export default {
     filename: 'index.js',
     path: resolve(__dirname, '..', '..', '..', 'dist', 'post-hook')
   },
-  externals: [
-    'aws-sdk'
-  ],
   devtool,
   resolve: {
     extensions: ["", ".webpack.js", ".web.js", ".ts", ".js"],

src/lambdas/pre-hook/webpack.config.js

@@ -19,9 +19,6 @@ export default {
     filename: 'index.js',
     path: resolve(__dirname, '..', '..', '..', 'dist', 'pre-hook')
   },
-  externals: [
-    'aws-sdk'
-  ],
   devtool,
   resolve: {
     extensions: ["", ".webpack.js", ".web.js", ".ts", ".js"],

src/lib/database-client.js

@@ -86,7 +86,10 @@ export async function createIndex(index) {
       logger.info(`Created index ${index}`)
       logger.debug('Mapping: %j', indexConfiguration)
     } catch (error) {
-      logger.debug(`Error creating index '${index}'`, error)
+      logger.error(`Error creating index '${index}'`, error)
+      throw error
     }
+  } else {
+    logger.error(`${index} already exists.`)
   }
 }

tests/unit/test-ingest-1.js

@@ -12,11 +12,7 @@ const setup = () => {
     promise: () => (Promise.resolve(true))
   })
   ECS.prototype.runTask = runTask
-  const AWS = {
-    ECS
-  }
   const lambda = proxyquire('../../src/lambdas/ingest/', {
-    'aws-sdk': AWS
   })
   return {
     ingest,