Merge to main

.example.env

@@ -22,3 +22,5 @@ VEDA_DB_PUBLICLY_ACCESSIBLE=TRUE
 
 VEDA_RASTER_PATH_PREFIX=[OPTIONAL PATH PREFIX TO ADD TO TITILER ENDPOINTS]
 VEDA_STAC_PATH_PREFIX=[OPTIONAL PATH PREFIX TO ADD TO TITILER ENDPOINTS]
+
+VEDA_DB_RDS_TYPE=[OPTIONAL RDS database type]

.github/workflows/pr.yml

@@ -90,7 +90,6 @@ jobs:
 
   predeploy:
     needs: [test]
-    environment: development
     runs-on: ubuntu-latest
     steps:
 

database/infrastructure/config.py

@@ -57,6 +57,10 @@ class vedaDBSettings(BaseSettings):
         False,
         description="Boolean if the RDS should be accessed through a proxy",
     )
+    rds_type: str = Field(
+        "db.t3.small",
+        description="Postgres database type",
+    )
 
     class Config:
         """model config."""

database/infrastructure/construct.py

@@ -166,8 +166,8 @@ def __init__(
                 instance_identifier=f"{stack_name}-postgres",
                 vpc=vpc,
                 engine=engine,
-                instance_type=aws_ec2.InstanceType.of(
-                    aws_ec2.InstanceClass.BURSTABLE3, aws_ec2.InstanceSize.SMALL
+                instance_type=aws_ec2.InstanceType(
+                    instance_type_identifier=veda_db_settings.rds_type
                 ),
                 vpc_subnets=aws_ec2.SubnetSelection(subnet_type=subnet_type),
                 deletion_protection=True,
@@ -176,7 +176,6 @@ def __init__(
                 credentials=credentials,
                 parameter_group=parameter_group,
             )
-
         # Or create/update RDS Resource
         else:
             database = aws_rds.DatabaseInstance(

database/runtime/handler.py

@@ -155,7 +155,7 @@ def create_dashboard_schema(cursor, username: str) -> None:
         sql.SQL(
             "CREATE SCHEMA IF NOT EXISTS dashboard;"
             "GRANT ALL ON SCHEMA dashboard TO {username};"
-            "ALTER ROLE {username} SET SEARCH_PATH TO dashboard, pgstac, public;"
+            "ALTER ROLE {username} SET SEARCH_PATH TO pgstac, dashboard, public;"
         ).format(username=sql.Identifier(username))
     )