eoapi-cdk 10.1.1 → 10.2.4
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 +47 -32
- package/lib/bastion-host/index.js +1 -1
- package/lib/database/PgBouncer.d.ts +1 -0
- package/lib/database/PgBouncer.js +30 -1
- package/lib/database/index.d.ts +42 -3
- package/lib/database/index.js +44 -5
- package/lib/database/lambda/package.json +2 -1
- package/lib/database/lambda/pgbouncer-health-check/health-check.sh +135 -0
- package/lib/database/lambda/pgbouncer-health-check/index.d.ts +2 -0
- package/lib/database/lambda/pgbouncer-health-check/index.js +221 -0
- package/lib/database/pgbouncer-setup.sh +127 -12
- package/lib/ingestor-api/index.js +1 -1
- package/lib/lambda-api-gateway/index.js +1 -1
- package/lib/lambda-api-gateway-private/index.js +1 -1
- package/lib/stac-api/index.js +2 -2
- package/lib/stac-auth-proxy/index.js +2 -2
- package/lib/stac-browser/index.js +1 -1
- package/lib/stac-loader/index.js +2 -2
- package/lib/stactools-item-generator/index.js +1 -1
- package/lib/tipg-api/index.js +2 -2
- package/lib/titiler-pgstac-api/index.js +2 -2
- package/package.json +1 -1
package/.jsii
CHANGED
|
@@ -4170,7 +4170,7 @@
|
|
|
4170
4170
|
"kind": "interface",
|
|
4171
4171
|
"locationInModule": {
|
|
4172
4172
|
"filename": "lib/database/index.ts",
|
|
4173
|
-
"line":
|
|
4173
|
+
"line": 335
|
|
4174
4174
|
},
|
|
4175
4175
|
"name": "DatabaseParameters",
|
|
4176
4176
|
"properties": [
|
|
@@ -4183,7 +4183,7 @@
|
|
|
4183
4183
|
"immutable": true,
|
|
4184
4184
|
"locationInModule": {
|
|
4185
4185
|
"filename": "lib/database/index.ts",
|
|
4186
|
-
"line":
|
|
4186
|
+
"line": 351
|
|
4187
4187
|
},
|
|
4188
4188
|
"name": "effectiveCacheSize",
|
|
4189
4189
|
"type": {
|
|
@@ -4199,7 +4199,7 @@
|
|
|
4199
4199
|
"immutable": true,
|
|
4200
4200
|
"locationInModule": {
|
|
4201
4201
|
"filename": "lib/database/index.ts",
|
|
4202
|
-
"line":
|
|
4202
|
+
"line": 361
|
|
4203
4203
|
},
|
|
4204
4204
|
"name": "maintenanceWorkMem",
|
|
4205
4205
|
"type": {
|
|
@@ -4215,7 +4215,7 @@
|
|
|
4215
4215
|
"immutable": true,
|
|
4216
4216
|
"locationInModule": {
|
|
4217
4217
|
"filename": "lib/database/index.ts",
|
|
4218
|
-
"line":
|
|
4218
|
+
"line": 339
|
|
4219
4219
|
},
|
|
4220
4220
|
"name": "maxConnections",
|
|
4221
4221
|
"type": {
|
|
@@ -4231,7 +4231,7 @@
|
|
|
4231
4231
|
"immutable": true,
|
|
4232
4232
|
"locationInModule": {
|
|
4233
4233
|
"filename": "lib/database/index.ts",
|
|
4234
|
-
"line":
|
|
4234
|
+
"line": 366
|
|
4235
4235
|
},
|
|
4236
4236
|
"name": "maxLocksPerTransaction",
|
|
4237
4237
|
"type": {
|
|
@@ -4247,7 +4247,7 @@
|
|
|
4247
4247
|
"immutable": true,
|
|
4248
4248
|
"locationInModule": {
|
|
4249
4249
|
"filename": "lib/database/index.ts",
|
|
4250
|
-
"line":
|
|
4250
|
+
"line": 381
|
|
4251
4251
|
},
|
|
4252
4252
|
"name": "randomPageCost",
|
|
4253
4253
|
"type": {
|
|
@@ -4263,7 +4263,7 @@
|
|
|
4263
4263
|
"immutable": true,
|
|
4264
4264
|
"locationInModule": {
|
|
4265
4265
|
"filename": "lib/database/index.ts",
|
|
4266
|
-
"line":
|
|
4266
|
+
"line": 376
|
|
4267
4267
|
},
|
|
4268
4268
|
"name": "seqPageCost",
|
|
4269
4269
|
"type": {
|
|
@@ -4280,7 +4280,7 @@
|
|
|
4280
4280
|
"immutable": true,
|
|
4281
4281
|
"locationInModule": {
|
|
4282
4282
|
"filename": "lib/database/index.ts",
|
|
4283
|
-
"line":
|
|
4283
|
+
"line": 346
|
|
4284
4284
|
},
|
|
4285
4285
|
"name": "sharedBuffers",
|
|
4286
4286
|
"type": {
|
|
@@ -4296,7 +4296,7 @@
|
|
|
4296
4296
|
"immutable": true,
|
|
4297
4297
|
"locationInModule": {
|
|
4298
4298
|
"filename": "lib/database/index.ts",
|
|
4299
|
-
"line":
|
|
4299
|
+
"line": 371
|
|
4300
4300
|
},
|
|
4301
4301
|
"name": "tempBuffers",
|
|
4302
4302
|
"type": {
|
|
@@ -4312,7 +4312,7 @@
|
|
|
4312
4312
|
"immutable": true,
|
|
4313
4313
|
"locationInModule": {
|
|
4314
4314
|
"filename": "lib/database/index.ts",
|
|
4315
|
-
"line":
|
|
4315
|
+
"line": 356
|
|
4316
4316
|
},
|
|
4317
4317
|
"name": "workMem",
|
|
4318
4318
|
"type": {
|
|
@@ -4818,9 +4818,9 @@
|
|
|
4818
4818
|
"assembly": "eoapi-cdk",
|
|
4819
4819
|
"base": "constructs.Construct",
|
|
4820
4820
|
"docs": {
|
|
4821
|
-
"remarks": "This is a wrapper around the
|
|
4821
|
+
"remarks": "This construct creates an optimized pgSTAC database setup that includes:\n- RDS PostgreSQL instance with pgSTAC extension\n- PgBouncer connection pooler (enabled by default)\n- Automated health monitoring system\n- Optimized database parameters for the selected instance type\n\n## Connection Pooling with PgBouncer\n\nBy default, this construct deploys PgBouncer as a connection pooler running on\na dedicated EC2 instance. PgBouncer provides several benefits:\n\n- **Connection Management**: Pools and reuses database connections to reduce overhead\n- **Performance**: Optimizes connection handling for high-traffic applications\n- **Scalability**: Allows more concurrent connections than the RDS instance alone\n- **Health Monitoring**: Includes comprehensive health checks to ensure availability\n\n### PgBouncer Configuration\n- Pool mode: Transaction-level pooling (default)\n- Maximum client connections: 1000\n- Default pool size: 20 connections per database/user combination\n- Instance type: t3.micro EC2 instance\n\n### Health Check System\nThe construct includes an automated health check system that validates:\n- PgBouncer service is running and listening on port 5432\n- Connection tests to ensure accessibility\n- Cloud-init setup completion before validation\n- Detailed diagnostics for troubleshooting\n\n### Connection Details\nWhen PgBouncer is enabled, applications connect through the PgBouncer instance\nrather than directly to RDS. The `pgstacSecret` contains connection information\npointing to PgBouncer, and the `connectionTarget` property refers to the\nPgBouncer EC2 instance.\n\nTo disable PgBouncer and connect directly to RDS, set `addPgbouncer: false`.\n\nThis is a wrapper around the `rds.DatabaseInstance` higher-level construct\nmaking use of the BootstrapPgStac construct.",
|
|
4822
4822
|
"stability": "experimental",
|
|
4823
|
-
"summary": "An RDS instance with pgSTAC installed."
|
|
4823
|
+
"summary": "An RDS instance with pgSTAC installed and PgBouncer connection pooling."
|
|
4824
4824
|
},
|
|
4825
4825
|
"fqn": "eoapi-cdk.PgStacDatabase",
|
|
4826
4826
|
"initializer": {
|
|
@@ -4829,7 +4829,7 @@
|
|
|
4829
4829
|
},
|
|
4830
4830
|
"locationInModule": {
|
|
4831
4831
|
"filename": "lib/database/index.ts",
|
|
4832
|
-
"line":
|
|
4832
|
+
"line": 83
|
|
4833
4833
|
},
|
|
4834
4834
|
"parameters": [
|
|
4835
4835
|
{
|
|
@@ -4855,7 +4855,7 @@
|
|
|
4855
4855
|
"kind": "class",
|
|
4856
4856
|
"locationInModule": {
|
|
4857
4857
|
"filename": "lib/database/index.ts",
|
|
4858
|
-
"line":
|
|
4858
|
+
"line": 72
|
|
4859
4859
|
},
|
|
4860
4860
|
"methods": [
|
|
4861
4861
|
{
|
|
@@ -4864,7 +4864,7 @@
|
|
|
4864
4864
|
},
|
|
4865
4865
|
"locationInModule": {
|
|
4866
4866
|
"filename": "lib/database/index.ts",
|
|
4867
|
-
"line":
|
|
4867
|
+
"line": 234
|
|
4868
4868
|
},
|
|
4869
4869
|
"name": "getParameters",
|
|
4870
4870
|
"parameters": [
|
|
@@ -4903,7 +4903,7 @@
|
|
|
4903
4903
|
"immutable": true,
|
|
4904
4904
|
"locationInModule": {
|
|
4905
4905
|
"filename": "lib/database/index.ts",
|
|
4906
|
-
"line":
|
|
4906
|
+
"line": 78
|
|
4907
4907
|
},
|
|
4908
4908
|
"name": "connectionTarget",
|
|
4909
4909
|
"type": {
|
|
@@ -4926,7 +4926,7 @@
|
|
|
4926
4926
|
"immutable": true,
|
|
4927
4927
|
"locationInModule": {
|
|
4928
4928
|
"filename": "lib/database/index.ts",
|
|
4929
|
-
"line":
|
|
4929
|
+
"line": 77
|
|
4930
4930
|
},
|
|
4931
4931
|
"name": "pgstacVersion",
|
|
4932
4932
|
"type": {
|
|
@@ -4940,7 +4940,22 @@
|
|
|
4940
4940
|
"immutable": true,
|
|
4941
4941
|
"locationInModule": {
|
|
4942
4942
|
"filename": "lib/database/index.ts",
|
|
4943
|
-
"line":
|
|
4943
|
+
"line": 81
|
|
4944
|
+
},
|
|
4945
|
+
"name": "pgbouncerHealthCheck",
|
|
4946
|
+
"optional": true,
|
|
4947
|
+
"type": {
|
|
4948
|
+
"fqn": "aws-cdk-lib.CustomResource"
|
|
4949
|
+
}
|
|
4950
|
+
},
|
|
4951
|
+
{
|
|
4952
|
+
"docs": {
|
|
4953
|
+
"stability": "experimental"
|
|
4954
|
+
},
|
|
4955
|
+
"immutable": true,
|
|
4956
|
+
"locationInModule": {
|
|
4957
|
+
"filename": "lib/database/index.ts",
|
|
4958
|
+
"line": 80
|
|
4944
4959
|
},
|
|
4945
4960
|
"name": "secretBootstrapper",
|
|
4946
4961
|
"optional": true,
|
|
@@ -4955,7 +4970,7 @@
|
|
|
4955
4970
|
"immutable": true,
|
|
4956
4971
|
"locationInModule": {
|
|
4957
4972
|
"filename": "lib/database/index.ts",
|
|
4958
|
-
"line":
|
|
4973
|
+
"line": 79
|
|
4959
4974
|
},
|
|
4960
4975
|
"name": "securityGroup",
|
|
4961
4976
|
"optional": true,
|
|
@@ -4969,7 +4984,7 @@
|
|
|
4969
4984
|
},
|
|
4970
4985
|
"locationInModule": {
|
|
4971
4986
|
"filename": "lib/database/index.ts",
|
|
4972
|
-
"line":
|
|
4987
|
+
"line": 73
|
|
4973
4988
|
},
|
|
4974
4989
|
"name": "db",
|
|
4975
4990
|
"type": {
|
|
@@ -4982,7 +4997,7 @@
|
|
|
4982
4997
|
},
|
|
4983
4998
|
"locationInModule": {
|
|
4984
4999
|
"filename": "lib/database/index.ts",
|
|
4985
|
-
"line":
|
|
5000
|
+
"line": 74
|
|
4986
5001
|
},
|
|
4987
5002
|
"name": "pgstacSecret",
|
|
4988
5003
|
"type": {
|
|
@@ -5005,7 +5020,7 @@
|
|
|
5005
5020
|
"kind": "interface",
|
|
5006
5021
|
"locationInModule": {
|
|
5007
5022
|
"filename": "lib/database/index.ts",
|
|
5008
|
-
"line":
|
|
5023
|
+
"line": 274
|
|
5009
5024
|
},
|
|
5010
5025
|
"name": "PgStacDatabaseProps",
|
|
5011
5026
|
"properties": [
|
|
@@ -5019,7 +5034,7 @@
|
|
|
5019
5034
|
"immutable": true,
|
|
5020
5035
|
"locationInModule": {
|
|
5021
5036
|
"filename": "lib/database/index.ts",
|
|
5022
|
-
"line":
|
|
5037
|
+
"line": 308
|
|
5023
5038
|
},
|
|
5024
5039
|
"name": "addPgbouncer",
|
|
5025
5040
|
"optional": true,
|
|
@@ -5037,7 +5052,7 @@
|
|
|
5037
5052
|
"immutable": true,
|
|
5038
5053
|
"locationInModule": {
|
|
5039
5054
|
"filename": "lib/database/index.ts",
|
|
5040
|
-
"line":
|
|
5055
|
+
"line": 332
|
|
5041
5056
|
},
|
|
5042
5057
|
"name": "bootstrapperLambdaFunctionOptions",
|
|
5043
5058
|
"optional": true,
|
|
@@ -5055,7 +5070,7 @@
|
|
|
5055
5070
|
"immutable": true,
|
|
5056
5071
|
"locationInModule": {
|
|
5057
5072
|
"filename": "lib/database/index.ts",
|
|
5058
|
-
"line":
|
|
5073
|
+
"line": 323
|
|
5059
5074
|
},
|
|
5060
5075
|
"name": "customResourceProperties",
|
|
5061
5076
|
"optional": true,
|
|
@@ -5078,7 +5093,7 @@
|
|
|
5078
5093
|
"immutable": true,
|
|
5079
5094
|
"locationInModule": {
|
|
5080
5095
|
"filename": "lib/database/index.ts",
|
|
5081
|
-
"line":
|
|
5096
|
+
"line": 315
|
|
5082
5097
|
},
|
|
5083
5098
|
"name": "pgbouncerInstanceProps",
|
|
5084
5099
|
"optional": true,
|
|
@@ -5096,7 +5111,7 @@
|
|
|
5096
5111
|
"immutable": true,
|
|
5097
5112
|
"locationInModule": {
|
|
5098
5113
|
"filename": "lib/database/index.ts",
|
|
5099
|
-
"line":
|
|
5114
|
+
"line": 280
|
|
5100
5115
|
},
|
|
5101
5116
|
"name": "pgstacDbName",
|
|
5102
5117
|
"optional": true,
|
|
@@ -5114,7 +5129,7 @@
|
|
|
5114
5129
|
"immutable": true,
|
|
5115
5130
|
"locationInModule": {
|
|
5116
5131
|
"filename": "lib/database/index.ts",
|
|
5117
|
-
"line":
|
|
5132
|
+
"line": 301
|
|
5118
5133
|
},
|
|
5119
5134
|
"name": "pgstacUsername",
|
|
5120
5135
|
"optional": true,
|
|
@@ -5132,7 +5147,7 @@
|
|
|
5132
5147
|
"immutable": true,
|
|
5133
5148
|
"locationInModule": {
|
|
5134
5149
|
"filename": "lib/database/index.ts",
|
|
5135
|
-
"line":
|
|
5150
|
+
"line": 287
|
|
5136
5151
|
},
|
|
5137
5152
|
"name": "pgstacVersion",
|
|
5138
5153
|
"optional": true,
|
|
@@ -5150,7 +5165,7 @@
|
|
|
5150
5165
|
"immutable": true,
|
|
5151
5166
|
"locationInModule": {
|
|
5152
5167
|
"filename": "lib/database/index.ts",
|
|
5153
|
-
"line":
|
|
5168
|
+
"line": 294
|
|
5154
5169
|
},
|
|
5155
5170
|
"name": "secretsPrefix",
|
|
5156
5171
|
"optional": true,
|
|
@@ -7696,6 +7711,6 @@
|
|
|
7696
7711
|
"symbolId": "lib/titiler-pgstac-api/index:TitilerPgstacApiLambdaRuntimeProps"
|
|
7697
7712
|
}
|
|
7698
7713
|
},
|
|
7699
|
-
"version": "10.
|
|
7700
|
-
"fingerprint": "+
|
|
7714
|
+
"version": "10.2.4",
|
|
7715
|
+
"fingerprint": "M+MIgofb3T0CiInM+HburxstD8Pn3AYdsTZigrb0ljQ="
|
|
7701
7716
|
}
|
|
@@ -158,5 +158,5 @@ class BastionHost extends constructs_1.Construct {
|
|
|
158
158
|
}
|
|
159
159
|
exports.BastionHost = BastionHost;
|
|
160
160
|
_a = JSII_RTTI_SYMBOL_1;
|
|
161
|
-
BastionHost[_a] = { fqn: "eoapi-cdk.BastionHost", version: "10.
|
|
161
|
+
BastionHost[_a] = { fqn: "eoapi-cdk.BastionHost", version: "10.2.4" };
|
|
162
162
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Stack,\n  aws_ec2 as ec2,\n  aws_iam as iam,\n  aws_rds as rds,\n  CfnOutput,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\n\n/**\n * The database is located in an isolated subnet, meaning that it is not accessible from the public internet. As such, to interact with the database directly, a user must tunnel through a bastion host.\n *\n * ### Configuring\n *\n * This codebase controls _who_ is allowed to connect to the bastion host. This requires two steps:\n *\n * 1. Adding the IP address from which you are connecting to the `ipv4Allowlist` array\n * 1. Creating a bastion host system user by adding the user's configuration inform to `userdata.yaml`\n *\n * #### Adding an IP address to the `ipv4Allowlist` array\n *\n * The `BastionHost` construct takes in an `ipv4Allowlist` array as an argument. Find your IP address (eg `curl api.ipify.org`) and add that to the array along with the trailing CIDR block (likely `/32` to indicate that you are adding a single IP address).\n *\n * #### Creating a user via `userdata.yaml`\n *\n * Add an entry to the `users` array with a username (likely matching your local systems username, which you can get by running the `whoami` command in your terminal) and a public key (likely your default public key, which you can get by running `cat ~/.ssh/id_*.pub` in your terminal).\n *\n * #### Tips & Tricks when using the Bastion Host\n *\n * **Connecting to RDS Instance via SSM**\n *\n * ```sh\n * aws ssm start-session --target $INSTANCE_ID \\\n * --document-name AWS-StartPortForwardingSessionToRemoteHost \\\n * --parameters '{\n * \"host\": [\n * \"example-db.c5abcdefghij.us-west-2.rds.amazonaws.com\"\n * ],\n * \"portNumber\": [\n * \"5432\"\n * ],\n * \"localPortNumber\": [\n * \"9999\"\n * ]\n * }' \\\n * --profile $AWS_PROFILE\n * ```\n *\n * ```sh\n * psql -h localhost -p 9999 # continue adding username (-U) and db (-d) here...\n * ```\n *\n * Connect directly to Bastion Host:\n *\n * ```sh\n * aws ssm start-session --target $INSTANCE_ID --profile $AWS_PROFILE\n * ```\n *\n * **Setting up an SSH tunnel**\n *\n * In your `~/.ssh/config` file, add an entry like:\n *\n * ```\n * Host db-tunnel\n * Hostname {the-bastion-host-address}\n * LocalForward 9999 {the-db-hostname}:5432\n * ```\n *\n * Then a tunnel can be opened via:\n *\n * ```\n * ssh -N db-tunnel\n * ```\n *\n * And a connection to the DB can be made via:\n *\n * ```\n * psql -h 127.0.0.1 -p 9999 -U {username} -d {database}\n * ```\n *\n * **Handling `REMOTE HOST IDENTIFICATION HAS CHANGED!` error**\n *\n * If you've redeployed a bastion host that you've previously connected to, you may see an error like:\n *\n * ```\n * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n * @    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @\n * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n * IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\n * Someone could be eavesdropping on you right now (man-in-the-middle attack)!\n * It is also possible that a host key has just been changed.\n * The fingerprint for the ECDSA key sent by the remote host is\n * SHA256:mPnxAOXTpb06PFgI1Qc8TMQ2e9b7goU8y2NdS5hzIr8.\n * Please contact your system administrator.\n * Add correct host key in /Users/username/.ssh/known_hosts to get rid of this message.\n * Offending ECDSA key in /Users/username/.ssh/known_hosts:28\n * ECDSA host key for ec2-12-34-56-789.us-west-2.compute.amazonaws.com has changed and you have requested strict checking.\n * Host key verification failed.\n * ```\n *\n * This is due to the server's fingerprint changing. We can scrub the fingerprint from our system with a command like:\n *\n * ```\n * ssh-keygen -R 12.34.56.789\n * ```\n *\n */\nexport class BastionHost extends Construct {\n  instance: ec2.Instance;\n\n  constructor(scope: Construct, id: string, props: BastionHostProps) {\n    super(scope, id);\n\n    const { stackName } = Stack.of(this);\n\n    // Build ec2 instance\n    this.instance = new ec2.Instance(this, \"bastion-host\", {\n      vpc: props.vpc,\n      vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC },\n      instanceName: `${stackName} bastion host`,\n      instanceType: ec2.InstanceType.of(\n        ec2.InstanceClass.BURSTABLE4_GRAVITON,\n        ec2.InstanceSize.NANO\n      ),\n      machineImage: ec2.MachineImage.latestAmazonLinux({\n        generation: ec2.AmazonLinuxGeneration.AMAZON_LINUX_2,\n        cpuType: ec2.AmazonLinuxCpuType.ARM_64,\n      }),\n      userData: props.userData,\n      userDataCausesReplacement: true,\n    });\n\n    // Assign elastic IP\n    if (props.createElasticIp ?? true) {\n      new ec2.CfnEIP(this, \"IP\", {\n        instanceId: this.instance.instanceId,\n        tags: [{ key: \"Name\", value: stackName }],\n      });\n    }\n\n    // Allow bastion host to connect to db\n    this.instance.connections.allowTo(\n      props.db.connections.securityGroups[0],\n      ec2.Port.tcp(5432),\n      \"Allow connection from bastion host\"\n    );\n\n    // Allow IP access to bastion host\n    for (const ipv4 of props.ipv4Allowlist) {\n      this.instance.connections.allowFrom(\n        ec2.Peer.ipv4(ipv4),\n        ec2.Port.tcp(props.sshPort || 22),\n        \"SSH Access\"\n      );\n    }\n\n    // Integrate with SSM\n    this.instance.addToRolePolicy(\n      new iam.PolicyStatement({\n        actions: [\n          \"ssmmessages:*\",\n          \"ssm:UpdateInstanceInformation\",\n          \"ec2messages:*\",\n        ],\n        resources: [\"*\"],\n      })\n    );\n\n    new CfnOutput(this, \"instance-id-output\", {\n      value: this.instance.instanceId,\n      exportName: `${stackName}-instance-id`,\n    });\n    new CfnOutput(this, \"instance-public-ip-output\", {\n      value: this.instance.instancePublicIp,\n      exportName: `${stackName}-instance-public-ip`,\n    });\n    new CfnOutput(this, \"instance-public-dns-name-output\", {\n      value: this.instance.instancePublicDnsName,\n      exportName: `${stackName}-public-dns-name`,\n    });\n  }\n}\n\nexport interface BastionHostProps {\n  readonly vpc: ec2.IVpc;\n  readonly db: rds.IDatabaseInstance;\n  readonly userData: ec2.UserData;\n  readonly ipv4Allowlist: string[];\n  readonly sshPort?: number;\n\n  /**\n   * Whether or not an elastic IP should be created for the bastion host.\n   *\n   * @default false\n   */\n  readonly createElasticIp?: boolean;\n}\n"]}
|
|
@@ -46,6 +46,7 @@ export declare class PgBouncer extends Construct {
|
|
|
46
46
|
readonly pgbouncerSecret: secretsmanager.Secret;
|
|
47
47
|
readonly securityGroup: ec2.SecurityGroup;
|
|
48
48
|
readonly secretUpdateComplete: CustomResource;
|
|
49
|
+
readonly healthCheck: CustomResource;
|
|
49
50
|
private getDefaultPgbouncerConfig;
|
|
50
51
|
constructor(scope: Construct, id: string, props: PgBouncerProps);
|
|
51
52
|
private loadUserDataScript;
|
|
@@ -116,6 +116,35 @@ class PgBouncer extends constructs_1.Construct {
|
|
|
116
116
|
: this.instance.instancePrivateIp,
|
|
117
117
|
},
|
|
118
118
|
});
|
|
119
|
+
// Add health check custom resource
|
|
120
|
+
const healthCheckFunction = new aws_cdk_lib_1.aws_lambda.Function(this, "HealthCheckFunction", {
|
|
121
|
+
runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_20_X,
|
|
122
|
+
handler: "index.handler",
|
|
123
|
+
timeout: aws_cdk_lib_1.Duration.minutes(10),
|
|
124
|
+
code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(__dirname, "lambda/pgbouncer-health-check")),
|
|
125
|
+
description: "PgBouncer health check function",
|
|
126
|
+
});
|
|
127
|
+
// Grant SSM permissions for health check
|
|
128
|
+
healthCheckFunction.addToRolePolicy(new aws_cdk_lib_1.aws_iam.PolicyStatement({
|
|
129
|
+
actions: [
|
|
130
|
+
"ssm:SendCommand",
|
|
131
|
+
"ssm:GetCommandInvocation",
|
|
132
|
+
"ssm:DescribeInstanceInformation",
|
|
133
|
+
"ssm:ListCommandInvocations",
|
|
134
|
+
],
|
|
135
|
+
resources: ["*"],
|
|
136
|
+
}));
|
|
137
|
+
this.healthCheck = new aws_cdk_lib_1.CustomResource(this, "PgBouncerHealthCheck", {
|
|
138
|
+
serviceToken: healthCheckFunction.functionArn,
|
|
139
|
+
properties: {
|
|
140
|
+
InstanceId: this.instance.instanceId,
|
|
141
|
+
// Add timestamp to force re-execution on stack updates
|
|
142
|
+
Timestamp: new Date().toISOString(),
|
|
143
|
+
},
|
|
144
|
+
});
|
|
145
|
+
// Ensure health check runs after instance is created but before secret update
|
|
146
|
+
this.healthCheck.node.addDependency(this.instance);
|
|
147
|
+
this.secretUpdateComplete.node.addDependency(this.healthCheck);
|
|
119
148
|
}
|
|
120
149
|
loadUserDataScript(pgBouncerConfig, database) {
|
|
121
150
|
const userDataScript = aws_cdk_lib_1.aws_ec2.UserData.forLinux();
|
|
@@ -131,4 +160,4 @@ class PgBouncer extends constructs_1.Construct {
|
|
|
131
160
|
}
|
|
132
161
|
}
|
|
133
162
|
exports.PgBouncer = PgBouncer;
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PgBouncer.js","sourceRoot":"","sources":["PgBouncer.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  aws_ec2 as ec2,\n  aws_iam as iam,\n  aws_lambda as lambda,\n  aws_secretsmanager as secretsmanager,\n  CustomResource,\n  Stack,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\n\nimport * as fs from \"fs\";\nimport * as path from \"path\";\n\n// used to populate pgbouncer config:\n// see https://www.pgbouncer.org/config.html for details\nexport interface PgBouncerConfigProps {\n  poolMode?: \"transaction\" | \"session\" | \"statement\";\n  maxClientConn?: number;\n  defaultPoolSize?: number;\n  minPoolSize?: number;\n  reservePoolSize?: number;\n  reservePoolTimeout?: number;\n  maxDbConnections?: number;\n  maxUserConnections?: number;\n}\n\nexport interface PgBouncerProps {\n  /**\n   * VPC to deploy PgBouncer into\n   */\n  vpc: ec2.IVpc;\n\n  /**\n   * The RDS instance to connect to\n   */\n  database: {\n    connections: ec2.Connections;\n    secret: secretsmanager.ISecret;\n  };\n\n  /**\n   * Maximum connections setting for the database.\n   * PgBouncer will use 10 fewer than this value.\n   */\n  dbMaxConnections: number;\n\n  /**\n   * Whether to deploy in public subnet\n   * @default false\n   */\n  usePublicSubnet?: boolean;\n\n  /**\n   * PgBouncer configuration options\n   */\n  pgBouncerConfig?: PgBouncerConfigProps;\n\n  /**\n   * EC2 instance options\n   */\n  instanceProps?: Partial<ec2.InstanceProps>;\n}\n\nexport class PgBouncer extends Construct {\n  public readonly instance: ec2.Instance;\n  public readonly pgbouncerSecret: secretsmanager.Secret;\n  public readonly securityGroup: ec2.SecurityGroup;\n  public readonly secretUpdateComplete: CustomResource;\n\n  // The max_connections parameter in PgBouncer determines the maximum number of\n  // connections to open on the actual database instance. We want that number to\n  // be slightly smaller than the actual max_connections value on the RDS instance\n  // so we perform this calculation.\n\n  private getDefaultPgbouncerConfig(\n    dbMaxConnections: number\n  ): Required<PgBouncerConfigProps> {\n    // maxDbConnections (and maxUserConnections) are the only settings that need\n    // to be responsive to the database size/max_connections setting\n    return {\n      poolMode: \"transaction\",\n      maxClientConn: 1000,\n      defaultPoolSize: 5,\n      minPoolSize: 0,\n      reservePoolSize: 5,\n      reservePoolTimeout: 5,\n      maxDbConnections: dbMaxConnections - 10,\n      maxUserConnections: dbMaxConnections - 10,\n    };\n  }\n\n  constructor(scope: Construct, id: string, props: PgBouncerProps) {\n    super(scope, id);\n\n    // Set defaults for optional props\n\n    const defaultPgbouncerConfig = this.getDefaultPgbouncerConfig(\n      props.dbMaxConnections\n    );\n\n    // Merge provided config with defaults\n    const pgBouncerConfig: Required<PgBouncerConfigProps> = {\n      ...defaultPgbouncerConfig,\n      ...props.pgBouncerConfig,\n    };\n\n    // Create role for PgBouncer instance to enable writing to CloudWatch\n    const role = new iam.Role(this, \"InstanceRole\", {\n      description:\n        \"pgbouncer instance role with Systems Manager + CloudWatch permissions\",\n      assumedBy: new iam.ServicePrincipal(\"ec2.amazonaws.com\"),\n      managedPolicies: [\n        iam.ManagedPolicy.fromAwsManagedPolicyName(\n          \"AmazonSSMManagedInstanceCore\"\n        ),\n        iam.ManagedPolicy.fromAwsManagedPolicyName(\n          \"CloudWatchAgentServerPolicy\"\n        ),\n      ],\n    });\n\n    // Add policy to allow reading RDS credentials from Secrets Manager\n    role.addToPolicy(\n      new iam.PolicyStatement({\n        actions: [\"secretsmanager:GetSecretValue\"],\n        resources: [props.database.secret.secretArn],\n      })\n    );\n\n    // Create a security group and allow connections from the Lambda IP ranges for this region\n    this.securityGroup = new ec2.SecurityGroup(this, \"PgBouncerSecurityGroup\", {\n      vpc: props.vpc,\n      description: \"Security group for PgBouncer instance\",\n      allowAllOutbound: true,\n    });\n\n    // Create PgBouncer instance\n    const defaultInstanceConfig: Omit<ec2.InstanceProps, \"vpc\"> = {\n      instanceName: \"pgbouncer\",\n      instanceType: ec2.InstanceType.of(\n        ec2.InstanceClass.T3,\n        ec2.InstanceSize.MICRO\n      ),\n      vpcSubnets: {\n        subnetType: props.usePublicSubnet\n          ? ec2.SubnetType.PUBLIC\n          : ec2.SubnetType.PRIVATE_WITH_EGRESS,\n      },\n      machineImage: ec2.MachineImage.fromSsmParameter(\n        \"/aws/service/canonical/ubuntu/server/noble/stable/current/amd64/hvm/ebs-gp3/ami-id\",\n        { os: ec2.OperatingSystemType.LINUX }\n      ),\n      blockDevices: [\n        {\n          deviceName: \"/dev/xvda\",\n          volume: ec2.BlockDeviceVolume.ebs(20, {\n            volumeType: ec2.EbsDeviceVolumeType.GP3,\n            encrypted: true,\n            deleteOnTermination: true,\n          }),\n        },\n      ],\n      role,\n      securityGroup: this.securityGroup,\n      userData: this.loadUserDataScript(pgBouncerConfig, props.database),\n      userDataCausesReplacement: true,\n      associatePublicIpAddress: props.usePublicSubnet,\n    };\n\n    this.instance = new ec2.Instance(this, \"Instance\", {\n      ...defaultInstanceConfig,\n      ...props.instanceProps,\n      vpc: props.vpc,\n    });\n\n    // Allow PgBouncer to connect to RDS\n    props.database.connections.allowFrom(\n      this.instance,\n      ec2.Port.tcp(5432),\n      \"Allow PgBouncer to connect to RDS\"\n    );\n\n    // Create a new secret for pgbouncer connection credentials\n    this.pgbouncerSecret = new secretsmanager.Secret(this, \"PgBouncerSecret\", {\n      description: \"Connection information for PgBouncer instance\",\n      generateSecretString: {\n        generateStringKey: \"dummy\",\n        secretStringTemplate: \"{}\",\n      },\n    });\n\n    // Grant the role permission to read the new secret\n    this.pgbouncerSecret.grantRead(role);\n\n    // Update pgbouncerSecret to contain pgstacSecret values but with new value for host\n    const secretUpdaterFn = new lambda.Function(this, \"SecretUpdaterFunction\", {\n      runtime: lambda.Runtime.NODEJS_20_X,\n      handler: \"index.handler\",\n      code: lambda.Code.fromAsset(\n        path.join(__dirname, \"lambda/pgbouncer-secret-updater\")\n      ),\n      environment: {\n        SOURCE_SECRET_ARN: props.database.secret.secretArn,\n        TARGET_SECRET_ARN: this.pgbouncerSecret.secretArn,\n      },\n    });\n\n    props.database.secret.grantRead(secretUpdaterFn);\n    this.pgbouncerSecret.grantWrite(secretUpdaterFn);\n\n    this.secretUpdateComplete = new CustomResource(\n      this,\n      \"pgbouncerSecretBootstrapper\",\n      {\n        serviceToken: secretUpdaterFn.functionArn,\n        properties: {\n          instanceIp: props.usePublicSubnet\n            ? this.instance.instancePublicIp\n            : this.instance.instancePrivateIp,\n        },\n      }\n    );\n  }\n\n  private loadUserDataScript(\n    pgBouncerConfig: Required<NonNullable<PgBouncerProps[\"pgBouncerConfig\"]>>,\n    database: { secret: secretsmanager.ISecret }\n  ): ec2.UserData {\n    const userDataScript = ec2.UserData.forLinux();\n\n    // Set environment variables with configuration parameters\n    userDataScript.addCommands(\n      'export SECRET_ARN=\"' + database.secret.secretArn + '\"',\n      'export REGION=\"' + Stack.of(this).region + '\"',\n      'export POOL_MODE=\"' + pgBouncerConfig.poolMode + '\"',\n      'export MAX_CLIENT_CONN=\"' + pgBouncerConfig.maxClientConn + '\"',\n      'export DEFAULT_POOL_SIZE=\"' + pgBouncerConfig.defaultPoolSize + '\"',\n      'export MIN_POOL_SIZE=\"' + pgBouncerConfig.minPoolSize + '\"',\n      'export RESERVE_POOL_SIZE=\"' + pgBouncerConfig.reservePoolSize + '\"',\n      'export RESERVE_POOL_TIMEOUT=\"' +\n        pgBouncerConfig.reservePoolTimeout +\n        '\"',\n      'export MAX_DB_CONNECTIONS=\"' + pgBouncerConfig.maxDbConnections + '\"',\n      'export MAX_USER_CONNECTIONS=\"' + pgBouncerConfig.maxUserConnections + '\"'\n    );\n\n    // Load the startup script\n    const scriptPath = path.join(__dirname, \"./pgbouncer-setup.sh\");\n    let script = fs.readFileSync(scriptPath, \"utf8\");\n\n    userDataScript.addCommands(script);\n\n    return userDataScript;\n  }\n}\n"]}
|
|
163
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PgBouncer.js","sourceRoot":"","sources":["PgBouncer.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  aws_ec2 as ec2,\n  aws_iam as iam,\n  aws_lambda as lambda,\n  aws_secretsmanager as secretsmanager,\n  CustomResource,\n  Duration,\n  Stack,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\n\nimport * as fs from \"fs\";\nimport * as path from \"path\";\n\n// used to populate pgbouncer config:\n// see https://www.pgbouncer.org/config.html for details\nexport interface PgBouncerConfigProps {\n  poolMode?: \"transaction\" | \"session\" | \"statement\";\n  maxClientConn?: number;\n  defaultPoolSize?: number;\n  minPoolSize?: number;\n  reservePoolSize?: number;\n  reservePoolTimeout?: number;\n  maxDbConnections?: number;\n  maxUserConnections?: number;\n}\n\nexport interface PgBouncerProps {\n  /**\n   * VPC to deploy PgBouncer into\n   */\n  vpc: ec2.IVpc;\n\n  /**\n   * The RDS instance to connect to\n   */\n  database: {\n    connections: ec2.Connections;\n    secret: secretsmanager.ISecret;\n  };\n\n  /**\n   * Maximum connections setting for the database.\n   * PgBouncer will use 10 fewer than this value.\n   */\n  dbMaxConnections: number;\n\n  /**\n   * Whether to deploy in public subnet\n   * @default false\n   */\n  usePublicSubnet?: boolean;\n\n  /**\n   * PgBouncer configuration options\n   */\n  pgBouncerConfig?: PgBouncerConfigProps;\n\n  /**\n   * EC2 instance options\n   */\n  instanceProps?: Partial<ec2.InstanceProps>;\n}\n\nexport class PgBouncer extends Construct {\n  public readonly instance: ec2.Instance;\n  public readonly pgbouncerSecret: secretsmanager.Secret;\n  public readonly securityGroup: ec2.SecurityGroup;\n  public readonly secretUpdateComplete: CustomResource;\n  public readonly healthCheck: CustomResource;\n\n  // The max_connections parameter in PgBouncer determines the maximum number of\n  // connections to open on the actual database instance. We want that number to\n  // be slightly smaller than the actual max_connections value on the RDS instance\n  // so we perform this calculation.\n\n  private getDefaultPgbouncerConfig(\n    dbMaxConnections: number\n  ): Required<PgBouncerConfigProps> {\n    // maxDbConnections (and maxUserConnections) are the only settings that need\n    // to be responsive to the database size/max_connections setting\n    return {\n      poolMode: \"transaction\",\n      maxClientConn: 1000,\n      defaultPoolSize: 5,\n      minPoolSize: 0,\n      reservePoolSize: 5,\n      reservePoolTimeout: 5,\n      maxDbConnections: dbMaxConnections - 10,\n      maxUserConnections: dbMaxConnections - 10,\n    };\n  }\n\n  constructor(scope: Construct, id: string, props: PgBouncerProps) {\n    super(scope, id);\n\n    // Set defaults for optional props\n\n    const defaultPgbouncerConfig = this.getDefaultPgbouncerConfig(\n      props.dbMaxConnections\n    );\n\n    // Merge provided config with defaults\n    const pgBouncerConfig: Required<PgBouncerConfigProps> = {\n      ...defaultPgbouncerConfig,\n      ...props.pgBouncerConfig,\n    };\n\n    // Create role for PgBouncer instance to enable writing to CloudWatch\n    const role = new iam.Role(this, \"InstanceRole\", {\n      description:\n        \"pgbouncer instance role with Systems Manager + CloudWatch permissions\",\n      assumedBy: new iam.ServicePrincipal(\"ec2.amazonaws.com\"),\n      managedPolicies: [\n        iam.ManagedPolicy.fromAwsManagedPolicyName(\n          \"AmazonSSMManagedInstanceCore\"\n        ),\n        iam.ManagedPolicy.fromAwsManagedPolicyName(\n          \"CloudWatchAgentServerPolicy\"\n        ),\n      ],\n    });\n\n    // Add policy to allow reading RDS credentials from Secrets Manager\n    role.addToPolicy(\n      new iam.PolicyStatement({\n        actions: [\"secretsmanager:GetSecretValue\"],\n        resources: [props.database.secret.secretArn],\n      })\n    );\n\n    // Create a security group and allow connections from the Lambda IP ranges for this region\n    this.securityGroup = new ec2.SecurityGroup(this, \"PgBouncerSecurityGroup\", {\n      vpc: props.vpc,\n      description: \"Security group for PgBouncer instance\",\n      allowAllOutbound: true,\n    });\n\n    // Create PgBouncer instance\n    const defaultInstanceConfig: Omit<ec2.InstanceProps, \"vpc\"> = {\n      instanceName: \"pgbouncer\",\n      instanceType: ec2.InstanceType.of(\n        ec2.InstanceClass.T3,\n        ec2.InstanceSize.MICRO\n      ),\n      vpcSubnets: {\n        subnetType: props.usePublicSubnet\n          ? ec2.SubnetType.PUBLIC\n          : ec2.SubnetType.PRIVATE_WITH_EGRESS,\n      },\n      machineImage: ec2.MachineImage.fromSsmParameter(\n        \"/aws/service/canonical/ubuntu/server/noble/stable/current/amd64/hvm/ebs-gp3/ami-id\",\n        { os: ec2.OperatingSystemType.LINUX }\n      ),\n      blockDevices: [\n        {\n          deviceName: \"/dev/xvda\",\n          volume: ec2.BlockDeviceVolume.ebs(20, {\n            volumeType: ec2.EbsDeviceVolumeType.GP3,\n            encrypted: true,\n            deleteOnTermination: true,\n          }),\n        },\n      ],\n      role,\n      securityGroup: this.securityGroup,\n      userData: this.loadUserDataScript(pgBouncerConfig, props.database),\n      userDataCausesReplacement: true,\n      associatePublicIpAddress: props.usePublicSubnet,\n    };\n\n    this.instance = new ec2.Instance(this, \"Instance\", {\n      ...defaultInstanceConfig,\n      ...props.instanceProps,\n      vpc: props.vpc,\n    });\n\n    // Allow PgBouncer to connect to RDS\n    props.database.connections.allowFrom(\n      this.instance,\n      ec2.Port.tcp(5432),\n      \"Allow PgBouncer to connect to RDS\"\n    );\n\n    // Create a new secret for pgbouncer connection credentials\n    this.pgbouncerSecret = new secretsmanager.Secret(this, \"PgBouncerSecret\", {\n      description: \"Connection information for PgBouncer instance\",\n      generateSecretString: {\n        generateStringKey: \"dummy\",\n        secretStringTemplate: \"{}\",\n      },\n    });\n\n    // Grant the role permission to read the new secret\n    this.pgbouncerSecret.grantRead(role);\n\n    // Update pgbouncerSecret to contain pgstacSecret values but with new value for host\n    const secretUpdaterFn = new lambda.Function(this, \"SecretUpdaterFunction\", {\n      runtime: lambda.Runtime.NODEJS_20_X,\n      handler: \"index.handler\",\n      code: lambda.Code.fromAsset(\n        path.join(__dirname, \"lambda/pgbouncer-secret-updater\")\n      ),\n      environment: {\n        SOURCE_SECRET_ARN: props.database.secret.secretArn,\n        TARGET_SECRET_ARN: this.pgbouncerSecret.secretArn,\n      },\n    });\n\n    props.database.secret.grantRead(secretUpdaterFn);\n    this.pgbouncerSecret.grantWrite(secretUpdaterFn);\n\n    this.secretUpdateComplete = new CustomResource(\n      this,\n      \"pgbouncerSecretBootstrapper\",\n      {\n        serviceToken: secretUpdaterFn.functionArn,\n        properties: {\n          instanceIp: props.usePublicSubnet\n            ? this.instance.instancePublicIp\n            : this.instance.instancePrivateIp,\n        },\n      }\n    );\n\n    // Add health check custom resource\n    const healthCheckFunction = new lambda.Function(\n      this,\n      \"HealthCheckFunction\",\n      {\n        runtime: lambda.Runtime.NODEJS_20_X,\n        handler: \"index.handler\",\n        timeout: Duration.minutes(10),\n        code: lambda.Code.fromAsset(\n          path.join(__dirname, \"lambda/pgbouncer-health-check\")\n        ),\n        description: \"PgBouncer health check function\",\n      }\n    );\n\n    // Grant SSM permissions for health check\n    healthCheckFunction.addToRolePolicy(\n      new iam.PolicyStatement({\n        actions: [\n          \"ssm:SendCommand\",\n          \"ssm:GetCommandInvocation\",\n          \"ssm:DescribeInstanceInformation\",\n          \"ssm:ListCommandInvocations\",\n        ],\n        resources: [\"*\"],\n      })\n    );\n\n    this.healthCheck = new CustomResource(this, \"PgBouncerHealthCheck\", {\n      serviceToken: healthCheckFunction.functionArn,\n      properties: {\n        InstanceId: this.instance.instanceId,\n        // Add timestamp to force re-execution on stack updates\n        Timestamp: new Date().toISOString(),\n      },\n    });\n\n    // Ensure health check runs after instance is created but before secret update\n    this.healthCheck.node.addDependency(this.instance);\n    this.secretUpdateComplete.node.addDependency(this.healthCheck);\n  }\n\n  private loadUserDataScript(\n    pgBouncerConfig: Required<NonNullable<PgBouncerProps[\"pgBouncerConfig\"]>>,\n    database: { secret: secretsmanager.ISecret }\n  ): ec2.UserData {\n    const userDataScript = ec2.UserData.forLinux();\n\n    // Set environment variables with configuration parameters\n    userDataScript.addCommands(\n      'export SECRET_ARN=\"' + database.secret.secretArn + '\"',\n      'export REGION=\"' + Stack.of(this).region + '\"',\n      'export POOL_MODE=\"' + pgBouncerConfig.poolMode + '\"',\n      'export MAX_CLIENT_CONN=\"' + pgBouncerConfig.maxClientConn + '\"',\n      'export DEFAULT_POOL_SIZE=\"' + pgBouncerConfig.defaultPoolSize + '\"',\n      'export MIN_POOL_SIZE=\"' + pgBouncerConfig.minPoolSize + '\"',\n      'export RESERVE_POOL_SIZE=\"' + pgBouncerConfig.reservePoolSize + '\"',\n      'export RESERVE_POOL_TIMEOUT=\"' +\n        pgBouncerConfig.reservePoolTimeout +\n        '\"',\n      'export MAX_DB_CONNECTIONS=\"' + pgBouncerConfig.maxDbConnections + '\"',\n      'export MAX_USER_CONNECTIONS=\"' + pgBouncerConfig.maxUserConnections + '\"'\n    );\n\n    // Load the startup script\n    const scriptPath = path.join(__dirname, \"./pgbouncer-setup.sh\");\n    let script = fs.readFileSync(scriptPath, \"utf8\");\n\n    userDataScript.addCommands(script);\n\n    return userDataScript;\n  }\n}\n"]}
|
package/lib/database/index.d.ts
CHANGED
|
@@ -2,9 +2,47 @@ import { CustomResource, aws_ec2 as ec2, aws_rds as rds, aws_secretsmanager as s
|
|
|
2
2
|
import { Construct } from "constructs";
|
|
3
3
|
import { CustomLambdaFunctionProps } from "../utils";
|
|
4
4
|
/**
|
|
5
|
-
* An RDS instance with pgSTAC installed
|
|
6
|
-
*
|
|
7
|
-
*
|
|
5
|
+
* An RDS instance with pgSTAC installed and PgBouncer connection pooling.
|
|
6
|
+
*
|
|
7
|
+
* This construct creates an optimized pgSTAC database setup that includes:
|
|
8
|
+
* - RDS PostgreSQL instance with pgSTAC extension
|
|
9
|
+
* - PgBouncer connection pooler (enabled by default)
|
|
10
|
+
* - Automated health monitoring system
|
|
11
|
+
* - Optimized database parameters for the selected instance type
|
|
12
|
+
*
|
|
13
|
+
* ## Connection Pooling with PgBouncer
|
|
14
|
+
*
|
|
15
|
+
* By default, this construct deploys PgBouncer as a connection pooler running on
|
|
16
|
+
* a dedicated EC2 instance. PgBouncer provides several benefits:
|
|
17
|
+
*
|
|
18
|
+
* - **Connection Management**: Pools and reuses database connections to reduce overhead
|
|
19
|
+
* - **Performance**: Optimizes connection handling for high-traffic applications
|
|
20
|
+
* - **Scalability**: Allows more concurrent connections than the RDS instance alone
|
|
21
|
+
* - **Health Monitoring**: Includes comprehensive health checks to ensure availability
|
|
22
|
+
*
|
|
23
|
+
* ### PgBouncer Configuration
|
|
24
|
+
* - Pool mode: Transaction-level pooling (default)
|
|
25
|
+
* - Maximum client connections: 1000
|
|
26
|
+
* - Default pool size: 20 connections per database/user combination
|
|
27
|
+
* - Instance type: t3.micro EC2 instance
|
|
28
|
+
*
|
|
29
|
+
* ### Health Check System
|
|
30
|
+
* The construct includes an automated health check system that validates:
|
|
31
|
+
* - PgBouncer service is running and listening on port 5432
|
|
32
|
+
* - Connection tests to ensure accessibility
|
|
33
|
+
* - Cloud-init setup completion before validation
|
|
34
|
+
* - Detailed diagnostics for troubleshooting
|
|
35
|
+
*
|
|
36
|
+
* ### Connection Details
|
|
37
|
+
* When PgBouncer is enabled, applications connect through the PgBouncer instance
|
|
38
|
+
* rather than directly to RDS. The `pgstacSecret` contains connection information
|
|
39
|
+
* pointing to PgBouncer, and the `connectionTarget` property refers to the
|
|
40
|
+
* PgBouncer EC2 instance.
|
|
41
|
+
*
|
|
42
|
+
* To disable PgBouncer and connect directly to RDS, set `addPgbouncer: false`.
|
|
43
|
+
*
|
|
44
|
+
* This is a wrapper around the `rds.DatabaseInstance` higher-level construct
|
|
45
|
+
* making use of the BootstrapPgStac construct.
|
|
8
46
|
*/
|
|
9
47
|
export declare class PgStacDatabase extends Construct {
|
|
10
48
|
db: rds.DatabaseInstance;
|
|
@@ -14,6 +52,7 @@ export declare class PgStacDatabase extends Construct {
|
|
|
14
52
|
readonly connectionTarget: rds.IDatabaseInstance | ec2.Instance;
|
|
15
53
|
readonly securityGroup?: ec2.SecurityGroup;
|
|
16
54
|
readonly secretBootstrapper?: CustomResource;
|
|
55
|
+
readonly pgbouncerHealthCheck?: CustomResource;
|
|
17
56
|
constructor(scope: Construct, id: string, props: PgStacDatabaseProps);
|
|
18
57
|
getParameters(instanceType: string, parameters: PgStacDatabaseProps["parameters"]): DatabaseParameters;
|
|
19
58
|
}
|