Fix deploy action

.github/workflows/ci.yml

@@ -86,21 +86,21 @@ jobs:
           aws-region: us-west-2
 
       - name: Set up node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 20
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v5
 
       - name: Install dependencies
         run: |
           uv sync --only-group deploy
           uv run --only-group deploy npm install
 
       - name: CDK Synth
-        run: uv run --only-group deploy npm run cdk -- synth
+        run: uv run --only-group deploy npx cdk synth --all
 
       - name: CDK Deploy
         run: |
-          uv run --only-group deploy npm run cdk -- deploy --require-approval never
+          uv run --only-group deploy npx cdk deploy --all --require-approval never

docker-compose.yml

@@ -35,11 +35,11 @@ services:
       - POSTGRES_PORT=5432
       - DB_MIN_CONN_SIZE=1
       - DB_MAX_CONN_SIZE=1
-      # - EOAPI_STAC_TITILER_ENDPOINT=raster
-      - EOAPI_STAC_TITILER_ENDPOINT=http://127.0.0.1:8082
+      # - TITILER_ENDPOINT=raster
+      - TITILER_ENDPOINT=http://127.0.0.1:8082
       # PgSTAC extensions
-      # - EOAPI_STAC_EXTENSIONS=["filter", "query", "sort", "fields", "pagination", "titiler", "transaction"]  # defaults
-      # - EOAPI_STAC_CORS_METHODS='GET,POST,PUT,OPTIONS'
+      # - EXTENSIONS=["filter", "query", "sort", "fields", "pagination", "titiler", "transaction"]  # defaults
+      # - CORS_METHODS='GET,POST,PUT,OPTIONS'
     env_file:
       - path: .env
         required: false
@@ -123,7 +123,7 @@ services:
       - POSTGRES_PORT=5432
       - DB_MIN_CONN_SIZE=1
       - DB_MAX_CONN_SIZE=10
-      - EOAPI_VECTOR_DEBUG=TRUE
+      - DEBUG=TRUE
     env_file:
       - path: .env
         required: false

infrastructure/app.py

@@ -136,23 +136,8 @@ def __init__(
             self,
             "raster-api",
             api_env={
-                "EOAPI_RASTER_NAME": app_config.build_service_name("raster"),
+                "NAME": app_config.build_service_name("raster"),
                 "description": f"{app_config.stage} Raster API",
-                "POSTGRES_HOST": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "host"
-                ).to_string(),
-                "POSTGRES_DBNAME": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "dbname"
-                ).to_string(),
-                "POSTGRES_USER": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "username"
-                ).to_string(),
-                "POSTGRES_PASS": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "password"
-                ).to_string(),
-                "POSTGRES_PORT": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "port"
-                ).to_string(),
             },
             db=pgstac_db.connection_target,
             db_secret=pgstac_db.pgstac_secret,
@@ -199,28 +184,10 @@ def __init__(
             self,
             "stac-api",
             api_env={
-                "EOAPI_STAC_NAME": app_config.build_service_name("stac"),
+                "NAME": app_config.build_service_name("stac"),
                 "description": f"{app_config.stage} STAC API",
-                "POSTGRES_HOST_READER": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "host"
-                ).to_string(),
-                "POSTGRES_HOST_WRITER": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "host"
-                ).to_string(),
-                "POSTGRES_DBNAME": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "dbname"
-                ).to_string(),
-                "POSTGRES_USER": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "username"
-                ).to_string(),
-                "POSTGRES_PASS": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "password"
-                ).to_string(),
-                "POSTGRES_PORT": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "port"
-                ).to_string(),
-                "EOAPI_STAC_TITILER_ENDPOINT": raster.url.strip("/"),
-                "EOAPI_STAC_EXTENSIONS": '["filter", "query", "sort", "fields", "pagination", "titiler"]',
+                "TITILER_ENDPOINT": raster.url.strip("/"),
+                "EXTENSIONS": '["filter", "query", "sort", "fields", "pagination", "titiler"]',
             },
             db=pgstac_db.connection_target,
             db_secret=pgstac_db.pgstac_secret,
@@ -268,23 +235,8 @@ def __init__(
             db=pgstac_db.connection_target,
             db_secret=pgstac_db.pgstac_secret,
             api_env={
-                "EOAPI_VECTOR_NAME": app_config.build_service_name("vector"),
+                "NAME": app_config.build_service_name("vector"),
                 "description": f"{app_config.stage} tipg API",
-                "POSTGRES_HOST": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "host"
-                ).to_string(),
-                "POSTGRES_DBNAME": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "dbname"
-                ).to_string(),
-                "POSTGRES_USER": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "username"
-                ).to_string(),
-                "POSTGRES_PASS": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "password"
-                ).to_string(),
-                "POSTGRES_PORT": pgstac_db.pgstac_secret.secret_value_from_json(
-                    "port"
-                ).to_string(),
             },
             # If the db is not in the public subnet then we need to put
             # the lambda within the VPC

infrastructure/handlers/raster_handler.py

@@ -5,17 +5,23 @@
 import os
 
 from eoapi.raster.app import app
+from eoapi.raster.config import ApiSettings
 from mangum import Mangum
 from titiler.pgstac.db import connect_to_db
 
 logging.getLogger("mangum.lifespan").setLevel(logging.ERROR)
 logging.getLogger("mangum.http").setLevel(logging.ERROR)
 
+settings = ApiSettings()
+
 
 @app.on_event("startup")
 async def startup_event() -> None:
     """Connect to database on startup."""
-    await connect_to_db(app)
+    await connect_to_db(
+        app,
+        settings=settings.load_postgres_settings(),
+    )
 
 
 handler = Mangum(app, lifespan="off")

infrastructure/handlers/vector_handler.py

@@ -5,15 +5,15 @@
 import os
 
 from eoapi.vector.app import app
+from eoapi.vector.config import ApiSettings
 from mangum import Mangum
 from tipg.collections import register_collection_catalog
 from tipg.database import connect_to_db
-from tipg.settings import PostgresSettings
 
 logging.getLogger("mangum.lifespan").setLevel(logging.ERROR)
 logging.getLogger("mangum.http").setLevel(logging.ERROR)
 
-postgres_settings = PostgresSettings()
+settings = ApiSettings()
 
 try:
     from importlib.resources import files as resources_files  # type: ignore
@@ -31,7 +31,7 @@ async def startup_event() -> None:
     """Connect to database on startup."""
     await connect_to_db(
         app,
-        settings=postgres_settings,
+        settings=settings.load_postgres_settings(),
         # We enable both pgstac and public schemas (pgstac will be used by custom functions)
         schemas=["pgstac", "public"],
         user_sql_files=sql_files,

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "eoapi-template",
+  "name": "eoapi-devseed",
   "version": "0.1.0",
   "dependencies": {
-    "aws-cdk": "^2.177.0"
+    "aws-cdk": "2.130.0"
   }
 }

pyproject.toml

@@ -9,10 +9,11 @@ dependencies = []
 [dependency-groups]
 deploy = [
     "boto3==1.24.15",
-    "eoapi-cdk==7.4.1",
+    "eoapi-cdk==7.4.2",
     "pydantic-settings[yaml]==2.2.1",
     "pydantic==2.7",
     "typing-extensions>=4.12.2",
+    "aws-cdk-lib==2.130.0",
 ]
 dev = [
     "httpx>=0.28.1",

runtimes/eoapi/raster/eoapi/raster/app.py

@@ -90,7 +90,7 @@
 async def lifespan(app: FastAPI):
     """FastAPI Lifespan."""
     logger.debug("Connecting to db...")
-    await connect_to_db(app)
+    await connect_to_db(app, settings=settings.load_postgres_settings())
     logger.debug("Connected to db.")
 
     yield

runtimes/eoapi/raster/eoapi/raster/config.py

@@ -1,7 +1,36 @@
 """API settings."""
 
+import base64
+import json
+from typing import Optional
+
+import boto3
 from pydantic import field_validator
 from pydantic_settings import BaseSettings
+from titiler.pgstac.settings import PostgresSettings
+
+
+def get_secret_dict(secret_name: str):
+    """Retrieve secrets from AWS Secrets Manager
+
+    Args:
+        secret_name (str): name of aws secrets manager secret containing database connection secrets
+        profile_name (str, optional): optional name of aws profile for use in debugger only
+
+    Returns:
+        secrets (dict): decrypted secrets in dict
+    """
+
+    # Create a Secrets Manager client
+    session = boto3.session.Session()
+    client = session.client(service_name="secretsmanager")
+
+    get_secret_value_response = client.get_secret_value(SecretId=secret_name)
+
+    if "SecretString" in get_secret_value_response:
+        return json.loads(get_secret_value_response["SecretString"])
+    else:
+        return json.loads(base64.b64decode(get_secret_value_response["SecretBinary"]))
 
 
 class ApiSettings(BaseSettings):
@@ -14,8 +43,9 @@ class ApiSettings(BaseSettings):
     debug: bool = False
     root_path: str = ""
 
+    pgstac_secret_arn: Optional[str] = None
+
     model_config = {
-        "env_prefix": "EOAPI_RASTER_",
         "env_file": ".env",
         "extra": "allow",
     }
@@ -29,3 +59,19 @@ def parse_cors_origin(cls, v):
     def parse_cors_methods(cls, v):
         """Parse CORS methods."""
         return [method.strip() for method in v.split(",")]
+
+    def load_postgres_settings(self) -> "PostgresSettings":
+        """Load postgres connection params from AWS secret"""
+
+        if self.pgstac_secret_arn:
+            secret = get_secret_dict(self.pgstac_secret_arn)
+
+            return PostgresSettings(
+                postgres_host=secret["host"],
+                postgres_dbname=secret["dbname"],
+                postgres_user=secret["username"],
+                postgres_pass=secret["password"],
+                postgres_port=secret["port"],
+            )
+        else:
+            return PostgresSettings()

runtimes/eoapi/raster/pyproject.toml

@@ -24,6 +24,7 @@ dependencies = [
     "titiler.extensions",
     "starlette-cramjam>=0.4,<0.5",
     "importlib_resources>=1.1.0;python_version<'3.9'",
+    "boto3",
     "eoapi.auth-utils>=0.2.0",
 ]
 

runtimes/eoapi/stac/eoapi/stac/app.py

@@ -22,7 +22,6 @@
     TransactionExtension,
 )
 from stac_fastapi.extensions.third_party import BulkTransactionExtension
-from stac_fastapi.pgstac.config import Settings
 from stac_fastapi.pgstac.core import CoreCrudClient
 from stac_fastapi.pgstac.db import close_db_connection, connect_to_db
 from stac_fastapi.pgstac.extensions import QueryExtension
@@ -51,7 +50,7 @@
 
 api_settings = ApiSettings()
 auth_settings = OpenIdConnectSettings()
-settings = Settings(enable_response_models=True)
+settings = api_settings.load_postgres_settings()
 
 # Logs
 init_logging(debug=api_settings.debug)