Skip to content

Commit 40bc816

Browse files
author
Maksym Mykhailenko
committed
chore: replace "dotenv" with "cmd-env"
Otherwise we cannot use different environment for "test" command and when runnig locally.
1 parent 5289291 commit 40bc816

File tree

3 files changed

+74
-20
lines changed

3 files changed

+74
-20
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ npm run data:import -- --file path/to-file.json
244244

245245
- As this commands calls topcoder services to get data like members details, so you have to provide environment variables `AUTH0_CLIENT_ID`, `AUTH0_CLIENT_SECRET`, `AUTH0_URL`, `AUTH0_AUDIENCE`, `AUTH0_PROXY_SERVER_URL`, they would automatically picked up from the `.env` file if provided.
246246

247-
- If you encounter conflicts errors during import, you may need to recreated database tables and Elasticssearch indexes by `npm run sync:all`.
247+
- If you encounter conflicts errors during import, you may need to recreated database tables and Elasticssearch indexes by `npm run local:reset`.
248248

249249
- List of models that will be imported are defined in `scripts/data/dataModels.js`. You can add new models to this list, but make sure that new models are added to list such that each model comes after its dependencies.
250250

@@ -289,7 +289,6 @@ This command for importing data uses API to create demo data. Which has a few pe
289289
| `npm run startKafkaConsumers:dev` | Start Kafka consumer app in the development mode using `nodemon`. |
290290
| `npm run test` | Run tests. |
291291
| `npm run test:watch` | Run tests and re-run them on changes (not useful now as it re-runs all the test). |
292-
| `npm run reset:all` | Recreate Database and Elasticsearch indexes (removes any existent data). |
293292
| `npm run reset:db` | Recreate Database schemas (removes any existent data). |
294293
| `npm run reset:es` | Recreate Elasticsearch indexes (removes any existent data). |
295294
| `npm run import-from-api` | Import Metadata from DEV environment, see [docs](#import-metadata-from-apitopcoder-devcom-deprecated). |
@@ -300,6 +299,7 @@ This command for importing data uses API to create demo data. Which has a few pe
300299
| `npm run services:down` | Stop services via docker-compose for local development. |
301300
| `npm run services:logs -- -f <service_name>` | View logs of some service inside docker-compose. |
302301
| `npm run local:init` | Recreate Database and Elasticsearch indexes and populate demo data for local development (removes any existent data). |
302+
| `npm run local:reset` | Recreate Database and Elasticsearch indexes (removes any existent data). |
303303
| `npm run babel-node-script -- <path/to/script>` | Helper command which is used by other commands to run node scripts using `babel-node` and `dotenv` so variables from `.env` file are automatically applied. |
304304
| `npm run generate:doc:permissions` | Generate [permissions.html](docs/permissions.html) which later can be viewed by [link](https://htmlpreview.github.io/?https://github.com/topcoder-platform/tc-project-service/blob/develop/docs/permissions.html). |
305305
| `npm run generate:doc:permissions:dev` | Generate [permissions.html](docs/permissions.html) on any changes (useful during development). |

package-lock.json

Lines changed: 59 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
"build": "babel src -d dist --presets es2015 --copy-files",
1313
"prestart": "npm run -s build",
1414
"start": "node dist",
15-
"start:dev": "cross-env NODE_ENV=development PORT=8001 nodemon -w src --exec \"npm run babel-node-script -- src\" | bunyan",
15+
"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",
1616
"startKafkaConsumers": "npm run -s build && node dist/index-kafka.js",
17-
"startKafkaConsumers:dev": "cross-env NODE_ENV=development nodemon -w src --exec \"npm run babel-node-script src/index-kafka.js\" | bunyan",
18-
"test": "cross-env NODE_ENV=test npm run lint && cross-env NODE_ENV=test npm run reset:all && cross-env NODE_ENV=test istanbul cover node_modules/mocha/bin/_mocha -- --timeout 10000 --require babel-core/register \"./src/**/*.spec.js*\" --exit",
17+
"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",
18+
"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 \"./src/**/*.spec.js*\" --exit",
1919
"test:watch": "cross-env NODE_ENV=test mocha -w --require babel-core/register \"./src/**/*.spec.js*\" ",
20-
"reset:all": "npm run reset:db && npm run reset:es",
2120
"reset:db": "npm run babel-node-script -- migrations/sync.js",
2221
"reset:es": "npm run babel-node-script -- migrations/elasticsearch_sync.js",
23-
"import-from-api": "npm run babel-node-script -- scripts/import-from-api",
24-
"es-db-compare": "npm run babel-node-script -- scripts/es-db-compare",
25-
"data:export": "cross-env NODE_ENV=development LOG_LEVEL=info npm run babel-node-script -- scripts/data/export",
26-
"data:import": "cross-env NODE_ENV=development LOG_LEVEL=info npm run babel-node-script -- scripts/data/import",
22+
"import-from-api": "env-cmd npm run babel-node-script -- scripts/import-from-api",
23+
"es-db-compare": "env-cmd npm run babel-node-script -- scripts/es-db-compare",
24+
"data:export": "cross-env NODE_ENV=development LOG_LEVEL=info env-cmd npm run babel-node-script -- scripts/data/export",
25+
"data:import": "cross-env NODE_ENV=development LOG_LEVEL=info env-cmd npm run babel-node-script -- scripts/data/import",
2726
"services:up": "docker-compose -f ./local/full/docker-compose.yml up -d",
2827
"services:down": "docker-compose -f ./local/full/docker-compose.yml down",
2928
"services:logs": "docker-compose -f ./local/full/docker-compose.yml logs",
30-
"local:init": "npm run reset:all && npm run data:import",
31-
"babel-node-script": "node --require dotenv/config --require babel-core/register",
32-
"generate:doc:permissions": "npm run babel-node-script -- scripts/permissions-doc",
33-
"generate:doc:permissions:dev": "nodemon --watch scripts/permissions-doc --watch src --ext js,jsx,hbs --exec \"npm run babel-node-script -- scripts/permissions-doc\""
29+
"local:init": "npm run local:reset && npm run data:import",
30+
"local:reset": "env-cmd npm run reset:db && env-cmd npm run reset:es",
31+
"babel-node-script": "node --require babel-core/register",
32+
"generate:doc:permissions": "env-cmd npm run babel-node-script -- scripts/permissions-doc",
33+
"generate:doc:permissions:dev": "nodemon --watch scripts/permissions-doc --watch src --ext js,jsx,hbs --exec \"./node_modules/.bin/env-cmd npm run babel-node-script -- scripts/permissions-doc\""
3434
},
3535
"repository": {
3636
"type": "git",
@@ -55,7 +55,6 @@
5555
"config": "^1.20.1",
5656
"continuation-local-storage": "^3.1.7",
5757
"cors": "^2.8.4",
58-
"dotenv": "^8.2.0",
5958
"elasticsearch": "^16.1.1",
6059
"express": "^4.13.4",
6160
"express-list-routes": "^0.1.4",
@@ -92,6 +91,7 @@
9291
"chai": "^3.5.0",
9392
"chai-as-promised": "^7.1.1",
9493
"cross-env": "^7.0.2",
94+
"env-cmd": "^10.1.0",
9595
"eslint": "^6.8.0",
9696
"eslint-config-airbnb-base": "^11.1.0",
9797
"eslint-plugin-import": "^2.2.0",

0 commit comments

Comments
 (0)