eoapi-cdk 5.4.1 → 6.0.0

package/lib/ingestor-api/runtime/requirements.txt

@@ -1,11 +1,11 @@
 Authlib==1.0.1
+cachetools==5.3.0
 fastapi>=0.75.1
-mangum>=0.15.0
 orjson>=3.6.8
 psycopg[binary,pool]>=3.0.15
 pydantic_ssm_settings>=0.2.0
 pydantic>=1.9.0
-pypgstac==0.7.9
+pypgstac==0.7.10
 requests>=2.27.1
 # Waiting for https://github.com/stac-utils/stac-pydantic/pull/116
 stac-pydantic @ git+https://github.com/alukach/stac-pydantic.git@patch-1

package/lib/ingestor-api/runtime/src/main.py

@@ -123,3 +123,11 @@ def who_am_i(username=Depends(dependencies.get_username)):
     Return username for the provided request
     """
     return {"username": username}
+
+
+@app.get("/root_path")
+def return_root_path():
+    """
+    Return root path for the provided request
+    """
+    return {"root_path": config.settings.root_path}

package/lib/stac-api/index.d.ts

@@ -1,17 +1,17 @@
-import { aws_ec2 as ec2, aws_rds as rds, aws_secretsmanager as secretsmanager } from "aws-cdk-lib";
-import { PythonFunction, PythonFunctionProps } from "@aws-cdk/aws-lambda-python-alpha";
+import { aws_ec2 as ec2, aws_rds as rds, aws_lambda as lambda, aws_secretsmanager as secretsmanager } from "aws-cdk-lib";
 import { IDomainName } from "@aws-cdk/aws-apigatewayv2-alpha";
 import { Construct } from "constructs";
+import { CustomLambdaFunctionProps } from "../utils";
 export declare class PgStacApiLambda extends Construct {
     readonly url: string;
-    stacApiLambdaFunction: PythonFunction;
+    stacApiLambdaFunction: lambda.Function;
     constructor(scope: Construct, id: string, props: PgStacApiLambdaProps);
 }
 export interface PgStacApiLambdaProps {
     /**
      * VPC into which the lambda should be deployed.
      */
-    readonly vpc: ec2.IVpc;
+    readonly vpc?: ec2.IVpc;
     /**
      * RDS Instance with installed pgSTAC.
      */
@@ -19,17 +19,11 @@ export interface PgStacApiLambdaProps {
     /**
      * Subnet into which the lambda should be deployed.
      */
-    readonly subnetSelection: ec2.SubnetSelection;
+    readonly subnetSelection?: ec2.SubnetSelection;
     /**
      * Secret containing connection information for pgSTAC database.
      */
     readonly dbSecret: secretsmanager.ISecret;
-    /**
-     * Custom code to run for fastapi-pgstac.
-     *
-     * @default - simplified version of fastapi-pgstac
-     */
-    readonly apiCode?: ApiEntrypoint;
     /**
      * Customized environment variables to send to fastapi-pgstac runtime.
      */
@@ -38,18 +32,10 @@ export interface PgStacApiLambdaProps {
      * Custom Domain Name Options for STAC API,
      */
     readonly stacApiDomainName?: IDomainName;
-}
-export interface ApiEntrypoint {
-    /**
-     * Path to the source of the function or the location for dependencies.
-     */
-    readonly entry: PythonFunctionProps["entry"];
-    /**
-     * The path (relative to entry) to the index file containing the exported handler.
-     */
-    readonly index: PythonFunctionProps["index"];
     /**
-     * The name of the exported handler in the index file.
-     */
-    readonly handler: PythonFunctionProps["handler"];
+       * Optional settings for the lambda function. Can be anything that can be configured on the lambda function, but some will be overwritten by values defined here.
+       *
+       * @default - defined in the construct.
+       */
+    readonly lambdaFunctionOptions?: CustomLambdaFunctionProps;
 }

package/lib/stac-api/index.js

@@ -4,46 +4,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgStacApiLambda = void 0;
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-const aws_lambda_python_alpha_1 = require("@aws-cdk/aws-lambda-python-alpha");
 const aws_apigatewayv2_alpha_1 = require("@aws-cdk/aws-apigatewayv2-alpha");
 const aws_apigatewayv2_integrations_alpha_1 = require("@aws-cdk/aws-apigatewayv2-integrations-alpha");
 const constructs_1 = require("constructs");
 class PgStacApiLambda extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const apiCode = props.apiCode || {
-            entry: `${__dirname}/runtime`,
-            index: "src/handler.py",
-            handler: "handler",
-        };
-        this.stacApiLambdaFunction = new aws_lambda_python_alpha_1.PythonFunction(this, "stac-api", {
-            ...apiCode,
-            /**
-             * NOTE: Unable to use Py3.9, due to issues with hashes:
-             *
-             *    ERROR: Hashes are required in --require-hashes mode, but they are missing
-             *    from some requirements. Here is a list of those requirements along with the
-             *    hashes their downloaded archives actually had. Add lines like these to your
-             *    requirements files to prevent tampering. (If you did not enable
-             *    --require-hashes manually, note that it turns on automatically when any
-             *    package has a hash.)
-             *        anyio==3.6.1 --hash=sha256:cb29b9c70620506a9a8f87a309591713446953302d7d995344d0d7c6c0c9a7be
-             * */
-            runtime: aws_cdk_lib_1.aws_lambda.Runtime.PYTHON_3_8,
-            architecture: aws_cdk_lib_1.aws_lambda.Architecture.X86_64,
+        console.log(props);
+        console.log(props.lambdaFunctionOptions);
+        this.stacApiLambdaFunction = new aws_cdk_lib_1.aws_lambda.Function(this, "lambda", {
+            // defaults for configurable properties
+            runtime: aws_cdk_lib_1.aws_lambda.Runtime.PYTHON_3_11,
+            handler: "src.handler.handler",
+            memorySize: 8192,
+            logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.ONE_WEEK,
+            timeout: aws_cdk_lib_1.Duration.seconds(30),
+            code: aws_cdk_lib_1.aws_lambda.Code.fromDockerBuild(__dirname, {
+                file: "runtime/Dockerfile",
+                buildArgs: { PYTHON_VERSION: '3.11' },
+            }),
+            // overwrites defaults with user-provided configurable properties
+            ...props.lambdaFunctionOptions,
+            // Non configurable properties that are going to be overwritten even if provided by the user
+            vpc: props.vpc,
+            vpcSubnets: props.subnetSelection,
+            allowPublicSubnet: true,
             environment: {
                 PGSTAC_SECRET_ARN: props.dbSecret.secretArn,
                 DB_MIN_CONN_SIZE: "0",
                 DB_MAX_CONN_SIZE: "1",
                 ...props.apiEnv,
             },
-            vpc: props.vpc,
-            vpcSubnets: props.subnetSelection,
-            allowPublicSubnet: true,
-            memorySize: 8192,
         });
         props.dbSecret.grantRead(this.stacApiLambdaFunction);
-        this.stacApiLambdaFunction.connections.allowTo(props.db, aws_cdk_lib_1.aws_ec2.Port.tcp(5432));
+        if (props.vpc) {
+            this.stacApiLambdaFunction.connections.allowTo(props.db, aws_cdk_lib_1.aws_ec2.Port.tcp(5432));
+        }
         const stacApi = new aws_apigatewayv2_alpha_1.HttpApi(this, `${aws_cdk_lib_1.Stack.of(this).stackName}-stac-api`, {
             defaultDomainMapping: props.stacApiDomainName ? {
                 domainName: props.stacApiDomainName
@@ -59,5 +55,5 @@ class PgStacApiLambda extends constructs_1.Construct {
 }
 exports.PgStacApiLambda = PgStacApiLambda;
 _a = JSII_RTTI_SYMBOL_1;
-PgStacApiLambda[_a] = { fqn: "eoapi-cdk.PgStacApiLambda", version: "5.4.1" };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQU9xQjtBQUNyQiw4RUFHMEM7QUFDMUMsNEVBQXVFO0FBQ3ZFLHNHQUFxRjtBQUNyRiwyQ0FBdUM7QUFFdkMsTUFBYSxlQUFnQixTQUFRLHNCQUFTO0lBSTVDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBMkI7UUFDbkUsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQixNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxJQUFJO1lBQy9CLEtBQUssRUFBRSxHQUFHLFNBQVMsVUFBVTtZQUM3QixLQUFLLEVBQUUsZ0JBQWdCO1lBQ3ZCLE9BQU8sRUFBRSxTQUFTO1NBQ25CLENBQUM7UUFFRixJQUFJLENBQUMscUJBQXFCLEdBQUcsSUFBSSx3Q0FBYyxDQUFDLElBQUksRUFBRSxVQUFVLEVBQUU7WUFDaEUsR0FBRyxPQUFPO1lBQ1Y7Ozs7Ozs7Ozs7aUJBVUs7WUFDTCxPQUFPLEVBQUUsd0JBQU0sQ0FBQyxPQUFPLENBQUMsVUFBVTtZQUNsQyxZQUFZLEVBQUUsd0JBQU0sQ0FBQyxZQUFZLENBQUMsTUFBTTtZQUN4QyxXQUFXLEVBQUU7Z0JBQ1gsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxTQUFTO2dCQUMzQyxnQkFBZ0IsRUFBRSxHQUFHO2dCQUNyQixnQkFBZ0IsRUFBRSxHQUFHO2dCQUNyQixHQUFHLEtBQUssQ0FBQyxNQUFNO2FBQ2hCO1lBQ0QsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO1lBQ2QsVUFBVSxFQUFFLEtBQUssQ0FBQyxlQUFlO1lBQ2pDLGlCQUFpQixFQUFFLElBQUk7WUFDdkIsVUFBVSxFQUFFLElBQUk7U0FDakIsQ0FBQyxDQUFDO1FBRUgsS0FBSyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFDckQsSUFBSSxDQUFDLHFCQUFxQixDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxxQkFBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUU3RSxNQUFNLE9BQU8sR0FBRyxJQUFJLGdDQUFPLENBQUMsSUFBSSxFQUFFLEdBQUcsbUJBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsU0FBUyxXQUFXLEVBQUU7WUFDeEUsb0JBQW9CLEVBQUUsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQztnQkFDOUMsVUFBVSxFQUFFLEtBQUssQ0FBQyxpQkFBaUI7YUFDcEMsQ0FBQyxDQUFDLENBQUMsU0FBUztZQUNiLGtCQUFrQixFQUFFLElBQUksMkRBQXFCLENBQUMsYUFBYSxFQUFFLElBQUksQ0FBQyxxQkFBcUIsQ0FBQztTQUN6RixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFJLENBQUM7UUFFeEIsSUFBSSx1QkFBUyxDQUFDLElBQUksRUFBRSxpQkFBaUIsRUFBRTtZQUNyQyxVQUFVLEVBQUUsR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxTQUFTLE1BQU07WUFDN0MsS0FBSyxFQUFFLElBQUksQ0FBQyxHQUFHO1NBQ2hCLENBQUMsQ0FBQztJQUNMLENBQUM7O0FBeERILDBDQXlEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIFN0YWNrLFxuICBhd3NfZWMyIGFzIGVjMixcbiAgYXdzX3JkcyBhcyByZHMsXG4gIGF3c19sYW1iZGEgYXMgbGFtYmRhLFxuICBhd3Nfc2VjcmV0c21hbmFnZXIgYXMgc2VjcmV0c21hbmFnZXIsXG4gIENmbk91dHB1dCxcbn0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQge1xuICBQeXRob25GdW5jdGlvbixcbiAgUHl0aG9uRnVuY3Rpb25Qcm9wcyxcbn0gZnJvbSBcIkBhd3MtY2RrL2F3cy1sYW1iZGEtcHl0aG9uLWFscGhhXCI7XG5pbXBvcnQgeyBJRG9tYWluTmFtZSwgSHR0cEFwaSB9IGZyb20gXCJAYXdzLWNkay9hd3MtYXBpZ2F0ZXdheXYyLWFscGhhXCI7XG5pbXBvcnQgeyBIdHRwTGFtYmRhSW50ZWdyYXRpb24gfSBmcm9tIFwiQGF3cy1jZGsvYXdzLWFwaWdhdGV3YXl2Mi1pbnRlZ3JhdGlvbnMtYWxwaGFcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmV4cG9ydCBjbGFzcyBQZ1N0YWNBcGlMYW1iZGEgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICByZWFkb25seSB1cmw6IHN0cmluZztcbiAgcHVibGljIHN0YWNBcGlMYW1iZGFGdW5jdGlvbjogUHl0aG9uRnVuY3Rpb247XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFBnU3RhY0FwaUxhbWJkYVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIGNvbnN0IGFwaUNvZGUgPSBwcm9wcy5hcGlDb2RlIHx8IHtcbiAgICAgIGVudHJ5OiBgJHtfX2Rpcm5hbWV9L3J1bnRpbWVgLFxuICAgICAgaW5kZXg6IFwic3JjL2hhbmRsZXIucHlcIixcbiAgICAgIGhhbmRsZXI6IFwiaGFuZGxlclwiLFxuICAgIH07XG5cbiAgICB0aGlzLnN0YWNBcGlMYW1iZGFGdW5jdGlvbiA9IG5ldyBQeXRob25GdW5jdGlvbih0aGlzLCBcInN0YWMtYXBpXCIsIHtcbiAgICAgIC4uLmFwaUNvZGUsXG4gICAgICAvKipcbiAgICAgICAqIE5PVEU6IFVuYWJsZSB0byB1c2UgUHkzLjksIGR1ZSB0byBpc3N1ZXMgd2l0aCBoYXNoZXM6XG4gICAgICAgKlxuICAgICAgICogICAgRVJST1I6IEhhc2hlcyBhcmUgcmVxdWlyZWQgaW4gLS1yZXF1aXJlLWhhc2hlcyBtb2RlLCBidXQgdGhleSBhcmUgbWlzc2luZ1xuICAgICAgICogICAgZnJvbSBzb21lIHJlcXVpcmVtZW50cy4gSGVyZSBpcyBhIGxpc3Qgb2YgdGhvc2UgcmVxdWlyZW1lbnRzIGFsb25nIHdpdGggdGhlXG4gICAgICAgKiAgICBoYXNoZXMgdGhlaXIgZG93bmxvYWRlZCBhcmNoaXZlcyBhY3R1YWxseSBoYWQuIEFkZCBsaW5lcyBsaWtlIHRoZXNlIHRvIHlvdXJcbiAgICAgICAqICAgIHJlcXVpcmVtZW50cyBmaWxlcyB0byBwcmV2ZW50IHRhbXBlcmluZy4gKElmIHlvdSBkaWQgbm90IGVuYWJsZVxuICAgICAgICogICAgLS1yZXF1aXJlLWhhc2hlcyBtYW51YWxseSwgbm90ZSB0aGF0IGl0IHR1cm5zIG9uIGF1dG9tYXRpY2FsbHkgd2hlbiBhbnlcbiAgICAgICAqICAgIHBhY2thZ2UgaGFzIGEgaGFzaC4pXG4gICAgICAgKiAgICAgICAgYW55aW89PTMuNi4xIC0taGFzaD1zaGEyNTY6Y2IyOWI5YzcwNjIwNTA2YTlhOGY4N2EzMDk1OTE3MTM0NDY5NTMzMDJkN2Q5OTUzNDRkMGQ3YzZjMGM5YTdiZVxuICAgICAgICogKi9cbiAgICAgIHJ1bnRpbWU6IGxhbWJkYS5SdW50aW1lLlBZVEhPTl8zXzgsXG4gICAgICBhcmNoaXRlY3R1cmU6IGxhbWJkYS5BcmNoaXRlY3R1cmUuWDg2XzY0LFxuICAgICAgZW52aXJvbm1lbnQ6IHtcbiAgICAgICAgUEdTVEFDX1NFQ1JFVF9BUk46IHByb3BzLmRiU2VjcmV0LnNlY3JldEFybixcbiAgICAgICAgREJfTUlOX0NPTk5fU0laRTogXCIwXCIsXG4gICAgICAgIERCX01BWF9DT05OX1NJWkU6IFwiMVwiLFxuICAgICAgICAuLi5wcm9wcy5hcGlFbnYsXG4gICAgICB9LFxuICAgICAgdnBjOiBwcm9wcy52cGMsXG4gICAgICB2cGNTdWJuZXRzOiBwcm9wcy5zdWJuZXRTZWxlY3Rpb24sXG4gICAgICBhbGxvd1B1YmxpY1N1Ym5ldDogdHJ1ZSxcbiAgICAgIG1lbW9yeVNpemU6IDgxOTIsXG4gICAgfSk7XG5cbiAgICBwcm9wcy5kYlNlY3JldC5ncmFudFJlYWQodGhpcy5zdGFjQXBpTGFtYmRhRnVuY3Rpb24pO1xuICAgIHRoaXMuc3RhY0FwaUxhbWJkYUZ1bmN0aW9uLmNvbm5lY3Rpb25zLmFsbG93VG8ocHJvcHMuZGIsIGVjMi5Qb3J0LnRjcCg1NDMyKSk7XG5cbiAgICBjb25zdCBzdGFjQXBpID0gbmV3IEh0dHBBcGkodGhpcywgYCR7U3RhY2sub2YodGhpcykuc3RhY2tOYW1lfS1zdGFjLWFwaWAsIHtcbiAgICAgIGRlZmF1bHREb21haW5NYXBwaW5nOiBwcm9wcy5zdGFjQXBpRG9tYWluTmFtZSA/IHsgXG4gICAgICAgIGRvbWFpbk5hbWU6IHByb3BzLnN0YWNBcGlEb21haW5OYW1lXG4gICAgICB9IDogdW5kZWZpbmVkLFxuICAgICAgZGVmYXVsdEludGVncmF0aW9uOiBuZXcgSHR0cExhbWJkYUludGVncmF0aW9uKFwiaW50ZWdyYXRpb25cIiwgdGhpcy5zdGFjQXBpTGFtYmRhRnVuY3Rpb24pLFxuICAgIH0pO1xuXG4gICAgdGhpcy51cmwgPSBzdGFjQXBpLnVybCE7XG5cbiAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIFwic3RhYy1hcGktb3V0cHV0XCIsIHtcbiAgICAgIGV4cG9ydE5hbWU6IGAke1N0YWNrLm9mKHRoaXMpLnN0YWNrTmFtZX0tdXJsYCxcbiAgICAgIHZhbHVlOiB0aGlzLnVybCxcbiAgICB9KTtcbiAgfVxufVxuXG5leHBvcnQgaW50ZXJmYWNlIFBnU3RhY0FwaUxhbWJkYVByb3BzIHtcbiAgLyoqXG4gICAqIFZQQyBpbnRvIHdoaWNoIHRoZSBsYW1iZGEgc2hvdWxkIGJlIGRlcGxveWVkLlxuICAgKi9cbiAgcmVhZG9ubHkgdnBjOiBlYzIuSVZwYztcblxuICAvKipcbiAgICogUkRTIEluc3RhbmNlIHdpdGggaW5zdGFsbGVkIHBnU1RBQy5cbiAgICovXG4gIHJlYWRvbmx5IGRiOiByZHMuSURhdGFiYXNlSW5zdGFuY2U7XG5cbiAgLyoqXG4gICAqIFN1Ym5ldCBpbnRvIHdoaWNoIHRoZSBsYW1iZGEgc2hvdWxkIGJlIGRlcGxveWVkLlxuICAgKi9cbiAgcmVhZG9ubHkgc3VibmV0U2VsZWN0aW9uOiBlYzIuU3VibmV0U2VsZWN0aW9uO1xuXG4gIC8qKlxuICAgKiBTZWNyZXQgY29udGFpbmluZyBjb25uZWN0aW9uIGluZm9ybWF0aW9uIGZvciBwZ1NUQUMgZGF0YWJhc2UuXG4gICAqL1xuICByZWFkb25seSBkYlNlY3JldDogc2VjcmV0c21hbmFnZXIuSVNlY3JldDtcblxuICAvKipcbiAgICogQ3VzdG9tIGNvZGUgdG8gcnVuIGZvciBmYXN0YXBpLXBnc3RhYy5cbiAgICpcbiAgICogQGRlZmF1bHQgLSBzaW1wbGlmaWVkIHZlcnNpb24gb2YgZmFzdGFwaS1wZ3N0YWNcbiAgICovXG4gIHJlYWRvbmx5IGFwaUNvZGU/OiBBcGlFbnRyeXBvaW50O1xuXG4gIC8qKlxuICAgKiBDdXN0b21pemVkIGVudmlyb25tZW50IHZhcmlhYmxlcyB0byBzZW5kIHRvIGZhc3RhcGktcGdzdGFjIHJ1bnRpbWUuXG4gICAqL1xuICByZWFkb25seSBhcGlFbnY/OiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+O1xuXG4gIC8qKlxuICAgKiBDdXN0b20gRG9tYWluIE5hbWUgT3B0aW9ucyBmb3IgU1RBQyBBUEksXG4gICAqL1xuICAgcmVhZG9ubHkgc3RhY0FwaURvbWFpbk5hbWU/OiBJRG9tYWluTmFtZTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBBcGlFbnRyeXBvaW50IHtcbiAgLyoqXG4gICAqIFBhdGggdG8gdGhlIHNvdXJjZSBvZiB0aGUgZnVuY3Rpb24gb3IgdGhlIGxvY2F0aW9uIGZvciBkZXBlbmRlbmNpZXMuXG4gICAqL1xuICByZWFkb25seSBlbnRyeTogUHl0aG9uRnVuY3Rpb25Qcm9wc1tcImVudHJ5XCJdO1xuICAvKipcbiAgICogVGhlIHBhdGggKHJlbGF0aXZlIHRvIGVudHJ5KSB0byB0aGUgaW5kZXggZmlsZSBjb250YWluaW5nIHRoZSBleHBvcnRlZCBoYW5kbGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgaW5kZXg6IFB5dGhvbkZ1bmN0aW9uUHJvcHNbXCJpbmRleFwiXTtcbiAgLyoqXG4gICAqIFRoZSBuYW1lIG9mIHRoZSBleHBvcnRlZCBoYW5kbGVyIGluIHRoZSBpbmRleCBmaWxlLlxuICAgKi9cbiAgcmVhZG9ubHkgaGFuZGxlcjogUHl0aG9uRnVuY3Rpb25Qcm9wc1tcImhhbmRsZXJcIl07XG59XG4iXX0=
+PgStacApiLambda[_a] = { fqn: "eoapi-cdk.PgStacApiLambda", version: "6.0.0" };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQVNxQjtBQUNyQiw0RUFBdUU7QUFDdkUsc0dBQXFGO0FBQ3JGLDJDQUF1QztBQUd2QyxNQUFhLGVBQWdCLFNBQVEsc0JBQVM7SUFJNUMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUEyQjtRQUNuRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMscUJBQXFCLEdBQUcsSUFBSSx3QkFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO1lBQy9ELHVDQUF1QztZQUN2QyxPQUFPLEVBQUUsd0JBQU0sQ0FBQyxPQUFPLENBQUMsV0FBVztZQUNuQyxPQUFPLEVBQUUscUJBQXFCO1lBQzlCLFVBQVUsRUFBRSxJQUFJO1lBQ2hCLFlBQVksRUFBRSxzQkFBUSxDQUFDLGFBQWEsQ0FBQyxRQUFRO1lBQzdDLE9BQU8sRUFBRSxzQkFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDN0IsSUFBSSxFQUFFLHdCQUFNLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUU7Z0JBQzNDLElBQUksRUFBRSxvQkFBb0I7Z0JBQzFCLFNBQVMsRUFBRSxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUU7YUFDdEMsQ0FBQztZQUNGLGlFQUFpRTtZQUNqRSxHQUFHLEtBQUssQ0FBQyxxQkFBcUI7WUFDOUIsNEZBQTRGO1lBQzVGLEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRztZQUNkLFVBQVUsRUFBRSxLQUFLLENBQUMsZUFBZTtZQUNqQyxpQkFBaUIsRUFBRSxJQUFJO1lBQ3ZCLFdBQVcsRUFBRTtnQkFDWCxpQkFBaUIsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFNBQVM7Z0JBQzNDLGdCQUFnQixFQUFFLEdBQUc7Z0JBQ3JCLGdCQUFnQixFQUFFLEdBQUc7Z0JBQ3JCLEdBQUcsS0FBSyxDQUFDLE1BQU07YUFDaEI7U0FDRixDQUFDLENBQUM7UUFFSCxLQUFLLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUNyRCxJQUFJLEtBQUssQ0FBQyxHQUFHLEVBQUM7WUFDWixJQUFJLENBQUMscUJBQXFCLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFLHFCQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1NBQzlFO1FBQ0QsTUFBTSxPQUFPLEdBQUcsSUFBSSxnQ0FBTyxDQUFDLElBQUksRUFBRSxHQUFHLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLFNBQVMsV0FBVyxFQUFFO1lBQ3hFLG9CQUFvQixFQUFFLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUM7Z0JBQzlDLFVBQVUsRUFBRSxLQUFLLENBQUMsaUJBQWlCO2FBQ3BDLENBQUMsQ0FBQyxDQUFDLFNBQVM7WUFDYixrQkFBa0IsRUFBRSxJQUFJLDJEQUFxQixDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMscUJBQXFCLENBQUM7U0FDekYsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBSSxDQUFDO1FBRXhCLElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLEVBQUU7WUFDckMsVUFBVSxFQUFFLEdBQUcsbUJBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsU0FBUyxNQUFNO1lBQzdDLEtBQUssRUFBRSxJQUFJLENBQUMsR0FBRztTQUNoQixDQUFDLENBQUM7SUFDTCxDQUFDOztBQW5ESCwwQ0FvREMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBTdGFjayxcbiAgYXdzX2VjMiBhcyBlYzIsXG4gIGF3c19yZHMgYXMgcmRzLFxuICBhd3NfbGFtYmRhIGFzIGxhbWJkYSxcbiAgYXdzX3NlY3JldHNtYW5hZ2VyIGFzIHNlY3JldHNtYW5hZ2VyLFxuICBDZm5PdXRwdXQsXG4gIER1cmF0aW9uLFxuICBhd3NfbG9ncyxcbn0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBJRG9tYWluTmFtZSwgSHR0cEFwaSB9IGZyb20gXCJAYXdzLWNkay9hd3MtYXBpZ2F0ZXdheXYyLWFscGhhXCI7XG5pbXBvcnQgeyBIdHRwTGFtYmRhSW50ZWdyYXRpb24gfSBmcm9tIFwiQGF3cy1jZGsvYXdzLWFwaWdhdGV3YXl2Mi1pbnRlZ3JhdGlvbnMtYWxwaGFcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBDdXN0b21MYW1iZGFGdW5jdGlvblByb3BzIH0gZnJvbSBcIi4uL3V0aWxzXCI7XG5cbmV4cG9ydCBjbGFzcyBQZ1N0YWNBcGlMYW1iZGEgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICByZWFkb25seSB1cmw6IHN0cmluZztcbiAgcHVibGljIHN0YWNBcGlMYW1iZGFGdW5jdGlvbjogbGFtYmRhLkZ1bmN0aW9uO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBQZ1N0YWNBcGlMYW1iZGFQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG4gICAgXG4gICAgY29uc29sZS5sb2cocHJvcHMpXG4gICAgY29uc29sZS5sb2cocHJvcHMubGFtYmRhRnVuY3Rpb25PcHRpb25zKTtcbiAgICB0aGlzLnN0YWNBcGlMYW1iZGFGdW5jdGlvbiA9IG5ldyBsYW1iZGEuRnVuY3Rpb24odGhpcywgXCJsYW1iZGFcIiwge1xuICAgICAgLy8gZGVmYXVsdHMgZm9yIGNvbmZpZ3VyYWJsZSBwcm9wZXJ0aWVzXG4gICAgICBydW50aW1lOiBsYW1iZGEuUnVudGltZS5QWVRIT05fM18xMSxcbiAgICAgIGhhbmRsZXI6IFwic3JjLmhhbmRsZXIuaGFuZGxlclwiLFxuICAgICAgbWVtb3J5U2l6ZTogODE5MixcbiAgICAgIGxvZ1JldGVudGlvbjogYXdzX2xvZ3MuUmV0ZW50aW9uRGF5cy5PTkVfV0VFSyxcbiAgICAgIHRpbWVvdXQ6IER1cmF0aW9uLnNlY29uZHMoMzApLFxuICAgICAgY29kZTogbGFtYmRhLkNvZGUuZnJvbURvY2tlckJ1aWxkKF9fZGlybmFtZSwge1xuICAgICAgICBmaWxlOiBcInJ1bnRpbWUvRG9ja2VyZmlsZVwiLFxuICAgICAgICBidWlsZEFyZ3M6IHsgUFlUSE9OX1ZFUlNJT046ICczLjExJyB9LFxuICAgICAgfSksXG4gICAgICAvLyBvdmVyd3JpdGVzIGRlZmF1bHRzIHdpdGggdXNlci1wcm92aWRlZCBjb25maWd1cmFibGUgcHJvcGVydGllc1xuICAgICAgLi4ucHJvcHMubGFtYmRhRnVuY3Rpb25PcHRpb25zLFxuICAgICAgLy8gTm9uIGNvbmZpZ3VyYWJsZSBwcm9wZXJ0aWVzIHRoYXQgYXJlIGdvaW5nIHRvIGJlIG92ZXJ3cml0dGVuIGV2ZW4gaWYgcHJvdmlkZWQgYnkgdGhlIHVzZXJcbiAgICAgIHZwYzogcHJvcHMudnBjLFxuICAgICAgdnBjU3VibmV0czogcHJvcHMuc3VibmV0U2VsZWN0aW9uLFxuICAgICAgYWxsb3dQdWJsaWNTdWJuZXQ6IHRydWUsXG4gICAgICBlbnZpcm9ubWVudDoge1xuICAgICAgICBQR1NUQUNfU0VDUkVUX0FSTjogcHJvcHMuZGJTZWNyZXQuc2VjcmV0QXJuLFxuICAgICAgICBEQl9NSU5fQ09OTl9TSVpFOiBcIjBcIixcbiAgICAgICAgREJfTUFYX0NPTk5fU0laRTogXCIxXCIsXG4gICAgICAgIC4uLnByb3BzLmFwaUVudixcbiAgICAgIH0sXG4gICAgfSk7XG5cbiAgICBwcm9wcy5kYlNlY3JldC5ncmFudFJlYWQodGhpcy5zdGFjQXBpTGFtYmRhRnVuY3Rpb24pO1xuICAgIGlmIChwcm9wcy52cGMpe1xuICAgICAgdGhpcy5zdGFjQXBpTGFtYmRhRnVuY3Rpb24uY29ubmVjdGlvbnMuYWxsb3dUbyhwcm9wcy5kYiwgZWMyLlBvcnQudGNwKDU0MzIpKTtcbiAgICB9XG4gICAgY29uc3Qgc3RhY0FwaSA9IG5ldyBIdHRwQXBpKHRoaXMsIGAke1N0YWNrLm9mKHRoaXMpLnN0YWNrTmFtZX0tc3RhYy1hcGlgLCB7XG4gICAgICBkZWZhdWx0RG9tYWluTWFwcGluZzogcHJvcHMuc3RhY0FwaURvbWFpbk5hbWUgPyB7IFxuICAgICAgICBkb21haW5OYW1lOiBwcm9wcy5zdGFjQXBpRG9tYWluTmFtZVxuICAgICAgfSA6IHVuZGVmaW5lZCxcbiAgICAgIGRlZmF1bHRJbnRlZ3JhdGlvbjogbmV3IEh0dHBMYW1iZGFJbnRlZ3JhdGlvbihcImludGVncmF0aW9uXCIsIHRoaXMuc3RhY0FwaUxhbWJkYUZ1bmN0aW9uKSxcbiAgICB9KTtcblxuICAgIHRoaXMudXJsID0gc3RhY0FwaS51cmwhO1xuXG4gICAgbmV3IENmbk91dHB1dCh0aGlzLCBcInN0YWMtYXBpLW91dHB1dFwiLCB7XG4gICAgICBleHBvcnROYW1lOiBgJHtTdGFjay5vZih0aGlzKS5zdGFja05hbWV9LXVybGAsXG4gICAgICB2YWx1ZTogdGhpcy51cmwsXG4gICAgfSk7XG4gIH1cbn1cblxuZXhwb3J0IGludGVyZmFjZSBQZ1N0YWNBcGlMYW1iZGFQcm9wcyB7XG4gIC8qKlxuICAgKiBWUEMgaW50byB3aGljaCB0aGUgbGFtYmRhIHNob3VsZCBiZSBkZXBsb3llZC5cbiAgICovXG4gIHJlYWRvbmx5IHZwYz86IGVjMi5JVnBjO1xuXG4gIC8qKlxuICAgKiBSRFMgSW5zdGFuY2Ugd2l0aCBpbnN0YWxsZWQgcGdTVEFDLlxuICAgKi9cbiAgcmVhZG9ubHkgZGI6IHJkcy5JRGF0YWJhc2VJbnN0YW5jZTtcblxuICAvKipcbiAgICogU3VibmV0IGludG8gd2hpY2ggdGhlIGxhbWJkYSBzaG91bGQgYmUgZGVwbG95ZWQuXG4gICAqL1xuICByZWFkb25seSBzdWJuZXRTZWxlY3Rpb24/OiBlYzIuU3VibmV0U2VsZWN0aW9uO1xuXG4gIC8qKlxuICAgKiBTZWNyZXQgY29udGFpbmluZyBjb25uZWN0aW9uIGluZm9ybWF0aW9uIGZvciBwZ1NUQUMgZGF0YWJhc2UuXG4gICAqL1xuICByZWFkb25seSBkYlNlY3JldDogc2VjcmV0c21hbmFnZXIuSVNlY3JldDtcblxuICAvKipcbiAgICogQ3VzdG9taXplZCBlbnZpcm9ubWVudCB2YXJpYWJsZXMgdG8gc2VuZCB0byBmYXN0YXBpLXBnc3RhYyBydW50aW1lLlxuICAgKi9cbiAgcmVhZG9ubHkgYXBpRW52PzogUmVjb3JkPHN0cmluZywgc3RyaW5nPjtcblxuICAvKipcbiAgICogQ3VzdG9tIERvbWFpbiBOYW1lIE9wdGlvbnMgZm9yIFNUQUMgQVBJLFxuICAgKi9cbiAgIHJlYWRvbmx5IHN0YWNBcGlEb21haW5OYW1lPzogSURvbWFpbk5hbWU7XG5cbiAgLyoqXG4gICAgICogT3B0aW9uYWwgc2V0dGluZ3MgZm9yIHRoZSBsYW1iZGEgZnVuY3Rpb24uIENhbiBiZSBhbnl0aGluZyB0aGF0IGNhbiBiZSBjb25maWd1cmVkIG9uIHRoZSBsYW1iZGEgZnVuY3Rpb24sIGJ1dCBzb21lIHdpbGwgYmUgb3ZlcndyaXR0ZW4gYnkgdmFsdWVzIGRlZmluZWQgaGVyZS4gXG4gICAgICpcbiAgICAgKiBAZGVmYXVsdCAtIGRlZmluZWQgaW4gdGhlIGNvbnN0cnVjdC5cbiAgICAgKi9cbiAgcmVhZG9ubHkgbGFtYmRhRnVuY3Rpb25PcHRpb25zPzogQ3VzdG9tTGFtYmRhRnVuY3Rpb25Qcm9wcztcbn1cblxuIl19

package/lib/stac-api/runtime/Dockerfile

@@ -0,0 +1,13 @@
+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 mkdir -p /asset/src
+COPY runtime/src/*.py /asset/src/
+
+CMD ["echo", "hello world"]

package/lib/stac-api/runtime/requirements.txt

@@ -1,4 +1,3 @@
-mangum==0.15.1
 stac-fastapi.api==2.4.8
 stac-fastapi.extensions==2.4.8
 stac-fastapi.pgstac==2.4.8

package/lib/stac-browser/index.js

@@ -82,5 +82,5 @@ class StacBrowser extends constructs_1.Construct {
 }
 exports.StacBrowser = StacBrowser;
 _a = JSII_RTTI_SYMBOL_1;
-StacBrowser[_a] = { fqn: "eoapi-cdk.StacBrowser", version: "5.4.1" };
+StacBrowser[_a] = { fqn: "eoapi-cdk.StacBrowser", version: "6.0.0" };
 //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Stack, aws_s3 as s3, aws_s3_deployment as s3_deployment} from \"aws-cdk-lib\";\nimport { RemovalPolicy, CfnOutput } from \"aws-cdk-lib\";\nimport { PolicyStatement, ServicePrincipal, Effect } from \"aws-cdk-lib/aws-iam\";\n\nimport { Construct } from \"constructs\";\nimport { execSync } from \"child_process\";\nimport * as fs from 'fs';\n\nconst DEFAULT_CLONE_DIRECTORY = './stac-browser';\n\nexport class StacBrowser extends Construct {\n\n    public bucket: s3.IBucket;\n    public bucketDeployment: s3_deployment.BucketDeployment;\n\n    constructor(scope: Construct, id: string, props: StacBrowserProps) {\n        super(scope, id);\n\n        const buildPath = this.buildApp(props.stacCatalogUrl, props.githubRepoTag, props.cloneDirectory || DEFAULT_CLONE_DIRECTORY);\n\n        // import a bucket from props.bucketArn if defined, otherwise create a new bucket\n        if (props.bucketArn) {\n            this.bucket = s3.Bucket.fromBucketArn(this, 'Bucket', props.bucketArn);\n        } else {\n            this.bucket = new s3.Bucket(this, 'Bucket', {\n                accessControl: s3.BucketAccessControl.PRIVATE,\n                removalPolicy: RemovalPolicy.DESTROY,\n                websiteIndexDocument: props.websiteIndexDocument\n            })\n        }\n        \n        // if props.cloudFrontDistributionArn is defined and props.bucketArn is not defined, add a bucket policy to allow read access from the cloudfront distribution\n        if (props.cloudFrontDistributionArn && !props.bucketArn) {\n            this.bucket.addToResourcePolicy(new PolicyStatement({\n                        sid: 'AllowCloudFrontServicePrincipal',\n                        effect: Effect.ALLOW, \n                        actions: ['s3:GetObject'],\n                        principals: [new ServicePrincipal('cloudfront.amazonaws.com')],\n                        resources: [this.bucket.arnForObjects('*')],\n                        conditions: {\n                            'StringEquals': {\n                                'aws:SourceArn': props.cloudFrontDistributionArn\n                            }\n                        }\n                    }));\n        }\n        \n        // add the compiled code to the bucket as a bucket deployment\n        this.bucketDeployment = new s3_deployment.BucketDeployment(this, 'BucketDeployment', {\n            destinationBucket: this.bucket,\n            sources: [s3_deployment.Source.asset(buildPath)]\n          });\n\n        new CfnOutput(this, \"bucket-name\", {\n        exportName: `${Stack.of(this).stackName}-bucket-name`,\n        value: this.bucket.bucketName,\n        });\n\n    }\n\n    private buildApp(stacCatalogUrl: string, githubRepoTag: string, cloneDirectory: string): string {\n            \n        // Define where to clone and build\n        const githubRepoUrl = 'https://github.com/radiantearth/stac-browser.git';\n\n\n        // Maybe the repo already exists in cloneDirectory. Try checking out the desired version and if it fails, delete and reclone. \n        try {\n            console.log(`Checking if a valid cloned repo exists with version ${githubRepoTag}...`)\n            execSync(`git checkout tags/${githubRepoTag}`, { cwd: cloneDirectory });\n        }\n        catch (error) {\n\n            // if directory exists, raise an error\n            if (fs.existsSync(cloneDirectory)) {\n                throw new Error(`Directory ${cloneDirectory} already exists and is not a valid clone of ${githubRepoUrl}. Please delete this directory or specify a different cloneDirectory.`);\n            }\n\n            // else, we clone and check out the version.\n\n            // Clone the repo\n            console.log(`Cloning ${githubRepoUrl} into ${cloneDirectory}...`)\n            execSync(`git clone ${githubRepoUrl} ${cloneDirectory}`);\n\n            // Check out the desired version\n            console.log(`Checking out version ${githubRepoTag}...`)\n            execSync(`git checkout tags/${githubRepoTag}`, { cwd: cloneDirectory });\n\n        }\n\n        // Install the dependencies and build the application\n        console.log(`Installing dependencies`)\n        execSync('npm install', { cwd: cloneDirectory });\n\n        // Build the app with catalogUrl\n        console.log(`Building app with catalogUrl=${stacCatalogUrl} into ${cloneDirectory}`)\n        execSync(`npm run build -- --catalogUrl=${stacCatalogUrl}`, { cwd: cloneDirectory });\n\n        return './stac-browser/dist'\n\n    }\n\n\n}\n\nexport interface StacBrowserProps {\n\n    /**\n     * Bucket ARN. If specified, the identity used to deploy the stack must have the appropriate permissions to create a deployment for this bucket. \n     * In addition, if specified, `cloudFrontDistributionArn` is ignored since the policy of an imported resource can't be modified.\n     * \n     * @default - No bucket ARN. A new bucket will be created.\n     */\n\n    readonly bucketArn?: string;\n\n    /**\n     * STAC catalog URL\n     */    \n    readonly stacCatalogUrl: string;\n\n    /**\n     * Tag of the radiant earth stac-browser repo to use to build the app.\n     */\n    readonly githubRepoTag: string;\n\n\n    /**\n     * The ARN of the cloudfront distribution that will be added to the bucket policy with read access.\n     * If `bucketArn` is specified, this parameter is ignored since the policy of an imported bucket can't be modified.\n     * \n     * @default - No cloudfront distribution ARN. The bucket policy will not be modified.\n     */    \n    readonly cloudFrontDistributionArn?: string;\n    \n    /**\n     * The name of the index document (e.g. \"index.html\") for the website. Enables static website\n     * hosting for this bucket.\n     *\n     * @default - No index document.\n     */\n    readonly websiteIndexDocument?: string;\n\n    /**\n     * Location in the filesystem where to compile the browser code. \n     * \n     * @default - DEFAULT_CLONE_DIRECTORY\n     */\n    readonly cloneDirectory?: string;\n\n}\n"]}

package/lib/tipg-api/index.d.ts

@@ -1,17 +1,17 @@
-import { aws_ec2 as ec2, aws_rds as rds, aws_secretsmanager as secretsmanager } from "aws-cdk-lib";
-import { PythonFunction, PythonFunctionProps } from "@aws-cdk/aws-lambda-python-alpha";
+import { aws_ec2 as ec2, aws_rds as rds, aws_lambda as lambda, aws_secretsmanager as secretsmanager } from "aws-cdk-lib";
 import { IDomainName } from "@aws-cdk/aws-apigatewayv2-alpha";
 import { Construct } from "constructs";
+import { CustomLambdaFunctionProps } from "../utils";
 export declare class TiPgApiLambda extends Construct {
     readonly url: string;
-    tiPgLambdaFunction: PythonFunction;
+    tiPgLambdaFunction: lambda.Function;
     constructor(scope: Construct, id: string, props: TiPgApiLambdaProps);
 }
 export interface TiPgApiLambdaProps {
     /**
      * VPC into which the lambda should be deployed.
      */
-    readonly vpc: ec2.IVpc;
+    readonly vpc?: ec2.IVpc;
     /**
      * RDS Instance with installed pgSTAC.
      */
@@ -19,17 +19,11 @@ export interface TiPgApiLambdaProps {
     /**
      * Subnet into which the lambda should be deployed.
      */
-    readonly subnetSelection: ec2.SubnetSelection;
+    readonly subnetSelection?: ec2.SubnetSelection;
     /**
      * Secret containing connection information for pgSTAC database.
      */
     readonly dbSecret: secretsmanager.ISecret;
-    /**
-     * Custom code to run for the application.
-     *
-     * @default - simplified version of tipg.
-     */
-    readonly apiCode?: TiPgApiEntrypoint;
     /**
      * Customized environment variables to send to titiler-pgstac runtime.
      */
@@ -41,18 +35,10 @@ export interface TiPgApiLambdaProps {
      * @default - undefined
      */
     readonly tipgApiDomainName?: IDomainName;
-}
-export interface TiPgApiEntrypoint {
     /**
-     * Path to the source of the function or the location for dependencies.
-     */
-    readonly entry: PythonFunctionProps["entry"];
-    /**
-     * The path (relative to entry) to the index file containing the exported handler.
-     */
-    readonly index: PythonFunctionProps["index"];
-    /**
-     * The name of the exported handler in the index file.
+     * Optional settings for the lambda function. Can be anything that can be configured on the lambda function, but some will be overwritten by values defined here.
+     *
+     * @default - defined in the construct.
      */
-    readonly handler: PythonFunctionProps["handler"];
+    readonly lambdaFunctionOptions?: CustomLambdaFunctionProps;
 }

package/lib/tipg-api/index.js

@@ -4,36 +4,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TiPgApiLambda = void 0;
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-const aws_lambda_python_alpha_1 = require("@aws-cdk/aws-lambda-python-alpha");
 const aws_apigatewayv2_alpha_1 = require("@aws-cdk/aws-apigatewayv2-alpha");
 const aws_apigatewayv2_integrations_alpha_1 = require("@aws-cdk/aws-apigatewayv2-integrations-alpha");
 const constructs_1 = require("constructs");
 class TiPgApiLambda extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const apiCode = props.apiCode || {
-            entry: `${__dirname}/runtime`,
-            index: "src/handler.py",
-            handler: "handler",
-        };
-        this.tiPgLambdaFunction = new aws_lambda_python_alpha_1.PythonFunction(this, "tipg-api", {
-            ...apiCode,
-            runtime: aws_cdk_lib_1.aws_lambda.Runtime.PYTHON_3_10,
-            architecture: aws_cdk_lib_1.aws_lambda.Architecture.X86_64,
+        this.tiPgLambdaFunction = new aws_cdk_lib_1.aws_lambda.Function(this, "lambda", {
+            // defaults for configurable properties
+            runtime: aws_cdk_lib_1.aws_lambda.Runtime.PYTHON_3_11,
+            handler: "handler.handler",
+            memorySize: 1024,
+            logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.ONE_WEEK,
+            timeout: aws_cdk_lib_1.Duration.seconds(30),
+            code: aws_cdk_lib_1.aws_lambda.Code.fromDockerBuild(__dirname, {
+                file: "runtime/Dockerfile",
+                buildArgs: { PYTHON_VERSION: '3.11' },
+            }),
+            // overwrites defaults with user-provided configurable properties
+            ...props.lambdaFunctionOptions,
+            // Non configurable properties that are going to be overwritten even if provided by the user
+            vpc: props.vpc,
+            vpcSubnets: props.subnetSelection,
+            allowPublicSubnet: true,
             environment: {
                 PGSTAC_SECRET_ARN: props.dbSecret.secretArn,
                 DB_MIN_CONN_SIZE: "1",
                 DB_MAX_CONN_SIZE: "1",
                 ...props.apiEnv,
             },
-            vpc: props.vpc,
-            vpcSubnets: props.subnetSelection,
-            allowPublicSubnet: true,
-            memorySize: 1024,
-            timeout: aws_cdk_lib_1.Duration.seconds(30),
         });
         props.dbSecret.grantRead(this.tiPgLambdaFunction);
-        this.tiPgLambdaFunction.connections.allowTo(props.db, aws_cdk_lib_1.aws_ec2.Port.tcp(5432), "allow connections from tipg");
+        if (props.vpc) {
+            this.tiPgLambdaFunction.connections.allowTo(props.db, aws_cdk_lib_1.aws_ec2.Port.tcp(5432), "allow connections from tipg");
+        }
         const tipgApi = new aws_apigatewayv2_alpha_1.HttpApi(this, `${aws_cdk_lib_1.Stack.of(this).stackName}-tipg-api`, {
             defaultDomainMapping: props.tipgApiDomainName ? {
                 domainName: props.tipgApiDomainName
@@ -49,5 +53,5 @@ class TiPgApiLambda extends constructs_1.Construct {
 }
 exports.TiPgApiLambda = TiPgApiLambda;
 _a = JSII_RTTI_SYMBOL_1;
-TiPgApiLambda[_a] = { fqn: "eoapi-cdk.TiPgApiLambda", version: "5.4.1" };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQVF1QjtBQUNyQiw4RUFHMEM7QUFDMUMsNEVBQXVFO0FBQ3ZFLHNHQUFxRjtBQUNyRiwyQ0FBdUM7QUFFdkMsTUFBYSxhQUFjLFNBQVEsc0JBQVM7SUFJMUMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUF5QjtRQUNqRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxPQUFPLElBQUk7WUFDL0IsS0FBSyxFQUFFLEdBQUcsU0FBUyxVQUFVO1lBQzdCLEtBQUssRUFBRSxnQkFBZ0I7WUFDdkIsT0FBTyxFQUFFLFNBQVM7U0FDbkIsQ0FBQztRQUVGLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxJQUFJLHdDQUFjLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRTtZQUM3RCxHQUFHLE9BQU87WUFDVixPQUFPLEVBQUUsd0JBQU0sQ0FBQyxPQUFPLENBQUMsV0FBVztZQUNuQyxZQUFZLEVBQUUsd0JBQU0sQ0FBQyxZQUFZLENBQUMsTUFBTTtZQUN4QyxXQUFXLEVBQUU7Z0JBQ1gsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxTQUFTO2dCQUMzQyxnQkFBZ0IsRUFBRSxHQUFHO2dCQUNyQixnQkFBZ0IsRUFBRSxHQUFHO2dCQUNyQixHQUFHLEtBQUssQ0FBQyxNQUFNO2FBQ2hCO1lBQ0QsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO1lBQ2QsVUFBVSxFQUFFLEtBQUssQ0FBQyxlQUFlO1lBQ2pDLGlCQUFpQixFQUFFLElBQUk7WUFDdkIsVUFBVSxFQUFFLElBQUk7WUFDaEIsT0FBTyxFQUFFLHNCQUFRLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztTQUM5QixDQUFDLENBQUM7UUFFSCxLQUFLLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUNsRCxJQUFJLENBQUMsa0JBQWtCLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFLHFCQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSw2QkFBNkIsQ0FBQyxDQUFDO1FBRXpHLE1BQU0sT0FBTyxHQUFHLElBQUksZ0NBQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxTQUFTLFdBQVcsRUFBRTtZQUN4RSxvQkFBb0IsRUFBRSxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDO2dCQUM5QyxVQUFVLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjthQUNwQyxDQUFDLENBQUMsQ0FBQyxTQUFTO1lBQ2Isa0JBQWtCLEVBQUUsSUFBSSwyREFBcUIsQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLGtCQUFrQixDQUFDO1NBQ3RGLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUksQ0FBQztRQUV4QixJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLGlCQUFpQixFQUFFO1lBQ3JDLFVBQVUsRUFBRSxHQUFHLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLFNBQVMsVUFBVTtZQUNqRCxLQUFLLEVBQUUsSUFBSSxDQUFDLEdBQUc7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7QUE5Q0gsc0NBK0NDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgICBTdGFjayxcbiAgICBhd3NfZWMyIGFzIGVjMixcbiAgICBhd3NfcmRzIGFzIHJkcyxcbiAgICBhd3NfbGFtYmRhIGFzIGxhbWJkYSxcbiAgICBhd3Nfc2VjcmV0c21hbmFnZXIgYXMgc2VjcmV0c21hbmFnZXIsXG4gICAgQ2ZuT3V0cHV0LFxuICAgIER1cmF0aW9uLFxuICB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuICBpbXBvcnQge1xuICAgIFB5dGhvbkZ1bmN0aW9uLFxuICAgIFB5dGhvbkZ1bmN0aW9uUHJvcHMsXG4gIH0gZnJvbSBcIkBhd3MtY2RrL2F3cy1sYW1iZGEtcHl0aG9uLWFscGhhXCI7XG4gIGltcG9ydCB7IElEb21haW5OYW1lLCBIdHRwQXBpIH0gZnJvbSBcIkBhd3MtY2RrL2F3cy1hcGlnYXRld2F5djItYWxwaGFcIjtcbiAgaW1wb3J0IHsgSHR0cExhbWJkYUludGVncmF0aW9uIH0gZnJvbSBcIkBhd3MtY2RrL2F3cy1hcGlnYXRld2F5djItaW50ZWdyYXRpb25zLWFscGhhXCI7XG4gIGltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbiAgZXhwb3J0IGNsYXNzIFRpUGdBcGlMYW1iZGEgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICAgIHJlYWRvbmx5IHVybDogc3RyaW5nO1xuICAgIHB1YmxpYyB0aVBnTGFtYmRhRnVuY3Rpb246IFB5dGhvbkZ1bmN0aW9uO1xuXG4gICAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFRpUGdBcGlMYW1iZGFQcm9wcykge1xuICAgICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgICAgY29uc3QgYXBpQ29kZSA9IHByb3BzLmFwaUNvZGUgfHwge1xuICAgICAgICBlbnRyeTogYCR7X19kaXJuYW1lfS9ydW50aW1lYCxcbiAgICAgICAgaW5kZXg6IFwic3JjL2hhbmRsZXIucHlcIixcbiAgICAgICAgaGFuZGxlcjogXCJoYW5kbGVyXCIsXG4gICAgICB9O1xuXG4gICAgICB0aGlzLnRpUGdMYW1iZGFGdW5jdGlvbiA9IG5ldyBQeXRob25GdW5jdGlvbih0aGlzLCBcInRpcGctYXBpXCIsIHtcbiAgICAgICAgLi4uYXBpQ29kZSxcbiAgICAgICAgcnVudGltZTogbGFtYmRhLlJ1bnRpbWUuUFlUSE9OXzNfMTAsXG4gICAgICAgIGFyY2hpdGVjdHVyZTogbGFtYmRhLkFyY2hpdGVjdHVyZS5YODZfNjQsXG4gICAgICAgIGVudmlyb25tZW50OiB7XG4gICAgICAgICAgUEdTVEFDX1NFQ1JFVF9BUk46IHByb3BzLmRiU2VjcmV0LnNlY3JldEFybixcbiAgICAgICAgICBEQl9NSU5fQ09OTl9TSVpFOiBcIjFcIixcbiAgICAgICAgICBEQl9NQVhfQ09OTl9TSVpFOiBcIjFcIixcbiAgICAgICAgICAuLi5wcm9wcy5hcGlFbnYsXG4gICAgICAgIH0sXG4gICAgICAgIHZwYzogcHJvcHMudnBjLFxuICAgICAgICB2cGNTdWJuZXRzOiBwcm9wcy5zdWJuZXRTZWxlY3Rpb24sXG4gICAgICAgIGFsbG93UHVibGljU3VibmV0OiB0cnVlLFxuICAgICAgICBtZW1vcnlTaXplOiAxMDI0LFxuICAgICAgICB0aW1lb3V0OiBEdXJhdGlvbi5zZWNvbmRzKDMwKSxcbiAgICAgIH0pO1xuXG4gICAgICBwcm9wcy5kYlNlY3JldC5ncmFudFJlYWQodGhpcy50aVBnTGFtYmRhRnVuY3Rpb24pO1xuICAgICAgdGhpcy50aVBnTGFtYmRhRnVuY3Rpb24uY29ubmVjdGlvbnMuYWxsb3dUbyhwcm9wcy5kYiwgZWMyLlBvcnQudGNwKDU0MzIpLCBcImFsbG93IGNvbm5lY3Rpb25zIGZyb20gdGlwZ1wiKTtcblxuICAgICAgY29uc3QgdGlwZ0FwaSA9IG5ldyBIdHRwQXBpKHRoaXMsIGAke1N0YWNrLm9mKHRoaXMpLnN0YWNrTmFtZX0tdGlwZy1hcGlgLCB7XG4gICAgICAgIGRlZmF1bHREb21haW5NYXBwaW5nOiBwcm9wcy50aXBnQXBpRG9tYWluTmFtZSA/IHsgXG4gICAgICAgICAgZG9tYWluTmFtZTogcHJvcHMudGlwZ0FwaURvbWFpbk5hbWVcbiAgICAgICAgfSA6IHVuZGVmaW5lZCxcbiAgICAgICAgZGVmYXVsdEludGVncmF0aW9uOiBuZXcgSHR0cExhbWJkYUludGVncmF0aW9uKFwiaW50ZWdyYXRpb25cIiwgdGhpcy50aVBnTGFtYmRhRnVuY3Rpb24pLFxuICAgICAgfSk7XG5cbiAgICAgIHRoaXMudXJsID0gdGlwZ0FwaS51cmwhO1xuXG4gICAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIFwidGlwZy1hcGktb3V0cHV0XCIsIHtcbiAgICAgICAgZXhwb3J0TmFtZTogYCR7U3RhY2sub2YodGhpcykuc3RhY2tOYW1lfS10aXAtdXJsYCxcbiAgICAgICAgdmFsdWU6IHRoaXMudXJsLFxuICAgICAgfSk7XG4gICAgfVxuICB9XG5cbiAgZXhwb3J0IGludGVyZmFjZSBUaVBnQXBpTGFtYmRhUHJvcHMge1xuXG4gICAgLyoqXG4gICAgICogVlBDIGludG8gd2hpY2ggdGhlIGxhbWJkYSBzaG91bGQgYmUgZGVwbG95ZWQuXG4gICAgICovXG4gICAgcmVhZG9ubHkgdnBjOiBlYzIuSVZwYztcblxuICAgIC8qKlxuICAgICAqIFJEUyBJbnN0YW5jZSB3aXRoIGluc3RhbGxlZCBwZ1NUQUMuXG4gICAgICovXG4gICAgcmVhZG9ubHkgZGI6IHJkcy5JRGF0YWJhc2VJbnN0YW5jZTtcblxuICAgIC8qKlxuICAgICAqIFN1Ym5ldCBpbnRvIHdoaWNoIHRoZSBsYW1iZGEgc2hvdWxkIGJlIGRlcGxveWVkLlxuICAgICAqL1xuICAgIHJlYWRvbmx5IHN1Ym5ldFNlbGVjdGlvbjogZWMyLlN1Ym5ldFNlbGVjdGlvbjtcblxuICAgIC8qKlxuICAgICAqIFNlY3JldCBjb250YWluaW5nIGNvbm5lY3Rpb24gaW5mb3JtYXRpb24gZm9yIHBnU1RBQyBkYXRhYmFzZS5cbiAgICAgKi9cbiAgICByZWFkb25seSBkYlNlY3JldDogc2VjcmV0c21hbmFnZXIuSVNlY3JldDtcblxuICAgIC8qKlxuICAgICAqIEN1c3RvbSBjb2RlIHRvIHJ1biBmb3IgdGhlIGFwcGxpY2F0aW9uLlxuICAgICAqXG4gICAgICogQGRlZmF1bHQgLSBzaW1wbGlmaWVkIHZlcnNpb24gb2YgdGlwZy5cbiAgICAgKi9cbiAgICByZWFkb25seSBhcGlDb2RlPzogVGlQZ0FwaUVudHJ5cG9pbnQ7XG5cbiAgICAvKipcbiAgICAgKiBDdXN0b21pemVkIGVudmlyb25tZW50IHZhcmlhYmxlcyB0byBzZW5kIHRvIHRpdGlsZXItcGdzdGFjIHJ1bnRpbWUuXG4gICAgICovXG4gICAgcmVhZG9ubHkgYXBpRW52PzogUmVjb3JkPHN0cmluZywgc3RyaW5nPjtcbiAgXG4gICAgLyoqXG4gICAgICogQ3VzdG9tIERvbWFpbiBOYW1lIGZvciB0aXBnIEFQSS4gSWYgZGVmaW5lZCwgd2lsbCBjcmVhdGUgdGhlIFxuICAgICAqIGRvbWFpbiBuYW1lIGFuZCBpbnRlZ3JhdGUgaXQgd2l0aCB0aGUgdGlwZyBBUEkuIFxuICAgICAqIFxuICAgICAqIEBkZWZhdWx0IC0gdW5kZWZpbmVkXG4gICAgICovXG4gICAgcmVhZG9ubHkgdGlwZ0FwaURvbWFpbk5hbWU/OiBJRG9tYWluTmFtZTtcbiAgfVxuXG4gIGV4cG9ydCBpbnRlcmZhY2UgVGlQZ0FwaUVudHJ5cG9pbnQge1xuICAgIC8qKlxuICAgICAqIFBhdGggdG8gdGhlIHNvdXJjZSBvZiB0aGUgZnVuY3Rpb24gb3IgdGhlIGxvY2F0aW9uIGZvciBkZXBlbmRlbmNpZXMuXG4gICAgICovXG4gICAgcmVhZG9ubHkgZW50cnk6IFB5dGhvbkZ1bmN0aW9uUHJvcHNbXCJlbnRyeVwiXTtcbiAgICAvKipcbiAgICAgKiBUaGUgcGF0aCAocmVsYXRpdmUgdG8gZW50cnkpIHRvIHRoZSBpbmRleCBmaWxlIGNvbnRhaW5pbmcgdGhlIGV4cG9ydGVkIGhhbmRsZXIuXG4gICAgICovXG4gICAgcmVhZG9ubHkgaW5kZXg6IFB5dGhvbkZ1bmN0aW9uUHJvcHNbXCJpbmRleFwiXTtcbiAgICAvKipcbiAgICAgKiBUaGUgbmFtZSBvZiB0aGUgZXhwb3J0ZWQgaGFuZGxlciBpbiB0aGUgaW5kZXggZmlsZS5cbiAgICAgKi9cbiAgICByZWFkb25seSBoYW5kbGVyOiBQeXRob25GdW5jdGlvblByb3BzW1wiaGFuZGxlclwiXTtcbiAgfVxuIl19
+TiPgApiLambda[_a] = { fqn: "eoapi-cdk.TiPgApiLambda", version: "6.0.0" };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQVN1QjtBQUNyQiw0RUFBdUU7QUFDdkUsc0dBQXFGO0FBQ3JGLDJDQUF1QztBQUd2QyxNQUFhLGFBQWMsU0FBUSxzQkFBUztJQUkxQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXlCO1FBQ2pFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLGtCQUFrQixHQUFHLElBQUksd0JBQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRTtZQUM1RCx1Q0FBdUM7WUFDdkMsT0FBTyxFQUFFLHdCQUFNLENBQUMsT0FBTyxDQUFDLFdBQVc7WUFDbkMsT0FBTyxFQUFFLGlCQUFpQjtZQUMxQixVQUFVLEVBQUUsSUFBSTtZQUNoQixZQUFZLEVBQUUsc0JBQUksQ0FBQyxhQUFhLENBQUMsUUFBUTtZQUN6QyxPQUFPLEVBQUUsc0JBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQzdCLElBQUksRUFBRSx3QkFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFO2dCQUM3QyxJQUFJLEVBQUUsb0JBQW9CO2dCQUMxQixTQUFTLEVBQUUsRUFBRSxjQUFjLEVBQUUsTUFBTSxFQUFFO2FBQ3BDLENBQUM7WUFDRixpRUFBaUU7WUFDakUsR0FBRyxLQUFLLENBQUMscUJBQXFCO1lBQzlCLDRGQUE0RjtZQUM1RixHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQUc7WUFDZCxVQUFVLEVBQUUsS0FBSyxDQUFDLGVBQWU7WUFDakMsaUJBQWlCLEVBQUUsSUFBSTtZQUN2QixXQUFXLEVBQUU7Z0JBQ1gsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxTQUFTO2dCQUMzQyxnQkFBZ0IsRUFBRSxHQUFHO2dCQUNyQixnQkFBZ0IsRUFBRSxHQUFHO2dCQUNyQixHQUFHLEtBQUssQ0FBQyxNQUFNO2FBQ2hCO1NBQ0YsQ0FBQyxDQUFDO1FBRUgsS0FBSyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDbEQsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFDO1lBQ1osSUFBSSxDQUFDLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxxQkFBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsNkJBQTZCLENBQUMsQ0FBQztTQUMxRztRQUNELE1BQU0sT0FBTyxHQUFHLElBQUksZ0NBQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxTQUFTLFdBQVcsRUFBRTtZQUN4RSxvQkFBb0IsRUFBRSxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDO2dCQUM5QyxVQUFVLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjthQUNwQyxDQUFDLENBQUMsQ0FBQyxTQUFTO1lBQ2Isa0JBQWtCLEVBQUUsSUFBSSwyREFBcUIsQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLGtCQUFrQixDQUFDO1NBQ3RGLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUksQ0FBQztRQUV4QixJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLGlCQUFpQixFQUFFO1lBQ3JDLFVBQVUsRUFBRSxHQUFHLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLFNBQVMsVUFBVTtZQUNqRCxLQUFLLEVBQUUsSUFBSSxDQUFDLEdBQUc7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7QUFqREgsc0NBa0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgICBTdGFjayxcbiAgICBhd3NfZWMyIGFzIGVjMixcbiAgICBhd3NfcmRzIGFzIHJkcyxcbiAgICBhd3NfbGFtYmRhIGFzIGxhbWJkYSxcbiAgICBhd3NfbG9ncyBhcyBsb2dzLFxuICAgIGF3c19zZWNyZXRzbWFuYWdlciBhcyBzZWNyZXRzbWFuYWdlcixcbiAgICBDZm5PdXRwdXQsXG4gICAgRHVyYXRpb24sXG4gIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG4gIGltcG9ydCB7IElEb21haW5OYW1lLCBIdHRwQXBpIH0gZnJvbSBcIkBhd3MtY2RrL2F3cy1hcGlnYXRld2F5djItYWxwaGFcIjtcbiAgaW1wb3J0IHsgSHR0cExhbWJkYUludGVncmF0aW9uIH0gZnJvbSBcIkBhd3MtY2RrL2F3cy1hcGlnYXRld2F5djItaW50ZWdyYXRpb25zLWFscGhhXCI7XG4gIGltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG4gIGltcG9ydCB7IEN1c3RvbUxhbWJkYUZ1bmN0aW9uUHJvcHMgfSBmcm9tIFwiLi4vdXRpbHNcIjtcblxuICBleHBvcnQgY2xhc3MgVGlQZ0FwaUxhbWJkYSBleHRlbmRzIENvbnN0cnVjdCB7XG4gICAgcmVhZG9ubHkgdXJsOiBzdHJpbmc7XG4gICAgcHVibGljIHRpUGdMYW1iZGFGdW5jdGlvbjogbGFtYmRhLkZ1bmN0aW9uO1xuXG4gICAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFRpUGdBcGlMYW1iZGFQcm9wcykge1xuICAgICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgICAgdGhpcy50aVBnTGFtYmRhRnVuY3Rpb24gPSBuZXcgbGFtYmRhLkZ1bmN0aW9uKHRoaXMsIFwibGFtYmRhXCIsIHtcbiAgICAgICAgLy8gZGVmYXVsdHMgZm9yIGNvbmZpZ3VyYWJsZSBwcm9wZXJ0aWVzXG4gICAgICAgIHJ1bnRpbWU6IGxhbWJkYS5SdW50aW1lLlBZVEhPTl8zXzExLFxuICAgICAgICBoYW5kbGVyOiBcImhhbmRsZXIuaGFuZGxlclwiLFxuICAgICAgICBtZW1vcnlTaXplOiAxMDI0LFxuICAgICAgICBsb2dSZXRlbnRpb246IGxvZ3MuUmV0ZW50aW9uRGF5cy5PTkVfV0VFSyxcbiAgICAgICAgdGltZW91dDogRHVyYXRpb24uc2Vjb25kcygzMCksXG4gICAgICAgIGNvZGU6IGxhbWJkYS5Db2RlLmZyb21Eb2NrZXJCdWlsZChfX2Rpcm5hbWUsIHtcbiAgICAgICAgZmlsZTogXCJydW50aW1lL0RvY2tlcmZpbGVcIixcbiAgICAgICAgYnVpbGRBcmdzOiB7IFBZVEhPTl9WRVJTSU9OOiAnMy4xMScgfSxcbiAgICAgICAgfSksXG4gICAgICAgIC8vIG92ZXJ3cml0ZXMgZGVmYXVsdHMgd2l0aCB1c2VyLXByb3ZpZGVkIGNvbmZpZ3VyYWJsZSBwcm9wZXJ0aWVzXG4gICAgICAgIC4uLnByb3BzLmxhbWJkYUZ1bmN0aW9uT3B0aW9ucyxcbiAgICAgICAgLy8gTm9uIGNvbmZpZ3VyYWJsZSBwcm9wZXJ0aWVzIHRoYXQgYXJlIGdvaW5nIHRvIGJlIG92ZXJ3cml0dGVuIGV2ZW4gaWYgcHJvdmlkZWQgYnkgdGhlIHVzZXJcbiAgICAgICAgdnBjOiBwcm9wcy52cGMsXG4gICAgICAgIHZwY1N1Ym5ldHM6IHByb3BzLnN1Ym5ldFNlbGVjdGlvbixcbiAgICAgICAgYWxsb3dQdWJsaWNTdWJuZXQ6IHRydWUsXG4gICAgICAgIGVudmlyb25tZW50OiB7XG4gICAgICAgICAgUEdTVEFDX1NFQ1JFVF9BUk46IHByb3BzLmRiU2VjcmV0LnNlY3JldEFybixcbiAgICAgICAgICBEQl9NSU5fQ09OTl9TSVpFOiBcIjFcIixcbiAgICAgICAgICBEQl9NQVhfQ09OTl9TSVpFOiBcIjFcIixcbiAgICAgICAgICAuLi5wcm9wcy5hcGlFbnYsXG4gICAgICAgIH0sXG4gICAgICB9KTtcblxuICAgICAgcHJvcHMuZGJTZWNyZXQuZ3JhbnRSZWFkKHRoaXMudGlQZ0xhbWJkYUZ1bmN0aW9uKTtcbiAgICAgIGlmIChwcm9wcy52cGMpe1xuICAgICAgICB0aGlzLnRpUGdMYW1iZGFGdW5jdGlvbi5jb25uZWN0aW9ucy5hbGxvd1RvKHByb3BzLmRiLCBlYzIuUG9ydC50Y3AoNTQzMiksIFwiYWxsb3cgY29ubmVjdGlvbnMgZnJvbSB0aXBnXCIpO1xuICAgICAgfVxuICAgICAgY29uc3QgdGlwZ0FwaSA9IG5ldyBIdHRwQXBpKHRoaXMsIGAke1N0YWNrLm9mKHRoaXMpLnN0YWNrTmFtZX0tdGlwZy1hcGlgLCB7XG4gICAgICAgIGRlZmF1bHREb21haW5NYXBwaW5nOiBwcm9wcy50aXBnQXBpRG9tYWluTmFtZSA/IHsgXG4gICAgICAgICAgZG9tYWluTmFtZTogcHJvcHMudGlwZ0FwaURvbWFpbk5hbWVcbiAgICAgICAgfSA6IHVuZGVmaW5lZCxcbiAgICAgICAgZGVmYXVsdEludGVncmF0aW9uOiBuZXcgSHR0cExhbWJkYUludGVncmF0aW9uKFwiaW50ZWdyYXRpb25cIiwgdGhpcy50aVBnTGFtYmRhRnVuY3Rpb24pLFxuICAgICAgfSk7XG5cbiAgICAgIHRoaXMudXJsID0gdGlwZ0FwaS51cmwhO1xuXG4gICAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIFwidGlwZy1hcGktb3V0cHV0XCIsIHtcbiAgICAgICAgZXhwb3J0TmFtZTogYCR7U3RhY2sub2YodGhpcykuc3RhY2tOYW1lfS10aXAtdXJsYCxcbiAgICAgICAgdmFsdWU6IHRoaXMudXJsLFxuICAgICAgfSk7XG4gICAgfVxuICB9XG5cbiAgZXhwb3J0IGludGVyZmFjZSBUaVBnQXBpTGFtYmRhUHJvcHMge1xuXG4gICAgLyoqXG4gICAgICogVlBDIGludG8gd2hpY2ggdGhlIGxhbWJkYSBzaG91bGQgYmUgZGVwbG95ZWQuXG4gICAgICovXG4gICAgcmVhZG9ubHkgdnBjPzogZWMyLklWcGM7XG5cbiAgICAvKipcbiAgICAgKiBSRFMgSW5zdGFuY2Ugd2l0aCBpbnN0YWxsZWQgcGdTVEFDLlxuICAgICAqL1xuICAgIHJlYWRvbmx5IGRiOiByZHMuSURhdGFiYXNlSW5zdGFuY2U7XG5cbiAgICAvKipcbiAgICAgKiBTdWJuZXQgaW50byB3aGljaCB0aGUgbGFtYmRhIHNob3VsZCBiZSBkZXBsb3llZC5cbiAgICAgKi9cbiAgICByZWFkb25seSBzdWJuZXRTZWxlY3Rpb24/OiBlYzIuU3VibmV0U2VsZWN0aW9uO1xuXG4gICAgLyoqXG4gICAgICogU2VjcmV0IGNvbnRhaW5pbmcgY29ubmVjdGlvbiBpbmZvcm1hdGlvbiBmb3IgcGdTVEFDIGRhdGFiYXNlLlxuICAgICAqL1xuICAgIHJlYWRvbmx5IGRiU2VjcmV0OiBzZWNyZXRzbWFuYWdlci5JU2VjcmV0O1xuXG5cbiAgICAvKipcbiAgICAgKiBDdXN0b21pemVkIGVudmlyb25tZW50IHZhcmlhYmxlcyB0byBzZW5kIHRvIHRpdGlsZXItcGdzdGFjIHJ1bnRpbWUuXG4gICAgICovXG4gICAgcmVhZG9ubHkgYXBpRW52PzogUmVjb3JkPHN0cmluZywgc3RyaW5nPjtcbiAgXG4gICAgLyoqXG4gICAgICogQ3VzdG9tIERvbWFpbiBOYW1lIGZvciB0aXBnIEFQSS4gSWYgZGVmaW5lZCwgd2lsbCBjcmVhdGUgdGhlIFxuICAgICAqIGRvbWFpbiBuYW1lIGFuZCBpbnRlZ3JhdGUgaXQgd2l0aCB0aGUgdGlwZyBBUEkuIFxuICAgICAqIFxuICAgICAqIEBkZWZhdWx0IC0gdW5kZWZpbmVkXG4gICAgICovXG4gICAgcmVhZG9ubHkgdGlwZ0FwaURvbWFpbk5hbWU/OiBJRG9tYWluTmFtZTtcblxuXG4gICAgLyoqXG4gICAgICogT3B0aW9uYWwgc2V0dGluZ3MgZm9yIHRoZSBsYW1iZGEgZnVuY3Rpb24uIENhbiBiZSBhbnl0aGluZyB0aGF0IGNhbiBiZSBjb25maWd1cmVkIG9uIHRoZSBsYW1iZGEgZnVuY3Rpb24sIGJ1dCBzb21lIHdpbGwgYmUgb3ZlcndyaXR0ZW4gYnkgdmFsdWVzIGRlZmluZWQgaGVyZS4gXG4gICAgICpcbiAgICAgKiBAZGVmYXVsdCAtIGRlZmluZWQgaW4gdGhlIGNvbnN0cnVjdC5cbiAgICAgKi9cbiAgICByZWFkb25seSBsYW1iZGFGdW5jdGlvbk9wdGlvbnM/OiBDdXN0b21MYW1iZGFGdW5jdGlvblByb3BzO1xuICB9XG4iXX0=

package/lib/tipg-api/runtime/Dockerfile

@@ -0,0 +1,17 @@
+ARG PYTHON_VERSION
+FROM --platform=linux/amd64 public.ecr.aws/lambda/python:${PYTHON_VERSION}
+
+WORKDIR /tmp
+RUN python -m pip install pip -U
+
+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;
+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/
+
+CMD ["echo", "hello world"]

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

@@ -6,7 +6,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
 

package/lib/titiler-pgstac-api/index.d.ts

@@ -1,7 +1,7 @@
-import { aws_ec2 as ec2, aws_rds as rds, aws_lambda as lambda, aws_secretsmanager as secretsmanager, BundlingOptions } from "aws-cdk-lib";
-import { Runtime } from 'aws-cdk-lib/aws-lambda';
+import { aws_ec2 as ec2, aws_rds as rds, aws_lambda as lambda, aws_secretsmanager as secretsmanager } from "aws-cdk-lib";
 import { IDomainName } from "@aws-cdk/aws-apigatewayv2-alpha";
 import { Construct } from "constructs";
+import { CustomLambdaFunctionProps } from "../utils";
 export declare class TitilerPgstacApiLambda extends Construct {
     readonly url: string;
     titilerPgstacLambdaFunction: lambda.Function;
@@ -11,7 +11,7 @@ export interface TitilerPgStacApiLambdaProps {
     /**
      * VPC into which the lambda should be deployed.
      */
-    readonly vpc: ec2.IVpc;
+    readonly vpc?: ec2.IVpc;
     /**
      * RDS Instance with installed pgSTAC.
      */
@@ -19,7 +19,7 @@ export interface TitilerPgStacApiLambdaProps {
     /**
      * Subnet into which the lambda should be deployed.
      */
-    readonly subnetSelection: ec2.SubnetSelection;
+    readonly subnetSelection?: ec2.SubnetSelection;
     /**
      * Secret containing connection information for pgSTAC database.
      */
@@ -40,42 +40,9 @@ export interface TitilerPgStacApiLambdaProps {
      */
     readonly titilerPgstacApiDomainName?: IDomainName;
     /**
-     * Optional settings for the titiler-pgstac python lambda function.
+     * Optional settings for the lambda function. Can be anything that can be configured on the lambda function, but some will be overwritten by values defined here.
      *
      * @default - defined in the construct.
      */
-    readonly pythonLambdaOptions?: TitilerPgstacPythonLambdaOptions;
-}
-export interface TitilerPgstacPythonLambdaOptions {
-    /**
-     * Path to the source of the function or the location for dependencies.
-     */
-    readonly entry: string;
-    /**
-     * The runtime environment. Only runtimes of the Python family are
-     * supported.
-     */
-    readonly runtime: Runtime;
-    /**
-     * The path (relative to entry) to the index file containing the exported handler.
-     *
-     */
-    readonly index: string;
-    /**
-     * The name of the exported handler in the index file.
-     */
-    readonly handler: string;
-    /**
-     * Bundling options to use for this function. Use this to specify custom bundling options like
-     * the bundling Docker image, asset hash type, custom hash, architecture, etc.
-     */
-    readonly bundling?: BundlingOptions;
-    /**
-     * The amount of memory, in MB, that is allocated to your Lambda function.
-     */
-    readonly memorySize: number;
-    /**
-     * The system architectures compatible with this lambda function.
-     */
-    readonly architecture: lambda.Architecture;
+    readonly lambdaFunctionOptions?: CustomLambdaFunctionProps;
 }

package/lib/titiler-pgstac-api/index.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TitilerPgstacApiLambda = void 0;
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-const aws_lambda_python_alpha_1 = require("@aws-cdk/aws-lambda-python-alpha");
 const aws_apigatewayv2_alpha_1 = require("@aws-cdk/aws-apigatewayv2-alpha");
 const aws_apigatewayv2_integrations_alpha_1 = require("@aws-cdk/aws-apigatewayv2-integrations-alpha");
 const constructs_1 = require("constructs");
@@ -26,24 +25,25 @@ let defaultTitilerPgstacEnv = {
 class TitilerPgstacApiLambda extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        // if user provided environment variables, merge them with the defaults.
-        const apiEnv = props.apiEnv ? { ...defaultTitilerPgstacEnv, ...props.apiEnv, "PGSTAC_SECRET_ARN": props.dbSecret.secretArn } : defaultTitilerPgstacEnv;
-        const pythonLambdaOptions = props.pythonLambdaOptions ?? {
-            runtime: aws_cdk_lib_1.aws_lambda.Runtime.PYTHON_3_10,
-            entry: `${__dirname}/runtime`,
-            index: "src/handler.py",
-            handler: "handler",
+        this.titilerPgstacLambdaFunction = new aws_cdk_lib_1.aws_lambda.Function(this, "lambda", {
+            // defaults for configurable properties
+            runtime: aws_cdk_lib_1.aws_lambda.Runtime.PYTHON_3_11,
+            handler: "handler.handler",
             memorySize: 3008,
-            architecture: aws_cdk_lib_1.aws_lambda.Architecture.X86_64
-        };
-        this.titilerPgstacLambdaFunction = new aws_lambda_python_alpha_1.PythonFunction(this, "titiler-pgstac-api", {
-            ...pythonLambdaOptions,
-            environment: apiEnv,
+            logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.ONE_WEEK,
+            timeout: aws_cdk_lib_1.Duration.seconds(30),
+            code: aws_cdk_lib_1.aws_lambda.Code.fromDockerBuild(__dirname, {
+                file: "runtime/Dockerfile",
+                buildArgs: { PYTHON_VERSION: '3.11' }
+            }),
+            // overwrites defaults with user-provided configurable properties
+            ...props.lambdaFunctionOptions,
+            // Non configurable properties that are going to be overwritten even if provided by the user
             vpc: props.vpc,
             vpcSubnets: props.subnetSelection,
             allowPublicSubnet: true,
-            logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.ONE_WEEK,
-            timeout: aws_cdk_lib_1.Duration.seconds(30)
+            // if user provided environment variables, merge them with the defaults.
+            environment: props.apiEnv ? { ...defaultTitilerPgstacEnv, ...props.apiEnv, "PGSTAC_SECRET_ARN": props.dbSecret.secretArn } : defaultTitilerPgstacEnv,
         });
         // grant access to buckets using addToRolePolicy
         if (props.buckets) {
@@ -55,7 +55,9 @@ class TitilerPgstacApiLambda extends constructs_1.Construct {
             });
         }
         props.dbSecret.grantRead(this.titilerPgstacLambdaFunction);
-        this.titilerPgstacLambdaFunction.connections.allowTo(props.db, aws_cdk_lib_1.aws_ec2.Port.tcp(5432), "allow connections from titiler");
+        if (props.vpc) {
+            this.titilerPgstacLambdaFunction.connections.allowTo(props.db, aws_cdk_lib_1.aws_ec2.Port.tcp(5432), "allow connections from titiler");
+        }
         const stacApi = new aws_apigatewayv2_alpha_1.HttpApi(this, `${aws_cdk_lib_1.Stack.of(this).stackName}-titiler-pgstac-api`, {
             defaultDomainMapping: props.titilerPgstacApiDomainName ? {
                 domainName: props.titilerPgstacApiDomainName
@@ -71,5 +73,5 @@ class TitilerPgstacApiLambda extends constructs_1.Construct {
 }
 exports.TitilerPgstacApiLambda = TitilerPgstacApiLambda;
 _a = JSII_RTTI_SYMBOL_1;
-TitilerPgstacApiLambda[_a] = { fqn: "eoapi-cdk.TitilerPgstacApiLambda", version: "5.4.1" };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    Stack,\n    aws_iam as iam,\n    aws_ec2 as ec2,\n    aws_rds as rds,\n    aws_lambda as lambda,\n    aws_secretsmanager as secretsmanager,\n    CfnOutput,\n    Duration,\n    aws_logs,\n    BundlingOptions\n  } from \"aws-cdk-lib\";\n  import { Runtime } from 'aws-cdk-lib/aws-lambda';\n  import {PythonFunction} from \"@aws-cdk/aws-lambda-python-alpha\";\n  import { IDomainName, HttpApi } from \"@aws-cdk/aws-apigatewayv2-alpha\";\n  import { HttpLambdaIntegration } from \"@aws-cdk/aws-apigatewayv2-integrations-alpha\";\n  import { Construct } from \"constructs\";\n  \n\n  // default settings that can be overridden by the user-provided environment. \n  let defaultTitilerPgstacEnv :{ [key: string]: any } = {\n    \"CPL_VSIL_CURL_ALLOWED_EXTENSIONS\": \".tif,.TIF,.tiff\",\n    \"GDAL_CACHEMAX\": \"200\", \n    \"GDAL_DISABLE_READDIR_ON_OPEN\": \"EMPTY_DIR\",\n    \"GDAL_INGESTED_BYTES_AT_OPEN\": \"32768\",\n    \"GDAL_HTTP_MERGE_CONSECUTIVE_RANGES\": \"YES\",\n    \"GDAL_HTTP_MULTIPLEX\": \"YES\",\n    \"GDAL_HTTP_VERSION\": \"2\",\n    \"PYTHONWARNINGS\": \"ignore\",\n    \"VSI_CACHE\": \"TRUE\",\n    \"VSI_CACHE_SIZE\": \"5000000\", \n    \"DB_MIN_CONN_SIZE\": \"1\",\n    \"DB_MAX_CONN_SIZE\": \"1\"\n  }\n\n  export class TitilerPgstacApiLambda extends Construct {\n    readonly url: string;\n    public titilerPgstacLambdaFunction: lambda.Function;\n  \n    constructor(scope: Construct, id: string, props: TitilerPgStacApiLambdaProps) {\n      super(scope, id);\n\n\n      // if user provided environment variables, merge them with the defaults.\n      const apiEnv = props.apiEnv ? { ...defaultTitilerPgstacEnv, ...props.apiEnv, \"PGSTAC_SECRET_ARN\": props.dbSecret.secretArn } : defaultTitilerPgstacEnv;\n\n      const pythonLambdaOptions: TitilerPgstacPythonLambdaOptions = props.pythonLambdaOptions ?? {\n        runtime: lambda.Runtime.PYTHON_3_10,\n        entry: `${__dirname}/runtime`,\n        index: \"src/handler.py\",\n        handler: \"handler\",\n        memorySize: 3008,\n        architecture: lambda.Architecture.X86_64\n      }\n\n      this.titilerPgstacLambdaFunction = new PythonFunction(this, \"titiler-pgstac-api\", {\n        ...pythonLambdaOptions,\n        environment: apiEnv,\n        vpc: props.vpc,\n        vpcSubnets: props.subnetSelection,\n        allowPublicSubnet: true,\n        logRetention: aws_logs.RetentionDays.ONE_WEEK,\n        timeout: Duration.seconds(30)\n      })\n      \n      // grant access to buckets using addToRolePolicy\n      if (props.buckets) {\n        props.buckets.forEach(bucket => {\n          this.titilerPgstacLambdaFunction.addToRolePolicy(new iam.PolicyStatement({\n            actions: [\"s3:GetObject\"],\n            resources: [`arn:aws:s3:::${bucket}/*`],\n          }));\n        });\n      }\n      \n      props.dbSecret.grantRead(this.titilerPgstacLambdaFunction);\n      this.titilerPgstacLambdaFunction.connections.allowTo(props.db, ec2.Port.tcp(5432), \"allow connections from titiler\");\n  \n      const stacApi = new HttpApi(this, `${Stack.of(this).stackName}-titiler-pgstac-api`, {\n        defaultDomainMapping: props.titilerPgstacApiDomainName ? { \n          domainName: props.titilerPgstacApiDomainName \n        } : undefined,\n        defaultIntegration: new HttpLambdaIntegration(\"integration\", this.titilerPgstacLambdaFunction),\n      });\n  \n      this.url = stacApi.url!;\n  \n      new CfnOutput(this, \"titiler-pgstac-api-output\", {\n        exportName: `${Stack.of(this).stackName}-titiler-pgstac-url`,\n        value: this.url,\n      });\n    }\n  }\n  \n  export interface TitilerPgStacApiLambdaProps {\n\n    /**\n     * VPC into which the lambda should be deployed.\n     */\n    readonly vpc: ec2.IVpc;\n  \n    /**\n     * RDS Instance with installed pgSTAC.\n     */\n    readonly db: rds.IDatabaseInstance;\n  \n    /**\n     * Subnet into which the lambda should be deployed.\n     */\n    readonly subnetSelection: ec2.SubnetSelection;\n  \n    /**\n     * Secret containing connection information for pgSTAC database.\n     */\n    readonly dbSecret: secretsmanager.ISecret;\n\n    /**\n     * Customized environment variables to send to titiler-pgstac runtime. These will be merged with `defaultTitilerPgstacEnv`.\n     * The database secret arn is automatically added to the environment variables at deployment. \n    /*/\n    readonly apiEnv?: Record<string, string>;\n\n    /**\n     * list of buckets the lambda will be granted access to. \n     */\n    readonly buckets?: string[];\n\n    /**\n     * Custom Domain Name Options for Titiler Pgstac API,\n     * \n     * @default - undefined. \n     */\n    readonly titilerPgstacApiDomainName?: IDomainName;\n\n    /**\n     * Optional settings for the titiler-pgstac python lambda function.\n     *\n     * @default - defined in the construct.\n     */\n    readonly pythonLambdaOptions?: TitilerPgstacPythonLambdaOptions;\n\n  }\n\n\n  export interface TitilerPgstacPythonLambdaOptions {\n\n    /**\n     * Path to the source of the function or the location for dependencies.\n     */\n    readonly entry: string;\n    /**\n     * The runtime environment. Only runtimes of the Python family are\n     * supported.\n     */\n    readonly runtime: Runtime;\n\n    /**\n     * The path (relative to entry) to the index file containing the exported handler.\n     *\n     */\n    readonly index: string;\n    /**\n     * The name of the exported handler in the index file.\n     */\n    readonly handler: string;\n\n    /**\n     * Bundling options to use for this function. Use this to specify custom bundling options like\n     * the bundling Docker image, asset hash type, custom hash, architecture, etc.\n     */\n    readonly bundling?: BundlingOptions;\n\n    /**\n     * The amount of memory, in MB, that is allocated to your Lambda function.\n     */\n    readonly memorySize: number;\n\n    /**\n     * The system architectures compatible with this lambda function.\n     */\n    readonly architecture: lambda.Architecture;\n\n  }\n"]}
+TitilerPgstacApiLambda[_a] = { fqn: "eoapi-cdk.TitilerPgstacApiLambda", version: "6.0.0" };
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    Stack,\n    aws_iam as iam,\n    aws_ec2 as ec2,\n    aws_rds as rds,\n    aws_lambda as lambda,\n    aws_secretsmanager as secretsmanager,\n    CfnOutput,\n    Duration,\n    aws_logs\n  } from \"aws-cdk-lib\";\n  import { IDomainName, HttpApi } from \"@aws-cdk/aws-apigatewayv2-alpha\";\n  import { HttpLambdaIntegration } from \"@aws-cdk/aws-apigatewayv2-integrations-alpha\";\n  import { Construct } from \"constructs\";\nimport { CustomLambdaFunctionProps } from \"../utils\";\n  \n\n  // default settings that can be overridden by the user-provided environment. \n  let defaultTitilerPgstacEnv :{ [key: string]: any } = {\n    \"CPL_VSIL_CURL_ALLOWED_EXTENSIONS\": \".tif,.TIF,.tiff\",\n    \"GDAL_CACHEMAX\": \"200\", \n    \"GDAL_DISABLE_READDIR_ON_OPEN\": \"EMPTY_DIR\",\n    \"GDAL_INGESTED_BYTES_AT_OPEN\": \"32768\",\n    \"GDAL_HTTP_MERGE_CONSECUTIVE_RANGES\": \"YES\",\n    \"GDAL_HTTP_MULTIPLEX\": \"YES\",\n    \"GDAL_HTTP_VERSION\": \"2\",\n    \"PYTHONWARNINGS\": \"ignore\",\n    \"VSI_CACHE\": \"TRUE\",\n    \"VSI_CACHE_SIZE\": \"5000000\", \n    \"DB_MIN_CONN_SIZE\": \"1\",\n    \"DB_MAX_CONN_SIZE\": \"1\"\n  }\n\n  export class TitilerPgstacApiLambda extends Construct {\n    readonly url: string;\n    public titilerPgstacLambdaFunction: lambda.Function;\n  \n    constructor(scope: Construct, id: string, props: TitilerPgStacApiLambdaProps) {\n      super(scope, id);\n      \n      this.titilerPgstacLambdaFunction = new lambda.Function(this, \"lambda\", {\n        // defaults for configurable properties\n        runtime: lambda.Runtime.PYTHON_3_11,\n        handler: \"handler.handler\",\n        memorySize: 3008,\n        logRetention: aws_logs.RetentionDays.ONE_WEEK,\n        timeout: Duration.seconds(30),\n        code: lambda.Code.fromDockerBuild(__dirname, {\n          file: \"runtime/Dockerfile\",\n          buildArgs: { PYTHON_VERSION: '3.11' }\n        }),\n        // overwrites defaults with user-provided configurable properties\n        ...props.lambdaFunctionOptions,\n        // Non configurable properties that are going to be overwritten even if provided by the user\n        vpc: props.vpc,\n        vpcSubnets: props.subnetSelection,\n        allowPublicSubnet: true,\n        // if user provided environment variables, merge them with the defaults.\n        environment: props.apiEnv ? { ...defaultTitilerPgstacEnv, ...props.apiEnv, \"PGSTAC_SECRET_ARN\": props.dbSecret.secretArn } : defaultTitilerPgstacEnv,\n      });\n      \n      // grant access to buckets using addToRolePolicy\n      if (props.buckets) {\n        props.buckets.forEach(bucket => {\n          this.titilerPgstacLambdaFunction.addToRolePolicy(new iam.PolicyStatement({\n            actions: [\"s3:GetObject\"],\n            resources: [`arn:aws:s3:::${bucket}/*`],\n          }));\n        });\n      }\n      \n      props.dbSecret.grantRead(this.titilerPgstacLambdaFunction);\n    \n      if (props.vpc) {\n        this.titilerPgstacLambdaFunction.connections.allowTo(props.db, ec2.Port.tcp(5432), \"allow connections from titiler\");\n      }\n  \n      const stacApi = new HttpApi(this, `${Stack.of(this).stackName}-titiler-pgstac-api`, {\n        defaultDomainMapping: props.titilerPgstacApiDomainName ? { \n          domainName: props.titilerPgstacApiDomainName \n        } : undefined,\n        defaultIntegration: new HttpLambdaIntegration(\"integration\", this.titilerPgstacLambdaFunction),\n      });\n  \n      this.url = stacApi.url!;\n  \n      new CfnOutput(this, \"titiler-pgstac-api-output\", {\n        exportName: `${Stack.of(this).stackName}-titiler-pgstac-url`,\n        value: this.url,\n      });\n    }\n  }\n  \n  export interface TitilerPgStacApiLambdaProps {\n\n    /**\n     * VPC into which the lambda should be deployed.\n     */\n    readonly vpc?: ec2.IVpc;\n  \n    /**\n     * RDS Instance with installed pgSTAC.\n     */\n    readonly db: rds.IDatabaseInstance;\n  \n    /**\n     * Subnet into which the lambda should be deployed.\n     */\n    readonly subnetSelection?: ec2.SubnetSelection;\n  \n    /**\n     * Secret containing connection information for pgSTAC database.\n     */\n    readonly dbSecret: secretsmanager.ISecret;\n\n    /**\n     * Customized environment variables to send to titiler-pgstac runtime. These will be merged with `defaultTitilerPgstacEnv`.\n     * The database secret arn is automatically added to the environment variables at deployment. \n    /*/\n    readonly apiEnv?: Record<string, string>;\n\n    /**\n     * list of buckets the lambda will be granted access to. \n     */\n    readonly buckets?: string[];\n\n    /**\n     * Custom Domain Name Options for Titiler Pgstac API,\n     * \n     * @default - undefined. \n     */\n    readonly titilerPgstacApiDomainName?: IDomainName;\n\n    /**\n     * Optional settings for the lambda function. Can be anything that can be configured on the lambda function, but some will be overwritten by values defined here. \n     *\n     * @default - defined in the construct.\n     */\n    readonly lambdaFunctionOptions?: CustomLambdaFunctionProps;\n\n  }\n\n"]}