cdk-rds-sql 7.3.2 → 8.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.jsii CHANGED
@@ -7,7 +7,7 @@
7
7
  ]
8
8
  },
9
9
  "bundled": {
10
- "@types/aws-lambda": "^8.10.152"
10
+ "@types/aws-lambda": "^8.10.159"
11
11
  },
12
12
  "dependencies": {
13
13
  "aws-cdk-lib": "^2.214.0",
@@ -4058,7 +4058,7 @@
4058
4058
  "stability": "stable"
4059
4059
  },
4060
4060
  "homepage": "https://github.com/berenddeboer/cdk-rds-sql.git",
4061
- "jsiiVersion": "5.9.4 (build db676e9)",
4061
+ "jsiiVersion": "5.9.20 (build 6e2b13a)",
4062
4062
  "keywords": [
4063
4063
  "aurora",
4064
4064
  "aws",
@@ -4080,7 +4080,7 @@
4080
4080
  },
4081
4081
  "name": "cdk-rds-sql",
4082
4082
  "readme": {
4083
- "markdown": "# About\n\nThis CDK construct library makes it possible to create databases,\nschemas, and roles in an Aurora Serverless v2, RDS Database Cluster,\nDatabase Instance, or AWS DSQL clusters. PostgreSQL, MySQL, and DSQL\ndatabases 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. For a cluster:\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\nFor an instance:\n\n```ts\nimport { Provider } from \"cdk-rds-sql\"\n\nconst provider = new Provider(this, \"Provider\", {\n vpc: vpc,\n instance: instance,\n secret: cluster.secret!,\n})\n```\n\nThe provider will setup a lambda, which normally lives in the same VPC\nas the database. You can give a different VPC, as long as that VPC has\naccess to the VPC of the database. Only the provider lambda will talk\nto your database.\n\nThe provider will by default use the private isolated subnet of the\nVPC. Your isolated network must have a VPC endpoint to AWS Secrets Manager\nand possibly KMS as well. If you want to use a subnet with egress\naccess in case you have no such VPC endpoints, specify the subnet as\nfollows:\n\n```ts\nimport { Provider } from \"cdk-rds-sql\"\n\nconst provider = new Provider(this, \"Provider\", {\n vpc: vpc,\n vpcSubnets: {\n subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS,\n },\n cluster: cluster,\n secret: cluster.secret!,\n})\n```\n\n## Roles\n\nCreate a postgres role (or mysql user) for a cluster 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\nvalue 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\nIf you want to make the role the owner of a new database, just specify\nthe `databaseName` here, and create the database later.\n\n### IAM Authentication\n\nInstead of password-based authentication, you can create roles that\nuse AWS IAM database authentication. This eliminates the need to store\ndatabase passwords and provides enhanced security through AWS IAM\npolicies.\n\n```ts\nimport { Role } from \"cdk-rds-sql\"\n\nconst iamRole = new Role(this, \"IamRole\", {\n provider: provider,\n roleName: \"myiamrole\",\n databaseName: \"mydb\",\n enableIamAuth: true,\n})\n```\n\nFor IAM-authenticated roles, the secret will not contain a password field:\n\n```json\n{\n \"dbClusterIdentifier\": \"teststack-clustereb1186t9-sh4wpqfdyfvu\",\n \"dbname\": \"mydb\",\n \"engine\": \"postgres\",\n \"port\": 5432,\n \"host\": \"teststack-clustereb1186t9-sh4wpqfdyfvu.cluster-cgudolabssna.us-east-1.rds.amazonaws.com\",\n \"username\": \"myiamrole\"\n}\n```\n\n**Requirements for IAM Authentication:**\n\n- SSL connections are required (enabled by default in this library)\n- Your application must have IAM permissions to connect to the database\n- The database user/role name must match the IAM identity\n\n**IAM Policy Example:**\n\nYour application will need an IAM policy like this to connect:\n\n```json\n{\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Effect\": \"Allow\",\n \"Action\": [\"rds-db:connect\"],\n \"Resource\": [\n \"arn:aws:rds-db:region:account-id:dbuser:cluster-resource-id/myiamrole\"\n ]\n }\n ]\n}\n```\n\nBoth PostgreSQL and MySQL databases support IAM authentication. For more details, see the [AWS RDS IAM Database Authentication documentation](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html).\n\n### MySQL support\n\nIn MySQL users are created with '%' as value for the host. It is hard\nto do this better:\n\n- Determine the CIDR blocks used by a VPC is not trivial.\n- For imported VPCs you cannot specify the IPv6 CIDR.\n- CIDRs might change without the system knowing, meaning applications\n could lose access to the database at random times, such as when a\n container is restarted.\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\nOne may need a role permitted for using schema:\n\n```ts\nnew Schema(this, \"Schema\", {\n provider: provider,\n schemaName: \"myschema\",\n databaseName: database.databaseName,\n role: role,\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\nRollback sql on stack deletion:\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 rollback: `\nDO $$BEGIN\n IF EXISTS (select from pg_database WHERE datname = 't') THEN\n IF EXISTS (select from pg_catalog.pg_roles WHERE rolname = 'myrole') THEN\n revoke select t from myrole;\n END IF;\n drop table t;\n END IF;\nEND$$;\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- When you delete your `Sql` construct the rollback is executed if specified\n- When permission are granted via `Sql` they must be removed via\n rollback to succesfully remove the role\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# Parameters\n\nSome lambda constructs, in particular [Bref](https://bref.sh/), do not\nsupport secrets out of the box. Use the `parameterPrefix` property to\ncreate SSM parameters in addition to a secret:\n\n```ts\nconst role = new Role(this, \"Role\", {\n provider: provider,\n roleName: \"myrole\",\n databaseName: \"mydb\",\n parameterPrefix: \"/my-app/\",\n})\n```\n\nThis will create `/my-app/username`, `/my-app/password` and such.\n\nTo access parameters you will need IAM permissions such as:\n\n```ts\ninitialPolicy: [\n new iam.PolicyStatement({\n\tactions: [\"ssm:GetParameter\", \"ssm:GetParameters\"],\n\tresources: [\n\t // Grant access to all parameters under the base path\n\t `arn:aws:ssm:${this.region}:${this.account}:parameter/my-app/*`,\n\t],\n\teffect: iam.Effect.ALLOW,\n })\n],\n```\n\nNote that your VPC will need an SSM Parameters interface endpoint to support this.\n\n# AWS DSQL Support\n\nThis construct also supports AWS DSQL. DSQL is a great number of\nlimitations around it's postgresql support, so there is some learing\ncurve. This library supports creating roles, schemas, and executing\nSQL on DSQL clusters. Creating databases is not supported by DSQL.\n\n## DSQL Provider Setup\n\nDSQL clusters don't require a VPC or secrets since they use IAM authentication:\n\n```ts\nimport * as dsql from \"aws-cdk-lib/aws-dsql\"\nimport { Provider } from \"cdk-rds-sql\"\n\nconst dsqlCluster = new dsql.CfnCluster(this, \"DsqlCluster\", {\n deletionProtectionEnabled: false,\n})\n\nconst provider = new Provider(this, \"Provider\", {\n cluster: dsqlCluster,\n // No VPC or secret needed for DSQL\n})\n```\n\nYou can access DSQL from within a VPC, but cdk-rds-sql has not been\nspecifically tested with that scenario.\n\n## DSQL Roles\n\nDSQL always uses IAM authentication, so the `enableIamAuth` property is ignored:\n\n```ts\nimport { Role } from \"cdk-rds-sql\"\n\nconst role = new Role(this, \"Role\", {\n provider: provider,\n roleName: \"myrole\",\n})\n```\n\n## Using DSQL\n\nConnecting to DSQL requires a couple of things:\n\n1. Your IAM role needs the `dsql:DbConnect` IAM permission to connect to the cluster.\n2. You probably want a normal postgres role (not \"admin\") to use from your apps.\n3. Your IAM role needs to be connected to your postgres role: use the `IamGrant` construct for that:\n\n ```ts\n new IamGrant(this, \"LambdaIamGrant\", {\n provider: provider,\n roleName: role.roleName,\n resourceArn: queryLambda.role!.roleArn,\n })\n ```\n\n4. From your code use the Dsql signer to create the password:\n\n ```ts\n import { DsqlSigner } from \"@aws-sdk/dsql-signer\"\n import { Client } from \"pg\"\n\n const region =\n process.env[\"AWS_REGION\"] || process.env[\"AWS_DEFAULT_REGION\"] || \"us-west-2\"\n\n // Generate DSQL auth token using AWS SDK\n const signer = new DsqlSigner({\n hostname: host,\n region,\n })\n\n const authToken = await signer.getDbConnectAuthToken()\n\n const client = new Client({\n host,\n port: 5432,\n user: dbUser,\n database: dbName,\n password: authToken,\n ssl: { rejectUnauthorized: false },\n })\n\n await client.connect()\n ```\n\n# IPv6\n\nIf you use the provider in an IPv6 subnet you probably need these settings:\n\n```ts\nimport { Provider } from \"cdk-rds-sql\"\n\nconst provider = new Provider(this, \"Provider\", {\n ...\n functionProps: {\n\tipv6AllowedForDualStack: true,\n\tallowAllIpv6Outbound: true,\n },\n}\n```\n\n# Disabling SSL\n\nThe default connection to RDS is ssl enabled. You can disable ssl by\nsetting the `ssl` option to `false`:\n\n```ts\nconst provider = new Provider(this, \"Provider\", {\n vpc: vpc,\n instance: instance,\n secret: cluster.secret!,\n ssl: false, // default is true\n})\n```\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 projen integ:deploy:serverless\n\nIf you want to use an existing vpc:\n\n npx cdk deploy --context vpc-id=vpc-0123456789 TestServerlessV2Stack\n\nYou can also test DSQL support with:\n\n npx projen integ:deploy:dsql\n\n# To do\n\n- Update role: will not revoke connect to previous database if database name has changed.\n"
4083
+ "markdown": "# About\n\nThis CDK construct library makes it possible to create databases,\nschemas, and roles in an Aurora Serverless v2, RDS Database Cluster,\nDatabase Instance, or AWS DSQL clusters. PostgreSQL, MySQL, and DSQL\ndatabases 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. For a cluster:\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\nFor an instance:\n\n```ts\nimport { Provider } from \"cdk-rds-sql\"\n\nconst provider = new Provider(this, \"Provider\", {\n vpc: vpc,\n instance: instance,\n secret: cluster.secret!,\n})\n```\n\nThe provider will setup a lambda, which normally lives in the same VPC\nas the database. You can give a different VPC, as long as that VPC has\naccess to the VPC of the database. Only the provider lambda will talk\nto your database.\n\nThe provider will by default use the private isolated subnet of the\nVPC. Your isolated network must have a VPC endpoint to AWS Secrets Manager\nand possibly KMS as well. If you want to use a subnet with egress\naccess in case you have no such VPC endpoints, specify the subnet as\nfollows:\n\n```ts\nimport { Provider } from \"cdk-rds-sql\"\n\nconst provider = new Provider(this, \"Provider\", {\n vpc: vpc,\n vpcSubnets: {\n subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS,\n },\n cluster: cluster,\n secret: cluster.secret!,\n})\n```\n\n## Roles\n\nCreate a postgres role (or mysql user) for a cluster 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\nvalue 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\nIf you want to make the role the owner of a new database, just specify\nthe `databaseName` here, and create the database later.\n\n### IAM Authentication\n\nInstead of password-based authentication, you can create roles that\nuse AWS IAM database authentication. This eliminates the need to store\ndatabase passwords and provides enhanced security through AWS IAM\npolicies.\n\n```ts\nimport { Role } from \"cdk-rds-sql\"\n\nconst iamRole = new Role(this, \"IamRole\", {\n provider: provider,\n roleName: \"myiamrole\",\n databaseName: \"mydb\",\n enableIamAuth: true,\n})\n```\n\nWhen `enableIamAuth` is set to `true`:\n\n- **No secret is created** - the `role.secret` property will be `undefined`\n- The database role is created without a password\n- Your application must generate an IAM authentication token at runtime\n\nThis is the same behavior as DSQL clusters, which always use IAM authentication.\n\n**Requirements for IAM Authentication:**\n\n- SSL connections are required (enabled by default in this library)\n- Your application must have IAM permissions to connect to the database\n- The database user/role name must match the IAM identity\n\n**IAM Policy Example:**\n\nYour application will need an IAM policy like this to connect:\n\n```json\n{\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Effect\": \"Allow\",\n \"Action\": [\"rds-db:connect\"],\n \"Resource\": [\n \"arn:aws:rds-db:region:account-id:dbuser:cluster-resource-id/myiamrole\"\n ]\n }\n ]\n}\n```\n\n**Generating an IAM Authentication Token:**\n\nAt runtime, your application needs to generate an authentication token\nusing the AWS SDK. Here's an example using the AWS SDK for JavaScript:\n\n```ts\nimport { Signer } from \"@aws-sdk/rds-signer\"\nimport { Client } from \"pg\"\n\nconst signer = new Signer({\n hostname: \"your-cluster.cluster-xxxxx.us-east-1.rds.amazonaws.com\",\n port: 5432,\n username: \"myiamrole\",\n region: \"us-east-1\",\n})\n\nconst token = await signer.getAuthToken()\n\nconst client = new Client({\n host: \"your-cluster.cluster-xxxxx.us-east-1.rds.amazonaws.com\",\n port: 5432,\n user: \"myiamrole\",\n database: \"mydb\",\n password: token,\n ssl: { rejectUnauthorized: true },\n})\n\nawait client.connect()\n```\n\nBoth PostgreSQL and MySQL databases support IAM authentication. For more details, see the [AWS RDS IAM Database Authentication documentation](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html).\n\n### MySQL support\n\nIn MySQL users are created with '%' as value for the host. It is hard\nto do this better:\n\n- Determine the CIDR blocks used by a VPC is not trivial.\n- For imported VPCs you cannot specify the IPv6 CIDR.\n- CIDRs might change without the system knowing, meaning applications\n could lose access to the database at random times, such as when a\n container is restarted.\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\nOne may need a role permitted for using schema:\n\n```ts\nnew Schema(this, \"Schema\", {\n provider: provider,\n schemaName: \"myschema\",\n databaseName: database.databaseName,\n role: role,\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\nRollback sql on stack deletion:\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 rollback: `\nDO $$BEGIN\n IF EXISTS (select from pg_database WHERE datname = 't') THEN\n IF EXISTS (select from pg_catalog.pg_roles WHERE rolname = 'myrole') THEN\n revoke select t from myrole;\n END IF;\n drop table t;\n END IF;\nEND$$;\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- When you delete your `Sql` construct the rollback is executed if specified\n- When permission are granted via `Sql` they must be removed via\n rollback to succesfully remove the role\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# Parameters\n\nSome lambda constructs, in particular [Bref](https://bref.sh/), do not\nsupport secrets out of the box. Use the `parameterPrefix` property to\ncreate SSM parameters in addition to a secret:\n\n```ts\nconst role = new Role(this, \"Role\", {\n provider: provider,\n roleName: \"myrole\",\n databaseName: \"mydb\",\n parameterPrefix: \"/my-app/\",\n})\n```\n\nThis will create `/my-app/username`, `/my-app/password` and such.\n\nTo access parameters you will need IAM permissions such as:\n\n```ts\ninitialPolicy: [\n new iam.PolicyStatement({\n\tactions: [\"ssm:GetParameter\", \"ssm:GetParameters\"],\n\tresources: [\n\t // Grant access to all parameters under the base path\n\t `arn:aws:ssm:${this.region}:${this.account}:parameter/my-app/*`,\n\t],\n\teffect: iam.Effect.ALLOW,\n })\n],\n```\n\nNote that your VPC will need an SSM Parameters interface endpoint to support this.\n\n# AWS DSQL Support\n\nThis construct also supports AWS DSQL. DSQL is a great number of\nlimitations around it's postgresql support, so there is some learing\ncurve. This library supports creating roles, schemas, and executing\nSQL on DSQL clusters. Creating databases is not supported by DSQL.\n\n## DSQL Provider Setup\n\nDSQL clusters don't require a VPC or secrets since they use IAM authentication:\n\n```ts\nimport * as dsql from \"aws-cdk-lib/aws-dsql\"\nimport { Provider } from \"cdk-rds-sql\"\n\nconst dsqlCluster = new dsql.CfnCluster(this, \"DsqlCluster\", {\n deletionProtectionEnabled: false,\n})\n\nconst provider = new Provider(this, \"Provider\", {\n cluster: dsqlCluster,\n // No VPC or secret needed for DSQL\n})\n```\n\nYou can access DSQL from within a VPC, but cdk-rds-sql has not been\nspecifically tested with that scenario.\n\n## DSQL Roles\n\nDSQL always uses IAM authentication, so the `enableIamAuth` property is ignored:\n\n```ts\nimport { Role } from \"cdk-rds-sql\"\n\nconst role = new Role(this, \"Role\", {\n provider: provider,\n roleName: \"myrole\",\n})\n```\n\n## Using DSQL\n\nConnecting to DSQL requires a couple of things:\n\n1. Your IAM role needs the `dsql:DbConnect` IAM permission to connect to the cluster.\n2. You probably want a normal postgres role (not \"admin\") to use from your apps.\n3. Your IAM role needs to be connected to your postgres role: use the `IamGrant` construct for that:\n\n ```ts\n new IamGrant(this, \"LambdaIamGrant\", {\n provider: provider,\n roleName: role.roleName,\n resourceArn: queryLambda.role!.roleArn,\n })\n ```\n\n4. From your code use the Dsql signer to create the password:\n\n ```ts\n import { DsqlSigner } from \"@aws-sdk/dsql-signer\"\n import { Client } from \"pg\"\n\n const region =\n process.env[\"AWS_REGION\"] || process.env[\"AWS_DEFAULT_REGION\"] || \"us-west-2\"\n\n // Generate DSQL auth token using AWS SDK\n const signer = new DsqlSigner({\n hostname: host,\n region,\n })\n\n const authToken = await signer.getDbConnectAuthToken()\n\n const client = new Client({\n host,\n port: 5432,\n user: dbUser,\n database: dbName,\n password: authToken,\n ssl: { rejectUnauthorized: false },\n })\n\n await client.connect()\n ```\n\n# IPv6\n\nIf you use the provider in an IPv6 subnet you probably need these settings:\n\n```ts\nimport { Provider } from \"cdk-rds-sql\"\n\nconst provider = new Provider(this, \"Provider\", {\n ...\n functionProps: {\n\tipv6AllowedForDualStack: true,\n\tallowAllIpv6Outbound: true,\n },\n}\n```\n\n# Disabling SSL\n\nThe default connection to RDS is ssl enabled. You can disable ssl by\nsetting the `ssl` option to `false`:\n\n```ts\nconst provider = new Provider(this, \"Provider\", {\n vpc: vpc,\n instance: instance,\n secret: cluster.secret!,\n ssl: false, // default is true\n})\n```\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 projen integ:deploy:serverless\n\nIf you want to use an existing vpc:\n\n npx cdk deploy --context vpc-id=vpc-0123456789 TestServerlessV2Stack\n\nYou can also test DSQL support with:\n\n npx projen integ:deploy:dsql\n\n# To do\n\n- Update role: will not revoke connect to previous database if database name has changed.\n"
4084
4084
  },
4085
4085
  "repository": {
4086
4086
  "type": "git",
@@ -5095,7 +5095,7 @@
5095
5095
  },
5096
5096
  "locationInModule": {
5097
5097
  "filename": "src/role.ts",
5098
- "line": 156
5098
+ "line": 165
5099
5099
  },
5100
5100
  "parameters": [
5101
5101
  {
@@ -5121,7 +5121,7 @@
5121
5121
  "kind": "class",
5122
5122
  "locationInModule": {
5123
5123
  "filename": "src/role.ts",
5124
- "line": 144
5124
+ "line": 147
5125
5125
  },
5126
5126
  "name": "Role",
5127
5127
  "properties": [
@@ -5133,7 +5133,7 @@
5133
5133
  "immutable": true,
5134
5134
  "locationInModule": {
5135
5135
  "filename": "src/role.ts",
5136
- "line": 148
5136
+ "line": 151
5137
5137
  },
5138
5138
  "name": "roleName",
5139
5139
  "type": {
@@ -5142,14 +5142,14 @@
5142
5142
  },
5143
5143
  {
5144
5144
  "docs": {
5145
- "remarks": "Only available for non-DSQL clusters as DSQL uses IAM authentication.",
5145
+ "remarks": "This is only available when:\n- The provider is not a DSQL cluster (DSQL uses IAM authentication)\n- `enableIamAuth` is not set to `true`\n\nWhen using IAM authentication, no secret is created as the password\nis generated dynamically using IAM credentials.",
5146
5146
  "stability": "stable",
5147
- "summary": "The generated secret."
5147
+ "summary": "The generated secret containing connection information and password."
5148
5148
  },
5149
5149
  "immutable": true,
5150
5150
  "locationInModule": {
5151
5151
  "filename": "src/role.ts",
5152
- "line": 154
5152
+ "line": 163
5153
5153
  },
5154
5154
  "name": "secret",
5155
5155
  "optional": true,
@@ -5246,7 +5246,7 @@
5246
5246
  "abstract": true,
5247
5247
  "docs": {
5248
5248
  "default": "false - use password authentication",
5249
- "remarks": "When enabled, the role will be created without a password and\nconfigured for AWS IAM database authentication. The secret\nwill not contain a password field.\n\nNote: For DSQL clusters, this property is ignored as DSQL always\nuses IAM authentication.",
5249
+ "remarks": "When enabled, the role will be created without a password and\nconfigured for AWS IAM database authentication. No secret will\nbe created for this role.\n\nNote: For DSQL clusters, this property is ignored as DSQL always\nuses IAM authentication.",
5250
5250
  "stability": "stable",
5251
5251
  "summary": "Enable IAM authentication for this role."
5252
5252
  },
@@ -5594,6 +5594,6 @@
5594
5594
  "symbolId": "src/sql:SqlProps"
5595
5595
  }
5596
5596
  },
5597
- "version": "7.3.2",
5598
- "fingerprint": "2Nt5HipkT3qGvOwwy3MgCUGWmXl40w4EVbXW8C8dBJo="
5597
+ "version": "8.0.1",
5598
+ "fingerprint": "kd/6afjq9ix4cOJibriTPyWOoG/cXXl1haYdhlC5BVE="
5599
5599
  }
package/README.md CHANGED
@@ -161,18 +161,13 @@ const iamRole = new Role(this, "IamRole", {
161
161
  })
162
162
  ```
163
163
 
164
- For IAM-authenticated roles, the secret will not contain a password field:
164
+ When `enableIamAuth` is set to `true`:
165
165
 
166
- ```json
167
- {
168
- "dbClusterIdentifier": "teststack-clustereb1186t9-sh4wpqfdyfvu",
169
- "dbname": "mydb",
170
- "engine": "postgres",
171
- "port": 5432,
172
- "host": "teststack-clustereb1186t9-sh4wpqfdyfvu.cluster-cgudolabssna.us-east-1.rds.amazonaws.com",
173
- "username": "myiamrole"
174
- }
175
- ```
166
+ - **No secret is created** - the `role.secret` property will be `undefined`
167
+ - The database role is created without a password
168
+ - Your application must generate an IAM authentication token at runtime
169
+
170
+ This is the same behavior as DSQL clusters, which always use IAM authentication.
176
171
 
177
172
  **Requirements for IAM Authentication:**
178
173
 
@@ -199,6 +194,36 @@ Your application will need an IAM policy like this to connect:
199
194
  }
200
195
  ```
201
196
 
197
+ **Generating an IAM Authentication Token:**
198
+
199
+ At runtime, your application needs to generate an authentication token
200
+ using the AWS SDK. Here's an example using the AWS SDK for JavaScript:
201
+
202
+ ```ts
203
+ import { Signer } from "@aws-sdk/rds-signer"
204
+ import { Client } from "pg"
205
+
206
+ const signer = new Signer({
207
+ hostname: "your-cluster.cluster-xxxxx.us-east-1.rds.amazonaws.com",
208
+ port: 5432,
209
+ username: "myiamrole",
210
+ region: "us-east-1",
211
+ })
212
+
213
+ const token = await signer.getAuthToken()
214
+
215
+ const client = new Client({
216
+ host: "your-cluster.cluster-xxxxx.us-east-1.rds.amazonaws.com",
217
+ port: 5432,
218
+ user: "myiamrole",
219
+ database: "mydb",
220
+ password: token,
221
+ ssl: { rejectUnauthorized: true },
222
+ })
223
+
224
+ await client.connect()
225
+ ```
226
+
202
227
  Both PostgreSQL and MySQL databases support IAM authentication. For more details, see the [AWS RDS IAM Database Authentication documentation](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html).
203
228
 
204
229
  ### MySQL support
package/lib/database.js CHANGED
@@ -45,5 +45,5 @@ class Database extends aws_cdk_lib_1.CustomResource {
45
45
  }
46
46
  exports.Database = Database;
47
47
  _a = JSII_RTTI_SYMBOL_1;
48
- Database[_a] = { fqn: "cdk-rds-sql.Database", version: "7.3.2" };
48
+ Database[_a] = { fqn: "cdk-rds-sql.Database", version: "8.0.1" };
49
49
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2Q0FBNEM7QUFDNUMsMkNBQXNDO0FBQ3RDLGlDQUF1QztBQUN2Qyx5Q0FBc0Q7QUEwQnRELE1BQU0sZ0JBQWlCLFNBQVEsc0JBQVM7SUFHdEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUF5QjtRQUNqRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ2hCLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtJQUN4QyxDQUFDO0NBQ0Y7QUFFRCxNQUFhLFFBQVMsU0FBUSw0QkFBYztJQUMxQzs7T0FFRztJQUNILE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFnQixFQUFFLEVBQVUsRUFBRSxZQUFvQjtRQUN4RSxPQUFPLElBQUksZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNyQyxZQUFZLEVBQUUsWUFBWTtTQUMzQixDQUFDLENBQUE7SUFDSixDQUFDO0lBSUQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCw0REFBNEQ7UUFDNUQsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sS0FBSyx5QkFBYyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQ2IscUZBQXFGLENBQ3RGLENBQUE7UUFDSCxDQUFDO1FBRUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxRQUFRO2dCQUNqQyxVQUFVLEVBQUUsS0FBSyxDQUFDLFlBQVk7Z0JBQzlCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLLEVBQUUsUUFBUTthQUM3QjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLENBQUMsWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdEMsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDaEIsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3RDLENBQUM7SUFDSCxDQUFDOztBQWxDSCw0QkFtQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyLCBEYXRhYmFzZUVuZ2luZSB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcbmltcG9ydCB7IFJvbGUgfSBmcm9tIFwiLi9yb2xlXCJcblxuaW50ZXJmYWNlIERhdGFiYXNlQXR0cmlidXRlcyB7XG4gIC8qKlxuICAgKiBOYW1lIG9mIGRhdGFiYXNlIHRvIGNyZWF0ZS5cbiAgICovXG4gIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIGRhdGFiYXNlIG93bmVyLlxuICAgKi9cbiAgcmVhZG9ubHkgb3duZXI/OiBSb2xlXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGF0YWJhc2VQcm9wcyBleHRlbmRzIERhdGFiYXNlQXR0cmlidXRlcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBJUHJvdmlkZXJcbn1cblxuZXhwb3J0IGludGVyZmFjZSBJRGF0YWJhc2Uge1xuICByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xufVxuXG5jbGFzcyBJbXBvcnRlZERhdGFiYXNlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgcHVibGljIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IERhdGFiYXNlQXR0cmlidXRlcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZClcbiAgICB0aGlzLmRhdGFiYXNlTmFtZSA9IHByb3BzLmRhdGFiYXNlTmFtZVxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBEYXRhYmFzZSBleHRlbmRzIEN1c3RvbVJlc291cmNlIGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgLyoqXG4gICAqIFJldHVybiBhIERhdGFiYXNlIGJhc2VkIHVwb24gbmFtZSBvbmx5LiBVc2UgZm9yIGltcG9ydGluZyBleGlzdGluZyBkYXRhYmFzZXMuXG4gICAqL1xuICBzdGF0aWMgZnJvbURhdGFiYXNlTmFtZShzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBkYXRhYmFzZU5hbWU6IHN0cmluZyk6IElEYXRhYmFzZSB7XG4gICAgcmV0dXJuIG5ldyBJbXBvcnRlZERhdGFiYXNlKHNjb3BlLCBpZCwge1xuICAgICAgZGF0YWJhc2VOYW1lOiBkYXRhYmFzZU5hbWUsXG4gICAgfSlcbiAgfVxuXG4gIHB1YmxpYyByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBEYXRhYmFzZVByb3BzKSB7XG4gICAgLy8gQ2hlY2sgaWYgdXNpbmcgRFNRTCBwcm92aWRlciBhbmQgZm9yYmlkIGRhdGFiYXNlIGNyZWF0aW9uXG4gICAgaWYgKHByb3BzLnByb3ZpZGVyLmVuZ2luZSA9PT0gRGF0YWJhc2VFbmdpbmUuRFNRTCkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKFxuICAgICAgICBcIkRhdGFiYXNlIGNyZWF0aW9uIGlzIG5vdCBzdXBwb3J0ZWQgd2l0aCBEU1FMLiBEU1FMIGFsd2F5cyB1c2VzICdwb3N0Z3JlcycgZGF0YWJhc2UuXCJcbiAgICAgIClcbiAgICB9XG5cbiAgICBzdXBlcihzY29wZSwgaWQsIHtcbiAgICAgIHNlcnZpY2VUb2tlbjogcHJvcHMucHJvdmlkZXIuc2VydmljZVRva2VuLFxuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBSZXNvdXJjZTogUmRzU3FsUmVzb3VyY2UuREFUQUJBU0UsXG4gICAgICAgIFJlc291cmNlSWQ6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgLi4uKHByb3BzLnByb3ZpZGVyLnNlY3JldCA/IHsgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuIH0gOiB7fSksXG4gICAgICAgIE93bmVyOiBwcm9wcy5vd25lcj8ucm9sZU5hbWUsXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgICBpZiAocHJvcHMub3duZXIpIHtcbiAgICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLm93bmVyKVxuICAgIH1cbiAgfVxufVxuIl19
@@ -4233,8 +4233,8 @@ var require_split2 = __commonJS({
4233
4233
  "use strict";
4234
4234
  var { Transform } = require("stream");
4235
4235
  var { StringDecoder } = require("string_decoder");
4236
- var kLast = Symbol("last");
4237
- var kDecoder = Symbol("decoder");
4236
+ var kLast = /* @__PURE__ */ Symbol("last");
4237
+ var kDecoder = /* @__PURE__ */ Symbol("decoder");
4238
4238
  function transform(chunk, enc, cb) {
4239
4239
  let list;
4240
4240
  if (this.overflow) {
@@ -17408,7 +17408,7 @@ var require_column_definition = __commonJS({
17408
17408
  decimals: this.decimals
17409
17409
  };
17410
17410
  }
17411
- [Symbol.for("nodejs.util.inspect.custom")](depth, inspectOptions, inspect) {
17411
+ [/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")](depth, inspectOptions, inspect) {
17412
17412
  const Types = require_types();
17413
17413
  const typeNames = [];
17414
17414
  for (const t in Types) {
@@ -18587,6 +18587,7 @@ var require_sha256_password = __commonJS({
18587
18587
  var PLUGIN_NAME = "sha256_password";
18588
18588
  var crypto2 = require("crypto");
18589
18589
  var { xorRotating } = require_auth_41();
18590
+ var Tls = require("tls");
18590
18591
  var REQUEST_SERVER_KEY_PACKET = Buffer.from([1]);
18591
18592
  var STATE_INITIAL = 0;
18592
18593
  var STATE_WAIT_SERVER_KEY = 1;
@@ -18607,6 +18608,9 @@ var require_sha256_password = __commonJS({
18607
18608
  return (data) => {
18608
18609
  switch (state) {
18609
18610
  case STATE_INITIAL:
18611
+ if (connection.stream instanceof Tls.TLSSocket && connection.stream.encrypted === true) {
18612
+ return Buffer.from(`${password}\0`, "utf8");
18613
+ }
18610
18614
  scramble = data.slice(0, 20);
18611
18615
  if (pluginOptions.serverPublicKey) {
18612
18616
  return authWithKey(pluginOptions.serverPublicKey);
@@ -21615,7 +21619,7 @@ var require_package = __commonJS({
21615
21619
  "node_modules/mysql2/package.json"(exports2, module2) {
21616
21620
  module2.exports = {
21617
21621
  name: "mysql2",
21618
- version: "3.14.5",
21622
+ version: "3.16.0",
21619
21623
  description: "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
21620
21624
  main: "index.js",
21621
21625
  typings: "typings/mysql/index",
@@ -21675,7 +21679,7 @@ var require_package = __commonJS({
21675
21679
  "@eslint/eslintrc": "^3.3.0",
21676
21680
  "@eslint/js": "^9.21.0",
21677
21681
  "@eslint/markdown": "^7.0.0",
21678
- "@types/node": "^24.0.0",
21682
+ "@types/node": "^25.0.2",
21679
21683
  "@typescript-eslint/eslint-plugin": "^8.26.0",
21680
21684
  "@typescript-eslint/parser": "^8.26.0",
21681
21685
  "assert-diff": "^3.0.2",
@@ -21931,7 +21935,8 @@ var require_connection_config = __commonJS({
21931
21935
  Promise: 1,
21932
21936
  queueLimit: 1,
21933
21937
  waitForConnections: 1,
21934
- jsonStrings: 1
21938
+ jsonStrings: 1,
21939
+ gracefulEnd: 1
21935
21940
  };
21936
21941
  var ConnectionConfig = class _ConnectionConfig {
21937
21942
  constructor(options) {
@@ -22024,6 +22029,7 @@ var require_connection_config = __commonJS({
22024
22029
  };
22025
22030
  this.maxPreparedStatements = options.maxPreparedStatements || 16e3;
22026
22031
  this.jsonStrings = options.jsonStrings || false;
22032
+ this.gracefulEnd = options.gracefulEnd || false;
22027
22033
  }
22028
22034
  static mergeFlags(default_flags, user_flags) {
22029
22035
  let flags = 0, i;
@@ -23552,7 +23558,7 @@ var require_connection2 = __commonJS({
23552
23558
  });
23553
23559
  const rejectUnauthorized = this.config.ssl.rejectUnauthorized;
23554
23560
  const verifyIdentity = this.config.ssl.verifyIdentity;
23555
- const servername = this.config.host;
23561
+ const servername = Net.isIP(this.config.host) ? void 0 : this.config.host;
23556
23562
  let secureEstablished = false;
23557
23563
  this.stream.removeAllListeners("data");
23558
23564
  const secureSocket = Tls.connect(
@@ -23606,6 +23612,24 @@ var require_connection2 = __commonJS({
23606
23612
  err.code = code || "PROTOCOL_ERROR";
23607
23613
  this.emit("error", err);
23608
23614
  }
23615
+ get state() {
23616
+ if (this._fatalError || this._protocolError) {
23617
+ return "error";
23618
+ }
23619
+ if (this._closing || this.stream && this.stream.destroyed) {
23620
+ return "disconnected";
23621
+ }
23622
+ if (this.authorized) {
23623
+ return "authenticated";
23624
+ }
23625
+ if (this._handshakePacket) {
23626
+ return "connected";
23627
+ }
23628
+ if (this.stream && !this.stream.destroyed) {
23629
+ return "protocol_handshake";
23630
+ }
23631
+ return "disconnected";
23632
+ }
23609
23633
  get fatalError() {
23610
23634
  return this._fatalError;
23611
23635
  }
@@ -24092,6 +24116,11 @@ var require_pool_connection = __commonJS({
24092
24116
  this._pool.releaseConnection(this);
24093
24117
  }
24094
24118
  end() {
24119
+ if (this.config.gracefulEnd) {
24120
+ this._removeFromPool();
24121
+ super.end();
24122
+ return;
24123
+ }
24095
24124
  const err = new Error(
24096
24125
  "Calling conn.end() to release a pooled connection is deprecated. In next version calling conn.end() will be restored to default conn.end() behavior. Use conn.release() instead."
24097
24126
  );
@@ -24617,7 +24646,11 @@ var require_pool = __commonJS({
24617
24646
  this._removeIdleTimeoutConnectionsTimer = setTimeout(() => {
24618
24647
  try {
24619
24648
  while (this._freeConnections.length > this.config.maxIdle || this._freeConnections.length > 0 && Date.now() - this._freeConnections.get(0).lastActiveTime > this.config.idleTimeout) {
24620
- this._freeConnections.get(0).destroy();
24649
+ if (this.config.connectionConfig.gracefulEnd) {
24650
+ this._freeConnections.get(0).end();
24651
+ } else {
24652
+ this._freeConnections.get(0).destroy();
24653
+ }
24621
24654
  }
24622
24655
  } finally {
24623
24656
  this._removeIdleTimeoutConnections();
package/lib/iam-grant.js CHANGED
@@ -26,5 +26,5 @@ class IamGrant extends aws_cdk_lib_1.CustomResource {
26
26
  }
27
27
  exports.IamGrant = IamGrant;
28
28
  _a = JSII_RTTI_SYMBOL_1;
29
- IamGrant[_a] = { fqn: "cdk-rds-sql.IamGrant", version: "7.3.2" };
29
+ IamGrant[_a] = { fqn: "cdk-rds-sql.IamGrant", version: "8.0.1" };
30
30
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWdyYW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2lhbS1ncmFudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUU1QyxpQ0FBdUM7QUFDdkMseUNBQXNEO0FBbUJ0RCxNQUFhLFFBQVMsU0FBUSw0QkFBYztJQUMxQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQW9CO1FBQzVELHdDQUF3QztRQUN4QyxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLHlCQUFjLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEQsTUFBTSxJQUFJLEtBQUssQ0FDYixnSEFBZ0gsQ0FDakgsQ0FBQTtRQUNILENBQUM7UUFFRCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsWUFBWSxFQUFFLHNCQUFzQjtZQUNwQyxVQUFVLEVBQUU7Z0JBQ1YsUUFBUSxFQUFFLHFCQUFjLENBQUMsU0FBUztnQkFDbEMsUUFBUSxFQUFFLEtBQUssQ0FBQyxRQUFRO2dCQUN4QixXQUFXLEVBQUUsS0FBSyxDQUFDLFdBQVc7YUFDL0I7U0FDRixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDekMsQ0FBQzs7QUFuQkgsNEJBb0JDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIlxuaW1wb3J0IHsgUmRzU3FsUmVzb3VyY2UgfSBmcm9tIFwiLi9lbnVtXCJcbmltcG9ydCB7IElQcm92aWRlciwgRGF0YWJhc2VFbmdpbmUgfSBmcm9tIFwiLi9wcm92aWRlclwiXG5cbmV4cG9ydCBpbnRlcmZhY2UgSWFtR3JhbnRQcm9wcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBJUHJvdmlkZXJcblxuICAvKipcbiAgICogRGF0YWJhc2Ugcm9sZSBuYW1lIHRvIGdyYW50IElBTSBhY2Nlc3MgdG8uXG4gICAqL1xuICByZWFkb25seSByb2xlTmFtZTogc3RyaW5nXG5cbiAgLyoqXG4gICAqIElBTSByZXNvdXJjZSBBUk4gKHJvbGUsIHVzZXIsIG9yIG90aGVyIElBTSBwcmluY2lwYWwpLlxuICAgKi9cbiAgcmVhZG9ubHkgcmVzb3VyY2VBcm46IHN0cmluZ1xufVxuXG5leHBvcnQgY2xhc3MgSWFtR3JhbnQgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBJYW1HcmFudFByb3BzKSB7XG4gICAgLy8gSUFNIGdyYW50cyBhcmUgb25seSBzdXBwb3J0ZWQgb24gRFNRTFxuICAgIGlmIChwcm9wcy5wcm92aWRlci5lbmdpbmUgIT09IERhdGFiYXNlRW5naW5lLkRTUUwpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihcbiAgICAgICAgXCJJQU0gZ3JhbnRzIGFyZSBvbmx5IHN1cHBvcnRlZCB3aXRoIERTUUwgY2x1c3RlcnMuIFVzZSByZWd1bGFyIGRhdGFiYXNlIGF1dGhlbnRpY2F0aW9uIGZvciBSRFMvQXVyb3JhIGNsdXN0ZXJzLlwiXG4gICAgICApXG4gICAgfVxuXG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3BzLnByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHJlc291cmNlVHlwZTogXCJDdXN0b206OkRzcWxJYW1HcmFudFwiLFxuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBSZXNvdXJjZTogUmRzU3FsUmVzb3VyY2UuSUFNX0dSQU5ULFxuICAgICAgICBSb2xlTmFtZTogcHJvcHMucm9sZU5hbWUsXG4gICAgICAgIFJlc291cmNlQXJuOiBwcm9wcy5yZXNvdXJjZUFybixcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgfVxufVxuIl19
package/lib/provider.js CHANGED
@@ -209,7 +209,7 @@ class Provider extends constructs_1.Construct {
209
209
  }
210
210
  exports.Provider = Provider;
211
211
  _a = JSII_RTTI_SYMBOL_1;
212
- Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "7.3.2" };
212
+ Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "8.0.1" };
213
213
  class ImportedProvider extends constructs_1.Construct {
214
214
  constructor(scope, id, attrs) {
215
215
  super(scope, id);
package/lib/role.d.ts CHANGED
@@ -62,8 +62,8 @@ export interface RoleProps {
62
62
  * Enable IAM authentication for this role.
63
63
  *
64
64
  * When enabled, the role will be created without a password and
65
- * configured for AWS IAM database authentication. The secret
66
- * will not contain a password field.
65
+ * configured for AWS IAM database authentication. No secret will
66
+ * be created for this role.
67
67
  *
68
68
  * Note: For DSQL clusters, this property is ignored as DSQL always
69
69
  * uses IAM authentication.
@@ -78,8 +78,14 @@ export declare class Role extends Construct {
78
78
  */
79
79
  readonly roleName: string;
80
80
  /**
81
- * The generated secret.
82
- * Only available for non-DSQL clusters as DSQL uses IAM authentication.
81
+ * The generated secret containing connection information and password.
82
+ *
83
+ * This is only available when:
84
+ * - The provider is not a DSQL cluster (DSQL uses IAM authentication)
85
+ * - `enableIamAuth` is not set to `true`
86
+ *
87
+ * When using IAM authentication, no secret is created as the password
88
+ * is generated dynamically using IAM credentials.
83
89
  */
84
90
  readonly secret?: ISecret;
85
91
  constructor(scope: Construct, id: string, props: RoleProps);
package/lib/role.js CHANGED
@@ -25,22 +25,25 @@ class Parameters extends constructs_1.Construct {
25
25
  }
26
26
  });
27
27
  // For password, use the existing provider to store it in SSM
28
- const passwordParameterName = `${props.parameterPrefix}password`;
29
- const password_parameter = new aws_cdk_lib_1.CustomResource(this, "PasswordParameter", {
30
- serviceToken: props.providerServiceToken,
31
- properties: {
32
- SecretArn: props.secretArn,
33
- Resource: enum_1.RdsSqlResource.PARAMETER_PASSWORD,
34
- PasswordArn: props.passwordArn,
35
- ParameterName: passwordParameterName,
36
- },
37
- });
38
- password_parameter.node.addDependency(props.provider);
39
- const paramArn = `arn:aws:ssm:${aws_cdk_lib_1.Stack.of(this).region}:${aws_cdk_lib_1.Stack.of(this).account}:parameter${passwordParameterName.startsWith("/") ? "" : "/"}${passwordParameterName}`;
40
- props.provider.handler.addToRolePolicy(new iam.PolicyStatement({
41
- actions: ["ssm:PutParameter", "ssm:AddTagsToResource", "ssm:GetParameters"],
42
- resources: [paramArn],
43
- }));
28
+ // Skip password parameter for IAM auth roles (no passwordArn)
29
+ if (props.passwordArn) {
30
+ const passwordParameterName = `${props.parameterPrefix}password`;
31
+ const password_parameter = new aws_cdk_lib_1.CustomResource(this, "PasswordParameter", {
32
+ serviceToken: props.providerServiceToken,
33
+ properties: {
34
+ SecretArn: props.secretArn,
35
+ Resource: enum_1.RdsSqlResource.PARAMETER_PASSWORD,
36
+ PasswordArn: props.passwordArn,
37
+ ParameterName: passwordParameterName,
38
+ },
39
+ });
40
+ password_parameter.node.addDependency(props.provider);
41
+ const paramArn = `arn:aws:ssm:${aws_cdk_lib_1.Stack.of(this).region}:${aws_cdk_lib_1.Stack.of(this).account}:parameter${passwordParameterName.startsWith("/") ? "" : "/"}${passwordParameterName}`;
42
+ props.provider.handler.addToRolePolicy(new iam.PolicyStatement({
43
+ actions: ["ssm:PutParameter", "ssm:AddTagsToResource", "ssm:GetParameters"],
44
+ resources: [paramArn],
45
+ }));
46
+ }
44
47
  }
45
48
  }
46
49
  class Role extends constructs_1.Construct {
@@ -57,7 +60,9 @@ class Role extends constructs_1.Construct {
57
60
  }
58
61
  }
59
62
  super(scope, id);
60
- // DSQL doesn't use secrets - it always uses IAM authentication
63
+ // Skip secret creation for DSQL (always uses IAM auth) or when enableIamAuth is true
64
+ const useIamAuth = props.enableIamAuth || props.provider.engine === provider_1.DatabaseEngine.DSQL;
65
+ // For non-DSQL providers, we need cluster info for secrets and/or parameters
61
66
  if (props.provider.engine !== provider_1.DatabaseEngine.DSQL) {
62
67
  // For imported providers without cluster details, provide helpful error message
63
68
  if (!props.provider.cluster) {
@@ -75,35 +80,33 @@ class Role extends constructs_1.Construct {
75
80
  const identifier = props.provider.cluster.clusterIdentifier
76
81
  ? props.provider.cluster.clusterIdentifier
77
82
  : props.provider.cluster.instanceIdentifier;
78
- const secretTemplate = {
79
- dbClusterIdentifier: identifier,
80
- engine: props.provider.engine,
81
- host: host,
82
- port: port,
83
- username: props.roleName,
84
- dbname: props.database ? props.database.databaseName : props.databaseName,
85
- };
86
- this.secret = new aws_secretsmanager_1.Secret(this, "Secret", {
87
- secretName: props.secretName,
88
- encryptionKey: props.encryptionKey,
89
- description: `Generated secret for ${props.provider.engine} role ${props.roleName}`,
90
- ...(props.enableIamAuth
91
- ? {
92
- // For IAM auth, create secret without password generation
83
+ const databaseName = props.database
84
+ ? props.database.databaseName
85
+ : props.databaseName;
86
+ // Create secret only for password auth (not IAM auth)
87
+ if (!useIamAuth) {
88
+ const secretTemplate = {
89
+ dbClusterIdentifier: identifier,
90
+ engine: props.provider.engine,
91
+ host: host,
92
+ port: port,
93
+ username: props.roleName,
94
+ dbname: databaseName,
95
+ };
96
+ this.secret = new aws_secretsmanager_1.Secret(this, "Secret", {
97
+ secretName: props.secretName,
98
+ encryptionKey: props.encryptionKey,
99
+ description: `Generated secret for ${props.provider.engine} role ${props.roleName}`,
100
+ generateSecretString: {
101
+ passwordLength: 30, // Oracle password cannot have more than 30 characters
93
102
  secretStringTemplate: JSON.stringify(secretTemplate),
94
- }
95
- : {
96
- // For password auth, generate password
97
- generateSecretString: {
98
- passwordLength: 30, // Oracle password cannot have more than 30 characters
99
- secretStringTemplate: JSON.stringify(secretTemplate),
100
- generateStringKey: "password",
101
- excludeCharacters: " %+~`#$&*()|[]{}:;<>?!'/@\"\\",
102
- },
103
- }),
104
- removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
105
- });
106
- // Create Parameters if parameterPrefix is provided
103
+ generateStringKey: "password",
104
+ excludeCharacters: " %+~`#$&*()|[]{}:;<>?!'/@\"\\",
105
+ },
106
+ removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
107
+ });
108
+ }
109
+ // Create Parameters if parameterPrefix is provided (for both password and IAM auth)
107
110
  if (props.parameterPrefix) {
108
111
  const paramData = {
109
112
  dbClusterIdentifier: identifier,
@@ -111,12 +114,14 @@ class Role extends constructs_1.Construct {
111
114
  host: host,
112
115
  port: port,
113
116
  username: props.roleName,
114
- dbname: props.database ? props.database.databaseName : props.databaseName,
115
117
  };
118
+ if (databaseName) {
119
+ paramData.dbname = databaseName;
120
+ }
116
121
  new Parameters(this, "Parameters", {
117
122
  secretArn: props.provider.secret?.secretArn || "",
118
123
  parameterPrefix: props.parameterPrefix,
119
- passwordArn: props.enableIamAuth ? "" : this.secret.secretArn,
124
+ passwordArn: this.secret?.secretArn, // undefined for IAM auth - skips password param
120
125
  providerServiceToken: props.provider.serviceToken,
121
126
  provider: props.provider,
122
127
  paramData,
@@ -126,12 +131,10 @@ class Role extends constructs_1.Construct {
126
131
  const role = new role_custom_resource_1.Role(this, "PostgresRole", {
127
132
  provider: props.provider,
128
133
  roleName: props.roleName,
129
- passwordArn: props.enableIamAuth || props.provider.engine === provider_1.DatabaseEngine.DSQL
130
- ? ""
131
- : this.secret.secretArn,
134
+ passwordArn: useIamAuth ? "" : this.secret.secretArn,
132
135
  database: props.database,
133
136
  databaseName: props.databaseName,
134
- enableIamAuth: props.enableIamAuth || props.provider.engine === provider_1.DatabaseEngine.DSQL,
137
+ enableIamAuth: useIamAuth,
135
138
  });
136
139
  if (this.secret) {
137
140
  role.node.addDependency(this.secret);
@@ -146,5 +149,5 @@ class Role extends constructs_1.Construct {
146
149
  }
147
150
  exports.Role = Role;
148
151
  _a = JSII_RTTI_SYMBOL_1;
149
- Role[_a] = { fqn: "cdk-rds-sql.Role", version: "7.3.2" };
150
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"role.js","sourceRoot":"","sources":["../src/role.ts"],"names":[],"mappings":"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","sourcesContent":["import { CustomResource, RemovalPolicy, Stack } from \"aws-cdk-lib\"\nimport * as iam from \"aws-cdk-lib/aws-iam\"\nimport * as kms from \"aws-cdk-lib/aws-kms\"\nimport { IDatabaseCluster, IDatabaseInstance } from \"aws-cdk-lib/aws-rds\"\nimport { ISecret, Secret } from \"aws-cdk-lib/aws-secretsmanager\"\nimport * as ssm from \"aws-cdk-lib/aws-ssm\"\nimport { Construct } from \"constructs\"\nimport { IDatabase } from \"./database\"\nimport { RdsSqlResource } from \"./enum\"\nimport { IProvider, DatabaseEngine } from \"./provider\"\nimport { Role as CustomResourceRole } from \"./role.custom-resource\"\n\nexport interface RoleProps {\n  /**\n   * Provider.\n   */\n  readonly provider: IProvider\n\n  /**\n   * SQL.\n   */\n  readonly roleName: string\n\n  /**\n   * Optional database this user is expected to use.\n   *\n   * If the database exists, connect privileges are granted.\n   *\n   * Specify one of `database` or `databaseName`. This is the name\n   * that will be stored in the role's secret as the database name to\n   * use.\n   */\n  readonly database?: IDatabase\n\n  /**\n   * Optional database name this user is expected to use.\n   *\n   * If the database exists, connect privileges are granted.\n   *\n   * Specify one of `database` or `databaseName`. This is the name\n   * that will be stored in the role's secret as the database name to\n   * use.\n   */\n  readonly databaseName?: string\n\n  /**\n   * A new secret is created for this user.\n   *\n   * Optionally encrypt it with the given key.\n   */\n  readonly encryptionKey?: kms.IKey\n\n  /**\n   * A new secret is created for this user.\n   *\n   * Optionally add secret name to the secret.\n   */\n  readonly secretName?: string\n\n  /**\n   * Prefix for SSM parameters to store credentials in Parameter Store.\n   * When defined, credentials will also be stored as parameters.\n   *\n   * The parameter names such as \"password\" is simply appended to\n   * `parameterPrefix`, so make sure the prefix ends with a slash if\n   *  you have your parameter names slash separated.\n   *\n   * Note that the password from the secret is copied just once, they\n   * are not kept in sync.\n   *\n   * @default - credentials are only stored in Secrets Manager\n   */\n  readonly parameterPrefix?: string\n\n  /**\n   * Enable IAM authentication for this role.\n   *\n   * When enabled, the role will be created without a password and\n   * configured for AWS IAM database authentication. The secret\n   * will not contain a password field.\n   *\n   * Note: For DSQL clusters, this property is ignored as DSQL always\n   * uses IAM authentication.\n   *\n   * @default false - use password authentication\n   */\n  readonly enableIamAuth?: boolean\n}\n\n// Private Parameters construct (not exported)\nclass Parameters extends Construct {\n  constructor(\n    scope: Construct,\n    id: string,\n    props: {\n      provider: IProvider\n      secretArn: string\n      parameterPrefix: string\n      passwordArn: string\n      providerServiceToken: string\n      paramData: Record<string, any>\n    }\n  ) {\n    super(scope, id)\n\n    // Create parameters for each key-value pair\n    Object.entries(props.paramData).forEach(([key, value]) => {\n      if (value !== undefined) {\n        new ssm.StringParameter(this, `Parameter-${key}`, {\n          parameterName: `${props.parameterPrefix}${key}`,\n          stringValue: value.toString(),\n        })\n      }\n    })\n\n    // For password, use the existing provider to store it in SSM\n    const passwordParameterName = `${props.parameterPrefix}password`\n    const password_parameter = new CustomResource(this, \"PasswordParameter\", {\n      serviceToken: props.providerServiceToken,\n      properties: {\n        SecretArn: props.secretArn,\n        Resource: RdsSqlResource.PARAMETER_PASSWORD,\n        PasswordArn: props.passwordArn,\n        ParameterName: passwordParameterName,\n      },\n    })\n    password_parameter.node.addDependency(props.provider)\n\n    const paramArn = `arn:aws:ssm:${Stack.of(this).region}:${\n      Stack.of(this).account\n    }:parameter${\n      passwordParameterName.startsWith(\"/\") ? \"\" : \"/\"\n    }${passwordParameterName}`\n\n    props.provider.handler.addToRolePolicy(\n      new iam.PolicyStatement({\n        actions: [\"ssm:PutParameter\", \"ssm:AddTagsToResource\", \"ssm:GetParameters\"],\n        resources: [paramArn],\n      })\n    )\n  }\n}\n\nexport class Role extends Construct {\n  /**\n   * The role name.\n   */\n  public readonly roleName: string\n\n  /**\n   * The generated secret.\n   * Only available for non-DSQL clusters as DSQL uses IAM authentication.\n   */\n  public readonly secret?: ISecret\n\n  constructor(scope: Construct, id: string, props: RoleProps) {\n    if (props.provider.engine !== DatabaseEngine.DSQL) {\n      if (props.database && props.databaseName) {\n        throw \"Specify either database or databaseName\"\n      }\n      if (!props.database && !props.databaseName) {\n        // If neither is specified, we might need a default or throw an error depending on desired behavior.\n        // For now, let's assume it's allowed but the secret won't have a dbname.\n        // If it should be required, uncomment the line below:\n        throw \"Specify either database or databaseName\"\n      }\n    }\n    super(scope, id)\n\n    // DSQL doesn't use secrets - it always uses IAM authentication\n    if (props.provider.engine !== DatabaseEngine.DSQL) {\n      // For imported providers without cluster details, provide helpful error message\n      if (!props.provider.cluster) {\n        throw new Error(\n          \"Role creation requires cluster information. When importing a provider with \" +\n            \"Provider.fromProviderAttributes(), include the 'cluster' property if you plan \" +\n            \"to create new roles. Alternatively, use existing roles created with the original provider.\"\n        )\n      }\n\n      // For RDS/Aurora clusters and instances, get endpoint details\n      const host = (props.provider.cluster as IDatabaseCluster).clusterEndpoint\n        ? (props.provider.cluster as IDatabaseCluster).clusterEndpoint.hostname\n        : (props.provider.cluster as IDatabaseInstance).instanceEndpoint.hostname\n\n      const port = (props.provider.cluster as IDatabaseCluster).clusterEndpoint\n        ? (props.provider.cluster as IDatabaseCluster).clusterEndpoint.port\n        : (props.provider.cluster as IDatabaseInstance).instanceEndpoint.port\n\n      const identifier = (props.provider.cluster as IDatabaseCluster).clusterIdentifier\n        ? (props.provider.cluster as IDatabaseCluster).clusterIdentifier\n        : (props.provider.cluster as IDatabaseInstance).instanceIdentifier\n\n      const secretTemplate = {\n        dbClusterIdentifier: identifier,\n        engine: props.provider.engine,\n        host: host,\n        port: port,\n        username: props.roleName,\n        dbname: props.database ? props.database.databaseName : props.databaseName,\n      }\n\n      this.secret = new Secret(this, \"Secret\", {\n        secretName: props.secretName,\n        encryptionKey: props.encryptionKey,\n        description: `Generated secret for ${props.provider.engine} role ${props.roleName}`,\n        ...(props.enableIamAuth\n          ? {\n              // For IAM auth, create secret without password generation\n              secretStringTemplate: JSON.stringify(secretTemplate),\n            }\n          : {\n              // For password auth, generate password\n              generateSecretString: {\n                passwordLength: 30, // Oracle password cannot have more than 30 characters\n                secretStringTemplate: JSON.stringify(secretTemplate),\n                generateStringKey: \"password\",\n                excludeCharacters: \" %+~`#$&*()|[]{}:;<>?!'/@\\\"\\\\\",\n              },\n            }),\n        removalPolicy: RemovalPolicy.DESTROY,\n      })\n\n      // Create Parameters if parameterPrefix is provided\n      if (props.parameterPrefix) {\n        const paramData = {\n          dbClusterIdentifier: identifier,\n          engine: props.provider.engine,\n          host: host,\n          port: port,\n          username: props.roleName,\n          dbname: props.database ? props.database.databaseName : props.databaseName,\n        }\n\n        new Parameters(this, \"Parameters\", {\n          secretArn: props.provider.secret?.secretArn || \"\",\n          parameterPrefix: props.parameterPrefix,\n          passwordArn: props.enableIamAuth ? \"\" : this.secret.secretArn,\n          providerServiceToken: props.provider.serviceToken,\n          provider: props.provider,\n          paramData,\n        })\n      }\n    }\n\n    const role = new CustomResourceRole(this, \"PostgresRole\", {\n      provider: props.provider,\n      roleName: props.roleName,\n      passwordArn:\n        props.enableIamAuth || props.provider.engine === DatabaseEngine.DSQL\n          ? \"\"\n          : this.secret!.secretArn,\n      database: props.database,\n      databaseName: props.databaseName,\n      enableIamAuth: props.enableIamAuth || props.provider.engine === DatabaseEngine.DSQL,\n    })\n\n    if (this.secret) {\n      role.node.addDependency(this.secret)\n      this.secret.grantRead(props.provider.handler)\n      if (this.secret.encryptionKey) {\n        // It seems we need to grant explicit permission\n        this.secret.encryptionKey.grantDecrypt(props.provider.handler)\n      }\n    }\n\n    this.roleName = props.roleName\n  }\n}\n"]}
152
+ Role[_a] = { fqn: "cdk-rds-sql.Role", version: "8.0.1" };
153
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"role.js","sourceRoot":"","sources":["../src/role.ts"],"names":[],"mappings":"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","sourcesContent":["import { CustomResource, RemovalPolicy, Stack } from \"aws-cdk-lib\"\nimport * as iam from \"aws-cdk-lib/aws-iam\"\nimport * as kms from \"aws-cdk-lib/aws-kms\"\nimport { IDatabaseCluster, IDatabaseInstance } from \"aws-cdk-lib/aws-rds\"\nimport { ISecret, Secret } from \"aws-cdk-lib/aws-secretsmanager\"\nimport * as ssm from \"aws-cdk-lib/aws-ssm\"\nimport { Construct } from \"constructs\"\nimport { IDatabase } from \"./database\"\nimport { RdsSqlResource } from \"./enum\"\nimport { IProvider, DatabaseEngine } from \"./provider\"\nimport { Role as CustomResourceRole } from \"./role.custom-resource\"\n\nexport interface RoleProps {\n  /**\n   * Provider.\n   */\n  readonly provider: IProvider\n\n  /**\n   * SQL.\n   */\n  readonly roleName: string\n\n  /**\n   * Optional database this user is expected to use.\n   *\n   * If the database exists, connect privileges are granted.\n   *\n   * Specify one of `database` or `databaseName`. This is the name\n   * that will be stored in the role's secret as the database name to\n   * use.\n   */\n  readonly database?: IDatabase\n\n  /**\n   * Optional database name this user is expected to use.\n   *\n   * If the database exists, connect privileges are granted.\n   *\n   * Specify one of `database` or `databaseName`. This is the name\n   * that will be stored in the role's secret as the database name to\n   * use.\n   */\n  readonly databaseName?: string\n\n  /**\n   * A new secret is created for this user.\n   *\n   * Optionally encrypt it with the given key.\n   */\n  readonly encryptionKey?: kms.IKey\n\n  /**\n   * A new secret is created for this user.\n   *\n   * Optionally add secret name to the secret.\n   */\n  readonly secretName?: string\n\n  /**\n   * Prefix for SSM parameters to store credentials in Parameter Store.\n   * When defined, credentials will also be stored as parameters.\n   *\n   * The parameter names such as \"password\" is simply appended to\n   * `parameterPrefix`, so make sure the prefix ends with a slash if\n   *  you have your parameter names slash separated.\n   *\n   * Note that the password from the secret is copied just once, they\n   * are not kept in sync.\n   *\n   * @default - credentials are only stored in Secrets Manager\n   */\n  readonly parameterPrefix?: string\n\n  /**\n   * Enable IAM authentication for this role.\n   *\n   * When enabled, the role will be created without a password and\n   * configured for AWS IAM database authentication. No secret will\n   * be created for this role.\n   *\n   * Note: For DSQL clusters, this property is ignored as DSQL always\n   * uses IAM authentication.\n   *\n   * @default false - use password authentication\n   */\n  readonly enableIamAuth?: boolean\n}\n\n// Private Parameters construct (not exported)\nclass Parameters extends Construct {\n  constructor(\n    scope: Construct,\n    id: string,\n    props: {\n      provider: IProvider\n      secretArn: string\n      parameterPrefix: string\n      passwordArn?: string\n      providerServiceToken: string\n      paramData: Record<string, string | number>\n    }\n  ) {\n    super(scope, id)\n\n    // Create parameters for each key-value pair\n    Object.entries(props.paramData).forEach(([key, value]) => {\n      if (value !== undefined) {\n        new ssm.StringParameter(this, `Parameter-${key}`, {\n          parameterName: `${props.parameterPrefix}${key}`,\n          stringValue: value.toString(),\n        })\n      }\n    })\n\n    // For password, use the existing provider to store it in SSM\n    // Skip password parameter for IAM auth roles (no passwordArn)\n    if (props.passwordArn) {\n      const passwordParameterName = `${props.parameterPrefix}password`\n      const password_parameter = new CustomResource(this, \"PasswordParameter\", {\n        serviceToken: props.providerServiceToken,\n        properties: {\n          SecretArn: props.secretArn,\n          Resource: RdsSqlResource.PARAMETER_PASSWORD,\n          PasswordArn: props.passwordArn,\n          ParameterName: passwordParameterName,\n        },\n      })\n      password_parameter.node.addDependency(props.provider)\n\n      const paramArn = `arn:aws:ssm:${Stack.of(this).region}:${\n        Stack.of(this).account\n      }:parameter${\n        passwordParameterName.startsWith(\"/\") ? \"\" : \"/\"\n      }${passwordParameterName}`\n\n      props.provider.handler.addToRolePolicy(\n        new iam.PolicyStatement({\n          actions: [\"ssm:PutParameter\", \"ssm:AddTagsToResource\", \"ssm:GetParameters\"],\n          resources: [paramArn],\n        })\n      )\n    }\n  }\n}\n\nexport class Role extends Construct {\n  /**\n   * The role name.\n   */\n  public readonly roleName: string\n\n  /**\n   * The generated secret containing connection information and password.\n   *\n   * This is only available when:\n   * - The provider is not a DSQL cluster (DSQL uses IAM authentication)\n   * - `enableIamAuth` is not set to `true`\n   *\n   * When using IAM authentication, no secret is created as the password\n   * is generated dynamically using IAM credentials.\n   */\n  public readonly secret?: ISecret\n\n  constructor(scope: Construct, id: string, props: RoleProps) {\n    if (props.provider.engine !== DatabaseEngine.DSQL) {\n      if (props.database && props.databaseName) {\n        throw \"Specify either database or databaseName\"\n      }\n      if (!props.database && !props.databaseName) {\n        // If neither is specified, we might need a default or throw an error depending on desired behavior.\n        // For now, let's assume it's allowed but the secret won't have a dbname.\n        // If it should be required, uncomment the line below:\n        throw \"Specify either database or databaseName\"\n      }\n    }\n    super(scope, id)\n\n    // Skip secret creation for DSQL (always uses IAM auth) or when enableIamAuth is true\n    const useIamAuth =\n      props.enableIamAuth || props.provider.engine === DatabaseEngine.DSQL\n\n    // For non-DSQL providers, we need cluster info for secrets and/or parameters\n    if (props.provider.engine !== DatabaseEngine.DSQL) {\n      // For imported providers without cluster details, provide helpful error message\n      if (!props.provider.cluster) {\n        throw new Error(\n          \"Role creation requires cluster information. When importing a provider with \" +\n            \"Provider.fromProviderAttributes(), include the 'cluster' property if you plan \" +\n            \"to create new roles. Alternatively, use existing roles created with the original provider.\"\n        )\n      }\n\n      // For RDS/Aurora clusters and instances, get endpoint details\n      const host = (props.provider.cluster as IDatabaseCluster).clusterEndpoint\n        ? (props.provider.cluster as IDatabaseCluster).clusterEndpoint.hostname\n        : (props.provider.cluster as IDatabaseInstance).instanceEndpoint.hostname\n\n      const port = (props.provider.cluster as IDatabaseCluster).clusterEndpoint\n        ? (props.provider.cluster as IDatabaseCluster).clusterEndpoint.port\n        : (props.provider.cluster as IDatabaseInstance).instanceEndpoint.port\n\n      const identifier = (props.provider.cluster as IDatabaseCluster).clusterIdentifier\n        ? (props.provider.cluster as IDatabaseCluster).clusterIdentifier\n        : (props.provider.cluster as IDatabaseInstance).instanceIdentifier\n\n      const databaseName = props.database\n        ? props.database.databaseName\n        : props.databaseName\n\n      // Create secret only for password auth (not IAM auth)\n      if (!useIamAuth) {\n        const secretTemplate = {\n          dbClusterIdentifier: identifier,\n          engine: props.provider.engine,\n          host: host,\n          port: port,\n          username: props.roleName,\n          dbname: databaseName,\n        }\n\n        this.secret = new Secret(this, \"Secret\", {\n          secretName: props.secretName,\n          encryptionKey: props.encryptionKey,\n          description: `Generated secret for ${props.provider.engine} role ${props.roleName}`,\n          generateSecretString: {\n            passwordLength: 30, // Oracle password cannot have more than 30 characters\n            secretStringTemplate: JSON.stringify(secretTemplate),\n            generateStringKey: \"password\",\n            excludeCharacters: \" %+~`#$&*()|[]{}:;<>?!'/@\\\"\\\\\",\n          },\n          removalPolicy: RemovalPolicy.DESTROY,\n        })\n      }\n\n      // Create Parameters if parameterPrefix is provided (for both password and IAM auth)\n      if (props.parameterPrefix) {\n        const paramData: Record<string, string | number> = {\n          dbClusterIdentifier: identifier,\n          engine: props.provider.engine,\n          host: host,\n          port: port,\n          username: props.roleName,\n        }\n        if (databaseName) {\n          paramData.dbname = databaseName\n        }\n\n        new Parameters(this, \"Parameters\", {\n          secretArn: props.provider.secret?.secretArn || \"\",\n          parameterPrefix: props.parameterPrefix,\n          passwordArn: this.secret?.secretArn, // undefined for IAM auth - skips password param\n          providerServiceToken: props.provider.serviceToken,\n          provider: props.provider,\n          paramData,\n        })\n      }\n    }\n\n    const role = new CustomResourceRole(this, \"PostgresRole\", {\n      provider: props.provider,\n      roleName: props.roleName,\n      passwordArn: useIamAuth ? \"\" : this.secret!.secretArn,\n      database: props.database,\n      databaseName: props.databaseName,\n      enableIamAuth: useIamAuth,\n    })\n\n    if (this.secret) {\n      role.node.addDependency(this.secret)\n      this.secret.grantRead(props.provider.handler)\n      if (this.secret.encryptionKey) {\n        // It seems we need to grant explicit permission\n        this.secret.encryptionKey.grantDecrypt(props.provider.handler)\n      }\n    }\n\n    this.roleName = props.roleName\n  }\n}\n"]}
package/lib/schema.js CHANGED
@@ -27,5 +27,5 @@ class Schema extends aws_cdk_lib_1.CustomResource {
27
27
  }
28
28
  exports.Schema = Schema;
29
29
  _a = JSII_RTTI_SYMBOL_1;
30
- Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "7.3.2" };
30
+ Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "8.0.1" };
31
31
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUE4QnZDLE1BQWEsTUFBTyxTQUFRLDRCQUFjO0lBR3hDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBa0I7UUFDMUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxNQUFNO2dCQUMvQixVQUFVLEVBQUUsS0FBSyxDQUFDLFVBQVU7Z0JBQzVCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsWUFBWSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxTQUFTO2dCQUN0RSxRQUFRLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLFNBQVM7YUFDdkQ7U0FDRixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDdkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFBO1FBQ2xDLElBQUksS0FBSyxDQUFDLFFBQVE7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDM0QsSUFBSSxLQUFLLENBQUMsSUFBSTtZQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNyRCxDQUFDOztBQWxCSCx3QkFtQkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuaW1wb3J0IHsgUm9sZSB9IGZyb20gXCIuL3JvbGVcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNjaGVtYVByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU2NoZW1hIG5hbWUuXG4gICAqL1xuICByZWFkb25seSBzY2hlbWFOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogT3B0aW9uYWwgcm9sZSB3aGljaCB3aWxsIGJlIGdyYW50ZWQgdXNhZ2UgYW5kIGNyZWF0ZSBwZXJtaXNzaW9uc1xuICAgKiB0byB0aGlzIHNjaGVtYS4gVGhpcyB3YXkgdGhlIHJvbGUgY2FuIHJlYWQgaXRzIG93biB0YWJsZXMsIGJ1dFxuICAgKiBjYW5ub3Qgc2VlIG9yIGFjY2VzcyB0YWJsZXMgY3JlYXRlZCBieSBvdGhlcnMuXG4gICAqL1xuICByZWFkb25seSByb2xlPzogUm9sZVxufVxuXG5leHBvcnQgY2xhc3MgU2NoZW1hIGV4dGVuZHMgQ3VzdG9tUmVzb3VyY2Uge1xuICBwdWJsaWMgcmVhZG9ubHkgc2NoZW1hTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFNjaGVtYVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3BzLnByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLlNDSEVNQSxcbiAgICAgICAgUmVzb3VyY2VJZDogcHJvcHMuc2NoZW1hTmFtZSxcbiAgICAgICAgLi4uKHByb3BzLnByb3ZpZGVyLnNlY3JldCA/IHsgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuIH0gOiB7fSksXG4gICAgICAgIERhdGFiYXNlTmFtZTogcHJvcHMuZGF0YWJhc2UgPyBwcm9wcy5kYXRhYmFzZS5kYXRhYmFzZU5hbWUgOiB1bmRlZmluZWQsXG4gICAgICAgIFJvbGVOYW1lOiBwcm9wcy5yb2xlID8gcHJvcHMucm9sZS5yb2xlTmFtZSA6IHVuZGVmaW5lZCxcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgICB0aGlzLnNjaGVtYU5hbWUgPSBwcm9wcy5zY2hlbWFOYW1lXG4gICAgaWYgKHByb3BzLmRhdGFiYXNlKSB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5kYXRhYmFzZSlcbiAgICBpZiAocHJvcHMucm9sZSkgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucm9sZSlcbiAgfVxufVxuIl19
package/lib/sql.js CHANGED
@@ -24,5 +24,5 @@ class Sql extends aws_cdk_lib_1.CustomResource {
24
24
  }
25
25
  exports.Sql = Sql;
26
26
  _a = JSII_RTTI_SYMBOL_1;
27
- Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "7.3.2" };
27
+ Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "8.0.1" };
28
28
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NxbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUEyQnZDLE1BQWEsR0FBSSxTQUFRLDRCQUFjO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZTtRQUN2RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLEdBQUc7Z0JBQzVCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsWUFBWSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxTQUFTO2dCQUN0RSxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVM7Z0JBQzFCLFFBQVEsRUFBRSxLQUFLLENBQUMsUUFBUTthQUN6QjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLEtBQUssQ0FBQyxRQUFRO1lBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQzdELENBQUM7O0FBZEgsa0JBZUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNxbFByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU1FMLlxuICAgKi9cbiAgcmVhZG9ubHkgc3RhdGVtZW50Pzogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIHN0YXRtZW50IHRvIGJlIGV4ZWN1dGVkIHdoZW4gdGhlIHJlc291cmNlIGlzIGRlbGV0ZWRcbiAgICovXG4gIHJlYWRvbmx5IHJvbGxiYWNrPzogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBTcWwgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBTcWxQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5TUUwsXG4gICAgICAgIC4uLihwcm9wcy5wcm92aWRlci5zZWNyZXQgPyB7IFNlY3JldEFybjogcHJvcHMucHJvdmlkZXIuc2VjcmV0LnNlY3JldEFybiB9IDoge30pLFxuICAgICAgICBEYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlID8gcHJvcHMuZGF0YWJhc2UuZGF0YWJhc2VOYW1lIDogdW5kZWZpbmVkLFxuICAgICAgICBTdGF0ZW1lbnQ6IHByb3BzLnN0YXRlbWVudCxcbiAgICAgICAgUm9sbGJhY2s6IHByb3BzLnJvbGxiYWNrLFxuICAgICAgfSxcbiAgICB9KVxuICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLnByb3ZpZGVyKVxuICAgIGlmIChwcm9wcy5kYXRhYmFzZSkgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMuZGF0YWJhc2UpXG4gIH1cbn1cbiJdfQ==
@@ -8,7 +8,7 @@ This package contains type definitions for aws-lambda (http://docs.aws.amazon.co
8
8
  Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/aws-lambda.
9
9
 
10
10
  ### Additional Details
11
- * Last updated: Sat, 19 Jul 2025 08:38:38 GMT
11
+ * Last updated: Tue, 18 Nov 2025 15:02:12 GMT
12
12
  * Dependencies: none
13
13
 
14
14
  # Credits
@@ -80,4 +80,6 @@ export interface APIGatewayEventIdentity {
80
80
  user: string | null;
81
81
  userAgent: string | null;
82
82
  userArn: string | null;
83
+ vpcId?: string | undefined;
84
+ vpceId?: string | undefined;
83
85
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@types/aws-lambda",
3
- "version": "8.10.152",
3
+ "version": "8.10.159",
4
4
  "description": "TypeScript definitions for aws-lambda",
5
5
  "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/aws-lambda",
6
6
  "license": "MIT",
@@ -221,6 +221,6 @@
221
221
  "scripts": {},
222
222
  "dependencies": {},
223
223
  "peerDependencies": {},
224
- "typesPublisherContentHash": "7ac21f912f5d39e38f9916d81a153b602cba17acc60370d4bd76dbb98d403494",
225
- "typeScriptVersion": "5.1"
224
+ "typesPublisherContentHash": "05cdbd1b79b9a9c0f6de57fc2e695fcf893c4491dac3280a93338882cc96129d",
225
+ "typeScriptVersion": "5.2"
226
226
  }
@@ -50,6 +50,10 @@ export interface CustomEmailSenderAdminCreateUserTriggerEvent
50
50
  extends BaseCustomEmailSenderTriggerEvent<"CustomEmailSender_AdminCreateUser">
51
51
  {}
52
52
 
53
+ export interface CustomEmailSenderAuthenticationTriggerEvent
54
+ extends BaseCustomEmailSenderTriggerEvent<"CustomEmailSender_Authentication">
55
+ {}
56
+
53
57
  export interface CustomEmailSenderAccountTakeOverNotificationTriggerEvent
54
58
  extends BaseTriggerEvent<"CustomEmailSender_AccountTakeOverNotification">
55
59
  {
@@ -71,6 +75,7 @@ export type CustomEmailSenderTriggerEvent =
71
75
  | CustomEmailSenderUpdateUserAttributeTriggerEvent
72
76
  | CustomEmailSenderVerifyUserAttributeTriggerEvent
73
77
  | CustomEmailSenderAdminCreateUserTriggerEvent
78
+ | CustomEmailSenderAuthenticationTriggerEvent
74
79
  | CustomEmailSenderAccountTakeOverNotificationTriggerEvent;
75
80
 
76
81
  export type CustomEmailSenderTriggerHandler = Handler<CustomEmailSenderTriggerEvent>;
@@ -29,7 +29,7 @@ export interface ConnectContactFlowEvent {
29
29
  Name: "ContactFlowEvent";
30
30
  }
31
31
 
32
- export type ConnectContactFlowChannel = "VOICE" | "CHAT";
32
+ export type ConnectContactFlowChannel = "VOICE" | "CHAT" | "EMAIL";
33
33
 
34
34
  export type ConnectContactFlowInitiationMethod = "INBOUND" | "OUTBOUND" | "TRANSFER" | "CALLBACK" | "API";
35
35
 
@@ -3,19 +3,27 @@ import { Handler } from "../handler";
3
3
  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
4
4
  export type DynamoDBStreamHandler = Handler<DynamoDBStreamEvent, DynamoDBBatchResponse | void>;
5
5
 
6
+ // eslint-disable-next-line @definitelytyped/strict-export-declare-modifiers, @definitelytyped/no-single-element-tuple-type
7
+ type Merge<T> = [{ [K in keyof T]: T[K] }][number];
8
+
9
+ // eslint-disable-next-line @definitelytyped/strict-export-declare-modifiers
10
+ type ExclusivePropertyUnion<T, P = keyof T> = P extends any
11
+ ? Merge<{ [K in Extract<keyof T, P>]: T[K] } & { [K in Exclude<keyof T, P>]?: never }>
12
+ : never;
13
+
6
14
  // http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_streams_AttributeValue.html
7
- export interface AttributeValue {
8
- B?: string | undefined;
9
- BS?: string[] | undefined;
10
- BOOL?: boolean | undefined;
11
- L?: AttributeValue[] | undefined;
12
- M?: { [id: string]: AttributeValue } | undefined;
13
- N?: string | undefined;
14
- NS?: string[] | undefined;
15
- NULL?: boolean | undefined;
16
- S?: string | undefined;
17
- SS?: string[] | undefined;
18
- }
15
+ export type AttributeValue = ExclusivePropertyUnion<{
16
+ B: string;
17
+ BOOL: boolean;
18
+ BS: string[];
19
+ L: AttributeValue[];
20
+ M: Record<string, AttributeValue>;
21
+ N: string;
22
+ NS: string[];
23
+ NULL: boolean;
24
+ S: string;
25
+ SS: string[];
26
+ }>;
19
27
 
20
28
  // http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_streams_StreamRecord.html
21
29
  export interface StreamRecord {
@@ -16,12 +16,12 @@ export interface SNSMessage {
16
16
  SignatureVersion: string;
17
17
  Timestamp: string;
18
18
  Signature: string;
19
- SigningCertUrl: string;
19
+ SigningCertUrl: string; // Not SigningCertURL; see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/73817#issuecomment-3367340170
20
20
  MessageId: string;
21
21
  Message: string;
22
22
  MessageAttributes: SNSMessageAttributes;
23
23
  Type: string;
24
- UnsubscribeUrl: string;
24
+ UnsubscribeUrl: string; // Not UnsubscribeURL; see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/73817#issuecomment-3367340170
25
25
  TopicArn: string;
26
26
  Subject?: string;
27
27
  Token?: string;
package/package.json CHANGED
@@ -42,9 +42,9 @@
42
42
  "organization": false
43
43
  },
44
44
  "devDependencies": {
45
- "@aws-sdk/client-secrets-manager": "^3.888.0",
46
- "@aws-sdk/client-ssm": "^3.888.0",
47
- "@aws-sdk/dsql-signer": "^3.888.0",
45
+ "@aws-sdk/client-secrets-manager": "^3.953.0",
46
+ "@aws-sdk/client-ssm": "^3.953.0",
47
+ "@aws-sdk/dsql-signer": "^3.953.0",
48
48
  "@types/jest": "~30",
49
49
  "@types/node": "^22",
50
50
  "@types/pg": "^8.11.11",
@@ -53,24 +53,24 @@
53
53
  "aws-cdk-lib": "2.214.0",
54
54
  "commit-and-tag-version": "^12",
55
55
  "constructs": "10.4.2",
56
- "esbuild": "0.25.9",
56
+ "esbuild": "0.27.2",
57
57
  "eslint": "^9",
58
58
  "eslint-config-prettier": "^8.10.2",
59
59
  "eslint-import-resolver-typescript": "^3.10.1",
60
60
  "eslint-plugin-import": "^2.32.0",
61
61
  "eslint-plugin-prettier": "^4.2.5",
62
- "exponential-backoff": "^3.1.2",
62
+ "exponential-backoff": "^3.1.3",
63
63
  "jest": "~30",
64
64
  "jest-junit": "^16",
65
65
  "jsii": "~5.9.0",
66
- "jsii-diff": "^1.114.1",
67
- "jsii-pacmak": "^1.114.1",
66
+ "jsii-diff": "^1.121.0",
67
+ "jsii-pacmak": "^1.121.0",
68
68
  "jsii-rosetta": "~5.9.0",
69
- "mysql2": "^3.14.5",
69
+ "mysql2": "^3.16.0",
70
70
  "node-pg-format": "^1.3.5",
71
71
  "pg": "^8.13.3",
72
72
  "prettier": "^2.8.8",
73
- "projen": "^0.96.1",
73
+ "projen": "^0.98.30",
74
74
  "source-map-support": "^0.5.21",
75
75
  "testcontainers": "11",
76
76
  "ts-jest": "^29",
@@ -82,7 +82,7 @@
82
82
  "constructs": "^10.4.2"
83
83
  },
84
84
  "dependencies": {
85
- "@types/aws-lambda": "^8.10.152"
85
+ "@types/aws-lambda": "^8.10.159"
86
86
  },
87
87
  "bundledDependencies": [
88
88
  "@types/aws-lambda"
@@ -105,7 +105,7 @@
105
105
  "publishConfig": {
106
106
  "access": "public"
107
107
  },
108
- "version": "7.3.2",
108
+ "version": "8.0.1",
109
109
  "jest": {
110
110
  "coverageProvider": "v8",
111
111
  "testMatch": [