Skip to content
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.

Sign up for GitHub

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

Jump to bottom

refactor(config): merge db & service config into one #67

Merged
merged 12 commits into from
May 14, 2021
Merged

refactor(config): merge db & service config into one #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
58db158
chore: enforce to --runInBand scripts
eoln May 13, 2021
e89351f
chore: enforce to --runInBand scripts
eoln May 13, 2021
e0d5533
refactor(config): merge all
eoln May 13, 2021
5884371
Merge branch 'refactor/2132_merge_config' of github.com:eoln/auth-ser…
eoln May 13, 2021
84c3d1b
fix(ci): cleanup linting smells
eoln May 14, 2021
57ddb06
fix(ci): cleanup linting smells
eoln May 14, 2021
8e04ce9
refactor(config): add knexfile for knex cli tool
eoln May 14, 2021
87b5013
fix(test): linting issues
eoln May 14, 2021
fa7dbdb
fix(requests): invalid type
eoln May 14, 2021
caf597d
fix(requests): invalid type
eoln May 14, 2021
e5b72aa
fix(requests): invalid type
eoln May 14, 2021
1d9c0da
fix(ci): improve
eoln May 14, 2021
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
11 changes: 1 addition & 10 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ jobs:
mv junit.xml test/results
- store_artifacts:
path: ./test/results
prefix: test
- store_test_results:
path: ./test/results

Expand All @@ -132,7 +131,6 @@ jobs:
mv junit.xml test/results
- store_artifacts:
path: ./test/results
prefix: test
- store_test_results:
path: ./test/results

Expand All @@ -156,7 +154,6 @@ jobs:
NODE_ENV: "test"
- store_artifacts:
path: coverage
prefix: test
- store_test_results:
path: coverage
- run:
Expand All @@ -174,8 +171,6 @@ jobs:
executor: default-machine
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "package-lock.json" }}
- run:
name: Set up NVM
command: |
Expand All @@ -188,7 +183,7 @@ jobs:
command: |
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
node --version
npm install
npm ci
- run:
name: Create dir for test results
command: |
Expand Down Expand Up @@ -225,7 +220,6 @@ jobs:
mv junit.xml test/results
- store_artifacts:
path: ./test/results
prefix: test
- store_test_results:
path: ./test/results

Expand Down Expand Up @@ -260,7 +254,6 @@ jobs:
command: npm run audit:check --silent -- --json > ./audit/results/auditResults.json
- store_artifacts:
path: ./audit/results
prefix: audit

audit-licenses:
executor: default-docker
Expand All @@ -281,7 +274,6 @@ jobs:
command: cd /tmp/license-scanner && pathToRepo=$CIRCLE_WORKING_DIRECTORY make run
- store_artifacts:
path: /tmp/license-scanner/results
prefix: licenses

build-local:
executor: default-machine
Expand Down Expand Up @@ -415,7 +407,6 @@ jobs:
command: cd /tmp/license-scanner && mode=docker dockerImages=$DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:local make run
- store_artifacts:
path: /tmp/license-scanner/results
prefix: licenses

image-scan:
executor: anchore/anchore_engine
Expand Down
99 changes: 0 additions & 99 deletions config/custom-convict-formats.ts
View file
Open in desktop

This file was deleted.

33 changes: 33 additions & 0 deletions config/development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,38 @@
"key": "./secrets/client.crt"
}
}
},
"DATABASE": {
"client": "mysql",
"version": "5.5",
"connection": {
"host": "localhost",
"port": 3306,
"user": "auth-service",
"password": "password",
"database": "auth-service",
"timezone": "UTC"
},
"pool": {
"min": 10,
"max": 10,
"acquireTimeoutMillis": 30000,
"createTimeoutMillis": 30000,
"destroyTimeoutMillis": 5000,
"idleTimeoutMillis": 30000,
"reapIntervalMillis": 1000,
"createRetryIntervalMillis": 200
},
"migrations": {
"tableName": "auth-service",
"loadExtensions": [
".ts"
]
},
"seeds": {
"loadExtensions": [
".ts"
]
}
}
}
29 changes: 0 additions & 29 deletions config/development_db.json
View file
Open in desktop

This file was deleted.

33 changes: 33 additions & 0 deletions config/integration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,38 @@
"key": "./secrets/client.crt"
}
}
},
"DATABASE": {
"client": "mysql",
"version": "5.5",
"connection": {
"host": "localhost",
"port": 3306,
"user": "auth-service",
"password": "password",
"database": "auth-service",
"timezone": "UTC"
},
"pool": {
"min": 10,
"max": 10,
"acquireTimeoutMillis": 30000,
"createTimeoutMillis": 30000,
"destroyTimeoutMillis": 5000,
"idleTimeoutMillis": 30000,
"reapIntervalMillis": 1000,
"createRetryIntervalMillis": 200
},
"migrations": {
"tableName": "auth-service",
"loadExtensions": [
".ts"
]
},
"seeds": {
"loadExtensions": [
".ts"
]
}
}
}
29 changes: 0 additions & 29 deletions config/integration_db.json
View file
Open in desktop

This file was deleted.

Loading