Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pgbouncer to CDK stack #18

Merged
merged 1 commit into from
Jan 24, 2025
Merged

Add pgbouncer to CDK stack #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions infrastructure/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def __init__(
self,
"pgstac-db",
vpc=vpc,
add_pgbouncer=True,
engine=aws_rds.DatabaseInstanceEngine.postgres(
version=aws_rds.PostgresEngineVersion.VER_14
),
Expand All @@ -122,7 +123,12 @@ def __init__(
"mosaic_index": True,
},
)
pgstac_db.db.connections.allow_default_port_from_any_ipv4()

# allow connections from any ipv4 to pgbouncer instance security group
assert pgstac_db.security_group
pgstac_db.security_group.add_ingress_rule(
aws_ec2.Peer.any_ipv4(), aws_ec2.Port.tcp(5432)
)

#######################################################################
# Raster service
Expand All @@ -148,7 +154,7 @@ def __init__(
"port"
).to_string(),
},
db=pgstac_db.db,
db=pgstac_db.connection_target,
db_secret=pgstac_db.pgstac_secret,
# If the db is not in the public subnet then we need to put
# the lambda within the VPC
Expand Down Expand Up @@ -216,7 +222,7 @@ def __init__(
"EOAPI_STAC_TITILER_ENDPOINT": raster.url.strip("/"),
"EOAPI_STAC_EXTENSIONS": '["filter", "query", "sort", "fields", "pagination", "titiler"]',
},
db=pgstac_db.db,
db=pgstac_db.connection_target,
db_secret=pgstac_db.pgstac_secret,
# If the db is not in the public subnet then we need to put
# the lambda within the VPC
Expand Down Expand Up @@ -259,7 +265,7 @@ def __init__(
TiPgApiLambda(
self,
"vector-api",
db=pgstac_db.db,
db=pgstac_db.connection_target,
db_secret=pgstac_db.pgstac_secret,
api_env={
"EOAPI_VECTOR_NAME": app_config.build_service_name("vector"),
Expand Down Expand Up @@ -342,7 +348,7 @@ def __init__(
stage=app_config.stage,
data_access_role=data_access_role,
stac_db_secret=pgstac_db.pgstac_secret,
stac_db_security_group=pgstac_db.db.connections.security_groups[0],
stac_db_security_group=pgstac_db.security_group,
# If the db is not in the public subnet then we need to put
# the lambda within the VPC
vpc=vpc if not app_config.public_db_subnet else None,
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eoapi-cdk==7.2.0
eoapi-cdk==7.4.1
pydantic==2.7
pydantic-settings[yaml]==2.2.1
boto3==1.24.15
Expand Down
Loading