@middy/secrets-manager 3.6.1 → 4.0.0-alpha.0

package/README.md

@@ -56,8 +56,8 @@ npm install --save @middy/secrets-manager
 
 ## Options
 
-- `AwsClient` (object) (default `AWS.SecretsManager`): AWS.SecretsManager 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.SecretsManager class constructor.
+- `AwsClient` (object) (default `SecretsManagerClient`): SecretsManagerClient class constructor (i.e. that has been instrumented with AWS XRay). Must be from `@aws-sdk/client-secrets-manager`.
+- `awsClientOptions` (object) (default `undefined`): Options to pass to SecretsManagerClient 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 parameter `SecretId`.
@@ -67,6 +67,7 @@ npm install --save @middy/secrets-manager
 - `setToContext` (boolean) (default `false`): Store secrets to `request.context`.
 
 NOTES:
+
 - Lambda is required to have IAM permission for `secretsmanager:GetSecretValue`
 
 ## Sample usage
@@ -79,21 +80,23 @@ const handler = middy((event, context) => {
   return {}
 })
 
-handler.use(secretsManager({
-  fetchData: {
-    apiToken: 'dev/api_token'
-  },
-  awsClientOptions: {
-    region: 'us-east-1',
-  },
-  setToContext: true,
-}))
+handler.use(
+  secretsManager({
+    fetchData: {
+      apiToken: 'dev/api_token'
+    },
+    awsClientOptions: {
+      region: 'us-east-1'
+    },
+    setToContext: true
+  })
+)
 
 // Before running the function handler, the middleware will fetch from Secrets Manager
 handler(event, context, (_, response) => {
   // assuming the dev/api_token has two keys, 'Username' and 'Password'
-  t.is(context.apiToken.Username,'username')
-  t.is(context.apiToken.Password,'password')
+  t.is(context.apiToken.Username, 'username')
+  t.is(context.apiToken.Password, 'password')
 })
 ```
 

package/index.cjs

@@ -7,14 +7,9 @@ Object.defineProperty(module, "exports", {
     get: ()=>_default
 });
 const _util = require("@middy/util");
-const _secretsmanagerJs = _interopRequireDefault(require("aws-sdk/clients/secretsmanager.js"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+const _clientSecretsManager = require("@aws-sdk/client-secrets-manager");
 const defaults = {
-    AwsClient: _secretsmanagerJs.default,
+    AwsClient: _clientSecretsManager.SecretsManagerClient,
     awsClientOptions: {},
     awsClientAssumeRole: undefined,
     awsClientCapture: undefined,
@@ -33,9 +28,9 @@ const secretsManagerMiddleware = (opts = {})=>{
         const values = {};
         for (const internalKey of Object.keys(options.fetchData)){
             if (cachedValues[internalKey]) continue;
-            values[internalKey] = client.getSecretValue({
+            values[internalKey] = client.send(new _clientSecretsManager.GetSecretValueCommand({
                 SecretId: options.fetchData[internalKey]
-            }).promise().then((resp)=>(0, _util.jsonSafeParse)(resp.SecretString)).catch((e)=>{
+            })).then((resp)=>(0, _util.jsonSafeParse)(resp.SecretString)).catch((e)=>{
                 const value = (0, _util.getCache)(options.cacheKey).value ?? {};
                 value[internalKey] = undefined;
                 (0, _util.modifyCache)(options.cacheKey, value);

package/index.d.ts

@@ -1,10 +1,13 @@
 import middy from '@middy/core'
 import { Options as MiddyOptions } from '@middy/util'
 import { Context as LambdaContext } from 'aws-lambda'
-import SecretsManager from 'aws-sdk/clients/secretsmanager'
+import { SecretsManagerClient, SecretsManagerClientConfig } from '@aws-sdk/client-secrets-manager'
 
-interface Options<SM = SecretsManager>
-  extends MiddyOptions<SM, SecretsManager.Types.ClientConfiguration> {}
+interface Options<AwsSecretsManagerClient = SecretsManagerClient>
+  extends MiddyOptions<
+  AwsSecretsManagerClient,
+  SecretsManagerClientConfig
+  > {}
 
 export type Context<TOptions extends Options | undefined> = TOptions extends {
   setToContext: true

package/index.js

@@ -1,7 +1,7 @@
 import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache, jsonSafeParse } from '@middy/util';
-import SecretsManager from 'aws-sdk/clients/secretsmanager.js';
+import { SecretsManagerClient, GetSecretValueCommand } from '@aws-sdk/client-secrets-manager';
 const defaults = {
-    AwsClient: SecretsManager,
+    AwsClient: SecretsManagerClient,
     awsClientOptions: {},
     awsClientAssumeRole: undefined,
     awsClientCapture: undefined,
@@ -20,9 +20,9 @@ const secretsManagerMiddleware = (opts = {})=>{
         const values = {};
         for (const internalKey of Object.keys(options.fetchData)){
             if (cachedValues[internalKey]) continue;
-            values[internalKey] = client.getSecretValue({
+            values[internalKey] = client.send(new GetSecretValueCommand({
                 SecretId: options.fetchData[internalKey]
-            }).promise().then((resp)=>jsonSafeParse(resp.SecretString)).catch((e)=>{
+            })).then((resp)=>jsonSafeParse(resp.SecretString)).catch((e)=>{
                 const value = getCache(options.cacheKey).value ?? {};
                 value[internalKey] = undefined;
                 modifyCache(options.cacheKey, value);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@middy/secrets-manager",
-  "version": "3.6.1",
+  "version": "4.0.0-alpha.0",
   "description": "Secrets Manager middleware for the middy framework",
   "type": "module",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "engineStrict": true,
   "publishConfig": {
@@ -60,13 +60,13 @@
   },
   "homepage": "https://middy.js.org",
   "dependencies": {
-    "@middy/util": "3.6.1"
+    "@middy/util": "4.0.0-alpha.0"
   },
   "devDependencies": {
-    "@middy/core": "3.6.1",
+    "@aws-sdk/client-secrets-manager": "^3.186.0",
+    "@middy/core": "4.0.0-alpha.0",
     "@types/aws-lambda": "^8.10.101",
-    "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "31a7f9f8e93a73a8be382b3022b9cfcbc13b2961"
+  "gitHead": "306fb9aa633d5757d11ced3dc192f046ef3c2685"
 }