v2.0.1

Author: spg

cdk-postgresql/lib/database.handler.ts

@@ -1,5 +1,5 @@
 import format from "pg-format";
-import { createClient, validateConnection, hashCode } from "./util";
+import { getConnectedClient, validateConnection, hashCode } from "./util";
 import * as postgres from "./postgres";
 
 import {
@@ -99,8 +99,7 @@ export const createDatabase = async (props: {
 }) => {
   const { connection, name, owner } = props;
   console.log("Creating database", name);
-  const client = await createClient(connection);
-  await client.connect();
+  const client = await getConnectedClient(connection);
 
   await postgres.createDatabase({ client, name, owner });
   await client.end();
@@ -113,8 +112,7 @@ export const deleteDatabase = async (
   owner: string
 ) => {
   console.log("Deleting database", name);
-  const client = await createClient(connection);
-  await client.connect();
+  const client = await getConnectedClient(connection);
 
   // First, drop all remaining DB connections
   // Sometimes, DB connections are still alive even though the ECS service has been deleted
@@ -136,8 +134,7 @@ export const updateDbOwner = async (
   owner: string
 ) => {
   console.log(`Updating DB ${name} owner to ${owner}`);
-  const client = await createClient(connection);
-  await client.connect();
+  const client = await getConnectedClient(connection);
 
   await client.query(format("ALTER DATABASE %I OWNER TO %I", name, owner));
   await client.end();

cdk-postgresql/lib/provider.ts

@@ -104,7 +104,7 @@ export class Provider extends Construct implements iam.IGrantable {
         nodeModules: ["pg", "pg-format"],
       },
       logRetention: logs.RetentionDays.ONE_MONTH,
-      timeout: cdk.Duration.seconds(30),
+      timeout: cdk.Duration.minutes(15),
       vpc,
       securityGroups: handlerSecurityGroups,
     });

cdk-postgresql/lib/role.handler.ts

@@ -10,7 +10,7 @@ import {
 import {
   validateConnection,
   hashCode,
-  createClient,
+  getConnectedClient,
   secretsmanager,
 } from "./util";
 import { Connection } from "./lambda.types";
@@ -109,8 +109,7 @@ const generatePhysicalId = (props: Props): string => {
 
 export const deleteRole = async (connection: Connection, name: string) => {
   console.log("Deleting user", name);
-  const client = await createClient(connection);
-  await client.connect();
+  const client = await getConnectedClient(connection);
 
   await client.query(format("DROP USER %I", name));
   await client.end();
@@ -122,8 +121,7 @@ export const updateRoleName = async (
   newName: string
 ) => {
   console.log(`Updating role name from ${oldName} to ${newName}`);
-  const client = await createClient(connection);
-  await client.connect();
+  const client = await getConnectedClient(connection);
 
   await client.query(format("ALTER ROLE %I RENAME TO %I", oldName, newName));
   await client.end();
@@ -137,8 +135,7 @@ export const updateRolePassword = async (props: {
   const { connection, name, passwordArn } = props;
   console.log("Updating user password", name);
 
-  const client = await createClient(connection);
-  await client.connect();
+  const client = await getConnectedClient(connection);
 
   const { SecretString: password } = await secretsmanager.getSecretValue({
     SecretId: passwordArn,
@@ -155,8 +152,7 @@ export const createRole = async (props: {
 }) => {
   const { connection, name, passwordArn } = props;
   console.log("Creating user", name);
-  const client = await createClient(connection);
-  await client.connect();
+  const client = await getConnectedClient(connection);
 
   const { SecretString: password } = await secretsmanager.getSecretValue({
     SecretId: passwordArn,

cdk-postgresql/lib/util.ts

@@ -8,11 +8,49 @@ export const isObject = (obj: any): obj is { [key: string]: any } => {
   return typeof obj === "object" && !Array.isArray(obj) && obj !== null;
 };
 
-export const createClient = async (connection: Connection) => {
+export const getConnectedClient = async (connection: Connection) => {
   console.debug(
     `creating PG client with connection: ${JSON.stringify(connection)}`
   );
 
+  const password = await getPassword(connection);
+
+  const clientProps: ClientConfig = {
+    host: connection.Host,
+    port: connection.Port,
+    user: connection.Username,
+    password,
+    database: connection.Database,
+  };
+
+  console.debug(`clientProps: ${JSON.stringify(clientProps)}`);
+
+  if (connection.SSLMode === "require") {
+    clientProps.ssl = {
+      rejectUnauthorized: false,
+    };
+  }
+
+  let client;
+  let tries = 0;
+  let connected = false;
+  do {
+    tries++;
+    client = new Client(clientProps);
+    try {
+      await client.connect();
+    } catch (err) {
+      console.debug({ err, tries });
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+      continue;
+    }
+    connected = true;
+  } while (!connected);
+  console.debug("connected");
+  return client;
+};
+
+const getPassword = async (connection: Connection) => {
   const { SecretString } = await secretsmanager.getSecretValue({
     SecretId: connection.PasswordArn,
   });
@@ -45,23 +83,7 @@ export const createClient = async (connection: Connection) => {
     password = parsedSecret;
   }
 
-  const clientProps: ClientConfig = {
-    host: connection.Host,
-    port: connection.Port,
-    user: connection.Username,
-    password,
-    database: connection.Database,
-  };
-
-  console.debug(`clientProps: ${JSON.stringify(clientProps)}`);
-
-  if (connection.SSLMode === "require") {
-    clientProps.ssl = {
-      rejectUnauthorized: false,
-    };
-  }
-
-  return new Client(clientProps);
+  return password;
 };
 
 export const validateConnection = (connection: Connection) => {

cdk-postgresql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cdk-postgresql",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Postgresql constructs for AWS CDK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

yarn.lock

@@ -954,18 +954,6 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@botpress/[email protected]":
-  version "2.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@botpress/cdk-postgresql/-/cdk-postgresql-2.0.0-beta.9.tgz#baf0a2c096c322c30fac487db868ab642cfd8177"
-  integrity sha512-qGhwws5zJXeNWx+vCJmq7EkUiceWJJ/7KwqWJqNBzqytPPz5kKBOG55sq1rRKgn3Dk+sN7wbHndFPzcg61ZX5w==
-  dependencies:
-    "@aws-sdk/client-secrets-manager" "3.47.2"
-    "@types/node" "17.0.8"
-    esbuild "^0.14.12"
-    pg "8.7.1"
-    pg-format "1.0.4"
-    verror "^1.10.1"
-
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"