@aws-amplify/graphql-model-transformer 1.4.0-rds.3 → 1.4.0

package/publish-notification-lambda/node_modules/@smithy/protocol-http/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@smithy/protocol-http",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "scripts": {
-    "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
+    "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
     "build:es": "tsc -p tsconfig.es.json",
     "build:types": "tsc -p tsconfig.types.json",
@@ -23,7 +23,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@smithy/types": "^1.1.0",
+    "@smithy/types": "^1.1.1",
     "tslib": "^2.5.0"
   },
   "engines": {

package/publish-notification-lambda/node_modules/@smithy/types/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@smithy/types",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "scripts": {
-    "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
+    "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
     "build:es": "tsc -p tsconfig.es.json",
     "build:types": "tsc -p tsconfig.types.json",

package/publish-notification-lambda/node_modules/@types/node/README.md

@@ -8,7 +8,7 @@ This package contains type definitions for Node.js (https://nodejs.org/).
 Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
 
 ### Additional Details
- * Last updated: Mon, 26 Jun 2023 20:02:42 GMT
+ * Last updated: Wed, 12 Jul 2023 23:02:41 GMT
  * Dependencies: none
  * Global values: `AbortController`, `AbortSignal`, `__dirname`, `__filename`, `console`, `exports`, `gc`, `global`, `module`, `process`, `require`, `structuredClone`
 

package/publish-notification-lambda/node_modules/@types/node/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@types/node",
-    "version": "20.3.2",
+    "version": "20.4.2",
     "description": "TypeScript definitions for Node.js",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node",
     "license": "MIT",
@@ -232,6 +232,6 @@
     },
     "scripts": {},
     "dependencies": {},
-    "typesPublisherContentHash": "77b1f16021a42a5f28f9061a3922380bdc6bcd9630c2405d53ff935c6538793c",
+    "typesPublisherContentHash": "8ccebbf79ef4c9ade9cde2b505492190d140170bf4372bb3fe1ebd36e9344eac",
     "typeScriptVersion": "4.3"
 }

package/publish-notification-lambda/package-lock.json

@@ -1114,11 +1114,11 @@
       }
     },
     "node_modules/@smithy/protocol-http": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.1.0.tgz",
-      "integrity": "sha512-H5y/kZOqfJSqRkwtcAoVbqONmhdXwSgYNJ1Glk5Ry8qlhVVy5qUzD9EklaCH8/XLnoCsLO/F/Giee8MIvaBRkg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.1.1.tgz",
+      "integrity": "sha512-mFLFa2sSvlUxm55U7B4YCIsJJIMkA6lHxwwqOaBkral1qxFz97rGffP/mmd4JDuin1EnygiO5eNJGgudiUgmDQ==",
       "dependencies": {
-        "@smithy/types": "^1.1.0",
+        "@smithy/types": "^1.1.1",
         "tslib": "^2.5.0"
       },
       "engines": {
@@ -1126,9 +1126,9 @@
       }
     },
     "node_modules/@smithy/types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.1.0.tgz",
-      "integrity": "sha512-KzmvisMmuwD2jZXuC9e65JrgsZM97y5NpDU7g347oB+Q+xQLU6hQZ5zFNNbEfwwOJHoOvEVTna+dk1h/lW7alw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.1.1.tgz",
+      "integrity": "sha512-tMpkreknl2gRrniHeBtdgQwaOlo39df8RxSrwsHVNIGXULy5XP6KqgScUw2m12D15wnJCKWxVhCX+wbrBW/y7g==",
       "dependencies": {
         "tslib": "^2.5.0"
       },
@@ -1137,9 +1137,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.3.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.2.tgz",
-      "integrity": "sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==",
+      "version": "20.4.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.2.tgz",
+      "integrity": "sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw==",
       "dev": true
     },
     "node_modules/ansi-regex": {

package/publish-notification-lambda/src/index.ts

@@ -1,5 +1,5 @@
-import { LambdaClient, ListLayerVersionsCommand, ListLayerVersionsCommandOutput } from "@aws-sdk/client-lambda";
-import { PublishCommand, SNSClient } from "@aws-sdk/client-sns";
+import { LambdaClient, ListLayerVersionsCommand, ListLayerVersionsCommandOutput } from '@aws-sdk/client-lambda';
+import { PublishCommand, SNSClient } from '@aws-sdk/client-sns';
 
 const MAX_ITEMS = 50;
 const { LAYER_NAME, SNS_TOPIC_ARN, SNS_TOPIC_REGION } = process.env;

package/publish-notification-lambda/tsconfig.json

@@ -1,13 +1,13 @@
 {
   "compilerOptions": {
-    "target": "ES2015",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    "module": "commonjs",                                /* Specify what module code is generated. */
-    "rootDir": "./src",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "node",                          /* Specify how TypeScript looks up a file from a given module specifier. */
-    "outDir": "./lib",                                   /* Specify an output folder for all emitted files. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
-    "strict": true,                                      /* Enable all strict type-checking options. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "target": "ES2015" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "module": "commonjs" /* Specify what module code is generated. */,
+    "rootDir": "./src" /* Specify the root folder within your source files. */,
+    "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
+    "outDir": "./lib" /* Specify an output folder for all emitted files. */,
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
+    "strict": true /* Enable all strict type-checking options. */,
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
   }
 }

package/rds-lambda/handler.ts

@@ -5,6 +5,8 @@ import { DBAdapter, DBConfig, getDBAdapter } from 'rds-query-processor';
 let adapter: DBAdapter;
 let secretsClient: SSMClient;
 
+const delay = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));
+
 export const run = async (event): Promise<any> => {
   if (!adapter) {
     const config = await getDBConfig();
@@ -18,7 +20,13 @@ const createSSMClient = (): void => {
   secretsClient = new SSMClient({});
 };
 
-const getSSMValue = async(key: string | undefined): Promise<string> => {
+const wait10SecondsAndThrowError = async (): Promise<void> => {
+  await delay(10000);
+  console.log('Unable to retrieve secret for database connection from SSM. If your database is in VPC, verify that you have VPC endpoints for SSM defined and the security group\'s inbound rule for port 443 is defined.');
+  throw new Error('Unable to get the database credentials. Check the logs for more details.');
+};
+
+const getSSMValue = async (key: string | undefined): Promise<string> => {
   if (!key) {
     throw Error('Key not provided to retrieve database connection secret');
   }
@@ -26,11 +34,16 @@ const getSSMValue = async(key: string | undefined): Promise<string> => {
     Name: key,
     WithDecryption: true,
   });
-  const data = await secretsClient.send(parameterCommand);
-  if ((data.$metadata?.httpStatusCode && data?.$metadata?.httpStatusCode >= 400) || !data.Parameter?.Value) {
+
+  // When the lambda is deployed in VPC and VPC endpoints for SSM are not defined or
+  // the security group's inbound rule for port 443 is not defined,
+  // the SSM client waits for the entire lambda execution time and times out.
+  // If the parameter is not retrieved within 10 seconds, throw an error.
+  const data = await Promise.race([secretsClient.send(parameterCommand), wait10SecondsAndThrowError()]);
+  if ((data?.$metadata?.httpStatusCode && data?.$metadata?.httpStatusCode >= 400) || !data?.Parameter?.Value) {
     throw new Error('Unable to get secret for database connection');
   }
-  return data.Parameter?.Value;
+  return data.Parameter.Value;
 };
 
 const getDBConfig = async (): DBConfig => {