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

* chore: enforce to --runInBand scripts * chore: enforce to --runInBand scripts * refactor(config): merge all * fix(ci): cleanup linting smells * fix(ci): cleanup linting smells * refactor(config): add knexfile for knex cli tool * fix(test): linting issues * fix(requests): invalid type * fix(requests): invalid type * fix(requests): invalid type * fix(ci): improve
mojaloop · May 14, 2021 · a0ecf8a · a0ecf8a
1 parent 40c0a64
commit a0ecf8a
Show file tree

Hide file tree

Showing 23 changed files with 624 additions and 442 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -108,7 +108,6 @@ jobs:
             mv junit.xml test/results
       - store_artifacts:
           path: ./test/results
-          prefix: test
       - store_test_results:
           path: ./test/results
 
@@ -132,7 +131,6 @@ jobs:
             mv junit.xml test/results
       - store_artifacts:
           path: ./test/results
-          prefix: test
       - store_test_results:
           path: ./test/results
 
@@ -156,7 +154,6 @@ jobs:
             NODE_ENV: "test"
       - store_artifacts:
           path: coverage
-          prefix: test
       - store_test_results:
           path: coverage
       - run:
@@ -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: |
@@ -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: |
@@ -225,7 +220,6 @@ jobs:
             mv junit.xml test/results
       - store_artifacts:
           path: ./test/results
-          prefix: test
       - store_test_results:
           path: ./test/results
 
@@ -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
@@ -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
@@ -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

diff --git a/config/custom-convict-formats.ts b/config/custom-convict-formats.ts
diff --git a/config/development.json b/config/development.json
@@ -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"
+      ]
+    }
   }
 }
diff --git a/config/development_db.json b/config/development_db.json
diff --git a/config/integration.json b/config/integration.json
@@ -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"
+      ]
+    }
   }
 }
diff --git a/config/integration_db.json b/config/integration_db.json