Merge branch 'develop' into feature/restful-invites

Author: maxceem

.circleci/config.yml

@@ -32,6 +32,12 @@ deploy_steps: &deploy_steps
         ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
         source buildenvvar
         ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
+        
+         echo "======= Running Masterscript - deploy projects-api-consumers ==========="
+        if [ -e ${LOGICAL_ENV}-${APPNAME}-appvar.json ]; then  sudo rm -vf ${LOGICAL_ENV}-${APPNAME}-appvar.json; fi
+        ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumers-deployvar
+        source buildenvvar
+        ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
 
 jobs:
   test:

config/custom-environment-variables.json

@@ -58,7 +58,7 @@
   "lookerConfig": {
     "EMBED_KEY": "LOOKER_EMBED_KEY",
     "LOOKER_HOST": "LOOKER_HOST",
-    "SESSION_LENGTH": "SESSION_LENGTH",
+    "SESSION_LENGTH": "LOOKER_SESSION_LENGTH",
     "BASE_URL": "LOOKER_API_BASE_URL",
     "CLIENT_ID": "LOOKER_API_CLIENT_ID",
     "CLIENT_SECRET": "LOOKER_API_CLIENT_SECRET",

config/default.json

@@ -36,7 +36,7 @@
     "idleTimeout": 1000
   },
   "kafkaConfig": {
-    "hosts": "localhost:9092"
+    "url": "localhost:9092"
   },
   "analyticsKey": "",
   "VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
@@ -63,7 +63,7 @@
   "lookerConfig": {
     "EMBED_KEY": "FAKE_KEY",
     "LOOKER_HOST": "demo.looker.com",
-    "SESSION_LENGTH": 86400,
+    "SESSION_LENGTH": 120,
     "BASE_URL": "",
     "CLIENT_ID": "",
     "CLIENT_SECRET": "",