From f3feda2967b771ee83d88eb3edb8083a460aa2a6 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Thu, 22 Aug 2024 15:45:23 +0100 Subject: [PATCH 1/6] ci: make redis-cluster default for integration tests --- config/default.json | 7 +- docker-compose.yml | 100 +++++++++++++++--- docker/central-ledger/default.json | 7 +- .../config-modifier/configs/central-ledger.js | 5 +- docker/env.sh | 15 +++ package-lock.json | 8 +- package.json | 4 +- test/scripts/test-integration.sh | 9 +- 8 files changed, 124 insertions(+), 31 deletions(-) create mode 100755 docker/env.sh diff --git a/config/default.json b/config/default.json index 2617b2006..933405b7a 100644 --- a/config/default.json +++ b/config/default.json @@ -86,10 +86,11 @@ }, "PROXY_CACHE": { "enabled": true, - "type": "redis", + "type": "redis-cluster", "proxyConfig": { - "host": "localhost", - "port": 6379 + "cluster": [ + { "host": "localhost", "port": 6379 } + ] } }, "API_DOC_ENDPOINTS_ENABLED": true, diff --git a/docker-compose.yml b/docker-compose.yml index 62ed0ffeb..f20e4e41f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,20 @@ -version: "3.7" - networks: cl-mojaloop-net: name: cl-mojaloop-net +# @see https://uninterrupted.tech/blog/hassle-free-redis-cluster-deployment-using-docker/ +x-redis-node: &REDIS_NODE + image: docker.io/bitnami/redis-cluster:6.2.14 + environment: &REDIS_ENVS + ALLOW_EMPTY_PASSWORD: yes + REDIS_CLUSTER_DYNAMIC_IPS: no + REDIS_CLUSTER_ANNOUNCE_IP: ${REDIS_CLUSTER_ANNOUNCE_IP} + REDIS_NODES: localhost:6379 localhost:6380 localhost:6381 localhost:6382 localhost:6383 localhost:6384 + healthcheck: + test: [ "CMD", "redis-cli", "ping" ] + timeout: 2s + network_mode: host + services: central-ledger: image: mojaloop/central-ledger:local @@ -31,10 +42,14 @@ services: - CLEDG_MONGODB__DISABLED=false networks: - cl-mojaloop-net + extra_hosts: + - "redis-node-0:host-gateway" depends_on: - mysql - kafka - objstore + - redis-node-0 + # - redis healthcheck: test: ["CMD", "sh", "-c" ,"apk --no-cache add curl", "&&", "curl", "http://localhost:3001/health"] timeout: 20s @@ -95,20 +110,77 @@ services: start_period: 40s interval: 30s - redis: - image: redis:6.2.4-alpine - restart: "unless-stopped" + redis-node-0: + <<: *REDIS_NODE + container_name: cl_redis-node-0 environment: - - ALLOW_EMPTY_PASSWORD=yes - - REDIS_PORT=6379 - - REDIS_REPLICATION_MODE=master - - REDIS_TLS_ENABLED=no - healthcheck: - test: ["CMD", "redis-cli", "ping"] + <<: *REDIS_ENVS + REDIS_CLUSTER_CREATOR: yes + REDIS_PORT_NUMBER: 6379 + depends_on: + - redis-node-1 + - redis-node-2 + - redis-node-3 + - redis-node-4 + - redis-node-5 + redis-node-1: + <<: *REDIS_NODE + container_name: cl_redis-node-1 + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 6380 ports: - - "6379:6379" - networks: - - cl-mojaloop-net + - "16380:16380" + redis-node-2: + <<: *REDIS_NODE + container_name: cl_redis-node-2 + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 6381 + ports: + - "16381:16381" + redis-node-3: + <<: *REDIS_NODE + container_name: cl_redis-node-3 + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 6382 + ports: + - "16382:16382" + redis-node-4: + <<: *REDIS_NODE + container_name: cl_redis-node-4 + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 6383 + ports: + - "16383:16383" + redis-node-5: + <<: *REDIS_NODE + container_name: cl_redis-node-5 + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 6384 + ports: + - "16384:16384" + +## To be used with proxyCache.type === 'redis' +# redis: +# image: redis:6.2.4-alpine +# restart: "unless-stopped" +# environment: +# <<: *REDIS_ENVS +# REDIS_CLUSTER_CREATOR: yes +# depends_on: +# - redis-node-1 +# - redis-node-2 +# - redis-node-3 +# - redis-node-4 +# - redis-node-5 +# ports: +# - "6379:6379" +# networks: +# - cl-mojaloop-net mockserver: image: jamesdbloom/mockserver diff --git a/docker/central-ledger/default.json b/docker/central-ledger/default.json index 7fff2e5f4..a8b233332 100644 --- a/docker/central-ledger/default.json +++ b/docker/central-ledger/default.json @@ -84,10 +84,11 @@ }, "PROXY_CACHE": { "enabled": true, - "type": "redis", + "type": "redis-cluster", "proxyConfig": { - "host": "redis", - "port": 6379 + "cluster": [ + { "host": "redis-node-0", "port": 6379 } + ] } }, "KAFKA": { diff --git a/docker/config-modifier/configs/central-ledger.js b/docker/config-modifier/configs/central-ledger.js index 99b265c90..ef96e3977 100644 --- a/docker/config-modifier/configs/central-ledger.js +++ b/docker/config-modifier/configs/central-ledger.js @@ -16,8 +16,9 @@ module.exports = { enabled: true, type: 'redis', proxyConfig: { - host: 'redis', - port: 6379 + cluster: [ + { host: 'redis-node-0', port: 6379 } + ] } }, KAFKA: { diff --git a/docker/env.sh b/docker/env.sh new file mode 100755 index 000000000..d3e0da0e4 --- /dev/null +++ b/docker/env.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Retrieve the external IP address of the host machine (on macOS) +# or the IP address of the docker0 interface (on Linux) +get_external_ip() { + if [ "$(uname)" = "Linux" ]; then + echo "$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d/ -f1)" + else + # Need to find a way to support Windows here + echo "$(route get ifconfig.me | grep interface | sed -e 's/.*: //' | xargs ipconfig getifaddr)" + fi +} + +# set/override dynamic variables +export REDIS_CLUSTER_ANNOUNCE_IP=$(get_external_ip) diff --git a/package-lock.json b/package-lock.json index 5e81f49d0..15ee2fdda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@mojaloop/central-services-stream": "11.3.1", "@mojaloop/database-lib": "11.0.6", "@mojaloop/event-sdk": "14.1.1", - "@mojaloop/inter-scheme-proxy-cache-lib": "^2.2.0", + "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0-snapshot.9", "@mojaloop/ml-number": "11.2.4", "@mojaloop/object-store-lib": "12.0.3", "@now-ims/hapi-now-auth": "2.1.0", @@ -1791,9 +1791,9 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@mojaloop/inter-scheme-proxy-cache-lib": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@mojaloop/inter-scheme-proxy-cache-lib/-/inter-scheme-proxy-cache-lib-2.2.0.tgz", - "integrity": "sha512-QrbJlhy7f7Tf1DTjspxqtw0oN3eUAm5zKfCm7moQIYFEV3MYF3rsbODLpgxyzmAO8FFi2Dky/ff7QMVnlA/P9A==", + "version": "2.3.0-snapshot.9", + "resolved": "https://registry.npmjs.org/@mojaloop/inter-scheme-proxy-cache-lib/-/inter-scheme-proxy-cache-lib-2.3.0-snapshot.9.tgz", + "integrity": "sha512-BtK2A6ecNj9TBg1U/UQ5mdW+aXfb9c7rBnYViY+vMZZ1A+El4xPGGOQ9qpFGzOfhpXgBVwqLpwSbklt6fnK0Sg==", "dependencies": { "@mojaloop/central-services-logger": "11.5.0", "ajv": "^8.17.1", diff --git a/package.json b/package.json index c8e17f6e8..6e3331c26 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "migrate:current": "npx knex migrate:currentVersion $npm_package_config_knex", "seed:run": "npx knex seed:run $npm_package_config_knex", "docker:build": "docker build --build-arg NODE_VERSION=\"$(cat .nvmrc)-alpine\" -t mojaloop/central-ledger:local .", - "docker:up": "docker-compose -f docker-compose.yml up", + "docker:up": ". ./docker/env.sh && docker-compose -f docker-compose.yml up", "docker:up:backend": "docker-compose up -d ml-api-adapter mysql mockserver kafka kowl temp_curl", "docker:up:int": "docker compose up -d kafka init-kafka objstore mysql", "docker:script:populateTestData": "sh ./test/util/scripts/populateTestData.sh", @@ -96,7 +96,7 @@ "@mojaloop/central-services-stream": "11.3.1", "@mojaloop/database-lib": "11.0.6", "@mojaloop/event-sdk": "14.1.1", - "@mojaloop/inter-scheme-proxy-cache-lib": "^2.2.0", + "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0-snapshot.9", "@mojaloop/ml-number": "11.2.4", "@mojaloop/object-store-lib": "12.0.3", "@now-ims/hapi-now-auth": "2.1.0", diff --git a/test/scripts/test-integration.sh b/test/scripts/test-integration.sh index c3ca079ee..42156e6c8 100644 --- a/test/scripts/test-integration.sh +++ b/test/scripts/test-integration.sh @@ -5,7 +5,7 @@ echo MYSQL_VERSION=${MYSQL_VERSION:-"latest"} KAFKA_VERSION=${MYSQL_VERSION:-"latest"} -INT_TEST_SKIP_SHUTDOWN=${INT_TEST_SKIP_SHUTDOWN:-false} +INT_TEST_SKIP_SHUTDOWN=${INT_TEST_SKIP_SHUTDOWN:-true} echo "==> Variables:" echo "====> MYSQL_VERSION=$MYSQL_VERSION" @@ -18,10 +18,13 @@ TTK_FUNC_TEST_EXIT_CODE=1 ## Make reports directory mkdir ./test/results +## Set environment variables +source ./docker/env.sh + ## Start backend services echo "==> Starting Docker backend services" -docker compose pull mysql kafka init-kafka redis -docker compose up -d mysql kafka init-kafka redis +docker compose pull mysql kafka init-kafka redis-node-0 +docker compose up -d mysql kafka init-kafka redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 docker compose ps npm run wait-4-docker From 6bc71b29d446dc3b364f2e5320209391610eba98 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Thu, 22 Aug 2024 15:46:25 +0100 Subject: [PATCH 2/6] ci: update script --- test/scripts/test-integration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/test-integration.sh b/test/scripts/test-integration.sh index 42156e6c8..ef93080aa 100644 --- a/test/scripts/test-integration.sh +++ b/test/scripts/test-integration.sh @@ -5,7 +5,7 @@ echo MYSQL_VERSION=${MYSQL_VERSION:-"latest"} KAFKA_VERSION=${MYSQL_VERSION:-"latest"} -INT_TEST_SKIP_SHUTDOWN=${INT_TEST_SKIP_SHUTDOWN:-true} +INT_TEST_SKIP_SHUTDOWN=${INT_TEST_SKIP_SHUTDOWN:-false} echo "==> Variables:" echo "====> MYSQL_VERSION=$MYSQL_VERSION" From b1ea5e474c22c56f4447ae00bc5c9b13266a1bd6 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Thu, 22 Aug 2024 16:27:52 +0100 Subject: [PATCH 3/6] chore: update dependencies --- package-lock.json | 93 +++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 62 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 15ee2fdda..6e7af54ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@hapi/vision": "7.0.3", "@mojaloop/central-services-error-handling": "13.0.1", "@mojaloop/central-services-health": "15.0.0", - "@mojaloop/central-services-logger": "11.5.0", + "@mojaloop/central-services-logger": "11.5.1", "@mojaloop/central-services-metrics": "12.0.8", "@mojaloop/central-services-shared": "18.6.3", "@mojaloop/central-services-stream": "11.3.1", @@ -556,6 +556,14 @@ "node": ">=6.9.0" } }, + "node_modules/@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", + "engines": { + "node": ">=0.1.90" + } + }, "node_modules/@dabh/diagnostics": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", @@ -1562,22 +1570,14 @@ } }, "node_modules/@mojaloop/central-services-logger": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-logger/-/central-services-logger-11.5.0.tgz", - "integrity": "sha512-pH73RiJ5fKTBTSdLocp1vPBad1D+Kh0HufdcfjLaBQj3dIBq72si0k+Z3L1MeOmMqMzpj+8M/he/izlgqJjVJA==", + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-logger/-/central-services-logger-11.5.1.tgz", + "integrity": "sha512-l+6+w35NqFJn1Xl82l55x71vCARWTkO6hYAgwbFuqVRqX0jqaRi4oiXG2WwPRVMLqVv8idAboCMX/I6vg/d4Kw==", "dependencies": { "parse-strings-in-object": "2.0.0", "rc": "1.2.8", "safe-stable-stringify": "^2.4.3", - "winston": "3.13.1" - } - }, - "node_modules/@mojaloop/central-services-logger/node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "engines": { - "node": ">=0.1.90" + "winston": "3.14.2" } }, "node_modules/@mojaloop/central-services-logger/node_modules/readable-stream": { @@ -1594,9 +1594,9 @@ } }, "node_modules/@mojaloop/central-services-logger/node_modules/winston": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", - "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", + "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", @@ -1805,6 +1805,51 @@ "node": ">=18.x" } }, + "node_modules/@mojaloop/inter-scheme-proxy-cache-lib/node_modules/@mojaloop/central-services-logger": { + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-logger/-/central-services-logger-11.5.0.tgz", + "integrity": "sha512-pH73RiJ5fKTBTSdLocp1vPBad1D+Kh0HufdcfjLaBQj3dIBq72si0k+Z3L1MeOmMqMzpj+8M/he/izlgqJjVJA==", + "dependencies": { + "parse-strings-in-object": "2.0.0", + "rc": "1.2.8", + "safe-stable-stringify": "^2.4.3", + "winston": "3.13.1" + } + }, + "node_modules/@mojaloop/inter-scheme-proxy-cache-lib/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@mojaloop/inter-scheme-proxy-cache-lib/node_modules/winston": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", + "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", + "dependencies": { + "@colors/colors": "^1.6.0", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.6.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.7.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, "node_modules/@mojaloop/ml-number": { "version": "11.2.4", "resolved": "https://registry.npmjs.org/@mojaloop/ml-number/-/ml-number-11.2.4.tgz", @@ -8601,14 +8646,6 @@ "node": ">= 12.0.0" } }, - "node_modules/logform/node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/long": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", @@ -14642,14 +14679,6 @@ "node": ">= 6" } }, - "node_modules/winston/node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/winston/node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", diff --git a/package.json b/package.json index 6e3331c26..15cbca758 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "@hapi/vision": "7.0.3", "@mojaloop/central-services-error-handling": "13.0.1", "@mojaloop/central-services-health": "15.0.0", - "@mojaloop/central-services-logger": "11.5.0", + "@mojaloop/central-services-logger": "11.5.1", "@mojaloop/central-services-metrics": "12.0.8", "@mojaloop/central-services-shared": "18.6.3", "@mojaloop/central-services-stream": "11.3.1", From cd5ba223b903c712070b96456bc1ccf2a26a3182 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Thu, 22 Aug 2024 17:13:04 +0100 Subject: [PATCH 4/6] ci: use redis standalone in func tests --- docker/config-modifier/configs/central-ledger.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/config-modifier/configs/central-ledger.js b/docker/config-modifier/configs/central-ledger.js index ef96e3977..99b265c90 100644 --- a/docker/config-modifier/configs/central-ledger.js +++ b/docker/config-modifier/configs/central-ledger.js @@ -16,9 +16,8 @@ module.exports = { enabled: true, type: 'redis', proxyConfig: { - cluster: [ - { host: 'redis-node-0', port: 6379 } - ] + host: 'redis', + port: 6379 } }, KAFKA: { From 84a9f9258b2d9a5d903001c0aed15369350c2d5f Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Fri, 23 Aug 2024 09:16:22 +0100 Subject: [PATCH 5/6] ci: fix config override --- Dockerfile | 2 +- docker/config-modifier/configs/central-ledger.js | 1 + test-integration.Dockerfile | 2 +- test.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58e2332bf..b7cbc27aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG NODE_VERSION=lts-alpine # # Build Image -FROM node:${NODE_VERSION} as builder +FROM node:${NODE_VERSION} AS builder WORKDIR /opt/app diff --git a/docker/config-modifier/configs/central-ledger.js b/docker/config-modifier/configs/central-ledger.js index 99b265c90..902498719 100644 --- a/docker/config-modifier/configs/central-ledger.js +++ b/docker/config-modifier/configs/central-ledger.js @@ -16,6 +16,7 @@ module.exports = { enabled: true, type: 'redis', proxyConfig: { + cluster: undefined, host: 'redis', port: 6379 } diff --git a/test-integration.Dockerfile b/test-integration.Dockerfile index cca862220..4772cae9e 100644 --- a/test-integration.Dockerfile +++ b/test-integration.Dockerfile @@ -2,7 +2,7 @@ ARG NODE_VERSION=lts-alpine # Build Image -FROM node:${NODE_VERSION} as builder +FROM node:${NODE_VERSION} AS builder USER root diff --git a/test.Dockerfile b/test.Dockerfile index 6d8b708cb..e2174a439 100644 --- a/test.Dockerfile +++ b/test.Dockerfile @@ -2,7 +2,7 @@ ARG NODE_VERSION=lts-alpine # Build Image -FROM node:${NODE_VERSION} as builder +FROM node:${NODE_VERSION} AS builder USER root From 2133666c85071f196173548842e448761b11c24b Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Fri, 23 Aug 2024 10:17:36 +0100 Subject: [PATCH 6/6] chore: update dps --- package-lock.json | 55 +++++------------------------------------------ package.json | 2 +- 2 files changed, 6 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e7af54ca..a7a934a7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@mojaloop/central-services-stream": "11.3.1", "@mojaloop/database-lib": "11.0.6", "@mojaloop/event-sdk": "14.1.1", - "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0-snapshot.9", + "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0", "@mojaloop/ml-number": "11.2.4", "@mojaloop/object-store-lib": "12.0.3", "@now-ims/hapi-now-auth": "2.1.0", @@ -1791,11 +1791,11 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@mojaloop/inter-scheme-proxy-cache-lib": { - "version": "2.3.0-snapshot.9", - "resolved": "https://registry.npmjs.org/@mojaloop/inter-scheme-proxy-cache-lib/-/inter-scheme-proxy-cache-lib-2.3.0-snapshot.9.tgz", - "integrity": "sha512-BtK2A6ecNj9TBg1U/UQ5mdW+aXfb9c7rBnYViY+vMZZ1A+El4xPGGOQ9qpFGzOfhpXgBVwqLpwSbklt6fnK0Sg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@mojaloop/inter-scheme-proxy-cache-lib/-/inter-scheme-proxy-cache-lib-2.3.0.tgz", + "integrity": "sha512-k24azZiBhj8rbszwpsaEfjcMvWFpeT0MfRkU3haiPTPqiV6dFplIBV+Poi4F9a9Ei+X3qcUfZdvU0TWVMR4pbA==", "dependencies": { - "@mojaloop/central-services-logger": "11.5.0", + "@mojaloop/central-services-logger": "11.5.1", "ajv": "^8.17.1", "convict": "^6.2.4", "fast-safe-stringify": "^2.1.1", @@ -1805,51 +1805,6 @@ "node": ">=18.x" } }, - "node_modules/@mojaloop/inter-scheme-proxy-cache-lib/node_modules/@mojaloop/central-services-logger": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-logger/-/central-services-logger-11.5.0.tgz", - "integrity": "sha512-pH73RiJ5fKTBTSdLocp1vPBad1D+Kh0HufdcfjLaBQj3dIBq72si0k+Z3L1MeOmMqMzpj+8M/he/izlgqJjVJA==", - "dependencies": { - "parse-strings-in-object": "2.0.0", - "rc": "1.2.8", - "safe-stable-stringify": "^2.4.3", - "winston": "3.13.1" - } - }, - "node_modules/@mojaloop/inter-scheme-proxy-cache-lib/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@mojaloop/inter-scheme-proxy-cache-lib/node_modules/winston": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", - "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", - "dependencies": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.2", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.6.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.7.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/@mojaloop/ml-number": { "version": "11.2.4", "resolved": "https://registry.npmjs.org/@mojaloop/ml-number/-/ml-number-11.2.4.tgz", diff --git a/package.json b/package.json index 15cbca758..17ced476b 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@mojaloop/central-services-stream": "11.3.1", "@mojaloop/database-lib": "11.0.6", "@mojaloop/event-sdk": "14.1.1", - "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0-snapshot.9", + "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0", "@mojaloop/ml-number": "11.2.4", "@mojaloop/object-store-lib": "12.0.3", "@now-ims/hapi-now-auth": "2.1.0",