eoapi-cdk 7.5.0 → 7.6.0

package/.jsii

@@ -3932,7 +3932,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/database/index.ts",
-        "line": 274
+        "line": 280
       },
       "name": "DatabaseParameters",
       "properties": [
@@ -3945,7 +3945,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 290
+            "line": 296
           },
           "name": "effectiveCacheSize",
           "type": {
@@ -3961,7 +3961,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 300
+            "line": 306
           },
           "name": "maintenanceWorkMem",
           "type": {
@@ -3977,7 +3977,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 278
+            "line": 284
           },
           "name": "maxConnections",
           "type": {
@@ -3993,7 +3993,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 305
+            "line": 311
           },
           "name": "maxLocksPerTransaction",
           "type": {
@@ -4009,7 +4009,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 320
+            "line": 326
           },
           "name": "randomPageCost",
           "type": {
@@ -4025,7 +4025,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 315
+            "line": 321
           },
           "name": "seqPageCost",
           "type": {
@@ -4042,7 +4042,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 285
+            "line": 291
           },
           "name": "sharedBuffers",
           "type": {
@@ -4058,7 +4058,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 310
+            "line": 316
           },
           "name": "tempBuffers",
           "type": {
@@ -4074,7 +4074,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 295
+            "line": 301
           },
           "name": "workMem",
           "type": {
@@ -4321,7 +4321,7 @@
         },
         "locationInModule": {
           "filename": "lib/database/index.ts",
-          "line": 43
+          "line": 44
         },
         "parameters": [
           {
@@ -4356,7 +4356,7 @@
           },
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 180
+            "line": 186
           },
           "name": "getParameters",
           "parameters": [
@@ -4411,6 +4411,21 @@
             }
           }
         },
+        {
+          "docs": {
+            "stability": "experimental"
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/database/index.ts",
+            "line": 42
+          },
+          "name": "secretBootstrapper",
+          "optional": true,
+          "type": {
+            "fqn": "aws-cdk-lib.CustomResource"
+          }
+        },
         {
           "docs": {
             "stability": "experimental"
@@ -4468,7 +4483,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/database/index.ts",
-        "line": 220
+        "line": 226
       },
       "name": "PgStacDatabaseProps",
       "properties": [
@@ -4482,7 +4497,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 254
+            "line": 260
           },
           "name": "addPgbouncer",
           "optional": true,
@@ -4500,7 +4515,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 271
+            "line": 277
           },
           "name": "bootstrapperLambdaFunctionOptions",
           "optional": true,
@@ -4518,7 +4533,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 262
+            "line": 268
           },
           "name": "customResourceProperties",
           "optional": true,
@@ -4541,7 +4556,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 226
+            "line": 232
           },
           "name": "pgstacDbName",
           "optional": true,
@@ -4559,7 +4574,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 247
+            "line": 253
           },
           "name": "pgstacUsername",
           "optional": true,
@@ -4577,7 +4592,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 233
+            "line": 239
           },
           "name": "pgstacVersion",
           "optional": true,
@@ -4595,7 +4610,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 240
+            "line": 246
           },
           "name": "secretsPrefix",
           "optional": true,
@@ -5603,6 +5618,6 @@
       "symbolId": "lib/titiler-pgstac-api/index:TitilerPgstacApiLambda"
     }
   },
-  "version": "7.5.0",
-  "fingerprint": "T40DSELPsAP955iV1u6Zc7g/8YGO+46Aw8q71FvTqgQ="
+  "version": "7.6.0",
+  "fingerprint": "pfxqE9/oHZrE80dhg8NjA4NvrK/PhGVVSqhymjz84/8="
 }

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [7.6.0](https://github.com/developmentseed/eoapi-cdk/compare/v7.5.1...v7.6.0) (2025-02-27)
+
+
+### Features
+
+* update ingestor-api runtime dependencies ([#125](https://github.com/developmentseed/eoapi-cdk/issues/125)) ([562955d](https://github.com/developmentseed/eoapi-cdk/commit/562955d02f925e3ce8101cc2f64dfab6553c28b8))
+
+## [7.5.1](https://github.com/developmentseed/eoapi-cdk/compare/v7.5.0...v7.5.1) (2025-02-06)
+
+
+### Bug Fixes
+
+* ensure db bootstrapper runs on each deploy ([#124](https://github.com/developmentseed/eoapi-cdk/issues/124)) ([bb4bff8](https://github.com/developmentseed/eoapi-cdk/commit/bb4bff8fd4a93fea6cce4bd7fcb8de60807ee37a))
+
 # [7.5.0](https://github.com/developmentseed/eoapi-cdk/compare/v7.4.2...v7.5.0) (2025-02-04)
 
 

package/integration_tests/cdk/app.py

@@ -81,18 +81,16 @@ class pgStacInfraStack(Stack):
             instance_type=aws_ec2.InstanceType(app_config.db_instance_type),
             add_pgbouncer=True,
             removal_policy=RemovalPolicy.DESTROY,
+            pgstac_version="0.9.2",
         )
 
         assert pgstac_db.security_group
 
-        # make sure we can get the secret value!
-        assert pgstac_db.pgstac_secret.secret_value_from_json("host").to_string()
-
         pgstac_db.security_group.add_ingress_rule(
             aws_ec2.Peer.any_ipv4(), aws_ec2.Port.tcp(5432)
         )
 
-        PgStacApiLambda(
+        stac_api = PgStacApiLambda(
             self,
             "pgstac-api",
             db=pgstac_db.connection_target,
@@ -100,9 +98,16 @@ class pgStacInfraStack(Stack):
             api_env={
                 "NAME": app_config.build_service_name("STAC API"),
                 "description": f"{app_config.stage} STAC API",
+                # test that we can use the pgbouncer secret in downstream resources
+                "POSTGRES_HOST": pgstac_db.pgstac_secret.secret_value_from_json(
+                    "host"
+                ).to_string(),
             },
         )
 
+        # make sure stac_api does not try to build before the secret has been boostrapped
+        stac_api.node.add_dependency(pgstac_db.secret_bootstrapper)
+
         TitilerPgstacApiLambda(
             self,
             "titiler-pgstac-api",

package/lib/bastion-host/index.js

@@ -158,5 +158,5 @@ class BastionHost extends constructs_1.Construct {
 }
 exports.BastionHost = BastionHost;
 _a = JSII_RTTI_SYMBOL_1;
-BastionHost[_a] = { fqn: "eoapi-cdk.BastionHost", version: "7.5.0" };
+BastionHost[_a] = { fqn: "eoapi-cdk.BastionHost", version: "7.6.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_ec2 as ec2,\n  aws_iam as iam,\n  aws_rds as rds,\n  CfnOutput,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\n\n/**\n * The database is located in an isolated subnet, meaning that it is not accessible from the public internet. As such, to interact with the database directly, a user must tunnel through a bastion host.\n *\n * ### Configuring\n *\n * This codebase controls _who_ is allowed to connect to the bastion host. This requires two steps:\n *\n * 1. Adding the IP address from which you are connecting to the `ipv4Allowlist` array\n * 1. Creating a bastion host system user by adding the user's configuration inform to `userdata.yaml`\n *\n * #### Adding an IP address to the `ipv4Allowlist` array\n *\n * The `BastionHost` construct takes in an `ipv4Allowlist` array as an argument. Find your IP address (eg `curl api.ipify.org`) and add that to the array along with the trailing CIDR block (likely `/32` to indicate that you are adding a single IP address).\n *\n * #### Creating a user via `userdata.yaml`\n *\n * Add an entry to the `users` array with a username (likely matching your local systems username, which you can get by running the `whoami` command in your terminal) and a public key (likely your default public key, which you can get by running `cat ~/.ssh/id_*.pub` in your terminal).\n *\n * #### Tips & Tricks when using the Bastion Host\n *\n * **Connecting to RDS Instance via SSM**\n *\n * ```sh\n * aws ssm start-session --target $INSTANCE_ID \\\n * --document-name AWS-StartPortForwardingSessionToRemoteHost \\\n * --parameters '{\n * \"host\": [\n * \"example-db.c5abcdefghij.us-west-2.rds.amazonaws.com\"\n * ],\n * \"portNumber\": [\n * \"5432\"\n * ],\n * \"localPortNumber\": [\n * \"9999\"\n * ]\n * }' \\\n * --profile $AWS_PROFILE\n * ```\n *\n * ```sh\n * psql -h localhost -p 9999 # continue adding username (-U) and db (-d) here...\n * ```\n *\n * Connect directly to Bastion Host:\n *\n * ```sh\n * aws ssm start-session --target $INSTANCE_ID --profile $AWS_PROFILE\n * ```\n *\n * **Setting up an SSH tunnel**\n *\n * In your `~/.ssh/config` file, add an entry like:\n *\n * ```\n * Host db-tunnel\n * Hostname {the-bastion-host-address}\n * LocalForward 9999 {the-db-hostname}:5432\n * ```\n *\n * Then a tunnel can be opened via:\n *\n * ```\n * ssh -N db-tunnel\n * ```\n *\n * And a connection to the DB can be made via:\n *\n * ```\n * psql -h 127.0.0.1 -p 9999 -U {username} -d {database}\n * ```\n *\n * **Handling `REMOTE HOST IDENTIFICATION HAS CHANGED!` error**\n *\n * If you've redeployed a bastion host that you've previously connected to, you may see an error like:\n *\n * ```\n * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n * @    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @\n * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n * IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\n * Someone could be eavesdropping on you right now (man-in-the-middle attack)!\n * It is also possible that a host key has just been changed.\n * The fingerprint for the ECDSA key sent by the remote host is\n * SHA256:mPnxAOXTpb06PFgI1Qc8TMQ2e9b7goU8y2NdS5hzIr8.\n * Please contact your system administrator.\n * Add correct host key in /Users/username/.ssh/known_hosts to get rid of this message.\n * Offending ECDSA key in /Users/username/.ssh/known_hosts:28\n * ECDSA host key for ec2-12-34-56-789.us-west-2.compute.amazonaws.com has changed and you have requested strict checking.\n * Host key verification failed.\n * ```\n *\n * This is due to the server's fingerprint changing. We can scrub the fingerprint from our system with a command like:\n *\n * ```\n * ssh-keygen -R 12.34.56.789\n * ```\n *\n */\nexport class BastionHost extends Construct {\n  instance: ec2.Instance;\n\n  constructor(scope: Construct, id: string, props: BastionHostProps) {\n    super(scope, id);\n\n    const { stackName } = Stack.of(this);\n\n    // Build ec2 instance\n    this.instance = new ec2.Instance(this, \"bastion-host\", {\n      vpc: props.vpc,\n      vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC },\n      instanceName: `${stackName} bastion host`,\n      instanceType: ec2.InstanceType.of(\n        ec2.InstanceClass.BURSTABLE4_GRAVITON,\n        ec2.InstanceSize.NANO\n      ),\n      machineImage: ec2.MachineImage.latestAmazonLinux({\n        generation: ec2.AmazonLinuxGeneration.AMAZON_LINUX_2,\n        cpuType: ec2.AmazonLinuxCpuType.ARM_64,\n      }),\n      userData: props.userData,\n      userDataCausesReplacement: true,\n    });\n\n    // Assign elastic IP\n    if (props.createElasticIp ?? true) {\n      new ec2.CfnEIP(this, \"IP\", {\n        instanceId: this.instance.instanceId,\n        tags: [{ key: \"Name\", value: stackName }],\n      });\n    }\n\n    // Allow bastion host to connect to db\n    this.instance.connections.allowTo(\n      props.db.connections.securityGroups[0],\n      ec2.Port.tcp(5432),\n      \"Allow connection from bastion host\"\n    );\n\n    // Allow IP access to bastion host\n    for (const ipv4 of props.ipv4Allowlist) {\n      this.instance.connections.allowFrom(\n        ec2.Peer.ipv4(ipv4),\n        ec2.Port.tcp(props.sshPort || 22),\n        \"SSH Access\"\n      );\n    }\n\n    // Integrate with SSM\n    this.instance.addToRolePolicy(\n      new iam.PolicyStatement({\n        actions: [\n          \"ssmmessages:*\",\n          \"ssm:UpdateInstanceInformation\",\n          \"ec2messages:*\",\n        ],\n        resources: [\"*\"],\n      })\n    );\n\n    new CfnOutput(this, \"instance-id-output\", {\n      value: this.instance.instanceId,\n      exportName: `${stackName}-instance-id`,\n    });\n    new CfnOutput(this, \"instance-public-ip-output\", {\n      value: this.instance.instancePublicIp,\n      exportName: `${stackName}-instance-public-ip`,\n    });\n    new CfnOutput(this, \"instance-public-dns-name-output\", {\n      value: this.instance.instancePublicDnsName,\n      exportName: `${stackName}-public-dns-name`,\n    });\n  }\n}\n\nexport interface BastionHostProps {\n  readonly vpc: ec2.IVpc;\n  readonly db: rds.IDatabaseInstance;\n  readonly userData: ec2.UserData;\n  readonly ipv4Allowlist: string[];\n  readonly sshPort?: number;\n\n  /**\n   * Whether or not an elastic IP should be created for the bastion host.\n   *\n   * @default false\n   */\n  readonly createElasticIp?: boolean;\n}\n"]}

package/lib/database/index.d.ts

@@ -1,4 +1,4 @@
-import { aws_rds as rds, aws_ec2 as ec2, aws_secretsmanager as secretsmanager } from "aws-cdk-lib";
+import { aws_rds as rds, aws_ec2 as ec2, aws_secretsmanager as secretsmanager, CustomResource } from "aws-cdk-lib";
 import { Construct } from "constructs";
 import { CustomLambdaFunctionProps } from "../utils";
 /**
@@ -12,6 +12,7 @@ export declare class PgStacDatabase extends Construct {
     private _pgBouncerServer?;
     readonly connectionTarget: rds.IDatabaseInstance | ec2.Instance;
     readonly securityGroup?: ec2.SecurityGroup;
+    readonly secretBootstrapper?: CustomResource;
     constructor(scope: Construct, id: string, props: PgStacDatabaseProps);
     getParameters(instanceType: string, parameters: PgStacDatabaseProps["parameters"]): DatabaseParameters;
 }
@@ -23,10 +24,10 @@ export interface PgStacDatabaseProps extends rds.DatabaseInstanceProps {
      */
     readonly pgstacDbName?: string;
     /**
-        * Version of pgstac to install on the database
-        *
-        * @default 0.8.5
-        */
+     * Version of pgstac to install on the database
+     *
+     * @default 0.8.5
+     */
     readonly pgstacVersion?: string;
     /**
      * Prefix to assign to the generated `secrets_manager.Secret`

package/lib/database/index.js

@@ -54,7 +54,7 @@ class PgStacDatabase extends constructs_1.Construct {
             code: aws_cdk_lib_1.aws_lambda.Code.fromDockerBuild(__dirname, {
                 file: "bootstrapper_runtime/Dockerfile",
                 buildArgs: {
-                    PYTHON_VERSION: "3.11"
+                    PYTHON_VERSION: "3.11",
                 },
             }),
             vpc: hasVpc(this.db) ? this.db.vpc : props.vpc,
@@ -97,15 +97,17 @@ class PgStacDatabase extends constructs_1.Construct {
             this.pgstacSecret.secretArn;
         // if props.lambdaFunctionOptions doesn't have 'code' defined, update pgstac_version (needed for default runtime)
         if (!props.bootstrapperLambdaFunctionOptions?.code) {
-            customResourceProperties["pgstac_version"] = props.pgstacVersion || DEFAULT_PGSTAC_VERSION;
+            customResourceProperties["pgstac_version"] =
+                props.pgstacVersion || DEFAULT_PGSTAC_VERSION;
         }
-        // this.connections = props.database.connections;
+        // add timestamp to properties to ensure the Lambda gets re-executed on each deploy
+        customResourceProperties["timestamp"] = new Date().toISOString();
         const bootstrapper = new aws_cdk_lib_1.CustomResource(this, "bootstrapper", {
             serviceToken: handler.functionArn,
             properties: customResourceProperties,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.RETAIN, // This retains the custom resource (which doesn't really exist), not the database
         });
-        // PgBouncer: connection pooler
+        // PgBouncer: connection poolercustomresource trigger on redeploy
         const addPgbouncer = props.addPgbouncer ?? true;
         if (addPgbouncer) {
             this._pgBouncerServer = new PgBouncer_1.PgBouncer(this, "pgbouncer", {
@@ -132,6 +134,7 @@ class PgStacDatabase extends constructs_1.Construct {
             this.pgstacSecret = this._pgBouncerServer.pgbouncerSecret;
             this.connectionTarget = this._pgBouncerServer.instance;
             this.securityGroup = this._pgBouncerServer.securityGroup;
+            this.secretBootstrapper = this._pgBouncerServer.secretUpdateComplete;
         }
         else {
             this.connectionTarget = this.db;
@@ -171,5 +174,5 @@ class PgStacDatabase extends constructs_1.Construct {
 }
 exports.PgStacDatabase = PgStacDatabase;
 _a = JSII_RTTI_SYMBOL_1;
-PgStacDatabase[_a] = { fqn: "eoapi-cdk.PgStacDatabase", version: "7.5.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_rds as rds,\n  aws_ec2 as ec2,\n  aws_secretsmanager as secretsmanager,\n  aws_lambda,\n  CustomResource,\n  RemovalPolicy,\n  Duration,\n  aws_logs,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { CustomLambdaFunctionProps } from \"../utils\";\nimport { PgBouncer } from \"./PgBouncer\";\n\nconst instanceSizes: Record<string, number> = require(\"./instance-memory.json\");\nconst DEFAULT_PGSTAC_VERSION = \"0.8.5\";\n\nlet defaultPgSTACCustomOptions: { [key: string]: any } = {\n  context: \"FALSE\",\n  mosaic_index: \"TRUE\",\n};\n\nfunction hasVpc(\n  instance: rds.DatabaseInstance | rds.IDatabaseInstance\n): instance is rds.DatabaseInstance {\n  return (instance as rds.DatabaseInstance).vpc !== undefined;\n}\n\n/**\n * An RDS instance with pgSTAC installed. This is a wrapper around the\n * `rds.DatabaseInstance` higher-level construct making use\n * of the BootstrapPgStac construct.\n */\nexport class PgStacDatabase extends Construct {\n  db: rds.DatabaseInstance;\n  pgstacSecret: secretsmanager.ISecret;\n  private _pgBouncerServer?: PgBouncer;\n\n  public readonly connectionTarget: rds.IDatabaseInstance | ec2.Instance;\n  public readonly securityGroup?: ec2.SecurityGroup;\n\n  constructor(scope: Construct, id: string, props: PgStacDatabaseProps) {\n    super(scope, id);\n\n    const defaultParameters = this.getParameters(\n      props.instanceType?.toString() || \"m5.large\",\n      props.parameters\n    );\n    const parameterGroup = new rds.ParameterGroup(this, \"parameterGroup\", {\n      engine: props.engine,\n      parameters: {\n        max_connections: defaultParameters.maxConnections,\n        shared_buffers: defaultParameters.sharedBuffers,\n        effective_cache_size: defaultParameters.effectiveCacheSize,\n        work_mem: defaultParameters.workMem,\n        maintenance_work_mem: defaultParameters.maintenanceWorkMem,\n        max_locks_per_transaction: defaultParameters.maxLocksPerTransaction,\n        temp_buffers: defaultParameters.tempBuffers,\n        seq_page_cost: defaultParameters.seqPageCost,\n        random_page_cost: defaultParameters.randomPageCost,\n        ...props.parameters,\n      },\n    });\n\n    this.db = new rds.DatabaseInstance(this, \"db\", {\n      instanceIdentifier: Stack.of(this).stackName,\n      parameterGroup,\n      ...props,\n    });\n\n    const handler = new aws_lambda.Function(this, \"lambda\", {\n      // defaults\n      runtime: aws_lambda.Runtime.PYTHON_3_11,\n      handler: \"handler.handler\",\n      memorySize: 128,\n      logRetention: aws_logs.RetentionDays.ONE_WEEK,\n      timeout: Duration.minutes(2),\n      code: aws_lambda.Code.fromDockerBuild(__dirname, {\n        file: \"bootstrapper_runtime/Dockerfile\",\n        buildArgs: {\n          PYTHON_VERSION: \"3.11\"\n        },\n      }),\n      vpc: hasVpc(this.db) ? this.db.vpc : props.vpc,\n      allowPublicSubnet: true,\n      // overwrites defaults with user-provided configurable properties,\n      ...props.bootstrapperLambdaFunctionOptions,\n    });\n\n    this.pgstacSecret = new secretsmanager.Secret(this, \"bootstrappersecret\", {\n      secretName: [\n        props.secretsPrefix || \"pgstac\",\n        id,\n        this.node.addr.slice(-8),\n      ].join(\"/\"),\n      generateSecretString: {\n        secretStringTemplate: JSON.stringify({\n          dbname: props.pgstacDbName || \"pgstac\",\n          engine: \"postgres\",\n          port: 5432,\n          host: this.db.instanceEndpoint.hostname,\n          username: props.pgstacUsername || \"pgstac_user\",\n        }),\n        generateStringKey: \"password\",\n        excludePunctuation: true,\n      },\n      description: `PgSTAC database bootstrapped by ${\n        Stack.of(this).stackName\n      }`,\n    });\n\n    // Allow lambda to...\n    // read new user secret\n    this.pgstacSecret.grantRead(handler);\n    // read database secret\n    this.db.secret!.grantRead(handler);\n    // connect to database\n    this.db.connections.allowFrom(handler, ec2.Port.tcp(5432));\n\n    let customResourceProperties: { [key: string]: any } =\n      props.customResourceProperties\n        ? { ...defaultPgSTACCustomOptions, ...props.customResourceProperties }\n        : defaultPgSTACCustomOptions;\n\n    // update properties\n    customResourceProperties[\"conn_secret_arn\"] = this.db.secret!.secretArn;\n    customResourceProperties[\"new_user_secret_arn\"] =\n      this.pgstacSecret.secretArn;\n\n    // if props.lambdaFunctionOptions doesn't have 'code' defined, update pgstac_version (needed for default runtime)\n    if (!props.bootstrapperLambdaFunctionOptions?.code) {\n      customResourceProperties[\"pgstac_version\"] = props.pgstacVersion || DEFAULT_PGSTAC_VERSION;\n    }\n    // this.connections = props.database.connections;\n    const bootstrapper = new CustomResource(this, \"bootstrapper\", {\n      serviceToken: handler.functionArn,\n      properties: customResourceProperties,\n      removalPolicy: RemovalPolicy.RETAIN, // This retains the custom resource (which doesn't really exist), not the database\n    });\n\n    // PgBouncer: connection pooler\n    const addPgbouncer = props.addPgbouncer ?? true;\n    if (addPgbouncer) {\n      this._pgBouncerServer = new PgBouncer(this, \"pgbouncer\", {\n        instanceName: `${Stack.of(this).stackName}-pgbouncer`,\n        instanceType: ec2.InstanceType.of(\n          ec2.InstanceClass.T3,\n          ec2.InstanceSize.MICRO\n        ),\n        vpc: props.vpc,\n        database: {\n          connections: this.db.connections,\n          secret: this.pgstacSecret,\n        },\n        dbMaxConnections: parseInt(defaultParameters.maxConnections),\n        usePublicSubnet:\n          !props.vpcSubnets ||\n          props.vpcSubnets.subnetType === ec2.SubnetType.PUBLIC,\n        pgBouncerConfig: {\n          poolMode: \"transaction\",\n          maxClientConn: 1000,\n          defaultPoolSize: 20,\n          minPoolSize: 10,\n          reservePoolSize: 5,\n          reservePoolTimeout: 5,\n        },\n      });\n\n      this._pgBouncerServer.node.addDependency(bootstrapper);\n\n      this.pgstacSecret = this._pgBouncerServer.pgbouncerSecret;\n      this.connectionTarget = this._pgBouncerServer.instance;\n      this.securityGroup = this._pgBouncerServer.securityGroup;\n    } else {\n      this.connectionTarget = this.db;\n    }\n  }\n\n  public getParameters(\n    instanceType: string,\n    parameters: PgStacDatabaseProps[\"parameters\"]\n  ): DatabaseParameters {\n    // https://github.com/aws/aws-cli/issues/1279#issuecomment-909318236\n    const memory_in_kb = instanceSizes[instanceType] * 1024;\n\n    // It's only necessary to consider passed in parameters for any value that used to\n    // derive subsequent values. Values that don't have dependencies will be overriden\n    // when we unpack the passed-in user parameters\n    const maxConnections = parameters?.maxConnections\n      ? Number.parseInt(parameters.maxConnections)\n      : // https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html#RDS_Limits.MaxConnections\n        Math.min(Math.round((memory_in_kb * 1024) / 9531392), 5000);\n    const sharedBuffers = parameters?.sharedBufers\n      ? Number.parseInt(parameters.sharedBufers)\n      : Math.round(0.25 * memory_in_kb);\n\n    const effectiveCacheSize = Math.round(0.75 * memory_in_kb);\n    const workMem = Math.floor(sharedBuffers / maxConnections);\n    const maintenanceWorkMem = Math.round(0.25 * sharedBuffers);\n\n    const tempBuffers = 128 * 1024;\n    const seqPageCost = 1;\n    const randomPageCost = 1.1;\n\n    return {\n      maxConnections: `${maxConnections}`,\n      sharedBuffers: `${sharedBuffers / 8}`, // Represented in 8kb blocks\n      effectiveCacheSize: `${effectiveCacheSize / 8}`, // Represented in 8kb blocks\n      workMem: `${workMem}`,\n      maintenanceWorkMem: `${maintenanceWorkMem}`,\n      maxLocksPerTransaction: \"1024\",\n      tempBuffers: `${tempBuffers / 8}`, // Represented in 8kb blocks\n      seqPageCost: `${seqPageCost}`,\n      randomPageCost: `${randomPageCost}`,\n    };\n  }\n}\n\nexport interface PgStacDatabaseProps extends rds.DatabaseInstanceProps {\n  /**\n   * Name of database that is to be created and onto which pgSTAC will be installed.\n   *\n   * @default pgstac\n   */\n  readonly pgstacDbName?: string;\n\n  /**\n      * Version of pgstac to install on the database\n      *\n      * @default 0.8.5\n      */\n  readonly pgstacVersion?: string;\n\n  /**\n   * Prefix to assign to the generated `secrets_manager.Secret`\n   *\n   * @default pgstac\n   */\n  readonly secretsPrefix?: string;\n\n  /**\n   * Name of user that will be generated for connecting to the pgSTAC database.\n   *\n   * @default pgstac_user\n   */\n  readonly pgstacUsername?: string;\n\n  /**\n   * Add pgbouncer instance for managing traffic to the pgSTAC database\n   *\n   * @default true\n   */\n  readonly addPgbouncer?: boolean;\n\n  /**\n   * Lambda function Custom Resource properties. A custom resource property is going to be created\n   * to trigger the boostrapping lambda function. This parameter allows the user to specify additional properties\n   * on top of the defaults ones.\n   *\n   */\n  readonly customResourceProperties?: {\n    [key: string]: any;\n  };\n\n  /**\n   * Can be used to override the default lambda function properties.\n   *\n   * @default - defined in the construct.\n   */\n  readonly bootstrapperLambdaFunctionOptions?: CustomLambdaFunctionProps;\n}\n\nexport interface DatabaseParameters {\n  /**\n   * @default - LEAST({DBInstanceClassMemory/9531392}, 5000)\n   */\n  readonly maxConnections: string;\n\n  /**\n   * Note: This value is measured in 8KB blocks.\n   *\n   * @default '{DBInstanceClassMemory/32768}' 25% of instance memory, ie `{(DBInstanceClassMemory/(1024*8)) * 0.25}`\n   */\n  readonly sharedBuffers: string;\n\n  /**\n   * @default - 75% of instance memory\n   */\n  readonly effectiveCacheSize: string;\n\n  /**\n   * @default - shared buffers divided by max connections\n   */\n  readonly workMem: string;\n\n  /**\n   * @default - 25% of shared buffers\n   */\n  readonly maintenanceWorkMem: string;\n\n  /**\n   * @default 1024\n   */\n  readonly maxLocksPerTransaction: string;\n\n  /**\n   * @default 131172 (128 * 1024)\n   */\n  readonly tempBuffers: string;\n\n  /**\n   * @default 1\n   */\n  readonly seqPageCost: string;\n\n  /**\n   * @default 1.1\n   */\n  readonly randomPageCost: string;\n}\n"]}
+PgStacDatabase[_a] = { fqn: "eoapi-cdk.PgStacDatabase", version: "7.6.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_rds as rds,\n  aws_ec2 as ec2,\n  aws_secretsmanager as secretsmanager,\n  aws_lambda,\n  CustomResource,\n  RemovalPolicy,\n  Duration,\n  aws_logs,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { CustomLambdaFunctionProps } from \"../utils\";\nimport { PgBouncer } from \"./PgBouncer\";\n\nconst instanceSizes: Record<string, number> = require(\"./instance-memory.json\");\nconst DEFAULT_PGSTAC_VERSION = \"0.8.5\";\n\nlet defaultPgSTACCustomOptions: { [key: string]: any } = {\n  context: \"FALSE\",\n  mosaic_index: \"TRUE\",\n};\n\nfunction hasVpc(\n  instance: rds.DatabaseInstance | rds.IDatabaseInstance\n): instance is rds.DatabaseInstance {\n  return (instance as rds.DatabaseInstance).vpc !== undefined;\n}\n\n/**\n * An RDS instance with pgSTAC installed. This is a wrapper around the\n * `rds.DatabaseInstance` higher-level construct making use\n * of the BootstrapPgStac construct.\n */\nexport class PgStacDatabase extends Construct {\n  db: rds.DatabaseInstance;\n  pgstacSecret: secretsmanager.ISecret;\n  private _pgBouncerServer?: PgBouncer;\n\n  public readonly connectionTarget: rds.IDatabaseInstance | ec2.Instance;\n  public readonly securityGroup?: ec2.SecurityGroup;\n  public readonly secretBootstrapper?: CustomResource;\n\n  constructor(scope: Construct, id: string, props: PgStacDatabaseProps) {\n    super(scope, id);\n\n    const defaultParameters = this.getParameters(\n      props.instanceType?.toString() || \"m5.large\",\n      props.parameters\n    );\n    const parameterGroup = new rds.ParameterGroup(this, \"parameterGroup\", {\n      engine: props.engine,\n      parameters: {\n        max_connections: defaultParameters.maxConnections,\n        shared_buffers: defaultParameters.sharedBuffers,\n        effective_cache_size: defaultParameters.effectiveCacheSize,\n        work_mem: defaultParameters.workMem,\n        maintenance_work_mem: defaultParameters.maintenanceWorkMem,\n        max_locks_per_transaction: defaultParameters.maxLocksPerTransaction,\n        temp_buffers: defaultParameters.tempBuffers,\n        seq_page_cost: defaultParameters.seqPageCost,\n        random_page_cost: defaultParameters.randomPageCost,\n        ...props.parameters,\n      },\n    });\n\n    this.db = new rds.DatabaseInstance(this, \"db\", {\n      instanceIdentifier: Stack.of(this).stackName,\n      parameterGroup,\n      ...props,\n    });\n\n    const handler = new aws_lambda.Function(this, \"lambda\", {\n      // defaults\n      runtime: aws_lambda.Runtime.PYTHON_3_11,\n      handler: \"handler.handler\",\n      memorySize: 128,\n      logRetention: aws_logs.RetentionDays.ONE_WEEK,\n      timeout: Duration.minutes(2),\n      code: aws_lambda.Code.fromDockerBuild(__dirname, {\n        file: \"bootstrapper_runtime/Dockerfile\",\n        buildArgs: {\n          PYTHON_VERSION: \"3.11\",\n        },\n      }),\n      vpc: hasVpc(this.db) ? this.db.vpc : props.vpc,\n      allowPublicSubnet: true,\n      // overwrites defaults with user-provided configurable properties,\n      ...props.bootstrapperLambdaFunctionOptions,\n    });\n\n    this.pgstacSecret = new secretsmanager.Secret(this, \"bootstrappersecret\", {\n      secretName: [\n        props.secretsPrefix || \"pgstac\",\n        id,\n        this.node.addr.slice(-8),\n      ].join(\"/\"),\n      generateSecretString: {\n        secretStringTemplate: JSON.stringify({\n          dbname: props.pgstacDbName || \"pgstac\",\n          engine: \"postgres\",\n          port: 5432,\n          host: this.db.instanceEndpoint.hostname,\n          username: props.pgstacUsername || \"pgstac_user\",\n        }),\n        generateStringKey: \"password\",\n        excludePunctuation: true,\n      },\n      description: `PgSTAC database bootstrapped by ${\n        Stack.of(this).stackName\n      }`,\n    });\n\n    // Allow lambda to...\n    // read new user secret\n    this.pgstacSecret.grantRead(handler);\n    // read database secret\n    this.db.secret!.grantRead(handler);\n    // connect to database\n    this.db.connections.allowFrom(handler, ec2.Port.tcp(5432));\n\n    let customResourceProperties: { [key: string]: any } =\n      props.customResourceProperties\n        ? { ...defaultPgSTACCustomOptions, ...props.customResourceProperties }\n        : defaultPgSTACCustomOptions;\n\n    // update properties\n    customResourceProperties[\"conn_secret_arn\"] = this.db.secret!.secretArn;\n    customResourceProperties[\"new_user_secret_arn\"] =\n      this.pgstacSecret.secretArn;\n\n    // if props.lambdaFunctionOptions doesn't have 'code' defined, update pgstac_version (needed for default runtime)\n    if (!props.bootstrapperLambdaFunctionOptions?.code) {\n      customResourceProperties[\"pgstac_version\"] =\n        props.pgstacVersion || DEFAULT_PGSTAC_VERSION;\n    }\n\n    // add timestamp to properties to ensure the Lambda gets re-executed on each deploy\n    customResourceProperties[\"timestamp\"] = new Date().toISOString();\n\n    const bootstrapper = new CustomResource(this, \"bootstrapper\", {\n      serviceToken: handler.functionArn,\n      properties: customResourceProperties,\n      removalPolicy: RemovalPolicy.RETAIN, // This retains the custom resource (which doesn't really exist), not the database\n    });\n\n    // PgBouncer: connection poolercustomresource trigger on redeploy\n    const addPgbouncer = props.addPgbouncer ?? true;\n    if (addPgbouncer) {\n      this._pgBouncerServer = new PgBouncer(this, \"pgbouncer\", {\n        instanceName: `${Stack.of(this).stackName}-pgbouncer`,\n        instanceType: ec2.InstanceType.of(\n          ec2.InstanceClass.T3,\n          ec2.InstanceSize.MICRO\n        ),\n        vpc: props.vpc,\n        database: {\n          connections: this.db.connections,\n          secret: this.pgstacSecret,\n        },\n        dbMaxConnections: parseInt(defaultParameters.maxConnections),\n        usePublicSubnet:\n          !props.vpcSubnets ||\n          props.vpcSubnets.subnetType === ec2.SubnetType.PUBLIC,\n        pgBouncerConfig: {\n          poolMode: \"transaction\",\n          maxClientConn: 1000,\n          defaultPoolSize: 20,\n          minPoolSize: 10,\n          reservePoolSize: 5,\n          reservePoolTimeout: 5,\n        },\n      });\n\n      this._pgBouncerServer.node.addDependency(bootstrapper);\n\n      this.pgstacSecret = this._pgBouncerServer.pgbouncerSecret;\n      this.connectionTarget = this._pgBouncerServer.instance;\n      this.securityGroup = this._pgBouncerServer.securityGroup;\n      this.secretBootstrapper = this._pgBouncerServer.secretUpdateComplete;\n    } else {\n      this.connectionTarget = this.db;\n    }\n  }\n\n  public getParameters(\n    instanceType: string,\n    parameters: PgStacDatabaseProps[\"parameters\"]\n  ): DatabaseParameters {\n    // https://github.com/aws/aws-cli/issues/1279#issuecomment-909318236\n    const memory_in_kb = instanceSizes[instanceType] * 1024;\n\n    // It's only necessary to consider passed in parameters for any value that used to\n    // derive subsequent values. Values that don't have dependencies will be overriden\n    // when we unpack the passed-in user parameters\n    const maxConnections = parameters?.maxConnections\n      ? Number.parseInt(parameters.maxConnections)\n      : // https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html#RDS_Limits.MaxConnections\n        Math.min(Math.round((memory_in_kb * 1024) / 9531392), 5000);\n    const sharedBuffers = parameters?.sharedBufers\n      ? Number.parseInt(parameters.sharedBufers)\n      : Math.round(0.25 * memory_in_kb);\n\n    const effectiveCacheSize = Math.round(0.75 * memory_in_kb);\n    const workMem = Math.floor(sharedBuffers / maxConnections);\n    const maintenanceWorkMem = Math.round(0.25 * sharedBuffers);\n\n    const tempBuffers = 128 * 1024;\n    const seqPageCost = 1;\n    const randomPageCost = 1.1;\n\n    return {\n      maxConnections: `${maxConnections}`,\n      sharedBuffers: `${sharedBuffers / 8}`, // Represented in 8kb blocks\n      effectiveCacheSize: `${effectiveCacheSize / 8}`, // Represented in 8kb blocks\n      workMem: `${workMem}`,\n      maintenanceWorkMem: `${maintenanceWorkMem}`,\n      maxLocksPerTransaction: \"1024\",\n      tempBuffers: `${tempBuffers / 8}`, // Represented in 8kb blocks\n      seqPageCost: `${seqPageCost}`,\n      randomPageCost: `${randomPageCost}`,\n    };\n  }\n}\n\nexport interface PgStacDatabaseProps extends rds.DatabaseInstanceProps {\n  /**\n   * Name of database that is to be created and onto which pgSTAC will be installed.\n   *\n   * @default pgstac\n   */\n  readonly pgstacDbName?: string;\n\n  /**\n   * Version of pgstac to install on the database\n   *\n   * @default 0.8.5\n   */\n  readonly pgstacVersion?: string;\n\n  /**\n   * Prefix to assign to the generated `secrets_manager.Secret`\n   *\n   * @default pgstac\n   */\n  readonly secretsPrefix?: string;\n\n  /**\n   * Name of user that will be generated for connecting to the pgSTAC database.\n   *\n   * @default pgstac_user\n   */\n  readonly pgstacUsername?: string;\n\n  /**\n   * Add pgbouncer instance for managing traffic to the pgSTAC database\n   *\n   * @default true\n   */\n  readonly addPgbouncer?: boolean;\n\n  /**\n   * Lambda function Custom Resource properties. A custom resource property is going to be created\n   * to trigger the boostrapping lambda function. This parameter allows the user to specify additional properties\n   * on top of the defaults ones.\n   *\n   */\n  readonly customResourceProperties?: {\n    [key: string]: any;\n  };\n\n  /**\n   * Can be used to override the default lambda function properties.\n   *\n   * @default - defined in the construct.\n   */\n  readonly bootstrapperLambdaFunctionOptions?: CustomLambdaFunctionProps;\n}\n\nexport interface DatabaseParameters {\n  /**\n   * @default - LEAST({DBInstanceClassMemory/9531392}, 5000)\n   */\n  readonly maxConnections: string;\n\n  /**\n   * Note: This value is measured in 8KB blocks.\n   *\n   * @default '{DBInstanceClassMemory/32768}' 25% of instance memory, ie `{(DBInstanceClassMemory/(1024*8)) * 0.25}`\n   */\n  readonly sharedBuffers: string;\n\n  /**\n   * @default - 75% of instance memory\n   */\n  readonly effectiveCacheSize: string;\n\n  /**\n   * @default - shared buffers divided by max connections\n   */\n  readonly workMem: string;\n\n  /**\n   * @default - 25% of shared buffers\n   */\n  readonly maintenanceWorkMem: string;\n\n  /**\n   * @default 1024\n   */\n  readonly maxLocksPerTransaction: string;\n\n  /**\n   * @default 131172 (128 * 1024)\n   */\n  readonly tempBuffers: string;\n\n  /**\n   * @default 1\n   */\n  readonly seqPageCost: string;\n\n  /**\n   * @default 1.1\n   */\n  readonly randomPageCost: string;\n}\n"]}

package/lib/ingestor-api/index.js

@@ -168,5 +168,5 @@ class StacIngestor extends constructs_1.Construct {
 }
 exports.StacIngestor = StacIngestor;
 _a = JSII_RTTI_SYMBOL_1;
-StacIngestor[_a] = { fqn: "eoapi-cdk.StacIngestor", version: "7.5.0" };
+StacIngestor[_a] = { fqn: "eoapi-cdk.StacIngestor", version: "7.6.0" };
 //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  aws_apigateway as apigateway,\n  aws_dynamodb as dynamodb,\n  aws_ec2 as ec2,\n  aws_iam as iam,\n  aws_lambda as lambda,\n  aws_logs,\n  aws_lambda_event_sources as events,\n  aws_secretsmanager as secretsmanager,\n  aws_ssm as ssm,\n  Duration,\n  RemovalPolicy,\n  Stack,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { CustomLambdaFunctionProps } from \"../utils\";\n\nexport class StacIngestor extends Construct {\n  table: dynamodb.Table;\n  public handlerRole: iam.Role;\n\n  constructor(scope: Construct, id: string, props: StacIngestorProps) {\n    super(scope, id);\n\n    this.table = this.buildTable();\n\n    const env: Record<string, string> = {\n      DYNAMODB_TABLE: this.table.tableName,\n      ROOT_PATH: `/${props.stage}`,\n      NO_PYDANTIC_SSM_SETTINGS: \"1\",\n      STAC_URL: props.stacUrl,\n      DATA_ACCESS_ROLE: props.dataAccessRole.roleArn,\n      ...props.apiEnv,\n    };\n\n    this.handlerRole = new iam.Role(this, \"execution-role\", {\n      description:\n        \"Role used by STAC Ingestor. Manually defined so that we can choose a name that is supported by the data access roles trust policy\",\n      assumedBy: new iam.ServicePrincipal(\"lambda.amazonaws.com\"),\n      managedPolicies: [\n        iam.ManagedPolicy.fromAwsManagedPolicyName(\n          \"service-role/AWSLambdaBasicExecutionRole\",\n        ),\n        iam.ManagedPolicy.fromAwsManagedPolicyName(\n          \"service-role/AWSLambdaVPCAccessExecutionRole\",\n        ),\n      ],\n    });\n\n    const handler = this.buildApiLambda({\n      table: this.table,\n      env,\n      dataAccessRole: props.dataAccessRole,\n      stage: props.stage,\n      dbSecret: props.stacDbSecret,\n      dbVpc: props.vpc,\n      dbSecurityGroup: props.stacDbSecurityGroup,\n      subnetSelection: props.subnetSelection,\n      lambdaFunctionOptions: props.apiLambdaFunctionOptions,\n    });\n\n    this.buildApiEndpoint({\n      handler,\n      stage: props.stage,\n      endpointConfiguration: props.apiEndpointConfiguration,\n      policy: props.apiPolicy,\n      ingestorDomainNameOptions: props.ingestorDomainNameOptions,\n    });\n\n    this.buildIngestor({\n      table: this.table,\n      env: env,\n      dbSecret: props.stacDbSecret,\n      dbVpc: props.vpc,\n      dbSecurityGroup: props.stacDbSecurityGroup,\n      subnetSelection: props.subnetSelection,\n      lambdaFunctionOptions: props.ingestorLambdaFunctionOptions\n    });\n\n    this.registerSsmParameter({\n      name: \"dynamodb_table\",\n      value: this.table.tableName,\n      description: \"Name of table used to store ingestions\",\n    });\n  }\n\n  private buildTable(): dynamodb.Table {\n    const table = new dynamodb.Table(this, \"ingestions-table\", {\n      partitionKey: { name: \"created_by\", type: dynamodb.AttributeType.STRING },\n      sortKey: { name: \"id\", type: dynamodb.AttributeType.STRING },\n      billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,\n      removalPolicy: RemovalPolicy.DESTROY,\n      stream: dynamodb.StreamViewType.NEW_IMAGE,\n    });\n\n    table.addGlobalSecondaryIndex({\n      indexName: \"status\",\n      partitionKey: { name: \"status\", type: dynamodb.AttributeType.STRING },\n      sortKey: { name: \"created_at\", type: dynamodb.AttributeType.STRING },\n    });\n\n    return table;\n  }\n\n  private buildApiLambda(props: {\n    table: dynamodb.ITable;\n    env: Record<string, string>;\n    dataAccessRole: iam.IRole;\n    stage: string;\n    dbSecret: secretsmanager.ISecret;\n    dbVpc: undefined | ec2.IVpc;\n    dbSecurityGroup: ec2.ISecurityGroup;\n    subnetSelection: undefined | ec2.SubnetSelection\n    lambdaFunctionOptions?: CustomLambdaFunctionProps;\n  }): lambda.Function {\n\n    const handler = new lambda.Function(this, \"api-handler\", {\n      // defaults\n      runtime: lambda.Runtime.PYTHON_3_11,\n      handler: \"src.handler.handler\",\n      memorySize: 2048,\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      allowPublicSubnet: true,\n      vpc: props.dbVpc,\n      vpcSubnets: props.subnetSelection,\n      environment: { DB_SECRET_ARN: props.dbSecret.secretArn, ...props.env },\n      role: this.handlerRole,\n      // overwrites defaults with user-provided configurable properties\n      ...props.lambdaFunctionOptions,\n    });\n\n    // Allow handler to read DB secret\n    props.dbSecret.grantRead(handler);\n\n    // Allow handler to connect to DB\n\n    if (props.dbVpc){\n      props.dbSecurityGroup.addIngressRule(\n        handler.connections.securityGroups[0],\n        ec2.Port.tcp(5432),\n        \"Allow connections from STAC Ingestor\"\n      );\n    }\n\n    props.table.grantReadWriteData(handler);\n\n    return handler;\n  }\n\n  private buildIngestor(props: {\n    table: dynamodb.ITable;\n    env: Record<string, string>;\n    dbSecret: secretsmanager.ISecret;\n    dbVpc: undefined | ec2.IVpc;\n    dbSecurityGroup: ec2.ISecurityGroup;\n    subnetSelection: undefined | ec2.SubnetSelection;\n    lambdaFunctionOptions?: CustomLambdaFunctionProps;\n  }): lambda.Function {\n\n\n    const handler = new lambda.Function(this, \"stac-ingestor\",{\n      // defaults\n      runtime: lambda.Runtime.PYTHON_3_11,\n      handler: \"src.ingestor.handler\",\n      memorySize: 2048,\n      logRetention: aws_logs.RetentionDays.ONE_WEEK,\n      timeout: Duration.seconds(180),\n      code: lambda.Code.fromDockerBuild(__dirname, {\n        file: \"runtime/Dockerfile\",\n        buildArgs: { PYTHON_VERSION: '3.11' },\n      }),\n      vpc: props.dbVpc,\n      vpcSubnets: props.subnetSelection,\n      allowPublicSubnet: true,\n      environment: { DB_SECRET_ARN: props.dbSecret.secretArn, ...props.env },\n      role: this.handlerRole,\n      // overwrites defaults with user-provided configurable properties\n      ...props.lambdaFunctionOptions,\n    });\n\n    // Allow handler to read DB secret\n    props.dbSecret.grantRead(handler);\n\n    // Allow handler to connect to DB\n    if (props.dbVpc){\n      props.dbSecurityGroup.addIngressRule(\n        handler.connections.securityGroups[0],\n        ec2.Port.tcp(5432),\n        \"Allow connections from STAC Ingestor\"\n      );\n    }\n\n    // Allow handler to write results back to DBƒ\n    props.table.grantWriteData(handler);\n\n    // Trigger handler from writes to DynamoDB table\n    handler.addEventSource(\n      new events.DynamoEventSource(props.table, {\n        // Read when batches reach size...\n        batchSize: 1000,\n        // ... or when window is reached.\n        maxBatchingWindow: Duration.seconds(10),\n        // Read oldest data first.\n        startingPosition: lambda.StartingPosition.TRIM_HORIZON,\n        retryAttempts: 1,\n      })\n    );\n\n    return handler;\n  }\n\n  private buildApiEndpoint(props: {\n    handler: lambda.IFunction;\n    stage: string;\n    policy?: iam.PolicyDocument;\n    endpointConfiguration?: apigateway.EndpointConfiguration;\n    ingestorDomainNameOptions?: apigateway.DomainNameOptions;\n  }): apigateway.LambdaRestApi {\n\n    return new apigateway.LambdaRestApi(\n      this,\n      `${Stack.of(this).stackName}-ingestor-api`,\n      {\n        handler: props.handler,\n        proxy: true,\n\n        cloudWatchRole: true,\n        deployOptions: { stageName: props.stage },\n        endpointExportName: `${Stack.of(this)}-ingestor-api`,\n\n        endpointConfiguration: props.endpointConfiguration,\n        policy: props.policy,\n\n        domainName:  props.ingestorDomainNameOptions ? {\n          domainName: props.ingestorDomainNameOptions.domainName,\n          certificate: props.ingestorDomainNameOptions.certificate,\n        } : undefined,\n      }\n    );\n  }\n\n  private registerSsmParameter(props: {\n    name: string;\n    value: string;\n    description: string;\n  }): ssm.IStringParameter {\n    const parameterNamespace = Stack.of(this).stackName;\n    return new ssm.StringParameter(\n      this,\n      `${props.name.replace(\"_\", \"-\")}-parameter`,\n      {\n        description: props.description,\n        parameterName: `/${parameterNamespace}/${props.name}`,\n        stringValue: props.value,\n      }\n    );\n  }\n}\n\nexport interface StacIngestorProps {\n  /**\n   * ARN of AWS Role used to validate access to S3 data\n   */\n  readonly dataAccessRole: iam.IRole;\n\n  /**\n   * URL of STAC API\n   */\n  readonly stacUrl: string;\n\n  /**\n   * Stage of deployment (e.g. `dev`, `prod`)\n   */\n  readonly stage: string;\n\n  /**\n   * Secret containing pgSTAC DB connection information\n   */\n  readonly stacDbSecret: secretsmanager.ISecret;\n\n  /**\n   * VPC running pgSTAC DB\n   */\n  readonly vpc?: ec2.IVpc;\n\n  /**\n   * Security Group used by pgSTAC DB\n   */\n  readonly stacDbSecurityGroup: ec2.ISecurityGroup;\n\n  /**\n   * Subnet into which the lambda should be deployed if using a VPC\n   */\n  readonly subnetSelection?: ec2.SubnetSelection;\n\n  /**\n   * Environment variables to be sent to Lambda.\n   */\n  readonly apiEnv?: Record<string, string>;\n\n  /**\n   * API Endpoint Configuration, useful for creating private APIs.\n   */\n  readonly apiEndpointConfiguration?: apigateway.EndpointConfiguration;\n\n  /**\n   * API Policy Document, useful for creating private APIs.\n   */\n  readonly apiPolicy?: iam.PolicyDocument;\n\n  /**\n   * Custom Domain Name Options for Ingestor API\n   */\n   readonly ingestorDomainNameOptions?: apigateway.DomainNameOptions;\n\n  /**\n     * Can be used to override the default lambda function properties.\n     *\n     * @default - default settings are defined in the construct.\n     */\n  readonly apiLambdaFunctionOptions?: CustomLambdaFunctionProps;\n\n  /**\n     * Can be used to override the default lambda function properties.\n     *\n     * @default - default settings are defined in the construct.\n     */\nreadonly ingestorLambdaFunctionOptions?: CustomLambdaFunctionProps;\n\n}\n"]}

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

@@ -3,9 +3,8 @@ cachetools==5.3.0
 fastapi>=0.75.1
 orjson>=3.6.8
 psycopg[binary,pool]>=3.0.15
-pydantic_ssm_settings>=0.2.0
+pydantic_ssm_settings>=1.0,<2.0
 pydantic>=1.9.0
 pypgstac==0.8.5
 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
+stac-pydantic>=3.0,<4.0

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

@@ -2,10 +2,11 @@ import os
 from getpass import getuser
 from typing import Optional
 
-from pydantic import AnyHttpUrl, BaseSettings, Field, constr
-from pydantic_ssm_settings import AwsSsmSourceConfig
+from pydantic import AnyHttpUrl, Field, constr
+from pydantic_settings import BaseSettings
+from pydantic_ssm_settings.settings import SsmBaseSettings
 
-AwsArn = constr(regex=r"^arn:aws:iam::\d{12}:role/.+")
+AwsArn = constr(pattern=r"^arn:aws:iam::\d{12}:role/.+")
 
 
 class Settings(BaseSettings):
@@ -27,8 +28,8 @@ class Settings(BaseSettings):
         description="Path from where to serve this URL.", default=False
     )
 
-    class Config(AwsSsmSourceConfig):
-        env_file = ".env"
+    class Config(SsmBaseSettings):
+        env_file: str = ".env"
 
     @classmethod
     def from_ssm(cls, stack: str):

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

@@ -14,7 +14,7 @@ from pydantic import (
     PositiveInt,
     dataclasses,
     error_wrappers,
-    validator,
+    field_validator,
 )
 from stac_pydantic import Collection, Item, shared
 
@@ -25,7 +25,7 @@ if TYPE_CHECKING:
 
 
 class AccessibleAsset(shared.Asset):
-    @validator("href")
+    @field_validator("href")
     def is_accessible(cls, href):
         url = urlparse(href)
 
@@ -44,7 +44,7 @@ class AccessibleAsset(shared.Asset):
 class AccessibleItem(Item):
     assets: Dict[str, AccessibleAsset]
 
-    @validator("collection")
+    @field_validator("collection")
     def exists(cls, collection):
         validators.collection_exists(collection_id=collection)
         return collection
@@ -66,15 +66,14 @@ class Status(str, enum.Enum):
 class Ingestion(BaseModel):
     id: str
     status: Status
-    message: Optional[str]
+    message: Optional[str] = None
     created_by: str
-    created_at: datetime = None
-    updated_at: datetime = None
+    created_at: datetime = datetime.now()
+    updated_at: datetime = datetime.now()
 
     item: Union[Item, Json[Item]]
 
-    @validator("created_at", pre=True, always=True, allow_reuse=True)
-    @validator("updated_at", pre=True, always=True, allow_reuse=True)
+    @field_validator("created_at", "updated_at", mode="before")
     def set_ts_now(cls, v):
         return v or datetime.now()
 
@@ -94,10 +93,10 @@ class Ingestion(BaseModel):
     def dynamodb_dict(self):
         """DynamoDB-friendly serialization"""
         # convert to dictionary
-        output = self.dict(exclude={"item"})
+        output = self.model_dump(exclude={"item"})
 
         # add STAC item as string
-        output["item"] = self.item.json()
+        output["item"] = self.item.model_dump_json()
 
         # make JSON-friendly (will be able to do with Pydantic V2, https://github.com/pydantic/pydantic/issues/1409#issuecomment-1423995424)
         return jsonable_encoder(output)
@@ -106,7 +105,7 @@ class Ingestion(BaseModel):
 @dataclasses.dataclass
 class ListIngestionRequest:
     status: Status = Status.queued
-    limit: PositiveInt = None
+    limit: Optional[PositiveInt] = None
     next: Optional[str] = None
 
     def __post_init_post_parse__(self) -> None:
@@ -133,7 +132,7 @@ class ListIngestionResponse(BaseModel):
     items: List[Ingestion]
     next: Optional[str]
 
-    @validator("next", pre=True)
+    @field_validator("next", mode="before")
     def b64_encode_next(cls, next):
         """
         Base64 encode next parameter for easier transportability
@@ -144,5 +143,5 @@ class ListIngestionResponse(BaseModel):
 
 
 class UpdateIngestionRequest(BaseModel):
-    status: Status = None
-    message: str = None
+    status: Optional[Status] = None
+    message: Optional[str] = None