cdk-rds-sql 3.3.0 → 3.4.0
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 +141 -44
- package/README.md +15 -4
- package/lib/database.js +1 -1
- package/lib/handler.js +2 -2
- package/lib/provider.d.ts +3 -3
- package/lib/provider.js +2 -3
- package/lib/role.js +14 -5
- package/lib/schema.js +1 -1
- package/lib/sql.js +1 -1
- package/package.json +3 -3
package/.jsii
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"source-map-support": "^0.5.21"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"aws-cdk-lib": "^2.
|
|
19
|
+
"aws-cdk-lib": "^2.144.0",
|
|
20
20
|
"constructs": "^10.3.0"
|
|
21
21
|
},
|
|
22
22
|
"dependencyClosure": {
|
|
@@ -505,10 +505,23 @@
|
|
|
505
505
|
}
|
|
506
506
|
}
|
|
507
507
|
},
|
|
508
|
+
"aws-cdk-lib.aws_bcmdataexports": {
|
|
509
|
+
"targets": {
|
|
510
|
+
"dotnet": {
|
|
511
|
+
"package": "Amazon.CDK.AWS.BCMDataExports"
|
|
512
|
+
},
|
|
513
|
+
"java": {
|
|
514
|
+
"package": "software.amazon.awscdk.services.bcmdataexports"
|
|
515
|
+
},
|
|
516
|
+
"python": {
|
|
517
|
+
"module": "aws_cdk.aws_bcmdataexports"
|
|
518
|
+
}
|
|
519
|
+
}
|
|
520
|
+
},
|
|
508
521
|
"aws-cdk-lib.aws_bedrock": {
|
|
509
522
|
"targets": {
|
|
510
523
|
"dotnet": {
|
|
511
|
-
"
|
|
524
|
+
"package": "Amazon.CDK.AWS.Bedrock"
|
|
512
525
|
},
|
|
513
526
|
"java": {
|
|
514
527
|
"package": "software.amazon.awscdk.services.bedrock"
|
|
@@ -609,6 +622,19 @@
|
|
|
609
622
|
}
|
|
610
623
|
}
|
|
611
624
|
},
|
|
625
|
+
"aws-cdk-lib.aws_cleanroomsml": {
|
|
626
|
+
"targets": {
|
|
627
|
+
"dotnet": {
|
|
628
|
+
"package": "Amazon.CDK.AWS.CleanRoomsML"
|
|
629
|
+
},
|
|
630
|
+
"java": {
|
|
631
|
+
"package": "software.amazon.awscdk.services.cleanroomsml"
|
|
632
|
+
},
|
|
633
|
+
"python": {
|
|
634
|
+
"module": "aws_cdk.aws_cleanroomsml"
|
|
635
|
+
}
|
|
636
|
+
}
|
|
637
|
+
},
|
|
612
638
|
"aws-cdk-lib.aws_cloud9": {
|
|
613
639
|
"targets": {
|
|
614
640
|
"dotnet": {
|
|
@@ -740,6 +766,19 @@
|
|
|
740
766
|
}
|
|
741
767
|
}
|
|
742
768
|
},
|
|
769
|
+
"aws-cdk-lib.aws_codeconnections": {
|
|
770
|
+
"targets": {
|
|
771
|
+
"dotnet": {
|
|
772
|
+
"package": "Amazon.CDK.AWS.CodeConnections"
|
|
773
|
+
},
|
|
774
|
+
"java": {
|
|
775
|
+
"package": "software.amazon.awscdk.services.codeconnections"
|
|
776
|
+
},
|
|
777
|
+
"python": {
|
|
778
|
+
"module": "aws_cdk.aws_codeconnections"
|
|
779
|
+
}
|
|
780
|
+
}
|
|
781
|
+
},
|
|
743
782
|
"aws-cdk-lib.aws_codedeploy": {
|
|
744
783
|
"targets": {
|
|
745
784
|
"dotnet": {
|
|
@@ -1013,6 +1052,19 @@
|
|
|
1013
1052
|
}
|
|
1014
1053
|
}
|
|
1015
1054
|
},
|
|
1055
|
+
"aws-cdk-lib.aws_deadline": {
|
|
1056
|
+
"targets": {
|
|
1057
|
+
"dotnet": {
|
|
1058
|
+
"package": "Amazon.CDK.AWS.Deadline"
|
|
1059
|
+
},
|
|
1060
|
+
"java": {
|
|
1061
|
+
"package": "software.amazon.awscdk.services.deadline"
|
|
1062
|
+
},
|
|
1063
|
+
"python": {
|
|
1064
|
+
"module": "aws_cdk.aws_deadline"
|
|
1065
|
+
}
|
|
1066
|
+
}
|
|
1067
|
+
},
|
|
1016
1068
|
"aws-cdk-lib.aws_detective": {
|
|
1017
1069
|
"targets": {
|
|
1018
1070
|
"dotnet": {
|
|
@@ -2534,6 +2586,19 @@
|
|
|
2534
2586
|
}
|
|
2535
2587
|
}
|
|
2536
2588
|
},
|
|
2589
|
+
"aws-cdk-lib.aws_paymentcryptography": {
|
|
2590
|
+
"targets": {
|
|
2591
|
+
"dotnet": {
|
|
2592
|
+
"package": "Amazon.CDK.AWS.PaymentCryptography"
|
|
2593
|
+
},
|
|
2594
|
+
"java": {
|
|
2595
|
+
"package": "software.amazon.awscdk.services.paymentcryptography"
|
|
2596
|
+
},
|
|
2597
|
+
"python": {
|
|
2598
|
+
"module": "aws_cdk.aws_paymentcryptography"
|
|
2599
|
+
}
|
|
2600
|
+
}
|
|
2601
|
+
},
|
|
2537
2602
|
"aws-cdk-lib.aws_pcaconnectorad": {
|
|
2538
2603
|
"targets": {
|
|
2539
2604
|
"dotnet": {
|
|
@@ -2612,6 +2677,19 @@
|
|
|
2612
2677
|
}
|
|
2613
2678
|
}
|
|
2614
2679
|
},
|
|
2680
|
+
"aws-cdk-lib.aws_qbusiness": {
|
|
2681
|
+
"targets": {
|
|
2682
|
+
"dotnet": {
|
|
2683
|
+
"package": "Amazon.CDK.AWS.QBusiness"
|
|
2684
|
+
},
|
|
2685
|
+
"java": {
|
|
2686
|
+
"package": "software.amazon.awscdk.services.qbusiness"
|
|
2687
|
+
},
|
|
2688
|
+
"python": {
|
|
2689
|
+
"module": "aws_cdk.aws_qbusiness"
|
|
2690
|
+
}
|
|
2691
|
+
}
|
|
2692
|
+
},
|
|
2615
2693
|
"aws-cdk-lib.aws_qldb": {
|
|
2616
2694
|
"targets": {
|
|
2617
2695
|
"dotnet": {
|
|
@@ -2820,6 +2898,19 @@
|
|
|
2820
2898
|
}
|
|
2821
2899
|
}
|
|
2822
2900
|
},
|
|
2901
|
+
"aws-cdk-lib.aws_route53profiles": {
|
|
2902
|
+
"targets": {
|
|
2903
|
+
"dotnet": {
|
|
2904
|
+
"package": "Amazon.CDK.AWS.Route53Profiles"
|
|
2905
|
+
},
|
|
2906
|
+
"java": {
|
|
2907
|
+
"package": "software.amazon.awscdk.services.route53profiles"
|
|
2908
|
+
},
|
|
2909
|
+
"python": {
|
|
2910
|
+
"module": "aws_cdk.aws_route53profiles"
|
|
2911
|
+
}
|
|
2912
|
+
}
|
|
2913
|
+
},
|
|
2823
2914
|
"aws-cdk-lib.aws_route53recoverycontrol": {
|
|
2824
2915
|
"targets": {
|
|
2825
2916
|
"dotnet": {
|
|
@@ -3041,6 +3132,19 @@
|
|
|
3041
3132
|
}
|
|
3042
3133
|
}
|
|
3043
3134
|
},
|
|
3135
|
+
"aws-cdk-lib.aws_securitylake": {
|
|
3136
|
+
"targets": {
|
|
3137
|
+
"dotnet": {
|
|
3138
|
+
"package": "Amazon.CDK.AWS.SecurityLake"
|
|
3139
|
+
},
|
|
3140
|
+
"java": {
|
|
3141
|
+
"package": "software.amazon.awscdk.services.securitylake"
|
|
3142
|
+
},
|
|
3143
|
+
"python": {
|
|
3144
|
+
"module": "aws_cdk.aws_securitylake"
|
|
3145
|
+
}
|
|
3146
|
+
}
|
|
3147
|
+
},
|
|
3044
3148
|
"aws-cdk-lib.aws_servicecatalog": {
|
|
3045
3149
|
"targets": {
|
|
3046
3150
|
"dotnet": {
|
|
@@ -3210,19 +3314,6 @@
|
|
|
3210
3314
|
}
|
|
3211
3315
|
}
|
|
3212
3316
|
},
|
|
3213
|
-
"aws-cdk-lib.aws_ssmguiconnect": {
|
|
3214
|
-
"targets": {
|
|
3215
|
-
"dotnet": {
|
|
3216
|
-
"package": "Amazon.CDK.AWS.SSMGuiConnect"
|
|
3217
|
-
},
|
|
3218
|
-
"java": {
|
|
3219
|
-
"package": "software.amazon.awscdk.services.ssmguiconnect"
|
|
3220
|
-
},
|
|
3221
|
-
"python": {
|
|
3222
|
-
"module": "aws_cdk.aws_ssmguiconnect"
|
|
3223
|
-
}
|
|
3224
|
-
}
|
|
3225
|
-
},
|
|
3226
3317
|
"aws-cdk-lib.aws_ssmincidents": {
|
|
3227
3318
|
"targets": {
|
|
3228
3319
|
"dotnet": {
|
|
@@ -3690,7 +3781,7 @@
|
|
|
3690
3781
|
},
|
|
3691
3782
|
"name": "cdk-rds-sql",
|
|
3692
3783
|
"readme": {
|
|
3693
|
-
"markdown": "# About\n\nThis CDK construct library makes it possible to create databases,\nschemas, and roles in an Aurora Serverless
|
|
3784
|
+
"markdown": "# About\n\nThis CDK construct library makes it possible to create databases,\nschemas, and roles in an Aurora Serverless (v1 and v2 are supported), RDS Database Cluster or Database Instance created\nin that stack.\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```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. This is a breaking change from the past, where the provider used\nthe default strategy, which may not have been the private isolated\nsubnet. But from an enterprise security point of view having third\nparty code run in an isolated network by default is better.\n\nYour 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 vpcSubnet: {\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 (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 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\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\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 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## 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"
|
|
3694
3785
|
},
|
|
3695
3786
|
"repository": {
|
|
3696
3787
|
"type": "git",
|
|
@@ -3917,7 +4008,7 @@
|
|
|
3917
4008
|
},
|
|
3918
4009
|
"locationInModule": {
|
|
3919
4010
|
"filename": "src/provider.ts",
|
|
3920
|
-
"line":
|
|
4011
|
+
"line": 78
|
|
3921
4012
|
},
|
|
3922
4013
|
"parameters": [
|
|
3923
4014
|
{
|
|
@@ -3943,7 +4034,7 @@
|
|
|
3943
4034
|
"kind": "class",
|
|
3944
4035
|
"locationInModule": {
|
|
3945
4036
|
"filename": "src/provider.ts",
|
|
3946
|
-
"line":
|
|
4037
|
+
"line": 72
|
|
3947
4038
|
},
|
|
3948
4039
|
"methods": [
|
|
3949
4040
|
{
|
|
@@ -3952,7 +4043,7 @@
|
|
|
3952
4043
|
},
|
|
3953
4044
|
"locationInModule": {
|
|
3954
4045
|
"filename": "src/provider.ts",
|
|
3955
|
-
"line":
|
|
4046
|
+
"line": 108
|
|
3956
4047
|
},
|
|
3957
4048
|
"name": "newCustomResourceHandler",
|
|
3958
4049
|
"parameters": [
|
|
@@ -3992,7 +4083,7 @@
|
|
|
3992
4083
|
"immutable": true,
|
|
3993
4084
|
"locationInModule": {
|
|
3994
4085
|
"filename": "src/provider.ts",
|
|
3995
|
-
"line":
|
|
4086
|
+
"line": 76
|
|
3996
4087
|
},
|
|
3997
4088
|
"name": "cluster",
|
|
3998
4089
|
"type": {
|
|
@@ -4001,6 +4092,9 @@
|
|
|
4001
4092
|
{
|
|
4002
4093
|
"fqn": "aws-cdk-lib.aws_rds.IDatabaseCluster"
|
|
4003
4094
|
},
|
|
4095
|
+
{
|
|
4096
|
+
"fqn": "aws-cdk-lib.aws_rds.IDatabaseInstance"
|
|
4097
|
+
},
|
|
4004
4098
|
{
|
|
4005
4099
|
"fqn": "aws-cdk-lib.aws_rds.IServerlessCluster"
|
|
4006
4100
|
}
|
|
@@ -4015,7 +4109,7 @@
|
|
|
4015
4109
|
"immutable": true,
|
|
4016
4110
|
"locationInModule": {
|
|
4017
4111
|
"filename": "src/provider.ts",
|
|
4018
|
-
"line":
|
|
4112
|
+
"line": 75
|
|
4019
4113
|
},
|
|
4020
4114
|
"name": "handler",
|
|
4021
4115
|
"type": {
|
|
@@ -4029,7 +4123,7 @@
|
|
|
4029
4123
|
"immutable": true,
|
|
4030
4124
|
"locationInModule": {
|
|
4031
4125
|
"filename": "src/provider.ts",
|
|
4032
|
-
"line":
|
|
4126
|
+
"line": 74
|
|
4033
4127
|
},
|
|
4034
4128
|
"name": "secret",
|
|
4035
4129
|
"type": {
|
|
@@ -4043,7 +4137,7 @@
|
|
|
4043
4137
|
"immutable": true,
|
|
4044
4138
|
"locationInModule": {
|
|
4045
4139
|
"filename": "src/provider.ts",
|
|
4046
|
-
"line":
|
|
4140
|
+
"line": 73
|
|
4047
4141
|
},
|
|
4048
4142
|
"name": "serviceToken",
|
|
4049
4143
|
"type": {
|
|
@@ -4063,7 +4157,7 @@
|
|
|
4063
4157
|
"kind": "interface",
|
|
4064
4158
|
"locationInModule": {
|
|
4065
4159
|
"filename": "src/provider.ts",
|
|
4066
|
-
"line":
|
|
4160
|
+
"line": 17
|
|
4067
4161
|
},
|
|
4068
4162
|
"name": "RdsSqlProps",
|
|
4069
4163
|
"properties": [
|
|
@@ -4076,7 +4170,7 @@
|
|
|
4076
4170
|
"immutable": true,
|
|
4077
4171
|
"locationInModule": {
|
|
4078
4172
|
"filename": "src/provider.ts",
|
|
4079
|
-
"line":
|
|
4173
|
+
"line": 37
|
|
4080
4174
|
},
|
|
4081
4175
|
"name": "cluster",
|
|
4082
4176
|
"type": {
|
|
@@ -4085,6 +4179,9 @@
|
|
|
4085
4179
|
{
|
|
4086
4180
|
"fqn": "aws-cdk-lib.aws_rds.IDatabaseCluster"
|
|
4087
4181
|
},
|
|
4182
|
+
{
|
|
4183
|
+
"fqn": "aws-cdk-lib.aws_rds.IDatabaseInstance"
|
|
4184
|
+
},
|
|
4088
4185
|
{
|
|
4089
4186
|
"fqn": "aws-cdk-lib.aws_rds.IServerlessCluster"
|
|
4090
4187
|
}
|
|
@@ -4102,7 +4199,7 @@
|
|
|
4102
4199
|
"immutable": true,
|
|
4103
4200
|
"locationInModule": {
|
|
4104
4201
|
"filename": "src/provider.ts",
|
|
4105
|
-
"line":
|
|
4202
|
+
"line": 44
|
|
4106
4203
|
},
|
|
4107
4204
|
"name": "secret",
|
|
4108
4205
|
"type": {
|
|
@@ -4120,7 +4217,7 @@
|
|
|
4120
4217
|
"immutable": true,
|
|
4121
4218
|
"locationInModule": {
|
|
4122
4219
|
"filename": "src/provider.ts",
|
|
4123
|
-
"line":
|
|
4220
|
+
"line": 25
|
|
4124
4221
|
},
|
|
4125
4222
|
"name": "vpc",
|
|
4126
4223
|
"type": {
|
|
@@ -4138,7 +4235,7 @@
|
|
|
4138
4235
|
"immutable": true,
|
|
4139
4236
|
"locationInModule": {
|
|
4140
4237
|
"filename": "src/provider.ts",
|
|
4141
|
-
"line":
|
|
4238
|
+
"line": 69
|
|
4142
4239
|
},
|
|
4143
4240
|
"name": "functionProps",
|
|
4144
4241
|
"optional": true,
|
|
@@ -4157,7 +4254,7 @@
|
|
|
4157
4254
|
"immutable": true,
|
|
4158
4255
|
"locationInModule": {
|
|
4159
4256
|
"filename": "src/provider.ts",
|
|
4160
|
-
"line":
|
|
4257
|
+
"line": 58
|
|
4161
4258
|
},
|
|
4162
4259
|
"name": "logger",
|
|
4163
4260
|
"optional": true,
|
|
@@ -4175,7 +4272,7 @@
|
|
|
4175
4272
|
"immutable": true,
|
|
4176
4273
|
"locationInModule": {
|
|
4177
4274
|
"filename": "src/provider.ts",
|
|
4178
|
-
"line":
|
|
4275
|
+
"line": 51
|
|
4179
4276
|
},
|
|
4180
4277
|
"name": "timeout",
|
|
4181
4278
|
"optional": true,
|
|
@@ -4193,7 +4290,7 @@
|
|
|
4193
4290
|
"immutable": true,
|
|
4194
4291
|
"locationInModule": {
|
|
4195
4292
|
"filename": "src/provider.ts",
|
|
4196
|
-
"line":
|
|
4293
|
+
"line": 32
|
|
4197
4294
|
},
|
|
4198
4295
|
"name": "vpcSubnets",
|
|
4199
4296
|
"optional": true,
|
|
@@ -4257,7 +4354,7 @@
|
|
|
4257
4354
|
},
|
|
4258
4355
|
"locationInModule": {
|
|
4259
4356
|
"filename": "src/role.ts",
|
|
4260
|
-
"line":
|
|
4357
|
+
"line": 69
|
|
4261
4358
|
},
|
|
4262
4359
|
"parameters": [
|
|
4263
4360
|
{
|
|
@@ -4283,7 +4380,7 @@
|
|
|
4283
4380
|
"kind": "class",
|
|
4284
4381
|
"locationInModule": {
|
|
4285
4382
|
"filename": "src/role.ts",
|
|
4286
|
-
"line":
|
|
4383
|
+
"line": 58
|
|
4287
4384
|
},
|
|
4288
4385
|
"name": "Role",
|
|
4289
4386
|
"properties": [
|
|
@@ -4295,7 +4392,7 @@
|
|
|
4295
4392
|
"immutable": true,
|
|
4296
4393
|
"locationInModule": {
|
|
4297
4394
|
"filename": "src/role.ts",
|
|
4298
|
-
"line":
|
|
4395
|
+
"line": 62
|
|
4299
4396
|
},
|
|
4300
4397
|
"name": "roleName",
|
|
4301
4398
|
"type": {
|
|
@@ -4310,7 +4407,7 @@
|
|
|
4310
4407
|
"immutable": true,
|
|
4311
4408
|
"locationInModule": {
|
|
4312
4409
|
"filename": "src/role.ts",
|
|
4313
|
-
"line":
|
|
4410
|
+
"line": 67
|
|
4314
4411
|
},
|
|
4315
4412
|
"name": "secret",
|
|
4316
4413
|
"type": {
|
|
@@ -4330,7 +4427,7 @@
|
|
|
4330
4427
|
"kind": "interface",
|
|
4331
4428
|
"locationInModule": {
|
|
4332
4429
|
"filename": "src/role.ts",
|
|
4333
|
-
"line":
|
|
4430
|
+
"line": 10
|
|
4334
4431
|
},
|
|
4335
4432
|
"name": "RoleProps",
|
|
4336
4433
|
"properties": [
|
|
@@ -4343,7 +4440,7 @@
|
|
|
4343
4440
|
"immutable": true,
|
|
4344
4441
|
"locationInModule": {
|
|
4345
4442
|
"filename": "src/role.ts",
|
|
4346
|
-
"line":
|
|
4443
|
+
"line": 14
|
|
4347
4444
|
},
|
|
4348
4445
|
"name": "provider",
|
|
4349
4446
|
"type": {
|
|
@@ -4359,7 +4456,7 @@
|
|
|
4359
4456
|
"immutable": true,
|
|
4360
4457
|
"locationInModule": {
|
|
4361
4458
|
"filename": "src/role.ts",
|
|
4362
|
-
"line":
|
|
4459
|
+
"line": 19
|
|
4363
4460
|
},
|
|
4364
4461
|
"name": "roleName",
|
|
4365
4462
|
"type": {
|
|
@@ -4377,7 +4474,7 @@
|
|
|
4377
4474
|
"immutable": true,
|
|
4378
4475
|
"locationInModule": {
|
|
4379
4476
|
"filename": "src/role.ts",
|
|
4380
|
-
"line":
|
|
4477
|
+
"line": 30
|
|
4381
4478
|
},
|
|
4382
4479
|
"name": "database",
|
|
4383
4480
|
"optional": true,
|
|
@@ -4396,7 +4493,7 @@
|
|
|
4396
4493
|
"immutable": true,
|
|
4397
4494
|
"locationInModule": {
|
|
4398
4495
|
"filename": "src/role.ts",
|
|
4399
|
-
"line":
|
|
4496
|
+
"line": 41
|
|
4400
4497
|
},
|
|
4401
4498
|
"name": "databaseName",
|
|
4402
4499
|
"optional": true,
|
|
@@ -4414,7 +4511,7 @@
|
|
|
4414
4511
|
"immutable": true,
|
|
4415
4512
|
"locationInModule": {
|
|
4416
4513
|
"filename": "src/role.ts",
|
|
4417
|
-
"line":
|
|
4514
|
+
"line": 48
|
|
4418
4515
|
},
|
|
4419
4516
|
"name": "encryptionKey",
|
|
4420
4517
|
"optional": true,
|
|
@@ -4432,7 +4529,7 @@
|
|
|
4432
4529
|
"immutable": true,
|
|
4433
4530
|
"locationInModule": {
|
|
4434
4531
|
"filename": "src/role.ts",
|
|
4435
|
-
"line":
|
|
4532
|
+
"line": 55
|
|
4436
4533
|
},
|
|
4437
4534
|
"name": "secretName",
|
|
4438
4535
|
"optional": true,
|
|
@@ -4700,6 +4797,6 @@
|
|
|
4700
4797
|
"symbolId": "src/sql:SqlProps"
|
|
4701
4798
|
}
|
|
4702
4799
|
},
|
|
4703
|
-
"version": "3.
|
|
4704
|
-
"fingerprint": "
|
|
4800
|
+
"version": "3.4.0",
|
|
4801
|
+
"fingerprint": "JScYAVL4DxVOz2269Y67J4zmpgO8yDQ368TSQieIXtQ="
|
|
4705
4802
|
}
|
package/README.md
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# About
|
|
2
2
|
|
|
3
3
|
This CDK construct library makes it possible to create databases,
|
|
4
|
-
schemas, and roles in an Aurora Serverless or
|
|
5
|
-
in that stack.
|
|
4
|
+
schemas, and roles in an Aurora Serverless (v1 and v2 are supported), RDS Database Cluster or Database Instance created
|
|
5
|
+
in that stack.
|
|
6
6
|
|
|
7
7
|
This construct library is intended to be used in enterprise
|
|
8
8
|
environments, and works in isolated subnets.
|
|
@@ -55,7 +55,7 @@ const cluster = new rds.ServerlessCluster(this, "Cluster", {
|
|
|
55
55
|
})
|
|
56
56
|
```
|
|
57
57
|
|
|
58
|
-
Then create a provider which will connect to your database:
|
|
58
|
+
Then create a provider which will connect to your database. For a cluster:
|
|
59
59
|
|
|
60
60
|
```ts
|
|
61
61
|
import { Provider } from "cdk-rds-sql"
|
|
@@ -67,6 +67,17 @@ const provider = new Provider(this, "Provider", {
|
|
|
67
67
|
})
|
|
68
68
|
```
|
|
69
69
|
|
|
70
|
+
For an instance:
|
|
71
|
+
```ts
|
|
72
|
+
import { Provider } from "cdk-rds-sql"
|
|
73
|
+
|
|
74
|
+
const provider = new Provider(this, "Provider", {
|
|
75
|
+
vpc: vpc,
|
|
76
|
+
instance: instance,
|
|
77
|
+
secret: cluster.secret!,
|
|
78
|
+
})
|
|
79
|
+
```
|
|
80
|
+
|
|
70
81
|
The provider will setup a lambda, which normally lives in the same VPC
|
|
71
82
|
as the database. You can give a different VPC, as long as that VPC has
|
|
72
83
|
access to the VPC of the database. Only the provider lambda will talk
|
|
@@ -98,7 +109,7 @@ const provider = new Provider(this, "Provider", {
|
|
|
98
109
|
|
|
99
110
|
## Roles
|
|
100
111
|
|
|
101
|
-
Create a postgres role (user) as follows:
|
|
112
|
+
Create a postgres role (user) for a cluster as follows:
|
|
102
113
|
|
|
103
114
|
```ts
|
|
104
115
|
import { Role } from "cdk-rds-sql"
|
package/lib/database.js
CHANGED
|
@@ -40,5 +40,5 @@ class Database extends aws_cdk_lib_1.CustomResource {
|
|
|
40
40
|
}
|
|
41
41
|
exports.Database = Database;
|
|
42
42
|
_a = JSII_RTTI_SYMBOL_1;
|
|
43
|
-
Database[_a] = { fqn: "cdk-rds-sql.Database", version: "3.
|
|
43
|
+
Database[_a] = { fqn: "cdk-rds-sql.Database", version: "3.4.0" };
|
|
44
44
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2Q0FBNEM7QUFDNUMsMkNBQXNDO0FBQ3RDLGlDQUF1QztBQTJCdkMsTUFBTSxnQkFBaUIsU0FBUSxzQkFBUztJQUd0QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXlCO1FBQ2pFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDaEIsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO0lBQ3hDLENBQUM7Q0FDRjtBQUVELE1BQWEsUUFBUyxTQUFRLDRCQUFjO0lBWTFDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBb0I7UUFDNUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxRQUFRO2dCQUNqQyxVQUFVLEVBQUUsS0FBSyxDQUFDLFlBQVk7Z0JBQzlCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxLQUFLLEVBQUUsS0FBSyxDQUFDLEtBQUssRUFBRSxRQUFRO2FBQzdCO1NBQ0YsQ0FBQyxDQUFBO1FBQ0YsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ3ZDLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtRQUN0QyxJQUFJLEtBQUssQ0FBQyxLQUFLLEVBQUU7WUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7U0FDckM7SUFDSCxDQUFDO0lBMUJEOztPQUVHO0lBQ0gsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQWdCLEVBQUUsRUFBVSxFQUFFLFlBQW9CO1FBQ3hFLE9BQU8sSUFBSSxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ3JDLFlBQVksRUFBRSxZQUFZO1NBQzNCLENBQUMsQ0FBQTtJQUNKLENBQUM7O0FBUkgsNEJBNEJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIlxuaW1wb3J0IHsgUmRzU3FsUmVzb3VyY2UgfSBmcm9tIFwiLi9lbnVtXCJcbmltcG9ydCB7IFByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuaW1wb3J0IHsgUm9sZSB9IGZyb20gXCIuL3JvbGVcIlxuXG5pbnRlcmZhY2UgRGF0YWJhc2VBdHRyaWJ1dGVzIHtcbiAgLyoqXG4gICAqIE5hbWUgb2YgZGF0YWJhc2UgdG8gY3JlYXRlLlxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2VOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogT3B0aW9uYWwgZGF0YWJhc2Ugb3duZXIuXG4gICAqL1xuICByZWFkb25seSBvd25lcj86IFJvbGVcbn1cblxuZXhwb3J0IGludGVyZmFjZSBEYXRhYmFzZVByb3BzIGV4dGVuZHMgRGF0YWJhc2VBdHRyaWJ1dGVzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IFByb3ZpZGVyXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgSURhdGFiYXNlIHtcbiAgcmVhZG9ubHkgZGF0YWJhc2VOYW1lOiBzdHJpbmdcbn1cblxuY2xhc3MgSW1wb3J0ZWREYXRhYmFzZSBleHRlbmRzIENvbnN0cnVjdCBpbXBsZW1lbnRzIElEYXRhYmFzZSB7XG4gIHB1YmxpYyByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBEYXRhYmFzZUF0dHJpYnV0ZXMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgRGF0YWJhc2UgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSBpbXBsZW1lbnRzIElEYXRhYmFzZSB7XG4gIC8qKlxuICAgKiBSZXR1cm4gYSBEYXRhYmFzZSBiYXNlZCB1cG9uIG5hbWUgb25seS4gVXNlIGZvciBpbXBvcnRpbmcgZXhpc3RpbmcgZGF0YWJhc2VzLlxuICAgKi9cbiAgc3RhdGljIGZyb21EYXRhYmFzZU5hbWUoc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgZGF0YWJhc2VOYW1lOiBzdHJpbmcpOiBJRGF0YWJhc2Uge1xuICAgIHJldHVybiBuZXcgSW1wb3J0ZWREYXRhYmFzZShzY29wZSwgaWQsIHtcbiAgICAgIGRhdGFiYXNlTmFtZTogZGF0YWJhc2VOYW1lLFxuICAgIH0pXG4gIH1cblxuICBwdWJsaWMgcmVhZG9ubHkgZGF0YWJhc2VOYW1lOiBzdHJpbmdcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogRGF0YWJhc2VQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5EQVRBQkFTRSxcbiAgICAgICAgUmVzb3VyY2VJZDogcHJvcHMuZGF0YWJhc2VOYW1lLFxuICAgICAgICBTZWNyZXRBcm46IHByb3BzLnByb3ZpZGVyLnNlY3JldC5zZWNyZXRBcm4sXG4gICAgICAgIE93bmVyOiBwcm9wcy5vd25lcj8ucm9sZU5hbWUsXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgICBpZiAocHJvcHMub3duZXIpIHtcbiAgICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLm93bmVyKVxuICAgIH1cbiAgfVxufVxuIl19
|
package/lib/handler.js
CHANGED
|
@@ -15,7 +15,7 @@ const jumpTable = {
|
|
|
15
15
|
Update: (_, __, props) => {
|
|
16
16
|
return props.Statement;
|
|
17
17
|
},
|
|
18
|
-
Delete: (_,
|
|
18
|
+
Delete: (_, props) => {
|
|
19
19
|
return props.Rollback;
|
|
20
20
|
},
|
|
21
21
|
},
|
|
@@ -280,4 +280,4 @@ const getPassword = async (arn) => {
|
|
|
280
280
|
return json.password;
|
|
281
281
|
}
|
|
282
282
|
};
|
|
283
|
-
//# 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  GetSecretValueCommandOutput,\n} from \"@aws-sdk/client-secrets-manager\"\nimport {\n  CloudFormationCustomResourceCreateEvent,\n  CloudFormationCustomResourceUpdateEvent,\n  CloudFormationCustomResourceDeleteEvent,\n} from \"aws-lambda\"\nimport { backOff } from \"exponential-backoff\"\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 maxAttempts = 20\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, __: string, props?: any) => {\n      return props.Rollback\n    },\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 $$\nBEGIN\n  IF EXISTS (select from pg_database where datname = '%s' and datistemplate = false) THEN\n    grant connect on database %I to %I;\n  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 $$\nBEGIN\n  IF EXISTS (select from pg_database where datname = '%s' and datistemplate = false) THEN\n    grant connect on database %I to %I;\n  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, props: RoleProps) => {\n      // TODO: if user is owner of a database, assign ownership to master user\n      // This will require a specified inheritor on role creation\n      return [\n        \"start transaction\",\n        format(\n          `DO $$\nBEGIN\n  IF EXISTS (select from pg_catalog.pg_roles WHERE rolname = '%s') AND EXISTS (select from pg_database WHERE datname = '%s') THEN\n    revoke all privileges on database %I from %I;\n  END IF;\nEND$$;`,\n          resourceId,\n          props.DatabaseName,\n          props.DatabaseName,\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, newOwner: 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(\n          \"DO $$BEGIN\\nIF EXISTS (select from pg_database WHERE datname = '%s') THEN alter database %I owner to %I; END IF;\\nEND$$;\",\n          resourceId,\n          resourceId,\n          newOwner\n        ),\n        format(\"drop database if exists %I\", resourceId),\n      ]\n    },\n  },\n}\n\nconst log =\n  process.env.LOGGER === \"true\"\n    ? console.debug\n    : (_message?: any, ..._optionalParams: any[]) => {}\n\nexport const handler = async (\n  event:\n    | CloudFormationCustomResourceCreateEvent\n    | CloudFormationCustomResourceUpdateEvent\n    | CloudFormationCustomResourceDeleteEvent\n): Promise<any> => {\n  log(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  // As the IAM credentials can be cached, an update makde very recent\n  // could not yet be available.\n  // So we retry this a bit.\n  log(\"Fetching secret\")\n  const secret: GetSecretValueCommandOutput = await backOff(\n    async () => {\n      try {\n        const result = await secrets_client.send(command)\n        return result\n      } catch (e) {\n        log(\"Error fetching secret %o\", e)\n        throw e\n      }\n    },\n    {\n      numOfAttempts: 10,\n      startingDelay: 500,\n    }\n  )\n  if (!secret.SecretString) throw \"No secret string\"\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      if (resource === RdsSqlResource.DATABASE) {\n        sql = jumpTable[resource][requestType](resourceId, secretValues.username)\n      } else {\n        sql = jumpTable[resource][requestType](resourceId, event.ResourceProperties)\n      }\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    log(\n      `Connecting to host ${params.host}: ${params.port}, database ${params.database} as ${params.user}`\n    )\n    log(\"Executing SQL\", sql)\n    const pg_client = new Client(params)\n    await pg_client.connect()\n    try {\n      await backOff(\n        async () => {\n          if (typeof sql === \"string\") {\n            return pg_client.query(sql)\n          } else {\n            if (sql) {\n              return Promise.all(\n                sql.map((statement) => {\n                  return pg_client.query(statement)\n                })\n              )\n            } else {\n              return\n            }\n          }\n        },\n        {\n          retry: errorFilter,\n          numOfAttempts: maxAttempts,\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// Custom error filter, mainly to retry role creation.\n// Frequently see \"tuple concurrently updated\", and adding\n// dependencies is very hard to make work.\nconst errorFilter = (error: any, nextAttemptNumber: number) => {\n  // Retry only if the error message contains \"tuple concurrently\"\n  // This will cover concurrent updates and deletes\n  const willRetry = error.message.includes(\"tuple concurrently\")\n  log(\n    \"Encountered an error on attempt %d/%d retry=%s error=[%o]\",\n    nextAttemptNumber - 1,\n    maxAttempts,\n    willRetry,\n    error\n  )\n  return willRetry\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"]}
|
|
283
|
+
//# 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  GetSecretValueCommandOutput,\n} from \"@aws-sdk/client-secrets-manager\"\nimport {\n  CloudFormationCustomResourceCreateEvent,\n  CloudFormationCustomResourceUpdateEvent,\n  CloudFormationCustomResourceDeleteEvent,\n} from \"aws-lambda\"\nimport { backOff } from \"exponential-backoff\"\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 maxAttempts = 20\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, props?: any) => {\n      return props.Rollback\n    },\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 $$\nBEGIN\n  IF EXISTS (select from pg_database where datname = '%s' and datistemplate = false) THEN\n    grant connect on database %I to %I;\n  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 $$\nBEGIN\n  IF EXISTS (select from pg_database where datname = '%s' and datistemplate = false) THEN\n    grant connect on database %I to %I;\n  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, props: RoleProps) => {\n      // TODO: if user is owner of a database, assign ownership to master user\n      // This will require a specified inheritor on role creation\n      return [\n        \"start transaction\",\n        format(\n          `DO $$\nBEGIN\n  IF EXISTS (select from pg_catalog.pg_roles WHERE rolname = '%s') AND EXISTS (select from pg_database WHERE datname = '%s') THEN\n    revoke all privileges on database %I from %I;\n  END IF;\nEND$$;`,\n          resourceId,\n          props.DatabaseName,\n          props.DatabaseName,\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, newOwner: 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(\n          \"DO $$BEGIN\\nIF EXISTS (select from pg_database WHERE datname = '%s') THEN alter database %I owner to %I; END IF;\\nEND$$;\",\n          resourceId,\n          resourceId,\n          newOwner\n        ),\n        format(\"drop database if exists %I\", resourceId),\n      ]\n    },\n  },\n}\n\nconst log =\n  process.env.LOGGER === \"true\"\n    ? console.debug\n    : (_message?: any, ..._optionalParams: any[]) => {}\n\nexport const handler = async (\n  event:\n    | CloudFormationCustomResourceCreateEvent\n    | CloudFormationCustomResourceUpdateEvent\n    | CloudFormationCustomResourceDeleteEvent\n): Promise<any> => {\n  log(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  // As the IAM credentials can be cached, an update makde very recent\n  // could not yet be available.\n  // So we retry this a bit.\n  log(\"Fetching secret\")\n  const secret: GetSecretValueCommandOutput = await backOff(\n    async () => {\n      try {\n        const result = await secrets_client.send(command)\n        return result\n      } catch (e) {\n        log(\"Error fetching secret %o\", e)\n        throw e\n      }\n    },\n    {\n      numOfAttempts: 10,\n      startingDelay: 500,\n    }\n  )\n  if (!secret.SecretString) throw \"No secret string\"\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      if (resource === RdsSqlResource.DATABASE) {\n        sql = jumpTable[resource][requestType](resourceId, secretValues.username)\n      } else {\n        sql = jumpTable[resource][requestType](resourceId, event.ResourceProperties)\n      }\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    log(\n      `Connecting to host ${params.host}: ${params.port}, database ${params.database} as ${params.user}`\n    )\n    log(\"Executing SQL\", sql)\n    const pg_client = new Client(params)\n    await pg_client.connect()\n    try {\n      await backOff(\n        async () => {\n          if (typeof sql === \"string\") {\n            return pg_client.query(sql)\n          } else {\n            if (sql) {\n              return Promise.all(\n                sql.map((statement) => {\n                  return pg_client.query(statement)\n                })\n              )\n            } else {\n              return\n            }\n          }\n        },\n        {\n          retry: errorFilter,\n          numOfAttempts: maxAttempts,\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// Custom error filter, mainly to retry role creation.\n// Frequently see \"tuple concurrently updated\", and adding\n// dependencies is very hard to make work.\nconst errorFilter = (error: any, nextAttemptNumber: number) => {\n  // Retry only if the error message contains \"tuple concurrently\"\n  // This will cover concurrent updates and deletes\n  const willRetry = error.message.includes(\"tuple concurrently\")\n  log(\n    \"Encountered an error on attempt %d/%d retry=%s error=[%o]\",\n    nextAttemptNumber - 1,\n    maxAttempts,\n    willRetry,\n    error\n  )\n  return willRetry\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
CHANGED
|
@@ -3,7 +3,7 @@ import { IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
|
|
|
3
3
|
import { IFunction } from "aws-cdk-lib/aws-lambda";
|
|
4
4
|
import * as lambda from "aws-cdk-lib/aws-lambda-nodejs";
|
|
5
5
|
import { NodejsFunctionProps } from "aws-cdk-lib/aws-lambda-nodejs";
|
|
6
|
-
import { IDatabaseCluster, IServerlessCluster } from "aws-cdk-lib/aws-rds";
|
|
6
|
+
import { IDatabaseCluster, IServerlessCluster, IDatabaseInstance } from "aws-cdk-lib/aws-rds";
|
|
7
7
|
import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
|
|
8
8
|
import { Construct } from "constructs";
|
|
9
9
|
export interface RdsSqlProps {
|
|
@@ -24,7 +24,7 @@ export interface RdsSqlProps {
|
|
|
24
24
|
/**
|
|
25
25
|
* Your database.
|
|
26
26
|
*/
|
|
27
|
-
readonly cluster: IServerlessCluster | IDatabaseCluster;
|
|
27
|
+
readonly cluster: IServerlessCluster | IDatabaseCluster | IDatabaseInstance;
|
|
28
28
|
/**
|
|
29
29
|
* Secret that grants access to your database.
|
|
30
30
|
*
|
|
@@ -58,7 +58,7 @@ export declare class Provider extends Construct {
|
|
|
58
58
|
readonly serviceToken: string;
|
|
59
59
|
readonly secret: ISecret;
|
|
60
60
|
readonly handler: IFunction;
|
|
61
|
-
readonly cluster: IServerlessCluster | IDatabaseCluster;
|
|
61
|
+
readonly cluster: IServerlessCluster | IDatabaseCluster | IDatabaseInstance;
|
|
62
62
|
constructor(scope: Construct, id: string, props: RdsSqlProps);
|
|
63
63
|
protected newCustomResourceHandler(scope: Construct, id: string, props: RdsSqlProps): lambda.NodejsFunction;
|
|
64
64
|
}
|
package/lib/provider.js
CHANGED
|
@@ -54,7 +54,6 @@ class Provider extends constructs_1.Construct {
|
|
|
54
54
|
}
|
|
55
55
|
const logger = props.logger ?? false;
|
|
56
56
|
const fn = new lambda.NodejsFunction(scope, id, {
|
|
57
|
-
...props.functionProps,
|
|
58
57
|
vpc: props.vpc,
|
|
59
58
|
vpcSubnets: props.vpcSubnets ?? {
|
|
60
59
|
subnetType: aws_ec2_1.SubnetType.PRIVATE_ISOLATED,
|
|
@@ -77,8 +76,8 @@ class Provider extends constructs_1.Construct {
|
|
|
77
76
|
}
|
|
78
77
|
exports.Provider = Provider;
|
|
79
78
|
_a = JSII_RTTI_SYMBOL_1;
|
|
80
|
-
Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "3.
|
|
79
|
+
Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "3.4.0" };
|
|
81
80
|
function slugify(x) {
|
|
82
81
|
return x.replace(/[^a-zA-Z0-9]/g, "");
|
|
83
82
|
}
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync } from \"fs\"\nimport * as path from \"path\"\nimport { Duration, Stack } from \"aws-cdk-lib\"\nimport { IVpc, SubnetType, SubnetSelection } from \"aws-cdk-lib/aws-ec2\"\nimport { IFunction, Runtime } from \"aws-cdk-lib/aws-lambda\"\nimport * as lambda from \"aws-cdk-lib/aws-lambda-nodejs\"\nimport { NodejsFunctionProps } from \"aws-cdk-lib/aws-lambda-nodejs\"\nimport {\n  IDatabaseCluster,\n  IServerlessCluster,\n  IDatabaseInstance,\n} from \"aws-cdk-lib/aws-rds\"\nimport { ISecret } from \"aws-cdk-lib/aws-secretsmanager\"\nimport * as customResources from \"aws-cdk-lib/custom-resources\"\nimport { Construct } from \"constructs\"\n\nexport interface RdsSqlProps {\n  /**\n   * VPC network to place the provider lambda.\n   *\n   * Normally this is the VPC of your database.\n   *\n   * @default - Function is not placed within a VPC.\n   */\n  readonly vpc: IVpc\n\n  /**\n   * Where to place the networkprovivder lambda within the VPC.\n   *\n   * @default - the isolated subnet if not specified\n   */\n  readonly vpcSubnets?: SubnetSelection\n\n  /**\n   * Your database.\n   */\n  readonly cluster: IServerlessCluster | IDatabaseCluster | IDatabaseInstance\n\n  /**\n   * Secret that grants access to your database.\n   *\n   * Usually this is your cluster's master secret.\n   */\n  readonly secret: ISecret\n\n  /**\n   * Timeout for lambda to do its work.\n   *\n   * @default - 5 minutes\n   */\n  readonly timeout?: Duration\n\n  /**\n   * Log SQL statements. This includes passwords. Use only for debugging.\n   *\n   * @default - false\n   */\n  readonly logger?: boolean\n\n  /**\n   * Additional function customization.\n   *\n   * This enables additional function customization such as the log group. However,\n   * lambda function properties controlled by other {RdsSqlProps} parameters will trump\n   * opions set via this parameter.\n   *\n   * @default - empty\n   */\n  readonly functionProps?: NodejsFunctionProps\n}\n\nexport class Provider extends Construct {\n  public readonly serviceToken: string\n  public readonly secret: ISecret\n  public readonly handler: IFunction\n  public readonly cluster: IServerlessCluster | IDatabaseCluster | IDatabaseInstance\n\n  constructor(scope: Construct, id: string, props: RdsSqlProps) {\n    super(scope, id)\n    this.secret = props.secret\n    this.cluster = props.cluster\n\n    const functionName = \"RdsSql\" + slugify(\"28b9e791-af60-4a33-bca8-ffb6f30ef8c5\")\n    this.handler =\n      (Stack.of(this).node.tryFindChild(functionName) as IFunction) ??\n      this.newCustomResourceHandler(scope, functionName, props)\n\n    const provider = new customResources.Provider(this, \"RdsSql\", {\n      onEventHandler: this.handler,\n    })\n    this.serviceToken = provider.serviceToken\n    this.secret.grantRead(this.handler)\n    if (this.secret.encryptionKey) {\n      // It seems we need to grant explicit permission\n      this.secret.encryptionKey.grantDecrypt(this.handler)\n    }\n    if (props.cluster.connections.securityGroups.length === 0) {\n      throw new Error(\"Cluster does not have a security group.\")\n    } else {\n      this.handler.node.defaultChild?.node.addDependency(\n        props.cluster.connections.securityGroups[0]\n      )\n    }\n    this.handler.connections.allowToDefaultPort(props.cluster)\n    this.node.addDependency(props.cluster)\n  }\n\n  protected newCustomResourceHandler(\n    scope: Construct,\n    id: string,\n    props: RdsSqlProps\n  ): lambda.NodejsFunction {\n    const ts_filename = `${__dirname}/handler.ts`\n    const js_filename = `${__dirname}/handler.js`\n    let entry: string\n    if (existsSync(ts_filename)) {\n      entry = ts_filename\n    } else if (existsSync(js_filename)) {\n      entry = js_filename\n    } else {\n      // Ugly hack to support SST (possibly caused by my hack to make SST work with CommonJS libraries)\n      entry = path.join(\n        path.dirname(process.env.npm_package_json || process.cwd()),\n        \"node_modules/cdk-rds-sql/lib/handler.js\"\n      )\n    }\n    const logger = props.logger ?? false\n    const fn = new lambda.NodejsFunction(scope, id, {\n      vpc: props.vpc,\n      vpcSubnets: props.vpcSubnets ?? {\n        subnetType: SubnetType.PRIVATE_ISOLATED,\n      },\n      entry: entry,\n      runtime: Runtime.NODEJS_20_X,\n      timeout: props.timeout ?? Duration.seconds(300),\n      bundling: {\n        sourceMap: true,\n        sourcesContent: false,\n        externalModules: [\"pg-native\"],\n      },\n      environment: {\n        LOGGER: logger.toString(),\n        NODE_OPTIONS: \"--enable-source-maps\",\n      },\n    })\n    return fn\n  }\n}\n\nfunction slugify(x: string): string {\n  return x.replace(/[^a-zA-Z0-9]/g, \"\")\n}\n"]}
|
package/lib/role.js
CHANGED
|
@@ -13,6 +13,15 @@ class Role extends constructs_1.Construct {
|
|
|
13
13
|
(!props.database && !props.databaseName))
|
|
14
14
|
throw "Specify either database or databaseName";
|
|
15
15
|
super(scope, id);
|
|
16
|
+
const host = props.provider.cluster.clusterEndpoint
|
|
17
|
+
? props.provider.cluster.clusterEndpoint.hostname
|
|
18
|
+
: props.provider.cluster.instanceEndpoint.hostname;
|
|
19
|
+
const port = props.provider.cluster.clusterEndpoint
|
|
20
|
+
? props.provider.cluster.clusterEndpoint.port
|
|
21
|
+
: props.provider.cluster.instanceEndpoint.port;
|
|
22
|
+
const identifier = props.provider.cluster.clusterIdentifier
|
|
23
|
+
? props.provider.cluster.clusterIdentifier
|
|
24
|
+
: props.provider.cluster.instanceIdentifier;
|
|
16
25
|
this.secret = new aws_secretsmanager_1.Secret(this, "Secret", {
|
|
17
26
|
secretName: props.secretName,
|
|
18
27
|
encryptionKey: props.encryptionKey,
|
|
@@ -20,10 +29,10 @@ class Role extends constructs_1.Construct {
|
|
|
20
29
|
generateSecretString: {
|
|
21
30
|
passwordLength: 30,
|
|
22
31
|
secretStringTemplate: JSON.stringify({
|
|
23
|
-
dbClusterIdentifier:
|
|
32
|
+
dbClusterIdentifier: identifier,
|
|
24
33
|
engine: "postgres",
|
|
25
|
-
host:
|
|
26
|
-
port:
|
|
34
|
+
host: host,
|
|
35
|
+
port: port,
|
|
27
36
|
username: props.roleName,
|
|
28
37
|
dbname: props.database ? props.database.databaseName : props.databaseName,
|
|
29
38
|
}),
|
|
@@ -50,5 +59,5 @@ class Role extends constructs_1.Construct {
|
|
|
50
59
|
}
|
|
51
60
|
exports.Role = Role;
|
|
52
61
|
_a = JSII_RTTI_SYMBOL_1;
|
|
53
|
-
Role[_a] = { fqn: "cdk-rds-sql.Role", version: "3.
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
Role[_a] = { fqn: "cdk-rds-sql.Role", version: "3.4.0" };
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"role.js","sourceRoot":"","sources":["../src/role.ts"],"names":[],"mappings":"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","sourcesContent":["import { RemovalPolicy } from \"aws-cdk-lib\"\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 { Construct } from \"constructs\"\nimport { IDatabase } from \"./database\"\nimport { Provider } from \"./provider\"\nimport { Role as CustomResourceRole } from \"./role.custom-resource\"\n\nexport interface RoleProps {\n  /**\n   * Provider.\n   */\n  readonly provider: Provider\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 none of `database` or `databaseName` or only one of them.\n   *\n   * @default no connection to any database is granted\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 none of `database` or `databaseName` or only one of them.\n   *\n   * @default no connection to any database is granted\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\nexport class Role extends Construct {\n  /**\n   * The role name.\n   */\n  public readonly roleName: string\n\n  /**\n   * The generated secret.\n   */\n  public readonly secret: ISecret\n\n  constructor(scope: Construct, id: string, props: RoleProps) {\n    if (\n      (props.database && props.databaseName) ||\n      (!props.database && !props.databaseName)\n    )\n      throw \"Specify either database or databaseName\"\n    super(scope, id)\n\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    this.secret = new Secret(this, \"Secret\", {\n      secretName: props.secretName,\n      encryptionKey: props.encryptionKey,\n      description: `Generated secret for postgres role ${props.roleName}`,\n      generateSecretString: {\n        passwordLength: 30, // Oracle password cannot have more than 30 characters\n        secretStringTemplate: JSON.stringify({\n          dbClusterIdentifier: identifier,\n          engine: \"postgres\",\n          host: host,\n          port: port,\n          username: props.roleName,\n          dbname: props.database ? props.database.databaseName : props.databaseName,\n        }),\n        generateStringKey: \"password\",\n        excludeCharacters: \" %+~`#$&*()|[]{}:;<>?!'/@\\\"\\\\\",\n      },\n      removalPolicy: RemovalPolicy.DESTROY,\n    })\n    const role = new CustomResourceRole(this, \"PostgresRole\", {\n      provider: props.provider,\n      roleName: props.roleName,\n      passwordArn: this.secret.secretArn,\n      database: props.database,\n      databaseName: props.databaseName,\n    })\n    role.node.addDependency(this.secret)\n    this.roleName = props.roleName\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"]}
|
package/lib/schema.js
CHANGED
|
@@ -24,5 +24,5 @@ class Schema extends aws_cdk_lib_1.CustomResource {
|
|
|
24
24
|
}
|
|
25
25
|
exports.Schema = Schema;
|
|
26
26
|
_a = JSII_RTTI_SYMBOL_1;
|
|
27
|
-
Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "3.
|
|
27
|
+
Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "3.4.0" };
|
|
28
28
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUFzQnZDLE1BQWEsTUFBTyxTQUFRLDRCQUFjO0lBR3hDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBa0I7UUFDMUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxNQUFNO2dCQUMvQixVQUFVLEVBQUUsS0FBSyxDQUFDLFVBQVU7Z0JBQzVCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVM7YUFDdkU7U0FDRixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDdkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFBO1FBQ2xDLElBQUksS0FBSyxDQUFDLFFBQVE7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDN0QsQ0FBQzs7QUFoQkgsd0JBaUJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIlxuaW1wb3J0IHsgSURhdGFiYXNlIH0gZnJvbSBcIi4vZGF0YWJhc2VcIlxuaW1wb3J0IHsgUmRzU3FsUmVzb3VyY2UgfSBmcm9tIFwiLi9lbnVtXCJcbmltcG9ydCB7IFByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNjaGVtYVByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IFByb3ZpZGVyXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIGRhdGFiYXNlLlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIHVzZSBkZWZhdWx0IGRhdGFiYXNlXG4gICAqL1xuICByZWFkb25seSBkYXRhYmFzZT86IElEYXRhYmFzZVxuXG4gIC8qKlxuICAgKiBTY2hlbWEgbmFtZS5cbiAgICovXG4gIHJlYWRvbmx5IHNjaGVtYU5hbWU6IHN0cmluZ1xufVxuXG5leHBvcnQgY2xhc3MgU2NoZW1hIGV4dGVuZHMgQ3VzdG9tUmVzb3VyY2Uge1xuICBwdWJsaWMgcmVhZG9ubHkgc2NoZW1hTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFNjaGVtYVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3BzLnByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLlNDSEVNQSxcbiAgICAgICAgUmVzb3VyY2VJZDogcHJvcHMuc2NoZW1hTmFtZSxcbiAgICAgICAgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuLFxuICAgICAgICBEYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlID8gcHJvcHMuZGF0YWJhc2UuZGF0YWJhc2VOYW1lIDogdW5kZWZpbmVkLFxuICAgICAgfSxcbiAgICB9KVxuICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLnByb3ZpZGVyKVxuICAgIHRoaXMuc2NoZW1hTmFtZSA9IHByb3BzLnNjaGVtYU5hbWVcbiAgICBpZiAocHJvcHMuZGF0YWJhc2UpIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLmRhdGFiYXNlKVxuICB9XG59XG4iXX0=
|
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: "3.
|
|
27
|
+
Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "3.4.0" };
|
|
28
28
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NxbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUEyQnZDLE1BQWEsR0FBSSxTQUFRLDRCQUFjO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZTtRQUN2RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLEdBQUc7Z0JBQzVCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQ3RFLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUztnQkFDMUIsUUFBUSxFQUFFLEtBQUssQ0FBQyxRQUFRO2FBQ3pCO1NBQ0YsQ0FBQyxDQUFBO1FBQ0YsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ3ZDLElBQUksS0FBSyxDQUFDLFFBQVE7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDN0QsQ0FBQzs7QUFkSCxrQkFlQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEN1c3RvbVJlc291cmNlIH0gZnJvbSBcImF3cy1jZGstbGliXCJcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCJcbmltcG9ydCB7IElEYXRhYmFzZSB9IGZyb20gXCIuL2RhdGFiYXNlXCJcbmltcG9ydCB7IFJkc1NxbFJlc291cmNlIH0gZnJvbSBcIi4vZW51bVwiXG5pbXBvcnQgeyBQcm92aWRlciB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcblxuZXhwb3J0IGludGVyZmFjZSBTcWxQcm9wcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU1FMLlxuICAgKi9cbiAgcmVhZG9ubHkgc3RhdGVtZW50Pzogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIHN0YXRtZW50IHRvIGJlIGV4ZWN1dGVkIHdoZW4gdGhlIHJlc291cmNlIGlzIGRlbGV0ZWRcbiAgICovXG4gIHJlYWRvbmx5IHJvbGxiYWNrPzogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBTcWwgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBTcWxQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5TUUwsXG4gICAgICAgIFNlY3JldEFybjogcHJvcHMucHJvdmlkZXIuc2VjcmV0LnNlY3JldEFybixcbiAgICAgICAgRGF0YWJhc2VOYW1lOiBwcm9wcy5kYXRhYmFzZSA/IHByb3BzLmRhdGFiYXNlLmRhdGFiYXNlTmFtZSA6IHVuZGVmaW5lZCxcbiAgICAgICAgU3RhdGVtZW50OiBwcm9wcy5zdGF0ZW1lbnQsXG4gICAgICAgIFJvbGxiYWNrOiBwcm9wcy5yb2xsYmFjayxcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgICBpZiAocHJvcHMuZGF0YWJhc2UpIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLmRhdGFiYXNlKVxuICB9XG59XG4iXX0=
|
package/package.json
CHANGED
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@types/pg": "^8.11.6",
|
|
41
41
|
"@typescript-eslint/eslint-plugin": "^6",
|
|
42
42
|
"@typescript-eslint/parser": "^6",
|
|
43
|
-
"aws-cdk-lib": "2.
|
|
43
|
+
"aws-cdk-lib": "2.144.0",
|
|
44
44
|
"constructs": "10.3.0",
|
|
45
45
|
"esbuild": "^0.21.3",
|
|
46
46
|
"eslint": "^8",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"typescript": "^4.9.5"
|
|
64
64
|
},
|
|
65
65
|
"peerDependencies": {
|
|
66
|
-
"aws-cdk-lib": "^2.
|
|
66
|
+
"aws-cdk-lib": "^2.144.0",
|
|
67
67
|
"constructs": "^10.3.0"
|
|
68
68
|
},
|
|
69
69
|
"dependencies": {
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
],
|
|
98
98
|
"main": "lib/index.js",
|
|
99
99
|
"license": "Apache-2.0",
|
|
100
|
-
"version": "3.
|
|
100
|
+
"version": "3.4.0",
|
|
101
101
|
"jest": {
|
|
102
102
|
"testMatch": [
|
|
103
103
|
"<rootDir>/src/**/__tests__/**/*.ts?(x)",
|