fixup: fix bootstrapper issues

developmentseed · Oct 26, 2022 · fc7ff20 · fc7ff20
1 parent 1421fec
commit fc7ff20
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/bootstrapper/index.ts b/lib/bootstrapper/index.ts
@@ -17,6 +17,8 @@ function hasVpc(
   return (instance as aws_rds.DatabaseInstance).vpc !== undefined;
 }
 
+const DEFAULT_PGSTAC_VERSION = "0.6.8";
+
 /**
  * Bootstraps a database instance, installing pgSTAC onto the database.
  */
@@ -26,12 +28,13 @@ export class BootstrapPgStac extends Construct {
   constructor(scope: Construct, id: string, props: BootstrapPgStacProps) {
     super(scope, id);
 
+    const { pgstacVersion = DEFAULT_PGSTAC_VERSION } = props;
     const handler = new aws_lambda.Function(this, "lambda", {
       handler: "handler.handler",
       runtime: aws_lambda.Runtime.PYTHON_3_8,
       code: aws_lambda.Code.fromDockerBuild(__dirname, {
         file: "runtime/Dockerfile",
-        buildArgs: { PGSTAC_VERSION: props.pgstacVersion || "0.6.8" },
+        buildArgs: { PGSTAC_VERSION: pgstacVersion },
       }),
       timeout: Duration.minutes(2),
       vpc: hasVpc(props.database) ? props.database.vpc : props.vpc,
@@ -74,7 +77,7 @@ export class BootstrapPgStac extends Construct {
       properties: {
         // By setting pgstac_version in the properties assures
         // that Create/Update events will be passed to the service token
-        pgstac_version: props.pgstacVersion,
+        pgstac_version: pgstacVersion,
         conn_secret_arn: props.dbSecret.secretArn,
         new_user_secret_arn: this.secret.secretArn,
       },

diff --git a/lib/bootstrapper/runtime/Dockerfile b/lib/bootstrapper/runtime/Dockerfile
@@ -12,3 +12,7 @@ COPY runtime/handler.py /asset/handler.py
 # https://stackoverflow.com/a/61746719
 # Tip from eoAPI: turns out, asyncio is part of python
 RUN rm -rf /asset/asyncio*
+
+# A command must be present avoid the following error on CDK deploy:
+# Error response from daemon: No command specified
+CMD [ "echo", "ready to go!" ]
diff --git a/lib/bootstrapper/runtime/handler.py b/lib/bootstrapper/runtime/handler.py
@@ -309,7 +309,8 @@ def handler(event, context):
 
     except Exception as e:
         print(f"Unable to bootstrap database with exception={e}")
-        return send(event, context, "FAILED", {"message": str(e)})
+        send(event, context, "FAILED", {"message": str(e)})
+        raise e
 
     print("Complete.")
     return send(event, context, "SUCCESS", {})