Merge pull request #5 from microservices-demo/fix-healthcheck

Fix healthcheck endpoint and docker-compose

docker-compose.yml

@@ -16,14 +16,27 @@ services:
       - /tmp:rw,noexec,nosuid
     environment:
       - reschedule=on-node-failure
-      - ZIPKIN=zipkin
     ports:
-      - "8082:80"
-  orders-db:
+      - "8000:80"
+    links:
+      - dynamo
+    environment:
+      - AWS_ACCESS_KEY_ID=0
+      - AWS_SECRET_ACCESS_KEY=0
+      - AWS_DEFAULT_REGION=eu-central-1
+  dynamo:
     image: dwmkerr/dynamodb
-    hostname: orders-db
+    command: "-sharedDb"
+    hostname: dynamo
     restart: always
     environment:
       - reschedule=on-node-failure
-    ports:
-      - "8080:8000"
+  init-dynamo:
+    image: garland/aws-cli-docker
+    command: "aws dynamodb create-table --table-name orders --attribute-definitions AttributeName=id,AttributeType=S AttributeName=customerId,AttributeType=S --key-schema AttributeName=id,KeyType=HASH AttributeName=customerId,KeyType=RANGE --provisioned-throughput ReadCapacityUnits=1,WriteCapacityUnits=1 --endpoint-url http://dynamo:8000"
+    links:
+      - dynamo
+    environment:
+      - AWS_ACCESS_KEY_ID=0
+      - AWS_SECRET_ACCESS_KEY=0
+      - AWS_DEFAULT_REGION=eu-central-1

src/main/scala/works.weave.socks.aws.orders/presentation/resource/HealthCheckResource.scala

@@ -15,10 +15,10 @@ import works.weave.socks.spring.aws.DynamoConfiguration
 
 @Component
 @Path("health")
-class HealthCheckResource() {
+class HealthCheckResource(dynamoConnection : DynamoConfiguration) {
 
   @GET
-  def getHealthCheck(dynamoConnection : DynamoConfiguration) : Response = {
+  def getHealthCheck() : Response = {
     Log.info("health check requested")
     val dateNow = Calendar.getInstance().getTime();
 
@@ -34,7 +34,7 @@ class HealthCheckResource() {
     try {
       val table = dynamoConnection.client.describeTable("orders")
     } catch {
-      case _ : Throwable => dynamoDBHealth("status") = "err"
+      case unknown : Throwable => dynamoDBHealth("status") = "err"
     }
 
     val map = Map("health" -> Array(ordersHealth, dynamoDBHealth))