@middy/service-discovery 3.6.2 → 4.0.0-alpha.1

package/README.md

@@ -46,11 +46,10 @@ To install this middleware you can use NPM:
 npm install --save @middy/service-discovery
 ```
 
-
 ## Options
 
-- `AwsClient` (object) (default `AWS.STS`): AWS.STS class constructor (e.g. that has been instrumented with AWS XRay). Must be from `aws-sdk` v2.
-- `awsClientOptions` (object) (default `undefined`): Options to pass to AWS.STS class constructor.
+- `AwsClient` (object) (default `ServiceDiscoveryClient`): ServiceDiscoveryClient class constructor (i.e. that has been instrumented with AWS XRay). Must be from `@aws-sdk/client-servicediscovery`.
+- `awsClientOptions` (object) (default `undefined`): Options to pass to ServiceDiscoveryClient class constructor.
 - `awsClientAssumeRole` (string) (default `undefined`): Internal key where secrets are stored. See [@middy/sts](/packages/sts/README.md) on to set this.
 - `awsClientCapture` (function) (default `undefined`): Enable XRay by passing `captureAWSClient` from `aws-xray-sdk` in.
 - `fetchData` (object) (required): Mapping of internal key name to API request parameters.
@@ -60,6 +59,7 @@ npm install --save @middy/service-discovery
 - `setToContext` (boolean) (default `false`): Store credentials to `request.context`.
 
 NOTES:
+
 - Lambda is required to have IAM permission for `servicediscovery:DiscoverInstances`
 
 ## Sample usage
@@ -73,33 +73,31 @@ const handler = middy((event, context) => {
     statusCode: 200,
     headers: {},
     body: JSON.stringify({ message: 'hello world' })
-  };
+  }
 
   return response
 })
 
-handler
-  .use(serviceDiscovery({
+handler.use(
+  serviceDiscovery({
     fetchData: {
       instances: {
         NamespaceName: '...',
-        ServiceName:'...'
+        ServiceName: '...'
       }
     }
-  }))
+  })
+)
 ```
 
-
 ## Middy documentation and examples
 
 For more documentation and examples, refers to the main [Middy monorepo on GitHub](https://github.com/middyjs/middy) or [Middy official website](https://middy.js.org).
 
-
 ## Contributing
 
 Everyone is very welcome to contribute to this repository. Feel free to [raise issues](https://github.com/middyjs/middy/issues) or to [submit Pull Requests](https://github.com/middyjs/middy/pulls).
 
-
 ## License
 
 Licensed under [MIT License](LICENSE). Copyright (c) 2017-2022 [Luciano Mammino](https://github.com/lmammino), [will Farrell](https://github.com/willfarrell), and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).

package/index.cjs

@@ -7,14 +7,9 @@ Object.defineProperty(module, "exports", {
     get: ()=>_default
 });
 const _util = require("@middy/util");
-const _servicediscoveryJs = _interopRequireDefault(require("aws-sdk/clients/servicediscovery.js"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+const _clientServicediscovery = require("@aws-sdk/client-servicediscovery");
 const defaults = {
-    AwsClient: _servicediscoveryJs.default,
+    AwsClient: _clientServicediscovery.ServiceDiscoveryClient,
     awsClientOptions: {},
     awsClientAssumeRole: undefined,
     awsClientCapture: undefined,
@@ -33,7 +28,7 @@ const serviceDiscoveryMiddleware = (opts = {})=>{
         const values = {};
         for (const internalKey of Object.keys(options.fetchData)){
             if (cachedValues[internalKey]) continue;
-            values[internalKey] = client.discoverInstances(options.fetchData[internalKey]).promise().then((resp)=>resp.Instances).catch((e)=>{
+            values[internalKey] = client.send(new _clientServicediscovery.DiscoverInstancesCommand(options.fetchData[internalKey])).then((resp)=>resp.Instances).catch((e)=>{
                 const value = (0, _util.getCache)(options.cacheKey).value ?? {};
                 value[internalKey] = undefined;
                 (0, _util.modifyCache)(options.cacheKey, value);

package/index.d.ts

@@ -1,13 +1,18 @@
 import middy from '@middy/core'
 import { Options as MiddyOptions } from '@middy/util'
 import { Context as LambdaContext } from 'aws-lambda'
-import ServiceDiscovery, {
-  HttpInstanceSummaryList
-} from 'aws-sdk/clients/servicediscovery'
+import {
+  ServiceDiscoveryClient,
+  ServiceDiscoveryClientConfig,
+  HttpInstanceSummary
+} from '@aws-sdk/client-servicediscovery'
 
-interface Options<S = ServiceDiscovery>
+interface Options<AwsServiceDiscoveryClient = ServiceDiscoveryClient>
   extends Pick<
-  MiddyOptions<S, ServiceDiscovery.Types.ClientConfiguration>,
+  MiddyOptions<
+  AwsServiceDiscoveryClient,
+  ServiceDiscoveryClientConfig
+  >,
   | 'AwsClient'
   | 'awsClientOptions'
   | 'awsClientCapture'
@@ -21,7 +26,7 @@ interface Options<S = ServiceDiscovery>
 export type Context<TOptions extends Options | undefined> = TOptions extends {
   setToContext: true
 }
-  ? LambdaContext & Record<keyof TOptions['fetchData'], HttpInstanceSummaryList>
+  ? LambdaContext & Record<keyof TOptions['fetchData'], HttpInstanceSummary>
   : LambdaContext
 
 declare function serviceDiscovery<TOptions extends Options | undefined> (

package/index.js

@@ -1,7 +1,7 @@
 import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache } from '@middy/util';
-import ServiceDiscovery from 'aws-sdk/clients/servicediscovery.js';
+import { ServiceDiscoveryClient, DiscoverInstancesCommand } from '@aws-sdk/client-servicediscovery';
 const defaults = {
-    AwsClient: ServiceDiscovery,
+    AwsClient: ServiceDiscoveryClient,
     awsClientOptions: {},
     awsClientAssumeRole: undefined,
     awsClientCapture: undefined,
@@ -20,7 +20,7 @@ const serviceDiscoveryMiddleware = (opts = {})=>{
         const values = {};
         for (const internalKey of Object.keys(options.fetchData)){
             if (cachedValues[internalKey]) continue;
-            values[internalKey] = client.discoverInstances(options.fetchData[internalKey]).promise().then((resp)=>resp.Instances).catch((e)=>{
+            values[internalKey] = client.send(new DiscoverInstancesCommand(options.fetchData[internalKey])).then((resp)=>resp.Instances).catch((e)=>{
                 const value = getCache(options.cacheKey).value ?? {};
                 value[internalKey] = undefined;
                 modifyCache(options.cacheKey, value);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@middy/service-discovery",
-  "version": "3.6.2",
+  "version": "4.0.0-alpha.1",
   "description": "Service Discovery (Cloud Map) instances middleware for the middy framework",
   "type": "module",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "engineStrict": true,
   "publishConfig": {
@@ -61,13 +61,13 @@
   },
   "homepage": "https://middy.js.org",
   "dependencies": {
-    "@middy/util": "3.6.2"
+    "@middy/util": "4.0.0-alpha.1"
   },
   "devDependencies": {
-    "@middy/core": "3.6.2",
+    "@aws-sdk/client-servicediscovery": "^3.186.0",
+    "@middy/core": "4.0.0-alpha.1",
     "@types/aws-lambda": "^8.10.101",
-    "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "4c5d64c72dd4bfde0d3b828a0082c99f688c759c"
+  "gitHead": "b531f61dac3a5268728a21fc4b2b32054b170f88"
 }