From cad8710674f4c1934b6e515e2a5fd404fddb4986 Mon Sep 17 00:00:00 2001
From: Joel Unzain <joe94@users.noreply.github.com>
Date: Thu, 27 May 2021 12:02:32 -0700
Subject: [PATCH] Feature/some updates (#48)

* ignore IDE config folder

* Add zipkin to visualize traces

* work around for aker issue

* docker-compose is now in docker cli

* export spans to zipkin

* add access level capability for testing
---
 .gitignore                               |  2 ++
 deploy/docker-compose/deploy.sh          |  2 +-
 deploy/docker-compose/docker-compose.yml | 22 ++++++++++++++++++++++
 simulator/Dockerfile                     |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6642cb2..8b2325f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 diagrams/*.png
 
+.idea
+
 rendered.*
 ./deploy/kubernetes/helm/xmidt-cloud-ship/
 ./deploy/kubernetes/helm/charts/
diff --git a/deploy/docker-compose/deploy.sh b/deploy/docker-compose/deploy.sh
index f6a36f5..3686a07 100755
--- a/deploy/docker-compose/deploy.sh
+++ b/deploy/docker-compose/deploy.sh
@@ -19,7 +19,7 @@ PETASOS_VERSION=${PETASOS_VERSION:-latest} \
 TALARIA_VERSION=${TALARIA_VERSION:-latest} \
 THEMIS_VERSION=${THEMIS_VERSION:-latest} \
 SIMULATOR_VERSION=${SIMULATOR_VERSION:-latest} \
-docker-compose -f $ROOT_DIR/deploy/docker-compose/docker-compose.yml up -d $@
+docker compose -f $ROOT_DIR/deploy/docker-compose/docker-compose.yml up -d $@
 if [[ $? -ne 0 ]]; then
   exit 1
 fi
diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml
index afa6690..16b74a1 100644
--- a/deploy/docker-compose/docker-compose.yml
+++ b/deploy/docker-compose/docker-compose.yml
@@ -17,6 +17,8 @@ services:
     environment:
       - CONSUL_HOST=consul0:8500
       - ARGUS_HOST=http://argus:6600
+      - TRACING_PROVIDER_NAME=zipkin
+      - TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
     ports:
       - "6100-6103:6100-6103"
     depends_on:
@@ -30,6 +32,8 @@ services:
     image: xmidt/talaria:${TALARIA_VERSION}
     environment:
       - CONSUL_HOST=consul0:8500
+      - TRACING_PROVIDER_NAME=zipkin
+      - TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
     ports:
       - "6200-6204:6200-6204"
     depends_on:
@@ -41,18 +45,24 @@ services:
     <<: *talaria
     environment:
       - CONSUL_HOST=consul0:8500
+      - TRACING_PROVIDER_NAME=zipkin
+      - TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
     ports:
       - "6210-6214:6200-6204"
   talaria-2:
     <<: *talaria
     environment:
       - CONSUL_HOST=consul1:8500
+      - TRACING_PROVIDER_NAME=zipkin
+      - TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
     ports:
       - "6220-6224:6200-6204"
   scytale:
     image: xmidt/scytale:${SCYTALE_VERSION}
     environment:
       - CONSUL_HOST=consul0:8500
+      - TRACING_PROVIDER_NAME=zipkin
+      - TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
     ports:
       - "6300-6303:6300-6303"
     depends_on:
@@ -76,6 +86,8 @@ services:
     image: xmidt/themis:${THEMIS_VERSION}
     environment:
       - CONSUL_HOST=consul0:8500
+      - TRACING_PROVIDER_NAME=zipkin
+      - TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
     ports:
       - "6500-6504:6500-6504"
     networks:
@@ -85,6 +97,9 @@ services:
     image: xmidt/argus:${ARGUS_VERSION}
     environment:
       - "AWS_ENDPOINT=http://dynamodb:8000"
+      - TRACING_PROVIDER_NAME=zipkin
+      - TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
+      - ACCESS_LEVEL_CAPABILITY=x1:issuer:test:.*:all
     ports:
       - "6600-6603:6600-6603"
     depends_on:
@@ -166,5 +181,12 @@ services:
     networks:
       - xmidt
 
+  zipkin:
+    image: openzipkin/zipkin 
+    ports:
+      - "9411:9411"
+    networks:
+      - xmidt
+
 networks:
   xmidt:
diff --git a/simulator/Dockerfile b/simulator/Dockerfile
index fb8bdc8..7c00f82 100644
--- a/simulator/Dockerfile
+++ b/simulator/Dockerfile
@@ -21,6 +21,7 @@ RUN cd /build && \
     cd /build && \
     git clone https://github.com/Comcast/aker.git && \
     cd aker && \
+    git checkout cfb54022fa6e0ba70040e419d34655da955637b5 && \
     mkdir build && \
     cd build && \
     cmake .. && make