Merge pull request #489 from topcoder-platform/develop

Production Release 2.6 & 2.7

Author: vikasrohit

.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:

.gitignore

@@ -47,3 +47,6 @@ jspm_packages
 !.elasticbeanstalk/*.global.yml
 .DS_Store
 .idea
+
+# Report which might be generated using `scripts/es-db-compare` script
+report.html

README.md

@@ -56,15 +56,20 @@
   "pageSize": "PAGE_SIZE",
   "SSO_REFCODES": "SSO_REFCODES",
   "lookerConfig": {
+    "EMBED_KEY": "LOOKER_EMBED_KEY",
+    "LOOKER_HOST": "LOOKER_HOST",
+    "SESSION_LENGTH": "LOOKER_SESSION_LENGTH",
     "BASE_URL": "LOOKER_API_BASE_URL",
     "CLIENT_ID": "LOOKER_API_CLIENT_ID",
     "CLIENT_SECRET": "LOOKER_API_CLIENT_SECRET",
     "TOKEN": "TOKEN",
-    "USE_MOCK": "LOOKER_API_ENABLE_MOCK",
+    "USE_MOCK": "ENABLE_MOCK_REPORTS",
     "QUERIES": {
       "REG_STATS": "LOOKER_API_REG_STATS_QUERY_ID",
       "BUDGET": "LOOKER_API_BUDGET_QUERY_ID"
-    }
+    },
+    "EMBED_REPORTS_MAPPING": "EMBED_REPORTS_MAPPING",
+    "ALLOWED_USERS": "REPORTS_ALLOWED_USERS"
   },
   "DEFAULT_M2M_USERID": "DEFAULT_M2M_USERID"
 }

config/custom-environment-variables.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\"]",
@@ -61,6 +61,9 @@
   "VALID_STATUSES_BEFORE_PAUSED": "[\"active\"]",
   "SSO_REFCODES": "[]",
   "lookerConfig": {
+    "EMBED_KEY": "FAKE_KEY",
+    "LOOKER_HOST": "demo.looker.com",
+    "SESSION_LENGTH": 120,
     "BASE_URL": "",
     "CLIENT_ID": "",
     "CLIENT_SECRET": "",
@@ -69,7 +72,9 @@
     "QUERIES": {
       "REG_STATS": 1234,
       "BUDGET": 123
-    }
+    },
+    "EMBED_REPORTS_MAPPING": "{\"mock\": \"/embed/looks/2\"}",
+    "ALLOWED_USERS": "[]"
   },
   "DEFAULT_M2M_USERID": -101
 }

config/default.json

@@ -17,7 +17,7 @@
     "rabbitmqUrl": "amqp://localhost:5672",
     "connectProjectsUrl": "https://local.topcoder-dev.com/projects/",
     "dbConfig": {
-        "masterUrl": "postgres://coder:mysecretpassword@localhost:5433/projectsdb_test",
+        "masterUrl": "postgres://coder:mysecretpassword@localhost:5432/projectsdb_test",
         "maxPoolSize": 50,
         "minPoolSize": 4,
         "idleTimeout": 1000