diff --git a/cdk/custom-resources/setup-pgvector/index.js b/cdk/custom-resources/setup-pgvector/index.js index 23fab9a6a..a92511193 100644 --- a/cdk/custom-resources/setup-pgvector/index.js +++ b/cdk/custom-resources/setup-pgvector/index.js @@ -1,5 +1,5 @@ const { Client } = require("pg"); -import { getSecret } from "@aws-lambda-powertools/parameters/secrets"; +const { getSecret } = require("@aws-lambda-powertools/parameters/secrets"); const setUp = async (dbConfig) => { const client = new Client(dbConfig); @@ -66,23 +66,20 @@ const updateStatus = async (event, status, reason, physicalResourceId) => { exports.handler = async (event, context) => { console.log(`Received event: ${JSON.stringify(event, null, 2)}`); console.log(`Received context: ${JSON.stringify(context, null, 2)}`); - console.log(`DB_SECRETS_ARN: ${process.env.DB_SECRETS_ARN}`); - const secrets = await getSecret(process.env.DB_SECRETS_ARN); - const dbInfo = JSON.parse(secrets); - - // const dbConfig = event.ResourceProperties.dbConfig; - const dbConfig = { - host: dbInfo["host"], - user: dbInfo["username"], - password: dbInfo["password"], - database: dbInfo["dbname"], - port: dbInfo["port"], - }; const dbClusterIdentifier = process.env.DB_CLUSTER_IDENTIFIER; try { + const secrets = await getSecret(process.env.DB_SECRETS_ARN); + const dbInfo = JSON.parse(secrets); + const dbConfig = { + host: dbInfo["host"], + user: dbInfo["username"], + password: dbInfo["password"], + database: dbInfo["dbname"], + port: dbInfo["port"], + }; switch (event.RequestType) { case "Create": case "Update": diff --git a/cdk/package-lock.json b/cdk/package-lock.json index b430782b4..746b54ba3 100644 --- a/cdk/package-lock.json +++ b/cdk/package-lock.json @@ -9,9 +9,9 @@ "version": "0.1.0", "hasInstallScript": true, "dependencies": { - "@aws-cdk/aws-glue-alpha": "^2.132.0-alpha.0", - "@aws-cdk/aws-lambda-python-alpha": "^2.132.0-alpha.0", - "aws-cdk-lib": "^2.132.0", + "@aws-cdk/aws-glue-alpha": "^2.147.3-alpha.0", + "@aws-cdk/aws-lambda-python-alpha": "^2.147.3-alpha.0", + "aws-cdk-lib": "^2.147.3", "cdk-aws-lambda-powertools-layer": "^3.7.0", "constructs": "^10.0.0", "deploy-time-build": "^0.3.2", @@ -25,7 +25,7 @@ "@aws-prototyping-sdk/pdk-nag": "^0.19.68", "@types/jest": "^29.5.3", "@types/node": "20.4.2", - "aws-cdk": "2.132.0", + "aws-cdk": "2.147.3", "jest": "^29.6.1", "ts-jest": "^29.1.1", "ts-node": "^10.9.1", @@ -56,31 +56,31 @@ "integrity": "sha512-3M2tELJOxQv0apCIiuKQ4pAbncz9GuLwnKFqxifWfe77wuMxyTRPmxssYHs42ePqzap1LT6GDcPygGs+hHstLg==" }, "node_modules/@aws-cdk/asset-node-proxy-agent-v6": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz", - "integrity": "sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.3.tgz", + "integrity": "sha512-twhuEG+JPOYCYPx/xy5uH2+VUsIEhPTzDY0F1KuB+ocjWWB/KEDiOVL19nHvbPCB6fhWnkykXEMJ4HHcKvjtvg==" }, "node_modules/@aws-cdk/aws-glue-alpha": { - "version": "2.132.0-alpha.0", - "resolved": "https://registry.npmjs.org/@aws-cdk/aws-glue-alpha/-/aws-glue-alpha-2.132.0-alpha.0.tgz", - "integrity": "sha512-G68EYFrB90aqM6TPKGmzqmlRzmnPXTywntoIfQr4jhWJ7qyTxf2E3OPeCQL1Dt2aDmSw84taAmdD1m/cM+3owA==", + "version": "2.147.3-alpha.0", + "resolved": "https://registry.npmjs.org/@aws-cdk/aws-glue-alpha/-/aws-glue-alpha-2.147.3-alpha.0.tgz", + "integrity": "sha512-MDULIMhoQjgL0jlYgwFR0D6zis8qrVjElWNUt/4HWpS0iT3mMzj6N0ZRLXgQNjRQjHIdNrt+BXtnSp+5Zd7USQ==", "engines": { "node": ">= 14.15.0" }, "peerDependencies": { - "aws-cdk-lib": "^2.132.0", + "aws-cdk-lib": "^2.147.3", "constructs": "^10.0.0" } }, "node_modules/@aws-cdk/aws-lambda-python-alpha": { - "version": "2.132.0-alpha.0", - "resolved": "https://registry.npmjs.org/@aws-cdk/aws-lambda-python-alpha/-/aws-lambda-python-alpha-2.132.0-alpha.0.tgz", - "integrity": "sha512-l9BFsL/eG29UCGoM0nCSKczWgRIJcHAmkHBPbFJEowWQ546dquOpv/LolYA+wS/I6aFKfx4Gi4m1h6vhi2CZLg==", + "version": "2.147.3-alpha.0", + "resolved": "https://registry.npmjs.org/@aws-cdk/aws-lambda-python-alpha/-/aws-lambda-python-alpha-2.147.3-alpha.0.tgz", + "integrity": "sha512-X6pa1nlqull0sMqGBk/LFn8pFxOwfHP+Fo8HkutB/TSfWYttJpkYKdIwtQcSrgMv384uXVmyAyZkOQYacbhVOQ==", "engines": { "node": ">= 14.15.0" }, "peerDependencies": { - "aws-cdk-lib": "^2.132.0", + "aws-cdk-lib": "^2.147.3", "constructs": "^10.0.0" } }, @@ -1360,9 +1360,9 @@ } }, "node_modules/aws-cdk": { - "version": "2.132.0", - "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.132.0.tgz", - "integrity": "sha512-C2j9iQqpl21YGuip02tIAAkgkDZNDDWeEoWfPcdXCJlQ9DVpYTJG24QxtY0rWflJ7Xkn+iAozdjlCrXSxYeAfA==", + "version": "2.147.3", + "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.147.3.tgz", + "integrity": "sha512-Y+o2eONCMQ2xwLpeUevwOeShxhlmW42Qx1uBWreF9fKzCeFkZ/in66FlaCBKlLXtKPQOdhmWNWKJ9A+pE+L+5A==", "dev": true, "bin": { "cdk": "bin/cdk" @@ -1375,9 +1375,9 @@ } }, "node_modules/aws-cdk-lib": { - "version": "2.132.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.132.0.tgz", - "integrity": "sha512-auztTTYy8j62MmRZNdM7Vd8eQ5eP3xLMhrrILhDZf3DiSDD0lyYL0hv98VD4XPkWGMQ8yOmo5nZ3s/zD7cnKlw==", + "version": "2.147.3", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.147.3.tgz", + "integrity": "sha512-GX07otmLydgR3CX51OaDtDr/MXRbsl9HZ2txVQpEV3pkF0UpJVc7XLShYuHmVv0uyStnAQfEN6W89cXMK64Nlg==", "bundleDependencies": [ "@balena/dockerignore", "case", @@ -1394,7 +1394,7 @@ "dependencies": { "@aws-cdk/asset-awscli-v1": "^2.2.202", "@aws-cdk/asset-kubectl-v20": "^2.1.2", - "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1", + "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.3", "@balena/dockerignore": "^1.0.2", "case": "1.6.3", "fs-extra": "^11.2.0", @@ -1403,8 +1403,8 @@ "mime-types": "^2.1.35", "minimatch": "^3.1.2", "punycode": "^2.3.1", - "semver": "^7.6.0", - "table": "^6.8.1", + "semver": "^7.6.2", + "table": "^6.8.2", "yaml": "1.10.2" }, "engines": { @@ -1420,14 +1420,14 @@ "license": "Apache-2.0" }, "node_modules/aws-cdk-lib/node_modules/ajv": { - "version": "8.12.0", + "version": "8.16.0", "inBundle": true, "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "uri-js": "^4.4.1" }, "funding": { "type": "github", @@ -1580,17 +1580,6 @@ "inBundle": true, "license": "MIT" }, - "node_modules/aws-cdk-lib/node_modules/lru-cache": { - "version": "6.0.0", - "inBundle": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/aws-cdk-lib/node_modules/mime-db": { "version": "1.52.0", "inBundle": true, @@ -1638,12 +1627,9 @@ } }, "node_modules/aws-cdk-lib/node_modules/semver": { - "version": "7.6.0", + "version": "7.6.2", "inBundle": true, "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -1692,7 +1678,7 @@ } }, "node_modules/aws-cdk-lib/node_modules/table": { - "version": "6.8.1", + "version": "6.8.2", "inBundle": true, "license": "BSD-3-Clause", "dependencies": { @@ -1722,11 +1708,6 @@ "punycode": "^2.1.0" } }, - "node_modules/aws-cdk-lib/node_modules/yallist": { - "version": "4.0.0", - "inBundle": true, - "license": "ISC" - }, "node_modules/aws-cdk-lib/node_modules/yaml": { "version": "1.10.2", "inBundle": true, @@ -3742,7 +3723,6 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, "bin": { "semver": "bin/semver.js" } diff --git a/cdk/package.json b/cdk/package.json index ad9313099..0ec9939f6 100644 --- a/cdk/package.json +++ b/cdk/package.json @@ -15,16 +15,16 @@ "@aws-prototyping-sdk/pdk-nag": "^0.19.68", "@types/jest": "^29.5.3", "@types/node": "20.4.2", - "aws-cdk": "2.132.0", + "aws-cdk": "2.147.3", "jest": "^29.6.1", "ts-jest": "^29.1.1", "ts-node": "^10.9.1", "typescript": "~5.1.6" }, "dependencies": { - "@aws-cdk/aws-glue-alpha": "^2.132.0-alpha.0", - "@aws-cdk/aws-lambda-python-alpha": "^2.132.0-alpha.0", - "aws-cdk-lib": "^2.132.0", + "@aws-cdk/aws-glue-alpha": "^2.147.3-alpha.0", + "@aws-cdk/aws-lambda-python-alpha": "^2.147.3-alpha.0", + "aws-cdk-lib": "^2.147.3", "cdk-aws-lambda-powertools-layer": "^3.7.0", "constructs": "^10.0.0", "deploy-time-build": "^0.3.2",