From 4db991443280bf86c70b508574a25df14d9ee7f0 Mon Sep 17 00:00:00 2001
From: Rickard Cardell <rickard.cardell@klarna.com>
Date: Sat, 27 Feb 2021 06:28:22 +0100
Subject: [PATCH] feat: neo4j https support (#2101) (#2144)

* feat: neo4j https support (#2101)

    Ability to specify http as well as https URI schemes in the 'NEO4J_HOST' variable.
---
 docker/datahub-gms/env/docker.env          | 2 +-
 docker/datahub-gms/env/docker.mariadb.env  | 2 +-
 docker/datahub-gms/env/docker.postgres.env | 2 +-
 docker/datahub-gms/start.sh                | 7 ++++++-
 docker/datahub-mae-consumer/env/docker.env | 2 +-
 docker/datahub-mae-consumer/start.sh       | 7 ++++++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/docker/datahub-gms/env/docker.env b/docker/datahub-gms/env/docker.env
index 45cfa03a0e..e4912a503f 100644
--- a/docker/datahub-gms/env/docker.env
+++ b/docker/datahub-gms/env/docker.env
@@ -8,7 +8,7 @@ KAFKA_BOOTSTRAP_SERVER=broker:29092
 KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
 ELASTICSEARCH_HOST=elasticsearch
 ELASTICSEARCH_PORT=9200
-NEO4J_HOST=neo4j:7474
+NEO4J_HOST=http://neo4j:7474
 NEO4J_URI=bolt://neo4j
 NEO4J_USERNAME=neo4j
 NEO4J_PASSWORD=datahub
diff --git a/docker/datahub-gms/env/docker.mariadb.env b/docker/datahub-gms/env/docker.mariadb.env
index 5abd67a74f..52f8076596 100644
--- a/docker/datahub-gms/env/docker.mariadb.env
+++ b/docker/datahub-gms/env/docker.mariadb.env
@@ -7,7 +7,7 @@ KAFKA_BOOTSTRAP_SERVER=broker:29092
 KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
 ELASTICSEARCH_HOST=elasticsearch
 ELASTICSEARCH_PORT=9200
-NEO4J_HOST=neo4j:7474
+NEO4J_HOST=http://neo4j:7474
 NEO4J_URI=bolt://neo4j
 NEO4J_USERNAME=neo4j
 NEO4J_PASSWORD=datahub
diff --git a/docker/datahub-gms/env/docker.postgres.env b/docker/datahub-gms/env/docker.postgres.env
index bff43aaa01..b92fd5b9e5 100644
--- a/docker/datahub-gms/env/docker.postgres.env
+++ b/docker/datahub-gms/env/docker.postgres.env
@@ -7,7 +7,7 @@ KAFKA_BOOTSTRAP_SERVER=broker:29092
 KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
 ELASTICSEARCH_HOST=elasticsearch
 ELASTICSEARCH_PORT=9200
-NEO4J_HOST=neo4j:7474
+NEO4J_HOST=http://neo4j:7474
 NEO4J_URI=bolt://neo4j
 NEO4J_USERNAME=neo4j
 NEO4J_PASSWORD=datahub
diff --git a/docker/datahub-gms/start.sh b/docker/datahub-gms/start.sh
index 37e81941f8..51cee07907 100755
--- a/docker/datahub-gms/start.sh
+++ b/docker/datahub-gms/start.sh
@@ -1,9 +1,14 @@
 #!/bin/sh
 
+# Add default URI (http) scheme if needed
+if ! echo $NEO4J_HOST | grep -q "://" ; then
+    NEO4J_HOST="http://$NEO4J_HOST"
+fi
+
 dockerize \
   -wait tcp://$EBEAN_DATASOURCE_HOST \
   -wait tcp://$KAFKA_BOOTSTRAP_SERVER \
   -wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
-  -wait http://$NEO4J_HOST \
+  -wait $NEO4J_HOST \
   -timeout 240s \
   java -jar /jetty-runner.jar /datahub/datahub-gms/bin/war.war
\ No newline at end of file
diff --git a/docker/datahub-mae-consumer/env/docker.env b/docker/datahub-mae-consumer/env/docker.env
index 5788020a95..82c9030f1a 100644
--- a/docker/datahub-mae-consumer/env/docker.env
+++ b/docker/datahub-mae-consumer/env/docker.env
@@ -2,7 +2,7 @@ KAFKA_BOOTSTRAP_SERVER=broker:29092
 KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
 ELASTICSEARCH_HOST=elasticsearch
 ELASTICSEARCH_PORT=9200
-NEO4J_HOST=neo4j:7474
+NEO4J_HOST=http://neo4j:7474
 NEO4J_URI=bolt://neo4j
 NEO4J_USERNAME=neo4j
 NEO4J_PASSWORD=datahub
diff --git a/docker/datahub-mae-consumer/start.sh b/docker/datahub-mae-consumer/start.sh
index 4f7f2837a3..bc2e08a891 100755
--- a/docker/datahub-mae-consumer/start.sh
+++ b/docker/datahub-mae-consumer/start.sh
@@ -1,8 +1,13 @@
 #!/bin/sh
 
+# Add default URI (http) scheme if needed
+if ! echo $NEO4J_HOST | grep -q "://" ; then
+    NEO4J_HOST="http://$NEO4J_HOST"
+fi
+
 dockerize \
   -wait tcp://$KAFKA_BOOTSTRAP_SERVER \
   -wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
-  -wait http://$NEO4J_HOST \
+  -wait $NEO4J_HOST \
   -timeout 240s \
   java -jar /datahub/datahub-mae-consumer/bin/mae-consumer-job.jar
\ No newline at end of file