Skip to content
This repository was archived by the owner on Mar 12, 2025. It is now read-only.

Commit d6c2ded

Browse files
committed
feat: "dev" branch merged into "v5-upgrade"
1 parent 828c885 commit d6c2ded

File tree

198 files changed

+23169
-3310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+23169
-3310
lines changed

.circleci/config.yml

+17-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
python_env: &python_env
33
docker:
44
- image: circleci/python:2.7-stretch-browsers
5-
5+
66
install_awscli: &install_awscli
77
name: "Install awscli"
88
command: |
@@ -14,7 +14,7 @@ install_deploysuite: &install_deploysuite
1414
cp ./../buildscript/master_deploy.sh .
1515
cp ./../buildscript/buildenv.sh .
1616
cp ./../buildscript/awsconfiguration.sh .
17-
17+
1818
# Instructions of deployment
1919
deploy_steps: &deploy_steps
2020
- checkout
@@ -25,14 +25,14 @@ deploy_steps: &deploy_steps
2525
- setup_remote_docker
2626
- run: docker build -t ${APPNAME}:latest .
2727
- deploy:
28-
name: "Running Masterscript - deploy tc-project-service "
28+
name: "Running Masterscript - deploy tc-project-service "
2929
command: |
30-
./awsconfiguration.sh $DEPLOY_ENV
30+
./awsconfiguration.sh $DEPLOY_ENV
3131
source awsenvconf
3232
./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
3333
source buildenvvar
3434
./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
35-
35+
3636
jobs:
3737
test:
3838
docker:
@@ -42,21 +42,22 @@ jobs:
4242
- POSTGRES_USER: circle_test
4343
- POSTGRES_DB: circle_test
4444
- image: elasticsearch:2.3
45+
- image: rabbitmq:3-management
4546
environment:
4647
DEPLOY_ENV: "DEV"
4748
LOGICAL_ENV: "dev"
48-
APPNAME: "projects-api"
49+
APPNAME: "projects-api"
4950
steps:
5051
- checkout
5152
- run:
5253
name: "Install dependeency"
5354
command: |
5455
sudo apt update
5556
sudo apt install curl
56-
sudo apt install python-pip
57+
sudo apt install python-pip
5758
- run: *install_awscli
5859
- run: *install_deploysuite
59-
- setup_remote_docker
60+
- setup_remote_docker
6061
- restore_cache:
6162
key: test-node-modules-{{ checksum "package.json" }}
6263
- run: npm install
@@ -66,36 +67,36 @@ jobs:
6667
- node_modules
6768
- run: npm run lint
6869
- run:
69-
name: "Running Masterscript - deploy tc-project-service "
70+
name: "Running Masterscript - deploy tc-project-service "
7071
command: |
71-
./awsconfiguration.sh $DEPLOY_ENV
72+
./awsconfiguration.sh $DEPLOY_ENV
7273
source awsenvconf
7374
./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-testvar
74-
source buildenvvar
75+
source buildenvvar
7576
npm run test
7677
rm -f buildenvvar
7778
- run: npm run build
7879
- persist_to_workspace:
7980
root: .
8081
paths:
8182
- dist
82-
83+
8384
deployProd:
8485
<<: *python_env
8586
environment:
8687
DEPLOY_ENV: "PROD"
8788
LOGICAL_ENV: "prod"
88-
APPNAME: "projects-api"
89+
APPNAME: "projects-api"
8990
steps: *deploy_steps
9091

9192
deployDev:
9293
<<: *python_env
9394
environment:
9495
DEPLOY_ENV: "DEV"
9596
LOGICAL_ENV: "dev"
96-
APPNAME: "projects-api"
97-
steps: *deploy_steps
98-
97+
APPNAME: "projects-api"
98+
steps: *deploy_steps
99+
99100
workflows:
100101
version: 2
101102
build:

.eslintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"mocha": true
99
},
1010
"rules": {
11-
"import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "**/serviceMocks.js"]}],
11+
"import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "src/tests/*.js"]}],
1212
"max-len": ["error", { "ignoreComments": true, "code": 120 }],
1313
"valid-jsdoc": ["error", {
1414
"requireReturn": true,

config/custom-environment-variables.json

+13-1
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,17 @@
5252
"accountsAppUrl": "ACCOUNTS_APP_URL",
5353
"inviteEmailSubject": "INVITE_EMAIL_SUBJECT",
5454
"inviteEmailSectionTitle": "INVITE_EMAIL_SECTION_TITLE",
55-
"pageSize": "PAGE_SIZE"
55+
"pageSize": "PAGE_SIZE",
56+
"SSO_REFCODES": "SSO_REFCODES",
57+
"lookerConfig": {
58+
"BASE_URL": "LOOKER_API_BASE_URL",
59+
"CLIENT_ID": "LOOKER_API_CLIENT_ID",
60+
"CLIENT_SECRET": "LOOKER_API_CLIENT_SECRET",
61+
"TOKEN": "TOKEN",
62+
"USE_MOCK": "LOOKER_API_ENABLE_MOCK",
63+
"QUERIES": {
64+
"REG_STATS": "LOOKER_API_REG_STATS_QUERY_ID",
65+
"BUDGET": "LOOKER_API_BUDGET_QUERY_ID"
66+
}
67+
}
5668
}

config/default.json

+14-1
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,18 @@
5656
"accountsAppUrl": "https://accounts.topcoder-dev.com",
5757
"MAX_REVISION_NUMBER": 100,
5858
"UNIQUE_GMAIL_VALIDATION": false,
59-
"pageSize": 20
59+
"pageSize": 20,
60+
"VALID_STATUSES_BEFORE_PAUSED": "[\"active\"]",
61+
"SSO_REFCODES": "[]",
62+
"lookerConfig": {
63+
"BASE_URL": "",
64+
"CLIENT_ID": "",
65+
"CLIENT_SECRET": "",
66+
"TOKEN": "TOKEN",
67+
"USE_MOCK": "true",
68+
"QUERIES": {
69+
"REG_STATS": 1234,
70+
"BUDGET": 123
71+
}
72+
}
6073
}

0 commit comments

Comments
 (0)