Updates to most dependencies, central-ledger still needs to be publis… (

#142) * Updates to most dependencies, central-ledger still needs to be published. Hapi version is at 18.3.2 because of new joi changes that are breaking hapi openapi swagger import Added new logger * updated ml-api-adapter config integration test * reverted to previous joi version * updated ml-api integration test json * updated dependency versions * updated config that was missing and needed for new ml-api image * tests now run but are failing because of a data issue * updates to fix integration issues not working still * central-ledger update
mojaloop · Sep 30, 2019 · d566b04 · d566b04
1 parent baaa12d
commit d566b04
Show file tree

Hide file tree

Showing 50 changed files with 2,162 additions and 2,308 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -348,11 +348,11 @@ jobs:
           command: mkdir -p ./audit/results
       - run:
           name: Check for new npm vulnerabilities
-          command: npm run audit:check --silent -- --json > ./audit/results/auditResults.json 
+          command: npm run audit:check --silent -- --json > ./audit/results/auditResults.json
       - store_artifacts:
           path: ./audit/results
           prefix: audit
-          
+
   audit-licenses:
     <<: *defaults_working_directory
     <<: *defaults_docker_node
@@ -367,6 +367,9 @@ jobs:
           keys:
             - dependency-cache-{{ checksum "package.json" }}
             - dependency-cache-
+      - run:
+          name: Prune non-production packages before running license-scanner
+          command: npm prune --production
       - run:
           name: Run the license-scanner
           command: cd /tmp/license-scanner && pathToRepo=$CIRCLE_WORKING_DIRECTORY make run

diff --git a/.ncurc.yml b/.ncurc.yml
@@ -0,0 +1,6 @@
+{
+  "reject": [
+    "@hapi/hapi",
+    "@hapi/joi"
+  ]
+}
diff --git a/audit-resolv.json b/audit-resolv.json
diff --git a/audit-resolve.json b/audit-resolve.json
@@ -0,0 +1 @@
+{}
diff --git a/docker/central-ledger/default.json b/docker/central-ledger/default.json
@@ -1,10 +1,13 @@
 {
   "PORT": 3001,
   "HOSTNAME": "http://central-ledger",
-  "RUN_MIGRATIONS": true,
+  "MIGRATIONS": {
+    "DISABLED": false,
+    "RUN_DATA_MIGRATIONS": true
+  },
   "AMOUNT": {
-    "PRECISION": 10,
-    "SCALE": 2
+    "PRECISION": 18,
+    "SCALE": 4
   },
   "SIDECAR": {
     "DISABLED": true,
@@ -17,6 +20,14 @@
     "POOL_MIN": 10,
     "POOL_MAX": 30
   },
+  "MONGODB": {
+    "DISABLED": false,
+    "URI": "mongodb://localhost:27017/mlos"
+  },
+  "ERROR_HANDLING": {
+    "includeCauseExtension": true,
+    "truncateCause": false
+  },
   "HANDLERS": {
     "DISABLED": false,
     "API": {
@@ -71,6 +82,77 @@
       }
     },
     "CONSUMER": {
+      "BULK": {
+        "PREPARE": {
+          "config": {
+            "options": {
+              "mode": 2,
+              "batchSize": 1,
+              "pollFrequency": 10,
+              "recursiveTimeout": 100,
+              "messageCharset": "utf8",
+              "messageAsJSON": true,
+              "sync": true,
+              "consumeTimeout": 1000
+            },
+            "rdkafkaConf": {
+              "client.id": "cl-con-bulk-prepare",
+              "group.id": "cl-group-bulk-prepare",
+              "metadata.broker.list": "localhost:9092",
+              "socket.keepalive.enable": true
+            },
+            "topicConf": {
+              "auto.offset.reset": "earliest"
+            }
+          }
+        },
+        "PROCESSING": {
+          "config": {
+            "options": {
+              "mode": 2,
+              "batchSize": 1,
+              "pollFrequency": 10,
+              "recursiveTimeout": 100,
+              "messageCharset": "utf8",
+              "messageAsJSON": true,
+              "sync": true,
+              "consumeTimeout": 1000
+            },
+            "rdkafkaConf": {
+              "client.id": "cl-con-bulk-processing",
+              "group.id": "cl-group-bulk-processing",
+              "metadata.broker.list": "localhost:9092",
+              "socket.keepalive.enable": true
+            },
+            "topicConf": {
+              "auto.offset.reset": "earliest"
+            }
+          }
+        },
+        "FULFIL": {
+          "config": {
+            "options": {
+              "mode": 2,
+              "batchSize": 1,
+              "pollFrequency": 10,
+              "recursiveTimeout": 100,
+              "messageCharset": "utf8",
+              "messageAsJSON": true,
+              "sync": true,
+              "consumeTimeout": 1000
+            },
+            "rdkafkaConf": {
+              "client.id": "cl-con-bulk-fulfil",
+              "group.id": "cl-group-bulk-fulfil",
+              "metadata.broker.list": "localhost:9092",
+              "socket.keepalive.enable": true
+            },
+            "topicConf": {
+              "auto.offset.reset": "earliest"
+            }
+          }
+        }
+      },
       "TRANSFER": {
         "PREPARE": {
           "config": {
@@ -192,6 +274,26 @@
       }
     },
     "PRODUCER": {
+      "BULK": {
+        "PROCESSING": {
+          "config": {
+            "options": {
+              "messageCharset": "utf8"
+            },
+            "rdkafkaConf": {
+              "metadata.broker.list": "kafka:9092",
+              "client.id": "cl-prod-bulk-processing",
+              "event_cb": true,
+              "dr_cb": true,
+              "socket.keepalive.enable": true,
+              "queue.buffering.max.messages": 10000000
+            },
+            "topicConf": {
+              "request.required.acks": "all"
+            }
+          }
+        }
+      },
       "TRANSFER": {
         "PREPARE": {
           "config": {

diff --git a/docker/ml-api-adapter/default.json b/docker/ml-api-adapter/default.json
@@ -1,7 +1,8 @@
 {
   "PORT": 3000,
   "HOSTNAME": "http://ml-api-adapter",
-  "ENDPOINT_SOURCE_URL": "http://localhost:3001/participants/{{fsp}}/endpoints",
+  "ENDPOINT_SOURCE_URL": "http://localhost:3001",
+  "ENDPOINT_HEALTH_URL": "http://localhost:3001/health",
   "ENDPOINT_CACHE_CONFIG": {
     "expiresIn": 180000,
     "generateTimeout": 30000
@@ -11,7 +12,15 @@
       "rejectUnauthorized": true
     }
   },
+  "MAX_CALLBACK_TIME_LAG_DILATION_MILLISECONDS": 200,
   "MAX_FULFIL_TIMEOUT_DURATION_SECONDS": 300,
+  "TRANSFERS": {
+    "SEND_TRANSFER_CONFIRMATION_TO_PAYEE": true
+  },
+  "ERROR_HANDLING": {
+    "includeCauseExtension": false,
+    "truncateCause": true
+  },
   "AMOUNT": {
     "PRECISION": 10,
     "SCALE": 2
@@ -39,18 +48,6 @@
       "GENERAL_TOPIC_TEMPLATE": {
         "TEMPLATE": "topic-{{functionality}}-{{action}}",
         "REGEX": "topic-(.*)-(.*)"
-      },
-      "NOTIFICATION_TOPIC_TEMPLATE": {
-        "TEMPLATE": "topic-notification-event",
-        "REGEX": "topic-notification-event"
-      },
-      "FULFIL_TOPIC_TEMPLATE": {
-        "TEMPLATE": "topic-transfer-fulfil",
-        "REGEX": "topic-transfer-fulfil"
-      },
-      "GET_TRANSFERS_TOPIC_TEMPLATE": {
-        "TEMPLATE": "topic-transfer-get",
-        "REGEX": "topic-transfer-get"
       }
     },
     "CONSUMER": {
@@ -139,4 +136,4 @@
       }
     }
   }
-}
+}