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(2151): helm-release-v12.1.0 #843

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions Onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,9 @@ This will do the following:

### 3.2 Configure the DB environment variable and run the server

> Note: Ensure that the `sidecar` has been disabled (`SIDECAR.DISABLED=true` is disabled in the `./config/default.json`) or set environment var `export CLEDG_SIDECAR__DISABLED=true`).
> Note: If you do disable Mongodb (i.e. `CLEDG_MONGODB__DISABLED=true`), please ensure that you comment out the following line `sh /opt/wait-for/wait-for-objstore.sh` from the following file: `docker/wait-for/wait-for-central-ledger.sh`.

```bash
# disable SIDECAR in config/default.json temporary by setting
# "SIDECAR": { "DISABLED": "true", ...

# Disable the SIDECAR (required)
export CLEDG_SIDECAR__DISABLED=true

# Disable the MongoDB (optional)
export CLEDG_MONGODB__DISABLED=true

Expand Down
7 changes: 0 additions & 7 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@
"PRECISION": 18,
"SCALE": 4
},
"SIDECAR": {
"DISABLED": true,
"HOST": "localhost",
"PORT": 5678,
"CONNECT_TIMEOUT": 45000,
"RECONNECT_INTERVAL": 5000
},
"MONGODB": {
"DISABLED": true,
"URI": "mongodb://localhost:27017/mlos"
Expand Down
1 change: 0 additions & 1 deletion docker-compose.integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ services:
- ./src:/opt/central-ledger/src
# - ./node_modules:/opt/central-ledger/node_modules
environment:
- CLEDG_SIDECAR__DISABLED=true
- CLEDG_MONGODB__DISABLED=true
command:
- tail
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ services:
environment:
- LOG_LEVEL=info
- CSL_LOG_TRANSPORT=file
- CLEDG_SIDECAR__DISABLED=true
- CLEDG_MONGODB__DISABLED=false
networks:
- cl-mojaloop-net
Expand Down
7 changes: 0 additions & 7 deletions docker/central-ledger/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@
"PRECISION": 10,
"SCALE": 2
},
"SIDECAR": {
"DISABLED": true,
"HOST": "localhost",
"PORT": 5678,
"CONNECT_TIMEOUT": 45000,
"RECONNECT_INTERVAL": 5000
},
"MONGODB": {
"DISABLED": false,
"URI": "mongodb://objstore:27017/mlos"
Expand Down
108 changes: 0 additions & 108 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
"mysql": "2.18.1"
},
"devDependencies": {
"@mojaloop/forensic-logging-client": "8.3.0",
"async-retry": "1.3.1",
"faucet": "0.0.1",
"get-port": "5.1.1",
Expand Down
2 changes: 0 additions & 2 deletions src/api/ledgerAccountTypes/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@
'use strict'

const LedgerAccountTypesService = require('../../domain/ledgerAccountTypes')
const Sidecar = require('../../lib/sidecar')
const ErrorHandler = require('@mojaloop/central-services-error-handling')

const getAll = async function () {
return LedgerAccountTypesService.getAll()
}
async function create (request, h) {
Sidecar.logRequest(request)
try {
const ledgerAccountTypeExist = await LedgerAccountTypesService.getByName(request.payload.name)
if (ledgerAccountTypeExist) {
Expand Down
14 changes: 0 additions & 14 deletions src/api/participants/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ const ParticipantService = require('../../domain/participant')
const UrlParser = require('../../lib/urlParser')
const Config = require('../../lib/config')
const Util = require('@mojaloop/central-services-shared').Util
const Sidecar = require('../../lib/sidecar')
const Logger = require('@mojaloop/central-services-logger')
const ErrorHandler = require('@mojaloop/central-services-error-handling')
const Enums = require('../../lib/enumCached')
Expand Down Expand Up @@ -71,7 +70,6 @@ const handleMissingRecord = (entity) => {
}

const create = async function (request, h) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`create: request - ${JSON.stringify(request)}`)
try {
const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType')
Expand Down Expand Up @@ -115,7 +113,6 @@ const create = async function (request, h) {
}

const createHubAccount = async function (request, h) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`createHubAccount: request - ${JSON.stringify(request)}`)
try {
// start - To Do move to domain
Expand Down Expand Up @@ -179,7 +176,6 @@ const getByName = async function (request) {
}

const update = async function (request) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`update: request - ${JSON.stringify(request)}`)
try {
const updatedEntity = await ParticipantService.update(request.params.name, request.payload)
Expand All @@ -198,7 +194,6 @@ const update = async function (request) {
}

const addEndpoint = async function (request, h) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`addEndpoint: request - ${JSON.stringify(request)}`)
try {
await ParticipantService.addEndpoint(request.params.name, request.payload)
Expand All @@ -210,7 +205,6 @@ const addEndpoint = async function (request, h) {
}

const getEndpoint = async function (request) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`getEndpoint: request - ${JSON.stringify(request)}`)
try {
if (request.query.type) {
Expand Down Expand Up @@ -243,7 +237,6 @@ const getEndpoint = async function (request) {
}

const addLimitAndInitialPosition = async function (request, h) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`addLimitAndInitialPosition: request - ${JSON.stringify(request)}`)
try {
await ParticipantService.addLimitAndInitialPosition(request.params.name, request.payload)
Expand All @@ -255,7 +248,6 @@ const addLimitAndInitialPosition = async function (request, h) {
}

const getLimits = async function (request) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`getLimits: request - ${JSON.stringify(request)}`)
try {
const result = await ParticipantService.getLimits(request.params.name, request.query)
Expand All @@ -280,7 +272,6 @@ const getLimits = async function (request) {
}

const getLimitsForAllParticipants = async function (request) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`getLimitsForAllParticipants: request - ${JSON.stringify(request)}`)
try {
const result = await ParticipantService.getLimitsForAllParticipants(request.query)
Expand All @@ -306,7 +297,6 @@ const getLimitsForAllParticipants = async function (request) {
}

const adjustLimits = async function (request, h) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`adjustLimits: request - ${JSON.stringify(request)}`)
try {
const result = await ParticipantService.adjustLimits(request.params.name, request.payload)
Expand All @@ -328,7 +318,6 @@ const adjustLimits = async function (request, h) {
}

const getPositions = async function (request) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`getPositions: request - ${JSON.stringify(request)}`)
try {
return await ParticipantService.getPositions(request.params.name, request.query)
Expand All @@ -339,7 +328,6 @@ const getPositions = async function (request) {
}

const getAccounts = async function (request) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`getAccounts: request - ${JSON.stringify(request)}`)
try {
return await ParticipantService.getAccounts(request.params.name, request.query)
Expand All @@ -350,7 +338,6 @@ const getAccounts = async function (request) {
}

const updateAccount = async function (request, h) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`updateAccount: request - ${JSON.stringify(request)}`)
try {
const enums = {
Expand All @@ -370,7 +357,6 @@ const updateAccount = async function (request, h) {
}

const recordFunds = async function (request, h) {
Sidecar.logRequest(request)
Logger.isDebugEnabled && Logger.debug(`recordFunds: request - ${JSON.stringify(request)}`)
try {
const enums = await Enums.getEnums('all')
Expand Down
3 changes: 0 additions & 3 deletions src/api/settlementModels/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
'use strict'

const SettlementService = require('../../domain/settlement')
const Sidecar = require('../../lib/sidecar')
const ErrorHandler = require('@mojaloop/central-services-error-handling')
const Enums = require('../../lib/enumCached')
const Util = require('@mojaloop/central-services-shared').Util
Expand Down Expand Up @@ -77,7 +76,6 @@ const getAll = async function () {
}

const update = async function (request) {
Sidecar.logRequest(request)
try {
const updatedEntity = await SettlementService.update(request.params.name, request.payload)
if (request.payload.isActive !== undefined) {
Expand All @@ -96,7 +94,6 @@ const update = async function (request) {
}
}
const create = async function (request, h) {
Sidecar.logRequest(request)
try {
await SettlementService.createSettlementModel(request.payload)
return h.response().code(201)
Expand Down
2 changes: 0 additions & 2 deletions src/lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ module.exports = {
MONGODB_DISABLED: RC.MONGODB.DISABLED,
AMOUNT: RC.AMOUNT,
EXPIRES_TIMEOUT: RC.EXPIRES_TIMEOUT,
SIDECAR: RC.SIDECAR,
SIDECAR_DISABLED: RC.SIDECAR.DISABLED,
ERROR_HANDLING: RC.ERROR_HANDLING,
HANDLERS: RC.HANDLERS,
HANDLERS_DISABLED: RC.HANDLERS.DISABLED,
Expand Down
Loading