Add lambda entrypoint to determine AUTOGRAPH_ROOT_HASH

Author: oskirby

docker-compose.yml

@@ -82,7 +82,6 @@ services:
       - AUTOGRAPH_KEY=19zd4w3xirb5syjgdx8atq6g91m03bdsmzjifs2oddivswlu9qs
       # set a non-empty value to use the lambda handler
       - LAMBDA_TASK_ROOT=/usr/local/bin/
-      - AUTOGRAPH_ROOT_HASH
     ports:
       - "9000:8080"
     links:
@@ -103,7 +102,6 @@ services:
       - AUTOGRAPH_KEY=19zd4w3xirb5syjgdx8atq6g91m03bdsmzjifs2oddivswlu9qs
       # set a non-empty value to use the lambda handler
       - LAMBDA_TASK_ROOT=/usr/local/bin/
-      - AUTOGRAPH_ROOT_HASH
     ports:
       - "9001:8080"
     links:

tools/autograph-monitor/Dockerfile.lambda-emulator

@@ -2,11 +2,14 @@ FROM autograph-app
 
 USER root
 
-RUN cp /app/src/autograph/bin/test_monitor.sh /usr/local/bin/test_monitor.sh
+ADD test_monitor.sh /usr/local/bin/test_monitor.sh
 RUN curl -Lo /usr/local/bin/aws-lambda-rie \
-    https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie \
-    && \
-    chmod +x /usr/local/bin/aws-lambda-rie /usr/local/bin/test_monitor.sh
+        https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie && \
+    chmod +x /usr/local/bin/aws-lambda-rie
+
+# Use an entrypoint to determine the AUTOGRAPH_ROOT_HASH
+COPY lambda-setup-entrypoint.sh /usr/local/bin/lambda-setup-entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/lambda-setup-entrypoint.sh"]
 
 USER app
-CMD ["/usr/local/bin/aws-lambda-rie", "/go/bin/autograph-monitor"]
+CMD ["/go/bin/autograph-monitor"]

bin/test_monitor.sh renamed to tools/autograph-monitor/lambda-setup-entrypoint.sh

@@ -8,6 +8,7 @@ export AUTOGRAPH_ROOT_HASH=$(autograph-client -t "$AUTOGRAPH_URL" -listconfig no
       jq -r '.cacert' | openssl x509 -outform der | openssl dgst -sha256 -hex | \
       awk '{print $2}' | tr '[:lower:]' '[:upper:]')
 
-# invoke a test monitor run in a lambda monitor
-MONITOR_ERROR=$(curl -w '\n' -X POST 'http://localhost:8080/2015-03-31/functions/function/invocations' -d '{}')
-test "$MONITOR_ERROR = null"
+echo "Autograph instance: $AUTOGRAPH_URL"
+echo "Got Root hash: $AUTOGRAPH_ROOT_HASH"
+echo "Starting lambda: $@"
+/usr/local/bin/aws-lambda-rie "$@"

tools/autograph-monitor/test_monitor.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+set -o pipefail
+
+MONITOR_ENDPOINT=${1:-"http://localhost:8080"}
+
+# invoke a test monitor run in a lambda monitor
+MONITOR_ERROR=$(curl -w '\n' -X POST "$MONITOR_ENDPOINT/2015-03-31/functions/function/invocations" -d '{}')
+test "$MONITOR_ERROR = null"