diff --git a/.circleci/config.yml b/.circleci/config.yml index dcbb018bc..c65ba28eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,20 +1,19 @@ version: 2.1 python_env: &python_env docker: - - image: cimg/python:3.11.11-browsers + - image: cimg/python:3.12.1-browsers install_awscli: &install_awscli name: "Install awscli" command: | - sudo apt update - sudo apt install jq python3-pip - sudo pip3 install awscli --upgrade + pip3 install awscli --upgrade install_deploysuite: &install_deploysuite name: Installation of install_deploysuite. command: | - git clone --branch v1.4.15 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript + git clone --branch v1.4.19 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript cp ./../buildscript/master_deploy.sh . cp ./../buildscript/buildenv.sh . cp ./../buildscript/awsconfiguration.sh . + cp ./../buildscript/psvar-processor.sh . # Instructions of deployment deploy_steps: &deploy_steps @@ -30,15 +29,22 @@ deploy_steps: &deploy_steps command: | ./awsconfiguration.sh $DEPLOY_ENV source awsenvconf - ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar - source buildenvvar - ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME} -p FARGATE + # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar + # source buildenvvar + # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME} -p FARGATE + ./psvar-processor.sh -t appenv -p /config/${APPNAME}/deployvar + source deployvar_env + ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -j /config/${APPNAME}/appvar,/config/common/global-appvar -i ${APPNAME} -p FARGATE echo "======= Running Masterscript - deploy projects-api-consumers ===========" if [ -e ${LOGICAL_ENV}-${APPNAME}-appvar.json ]; then sudo rm -vf ${LOGICAL_ENV}-${APPNAME}-appvar.json; fi - ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumers-deployvar - source buildenvvar - ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME} -p FARGATE + # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumers-deployvar + # source buildenvvar + # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME} -p FARGATE + ./psvar-processor.sh -t appenv -p /config/${APPNAME}-consumers/deployvar + source deployvar_env + ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -j /config/${APPNAME}/appvar,/config/common/global-appvar -i ${APPNAME} -p FARGATE + jobs: UnitTests: diff --git a/package.json b/package.json index b06ca0dab..92bf634a3 100644 --- a/package.json +++ b/package.json @@ -36,14 +36,14 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/appirio-tech/tc-projects-service.git" + "url": "git+https://github.com/topcoder-platform/tc-projects-service.git" }, "author": "", "license": "ISC", "bugs": { - "url": "https://github.com/appirio-tech/tc-projects-service/issues" + "url": "https://github.com/topcoder-platform/tc-projects-service/issues" }, - "homepage": "https://github.com/appirio-tech/tc-projects-service#readme", + "homepage": "https://github.com/topcoder-platform/tc-projects-service#readme", "dependencies": { "ajv": "^8.17.1", "analytics-node": "^2.1.1", @@ -79,7 +79,7 @@ "sequelize": "^5.8.7", "stripe": "^8.195.0", "swagger-ui-express": "^4.0.6", - "tc-core-library-js": "github:appirio-tech/tc-core-library-js#security", + "tc-core-library-js": "github:topcoder-platform/tc-core-library-js#master", "traverse": "^0.6.6", "umzug": "^3.8.2", "urlencode": "^1.1.0", diff --git a/src/constants.js b/src/constants.js index 0dc8af26f..18a2ca7a3 100644 --- a/src/constants.js +++ b/src/constants.js @@ -95,6 +95,10 @@ export const USER_ROLE = { PROGRAM_MANAGER: 'Program Manager', SOLUTION_ARCHITECT: 'Solution Architect', PROJECT_MANAGER: 'Project Manager', + TASK_MANAGER: 'Task Manager', + TOPCODER_TASK_MANAGER: 'Topcoder Task Manager', + TALENT_MANAGER: 'Talent Manager', + TOPCODER_TALENT_MANAGER: 'Topcoder Talent Manager', TOPCODER_USER: 'Topcoder User', TG_ADMIN: 'tgadmin', TC_COPILOT: 'copilot', diff --git a/src/permissions/constants.js b/src/permissions/constants.js index 7f55c3626..25a47da15 100644 --- a/src/permissions/constants.js +++ b/src/permissions/constants.js @@ -192,6 +192,10 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export ...TOPCODER_ROLES_ADMINS, USER_ROLE.MANAGER, USER_ROLE.PROJECT_MANAGER, + USER_ROLE.TASK_MANAGER, + USER_ROLE.TOPCODER_TASK_MANAGER, + USER_ROLE.TALENT_MANAGER, + USER_ROLE.TOPCODER_TALENT_MANAGER, ], projectRoles: ALL, scopes: SCOPES_PROJECTS_READ, @@ -207,6 +211,10 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export ...TOPCODER_ROLES_ADMINS, USER_ROLE.MANAGER, USER_ROLE.PROJECT_MANAGER, + USER_ROLE.TASK_MANAGER, + USER_ROLE.TOPCODER_TASK_MANAGER, + USER_ROLE.TALENT_MANAGER, + USER_ROLE.TOPCODER_TALENT_MANAGER, ], scopes: SCOPES_PROJECTS_READ, }, @@ -361,7 +369,14 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export ...PROJECT_ROLES_MANAGEMENT, PROJECT_MEMBER_ROLE.COPILOT, ], - topcoderRoles: [...TOPCODER_ROLES_ADMINS, USER_ROLE.PROJECT_MANAGER], + topcoderRoles: [ + ...TOPCODER_ROLES_ADMINS, + USER_ROLE.PROJECT_MANAGER, + USER_ROLE.TASK_MANAGER, + USER_ROLE.TOPCODER_TASK_MANAGER, + USER_ROLE.TALENT_MANAGER, + USER_ROLE.TOPCODER_TALENT_MANAGER, + ], scopes: SCOPES_PROJECTS_READ_AVL_BILLING_ACCOUNTS, }, @@ -381,6 +396,10 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export topcoderRoles: [ USER_ROLE.TOPCODER_ADMIN, USER_ROLE.PROJECT_MANAGER, + USER_ROLE.TASK_MANAGER, + USER_ROLE.TOPCODER_TASK_MANAGER, + USER_ROLE.TALENT_MANAGER, + USER_ROLE.TOPCODER_TALENT_MANAGER, ], scopes: SCOPES_PROJECTS_READ_BILLING_ACCOUNT_DETAILS, },