Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/fx-impl
Browse files Browse the repository at this point in the history
  • Loading branch information
kleyow committed Jul 4, 2024
2 parents 22c070b + 033ef63 commit 56da4c3
Show file tree
Hide file tree
Showing 8 changed files with 382 additions and 755 deletions.
13 changes: 3 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -849,10 +849,7 @@ workflows:
- setup
filters:
tags:
# Re-enable as soon as test coverage is fixed for fx
# only: /.*/
# Remove as soon as test coverage is fixed for fx
ignore: /v[0-9]+(\.[0-9]+)*\-snapshot+((\.[0-9]+)?)/
only: /.*/
branches:
ignore:
- /feature*/
Expand All @@ -863,10 +860,7 @@ workflows:
- setup
filters:
tags:
# Re-enable as soon as test coverage is fixed for fx
# only: /.*/
# Remove as soon as test coverage is fixed for fx
ignore: /v[0-9]+(\.[0-9]+)*\-snapshot+((\.[0-9]+)?)/
only: /.*/
branches:
ignore:
- /feature*/
Expand Down Expand Up @@ -1008,8 +1002,7 @@ workflows:
## Only do this check on PRs
# - test-dependencies
- test-lint
## TODO: re-enable these once we fix all the unit tests that are failing due to fx changes
# - test-unit
- test-unit
- test-coverage
- test-integration
- test-functional
Expand Down
64 changes: 64 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,70 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [17.7.8](https://github.com/mojaloop/central-ledger/compare/v17.7.7...v17.7.8) (2024-06-14)


### Chore

* dependency updates and clean up audit exceptions ([#1053](https://github.com/mojaloop/central-ledger/issues/1053)) ([3362906](https://github.com/mojaloop/central-ledger/commit/33629066e0f4949fafd572d2dc32868e312c564a))

### [17.7.7](https://github.com/mojaloop/central-ledger/compare/v17.7.6...v17.7.7) (2024-06-07)


### Chore

* updates to fix ajv vulns ([#1049](https://github.com/mojaloop/central-ledger/issues/1049)) ([6e64d28](https://github.com/mojaloop/central-ledger/commit/6e64d287be51b40e98d6ae6cefc712c5228f42f5))

### [17.7.6](https://github.com/mojaloop/central-ledger/compare/v17.7.5...v17.7.6) (2024-06-07)


### Chore

* dependency updates, cs shared ([#1048](https://github.com/mojaloop/central-ledger/issues/1048)) ([5844ee0](https://github.com/mojaloop/central-ledger/commit/5844ee0720a861da27f33649aff62be37fcdfaca))

### [17.7.5](https://github.com/mojaloop/central-ledger/compare/v17.7.4...v17.7.5) (2024-06-06)


### Chore

* dependency updates, overrides ([#1047](https://github.com/mojaloop/central-ledger/issues/1047)) ([8bd1dcd](https://github.com/mojaloop/central-ledger/commit/8bd1dcd43e9730af087a96f845cde5e7454c1a4a))

### [17.7.4](https://github.com/mojaloop/central-ledger/compare/v17.7.3...v17.7.4) (2024-06-06)


### Chore

* more dep updates to fix dependabot alerts ([#1046](https://github.com/mojaloop/central-ledger/issues/1046)) ([1ab8aa9](https://github.com/mojaloop/central-ledger/commit/1ab8aa9d0401d9019968d908774d6e19ca94374e))

### [17.7.3](https://github.com/mojaloop/central-ledger/compare/v17.7.2...v17.7.3) (2024-06-05)


### Chore

* dependency upgrades and one migration ([#1045](https://github.com/mojaloop/central-ledger/issues/1045)) ([3a94cdf](https://github.com/mojaloop/central-ledger/commit/3a94cdf0eafc6e9b53d796357b68c6d82eaa5277))

### [17.7.2](https://github.com/mojaloop/central-ledger/compare/v17.7.1...v17.7.2) (2024-06-04)


### Chore

* dependency updates to address dependabot alerts ([#1044](https://github.com/mojaloop/central-ledger/issues/1044)) ([d6bb4b9](https://github.com/mojaloop/central-ledger/commit/d6bb4b912d24f07f21822cc8079338146e0f0be6))

### [17.7.1](https://github.com/mojaloop/central-ledger/compare/v17.7.0...v17.7.1) (2024-06-04)


### Chore

* "revert feat: extend admin api to support proxy participants ([#1038](https://github.com/mojaloop/central-ledger/issues/1038))" ([#1042](https://github.com/mojaloop/central-ledger/issues/1042)) ([182142e](https://github.com/mojaloop/central-ledger/commit/182142ee76231ac4899b910c8ea2673997056b6e))
* dependency updates to use latest libraries with patches ([#1040](https://github.com/mojaloop/central-ledger/issues/1040)) ([dc672ae](https://github.com/mojaloop/central-ledger/commit/dc672ae8554732a3d9920ef45fc122fa85522488))

## [17.7.0](https://github.com/mojaloop/central-ledger/compare/v17.6.2...v17.7.0) (2024-05-31)


### Features

* extend admin api to support proxy participants ([#1038](https://github.com/mojaloop/central-ledger/issues/1038)) ([5316df3](https://github.com/mojaloop/central-ledger/commit/5316df3817c2f1066c116bfec64ac2cef1fe5d64))

### [17.6.2](https://github.com/mojaloop/central-ledger/compare/v17.6.1...v17.6.2) (2024-04-30)


Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## @global-owner1 and @global-owner2 will be requested for
## review when someone opens a pull request.
#* @global-owner1 @global-owner2
* @mdebarros @elnyry-sam-k @vijayg10 @kleyow
* @mdebarros @elnyry-sam-k @vijayg10 @kleyow @bushjames @oderayi
## Order is important; the last matching pattern takes the most
## precedence. When someone opens a pull request that only
## modifies JS files, only @js-owner and not the global
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# LICENSE

Copyright © 2020 Mojaloop Foundation
Copyright © 2020-2024 Mojaloop Foundation

The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0
(the "License") and you may not use these files except in compliance with the [License](http://www.apache.org/licenses/LICENSE-2.0).
Expand Down
29 changes: 7 additions & 22 deletions audit-ci.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,12 @@
// Only use one of ["low": true, "moderate": true, "high": true, "critical": true]
"moderate": true,
"allowlist": [ // NOTE: Please add as much information as possible to any items added to the allowList
"GHSA-v88g-cgmw-v5xw", // widdershins>swagger2openapi>oas-validator>ajv
"GHSA-mg85-8mv5-ffjr", // hapi-auth-basic>hapi>ammo
"GHSA-phwq-j96m-2c2q", // @mojaloop/central-services-shared>shins>ejs
"GHSA-7hx8-2rxv-66xv", // hapi-auth-basic>hapi
"GHSA-c429-5p7v-vgjp", // hapi>boom>hoek
"GHSA-282f-qqgm-c34q", // widdershins>swagger2openapi>better-ajv-errors>jsonpointer
"GHSA-8cf7-32gw-wr33", // @now-ims/hapi-now-auth>jsonwebtoken
"GHSA-hjrf-2m68-5959", // @now-ims/hapi-now-auth>jsonwebtoken
"GHSA-qwph-4952-7xr6", // @now-ims/hapi-now-auth>jsonwebtoken
"GHSA-6vfc-qv3f-vr6c", // widdershins>markdown-it
"GHSA-7fh5-64p2-3v2j", // @mojaloop/central-services-shared>shins>sanitize-html>postcss
"GHSA-mjxr-4v3x-q3m4", // @mojaloop/central-services-shared>shins>sanitize-html
"GHSA-rjqq-98f6-6j3r", // @mojaloop/central-services-shared>shins>sanitize-html
"GHSA-rm97-x556-q36h", // @mojaloop/central-services-shared>shins>sanitize-html
"GHSA-g64q-3vg8-8f93", // hapi-auth-basic>hapi>subtext
"GHSA-5854-jvxx-2cg9", // hapi-auth-basic>hapi>subtext
"GHSA-2mvq-xp48-4c77", // hapi-auth-basic>hapi>subtext
"GHSA-w5p7-h5w8-2hfq", // tap-spec>tap-out>trim
"GHSA-p9pc-299p-vxgp", // widdershins>yargs>yargs-parser
"GHSA-f5x3-32g6-xq36", // https://github.com/advisories/GHSA-f5x3-32g6-xq36
"GHSA-cgfm-xwp7-2cvr", // https://github.com/advisories/GHSA-cgfm-xwp7-2cvr
"GHSA-ghr5-ch3p-vcr6" // https://github.com/advisories/GHSA-ghr5-ch3p-vcr6
"GHSA-w5p7-h5w8-2hfq", // tap-spec>tap-out>trim; This has been analyzed and this is acceptable as it is used to run tests.
"GHSA-2mvq-xp48-4c77", // https://github.com/advisories/GHSA-2mvq-xp48-4c77
"GHSA-5854-jvxx-2cg9", // https://github.com/advisories/GHSA-5854-jvxx-2cg9
"GHSA-7hx8-2rxv-66xv", // https://github.com/advisories/GHSA-7hx8-2rxv-66xv
"GHSA-c429-5p7v-vgjp", // https://github.com/advisories/GHSA-c429-5p7v-vgjp
"GHSA-g64q-3vg8-8f93", // https://github.com/advisories/GHSA-g64q-3vg8-8f93
"GHSA-mg85-8mv5-ffjr" // https://github.com/advisories/GHSA-mg85-8mv5-ffjr
]
}
Loading

0 comments on commit 56da4c3

Please sign in to comment.