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.

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

feat(mojaloop/#3991): add support for cross-network proxy routing #341

Merged
merged 51 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
97e969a
feat: add proxy cache lib and config
oderayi Jul 2, 2024
232d143
feat: update proxy cache config
oderayi Jul 2, 2024
691c82a
feat: refactor models to use private methods for participants endpoin…
oderayi Jul 2, 2024
345f50a
feat: update model factory methods
oderayi Jul 2, 2024
7da665e
feat: update proxy cache connection routine
oderayi Jul 2, 2024
c3aa2c9
feat: refactor proxy client init
oderayi Jul 2, 2024
cb087d8
feat: update proxy init
oderayi Jul 2, 2024
c20643f
test: update unit tests
oderayi Jul 2, 2024
d6b2c24
test: add unit tests for util.getParticipantEndpoint
oderayi Jul 2, 2024
c2dc2e7
test: update tests
oderayi Jul 2, 2024
7044f06
test: update unit tests
oderayi Jul 3, 2024
74c306f
test: update unit tests
oderayi Jul 3, 2024
e790007
test: update unit tests
oderayi Jul 3, 2024
b569513
test: update unit test
oderayi Jul 3, 2024
a97ec05
test: update unit test
oderayi Jul 3, 2024
8c432cf
test: update unit test
oderayi Jul 3, 2024
ee76592
test: update tests
oderayi Jul 3, 2024
bf2eab6
chore: remove unused dep
oderayi Jul 3, 2024
78ccf52
test: add integration test for PUT /quotes/{ID}
oderayi Jul 3, 2024
1685776
feat: minor refactor
oderayi Jul 3, 2024
edc8590
feat: minor refactor
oderayi Jul 3, 2024
4ea9260
feat: minor refactor
oderayi Jul 4, 2024
70a42f5
ci: update docker-compose config
oderayi Jul 4, 2024
7680bb0
ci: add healthcheck to redis
oderayi Jul 4, 2024
8eecdc9
test: update integration test
oderayi Jul 4, 2024
484e07f
test: update integration test
oderayi Jul 4, 2024
cec18df
test: update integration test
oderayi Jul 4, 2024
07a0b52
test: update integration test
oderayi Jul 4, 2024
2b83d18
chore: linting
oderayi Jul 4, 2024
d9658f1
test: update integration test
oderayi Jul 4, 2024
5892c39
test: add integration tests for fx quotes
oderayi Jul 4, 2024
20c4d4e
test: add integration test for bulk quotes and fx quotes
oderayi Jul 4, 2024
528ca65
test: add integration tests for bulk quotes
oderayi Jul 4, 2024
deb905c
chore(snapshot): 15.8.0-snapshot.25
oderayi Jul 4, 2024
0c3766d
feat: remove retryInterval config
oderayi Jul 4, 2024
3c2939b
chore(snapshot): 15.8.0-snapshot.26
oderayi Jul 4, 2024
6115f02
ci: remove debug start
oderayi Jul 4, 2024
7687609
feat: disable proxy cache by default
oderayi Jul 4, 2024
2c59938
chore(snapshot): 15.8.0-snapshot.27
oderayi Jul 4, 2024
155ec72
feat: add db number for redis
oderayi Jul 4, 2024
f454919
feat: minor refactor
oderayi Jul 5, 2024
720e4c5
feat: minor refactor
oderayi Jul 5, 2024
dbd65a7
feat: remove support for falsy lazyConnect
oderayi Jul 5, 2024
dd1c5bf
chore(snapshot): 15.8.0-snapshot.28
oderayi Jul 5, 2024
3f59c93
feat: refactor init, proxy and update test
oderayi Jul 5, 2024
3eebad3
chore(snapshot): 15.8.0-snapshot.29
oderayi Jul 5, 2024
06fa95c
feat: throw on failed proxy connect
oderayi Jul 5, 2024
2c606be
chore(snapshot): 15.8.0-snapshot.30
oderayi Jul 5, 2024
0b4dd4b
feat: update logging
oderayi Jul 5, 2024
f5ea174
chore(snapshot): 15.8.0-snapshot.31
oderayi Jul 5, 2024
9686ada
feat: disbale proxy by default
oderayi Jul 5, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ USER root
WORKDIR /opt/app

RUN apk --no-cache add git
RUN apk add --no-cache -t build-dependencies make gcc g++ python3 libtool openssl-dev autoconf automake bash \
RUN apk add --no-cache -t build-dependencies make gcc g++ python3 py3-setuptools libtool openssl-dev autoconf automake bash \
&& cd $(npm root -g)/npm

COPY package.json package-lock.json* /opt/app/
Expand Down
10 changes: 10 additions & 0 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,16 @@
"ENUM_DATA_EXPIRES_IN_MS": 4170000,
"PARTICIPANT_DATA_EXPIRES_IN_MS": 60000
},
"PROXY_CACHE": {
"enabled": false,
"type": "redis",
"proxyConfig": {
"host": "localhost",
"port": 6379,
"db": 0
}
},
kalinkrustev marked this conversation as resolved.
Show resolved Hide resolved
"LOG_LEVEL": "info",
"KAFKA": {
"CONSUMER": {
"QUOTE": {
Expand Down
13 changes: 12 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ services:


central-ledger:
image: mojaloop/central-ledger
image: mojaloop/central-ledger:v17.7.0-snapshot.20
container_name: qs_central-ledger
ports:
- "3001:3001"
Expand Down Expand Up @@ -97,6 +97,17 @@ services:
healthcheck:
<<: *healthcheckParams
test: [ "CMD", "mysqladmin" ,"ping", "-h", "mysql" ]

redis:
image: "redis:6.2.4-alpine"
container_name: redis
ports:
- "6379:6379"
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 30s
timeout: 10s
retries: 3

# mockserver:
# image: jamesdbloom/mockserver
Expand Down
9 changes: 9 additions & 0 deletions docker/quoting-service/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@
"ENUM_DATA_EXPIRES_IN_MS": 4170000,
"PARTICIPANT_DATA_EXPIRES_IN_MS": 60000
},
"PROXY_CACHE": {
"enabled": true,
"type": "redis",
"proxyConfig": {
"host": "redis",
"port": 6379,
"db": 0
}
},
"KAFKA": {
"CONSUMER": {
"QUOTE": {
Expand Down
Loading