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

Jump to bottom

New vpc #105

Merged
merged 5 commits into from
Aug 25, 2023
Merged

New vpc #105

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aab8c20
put the raster service in a private subnet
vincentsarago Jun 24, 2023
5845582
add notice
vincentsarago Jun 24, 2023
7dd48b2
Merge branch 'main' of https://github.com/developmentseed/eoapi into …
vincentsarago Jun 24, 2023
a106e4b
Merge branch 'main' of https://github.com/developmentseed/eoapi into …
vincentsarago Jun 26, 2023
39d17c8
Merge branch 'main' of https://github.com/developmentseed/eoapi into …
vincentsarago Aug 25, 2023
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
39 changes: 36 additions & 3 deletions infrastructure/aws/cdk/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,34 @@ def __init__( # noqa: C901
"""Define stack."""
super().__init__(scope, id, **kwargs)

vpc = ec2.Vpc(self, f"{id}-vpc", nat_gateways=0)
# vpc = ec2.Vpc(self, f"{id}-vpc", nat_gateways=0)

vpc = ec2.Vpc(
self,
f"{id}-vpc",
subnet_configuration=[
ec2.SubnetConfiguration(
name="ingress",
cidr_mask=24,
subnet_type=ec2.SubnetType.PUBLIC,
),
ec2.SubnetConfiguration(
name="application",
cidr_mask=24,
subnet_type=ec2.SubnetType.PRIVATE_WITH_EGRESS,
),
ec2.SubnetConfiguration(
name="rds",
cidr_mask=28,
subnet_type=ec2.SubnetType.PRIVATE_ISOLATED,
),
],
nat_gateways=1,
)
print(
"""The eoAPI stack use AWS NatGateway for the Raster service so it can reach the internet.
This might incurs some cost (https://docs.aws.amazon.com/vpc/latest/userguide/vpc-nat-gateway.html)."""
)

interface_endpoints = [
(
Expand Down Expand Up @@ -164,6 +191,8 @@ def __init__( # noqa: C901
ec2.InstanceSize(eodb_settings.instance_size),
),
database_name="postgres",
# should set the subnet to `PRIVATE_ISOLATED` but then we need either a bastion host to connect to the db
# or an API to ingest/delete data in the DB
vpc_subnets=ec2.SubnetSelection(subnet_type=ec2.SubnetType.PUBLIC),
backup_retention=Duration.days(7),
deletion_protection=eoapi_settings.stage.lower() == "production",
Expand Down Expand Up @@ -230,6 +259,9 @@ def __init__( # noqa: C901
platform="linux/amd64",
),
vpc=vpc,
vpc_subnets=ec2.SubnetSelection(
subnet_type=ec2.SubnetType.PRIVATE_WITH_EGRESS
),
allow_public_subnet=True,
handler="handler.handler",
memory_size=eoraster_settings.memory,
Expand All @@ -251,6 +283,7 @@ def __init__( # noqa: C901
)

db.connections.allow_from(eoraster_function, port_range=ec2.Port.tcp(5432))

raster_api = apigw.HttpApi(
self,
f"{id}-raster-endpoint",
Expand Down Expand Up @@ -306,7 +339,6 @@ def __init__( # noqa: C901
platform="linux/amd64",
),
vpc=vpc,
allow_public_subnet=True,
handler="handler.handler",
memory_size=eostac_settings.memory,
timeout=Duration.seconds(eostac_settings.timeout),
Expand Down Expand Up @@ -361,6 +393,8 @@ def __init__( # noqa: C901

if "DB_MAX_CONN_SIZE" not in env:
env["DB_MAX_CONN_SIZE"] = "1"
if "DB_MIN_CONN_SIZE" not in env:
env["DB_MIN_CONN_SIZE"] = "1"

eovector_function = aws_lambda.Function(
self,
Expand All @@ -375,7 +409,6 @@ def __init__( # noqa: C901
platform="linux/amd64",
),
vpc=vpc,
allow_public_subnet=True,
handler="handler.handler",
memory_size=eovector_settings.memory,
timeout=Duration.seconds(eovector_settings.timeout),
Expand Down