fix a couple bugs found in the first changes

lib/bootstrapper/index.ts

@@ -12,6 +12,8 @@ import {
 import { Construct } from "constructs";
 import { CustomLambdaFunctionOptions } from "../utils";
 
+const DEFAULT_PGSTAC_VERSION = "0.6.13";
+
 function hasVpc(
   instance: aws_rds.DatabaseInstance | aws_rds.IDatabaseInstance
 ): instance is aws_rds.DatabaseInstance {
@@ -27,6 +29,15 @@ export class BootstrapPgStac extends Construct {
   constructor(scope: Construct, id: string, props: BootstrapPgStacProps) {
     super(scope, id);
 
+    // if `lambdaAssetCode` is provided, `pgstacVersion` must be provided, otherwise throw an error
+    if (props.lambdaAssetCode && !props.pgstacVersion) {
+      throw new Error(
+        "If `lambdaAssetCode` is provided, `pgstacVersion` must be provided as well."
+      );
+    }
+
+    const pgstacVersion = props.pgstacVersion ?? DEFAULT_PGSTAC_VERSION;
+
     const handler = new aws_lambda.Function(this, "lambda", {
       ...props.lambdaFunctionOptions ?? {
         runtime: aws_lambda.Runtime.PYTHON_3_8,
@@ -37,6 +48,7 @@ export class BootstrapPgStac extends Construct {
       },
       code: props.lambdaAssetCode ?? aws_lambda.Code.fromDockerBuild(__dirname, {
         file: "runtime/Dockerfile",
+        buildArgs: {PGSTAC_VERSION: pgstacVersion, PYTHON_VERSION: "3.8"}
       }),
       vpc: hasVpc(props.database) ? props.database.vpc : props.vpc,
     });
@@ -75,6 +87,7 @@ export class BootstrapPgStac extends Construct {
     new CustomResource(this, "bootstrapper", {
       serviceToken: handler.functionArn,
       properties: {
+        pgstac_version: pgstacVersion,
         conn_secret_arn: props.dbSecret.secretArn,
         new_user_secret_arn: this.secret.secretArn,
       },
@@ -142,4 +155,13 @@ export interface BootstrapPgStacProps {
    * @default default runtime defined in this repository
    */
   readonly lambdaAssetCode?: aws_lambda.AssetCode;
+
+  /**
+   * pgSTAC database version to be installed. If a custom `lambdaAssetCode` 
+   * is provided, must be provided and match the version of pgSTAC installed
+   * in the lambda function.
+   * 
+   * @default 0.6.13
+   */
+  readonly pgstacVersion?: string;
 }

lib/bootstrapper/runtime/Dockerfile

@@ -1,8 +1,13 @@
-FROM lambci/lambda:build-python3.8
+ARG PYTHON_VERSION
+FROM lambci/lambda:build-python${PYTHON_VERSION}
+
+ARG PGSTAC_VERSION
+RUN echo "PGSTAC_VERSION: ${PGSTAC_VERSION}"
+RUN echo "PYTHON_VERSION: ${PYTHON_VERSION}"
 
 WORKDIR /tmp
 
-RUN pip install httpx psycopg[binary,pool] pypgstac==0.6.13 -t /asset
+RUN pip install httpx psycopg[binary,pool] pypgstac==${PGSTAC_VERSION} -t /asset
 
 COPY runtime/handler.py /asset/handler.py
 

lib/ingestor-api/index.ts

@@ -120,7 +120,7 @@ export class StacIngestor extends Construct {
     const handler = new lambda.Function(this, "api-handler", {
       ...props.lambdaFunctionOptions ?? {
         runtime: lambda.Runtime.PYTHON_3_9,
-        handler: "handler.handler",
+        handler: "src.handler.handler",
         memorySize: 2048,
         logRetention: aws_logs.RetentionDays.ONE_WEEK,
         timeout: Duration.seconds(30)
@@ -166,7 +166,7 @@ export class StacIngestor extends Construct {
     const handler = new lambda.Function(this, "stac-ingestor", {
       ...props.lambdaFunctionOptions ?? {
         runtime: lambda.Runtime.PYTHON_3_9,
-        handler: "handler.handler",
+        handler: "src.handler.handler",
         memorySize: 2048,
         logRetention: aws_logs.RetentionDays.ONE_WEEK,
         timeout: Duration.seconds(180)

lib/ingestor-api/runtime/Dockerfile

@@ -1,17 +1,16 @@
-FROM public.ecr.aws/lambda/python:3.10
+ARG PYTHON_VERSION
+FROM --platform=linux/amd64 public.ecr.aws/lambda/python:${PYTHON_VERSION}
 
 WORKDIR /tmp
+
+RUN yum install -y git
+
 RUN python -m pip install pip -U
 
 COPY runtime/requirements.txt requirements.txt
 RUN python -m pip install -r requirements.txt "mangum>=0.14,<0.15" -t /asset --no-binary pydantic
 
-# Reduce package size and remove useless files
-RUN cd /asset && find . -type f -name '*.pyc' | while read f; do n=$(echo $f | sed 's/__pycache__\///' | sed 's/.cpython-[0-9]*//'); cp $f $n; done;
-RUN cd /asset && find . -type d -a -name '__pycache__' -print0 | xargs -0 rm -rf
-RUN cd /asset && find . -type f -a -name '*.py' -print0 | xargs -0 rm -f
-RUN find /asset -type d -a -name 'tests' -print0 | xargs -0 rm -rf
-
-COPY runtime/src/*.py /asset/
+RUN mkdir -p /asset/src
+COPY runtime/src/*.py /asset/src/
 
 CMD ["echo", "hello world"]

lib/stac-api/index.ts

@@ -22,15 +22,15 @@ export class PgStacApiLambda extends Construct {
 
     this.stacApiLambdaFunction = new lambda.Function(this, "lambda", {
       ...props.lambdaFunctionOptions ?? {
-        runtime: lambda.Runtime.PYTHON_3_8,
-        handler: "handler.handler",
+        runtime: lambda.Runtime.PYTHON_3_10,
+        handler: "src.handler.handler",
         memorySize: 8192,
         logRetention: aws_logs.RetentionDays.ONE_WEEK,
         timeout: Duration.seconds(30)
       },
       code: props.lambdaAssetCode ?? lambda.Code.fromDockerBuild(__dirname, {
         file: "runtime/Dockerfile",
-        buildArgs: { PYTHON_VERSION: '3.8' },
+        buildArgs: { PYTHON_VERSION: '3.10' },
       }),
       vpc: props.vpc,
       vpcSubnets: props.subnetSelection,

lib/stac-api/runtime/Dockerfile

@@ -1,17 +1,13 @@
-FROM public.ecr.aws/lambda/python:3.10
+ARG PYTHON_VERSION
+FROM --platform=linux/amd64 public.ecr.aws/lambda/python:${PYTHON_VERSION}
 
 WORKDIR /tmp
 RUN python -m pip install pip -U
 
 COPY runtime/requirements.txt requirements.txt
 RUN python -m pip install -r requirements.txt "mangum>=0.14,<0.15" -t /asset --no-binary pydantic
 
-# Reduce package size and remove useless files
-RUN cd /asset && find . -type f -name '*.pyc' | while read f; do n=$(echo $f | sed 's/__pycache__\///' | sed 's/.cpython-[0-9]*//'); cp $f $n; done;
-RUN cd /asset && find . -type d -a -name '__pycache__' -print0 | xargs -0 rm -rf
-RUN cd /asset && find . -type f -a -name '*.py' -print0 | xargs -0 rm -f
-RUN find /asset -type d -a -name 'tests' -print0 | xargs -0 rm -rf
-
-COPY runtime/src/*.py /asset/
+RUN mkdir -p /asset/src
+COPY runtime/src/*.py /asset/src/
 
 CMD ["echo", "hello world"]

lib/tipg-api/runtime/Dockerfile

@@ -1,10 +1,10 @@
-FROM --platform=linux/amd64 public.ecr.aws/lambda/python:3.10
+ARG PYTHON_VERSION
+FROM --platform=linux/amd64 public.ecr.aws/lambda/python:${PYTHON_VERSION}
 
 WORKDIR /tmp
 RUN python -m pip install pip -U
 
-COPY runtime/requirements.txt requirements.txt
-RUN python -m pip install -r requirements.txt "mangum>=0.14,<0.15" -t /asset --no-binary pydantic
+RUN python -m pip install tipg==0.3.1 "mangum>=0.14,<0.15" -t /asset --no-binary pydantic
 
 # Reduce package size and remove useless files
 RUN cd /asset && find . -type f -name '*.pyc' | while read f; do n=$(echo $f | sed 's/__pycache__\///' | sed 's/.cpython-[0-9]*//'); cp $f $n; done;

lib/tipg-api/runtime/src/handler.py

@@ -5,7 +5,7 @@
 import asyncio
 import os
 from mangum import Mangum
-from src.utils import load_pgstac_secret
+from utils import load_pgstac_secret
 
 load_pgstac_secret(os.environ["PGSTAC_SECRET_ARN"])  # required for the below imports
 

lib/titiler-pgstac-api/index.ts

@@ -48,6 +48,7 @@ import { CustomLambdaFunctionOptions } from "../utils";
         },
         code: props.lambdaAssetCode ?? lambda.Code.fromDockerBuild(__dirname, {
           file: "runtime/Dockerfile",
+          buildArgs: { PYTHON_VERSION: '3.10' }
         }),
         vpc: props.vpc,
         vpcSubnets: props.subnetSelection,

lib/titiler-pgstac-api/runtime/Dockerfile

@@ -1,4 +1,5 @@
-FROM --platform=linux/amd64 public.ecr.aws/lambda/python:3.10
+ARG PYTHON_VERSION
+FROM --platform=linux/amd64 public.ecr.aws/lambda/python:${PYTHON_VERSION}
 
 WORKDIR /tmp
 RUN python -m pip install pip -U

lib/titiler-pgstac-api/runtime/src/handler.py

@@ -5,7 +5,7 @@
 import asyncio
 import os
 from mangum import Mangum
-from src.utils import get_secret_dict
+from utils import get_secret_dict
 
 pgstac_secret_arn = os.environ["PGSTAC_SECRET_ARN"]