@middy/secrets-manager 5.1.0 → 5.2.1
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/index.js +112 -67
- package/package.json +4 -4
package/index.js
CHANGED
|
@@ -1,72 +1,117 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import {
|
|
2
|
+
canPrefetch,
|
|
3
|
+
createPrefetchClient,
|
|
4
|
+
createClient,
|
|
5
|
+
getCache,
|
|
6
|
+
getInternal,
|
|
7
|
+
processCache,
|
|
8
|
+
modifyCache,
|
|
9
|
+
jsonSafeParse,
|
|
10
|
+
catchInvalidSignatureException
|
|
11
|
+
} from '@middy/util'
|
|
12
|
+
import {
|
|
13
|
+
SecretsManagerClient,
|
|
14
|
+
DescribeSecretCommand,
|
|
15
|
+
GetSecretValueCommand
|
|
16
|
+
} from '@aws-sdk/client-secrets-manager'
|
|
17
|
+
|
|
3
18
|
const defaults = {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
19
|
+
AwsClient: SecretsManagerClient,
|
|
20
|
+
awsClientOptions: {},
|
|
21
|
+
awsClientAssumeRole: undefined,
|
|
22
|
+
awsClientCapture: undefined,
|
|
23
|
+
fetchData: {},
|
|
24
|
+
fetchRotationDate: false, // true: apply to all or {key: true} for individual
|
|
25
|
+
disablePrefetch: false,
|
|
26
|
+
cacheKey: 'secrets-manager',
|
|
27
|
+
cacheKeyExpiry: {},
|
|
28
|
+
cacheExpiry: -1, // ignored when fetchRotationRules is true/object
|
|
29
|
+
setToContext: false
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const secretsManagerMiddleware = (opts = {}) => {
|
|
33
|
+
const options = { ...defaults, ...opts }
|
|
34
|
+
|
|
35
|
+
const fetch = (request, cachedValues = {}) => {
|
|
36
|
+
const values = {}
|
|
37
|
+
|
|
38
|
+
for (const internalKey of Object.keys(options.fetchData)) {
|
|
39
|
+
if (cachedValues[internalKey]) continue
|
|
40
|
+
|
|
41
|
+
values[internalKey] = Promise.resolve()
|
|
42
|
+
.then(() => {
|
|
43
|
+
if (
|
|
44
|
+
options.fetchRotationDate === true ||
|
|
45
|
+
options.fetchRotationDate?.[internalKey]
|
|
46
|
+
) {
|
|
47
|
+
const command = new DescribeSecretCommand({
|
|
48
|
+
SecretId: options.fetchData[internalKey]
|
|
49
|
+
})
|
|
50
|
+
return client
|
|
51
|
+
.send(command)
|
|
52
|
+
.catch((e) => catchInvalidSignatureException(e, client, command))
|
|
53
|
+
.then((resp) => {
|
|
54
|
+
if (options.cacheExpiry < 0) {
|
|
55
|
+
options.cacheKeyExpiry[internalKey] =
|
|
56
|
+
resp.NextRotationDate * 1000
|
|
57
|
+
} else {
|
|
58
|
+
options.cacheKeyExpiry[internalKey] = Math.min(
|
|
59
|
+
Math.max(resp.LastRotationDate, resp.LastChangedDate) *
|
|
60
|
+
1000 +
|
|
61
|
+
options.cacheExpiry,
|
|
62
|
+
resp.NextRotationDate * 1000
|
|
63
|
+
)
|
|
36
64
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
65
|
+
})
|
|
66
|
+
}
|
|
67
|
+
})
|
|
68
|
+
.then(() => {
|
|
69
|
+
const command = new GetSecretValueCommand({
|
|
70
|
+
SecretId: options.fetchData[internalKey]
|
|
71
|
+
})
|
|
72
|
+
return client
|
|
73
|
+
.send(command)
|
|
74
|
+
.catch((e) => catchInvalidSignatureException(e, client, command))
|
|
75
|
+
})
|
|
76
|
+
.then((resp) => jsonSafeParse(resp.SecretString))
|
|
77
|
+
.catch((e) => {
|
|
78
|
+
const value = getCache(options.cacheKey).value ?? {}
|
|
79
|
+
value[internalKey] = undefined
|
|
80
|
+
modifyCache(options.cacheKey, value)
|
|
81
|
+
throw e
|
|
82
|
+
})
|
|
52
83
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
84
|
+
return values
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
let client
|
|
88
|
+
if (canPrefetch(options)) {
|
|
89
|
+
client = createPrefetchClient(options)
|
|
90
|
+
processCache(options, fetch)
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
const secretsManagerMiddlewareBefore = async (request) => {
|
|
94
|
+
if (!client) {
|
|
95
|
+
client = await createClient(options, request)
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
const { value } = processCache(options, fetch, request)
|
|
99
|
+
|
|
100
|
+
Object.assign(request.internal, value)
|
|
101
|
+
|
|
102
|
+
if (options.setToContext) {
|
|
103
|
+
const data = await getInternal(Object.keys(options.fetchData), request)
|
|
104
|
+
Object.assign(request.context, data)
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
return {
|
|
109
|
+
before: secretsManagerMiddlewareBefore
|
|
110
|
+
}
|
|
71
111
|
}
|
|
112
|
+
export default secretsManagerMiddleware
|
|
72
113
|
|
|
114
|
+
// used for TS type inference (see index.d.ts)
|
|
115
|
+
export function secret (name) {
|
|
116
|
+
return name
|
|
117
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@middy/secrets-manager",
|
|
3
|
-
"version": "5.1
|
|
3
|
+
"version": "5.2.1",
|
|
4
4
|
"description": "Secrets Manager middleware for the middy framework",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
"url": "https://github.com/sponsors/willfarrell"
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@middy/util": "5.1
|
|
61
|
+
"@middy/util": "5.2.1"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
64
|
"@aws-sdk/client-secrets-manager": "^3.0.0",
|
|
65
|
-
"@middy/core": "5.1
|
|
65
|
+
"@middy/core": "5.2.1",
|
|
66
66
|
"@types/aws-lambda": "^8.10.101",
|
|
67
67
|
"aws-xray-sdk": "^3.3.3"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "4d55da221b9165b4b3e59a12632fd40a149a1e92"
|
|
70
70
|
}
|