Skip to content

Commit 4d3d43e

Browse files
authored
Merge pull request #749 from topcoder-platform/develop
Add `tgadmin` to list of admin roles
2 parents 30f6f2a + c2cf55d commit 4d3d43e

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ install_awscli: &install_awscli
1212
install_deploysuite: &install_deploysuite
1313
name: Installation of install_deploysuite.
1414
command: |
15-
git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
15+
git clone --branch v1.4.15 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
1616
cp ./../buildscript/master_deploy.sh .
1717
cp ./../buildscript/buildenv.sh .
1818
cp ./../buildscript/awsconfiguration.sh .

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ WORKDIR /usr/src/app
2626
COPY . /usr/src/app
2727
# Install app dependencies
2828
RUN npm install
29+
RUN npm run -s build
2930

3031
EXPOSE 3000
3132

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
"lint": "eslint .",
1111
"lint:fix": "eslint . --fix || true",
1212
"build": "babel src -d dist --presets es2015 --copy-files",
13-
"prestart": "npm run -s build",
1413
"start": "node dist",
1514
"start:dev": "cross-env NODE_ENV=development PORT=8001 nodemon -w src --exec \"./node_modules/.bin/env-cmd npm run babel-node-script -- src\" | bunyan",
16-
"startKafkaConsumers": "npm run -s build && node dist/index-kafka.js",
15+
"startKafkaConsumers": "node dist/index-kafka.js",
1716
"startKafkaConsumers:dev": "cross-env NODE_ENV=development nodemon -w src --exec \"./node_modules/.bin/env-cmd npm run babel-node-script src/index-kafka.js\" | bunyan",
1817
"test": "cross-env NODE_ENV=test npm run lint && cross-env NODE_ENV=test npm run reset:db && cross-env NODE_ENV=test npm run reset:es && cross-env NODE_ENV=test istanbul cover node_modules/mocha/bin/_mocha -- --timeout 10000 --require babel-core/register --require ./src/tests \"./src/**/*.spec.js*\" --exit",
1918
"test:watch": "cross-env NODE_ENV=test mocha -w --require babel-core/register --require ./src/tests \"./src/**/*.spec.js*\" ",

src/constants.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ export const USER_ROLE = {
6565
SOLUTION_ARCHITECT: 'Solution Architect',
6666
PROJECT_MANAGER: 'Project Manager',
6767
TOPCODER_USER: 'Topcoder User',
68+
TG_ADMIN: 'tgadmin',
6869
};
6970

70-
export const ADMIN_ROLES = [USER_ROLE.CONNECT_ADMIN, USER_ROLE.TOPCODER_ADMIN];
71+
export const ADMIN_ROLES = [USER_ROLE.CONNECT_ADMIN, USER_ROLE.TOPCODER_ADMIN, USER_ROLE.TG_ADMIN];
7172

7273
export const MANAGER_ROLES = [
7374
...ADMIN_ROLES,

0 commit comments

Comments
 (0)