From 89ca2d57270e171732495db6be075ab4604a3028 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Thu, 5 Apr 2018 11:44:52 +0530 Subject: [PATCH 1/5] changes for versioning v5. --- .circleci/config.yml | 2 +- config/default.js | 1 + deploy.sh | 12 +++++++++--- src/app.js | 2 +- src/routes.js | 10 +++++----- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eed75ca..a1a0673 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,7 +82,7 @@ workflows: - "build-dev": filters: branches: - only: dev + only: "feature/v5-support" - "build-prod": filters: branches: diff --git a/config/default.js b/config/default.js index 7462e9b..3ab7a2b 100644 --- a/config/default.js +++ b/config/default.js @@ -27,4 +27,5 @@ module.exports = { KAFKA_CLIENT_CERT: process.env.KAFKA_CLIENT_CERT ? process.env.KAFKA_CLIENT_CERT.replace('\\n', '\n') : null, KAFKA_CLIENT_CERT_KEY: process.env.KAFKA_CLIENT_CERT_KEY ? process.env.KAFKA_CLIENT_CERT_KEY.replace('\\n', '\n') : null, + API_CONTEXT_PATH: process.env.API_CONTEXT_PATH || '/v5/notifications', }; diff --git a/deploy.sh b/deploy.sh index 6cef86e..967c0b6 100755 --- a/deploy.sh +++ b/deploy.sh @@ -58,6 +58,8 @@ DATABASE_URL=postgres://$DB_USER:$DB_PASSWORD@$DB_HOST:$DB_PORT/$DB_DATABASE; family=$(eval "echo \$${ENV}_AWS_ECS_TASK_FAMILY") AWS_ECS_CONTAINER_NAME=$(eval "echo \$${ENV}_AWS_ECS_CONTAINER_NAME") +API_CONTEXT_PATH=$(eval "echo \$${ENV}_API_CONTEXT_PATH") + echo $APP_NAME configure_aws_cli() { @@ -172,6 +174,10 @@ make_task_def(){ { "name": "PORT", "value": "%s" + }, + { + "name": "API_CONTEXT_PATH", + "value": "%s" } ], "portMappings": [ @@ -192,7 +198,7 @@ make_task_def(){ } ]' - task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID "$KAFKA_TOPIC_IGNORE_PREFIX" $KAFKA_URL $DATABASE_URL $AUTHSECRET "$AUTHDOMAIN" "$JWKSURI" $TC_API_BASE_URL $TC_API_V3_BASE_URL $TC_API_V4_BASE_URL $TC_ADMIN_TOKEN $LOG_LEVEL $VALID_ISSUERS $PORT $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV) + task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID "$KAFKA_TOPIC_IGNORE_PREFIX" $KAFKA_URL $DATABASE_URL $AUTHSECRET "$AUTHDOMAIN" "$JWKSURI" $TC_API_BASE_URL $TC_API_V3_BASE_URL $TC_API_V4_BASE_URL $TC_ADMIN_TOKEN $LOG_LEVEL $VALID_ISSUERS $PORT "$API_CONTEXT_PATH" $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV) } register_definition() { @@ -226,5 +232,5 @@ check_service_status() { configure_aws_cli push_ecr_image -deploy_cluster -check_service_status +#deploy_cluster +#check_service_status diff --git a/src/app.js b/src/app.js index 798f456..3dd02d9 100644 --- a/src/app.js +++ b/src/app.js @@ -112,7 +112,7 @@ function start(handlers) { }); }); - app.use('/', apiRouter); + app.use(config.API_CONTEXT_PATH, apiRouter); app.use((req, res) => { diff --git a/src/routes.js b/src/routes.js index c8be007..3b3005d 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1,31 +1,31 @@ 'use strict'; module.exports = { - '/notifications': { + '/': { get: { controller: 'NotificationController', method: 'listNotifications', }, }, - '/notifications/:id/read': { + '/:id/read': { put: { controller: 'NotificationController', method: 'markAsRead', }, }, - '/notifications/read': { + '/read': { put: { controller: 'NotificationController', method: 'markAllRead', }, }, - '/notifications/:id/seen': { + '/:id/seen': { put: { controller: 'NotificationController', method: 'markAsSeen', }, }, - '/notificationsettings': { + '/settings': { get: { controller: 'NotificationController', method: 'getSettings', From 88e456c09f2ac219cbeb64bca755ca85fdbbf287 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Thu, 5 Apr 2018 11:49:53 +0530 Subject: [PATCH 2/5] reverting testing changes in deployment script. --- .circleci/config.yml | 2 +- deploy.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1a0673..eed75ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,7 +82,7 @@ workflows: - "build-dev": filters: branches: - only: "feature/v5-support" + only: dev - "build-prod": filters: branches: diff --git a/deploy.sh b/deploy.sh index 967c0b6..7a2dad5 100755 --- a/deploy.sh +++ b/deploy.sh @@ -232,5 +232,5 @@ check_service_status() { configure_aws_cli push_ecr_image -#deploy_cluster -#check_service_status +deploy_cluster +check_service_status From 5c474110ee7e46f70bb1499d9b4854535528ff4d Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Thu, 5 Apr 2018 13:09:30 +0530 Subject: [PATCH 3/5] added prefix 'list' in an endpoint to support 'tyk'. Also changes in deployment script for testing. --- .circleci/config.yml | 2 +- deploy.sh | 4 ++-- src/app.js | 2 +- src/routes.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eed75ca..a1a0673 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,7 +82,7 @@ workflows: - "build-dev": filters: branches: - only: dev + only: "feature/v5-support" - "build-prod": filters: branches: diff --git a/deploy.sh b/deploy.sh index 7a2dad5..967c0b6 100755 --- a/deploy.sh +++ b/deploy.sh @@ -232,5 +232,5 @@ check_service_status() { configure_aws_cli push_ecr_image -deploy_cluster -check_service_status +#deploy_cluster +#check_service_status diff --git a/src/app.js b/src/app.js index 3dd02d9..db08440 100644 --- a/src/app.js +++ b/src/app.js @@ -150,7 +150,7 @@ function start(handlers) { logger.info(`Express server listening on port ${app.get('port')}`); }); - startKafkaConsumer(handlers); + //startKafkaConsumer(handlers); }) .catch((err) => logger.error(err)); } diff --git a/src/routes.js b/src/routes.js index 3b3005d..15d287d 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1,7 +1,7 @@ 'use strict'; module.exports = { - '/': { + '/list': { get: { controller: 'NotificationController', method: 'listNotifications', From a8ad08d972be639b4751e34c757a0a950455cf56 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Thu, 5 Apr 2018 13:26:53 +0530 Subject: [PATCH 4/5] reverting testing changes from deployment script. --- .circleci/config.yml | 2 +- deploy.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1a0673..eed75ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,7 +82,7 @@ workflows: - "build-dev": filters: branches: - only: "feature/v5-support" + only: dev - "build-prod": filters: branches: diff --git a/deploy.sh b/deploy.sh index 967c0b6..7a2dad5 100755 --- a/deploy.sh +++ b/deploy.sh @@ -232,5 +232,5 @@ check_service_status() { configure_aws_cli push_ecr_image -#deploy_cluster -#check_service_status +deploy_cluster +check_service_status From c2c9105e51e2cf500e92c022a05b91423a0913d8 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Thu, 5 Apr 2018 17:16:11 +0530 Subject: [PATCH 5/5] reverting testing step. --- src/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index db08440..3dd02d9 100644 --- a/src/app.js +++ b/src/app.js @@ -150,7 +150,7 @@ function start(handlers) { logger.info(`Express server listening on port ${app.get('port')}`); }); - //startKafkaConsumer(handlers); + startKafkaConsumer(handlers); }) .catch((err) => logger.error(err)); }