Skip to content

Commit 149952c

Browse files
Merge pull request #5 from topcoder-platform/dev
[skip ci] merge into master from Dev
2 parents d85dcf4 + f4356e1 commit 149952c

12 files changed

+760
-54
lines changed

.circleci/config.yml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,22 @@ build_steps: &build_steps
4141
command: |
4242
./awsconfiguration.sh ${DEPLOY_ENV}
4343
source awsenvconf
44-
./buildenv.sh -e ${DEPLOY_ENV} -b ${LOGICAL_ENV}-${APP_NAME}-consumer-deployvar
44+
45+
./buildenv.sh -e ${DEPLOY_ENV} -b ${LOGICAL_ENV}-${APP_NAME}-consumer-deployvar
4546
source buildenvvar
4647
./master_deploy.sh -d ECS -e ${DEPLOY_ENV} -t latest -s ${GLOBAL_ENV}-global-appvar,${LOGICAL_ENV}-${APP_NAME}-appvar -i postgres-ifx-processer
47-
48+
4849
echo "Running Masterscript - deploy postgres-ifx-processer producer"
4950
if [ -e ${LOGICAL_ENV}-${APP_NAME}-consumer-deployvar.json ]; then sudo rm -vf ${LOGICAL_ENV}-${APP_NAME}-consumer-deployvar.json; fi
5051
./buildenv.sh -e ${DEPLOY_ENV} -b ${LOGICAL_ENV}-${APP_NAME}-producer-deployvar
5152
source buildenvvar
5253
./master_deploy.sh -d ECS -e ${DEPLOY_ENV} -t latest -s ${GLOBAL_ENV}-global-appvar,${LOGICAL_ENV}-${APP_NAME}-appvar -i postgres-ifx-processer
53-
54+
55+
echo "Running Masterscript - deploy postgres-ifx-processer producer_dd"
56+
if [ -e ${LOGICAL_ENV}-${APP_NAME}-producer-deployvar.json ]; then sudo rm -vf ${LOGICAL_ENV}-${APP_NAME}-producer-deployvar.json; fi
57+
./buildenv.sh -e ${DEPLOY_ENV} -b ${LOGICAL_ENV}-${APP_NAME}-producer_dd-deployvar
58+
source buildenvvar
59+
./master_deploy.sh -d ECS -e ${DEPLOY_ENV} -t latest -s ${GLOBAL_ENV}-global-appvar,${LOGICAL_ENV}-${APP_NAME}-appvar -i postgres-ifx-processer
5460
jobs:
5561
# Build & Deploy against development backend #
5662
"build-dev":
@@ -61,7 +67,16 @@ jobs:
6167
GLOBAL_ENV: "dev"
6268
APP_NAME: "postgres-ifx-processer"
6369
steps: *build_steps
64-
# Build & Deploy against production backend
70+
# Build & Deploy against development backend #
71+
"build-test":
72+
<<: *defaults
73+
environment:
74+
DEPLOY_ENV: "DEV"
75+
LOGICAL_ENV: "TEST"
76+
GLOBAL_ENV: "dev"
77+
APP_NAME: "postgres-ifx-processer"
78+
steps: *build_steps
79+
# Build & Deploy against production backend
6580
"build-prod":
6681
<<: *defaults
6782
environment:
@@ -82,10 +97,16 @@ workflows:
8297
only:
8398
- dev
8499
- dev-retryfeature
100+
- "build-test":
101+
context : org-global
102+
filters:
103+
branches:
104+
only:
105+
- dev-test-pg
106+
- dev-test-pg-rf
85107
- "build-prod":
86108
context : org-global
87109
filters:
88110
branches:
89111
only:
90112
- master
91-

config/default.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ module.exports = {
2222
database: process.env.PG_DATABASE || 'postgres', // database must exist before running the tool
2323
password: process.env.PG_PASSWORD || 'password',
2424
port: parseInt(process.env.PG_PORT, 10) || 5432,
25-
triggerFunctions: process.env.TRIGGER_FUNCTIONS || ['db_notifications'], // List of trigger functions to listen to
26-
triggerTopics: process.env.TRIGGER_TOPICS || ['db.postgres.sync'], // Names of the topic in the trigger payload
25+
triggerFunctions: process.env.TRIGGER_FUNCTIONS || ['dev_db_notifications'], // List of trigger functions to listen to
26+
triggerTopics: process.env.TRIGGER_TOPICS || ['dev.db.postgres.sync'], // Names of the topic in the trigger payload
2727
triggerOriginators: process.env.TRIGGER_ORIGINATORS || ['tc-postgres-delta-processor'] // Names of the originator in the trigger payload
2828
},
2929
KAFKA: { // Kafka connection options
@@ -38,6 +38,20 @@ module.exports = {
3838
errorTopic: process.env.ERROR_TOPIC || 'db.scorecardtable.error',
3939
recipients: ['[email protected]'] // Kafka partitions to use
4040
},
41+
SLACK: {
42+
URL: process.env.SLACKURL || 'us-east-1',
43+
SLACKCHANNEL: process.env.SLACKCHANNEL || 'ifxpg-migrator',
44+
SLACKNOTIFY: process.env.SLACKNOTIFY || 'false'
45+
},
46+
RECONSILER:{
47+
RECONSILER_START: process.env.RECONSILER_START || 10,
48+
RECONSILER_END: process.env.RECONSILER_END || 5,
49+
RECONSILER_DURATION_TYPE: process.env.RECONSILER_DURATION_TYPE || 'm'
50+
},
51+
DYNAMODB:
52+
{
53+
DYNAMODB_TABLE: process.env.DYNAMODB_TABLE || 'dev_pg_ifx_payload_sync'
54+
},
4155

4256
AUTH0_URL: process.env.AUTH0_URL ,
4357
AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE ,

config/test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ module.exports = {
77
host: process.env.INFORMIX_HOST || 'localhost',
88
port: parseInt(process.env.INFORMIX_PORT, 10) || 2021,
99
user: process.env.INFORMIX_USER || 'informix',
10-
password: process.env.INFORMIX_PASSWORD || '1nf0rm1x',
11-
database: process.env.INFORMIX_DATABASE || 'tcs_catalog',
12-
server: process.env.INFORMIX_SERVER || 'informixoltp_tcp',
10+
password: process.env.INFORMIX_PASSWORD || 'password',
11+
database: process.env.INFORMIX_DATABASE || 'db',
12+
server: process.env.INFORMIX_SERVER || 'informixp',
1313
minpool: parseInt(process.env.MINPOOL, 10) || 1,
1414
maxpool: parseInt(process.env.MAXPOOL, 10) || 60,
1515
maxsize: parseInt(process.env.MAXSIZE, 10) || 0,

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
"lint:fix": "standard --env mocha --fix",
99
"producer": "node ./src/producer.js",
1010
"consumer": "node ./src/consumer.js",
11-
"start": "npm run producer & npm run consumer"
11+
"producer_dd": "node ./src/producer.js failover",
12+
"start": "npm run producer & npm run producer_dd & npm run consumer"
1213
},
1314
"author": "Topcoder",
1415
"license": "ISC",
1516
"dependencies": {
17+
"aws-sdk": "*",
1618
"config": "^3.2.2",
1719
"informix-wrapper": "git+https://github.com/appirio-tech/informix-wrapper.git",
1820
"no-kafka": "^3.4.3",

0 commit comments

Comments
 (0)