From 87fae5ba82c96d588172903d4ed9965df8a4fb11 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:05:02 +0530
Subject: [PATCH 01/19] Update Dockerfile

[skip ci]
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b4a2d28..047633a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,4 +10,4 @@ COPY . .
 RUN npm install
 RUN npm install dotenv --save
 RUN npm test
-CMD ["npm", "start"]
+ENTRYPOINT ["npm"]

From 96374c8cf83fbdd9b010979023875521bbaacbcd Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:08:05 +0530
Subject: [PATCH 02/19] Update Dockerfile

[skip ci]
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 047633a..b4a2d28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,4 +10,4 @@ COPY . .
 RUN npm install
 RUN npm install dotenv --save
 RUN npm test
-ENTRYPOINT ["npm"]
+CMD ["npm", "start"]

From 9c9d8b7b3a1b664541f4e903583b7b5d9e7b7d3a Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:37:38 +0530
Subject: [PATCH 03/19] Update build.sh

[skip ci]
---
 build.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index 4a6e7b9..02db09e 100755
--- a/build.sh
+++ b/build.sh
@@ -5,17 +5,17 @@ set -eo pipefail
 # This script expects a single argument: NODE_ENV, which must be either
 # "development" or "production".
 
-NODE_ENV=$1
+# NODE_ENV=$1
 
-ENV=$1
-AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
-AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
-AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
-AWS_ACCOUNT_ID=$(eval "echo \$${ENV}_AWS_ACCOUNT_ID")
-AWS_REPOSITORY=$(eval "echo \$${ENV}_AWS_REPOSITORY") 
-
-TAG=$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/tc-notifications:$CIRCLE_SHA1
+#ENV=$1
+#AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
+#AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
+#AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
+#AWS_ACCOUNT_ID=$(eval "echo \$${ENV}_AWS_ACCOUNT_ID")
+#AWS_REPOSITORY=$(eval "echo \$${ENV}_AWS_REPOSITORY") 
 
+#TAG=$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/tc-notifications:$CIRCLE_SHA1
+TAG="tc-notifications:latest"
 docker build -t $TAG .
 
 # Copies "node_modules" from the created image, if necessary for caching.

From 83a55cc717f15f94431e9546e48b59fb7604e054 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:38:24 +0530
Subject: [PATCH 04/19] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b4a2d28..047633a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,4 +10,4 @@ COPY . .
 RUN npm install
 RUN npm install dotenv --save
 RUN npm test
-CMD ["npm", "start"]
+ENTRYPOINT ["npm"]

From b70f000fc41ffeff3da4d0500722daca4a0942f1 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Fri, 22 Mar 2019 18:13:42 +0530
Subject: [PATCH 05/19] Update config.yml

[skip ci]
---
 .circleci/config.yml | 132 +++++++++++++++++++++++--------------------
 1 file changed, 70 insertions(+), 62 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 51fe260..5bb0a22 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,89 +1,97 @@
-version: 2
 
-jobs:
-  # Build & Deploy against development backend rer
-  "build-dev":
+version: 2
+defaults: &defaults
     docker:
       - image: docker:17.06.1-ce-git
-    steps:
-      # Initialization.
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Installation of build dependencies.
-          command: apk add --no-cache bash
+install_dependency: &install_dependency
+          name: Installation of build and deployment dependencies.
+          command: |
+            apk update
+            apk add --no-cache bash curl
+            apk upgrade
+            apk add --no-cache jq py-pip sudo
+            sudo pip install awscli --upgrade
+install_deploysuite: &install_deploysuite
+          name: Installation of install_deploysuite.
+          command: |
+            git clone --branch v1.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-tc-notify-{{ checksum "package-lock.json" }}
 
-      # Restoration of node_modules from cache.
-      - restore_cache:
-          key: docker-tc-notify-{{ checksum "package-lock.json" }}
+save_cache_settings: &save_cache_settings
+  key: docker-tc-notify-{{ checksum "package-lock.json" }}
+  paths:
+    - node_modules
 
-      # Build of Docker image.
-      - run:
+run_build: &run_build
           name: Build of Docker image
-          command: ./build.sh DEV
+          command: ./build.sh
 
-      # Caching node modules.
-      - save_cache:
-          key: docker-tc-notify-{{ checksum "package-lock.json" }}
-          paths:
-            - node_modules
-
-      # Deployment.
-      - run:
-          name: Installing AWS client
-          command: |
-            apk add --no-cache jq py-pip sudo
-            sudo pip install awscli --upgrade
 
+jobs:
+  # Build & Deploy against development backend rer
+  "build-dev":
+    <<: *defaults
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: *install_dependency
+      - run: *install_deploysuite
+      - restore_cache: *restore_cache_settings_for_build
+      - run: *run_build
+      - save_cache: *save_cache_settings
       - deploy:
-          command: ./deploy.sh DEV $CIRCLE_SHA1
+          name: Running Masterscript - deploy tc-notifications-api service
+          command: |    
+            ./awsconfiguration.sh DEV
+            source awsenvconf
+            ./buildenv.sh -e DEV -b dev-tc-notifications-deployvar
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,dev-tc-notifications-appvar -i tc-notifications  
+      - deploy:
+          name: Running Masterscript - deploy tc-notifications-consumers service
+          command: |
+            if [ -e dev-tc-notifications-deployvar.json ]; then
+              sudo rm -vf dev-tc-notifications-deployvar.json
+            fi
+            ./buildenv.sh -e DEV -b dev-tc-notifications-consumers-deployvar
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,dev-tc-notifications-appvar -i tc-notifications      
 
   "build-prod":
-    docker:
-      - image: docker:17.06.1-ce-git
+    <<: *defaults
     steps:
-      # Initialization.
       - checkout
       - setup_remote_docker
-      - run:
-          name: Installation of build dependencies.
-          command: apk add --no-cache bash
-
-      # Restoration of node_modules from cache.
-      - restore_cache:
-          key: docker-tc-notify-{{ checksum "package-lock.json" }}
-
-      # Build of Docker image.
-      - run:
-          name: Build of Docker image
-          command: ./build.sh PROD
-
-      # Caching node modules.
-      - save_cache:
-          key: docker-tc-notify-{{ checksum "package-lock.json" }}
-          paths:
-            - node_modules
-
-      # Deployment.
-      - run:
-          name: Installing AWS client
-          command: |
-            apk add --no-cache jq py-pip sudo
-            sudo pip install awscli --upgrade
-
+      - run: *install_dependency
+      - run: *install_deploysuite
+      - restore_cache: *restore_cache_settings_for_build
+      - run: *run_build
+      - save_cache: *save_cache_settings
       - deploy:
-          command: ./deploy.sh PROD $CIRCLE_SHA1
-
+          command: |
+            ./awsconfiguration.sh PROD
+            source awsenvconf
+            ./buildenv.sh -e PROD -b prod-tc-notifications-deployvar
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,prod-tc-notifications-appvar -i tc-notifications
+            
 workflows:
   version: 2
   build:
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":
+          context : org-global
           filters:
             branches:
-              only: [dev]
+              only: ['dev']
       - "build-prod":
+          context : org-global
           filters:
             branches:
               only: master

From 1590a0746f02d0858c2ff8e977abf282b85e7b24 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 11:08:18 +0530
Subject: [PATCH 06/19] Update config.yml

[skip ci]
---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5bb0a22..cf4a76b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,9 +55,7 @@ jobs:
       - deploy:
           name: Running Masterscript - deploy tc-notifications-consumers service
           command: |
-            if [ -e dev-tc-notifications-deployvar.json ]; then
-              sudo rm -vf dev-tc-notifications-deployvar.json
-            fi
+            if [ -e dev-tc-notifications-deployvar.json ]; then  sudo rm -vf dev-tc-notifications-deployvar.json fi
             ./buildenv.sh -e DEV -b dev-tc-notifications-consumers-deployvar
             source buildenvvar
             ./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,dev-tc-notifications-appvar -i tc-notifications      

From 88e679e89ae86a2591725df06d180f7a900d1e78 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 11:53:27 +0530
Subject: [PATCH 07/19] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cf4a76b..8fa7f6f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -87,7 +87,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ['dev']
+              only: ['dev', 'dev_msstsv1.3']
       - "build-prod":
           context : org-global
           filters:

From a5b0f83a3c4c0037189ff020ead72cbcd50c4e92 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 12:55:25 +0530
Subject: [PATCH 08/19] Update Dockerfile

[skip ci]
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 047633a..5fea286 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,4 +10,4 @@ COPY . .
 RUN npm install
 RUN npm install dotenv --save
 RUN npm test
-ENTRYPOINT ["npm"]
+ENTRYPOINT ["npm","run"]

From a35874d2620554846cf2504083d4588b67a9e10f Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 12:58:17 +0530
Subject: [PATCH 09/19] Update config.yml

---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8fa7f6f..8b6087f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,9 +52,7 @@ jobs:
             ./buildenv.sh -e DEV -b dev-tc-notifications-deployvar
             source buildenvvar
             ./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,dev-tc-notifications-appvar -i tc-notifications  
-      - deploy:
-          name: Running Masterscript - deploy tc-notifications-consumers service
-          command: |
+            echo "Running Masterscript - deploy tc-notifications-consumers service"
             if [ -e dev-tc-notifications-deployvar.json ]; then  sudo rm -vf dev-tc-notifications-deployvar.json fi
             ./buildenv.sh -e DEV -b dev-tc-notifications-consumers-deployvar
             source buildenvvar

From 23b36af65035ddd5576ba983efc1867a5493fed1 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 14:02:20 +0530
Subject: [PATCH 10/19] Update Dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5fea286..52f64b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,4 +10,5 @@ COPY . .
 RUN npm install
 RUN npm install dotenv --save
 RUN npm test
-ENTRYPOINT ["npm","run"]
+#ENTRYPOINT ["npm","run"]
+CMD ["npm", "start"]

From 837aef63a984096c2364958abcfd7bf4833aa72f Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 14:07:14 +0530
Subject: [PATCH 11/19] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 52f64b3..cf1ff08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,5 +10,5 @@ COPY . .
 RUN npm install
 RUN npm install dotenv --save
 RUN npm test
-#ENTRYPOINT ["npm","run"]
-CMD ["npm", "start"]
+ENTRYPOINT ["npm","run"]
+#CMD ["npm", "start"]

From 5c8097b3a3240997364a8baa42258bd821e310b2 Mon Sep 17 00:00:00 2001
From: sachin-maheshwari <sachin.maheshwari@topcoder.com>
Date: Mon, 25 Mar 2019 14:27:52 +0530
Subject: [PATCH 12/19] Update default.js

---
 config/default.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.js b/config/default.js
index 9d83724..d736ec7 100644
--- a/config/default.js
+++ b/config/default.js
@@ -18,7 +18,7 @@ module.exports = {
   },
 
   AUTH_SECRET: process.env.authSecret,
-  VALID_ISSUERS: process.env.validIssuers ? process.env.validIssuers.replace(/\\"/g, '') : null,
+  VALID_ISSUERS: process.env.VALID_ISSUERS ? process.env.VALID_ISSUERS.replace(/\\"/g, '') : null,
   // keep it here for dev purposes, it's only needed by modified version of tc-core-library-js
   // which skips token validation when locally deployed
 

From 896ebb5bbc0fc5af96fa103fdf812ccf52b48a31 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 14:33:32 +0530
Subject: [PATCH 13/19] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b6087f..f20ec4a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ jobs:
             source buildenvvar
             ./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,dev-tc-notifications-appvar -i tc-notifications  
             echo "Running Masterscript - deploy tc-notifications-consumers service"
-            if [ -e dev-tc-notifications-deployvar.json ]; then  sudo rm -vf dev-tc-notifications-deployvar.json fi
+            if [ -e dev-tc-notifications-deployvar.json ]; then  sudo rm -vf dev-tc-notifications-deployvar.json; fi
             ./buildenv.sh -e DEV -b dev-tc-notifications-consumers-deployvar
             source buildenvvar
             ./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,dev-tc-notifications-appvar -i tc-notifications      

From fdc6e422cae97aaf9124738557ff4ed497dadecc Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 14:53:22 +0530
Subject: [PATCH 14/19] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f20ec4a..dc3ce42 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
           name: Installation of install_deploysuite.
           command: |
-            git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript    
+            git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript    
             cp ./../buildscript/master_deploy.sh .
             cp ./../buildscript/buildenv.sh .
             cp ./../buildscript/awsconfiguration.sh .

From 000d82378a727524b0dcddff1258eac8456f9521 Mon Sep 17 00:00:00 2001
From: Sachin Maheshwari <sachin.maheshwari@topcoder.com>
Date: Mon, 25 Mar 2019 17:22:48 +0530
Subject: [PATCH 15/19] adding health endpoint for processor service

---
 package.json |  3 ++-
 src/app.js   | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index be1646f..ab609c5 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,8 @@
     "sequelize": "^4.21.0",
     "superagent": "^3.8.0",
     "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6",
-    "winston": "^2.2.0"
+    "winston": "^2.2.0",
+    "topcoder-healthcheck-dropin": "^1.0.3"
   },
   "engines": {
     "node": "6.x"
diff --git a/src/app.js b/src/app.js
index e2e6d0e..3ee3e4a 100644
--- a/src/app.js
+++ b/src/app.js
@@ -15,6 +15,7 @@ const logger = require('./common/logger');
 const errors = require('./common/errors');
 const models = require('./models');
 const Kafka = require('no-kafka');
+const healthcheck = require('topcoder-healthcheck-dropin')
 
 /**
  * Start Kafka consumer for event bus events.
@@ -74,11 +75,25 @@ function startKafkaConsumer(handlers, notificationServiceHandlers) {
       });
   });
 
+  const check = function () {
+    if (!consumer.client.initialBrokers && !consumer.client.initialBrokers.length) {
+      return false
+    }
+    let connected = true
+    consumer.client.initialBrokers.forEach(conn => {
+      logger.debug(`url ${conn.server()} - connected=${conn.connected}`)
+      connected = conn.connected & connected
+    })
+    return connected
+  }
 
   consumer
     .init()
-    .then(() => _.each(_.keys(handlers),
-      (topicName) => consumer.subscribe(topicName, dataHandler)))
+    .then(() => {
+      _.each(_.keys(handlers),
+        (topicName) => consumer.subscribe(topicName, dataHandler))
+      healthcheck.init([check])
+    })
     .catch((err) => {
       logger.error('Kafka Consumer failed');
       logger.error(err);

From 234c09026dff014fb26688d9590402a92e8ca9aa Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 19:09:42 +0530
Subject: [PATCH 16/19] Update config.yml

[skip ci]
---
 .circleci/config.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc3ce42..99f5907 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,6 +14,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
           name: Installation of install_deploysuite.
           command: |
+            #change back to v1.3 or latest once counter var is generalized.
             git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript    
             cp ./../buildscript/master_deploy.sh .
             cp ./../buildscript/buildenv.sh .
@@ -69,12 +70,18 @@ jobs:
       - run: *run_build
       - save_cache: *save_cache_settings
       - deploy:
+          name: Running Masterscript - prod deploy tc-notifications-api service
           command: |
             ./awsconfiguration.sh PROD
             source awsenvconf
             ./buildenv.sh -e PROD -b prod-tc-notifications-deployvar
             source buildenvvar
-            ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,prod-tc-notifications-appvar -i tc-notifications
+            ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,prod-tc-notifications-appvar -i tc-notifications  
+            echo "========== Running Masterscript - prod deploy tc-notifications-consumers service ========="
+            if [ -e prod-tc-notifications-deployvar.json ]; then  sudo rm -vf dev-tc-notifications-deployvar.json; fi
+            ./buildenv.sh -e PROD -b prod-tc-notifications-consumers-deployvar
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,prod-tc-notifications-appvar -i tc-notifications      
             
 workflows:
   version: 2
@@ -85,7 +92,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ['dev', 'dev_msstsv1.3']
+              only: ['dev']
       - "build-prod":
           context : org-global
           filters:

From b0e91ee48df1606f1605e85143539c38b05d8ce3 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 19:10:55 +0530
Subject: [PATCH 17/19] Update config.yml

[skip ci]
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 99f5907..16581d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,8 +13,8 @@ install_dependency: &install_dependency
             sudo pip install awscli --upgrade
 install_deploysuite: &install_deploysuite
           name: Installation of install_deploysuite.
+          #Git Clone -change back to v1.3 or latest once counter var is generalized.
           command: |
-            #change back to v1.3 or latest once counter var is generalized.
             git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript    
             cp ./../buildscript/master_deploy.sh .
             cp ./../buildscript/buildenv.sh .

From 73bdcb8d67c79938bc3f38de10cd3b27dd4577e0 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Mon, 25 Mar 2019 19:13:57 +0530
Subject: [PATCH 18/19] update prod workflow section

[skip ci]
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16581d8..2f6e7fe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -78,7 +78,7 @@ jobs:
             source buildenvvar
             ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,prod-tc-notifications-appvar -i tc-notifications  
             echo "========== Running Masterscript - prod deploy tc-notifications-consumers service ========="
-            if [ -e prod-tc-notifications-deployvar.json ]; then  sudo rm -vf dev-tc-notifications-deployvar.json; fi
+            if [ -e prod-tc-notifications-deployvar.json ]; then  sudo rm -vf prod-tc-notifications-deployvar.json; fi
             ./buildenv.sh -e PROD -b prod-tc-notifications-consumers-deployvar
             source buildenvvar
             ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,prod-tc-notifications-appvar -i tc-notifications      

From 97949f461eeaf9593b22d05da5a02e08c35eee04 Mon Sep 17 00:00:00 2001
From: sachin-maheshwari <sachin.maheshwari@topcoder.com>
Date: Thu, 28 Mar 2019 10:50:55 +0530
Subject: [PATCH 19/19] Update default.js

---
 config/default.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.js b/config/default.js
index d736ec7..1a1b895 100644
--- a/config/default.js
+++ b/config/default.js
@@ -17,7 +17,7 @@ module.exports = {
     },
   },
 
-  AUTH_SECRET: process.env.authSecret,
+  AUTH_SECRET: process.env.AUTH_SECRET,
   VALID_ISSUERS: process.env.VALID_ISSUERS ? process.env.VALID_ISSUERS.replace(/\\"/g, '') : null,
   // keep it here for dev purposes, it's only needed by modified version of tc-core-library-js
   // which skips token validation when locally deployed