fix(env): provide default for unset telemetry variable (#4937)

datahub-project · May 18, 2022 · bb341f7 · bb341f7
1 parent 7b1cf6f
commit bb341f7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 13 deletions.
diff --git a/docker/docker-compose-without-neo4j.override.yml b/docker/docker-compose-without-neo4j.override.yml
@@ -27,8 +27,7 @@ services:
   datahub-gms:
     env_file: datahub-gms/env/docker-without-neo4j.env
     environment:
-      - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED}
-      - DATAHUB_FOLDER_PATH=/etc/datahub
+      - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED:-true}
     depends_on:
       - mysql
     volumes:

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
@@ -39,8 +39,7 @@ services:
         APP_ENV: dev
     environment:
       - SKIP_ELASTICSEARCH_CHECK=false
-      - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED}
-      - DATAHUB_FOLDER_PATH=/etc/datahub
+      - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED:-true}
     volumes:
       - ./datahub-gms/start.sh:/datahub/datahub-gms/scripts/start.sh
       - ./datahub-gms/jetty.xml:/datahub/datahub-gms/scripts/jetty.xml

diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
@@ -30,8 +30,7 @@ services:
     depends_on:
       - mysql
     environment:
-      - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED}
-      - DATAHUB_FOLDER_PATH=/etc/datahub
+      - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED:-true}
     volumes:
       - ${HOME}/.datahub/plugins/:/etc/datahub/plugins
 

diff --git a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
@@ -78,8 +78,7 @@ services:
     - ENTITY_REGISTRY_CONFIG_PATH=/datahub/datahub-gms/resources/entity-registry.yml
     - MAE_CONSUMER_ENABLED=true
     - MCE_CONSUMER_ENABLED=true
-    - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED}
-    - DATAHUB_FOLDER_PATH=/etc/datahub
+    - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED:-true}
     - PE_CONSUMER_ENABLED=true
     hostname: datahub-gms
     image: linkedin/datahub-gms:${DATAHUB_VERSION:-head}

diff --git a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
@@ -63,8 +63,7 @@ services:
     depends_on:
     - mysql
     environment:
-    - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED}
-    - DATAHUB_FOLDER_PATH=/etc/datahub
+    - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED:-true}
     - DATASET_ENABLE_SCSI=false
     - EBEAN_DATASOURCE_USERNAME=datahub
     - EBEAN_DATASOURCE_PASSWORD=datahub

diff --git a/docker/quickstart/docker-compose.quickstart.yml b/docker/quickstart/docker-compose.quickstart.yml
@@ -65,8 +65,7 @@ services:
     depends_on:
     - mysql
     environment:
-    - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED}
-    - DATAHUB_FOLDER_PATH=/etc/datahub
+    - DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED:-true}
     - DATASET_ENABLE_SCSI=false
     - EBEAN_DATASOURCE_USERNAME=datahub
     - EBEAN_DATASOURCE_PASSWORD=datahub

diff --git a/smoke-test/smoke.sh b/smoke-test/smoke.sh
@@ -20,7 +20,7 @@ pip install --upgrade pip wheel setuptools
 pip install -r requirements.txt
 
 echo "DATAHUB_VERSION = $DATAHUB_VERSION"
-datahub docker quickstart --dump-logs-on-failure
+datahub docker quickstart --quickstart-compose-file ../docker/quickstart/docker-compose-without-neo4j.quickstart.yml --dump-logs-on-failure
 
 (cd tests/cypress ; yarn install)