Merge pull request #1 from topcoder-platform/develop

Shapeup#2 v5 user fortification

Author: sachin-maheshwari

.circleci/config.yml

@@ -0,0 +1,80 @@
+version: 2
+defaults: &defaults
+    docker:
+      - image: circleci/python:2.7.18-stretch-browsers
+install_dependency: &install_dependency
+  name: Installation of build and deployment dependencies.
+  command: |
+    sudo apt install jq
+    sudo pip install awscli --upgrade
+    sudo pip install docker-compose
+install_deploysuite: &install_deploysuite
+  name: Installation of install_deploysuite.
+  command: |
+    git clone --branch v1.4.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+    cp ./../buildscript/master_deploy.sh .
+    cp ./../buildscript/buildenv.sh .
+    cp ./../buildscript/awsconfiguration.sh .
+restore_cache_settings_for_build: &restore_cache_settings_for_build
+  key: docker-node-modules-{{ checksum "package-lock.json" }}
+
+save_cache_settings: &save_cache_settings
+  key: docker-node-modules-{{ checksum "package-lock.json" }}
+  paths:
+    - node_modules
+
+builddeploy_steps: &builddeploy_steps
+      - checkout
+      - setup_remote_docker
+      - run: *install_dependency
+      - run: *install_deploysuite
+      - restore_cache: *restore_cache_settings_for_build
+      - run: ./build.sh ${APPNAME}
+      - save_cache: *save_cache_settings
+      - deploy:
+          name: Running MasterScript.
+          command: |
+            ./awsconfiguration.sh $DEPLOY_ENV
+            source awsenvconf
+            ./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}
+
+
+jobs:
+  # Build & Deploy against development backend
+  "build-dev":
+    <<: *defaults
+    environment:
+      DEPLOY_ENV: "DEV"
+      LOGICAL_ENV: "dev"
+      APPNAME: "u-bahn-backendjob"    
+    steps: *builddeploy_steps
+
+  "build-prod":
+    <<: *defaults
+    environment:
+      DEPLOY_ENV: "PROD"
+      LOGICAL_ENV: "prod"    
+      APPNAME: "u-bahn-backendjob"  
+    steps: *builddeploy_steps
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      # Development builds are executed on "develop" branch only.
+      - "build-dev":
+          context : org-global
+          filters:
+            branches:
+              only:
+                - develop
+
+      # Production builds are exectuted only on tagged commits to the
+      # master branch.
+      - "build-prod":
+          context : org-global
+          filters:
+            branches:
+              only: master

config/default.js

@@ -13,7 +13,6 @@ module.exports = {
 
   AUTH0_URL: process.env.AUTH0_URL || 'https://topcoder-dev.auth0.com/oauth/token', // Auth0 credentials
   AUTH0_AUDIENCE: process.env.AUTH0_TOPCODER_AUDIENCE || 'https://m2m.topcoder-dev.com/',
-  TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME,
   AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
   AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
   AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL,
@@ -24,6 +23,7 @@ module.exports = {
   DB_HOST: process.env.DB_HOST || 'localhost',
   DB_PORT: process.env.DB_PORT || 5432,
 
+  REDIS_URL: process.env.REDIS_URL,
   REDIS_HOST: process.env.REDIS_HOST || 'localhost',
   REDIS_PORT: parseInt(process.env.REDIS_PORT || 6379),
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,

docker/Dockerfile

@@ -2,10 +2,10 @@
 FROM node:12.16.3
 
 # Copy the current directory into the Docker image
-COPY . /ubahn-skill-processor-trigger
+COPY . /u-bahn-backendjob
 
 # Set working directory for future use
-WORKDIR /ubahn-skill-processor-trigger
+WORKDIR /u-bahn-backendjob
 
 # Install the dependencies from package.json
 RUN npm install

docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
-  ubahn-skill-processor-trigger:
-    image: ubahn-skill-processor-trigger:latest
+  u-bahn-backendjob:
+    image: u-bahn-backendjob:latest
     build:
       context: ../
       dockerfile: docker/Dockerfile

src/app.js

@@ -14,9 +14,17 @@ const User = sequelize.models.User
 /**
  * Send user skill event
  */
-async function main () {
+async function main() {
+  const redis_url = config.REDIS_URL
   let offset = config.USER_RECORD_OFFSET
-  const client = redis.createClient({ host: config.REDIS_HOST, port: config.REDIS_PORT, password: config.REDIS_PASSWORD, user: config.REDIS_USER })
+  let client
+
+  if (redis_url) {
+    client = redis.createClient(redis_url)
+  } else {
+    client = redis.createClient({ host: config.REDIS_HOST, port: config.REDIS_PORT, password: config.REDIS_PASSWORD, user: config.REDIS_USER })
+  }
+
   const offsetFromRedis = await promisify(client.get).bind(client)(config.OFFSET_REDIS_KEY)
   if (offsetFromRedis) {
     offset = offsetFromRedis

src/common/helper.js

@@ -5,7 +5,7 @@ const _ = require('lodash')
 const config = require('config')
 const logger = require('./logger')
 const busApi = require('tc-bus-api-wrapper')
-const busApiClient = busApi(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME', 'AUTH0_CLIENT_ID',
+const busApiClient = busApi(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'AUTH0_CLIENT_ID',
   'AUTH0_CLIENT_SECRET', 'BUSAPI_URL', 'KAFKA_ERROR_TOPIC', 'AUTH0_PROXY_SERVER_URL']))
 
 /**