8000 Merge branch 'main' into nicholas.hulston/migrate-gitlab-secrets-to-v… · DataDog/datadog-lambda-js@3977ae3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3977ae3

Browse files
nhulstonnhulston
authored
Merge branch 'main' into nicholas.hulston/migrate-gitlab-secrets-to-vault
2 parents 514dabc + 05e1b03 commit 3977ae3

File tree

4 files changed

+724
-12
lines changed

4 files changed

+724
-12
lines changed

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "datadog-lambda-js",
3-
"version": "9.118.0",
3+
"version": "9.120.0",
44
"description": "Lambda client library that supports hybrid tracing in node js",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
@@ -21,6 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"@aws-sdk/client-kms": "^3.366.0",
24+
"@aws-sdk/client-secrets-manager": "^3.721.0",
2425
"@types/aws-lambda": "^8.10.136",
2526
"@types/aws-sdk": "^2.7.0",
2627
"@types/jest": "^26.0.23",

‎src/metrics/listener.spec.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ import StatsDClient from "hot-shots";
99
import { Context } from "aws-lambda";
1010
jest.mock("hot-shots");
1111

12-
jest.mock("aws-sdk/clients/secretsmanager", () => {
13-
return jest.fn().mockImplementation(() => ({
14-
getSecretValue: jest.fn().mockReturnValue({
15-
promise: jest.fn().mockResolvedValue({
16-
SecretString: "api-key-secret",
17-
}),
18-
}),
19-
}));
12+
jest.mock("@aws-sdk/client-secrets-manager", () => {
13+
return {
14+
SecretsManager: jest.fn().mockImplementation(() => ({
15+
getSecretValue: jest.fn().mockResolvedValue({ SecretString: "api-key-secret" }),
16+
})),
17+
};
2018
});
2119

2220
const siteURL = "example.com";

‎src/metrics/listener.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ export class MetricsListener {
222222

223223
if (config.apiKeySecretARN !== "") {
224224
try {
225-
const { default: secretsClient } = await import("aws-sdk/clients/secretsmanager");
226-
const secretsManager = new secretsClient();
227-
const secret = await secretsManager.getSecretValue({ SecretId: config.apiKeySecretARN }).promise();
225+
const { SecretsManager } = await import("@aws-sdk/client-secrets-manager");
226+
const secretsManager = new SecretsManager();
227+
const secret = await secretsManager.getSecretValue({ SecretId: config.apiKeySecretARN });
228228
return secret?.SecretString ?? "";
229229
} catch (error) {
230230
logError("couldn't get secrets manager api key", error as Error);

0 commit comments

Comments
 (0)
0