cdk-rds-sql 2.1.2 → 2.3.0

package/.gitattributes

@@ -7,7 +7,6 @@
 /.github/workflows/build.yml linguist-generated
 /.github/workflows/pull-request-lint.yml linguist-generated
 /.github/workflows/release.yml linguist-generated
-/.github/workflows/upgrade-main.yml linguist-generated
 /.gitignore linguist-generated
 /.mergify.yml linguist-generated
 /.npmignore linguist-generated

package/.jsii

@@ -15,7 +15,7 @@
     "source-map-support": "^0.5.21"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.51.1",
+    "aws-cdk-lib": "^2.64.0",
     "constructs": "^10.1.168"
   },
   "dependencyClosure": {
@@ -932,6 +932,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_devicefarm": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.DeviceFarm"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.devicefarm"
+            },
+            "python": {
+              "module": "aws_cdk.aws_devicefarm"
+            }
+          }
+        },
         "aws-cdk-lib.aws_devopsguru": {
           "targets": {
             "dotnet": {
@@ -997,6 +1010,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_docdbelastic": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.DocDBElastic"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.docdbelastic"
+            },
+            "python": {
+              "module": "aws_cdk.aws_docdbelastic"
+            }
+          }
+        },
         "aws-cdk-lib.aws_dynamodb": {
           "targets": {
             "dotnet": {
@@ -1413,6 +1439,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_grafana": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.Grafana"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.grafana"
+            },
+            "python": {
+              "module": "aws_cdk.aws_grafana"
+            }
+          }
+        },
         "aws-cdk-lib.aws_greengrass": {
           "targets": {
             "dotnet": {
@@ -1725,6 +1764,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_kendraranking": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.KendraRanking"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.kendraranking"
+            },
+            "python": {
+              "module": "aws_cdk.aws_kendraranking"
+            }
+          }
+        },
         "aws-cdk-lib.aws_kinesis": {
           "targets": {
             "dotnet": {
@@ -2193,6 +2245,45 @@
             }
           }
         },
+        "aws-cdk-lib.aws_oam": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.Oam"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.oam"
+            },
+            "python": {
+              "module": "aws_cdk.aws_oam"
+            }
+          }
+        },
+        "aws-cdk-lib.aws_omics": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.Omics"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.omics"
+            },
+            "python": {
+              "module": "aws_cdk.aws_omics"
+            }
+          }
+        },
+        "aws-cdk-lib.aws_opensearchserverless": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.OpenSearchServerless"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.opensearchserverless"
+            },
+            "python": {
+              "module": "aws_cdk.aws_opensearchserverless"
+            }
+          }
+        },
         "aws-cdk-lib.aws_opensearchservice": {
           "targets": {
             "dotnet": {
@@ -2297,6 +2388,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_pipes": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.Pipes"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.pipes"
+            },
+            "python": {
+              "module": "aws_cdk.aws_pipes"
+            }
+          }
+        },
         "aws-cdk-lib.aws_qldb": {
           "targets": {
             "dotnet": {
@@ -2791,6 +2895,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_simspaceweaver": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.SimSpaceWeaver"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.simspaceweaver"
+            },
+            "python": {
+              "module": "aws_cdk.aws_simspaceweaver"
+            }
+          }
+        },
         "aws-cdk-lib.aws_sns": {
           "targets": {
             "dotnet": {
@@ -3258,7 +3375,7 @@
   },
   "name": "cdk-rds-sql",
   "readme": {
-    "markdown": "# About\n\nThis CDK construct library makes it possible create databases,\nschemas, and roles to an Aurora Serverless or database cluster created\nin that stack. Both Aurora Serverless v1 and v2 are supported.\n\nThis construct library is intended to be used in enterprise\nenvironments, and works in isolated subnets.\n\n<p align=\"left\">\n  <a href=\"https://github.com/semantic-release/semantic-release\"><img src=\"https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release\" alt=semantic-release: angular\"></a>\n  <a href=\"https://github.com/berenddeboer/cdk-rds-sql/actions/workflows/release.yml\"><img src=\"https://github.com/berenddeboer/cdk-rds-sql/actions/workflows/release.yml/badge.svg\" alt=\"Release badge\"></a>\n</p>\n\n# Requirements\n\n- CDK v2.\n\n# Installation\n\n     npm i cdk-rds-sql\n\n# Usage\n\n## Provider\n\nFirst setup your VPC and create your cluster:\n\n```ts\nimport { Duration, RemovalPolicy } from \"aws-cdk-lib\"\nimport * as ec2 from \"aws-cdk-lib/aws-ec2\"\nimport * as rds from \"aws-cdk-lib/aws-rds\"\n\nconst vpc = ec2.Vpc.fromLookup(this, \"Vpc\", {\n  vpcId: this.node.tryGetContext(\"vpc-id\"),\n})\n\nconst cluster = new rds.ServerlessCluster(this, \"Cluster\", {\n  vpc: vpc,\n  vpcSubnets: {\n    subnetType: ec2.SubnetType.PRIVATE_ISOLATED,\n  },\n  engine: rds.DatabaseClusterEngine.AURORA_POSTGRESQL,\n  parameterGroup: rds.ParameterGroup.fromParameterGroupName(\n    this,\n    \"ParameterGroup\",\n    \"default.aurora-postgresql10\"\n  ),\n  removalPolicy: RemovalPolicy.DESTROY,\n  scaling: {\n    autoPause: Duration.minutes(60),\n    minCapacity: rds.AuroraCapacityUnit.ACU_2,\n    maxCapacity: rds.AuroraCapacityUnit.ACU_2,\n  },\n})\n```\n\nThen create a provider which will connect to your database:\n\n```ts\nimport { Provider } from \"cdk-rds-sql\"\n\nconst provider = new Provider(this, \"Provider\", {\n  vpc: vpc,\n  cluster: cluster,\n  secret: cluster.secret!,\n})\n```\n\nThe provider will setup a lambda, which will live in the same VPC, or\nat minimum in a VPC that can get access to the database. The provider\nwill automatically setup a connection to the given cluster.\n\n## Roles\n\nCreate a postgres role (user) as follows:\n\n```ts\nimport { Role } from \"cdk-rds-sql\"\n\nconst role = new Role(this, \"Role\", {\n  provider: provider,\n  roleName: \"myrole\",\n  databaseName: \"mydb\",\n})\n```\n\nThis will automatically create a secret just like `ServerlessCluster`\ndoes, with all the connection info needed for this user. It's secret value is a JSON like:\n\n```json\n{\n  \"dbClusterIdentifier\": \"teststack-clustereb1186t9-sh4wpqfdyfvu\",\n  \"password\": \"very-long-and-boring\",\n  \"dbname\": \"mydb\",\n  \"engine\": \"postgres\",\n  \"port\": 5432,\n  \"host\": \"teststack-clustereb1186t9-sh4wpqfdyfvu.cluster-cgudolabssna.us-east-1.rds.amazonaws.com\",\n  \"username\": \"myrole\"\n}\n```\n\nYou can access the secret via `role.secret`.\n\nInstead of `databaseName` you can also specify `database` to reference\nan existing database. The role will not be created until the database\nhas been created.\n\n## Database\n\nCreate a datdabse as follows:\n\n```ts\nimport { Database } from \"cdk-rds-sql\"\n\nconst database = new Database(this, \"Database\", {\n  provider: provider,\n  databaseName: \"mydb\",\n})\n```\n\nYou can provide an owner, which makes it easy to create database owned\nby a new user:\n\n```ts\nconst database = new Database(this, \"Database\", {\n  provider: provider,\n  databaseName: \"mydb\",\n  owner: role,\n})\n```\n\n## Schema\n\nCreate a schema in the default database as follows:\n\n```ts\nimport { Schema } from \"cdk-rds-sql\"\n\nnew Schema(this, \"Schema\", {\n  provider: provider,\n  schemaName: \"myschema\",\n})\n```\n\nOr in another database:\n\n```ts\nconst database = new Database(this, \"Database\", {\n  provider: provider,\n  databaseName: \"mydb\",\n})\n\nnew Schema(this, \"Schema\", {\n  provider: provider,\n  schemaName: \"myschema\",\n  databaseName: database.databaseName,\n})\n```\n\n## Sql\n\nYou can insert arbitrary SQL into your database with the `Sql` construct:\n\n```ts\nimport { Sql } from \"cdk-rds-sql\"\n\nconst sql = new Sql(this, \"Sql\", {\n  provider: provider,\n  database: database,\n  statement: \"create table t (i int)\",\n})\n```\n\nCreate a table if it does not exist, and grant a role privileges:\n\n```ts\nconst sql = new Sql(this, \"Sql\", {\n  provider: provider,\n  database: database,\n  statement: `\ncreate table if not exists t (i int);\ngrant select on t to myrole;\n`,\n})\n```\n\nNote that there is no synchronisation between various `Sql`\nconstructs, in particular the order in your code does not determine\nthe order in which your SQL is executed. This happens in parallel,\nunless you specify an explicit dependency via `sql.node.addDepency()`.\n\nThere are a lot of concerns when using `Sql`:\n\n- When you update your Sql, your previous Sql is not \"rolled back\",\n  the new Sql is simply executed again.\n- The same when you delete your `Sql` construct: nothing is rolled\n  back in the database.\n- Currently the `Sql` constructs has less than 5 minutes to execute\n  its work.\n- It is unknown how large your SQL can be.\n\n## Dependencies\n\nThis library manages dependencies, there is no need to specify\ndependencies except possibly for `Sql` constructs.\n\n# Working on this code\n\nThis code is managed by\n[projen](https://github.com/projen/projen/blob/main/README.md). In\naddition [pre-commit](https://pre-commit.com/) is used.\n\nSo after git clone and `npm ci` you would do:\n\n```\npre-commit install --install-hooks --hook-type commit-msg --hook-type pre-commit\n```\n\nto install the pre-commit hooks.\n\n## Testing\n\nTest code via projen with:\n\n    npx projen test\n\nYou can run the sample stack with:\n\n    npx cdk deploy --context vpc-id=vpc-0123456789 TestServerlessV2Stack\n\n# To do\n\n- Update role: will not revoke connect to previous database if database name has changed.\n- If the cluster is configured for autopausing, wake cluster up before doing any SQL operations.\n- We rename roles and database on update: is that actually the best\n  thing? More change to get us into an irrecoverable situation??\n"
+    "markdown": "# About\n\nThis CDK construct library makes it possible to create databases,\nschemas, and roles in an Aurora Serverless or database cluster created\nin that stack. Both Aurora Serverless v1 and v2 are supported.\n\nThis construct library is intended to be used in enterprise\nenvironments, and works in isolated subnets.\n\n<p align=\"left\">\n  <a href=\"https://github.com/semantic-release/semantic-release\"><img src=\"https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release\" alt=semantic-release: angular\"></a>\n  <a href=\"https://github.com/berenddeboer/cdk-rds-sql/actions/workflows/release.yml\"><img src=\"https://github.com/berenddeboer/cdk-rds-sql/actions/workflows/release.yml/badge.svg\" alt=\"Release badge\"></a>\n</p>\n\n# Requirements\n\n- CDK v2.\n\n# Installation\n\n     npm i cdk-rds-sql\n\n# Usage\n\n## Provider\n\nFirst setup your VPC and create your cluster:\n\n```ts\nimport { Duration, RemovalPolicy } from \"aws-cdk-lib\"\nimport * as ec2 from \"aws-cdk-lib/aws-ec2\"\nimport * as rds from \"aws-cdk-lib/aws-rds\"\n\nconst vpc = ec2.Vpc.fromLookup(this, \"Vpc\", {\n  vpcId: this.node.tryGetContext(\"vpc-id\"),\n})\n\nconst cluster = new rds.ServerlessCluster(this, \"Cluster\", {\n  vpc: vpc,\n  vpcSubnets: {\n    subnetType: ec2.SubnetType.PRIVATE_ISOLATED,\n  },\n  engine: rds.DatabaseClusterEngine.AURORA_POSTGRESQL,\n  parameterGroup: rds.ParameterGroup.fromParameterGroupName(\n    this,\n    \"ParameterGroup\",\n    \"default.aurora-postgresql11\"\n  ),\n  removalPolicy: RemovalPolicy.DESTROY,\n  scaling: {\n    autoPause: Duration.minutes(60),\n    minCapacity: rds.AuroraCapacityUnit.ACU_2,\n    maxCapacity: rds.AuroraCapacityUnit.ACU_2,\n  },\n})\n```\n\nThen create a provider which will connect to your database:\n\n```ts\nimport { Provider } from \"cdk-rds-sql\"\n\nconst provider = new Provider(this, \"Provider\", {\n  vpc: vpc,\n  cluster: cluster,\n  secret: cluster.secret!,\n})\n```\n\nThe provider will setup a lambda, which will live in the same VPC, or\nat minimum in a VPC that can get access to the database. The provider\nwill automatically setup a connection to the given cluster.\n\n## Roles\n\nCreate a postgres role (user) as follows:\n\n```ts\nimport { Role } from \"cdk-rds-sql\"\n\nconst role = new Role(this, \"Role\", {\n  provider: provider,\n  roleName: \"myrole\",\n  databaseName: \"mydb\",\n})\n```\n\nThis will automatically create a secret just like `ServerlessCluster`\ndoes, with all the connection info needed for this user. It's secret value is a JSON like:\n\n```json\n{\n  \"dbClusterIdentifier\": \"teststack-clustereb1186t9-sh4wpqfdyfvu\",\n  \"password\": \"very-long-and-boring\",\n  \"dbname\": \"mydb\",\n  \"engine\": \"postgres\",\n  \"port\": 5432,\n  \"host\": \"teststack-clustereb1186t9-sh4wpqfdyfvu.cluster-cgudolabssna.us-east-1.rds.amazonaws.com\",\n  \"username\": \"myrole\"\n}\n```\n\nYou can access the secret via `role.secret`.\n\nInstead of `databaseName` you can also specify `database` to reference\nan existing database. The role will not be created until the database\nhas been created.\n\n## Database\n\nCreate a database as follows:\n\n```ts\nimport { Database } from \"cdk-rds-sql\"\n\nconst database = new Database(this, \"Database\", {\n  provider: provider,\n  databaseName: \"mydb\",\n})\n```\n\nYou can provide an owner, which makes it easy to create database owned\nby a new user:\n\n```ts\nconst database = new Database(this, \"Database\", {\n  provider: provider,\n  databaseName: \"mydb\",\n  owner: role,\n})\n```\n\n## Schema\n\nCreate a schema in the default database as follows:\n\n```ts\nimport { Schema } from \"cdk-rds-sql\"\n\nnew Schema(this, \"Schema\", {\n  provider: provider,\n  schemaName: \"myschema\",\n})\n```\n\nOr in another database:\n\n```ts\nconst database = new Database(this, \"Database\", {\n  provider: provider,\n  databaseName: \"mydb\",\n})\n\nnew Schema(this, \"Schema\", {\n  provider: provider,\n  schemaName: \"myschema\",\n  databaseName: database.databaseName,\n})\n```\n\n## Sql\n\nYou can insert arbitrary SQL into your database with the `Sql` construct:\n\n```ts\nimport { Sql } from \"cdk-rds-sql\"\n\nconst sql = new Sql(this, \"Sql\", {\n  provider: provider,\n  database: database,\n  statement: \"create table t (i int)\",\n})\n```\n\nCreate a table if it does not exist, and grant a role privileges:\n\n```ts\nconst sql = new Sql(this, \"Sql\", {\n  provider: provider,\n  database: database,\n  statement: `\ncreate table if not exists t (i int);\ngrant select on t to myrole;\n`,\n})\n```\n\nNote that there is no synchronisation between various `Sql`\nconstructs, in particular the order in your code does not determine\nthe order in which your SQL is executed. This happens in parallel,\nunless you specify an explicit dependency via `sql.node.addDepency()`.\n\nThere are a lot of concerns when using `Sql`:\n\n- When you update your Sql, your previous Sql is not \"rolled back\",\n  the new Sql is simply executed again.\n- The same when you delete your `Sql` construct: nothing is rolled\n  back in the database.\n- Currently the `Sql` constructs has less than 5 minutes to execute\n  its work.\n- It is unknown how large your SQL can be.\n\n## Dependencies\n\nThis library manages dependencies, there is no need to specify\ndependencies except possibly for `Sql` constructs.\n\n# Working on this code\n\nThis code is managed by\n[projen](https://github.com/projen/projen/blob/main/README.md). In\naddition [pre-commit](https://pre-commit.com/) is used.\n\nSo after git clone and `npm ci` you would do:\n\n```\npre-commit install --install-hooks --hook-type commit-msg --hook-type pre-commit\n```\n\nto install the pre-commit hooks.\n\n## Testing\n\nTest code via projen with:\n\n    npx projen test\n\nYou can run the sample stack with:\n\n    npx cdk deploy --context vpc-id=vpc-0123456789 TestServerlessV1Stack\n\nOr for v2:\n\n    npx cdk deploy TestServerlessV2Stack\n\nIf you want to use an existing vpc:\n\n    npx cdk deploy --context vpc-id=vpc-0123456789 TestServerlessV2Stack\n\n# To do\n\n- Update role: will not revoke connect to previous database if database name has changed.\n- If the cluster is configured for autopausing, wake cluster up before doing any SQL operations.\n- We rename roles and database on update: is that actually the best\n  thing? More change to get us into an irrecoverable situation??\n"
   },
   "repository": {
     "type": "git",
@@ -3485,7 +3602,7 @@
         },
         "locationInModule": {
           "filename": "src/provider.ts",
-          "line": 36
+          "line": 48
         },
         "parameters": [
           {
@@ -3511,7 +3628,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/provider.ts",
-        "line": 30
+        "line": 42
       },
       "methods": [
         {
@@ -3520,7 +3637,7 @@
           },
           "locationInModule": {
             "filename": "src/provider.ts",
-            "line": 55
+            "line": 67
           },
           "name": "newCustomResourceHandler",
           "parameters": [
@@ -3560,7 +3677,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/provider.ts",
-            "line": 34
+            "line": 46
           },
           "name": "cluster",
           "type": {
@@ -3583,7 +3700,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/provider.ts",
-            "line": 33
+            "line": 45
           },
           "name": "handler",
           "type": {
@@ -3597,7 +3714,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/provider.ts",
-            "line": 32
+            "line": 44
           },
           "name": "secret",
           "type": {
@@ -3611,7 +3728,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/provider.ts",
-            "line": 31
+            "line": 43
           },
           "name": "serviceToken",
           "type": {
@@ -3631,7 +3748,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/provider.ts",
-        "line": 11
+        "line": 12
       },
       "name": "RdsSqlProps",
       "properties": [
@@ -3644,7 +3761,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/provider.ts",
-            "line": 20
+            "line": 25
           },
           "name": "cluster",
           "type": {
@@ -3670,7 +3787,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/provider.ts",
-            "line": 27
+            "line": 32
           },
           "name": "secret",
           "type": {
@@ -3680,18 +3797,38 @@
         {
           "abstract": true,
           "docs": {
+            "default": "- Function is not placed within a VPC.",
+            "remarks": "Normally this is the VPC of your database.",
             "stability": "stable",
-            "summary": "VPC of your cluster."
+            "summary": "VPC network to place the provider lambda."
           },
           "immutable": true,
           "locationInModule": {
             "filename": "src/provider.ts",
-            "line": 15
+            "line": 20
           },
           "name": "vpc",
           "type": {
             "fqn": "aws-cdk-lib.aws_ec2.IVpc"
           }
+        },
+        {
+          "abstract": true,
+          "docs": {
+            "default": "- 5 minutes",
+            "stability": "stable",
+            "summary": "Timeout for lambda to do its work."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "src/provider.ts",
+            "line": 39
+          },
+          "name": "timeout",
+          "optional": true,
+          "type": {
+            "fqn": "aws-cdk-lib.Duration"
+          }
         }
       ],
       "symbolId": "src/provider:RdsSqlProps"
@@ -4175,6 +4312,6 @@
       "symbolId": "src/sql:SqlProps"
     }
   },
-  "version": "2.1.2",
-  "fingerprint": "/Zz07RGA8AR70aLEm6TBnGtFHrjRuMd9b7Q4WeiJe78="
+  "version": "2.3.0",
+  "fingerprint": "5qeaBZuHFU/FC2toc1lOtfDvYyc5GYpKXWW2zh8aW1k="
 }

package/.projenrc.ts

@@ -14,12 +14,17 @@ const project = new awscdk.AwsCdkConstructLibrary({
   repositoryUrl: "https://github.com/berenddeboer/cdk-rds-sql.git",
   projenrcTs: true,
   packageManager: NodePackageManager.NPM,
+  depsUpgrade: true,
+  depsUpgradeOptions: {
+    workflow: false,
+  },
   constructsVersion: "10.1.168",
-  cdkVersion: "2.51.1",
+  cdkVersion: "2.64.0",
   disableTsconfig: true,
   tsconfigDev: {
     compilerOptions: {
       esModuleInterop: true,
+      noUnusedLocals: false,
     },
   },
   eslint: true,

package/README.md

@@ -1,7 +1,7 @@
 # About
 
-This CDK construct library makes it possible create databases,
-schemas, and roles to an Aurora Serverless or database cluster created
+This CDK construct library makes it possible to create databases,
+schemas, and roles in an Aurora Serverless or database cluster created
 in that stack. Both Aurora Serverless v1 and v2 are supported.
 
 This construct library is intended to be used in enterprise
@@ -44,7 +44,7 @@ const cluster = new rds.ServerlessCluster(this, "Cluster", {
   parameterGroup: rds.ParameterGroup.fromParameterGroupName(
     this,
     "ParameterGroup",
-    "default.aurora-postgresql10"
+    "default.aurora-postgresql11"
   ),
   removalPolicy: RemovalPolicy.DESTROY,
   scaling: {
@@ -108,7 +108,7 @@ has been created.
 
 ## Database
 
-Create a datdabse as follows:
+Create a database as follows:
 
 ```ts
 import { Database } from "cdk-rds-sql"
@@ -227,6 +227,14 @@ Test code via projen with:
 
 You can run the sample stack with:
 
+    npx cdk deploy --context vpc-id=vpc-0123456789 TestServerlessV1Stack
+
+Or for v2:
+
+    npx cdk deploy TestServerlessV2Stack
+
+If you want to use an existing vpc:
+
     npx cdk deploy --context vpc-id=vpc-0123456789 TestServerlessV2Stack
 
 # To do

package/lib/database.js

@@ -40,5 +40,5 @@ class Database extends aws_cdk_lib_1.CustomResource {
 }
 exports.Database = Database;
 _a = JSII_RTTI_SYMBOL_1;
-Database[_a] = { fqn: "cdk-rds-sql.Database", version: "2.1.2" };
+Database[_a] = { fqn: "cdk-rds-sql.Database", version: "2.3.0" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2Q0FBNEM7QUFDNUMsMkNBQXNDO0FBQ3RDLGlDQUF1QztBQTJCdkMsTUFBTSxnQkFBaUIsU0FBUSxzQkFBUztJQUd0QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXlCO1FBQ2pFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDaEIsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO0lBQ3hDLENBQUM7Q0FDRjtBQUVELE1BQWEsUUFBUyxTQUFRLDRCQUFjO0lBWTFDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBb0I7UUFDNUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxRQUFRO2dCQUNqQyxVQUFVLEVBQUUsS0FBSyxDQUFDLFlBQVk7Z0JBQzlCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxLQUFLLEVBQUUsS0FBSyxDQUFDLEtBQUssRUFBRSxRQUFRO2FBQzdCO1NBQ0YsQ0FBQyxDQUFBO1FBQ0YsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ3ZDLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtRQUN0QyxJQUFJLEtBQUssQ0FBQyxLQUFLLEVBQUU7WUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7U0FDckM7SUFDSCxDQUFDO0lBMUJEOztPQUVHO0lBQ0gsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQWdCLEVBQUUsRUFBVSxFQUFFLFlBQW9CO1FBQ3hFLE9BQU8sSUFBSSxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ3JDLFlBQVksRUFBRSxZQUFZO1NBQzNCLENBQUMsQ0FBQTtJQUNKLENBQUM7O0FBUkgsNEJBNEJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIlxuaW1wb3J0IHsgUmRzU3FsUmVzb3VyY2UgfSBmcm9tIFwiLi9lbnVtXCJcbmltcG9ydCB7IFByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuaW1wb3J0IHsgUm9sZSB9IGZyb20gXCIuL3JvbGVcIlxuXG5pbnRlcmZhY2UgRGF0YWJhc2VBdHRyaWJ1dGVzIHtcbiAgLyoqXG4gICAqIE5hbWUgb2YgZGF0YWJhc2UgdG8gY3JlYXRlLlxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2VOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogT3B0aW9uYWwgZGF0YWJhc2Ugb3duZXIuXG4gICAqL1xuICByZWFkb25seSBvd25lcj86IFJvbGVcbn1cblxuZXhwb3J0IGludGVyZmFjZSBEYXRhYmFzZVByb3BzIGV4dGVuZHMgRGF0YWJhc2VBdHRyaWJ1dGVzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IFByb3ZpZGVyXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgSURhdGFiYXNlIHtcbiAgcmVhZG9ubHkgZGF0YWJhc2VOYW1lOiBzdHJpbmdcbn1cblxuY2xhc3MgSW1wb3J0ZWREYXRhYmFzZSBleHRlbmRzIENvbnN0cnVjdCBpbXBsZW1lbnRzIElEYXRhYmFzZSB7XG4gIHB1YmxpYyByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBEYXRhYmFzZUF0dHJpYnV0ZXMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgRGF0YWJhc2UgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSBpbXBsZW1lbnRzIElEYXRhYmFzZSB7XG4gIC8qKlxuICAgKiBSZXR1cm4gYSBEYXRhYmFzZSBiYXNlZCB1cG9uIG5hbWUgb25seS4gVXNlIGZvciBpbXBvcnRpbmcgZXhpc3RpbmcgZGF0YWJhc2VzLlxuICAgKi9cbiAgc3RhdGljIGZyb21EYXRhYmFzZU5hbWUoc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgZGF0YWJhc2VOYW1lOiBzdHJpbmcpOiBJRGF0YWJhc2Uge1xuICAgIHJldHVybiBuZXcgSW1wb3J0ZWREYXRhYmFzZShzY29wZSwgaWQsIHtcbiAgICAgIGRhdGFiYXNlTmFtZTogZGF0YWJhc2VOYW1lLFxuICAgIH0pXG4gIH1cblxuICBwdWJsaWMgcmVhZG9ubHkgZGF0YWJhc2VOYW1lOiBzdHJpbmdcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogRGF0YWJhc2VQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5EQVRBQkFTRSxcbiAgICAgICAgUmVzb3VyY2VJZDogcHJvcHMuZGF0YWJhc2VOYW1lLFxuICAgICAgICBTZWNyZXRBcm46IHByb3BzLnByb3ZpZGVyLnNlY3JldC5zZWNyZXRBcm4sXG4gICAgICAgIE93bmVyOiBwcm9wcy5vd25lcj8ucm9sZU5hbWUsXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgICBpZiAocHJvcHMub3duZXIpIHtcbiAgICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLm93bmVyKVxuICAgIH1cbiAgfVxufVxuIl19

package/lib/handler.js

@@ -123,11 +123,11 @@ const jumpTable = {
     },
 };
 exports.handler = async (event) => {
-    //console.debug("EVENT", event)
+    console.log("event", event);
     const requestType = event.RequestType;
     const resource = event.ResourceProperties.Resource;
     const resourceId = event.ResourceProperties.ResourceId;
-    const database = event.ResourceProperties.Database;
+    const databaseName = event.ResourceProperties.DatabaseName;
     if (!Object.keys(jumpTable).includes(event.ResourceProperties.Resource)) {
         throw `Resource type '${resource}' not recognised.`;
     }
@@ -162,8 +162,13 @@ exports.handler = async (event) => {
         }
     }
     if (sql) {
-        //console.debug("DATABASE", database)
-        console.debug("SQL", sql);
+        let database;
+        if (resource === enum_1.RdsSqlResource.ROLE) {
+            database = secretValues.dbname;
+        }
+        else {
+            database = databaseName ?? secretValues.dbname; // connect to given database if possible, else to database mentioned in secret
+        }
         const params = {
             host: secretValues.host,
             port: secretValues.port,
@@ -173,6 +178,8 @@ exports.handler = async (event) => {
             connectionTimeoutMillis: 2000,
         };
         //console.debug ("PARAMS", params)
+        console.debug(`Connecting to host ${params.host}:${params.port}, database ${params.database} as ${params.user}`);
+        console.debug("Executing SQL", sql);
         const pg_client = new pg_1.Client(params);
         await pg_client.connect();
         try {
@@ -211,4 +218,4 @@ const getPassword = async (arn) => {
         return json.password;
     }
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  SecretsManagerClient,\n  GetSecretValueCommand,\n} from \"@aws-sdk/client-secrets-manager\"\nimport {\n  CloudFormationCustomResourceCreateEvent,\n  CloudFormationCustomResourceUpdateEvent,\n  CloudFormationCustomResourceDeleteEvent,\n} from \"aws-lambda\"\nimport { format } from \"node-pg-format\"\nimport { Client } from \"pg\"\nimport { RdsSqlResource } from \"./enum\"\n\ninterface CustomResourceResponse {\n  PhysicalResourceId?: string\n  Data?: any\n  NoEcho?: boolean\n}\n\ntype CreateResourceHandler = (\n  resourceId: string,\n  props?: any\n) => Promise<string | string[]>\ntype UpdateResourceHandler = (\n  resourceId: string,\n  oldResourceId: string,\n  props?: any\n) => Promise<string | string[] | void>\ntype DeleteResourceHandler = (resourceId: string, props?: any) => string | string[] | void\n\ntype JumpTable = {\n  [key in RdsSqlResource]: {\n    Create: CreateResourceHandler\n    Update: UpdateResourceHandler\n    Delete: DeleteResourceHandler\n  }\n}\n\ninterface RoleProps {\n  /**\n   * Secret ARN.\n   */\n  PasswordArn: string\n\n  /**\n   * Optional database to which role is granted connect permissions.\n   */\n  DatabaseName?: string\n}\n\ninterface DatabaseProps {\n  Owner: string\n}\n\ninterface DatabaseUpdateProps extends DatabaseProps {\n  MasterOwner: string\n}\n\nconst jumpTable: JumpTable = {\n  sql: {\n    Create: (_: string, props?: any) => {\n      return props.Statement\n    },\n    Update: (_: string, __: string, props?: any) => {\n      return props.Statement\n    },\n    Delete: (_: string) => {},\n  },\n  schema: {\n    Create: async (resourceId: string) => {\n      return format(\"create schema if not exists %I\", resourceId)\n    },\n    Update: async (resourceId: string, oldResourceId: string) => {\n      return format(\"alter schema %I rename to %I\", oldResourceId, resourceId)\n    },\n    Delete: (resourceId: string) => {\n      return format(\"drop schema if exists %I cascade\", resourceId)\n    },\n  },\n  role: {\n    Create: async (resourceId: string, props: RoleProps) => {\n      if (!props.PasswordArn) throw \"No PasswordArn provided\"\n      const password = await getPassword(props.PasswordArn)\n      if (password) {\n        const sql = [\n          \"start transaction\",\n          format(\"create role %I with login password %L\", resourceId, password),\n        ]\n        if (props.DatabaseName) {\n          // grant connect to database if database already exists\n          sql.push(\n            format(\n              \"DO $$BEGIN\\nIF EXISTS (select from pg_database where datname = '%s' and datistemplate = false) THEN grant connect on database %I to %I; END IF;\\nEND$$;\",\n              props.DatabaseName,\n              props.DatabaseName,\n              resourceId\n            )\n          )\n        }\n        sql.push(\"commit\")\n        return sql\n      } else {\n        throw `Cannot parse password from ${props.PasswordArn}`\n      }\n    },\n    Update: async (resourceId: string, oldResourceId: string, props: RoleProps) => {\n      // TODO: if database name has changed in OldResourceProperties, revoke connect\n      if (props && props.PasswordArn) {\n        const password = await getPassword(props.PasswordArn)\n        if (password) {\n          const sql = [\"start transaction\"]\n          if (oldResourceId !== resourceId) {\n            sql.push(format(\"alter role %I rename to %I\", oldResourceId, resourceId))\n          }\n          sql.push(format(\"alter role %I with password %L\", resourceId, password))\n          if (props.DatabaseName) {\n            sql.push(\n              format(\"grant connect on database %I to %I\", props.DatabaseName, resourceId)\n            )\n          }\n          sql.push(\"commit\")\n          return sql\n        } else {\n          throw `Cannot parse password from ${props.PasswordArn}`\n        }\n      } else {\n        const sql = [\"start transaction\"]\n        if (oldResourceId !== resourceId) {\n          sql.push(format(\"alter role %I rename to %I\", oldResourceId, resourceId))\n        }\n        sql.push(\n          format(\n            \"DO $$BEGIN\\nIF EXISTS (select from pg_database where datname = '%s' and datistemplate = false) THEN grant connect on database %I to %I; END IF;\\nEND$$;\",\n            props.DatabaseName,\n            props.DatabaseName,\n            resourceId\n          )\n        )\n        sql.push(\"commit\")\n        return sql\n      }\n    },\n    Delete: (resourceId: string) => {\n      // TODO: if user is owner of a database, assign ownership to master user?\n      return [\n        \"start transaction\",\n        format(\n          \"DO $$BEGIN\\nIF EXISTS (select from pg_catalog.pg_roles WHERE rolname = '%s') THEN revoke all privileges on database postgres from %I; END IF;\\nEND$$;\",\n          resourceId,\n          resourceId\n        ),\n        format(\"drop role if exists %I\", resourceId),\n        \"commit\",\n      ]\n    },\n  },\n  database: {\n    Create: async (resourceId: string, props: DatabaseProps) => {\n      const owner = props.Owner\n      if (owner) {\n        return [\n          format(\"create database %I\", resourceId),\n          format(\"alter database %I owner to %I\", resourceId, owner),\n        ]\n      } else {\n        return format(\"create database %I\", resourceId)\n      }\n    },\n    Update: async (\n      resourceId: string,\n      oldResourceId: string,\n      props: DatabaseUpdateProps\n    ): Promise<string[]> => {\n      const statements: string[] = []\n      if (resourceId !== oldResourceId) {\n        if (props.MasterOwner) {\n          statements.push(\n            format(\"alter database %I owner to %I\", oldResourceId, props.MasterOwner)\n          )\n        }\n        statements.push(\n          format(\"alter database %I rename to %I\", oldResourceId, resourceId)\n        )\n      }\n      const owner = props.Owner\n      if (owner) {\n        statements.push(format(\"alter database %I owner to %I\", resourceId, props.Owner))\n      }\n      return statements\n    },\n    Delete: (resourceId: string) => {\n      return [\n        format(\n          \"select pg_terminate_backend(pg_stat_activity.pid) from pg_stat_activity where datname = %L\",\n          resourceId\n        ),\n        format(\"drop database if exists %I\", resourceId),\n      ]\n    },\n  },\n}\n\nexport const handler = async (\n  event:\n    | CloudFormationCustomResourceCreateEvent\n    | CloudFormationCustomResourceUpdateEvent\n    | CloudFormationCustomResourceDeleteEvent\n): Promise<any> => {\n  //console.debug(\"EVENT\", event)\n\n  const requestType = event.RequestType\n  const resource: RdsSqlResource = event.ResourceProperties.Resource\n  const resourceId = event.ResourceProperties.ResourceId\n  const database = event.ResourceProperties.Database\n\n  if (!Object.keys(jumpTable).includes(event.ResourceProperties.Resource)) {\n    throw `Resource type '${resource}' not recognised.`\n  }\n\n  const secrets_client = new SecretsManagerClient({})\n  const command = new GetSecretValueCommand({\n    SecretId: event.ResourceProperties.SecretArn,\n  })\n  const secret = await secrets_client.send(command)\n  if (!secret.SecretString) throw \"No secret string\"\n\n  const secretValues = JSON.parse(secret.SecretString)\n\n  let sql: string | string[] | void\n  switch (requestType) {\n    case \"Create\": {\n      sql = await jumpTable[resource][requestType](resourceId, event.ResourceProperties)\n      break\n    }\n    case \"Update\": {\n      const oldResourceId = (event as CloudFormationCustomResourceUpdateEvent)\n        .PhysicalResourceId\n      sql = await jumpTable[resource][requestType](resourceId, oldResourceId, {\n        ...event.ResourceProperties,\n        MasterOwner: secretValues.username,\n      })\n      break\n    }\n    case \"Delete\": {\n      const oldResourceId = (event as CloudFormationCustomResourceDeleteEvent)\n        .PhysicalResourceId\n      sql = jumpTable[resource][requestType](resourceId, oldResourceId)\n      break\n    }\n  }\n\n  if (sql) {\n    //console.debug(\"DATABASE\", database)\n    console.debug(\"SQL\", sql)\n    const params = {\n      host: secretValues.host,\n      port: secretValues.port,\n      user: secretValues.username,\n      password: secretValues.password,\n      database: database,\n      connectionTimeoutMillis: 2000, // return an error if a connection could not be established within 2 seconds\n    }\n    //console.debug (\"PARAMS\", params)\n    const pg_client = new Client(params)\n    await pg_client.connect()\n    try {\n      if (typeof sql === \"string\") {\n        await pg_client.query(sql)\n      } else {\n        await Promise.all(\n          sql.map(async (statement) => {\n            await pg_client.query(statement)\n          })\n        )\n      }\n    } finally {\n      await pg_client.end()\n    }\n  }\n\n  let response: CustomResourceResponse = {}\n  // Except for the SQL resource, return the new resource id. This\n  // will cause a delete to be send for the old resource.\n  if (resource !== RdsSqlResource.SQL) {\n    response.PhysicalResourceId = resourceId\n  }\n\n  return response\n}\n\n/**\n * Parse password field from secret. Returns void on error.\n */\nconst getPassword = async (arn: string): Promise<string | void> => {\n  const secrets_client = new SecretsManagerClient({})\n  const command = new GetSecretValueCommand({\n    SecretId: arn,\n  })\n  const secret = await secrets_client.send(command)\n  if (secret.SecretString) {\n    const json = JSON.parse(secret.SecretString)\n    return json.password\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  SecretsManagerClient,\n  GetSecretValueCommand,\n} from \"@aws-sdk/client-secrets-manager\"\nimport {\n  CloudFormationCustomResourceCreateEvent,\n  CloudFormationCustomResourceUpdateEvent,\n  CloudFormationCustomResourceDeleteEvent,\n} from \"aws-lambda\"\nimport { format } from \"node-pg-format\"\nimport { Client } from \"pg\"\nimport { RdsSqlResource } from \"./enum\"\n\ninterface CustomResourceResponse {\n  PhysicalResourceId?: string\n  Data?: any\n  NoEcho?: boolean\n}\n\ntype CreateResourceHandler = (\n  resourceId: string,\n  props?: any\n) => Promise<string | string[]>\ntype UpdateResourceHandler = (\n  resourceId: string,\n  oldResourceId: string,\n  props?: any\n) => Promise<string | string[] | void>\ntype DeleteResourceHandler = (resourceId: string, props?: any) => string | string[] | void\n\ntype JumpTable = {\n  [key in RdsSqlResource]: {\n    Create: CreateResourceHandler\n    Update: UpdateResourceHandler\n    Delete: DeleteResourceHandler\n  }\n}\n\ninterface RoleProps {\n  /**\n   * Secret ARN.\n   */\n  PasswordArn: string\n\n  /**\n   * Optional database to which role is granted connect permissions.\n   */\n  DatabaseName?: string\n}\n\ninterface DatabaseProps {\n  Owner: string\n}\n\ninterface DatabaseUpdateProps extends DatabaseProps {\n  MasterOwner: string\n}\n\nconst jumpTable: JumpTable = {\n  sql: {\n    Create: (_: string, props?: any) => {\n      return props.Statement\n    },\n    Update: (_: string, __: string, props?: any) => {\n      return props.Statement\n    },\n    Delete: (_: string) => {},\n  },\n  schema: {\n    Create: async (resourceId: string) => {\n      return format(\"create schema if not exists %I\", resourceId)\n    },\n    Update: async (resourceId: string, oldResourceId: string) => {\n      return format(\"alter schema %I rename to %I\", oldResourceId, resourceId)\n    },\n    Delete: (resourceId: string) => {\n      return format(\"drop schema if exists %I cascade\", resourceId)\n    },\n  },\n  role: {\n    Create: async (resourceId: string, props: RoleProps) => {\n      if (!props.PasswordArn) throw \"No PasswordArn provided\"\n      const password = await getPassword(props.PasswordArn)\n      if (password) {\n        const sql = [\n          \"start transaction\",\n          format(\"create role %I with login password %L\", resourceId, password),\n        ]\n        if (props.DatabaseName) {\n          // grant connect to database if database already exists\n          sql.push(\n            format(\n              \"DO $$BEGIN\\nIF EXISTS (select from pg_database where datname = '%s' and datistemplate = false) THEN grant connect on database %I to %I; END IF;\\nEND$$;\",\n              props.DatabaseName,\n              props.DatabaseName,\n              resourceId\n            )\n          )\n        }\n        sql.push(\"commit\")\n        return sql\n      } else {\n        throw `Cannot parse password from ${props.PasswordArn}`\n      }\n    },\n    Update: async (resourceId: string, oldResourceId: string, props: RoleProps) => {\n      // TODO: if database name has changed in OldResourceProperties, revoke connect\n      if (props && props.PasswordArn) {\n        const password = await getPassword(props.PasswordArn)\n        if (password) {\n          const sql = [\"start transaction\"]\n          if (oldResourceId !== resourceId) {\n            sql.push(format(\"alter role %I rename to %I\", oldResourceId, resourceId))\n          }\n          sql.push(format(\"alter role %I with password %L\", resourceId, password))\n          if (props.DatabaseName) {\n            sql.push(\n              format(\"grant connect on database %I to %I\", props.DatabaseName, resourceId)\n            )\n          }\n          sql.push(\"commit\")\n          return sql\n        } else {\n          throw `Cannot parse password from ${props.PasswordArn}`\n        }\n      } else {\n        const sql = [\"start transaction\"]\n        if (oldResourceId !== resourceId) {\n          sql.push(format(\"alter role %I rename to %I\", oldResourceId, resourceId))\n        }\n        sql.push(\n          format(\n            \"DO $$BEGIN\\nIF EXISTS (select from pg_database where datname = '%s' and datistemplate = false) THEN grant connect on database %I to %I; END IF;\\nEND$$;\",\n            props.DatabaseName,\n            props.DatabaseName,\n            resourceId\n          )\n        )\n        sql.push(\"commit\")\n        return sql\n      }\n    },\n    Delete: (resourceId: string) => {\n      // TODO: if user is owner of a database, assign ownership to master user?\n      return [\n        \"start transaction\",\n        format(\n          \"DO $$BEGIN\\nIF EXISTS (select from pg_catalog.pg_roles WHERE rolname = '%s') THEN revoke all privileges on database postgres from %I; END IF;\\nEND$$;\",\n          resourceId,\n          resourceId\n        ),\n        format(\"drop role if exists %I\", resourceId),\n        \"commit\",\n      ]\n    },\n  },\n  database: {\n    Create: async (resourceId: string, props: DatabaseProps) => {\n      const owner = props.Owner\n      if (owner) {\n        return [\n          format(\"create database %I\", resourceId),\n          format(\"alter database %I owner to %I\", resourceId, owner),\n        ]\n      } else {\n        return format(\"create database %I\", resourceId)\n      }\n    },\n    Update: async (\n      resourceId: string,\n      oldResourceId: string,\n      props: DatabaseUpdateProps\n    ): Promise<string[]> => {\n      const statements: string[] = []\n      if (resourceId !== oldResourceId) {\n        if (props.MasterOwner) {\n          statements.push(\n            format(\"alter database %I owner to %I\", oldResourceId, props.MasterOwner)\n          )\n        }\n        statements.push(\n          format(\"alter database %I rename to %I\", oldResourceId, resourceId)\n        )\n      }\n      const owner = props.Owner\n      if (owner) {\n        statements.push(format(\"alter database %I owner to %I\", resourceId, props.Owner))\n      }\n      return statements\n    },\n    Delete: (resourceId: string) => {\n      return [\n        format(\n          \"select pg_terminate_backend(pg_stat_activity.pid) from pg_stat_activity where datname = %L\",\n          resourceId\n        ),\n        format(\"drop database if exists %I\", resourceId),\n      ]\n    },\n  },\n}\n\nexport const handler = async (\n  event:\n    | CloudFormationCustomResourceCreateEvent\n    | CloudFormationCustomResourceUpdateEvent\n    | CloudFormationCustomResourceDeleteEvent\n): Promise<any> => {\n  console.log(\"event\", event)\n\n  const requestType = event.RequestType\n  const resource: RdsSqlResource = event.ResourceProperties.Resource\n  const resourceId = event.ResourceProperties.ResourceId\n  const databaseName = event.ResourceProperties.DatabaseName\n\n  if (!Object.keys(jumpTable).includes(event.ResourceProperties.Resource)) {\n    throw `Resource type '${resource}' not recognised.`\n  }\n\n  const secrets_client = new SecretsManagerClient({})\n  const command = new GetSecretValueCommand({\n    SecretId: event.ResourceProperties.SecretArn,\n  })\n  const secret = await secrets_client.send(command)\n  if (!secret.SecretString) throw \"No secret string\"\n\n  const secretValues = JSON.parse(secret.SecretString)\n\n  let sql: string | string[] | void\n  switch (requestType) {\n    case \"Create\": {\n      sql = await jumpTable[resource][requestType](resourceId, event.ResourceProperties)\n      break\n    }\n    case \"Update\": {\n      const oldResourceId = (event as CloudFormationCustomResourceUpdateEvent)\n        .PhysicalResourceId\n      sql = await jumpTable[resource][requestType](resourceId, oldResourceId, {\n        ...event.ResourceProperties,\n        MasterOwner: secretValues.username,\n      })\n      break\n    }\n    case \"Delete\": {\n      const oldResourceId = (event as CloudFormationCustomResourceDeleteEvent)\n        .PhysicalResourceId\n      sql = jumpTable[resource][requestType](resourceId, oldResourceId)\n      break\n    }\n  }\n\n  if (sql) {\n    let database: string\n    if (resource === RdsSqlResource.ROLE) {\n      database = secretValues.dbname\n    } else {\n      database = databaseName ?? secretValues.dbname // connect to given database if possible, else to database mentioned in secret\n    }\n    const params = {\n      host: secretValues.host,\n      port: secretValues.port,\n      user: secretValues.username,\n      password: secretValues.password,\n      database: database,\n      connectionTimeoutMillis: 2000, // return an error if a connection could not be established within 2 seconds\n    }\n    //console.debug (\"PARAMS\", params)\n    console.debug(\n      `Connecting to host ${params.host}:${params.port}, database ${params.database} as ${params.user}`\n    )\n    console.debug(\"Executing SQL\", sql)\n    const pg_client = new Client(params)\n    await pg_client.connect()\n    try {\n      if (typeof sql === \"string\") {\n        await pg_client.query(sql)\n      } else {\n        await Promise.all(\n          sql.map(async (statement) => {\n            await pg_client.query(statement)\n          })\n        )\n      }\n    } finally {\n      await pg_client.end()\n    }\n  }\n\n  let response: CustomResourceResponse = {}\n  // Except for the SQL resource, return the new resource id. This\n  // will cause a delete to be send for the old resource.\n  if (resource !== RdsSqlResource.SQL) {\n    response.PhysicalResourceId = resourceId\n  }\n\n  return response\n}\n\n/**\n * Parse password field from secret. Returns void on error.\n */\nconst getPassword = async (arn: string): Promise<string | void> => {\n  const secrets_client = new SecretsManagerClient({})\n  const command = new GetSecretValueCommand({\n    SecretId: arn,\n  })\n  const secret = await secrets_client.send(command)\n  if (secret.SecretString) {\n    const json = JSON.parse(secret.SecretString)\n    return json.password\n  }\n}\n"]}

package/lib/provider.d.ts

@@ -1,3 +1,4 @@
+import { Duration } from "aws-cdk-lib";
 import { IVpc } from "aws-cdk-lib/aws-ec2";
 import { IFunction } from "aws-cdk-lib/aws-lambda";
 import * as lambda from "aws-cdk-lib/aws-lambda-nodejs";
@@ -6,7 +7,11 @@ import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
 import { Construct } from "constructs";
 export interface RdsSqlProps {
     /**
-     * VPC of your cluster.
+     * VPC network to place the provider lambda.
+     *
+     * Normally this is the VPC of your database.
+     *
+     * @default - Function is not placed within a VPC.
      */
     readonly vpc: IVpc;
     /**
@@ -19,6 +24,12 @@ export interface RdsSqlProps {
      * Usually this is your cluster's master secret.
      */
     readonly secret: ISecret;
+    /**
+     * Timeout for lambda to do its work.
+     *
+     * @default - 5 minutes
+     */
+    readonly timeout?: Duration;
 }
 export declare class Provider extends Construct {
     readonly serviceToken: string;

package/lib/provider.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 const fs_1 = require("fs");
+const path = require("path");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
 const lambda = require("aws-cdk-lib/aws-lambda-nodejs");
@@ -28,12 +29,23 @@ class Provider extends constructs_1.Construct {
     }
     newCustomResourceHandler(scope, id, props) {
         const ts_filename = `${__dirname}/handler.ts`;
-        const entry = fs_1.existsSync(ts_filename) ? ts_filename : `${__dirname}/handler.js`;
+        const js_filename = `${__dirname}/handler.js`;
+        let entry;
+        if (fs_1.existsSync(ts_filename)) {
+            entry = ts_filename;
+        }
+        else if (fs_1.existsSync(js_filename)) {
+            entry = js_filename;
+        }
+        else {
+            // Ugly hack to support SST (possibly caused by my hack to make SST work with CommonJS libraries)
+            entry = path.join(path.dirname(process.env.npm_package_json || process.cwd()), "node_modules/cdk-rds-sql/lib/handler.js");
+        }
         const fn = new lambda.NodejsFunction(scope, id, {
             vpc: props.vpc,
             entry: entry,
-            runtime: aws_lambda_1.Runtime.NODEJS_16_X,
-            timeout: aws_cdk_lib_1.Duration.seconds(300),
+            runtime: aws_lambda_1.Runtime.NODEJS_18_X,
+            timeout: props.timeout ?? aws_cdk_lib_1.Duration.seconds(300),
             bundling: {
                 sourceMap: true,
                 externalModules: ["pg-native"],
@@ -44,8 +56,8 @@ class Provider extends constructs_1.Construct {
 }
 exports.Provider = Provider;
 _a = JSII_RTTI_SYMBOL_1;
-Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "2.1.2" };
+Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "2.3.0" };
 function slugify(x) {
     return x.replace(/[^a-zA-Z0-9]/g, "");
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSwyQkFBK0I7QUFDL0IsNkNBQTZDO0FBRTdDLHVEQUEyRDtBQUMzRCx3REFBdUQ7QUFHdkQsZ0VBQStEO0FBQy9ELDJDQUFzQztBQXFCdEMsTUFBYSxRQUFTLFNBQVEsc0JBQVM7SUFNckMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFrQjtRQUMxRCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ2hCLElBQUksQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQTtRQUMxQixJQUFJLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUE7UUFFNUIsTUFBTSxZQUFZLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFBO1FBQy9FLElBQUksQ0FBQyxPQUFPO1lBQ1QsbUJBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxZQUFZLENBQWU7Z0JBQzdELElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLEtBQUssQ0FBQyxDQUFBO1FBRTNELE1BQU0sUUFBUSxHQUFHLElBQUksZUFBZSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO1lBQzVELGNBQWMsRUFBRSxJQUFJLENBQUMsT0FBTztTQUM3QixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsWUFBWSxHQUFHLFFBQVEsQ0FBQyxZQUFZLENBQUE7UUFDekMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ25DLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUM1RCxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDeEMsQ0FBQztJQUVTLHdCQUF3QixDQUNoQyxLQUFnQixFQUNoQixFQUFVLEVBQ1YsS0FBa0I7UUFFbEIsTUFBTSxXQUFXLEdBQUcsR0FBRyxTQUFTLGFBQWEsQ0FBQTtRQUM3QyxNQUFNLEtBQUssR0FBRyxlQUFVLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsR0FBRyxTQUFTLGFBQWEsQ0FBQTtRQUMvRSxNQUFNLEVBQUUsR0FBRyxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUM5QyxHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQUc7WUFDZCxLQUFLLEVBQUUsS0FBSztZQUNaLE9BQU8sRUFBRSxvQkFBTyxDQUFDLFdBQVc7WUFDNUIsT0FBTyxFQUFFLHNCQUFRLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQztZQUM5QixRQUFRLEVBQUU7Z0JBQ1IsU0FBUyxFQUFFLElBQUk7Z0JBQ2YsZUFBZSxFQUFFLENBQUMsV0FBVyxDQUFDO2FBQy9CO1NBQ0YsQ0FBQyxDQUFBO1FBQ0YsT0FBTyxFQUFFLENBQUE7SUFDWCxDQUFDOztBQTNDSCw0QkE0Q0M7OztBQUVELFNBQVMsT0FBTyxDQUFDLENBQVM7SUFDeEIsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRSxFQUFFLENBQUMsQ0FBQTtBQUN2QyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZXhpc3RzU3luYyB9IGZyb20gXCJmc1wiXG5pbXBvcnQgeyBEdXJhdGlvbiwgU3RhY2sgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgSVZwYyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCJcbmltcG9ydCB7IElGdW5jdGlvbiwgUnVudGltZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtbGFtYmRhXCJcbmltcG9ydCAqIGFzIGxhbWJkYSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWxhbWJkYS1ub2RlanNcIlxuaW1wb3J0IHsgSURhdGFiYXNlQ2x1c3RlciwgSVNlcnZlcmxlc3NDbHVzdGVyIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1yZHNcIlxuaW1wb3J0IHsgSVNlY3JldCB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3Mtc2VjcmV0c21hbmFnZXJcIlxuaW1wb3J0ICogYXMgY3VzdG9tUmVzb3VyY2VzIGZyb20gXCJhd3MtY2RrLWxpYi9jdXN0b20tcmVzb3VyY2VzXCJcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCJcblxuZXhwb3J0IGludGVyZmFjZSBSZHNTcWxQcm9wcyB7XG4gIC8qKlxuICAgKiBWUEMgb2YgeW91ciBjbHVzdGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgdnBjOiBJVnBjXG5cbiAgLyoqXG4gICAqIFlvdXIgZGF0YWJhc2UuXG4gICAqL1xuICByZWFkb25seSBjbHVzdGVyOiBJU2VydmVybGVzc0NsdXN0ZXIgfCBJRGF0YWJhc2VDbHVzdGVyXG5cbiAgLyoqXG4gICAqIFNlY3JldCB0aGF0IGdyYW50cyBhY2Nlc3MgdG8geW91ciBkYXRhYmFzZS5cbiAgICpcbiAgICogVXN1YWxseSB0aGlzIGlzIHlvdXIgY2x1c3RlcidzIG1hc3RlciBzZWNyZXQuXG4gICAqL1xuICByZWFkb25seSBzZWNyZXQ6IElTZWNyZXRcbn1cblxuZXhwb3J0IGNsYXNzIFByb3ZpZGVyIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IHNlcnZpY2VUb2tlbjogc3RyaW5nXG4gIHB1YmxpYyByZWFkb25seSBzZWNyZXQ6IElTZWNyZXRcbiAgcHVibGljIHJlYWRvbmx5IGhhbmRsZXI6IElGdW5jdGlvblxuICBwdWJsaWMgcmVhZG9ubHkgY2x1c3RlcjogSVNlcnZlcmxlc3NDbHVzdGVyIHwgSURhdGFiYXNlQ2x1c3RlclxuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBSZHNTcWxQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZClcbiAgICB0aGlzLnNlY3JldCA9IHByb3BzLnNlY3JldFxuICAgIHRoaXMuY2x1c3RlciA9IHByb3BzLmNsdXN0ZXJcblxuICAgIGNvbnN0IGZ1bmN0aW9uTmFtZSA9IFwiUmRzU3FsXCIgKyBzbHVnaWZ5KFwiMjhiOWU3OTEtYWY2MC00YTMzLWJjYTgtZmZiNmYzMGVmOGM1XCIpXG4gICAgdGhpcy5oYW5kbGVyID1cbiAgICAgIChTdGFjay5vZih0aGlzKS5ub2RlLnRyeUZpbmRDaGlsZChmdW5jdGlvbk5hbWUpIGFzIElGdW5jdGlvbikgPz9cbiAgICAgIHRoaXMubmV3Q3VzdG9tUmVzb3VyY2VIYW5kbGVyKHNjb3BlLCBmdW5jdGlvbk5hbWUsIHByb3BzKVxuXG4gICAgY29uc3QgcHJvdmlkZXIgPSBuZXcgY3VzdG9tUmVzb3VyY2VzLlByb3ZpZGVyKHRoaXMsIFwiUmRzU3FsXCIsIHtcbiAgICAgIG9uRXZlbnRIYW5kbGVyOiB0aGlzLmhhbmRsZXIsXG4gICAgfSlcbiAgICB0aGlzLnNlcnZpY2VUb2tlbiA9IHByb3ZpZGVyLnNlcnZpY2VUb2tlblxuICAgIHRoaXMuc2VjcmV0LmdyYW50UmVhZCh0aGlzLmhhbmRsZXIpXG4gICAgcHJvcHMuY2x1c3Rlci5jb25uZWN0aW9ucy5hbGxvd0RlZmF1bHRQb3J0RnJvbSh0aGlzLmhhbmRsZXIpXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMuY2x1c3RlcilcbiAgfVxuXG4gIHByb3RlY3RlZCBuZXdDdXN0b21SZXNvdXJjZUhhbmRsZXIoXG4gICAgc2NvcGU6IENvbnN0cnVjdCxcbiAgICBpZDogc3RyaW5nLFxuICAgIHByb3BzOiBSZHNTcWxQcm9wc1xuICApOiBsYW1iZGEuTm9kZWpzRnVuY3Rpb24ge1xuICAgIGNvbnN0IHRzX2ZpbGVuYW1lID0gYCR7X19kaXJuYW1lfS9oYW5kbGVyLnRzYFxuICAgIGNvbnN0IGVudHJ5ID0gZXhpc3RzU3luYyh0c19maWxlbmFtZSkgPyB0c19maWxlbmFtZSA6IGAke19fZGlybmFtZX0vaGFuZGxlci5qc2BcbiAgICBjb25zdCBmbiA9IG5ldyBsYW1iZGEuTm9kZWpzRnVuY3Rpb24oc2NvcGUsIGlkLCB7XG4gICAgICB2cGM6IHByb3BzLnZwYyxcbiAgICAgIGVudHJ5OiBlbnRyeSxcbiAgICAgIHJ1bnRpbWU6IFJ1bnRpbWUuTk9ERUpTXzE2X1gsXG4gICAgICB0aW1lb3V0OiBEdXJhdGlvbi5zZWNvbmRzKDMwMCksXG4gICAgICBidW5kbGluZzoge1xuICAgICAgICBzb3VyY2VNYXA6IHRydWUsXG4gICAgICAgIGV4dGVybmFsTW9kdWxlczogW1wicGctbmF0aXZlXCJdLFxuICAgICAgfSxcbiAgICB9KVxuICAgIHJldHVybiBmblxuICB9XG59XG5cbmZ1bmN0aW9uIHNsdWdpZnkoeDogc3RyaW5nKTogc3RyaW5nIHtcbiAgcmV0dXJuIHgucmVwbGFjZSgvW15hLXpBLVowLTldL2csIFwiXCIpXG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSwyQkFBK0I7QUFDL0IsNkJBQTRCO0FBQzVCLDZDQUE2QztBQUU3Qyx1REFBMkQ7QUFDM0Qsd0RBQXVEO0FBR3ZELGdFQUErRDtBQUMvRCwyQ0FBc0M7QUFnQ3RDLE1BQWEsUUFBUyxTQUFRLHNCQUFTO0lBTXJDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBa0I7UUFDMUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUNoQixJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUE7UUFDMUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFBO1FBRTVCLE1BQU0sWUFBWSxHQUFHLFFBQVEsR0FBRyxPQUFPLENBQUMsc0NBQXNDLENBQUMsQ0FBQTtRQUMvRSxJQUFJLENBQUMsT0FBTztZQUNULG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFlO2dCQUM3RCxJQUFJLENBQUMsd0JBQXdCLENBQUMsS0FBSyxFQUFFLFlBQVksRUFBRSxLQUFLLENBQUMsQ0FBQTtRQUUzRCxNQUFNLFFBQVEsR0FBRyxJQUFJLGVBQWUsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRTtZQUM1RCxjQUFjLEVBQUUsSUFBSSxDQUFDLE9BQU87U0FDN0IsQ0FBQyxDQUFBO1FBQ0YsSUFBSSxDQUFDLFlBQVksR0FBRyxRQUFRLENBQUMsWUFBWSxDQUFBO1FBQ3pDLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUNuQyxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDNUQsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3hDLENBQUM7SUFFUyx3QkFBd0IsQ0FDaEMsS0FBZ0IsRUFDaEIsRUFBVSxFQUNWLEtBQWtCO1FBRWxCLE1BQU0sV0FBVyxHQUFHLEdBQUcsU0FBUyxhQUFhLENBQUE7UUFDN0MsTUFBTSxXQUFXLEdBQUcsR0FBRyxTQUFTLGFBQWEsQ0FBQTtRQUM3QyxJQUFJLEtBQWEsQ0FBQTtRQUNqQixJQUFJLGVBQVUsQ0FBQyxXQUFXLENBQUMsRUFBRTtZQUMzQixLQUFLLEdBQUcsV0FBVyxDQUFBO1NBQ3BCO2FBQU0sSUFBSSxlQUFVLENBQUMsV0FBVyxDQUFDLEVBQUU7WUFDbEMsS0FBSyxHQUFHLFdBQVcsQ0FBQTtTQUNwQjthQUFNO1lBQ0wsaUdBQWlHO1lBQ2pHLEtBQUssR0FBRyxJQUFJLENBQUMsSUFBSSxDQUNmLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsRUFDM0QseUNBQXlDLENBQzFDLENBQUE7U0FDRjtRQUNELE1BQU0sRUFBRSxHQUFHLElBQUksTUFBTSxDQUFDLGNBQWMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQzlDLEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRztZQUNkLEtBQUssRUFBRSxLQUFLO1lBQ1osT0FBTyxFQUFFLG9CQUFPLENBQUMsV0FBVztZQUM1QixPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sSUFBSSxzQkFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUM7WUFDL0MsUUFBUSxFQUFFO2dCQUNSLFNBQVMsRUFBRSxJQUFJO2dCQUNmLGVBQWUsRUFBRSxDQUFDLFdBQVcsQ0FBQzthQUMvQjtTQUNGLENBQUMsQ0FBQTtRQUNGLE9BQU8sRUFBRSxDQUFBO0lBQ1gsQ0FBQzs7QUF2REgsNEJBd0RDOzs7QUFFRCxTQUFTLE9BQU8sQ0FBQyxDQUFTO0lBQ3hCLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDLENBQUE7QUFDdkMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGV4aXN0c1N5bmMgfSBmcm9tIFwiZnNcIlxuaW1wb3J0ICogYXMgcGF0aCBmcm9tIFwicGF0aFwiXG5pbXBvcnQgeyBEdXJhdGlvbiwgU3RhY2sgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgSVZwYyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCJcbmltcG9ydCB7IElGdW5jdGlvbiwgUnVudGltZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtbGFtYmRhXCJcbmltcG9ydCAqIGFzIGxhbWJkYSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWxhbWJkYS1ub2RlanNcIlxuaW1wb3J0IHsgSURhdGFiYXNlQ2x1c3RlciwgSVNlcnZlcmxlc3NDbHVzdGVyIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1yZHNcIlxuaW1wb3J0IHsgSVNlY3JldCB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3Mtc2VjcmV0c21hbmFnZXJcIlxuaW1wb3J0ICogYXMgY3VzdG9tUmVzb3VyY2VzIGZyb20gXCJhd3MtY2RrLWxpYi9jdXN0b20tcmVzb3VyY2VzXCJcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCJcblxuZXhwb3J0IGludGVyZmFjZSBSZHNTcWxQcm9wcyB7XG4gIC8qKlxuICAgKiBWUEMgbmV0d29yayB0byBwbGFjZSB0aGUgcHJvdmlkZXIgbGFtYmRhLlxuICAgKlxuICAgKiBOb3JtYWxseSB0aGlzIGlzIHRoZSBWUEMgb2YgeW91ciBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSBGdW5jdGlvbiBpcyBub3QgcGxhY2VkIHdpdGhpbiBhIFZQQy5cbiAgICovXG4gIHJlYWRvbmx5IHZwYzogSVZwY1xuXG4gIC8qKlxuICAgKiBZb3VyIGRhdGFiYXNlLlxuICAgKi9cbiAgcmVhZG9ubHkgY2x1c3RlcjogSVNlcnZlcmxlc3NDbHVzdGVyIHwgSURhdGFiYXNlQ2x1c3RlclxuXG4gIC8qKlxuICAgKiBTZWNyZXQgdGhhdCBncmFudHMgYWNjZXNzIHRvIHlvdXIgZGF0YWJhc2UuXG4gICAqXG4gICAqIFVzdWFsbHkgdGhpcyBpcyB5b3VyIGNsdXN0ZXIncyBtYXN0ZXIgc2VjcmV0LlxuICAgKi9cbiAgcmVhZG9ubHkgc2VjcmV0OiBJU2VjcmV0XG5cbiAgLyoqXG4gICAqIFRpbWVvdXQgZm9yIGxhbWJkYSB0byBkbyBpdHMgd29yay5cbiAgICpcbiAgICogQGRlZmF1bHQgLSA1IG1pbnV0ZXNcbiAgICovXG4gIHJlYWRvbmx5IHRpbWVvdXQ/OiBEdXJhdGlvblxufVxuXG5leHBvcnQgY2xhc3MgUHJvdmlkZXIgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICBwdWJsaWMgcmVhZG9ubHkgc2VydmljZVRva2VuOiBzdHJpbmdcbiAgcHVibGljIHJlYWRvbmx5IHNlY3JldDogSVNlY3JldFxuICBwdWJsaWMgcmVhZG9ubHkgaGFuZGxlcjogSUZ1bmN0aW9uXG4gIHB1YmxpYyByZWFkb25seSBjbHVzdGVyOiBJU2VydmVybGVzc0NsdXN0ZXIgfCBJRGF0YWJhc2VDbHVzdGVyXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFJkc1NxbFByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKVxuICAgIHRoaXMuc2VjcmV0ID0gcHJvcHMuc2VjcmV0XG4gICAgdGhpcy5jbHVzdGVyID0gcHJvcHMuY2x1c3RlclxuXG4gICAgY29uc3QgZnVuY3Rpb25OYW1lID0gXCJSZHNTcWxcIiArIHNsdWdpZnkoXCIyOGI5ZTc5MS1hZjYwLTRhMzMtYmNhOC1mZmI2ZjMwZWY4YzVcIilcbiAgICB0aGlzLmhhbmRsZXIgPVxuICAgICAgKFN0YWNrLm9mKHRoaXMpLm5vZGUudHJ5RmluZENoaWxkKGZ1bmN0aW9uTmFtZSkgYXMgSUZ1bmN0aW9uKSA/P1xuICAgICAgdGhpcy5uZXdDdXN0b21SZXNvdXJjZUhhbmRsZXIoc2NvcGUsIGZ1bmN0aW9uTmFtZSwgcHJvcHMpXG5cbiAgICBjb25zdCBwcm92aWRlciA9IG5ldyBjdXN0b21SZXNvdXJjZXMuUHJvdmlkZXIodGhpcywgXCJSZHNTcWxcIiwge1xuICAgICAgb25FdmVudEhhbmRsZXI6IHRoaXMuaGFuZGxlcixcbiAgICB9KVxuICAgIHRoaXMuc2VydmljZVRva2VuID0gcHJvdmlkZXIuc2VydmljZVRva2VuXG4gICAgdGhpcy5zZWNyZXQuZ3JhbnRSZWFkKHRoaXMuaGFuZGxlcilcbiAgICBwcm9wcy5jbHVzdGVyLmNvbm5lY3Rpb25zLmFsbG93RGVmYXVsdFBvcnRGcm9tKHRoaXMuaGFuZGxlcilcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5jbHVzdGVyKVxuICB9XG5cbiAgcHJvdGVjdGVkIG5ld0N1c3RvbVJlc291cmNlSGFuZGxlcihcbiAgICBzY29wZTogQ29uc3RydWN0LFxuICAgIGlkOiBzdHJpbmcsXG4gICAgcHJvcHM6IFJkc1NxbFByb3BzXG4gICk6IGxhbWJkYS5Ob2RlanNGdW5jdGlvbiB7XG4gICAgY29uc3QgdHNfZmlsZW5hbWUgPSBgJHtfX2Rpcm5hbWV9L2hhbmRsZXIudHNgXG4gICAgY29uc3QganNfZmlsZW5hbWUgPSBgJHtfX2Rpcm5hbWV9L2hhbmRsZXIuanNgXG4gICAgbGV0IGVudHJ5OiBzdHJpbmdcbiAgICBpZiAoZXhpc3RzU3luYyh0c19maWxlbmFtZSkpIHtcbiAgICAgIGVudHJ5ID0gdHNfZmlsZW5hbWVcbiAgICB9IGVsc2UgaWYgKGV4aXN0c1N5bmMoanNfZmlsZW5hbWUpKSB7XG4gICAgICBlbnRyeSA9IGpzX2ZpbGVuYW1lXG4gICAgfSBlbHNlIHtcbiAgICAgIC8vIFVnbHkgaGFjayB0byBzdXBwb3J0IFNTVCAocG9zc2libHkgY2F1c2VkIGJ5IG15IGhhY2sgdG8gbWFrZSBTU1Qgd29yayB3aXRoIENvbW1vbkpTIGxpYnJhcmllcylcbiAgICAgIGVudHJ5ID0gcGF0aC5qb2luKFxuICAgICAgICBwYXRoLmRpcm5hbWUocHJvY2Vzcy5lbnYubnBtX3BhY2thZ2VfanNvbiB8fCBwcm9jZXNzLmN3ZCgpKSxcbiAgICAgICAgXCJub2RlX21vZHVsZXMvY2RrLXJkcy1zcWwvbGliL2hhbmRsZXIuanNcIlxuICAgICAgKVxuICAgIH1cbiAgICBjb25zdCBmbiA9IG5ldyBsYW1iZGEuTm9kZWpzRnVuY3Rpb24oc2NvcGUsIGlkLCB7XG4gICAgICB2cGM6IHByb3BzLnZwYyxcbiAgICAgIGVudHJ5OiBlbnRyeSxcbiAgICAgIHJ1bnRpbWU6IFJ1bnRpbWUuTk9ERUpTXzE4X1gsXG4gICAgICB0aW1lb3V0OiBwcm9wcy50aW1lb3V0ID8/IER1cmF0aW9uLnNlY29uZHMoMzAwKSxcbiAgICAgIGJ1bmRsaW5nOiB7XG4gICAgICAgIHNvdXJjZU1hcDogdHJ1ZSxcbiAgICAgICAgZXh0ZXJuYWxNb2R1bGVzOiBbXCJwZy1uYXRpdmVcIl0sXG4gICAgICB9LFxuICAgIH0pXG4gICAgcmV0dXJuIGZuXG4gIH1cbn1cblxuZnVuY3Rpb24gc2x1Z2lmeSh4OiBzdHJpbmcpOiBzdHJpbmcge1xuICByZXR1cm4geC5yZXBsYWNlKC9bXmEtekEtWjAtOV0vZywgXCJcIilcbn1cbiJdfQ==

package/lib/role.js

@@ -46,5 +46,5 @@ class Role extends constructs_1.Construct {
 }
 exports.Role = Role;
 _a = JSII_RTTI_SYMBOL_1;
-Role[_a] = { fqn: "cdk-rds-sql.Role", version: "2.1.2" };
+Role[_a] = { fqn: "cdk-rds-sql.Role", version: "2.3.0" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9yb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNkNBQTJDO0FBRTNDLHVFQUFnRTtBQUNoRSwyQ0FBc0M7QUFHdEMsaUVBQW1FO0FBa0RuRSxNQUFhLElBQUssU0FBUSxzQkFBUztJQVdqQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQWdCO1FBQ3hELElBQ0UsQ0FBQyxLQUFLLENBQUMsUUFBUSxJQUFJLEtBQUssQ0FBQyxZQUFZLENBQUM7WUFDdEMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDO1lBRXhDLE1BQU0seUNBQXlDLENBQUE7UUFDakQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUNoQixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksMkJBQU0sQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO1lBQ3ZDLFVBQVUsRUFBRSxLQUFLLENBQUMsVUFBVTtZQUM1QixhQUFhLEVBQUUsS0FBSyxDQUFDLGFBQWE7WUFDbEMsV0FBVyxFQUFFLHNDQUFzQyxLQUFLLENBQUMsUUFBUSxFQUFFO1lBQ25FLG9CQUFvQixFQUFFO2dCQUNwQixjQUFjLEVBQUUsRUFBRTtnQkFDbEIsb0JBQW9CLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQztvQkFDbkMsbUJBQW1CLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsaUJBQWlCO29CQUM3RCxNQUFNLEVBQUUsVUFBVTtvQkFDbEIsSUFBSSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxRQUFRO29CQUNyRCxJQUFJLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLElBQUk7b0JBQ2pELFFBQVEsRUFBRSxLQUFLLENBQUMsUUFBUTtvQkFDeEIsTUFBTSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsWUFBWTtpQkFDMUUsQ0FBQztnQkFDRixpQkFBaUIsRUFBRSxVQUFVO2dCQUM3QixpQkFBaUIsRUFBRSwrQkFBK0I7YUFDbkQ7WUFDRCxhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO1NBQ3JDLENBQUMsQ0FBQTtRQUNGLE1BQU0sSUFBSSxHQUFHLElBQUksMkJBQWtCLENBQUMsSUFBSSxFQUFFLGNBQWMsRUFBRTtZQUN4RCxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDeEIsUUFBUSxFQUFFLEtBQUssQ0FBQyxRQUFRO1lBQ3hCLFdBQVcsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVM7WUFDbEMsUUFBUSxFQUFFLEtBQUssQ0FBQyxRQUFRO1lBQ3hCLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtTQUNqQyxDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDcEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUMsUUFBUSxDQUFBO1FBQzlCLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDL0MsQ0FBQzs7QUEvQ0gsb0JBZ0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgKiBhcyBrbXMgZnJvbSBcImF3cy1jZGstbGliL2F3cy1rbXNcIlxuaW1wb3J0IHsgSVNlY3JldCwgU2VjcmV0IH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1zZWNyZXRzbWFuYWdlclwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBQcm92aWRlciB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcbmltcG9ydCB7IFJvbGUgYXMgQ3VzdG9tUmVzb3VyY2VSb2xlIH0gZnJvbSBcIi4vcm9sZS5jdXN0b20tcmVzb3VyY2VcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFJvbGVQcm9wcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBQcm92aWRlclxuXG4gIC8qKlxuICAgKiBTUUwuXG4gICAqL1xuICByZWFkb25seSByb2xlTmFtZTogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIGRhdGFiYXNlIHRoaXMgdXNlciBpcyBleHBlY3RlZCB0byB1c2UuXG4gICAqXG4gICAqIElmIHRoZSBkYXRhYmFzZSBleGlzdHMsIGNvbm5lY3QgcHJpdmlsZWdlcyBhcmUgZ3JhbnRlZC5cbiAgICpcbiAgICogU3BlY2lmeSBub25lIG9mIGBkYXRhYmFzZWAgb3IgYGRhdGFiYXNlTmFtZWAgb3Igb25seSBvbmUgb2YgdGhlbS5cbiAgICpcbiAgICogQGRlZmF1bHQgbm8gY29ubmVjdGlvbiB0byBhbnkgZGF0YWJhc2UgaXMgZ3JhbnRlZFxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogT3B0aW9uYWwgZGF0YWJhc2UgbmFtZSB0aGlzIHVzZXIgaXMgZXhwZWN0ZWQgdG8gdXNlLlxuICAgKlxuICAgKiBJZiB0aGUgZGF0YWJhc2UgZXhpc3RzLCBjb25uZWN0IHByaXZpbGVnZXMgYXJlIGdyYW50ZWQuXG4gICAqXG4gICAqIFNwZWNpZnkgbm9uZSBvZiBgZGF0YWJhc2VgIG9yIGBkYXRhYmFzZU5hbWVgIG9yIG9ubHkgb25lIG9mIHRoZW0uXG4gICAqXG4gICAqIEBkZWZhdWx0IG5vIGNvbm5lY3Rpb24gdG8gYW55IGRhdGFiYXNlIGlzIGdyYW50ZWRcbiAgICovXG4gIHJlYWRvbmx5IGRhdGFiYXNlTmFtZT86IHN0cmluZ1xuXG4gIC8qKlxuICAgKiBBIG5ldyBzZWNyZXQgaXMgY3JlYXRlZCBmb3IgdGhpcyB1c2VyLlxuICAgKlxuICAgKiBPcHRpb25hbGx5IGVuY3J5cHQgaXQgd2l0aCB0aGUgZ2l2ZW4ga2V5LlxuICAgKi9cbiAgcmVhZG9ubHkgZW5jcnlwdGlvbktleT86IGttcy5JS2V5XG5cbiAgLyoqXG4gICAqIEEgbmV3IHNlY3JldCBpcyBjcmVhdGVkIGZvciB0aGlzIHVzZXIuXG4gICAqXG4gICAqIE9wdGlvbmFsbHkgYWRkIHNlY3JldCBuYW1lIHRvIHRoZSBzZWNyZXQuXG4gICAqL1xuICByZWFkb25seSBzZWNyZXROYW1lPzogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBSb2xlIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgLyoqXG4gICAqIFRoZSByb2xlIG5hbWUuXG4gICAqL1xuICBwdWJsaWMgcmVhZG9ubHkgcm9sZU5hbWU6IHN0cmluZ1xuXG4gIC8qKlxuICAgKiBUaGUgZ2VuZXJhdGVkIHNlY3JldC5cbiAgICovXG4gIHB1YmxpYyByZWFkb25seSBzZWNyZXQ6IElTZWNyZXRcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogUm9sZVByb3BzKSB7XG4gICAgaWYgKFxuICAgICAgKHByb3BzLmRhdGFiYXNlICYmIHByb3BzLmRhdGFiYXNlTmFtZSkgfHxcbiAgICAgICghcHJvcHMuZGF0YWJhc2UgJiYgIXByb3BzLmRhdGFiYXNlTmFtZSlcbiAgICApXG4gICAgICB0aHJvdyBcIlNwZWNpZnkgZWl0aGVyIGRhdGFiYXNlIG9yIGRhdGFiYXNlTmFtZVwiXG4gICAgc3VwZXIoc2NvcGUsIGlkKVxuICAgIHRoaXMuc2VjcmV0ID0gbmV3IFNlY3JldCh0aGlzLCBcIlNlY3JldFwiLCB7XG4gICAgICBzZWNyZXROYW1lOiBwcm9wcy5zZWNyZXROYW1lLFxuICAgICAgZW5jcnlwdGlvbktleTogcHJvcHMuZW5jcnlwdGlvbktleSxcbiAgICAgIGRlc2NyaXB0aW9uOiBgR2VuZXJhdGVkIHNlY3JldCBmb3IgcG9zdGdyZXMgcm9sZSAke3Byb3BzLnJvbGVOYW1lfWAsXG4gICAgICBnZW5lcmF0ZVNlY3JldFN0cmluZzoge1xuICAgICAgICBwYXNzd29yZExlbmd0aDogMzAsIC8vIE9yYWNsZSBwYXNzd29yZCBjYW5ub3QgaGF2ZSBtb3JlIHRoYW4gMzAgY2hhcmFjdGVyc1xuICAgICAgICBzZWNyZXRTdHJpbmdUZW1wbGF0ZTogSlNPTi5zdHJpbmdpZnkoe1xuICAgICAgICAgIGRiQ2x1c3RlcklkZW50aWZpZXI6IHByb3BzLnByb3ZpZGVyLmNsdXN0ZXIuY2x1c3RlcklkZW50aWZpZXIsXG4gICAgICAgICAgZW5naW5lOiBcInBvc3RncmVzXCIsXG4gICAgICAgICAgaG9zdDogcHJvcHMucHJvdmlkZXIuY2x1c3Rlci5jbHVzdGVyRW5kcG9pbnQuaG9zdG5hbWUsXG4gICAgICAgICAgcG9ydDogcHJvcHMucHJvdmlkZXIuY2x1c3Rlci5jbHVzdGVyRW5kcG9pbnQucG9ydCxcbiAgICAgICAgICB1c2VybmFtZTogcHJvcHMucm9sZU5hbWUsXG4gICAgICAgICAgZGJuYW1lOiBwcm9wcy5kYXRhYmFzZSA/IHByb3BzLmRhdGFiYXNlLmRhdGFiYXNlTmFtZSA6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgfSksXG4gICAgICAgIGdlbmVyYXRlU3RyaW5nS2V5OiBcInBhc3N3b3JkXCIsXG4gICAgICAgIGV4Y2x1ZGVDaGFyYWN0ZXJzOiBcIiAlK35gIyQmKigpfFtde306Ozw+PyEnL0BcXFwiXFxcXFwiLFxuICAgICAgfSxcbiAgICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWSxcbiAgICB9KVxuICAgIGNvbnN0IHJvbGUgPSBuZXcgQ3VzdG9tUmVzb3VyY2VSb2xlKHRoaXMsIFwiUG9zdGdyZXNSb2xlXCIsIHtcbiAgICAgIHByb3ZpZGVyOiBwcm9wcy5wcm92aWRlcixcbiAgICAgIHJvbGVOYW1lOiBwcm9wcy5yb2xlTmFtZSxcbiAgICAgIHBhc3N3b3JkQXJuOiB0aGlzLnNlY3JldC5zZWNyZXRBcm4sXG4gICAgICBkYXRhYmFzZTogcHJvcHMuZGF0YWJhc2UsXG4gICAgICBkYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICB9KVxuICAgIHJvbGUubm9kZS5hZGREZXBlbmRlbmN5KHRoaXMuc2VjcmV0KVxuICAgIHRoaXMucm9sZU5hbWUgPSBwcm9wcy5yb2xlTmFtZVxuICAgIHRoaXMuc2VjcmV0LmdyYW50UmVhZChwcm9wcy5wcm92aWRlci5oYW5kbGVyKVxuICB9XG59XG4iXX0=

package/lib/schema.js

@@ -13,7 +13,7 @@ class Schema extends aws_cdk_lib_1.CustomResource {
                 Resource: enum_1.RdsSqlResource.SCHEMA,
                 ResourceId: props.schemaName,
                 SecretArn: props.provider.secret.secretArn,
-                Database: props.database ? props.database.databaseName : undefined,
+                DatabaseName: props.database ? props.database.databaseName : undefined,
             },
         });
         this.node.addDependency(props.provider);
@@ -24,5 +24,5 @@ class Schema extends aws_cdk_lib_1.CustomResource {
 }
 exports.Schema = Schema;
 _a = JSII_RTTI_SYMBOL_1;
-Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "2.1.2" };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUFzQnZDLE1BQWEsTUFBTyxTQUFRLDRCQUFjO0lBR3hDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBa0I7UUFDMUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxNQUFNO2dCQUMvQixVQUFVLEVBQUUsS0FBSyxDQUFDLFVBQVU7Z0JBQzVCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVM7YUFDbkU7U0FDRixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDdkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFBO1FBQ2xDLElBQUksS0FBSyxDQUFDLFFBQVE7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDN0QsQ0FBQzs7QUFoQkgsd0JBaUJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIlxuaW1wb3J0IHsgSURhdGFiYXNlIH0gZnJvbSBcIi4vZGF0YWJhc2VcIlxuaW1wb3J0IHsgUmRzU3FsUmVzb3VyY2UgfSBmcm9tIFwiLi9lbnVtXCJcbmltcG9ydCB7IFByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNjaGVtYVByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IFByb3ZpZGVyXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIGRhdGFiYXNlLlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIHVzZSBkZWZhdWx0IGRhdGFiYXNlXG4gICAqL1xuICByZWFkb25seSBkYXRhYmFzZT86IElEYXRhYmFzZVxuXG4gIC8qKlxuICAgKiBTUUwuXG4gICAqL1xuICByZWFkb25seSBzY2hlbWFOYW1lOiBzdHJpbmdcbn1cblxuZXhwb3J0IGNsYXNzIFNjaGVtYSBleHRlbmRzIEN1c3RvbVJlc291cmNlIHtcbiAgcHVibGljIHJlYWRvbmx5IHNjaGVtYU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBTY2hlbWFQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5TQ0hFTUEsXG4gICAgICAgIFJlc291cmNlSWQ6IHByb3BzLnNjaGVtYU5hbWUsXG4gICAgICAgIFNlY3JldEFybjogcHJvcHMucHJvdmlkZXIuc2VjcmV0LnNlY3JldEFybixcbiAgICAgICAgRGF0YWJhc2U6IHByb3BzLmRhdGFiYXNlID8gcHJvcHMuZGF0YWJhc2UuZGF0YWJhc2VOYW1lIDogdW5kZWZpbmVkLFxuICAgICAgfSxcbiAgICB9KVxuICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLnByb3ZpZGVyKVxuICAgIHRoaXMuc2NoZW1hTmFtZSA9IHByb3BzLnNjaGVtYU5hbWVcbiAgICBpZiAocHJvcHMuZGF0YWJhc2UpIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLmRhdGFiYXNlKVxuICB9XG59XG4iXX0=
+Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "2.3.0" };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUFzQnZDLE1BQWEsTUFBTyxTQUFRLDRCQUFjO0lBR3hDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBa0I7UUFDMUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxNQUFNO2dCQUMvQixVQUFVLEVBQUUsS0FBSyxDQUFDLFVBQVU7Z0JBQzVCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVM7YUFDdkU7U0FDRixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDdkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFBO1FBQ2xDLElBQUksS0FBSyxDQUFDLFFBQVE7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDN0QsQ0FBQzs7QUFoQkgsd0JBaUJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIlxuaW1wb3J0IHsgSURhdGFiYXNlIH0gZnJvbSBcIi4vZGF0YWJhc2VcIlxuaW1wb3J0IHsgUmRzU3FsUmVzb3VyY2UgfSBmcm9tIFwiLi9lbnVtXCJcbmltcG9ydCB7IFByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNjaGVtYVByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IFByb3ZpZGVyXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIGRhdGFiYXNlLlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIHVzZSBkZWZhdWx0IGRhdGFiYXNlXG4gICAqL1xuICByZWFkb25seSBkYXRhYmFzZT86IElEYXRhYmFzZVxuXG4gIC8qKlxuICAgKiBTUUwuXG4gICAqL1xuICByZWFkb25seSBzY2hlbWFOYW1lOiBzdHJpbmdcbn1cblxuZXhwb3J0IGNsYXNzIFNjaGVtYSBleHRlbmRzIEN1c3RvbVJlc291cmNlIHtcbiAgcHVibGljIHJlYWRvbmx5IHNjaGVtYU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBTY2hlbWFQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5TQ0hFTUEsXG4gICAgICAgIFJlc291cmNlSWQ6IHByb3BzLnNjaGVtYU5hbWUsXG4gICAgICAgIFNlY3JldEFybjogcHJvcHMucHJvdmlkZXIuc2VjcmV0LnNlY3JldEFybixcbiAgICAgICAgRGF0YWJhc2VOYW1lOiBwcm9wcy5kYXRhYmFzZSA/IHByb3BzLmRhdGFiYXNlLmRhdGFiYXNlTmFtZSA6IHVuZGVmaW5lZCxcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgICB0aGlzLnNjaGVtYU5hbWUgPSBwcm9wcy5zY2hlbWFOYW1lXG4gICAgaWYgKHByb3BzLmRhdGFiYXNlKSB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5kYXRhYmFzZSlcbiAgfVxufVxuIl19

package/lib/sql.js

@@ -12,7 +12,7 @@ class Sql extends aws_cdk_lib_1.CustomResource {
             properties: {
                 Resource: enum_1.RdsSqlResource.SQL,
                 SecretArn: props.provider.secret.secretArn,
-                Database: props.database ? props.database.databaseName : undefined,
+                DatabaseName: props.database ? props.database.databaseName : undefined,
                 Statement: props.statement,
             },
         });
@@ -23,5 +23,5 @@ class Sql extends aws_cdk_lib_1.CustomResource {
 }
 exports.Sql = Sql;
 _a = JSII_RTTI_SYMBOL_1;
-Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "2.1.2" };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NxbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUFzQnZDLE1BQWEsR0FBSSxTQUFRLDRCQUFjO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZTtRQUN2RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLEdBQUc7Z0JBQzVCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQ2xFLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUzthQUMzQjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLEtBQUssQ0FBQyxRQUFRO1lBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQzdELENBQUM7O0FBYkgsa0JBY0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgUHJvdmlkZXIgfSBmcm9tIFwiLi9wcm92aWRlclwiXG5cbmV4cG9ydCBpbnRlcmZhY2UgU3FsUHJvcHMge1xuICAvKipcbiAgICogUHJvdmlkZXIuXG4gICAqL1xuICByZWFkb25seSBwcm92aWRlcjogUHJvdmlkZXJcblxuICAvKipcbiAgICogT3B0aW9uYWwgZGF0YWJhc2UuXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gdXNlIGRlZmF1bHQgZGF0YWJhc2VcbiAgICovXG4gIHJlYWRvbmx5IGRhdGFiYXNlPzogSURhdGFiYXNlXG5cbiAgLyoqXG4gICAqIFNRTC5cbiAgICovXG4gIHJlYWRvbmx5IHN0YXRlbWVudD86IHN0cmluZ1xufVxuXG5leHBvcnQgY2xhc3MgU3FsIGV4dGVuZHMgQ3VzdG9tUmVzb3VyY2Uge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogU3FsUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQsIHtcbiAgICAgIHNlcnZpY2VUb2tlbjogcHJvcHMucHJvdmlkZXIuc2VydmljZVRva2VuLFxuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBSZXNvdXJjZTogUmRzU3FsUmVzb3VyY2UuU1FMLFxuICAgICAgICBTZWNyZXRBcm46IHByb3BzLnByb3ZpZGVyLnNlY3JldC5zZWNyZXRBcm4sXG4gICAgICAgIERhdGFiYXNlOiBwcm9wcy5kYXRhYmFzZSA/IHByb3BzLmRhdGFiYXNlLmRhdGFiYXNlTmFtZSA6IHVuZGVmaW5lZCxcbiAgICAgICAgU3RhdGVtZW50OiBwcm9wcy5zdGF0ZW1lbnQsXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gICAgaWYgKHByb3BzLmRhdGFiYXNlKSB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5kYXRhYmFzZSlcbiAgfVxufVxuIl19
+Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "2.3.0" };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NxbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUFzQnZDLE1BQWEsR0FBSSxTQUFRLDRCQUFjO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZTtRQUN2RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLEdBQUc7Z0JBQzVCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQ3RFLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUzthQUMzQjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLEtBQUssQ0FBQyxRQUFRO1lBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQzdELENBQUM7O0FBYkgsa0JBY0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgUHJvdmlkZXIgfSBmcm9tIFwiLi9wcm92aWRlclwiXG5cbmV4cG9ydCBpbnRlcmZhY2UgU3FsUHJvcHMge1xuICAvKipcbiAgICogUHJvdmlkZXIuXG4gICAqL1xuICByZWFkb25seSBwcm92aWRlcjogUHJvdmlkZXJcblxuICAvKipcbiAgICogT3B0aW9uYWwgZGF0YWJhc2UuXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gdXNlIGRlZmF1bHQgZGF0YWJhc2VcbiAgICovXG4gIHJlYWRvbmx5IGRhdGFiYXNlPzogSURhdGFiYXNlXG5cbiAgLyoqXG4gICAqIFNRTC5cbiAgICovXG4gIHJlYWRvbmx5IHN0YXRlbWVudD86IHN0cmluZ1xufVxuXG5leHBvcnQgY2xhc3MgU3FsIGV4dGVuZHMgQ3VzdG9tUmVzb3VyY2Uge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogU3FsUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQsIHtcbiAgICAgIHNlcnZpY2VUb2tlbjogcHJvcHMucHJvdmlkZXIuc2VydmljZVRva2VuLFxuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBSZXNvdXJjZTogUmRzU3FsUmVzb3VyY2UuU1FMLFxuICAgICAgICBTZWNyZXRBcm46IHByb3BzLnByb3ZpZGVyLnNlY3JldC5zZWNyZXRBcm4sXG4gICAgICAgIERhdGFiYXNlTmFtZTogcHJvcHMuZGF0YWJhc2UgPyBwcm9wcy5kYXRhYmFzZS5kYXRhYmFzZU5hbWUgOiB1bmRlZmluZWQsXG4gICAgICAgIFN0YXRlbWVudDogcHJvcHMuc3RhdGVtZW50LFxuICAgICAgfSxcbiAgICB9KVxuICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLnByb3ZpZGVyKVxuICAgIGlmIChwcm9wcy5kYXRhYmFzZSkgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMuZGF0YWJhc2UpXG4gIH1cbn1cbiJdfQ==

package/package.json

@@ -41,7 +41,7 @@
     "@types/pg": "^8.6.6",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
-    "aws-cdk-lib": "2.51.1",
+    "aws-cdk-lib": "2.64.0",
     "constructs": "10.1.168",
     "esbuild": "^0.16.12",
     "eslint": "^8",
@@ -66,7 +66,7 @@
     "typescript": "^4.9.4"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.51.1",
+    "aws-cdk-lib": "^2.64.0",
     "constructs": "^10.1.168"
   },
   "dependencies": {
@@ -94,7 +94,7 @@
   ],
   "main": "lib/index.js",
   "license": "Apache-2.0",
-  "version": "2.1.2",
+  "version": "2.3.0",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",