Skip to content

Prod Release: 2.4.0 #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 50 commits into from
Apr 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
abc2ab9
chore: looal docker-compose update
maxceem Apr 2, 2020
23b9374
chore: disable creating projects demo data
maxceem Apr 2, 2020
295fb2f
Merge pull request #526 from topcoder-platform/hotfix/post-release-2.2.1
maxceem Apr 3, 2020
a12dfe2
Merge pull request #535 from topcoder-platform/hotfix/user_level_reports
Apr 9, 2020
3cd0dc3
Upgrade to Node 12 (#531)
maxceem Apr 10, 2020
dfffbee
doc: fix node version
maxceem Apr 10, 2020
85e3d9f
chore: bump lodash to 4.17.15
maxceem Apr 10, 2020
0bbe1c4
Merge pull request #536 from maxceem/feature/lodash-4.17.15
maxceem Apr 10, 2020
56ebb91
chore: bump eslint to 6.8.0
maxceem Apr 10, 2020
270cdf4
Merge pull request #537 from maxceem/feature/eslint-6.8.0
maxceem Apr 10, 2020
91f9998
chore(deps): bump auth0-js from 9.12.2 to 9.13.2
dependabot[bot] Apr 10, 2020
deab0d3
Topcoder Project Service - Import and Export Data version 1.0
AliGebily Apr 12, 2020
9ae0fc2
Merge pull request #542 from AliGebily/feature/export-import-aligebily-0
maxceem Apr 12, 2020
51471f7
Merge branch 'develop' into feature/export-import
maxceem Apr 12, 2020
58f2f60
docs: automatically updated README TOC
maxceem Apr 12, 2020
1bdb224
Merge pull request #544 from topcoder-platform/feature/auth0-js-9-13-2
maxceem Apr 13, 2020
ee649cf
Topcoder Project Service - Import and Export Data - Final Fixes
AliGebily Apr 13, 2020
18a778b
Use .env file for local setup (#505)
maxceem Apr 13, 2020
b1258e2
minor-fixes:
AliGebily Apr 13, 2020
f50e54f
chore: use any Node.js version 12
Apr 14, 2020
8bb3e23
revert changes in project.delete.js
AliGebily Apr 14, 2020
bfec5ad
Merge pull request #545 from AliGebily/feature/export-import-aligebily-1
maxceem Apr 14, 2020
03acbca
Merge branch 'develop' into feature/export-import
Apr 14, 2020
b2e4357
chore: simplify data import/export scripts logs
Apr 14, 2020
8037d7a
update database sequencers, after importing, to be set to max(autoinc…
AliGebily Apr 14, 2020
f044093
Identify sequencer name by querying it from database using table name…
AliGebily Apr 16, 2020
740427d
Merge pull request #547 from AliGebily/feature/export-import-aligebily-2
maxceem Apr 16, 2020
64efe2a
fix: don't mask email in invite by email
Apr 17, 2020
98d2fde
Merge pull request #549 from topcoder-platform/hotfix/post-release-2.3.1
maxceem Apr 17, 2020
356405e
fix: unit tests for invites
Apr 17, 2020
49d3756
Merge pull request #551 from topcoder-platform/hotfix/post-release-2.3.1
maxceem Apr 17, 2020
f0fe7bf
fix: search invited user by email case-insensetive
Apr 17, 2020
1d93a4e
fix: update and delete invited user by email
Apr 17, 2020
90802ab
fix: use node 12 in DEV and PROD env
Apr 20, 2020
f06e245
Merge branch 'develop' into feature/export-import
Apr 21, 2020
dee5668
docs: improve readme using import/export scripts
Apr 21, 2020
81c204f
chore: remove redundant "seed" scipt
Apr 21, 2020
22d97ca
feat: dummify metadata prices during importing
Apr 21, 2020
17721fc
chore: import/export scripts improvements
Apr 21, 2020
a647090
Merge pull request #546 from topcoder-platform/feature/export-import
maxceem Apr 21, 2020
a7a2b56
fix: invite by handles
Apr 21, 2020
8af9863
fix: invite by emails
Apr 21, 2020
baa76ce
Revert "Import and Export Data Commands"
maxceem Apr 22, 2020
de1e29c
Merge pull request #552 from topcoder-platform/revert-546-feature/exp…
maxceem Apr 22, 2020
e8ac9f7
docs: fix comments
Apr 22, 2020
85b4c0f
Revert "Revert "Import and Export Data Commands""
maxceem Apr 22, 2020
8f48ffc
Merge pull request #554 from topcoder-platform/revert-552-revert-546-…
maxceem Apr 22, 2020
9be8a21
fix: deploying
Apr 22, 2020
899be6a
Support M2M and Unified permissions, part 1 (#555)
maxceem Apr 28, 2020
f451d6a
Merge branch 'master' into develop
Apr 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ deploy_steps: &deploy_steps
./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}

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
Expand All @@ -42,7 +42,7 @@ deploy_steps: &deploy_steps
jobs:
test:
docker:
- image: circleci/node:8.9.4
- image: circleci/node:12.16.1
- image: circleci/postgres:9.6.2-alpine
environment:
- POSTGRES_USER: circle_test
Expand Down
21 changes: 9 additions & 12 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@
"rules": {
"import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "src/tests/*.js"]}],
"max-len": ["error", { "ignoreComments": true, "code": 120 }],
"valid-jsdoc": ["error", {
"requireReturn": true,
"requireReturnType": true,
"requireParamDescription": true,
"requireReturnDescription": true
}],
"require-jsdoc": ["error", {
"require": {
"FunctionDeclaration": true,
"MethodDefinition": true,
"ClassDeclaration": true
}
}]
"require": {
"FunctionDeclaration": true,
"MethodDefinition": true,
"ClassDeclaration": true
}
}],
"indent": 0,
"no-multi-spaces": 0,
"valid-jsdoc": 0
}
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.9.4
12
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8.2.1
FROM node:12.16.1
LABEL version="1.2"
LABEL description="Projects microservice"
RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
Expand Down
258 changes: 148 additions & 110 deletions README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"url": "localhost:9092"
},
"analyticsKey": "",
"VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
"validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
"VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\"]",
"validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\"]",
"jwksUri": "",
"busApiUrl": "http://api.topcoder-dev.com/v5",
"messageApiUrl": "http://api.topcoder-dev.com/v5",
Expand Down
1 change: 1 addition & 0 deletions data/demo-data.json

Large diffs are not rendered by default.

1,299 changes: 1,299 additions & 0 deletions docs/permissions.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion local/full/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ services:
args:
NODE_VERSION: 8.11.3
GIT_URL: https://github.com/topcoder-platform/project-processor-es
GIT_BRANCH: feature/link-attachments
GIT_BRANCH: develop
command: start kafka-client
expose:
- "5000"
Expand Down
2 changes: 1 addition & 1 deletion local/seed/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const token =

async function seed() {
await seedMetadata(targetUrl, token);
await seedProjects(targetUrl, token);
// await seedProjects(targetUrl, token);
}

seed().then(() => process.exit());
23 changes: 23 additions & 0 deletions local/seed/seedMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,28 @@ if (!process.env.CONNECT_USER_TOKEN) {
process.exit(1);
}

/**
* Iteratively goes through the object and replaces prices with random values.
*
* This method MUTATES object.
*
* @param {Object} o object
*/
function dummifyPrices(o) {
Object.keys(o).forEach(function (k) {
if (o[k] !== null && typeof o[k] === 'object') {
dummifyPrices(o[k]);
return;
}
if (k === 'price' && typeof o[k] === 'number') {
o[k] = 100 + Math.round(Math.random() * 10000);
}
if (k === 'price' && typeof o[k] === 'string') {
o[k] = (100 + Math.round(Math.random() * 10000)).toFixed(0);
}
});
}

// we need to know any logged in Connect user token to retrieve data from DEV
const CONNECT_USER_TOKEN = process.env.CONNECT_USER_TOKEN;

Expand All @@ -29,6 +51,7 @@ module.exports = (targetUrl, token) => {
})
.then(async function (response) {
let data = response.data;
dummifyPrices(data)

console.log('Creating metadata objects locally...');

Expand Down
Loading