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

chore: sync pisp/master with master #398

Merged
merged 28 commits into from
Feb 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1363ddb
Updated versions for error-handler, etc... (#342)
aenns May 29, 2020
883ec9e
Bugfix/send request span finishing before function completed (#352)
rmothilal Jun 2, 2020
c29c080
Updated api_swagger.json as per version 1.1 of the FSPIOP spec and re…
ndonnan Jun 8, 2020
ec548fc
Feature/validation for name place accents (#353)
rmothilal Jun 15, 2020
7fad1d1
Updated python in Circle CI (#357)
rmothilal Jun 15, 2020
6092813
Updated dependencies for issue: https://github.com/mojaloop/project/i…
aenns Jun 17, 2020
4a308a7
#1484: Update FSPIOP API version (#367)
oderayi Aug 6, 2020
ad7fa57
Feature/updated shared library to cater for delete (#368)
rmothilal Aug 24, 2020
e7933ac
Feature/updated openapi backend version (#369)
rmothilal Aug 27, 2020
a8896d8
updated shared lib version to allow configurable resource versions (#…
vgenev Sep 9, 2020
08ddbd4
updated shared lib version (#371)
vgenev Sep 21, 2020
3ca778a
Updating dependencies for new helm release (#373)
rmothilal Oct 1, 2020
007bc5e
feat(security): November security review (#374)
lewisdaly Nov 4, 2020
1df4f5b
Fix /documentation and /swagger.json endpoints (#375)
oderayi Nov 25, 2020
856c15a
Replace wildcard routes with explicit routes and fix API documentatio…
oderayi Nov 26, 2020
0cf0508
#1885: Update API documenation (#379)
oderayi Dec 14, 2020
39037f4
[Security] Bump node-notifier from 8.0.0 to 8.0.1 (#381)
dependabot-preview[bot] Dec 29, 2020
363c117
chore: update license file (#377)
lewisdaly Dec 29, 2020
9eccdf5
fix: package.json & package-lock.json to reduce vulnerabilities (#386)
snyk-bot Jan 15, 2021
c93f4aa
chore: fix broken links in readme (#387)
lewisdaly Jan 19, 2021
f9fe56e
Revert "fix: package.json & package-lock.json to reduce vulnerabiliti…
elnyry-sam-k Jan 21, 2021
5b3f3de
Add codeowners for the core repo (#390)
elnyry-sam-k Jan 25, 2021
d3f9025
feat(ci/cd): add pr title check (#395)
lewisdaly Feb 5, 2021
f95a849
feat: allow multiple fsps per msisdn, instead of sending request for …
gibaros Feb 7, 2021
ac81d96
fix: proper status code for health check (#396)
shashi165 Feb 10, 2021
f1eb4ee
fix: Core handler services that have a dependency on central-services…
vijayg10 Feb 12, 2021
ca7354e
Merge remote-tracking branch 'upstream/master' into test/changes
kleyow Feb 22, 2021
05e0c01
chore: fix circleci
kleyow Feb 22, 2021
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
30 changes: 11 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ orbs:
anchore: anchore/[email protected]
deploy-kube: mojaloop/[email protected]
slack: circleci/[email protected]
pr-tools: mojaloop/[email protected]

##
# defaults
Expand Down Expand Up @@ -239,7 +240,7 @@ jobs:
- run:
name: Install docker dependencies for anchore
command: |
apk add --update py-pip docker python3-dev libffi-dev openssl-dev gcc libc-dev make jq npm
apk add --update python3 py3-pip docker python3-dev libffi-dev openssl-dev gcc libc-dev make jq npm
- run:
name: Install general dependencies
command: |
Expand Down Expand Up @@ -316,19 +317,8 @@ jobs:
command: |
echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG"
docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG

case "$CIRCLE_TAG" in
*-pisp*)
# Don't update `late5t` for an image that has a `-pisp`
echo 'skipping late5t tag'
exit 0
;;
*)
echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG"
docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG
;;
esac

echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG"
docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG
- slack/status:
webhook: "$SLACK_WEBHOOK_ANNOUNCEMENT"
success_message: '*"${CIRCLE_PROJECT_REPONAME}"* - Release \`"${CIRCLE_TAG}"\` \nhttps://github.com/mojaloop/"${CIRCLE_PROJECT_REPONAME}"/releases/tag/"${CIRCLE_TAG}"'
Expand Down Expand Up @@ -357,6 +347,8 @@ workflows:
version: 2
build_and_test:
jobs:
- pr-tools/pr-title-check:
context: org-global
- setup:
context: org-global
filters:
Expand Down Expand Up @@ -416,7 +408,7 @@ workflows:
- setup
filters:
tags:
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(\-pisp)?/
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?/
branches:
ignore:
- /feature*/
Expand All @@ -432,7 +424,7 @@ workflows:
- audit-licenses
filters:
tags:
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(\-pisp)?/
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?/
branches:
ignore:
- /.*/
Expand All @@ -442,7 +434,7 @@ workflows:
- build
filters:
tags:
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(\-pisp)?/
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?/
branches:
ignore:
- /.*/
Expand All @@ -452,7 +444,7 @@ workflows:
- build
filters:
tags:
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(\-pisp)?/
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?/
branches:
ignore:
- /.*/
Expand All @@ -463,7 +455,7 @@ workflows:
- image-scan
filters:
tags:
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(\-pisp)?/
only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?/
branches:
ignore:
- /.*/
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ coverage
templates
docs
**/node_modules
test
38 changes: 38 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This is a comment.
# Each line is a file pattern followed by one or more owners.

## These owners will be the default owners for everything in
## the repo. Unless a later match takes precedence,
## @global-owner1 and @global-owner2 will be requested for
## review when someone opens a pull request.
#* @global-owner1 @global-owner2
* @vgenev @mdebarros @elnyry-sam-k @lewisdaly @oderayi @shashi165

## 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
## owner(s) will be requested for a review.
# *.js @js-owner

## You can also use email addresses if you prefer. They'll be
## used to look up users just like we do for commit author
## emails.
#*.go [email protected]

# In this example, @doctocat owns any files in the build/logs
# directory at the root of the repository and any of its
# subdirectories.
# /build/logs/ @doctocat

## The `docs/*` pattern will match files like
## `docs/getting-started.md` but not further nested files like
## `docs/build-app/troubleshooting.md`.
# docs/* [email protected]

## In this example, @octocat owns any file in an apps directory
## anywhere in your repository.
#apps/ @octocat

## In this example, @doctocat owns any file in the `/docs`
## directory in the root of your repository.
#/docs/ @doctocat
8 changes: 4 additions & 4 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# LICENSE

Copyright © 2017 Bill & Melinda Gates Foundation
Copyright © 2020 Mojaloop Foundation

The Mojaloop files are made available by the Bill & Melinda Gates 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). You may obtain a copy of the License at
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).

[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)

Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the [License](http://www.apache.org/licenses/LICENSE-2.0).
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@


## Documentation
[Documentation](http://mojaloop.io/documentation/mojaloop-technical-overview/account-lookup-service/) \
[API Swagger](http://mojaloop.io/documentation/api/#als-oracle-api) \
[Admin Swagger](http://mojaloop.io/documentation/api/#als-oracle-api) <!--This currently points to API but will be updated when Admin documentation is created-->

- [Documentation](http://docs.mojaloop.io/documentation/mojaloop-technical-overview/account-lookup-service/)
- [API Swagger Reference](/src/interface/api-swagger.yaml)
- [Admin Swagger Referemce](/src/interface/admin-swagger.yaml)

## Database initialisation

Expand Down Expand Up @@ -149,4 +148,4 @@ For more information on anchore and anchore-cli, refer to:

## Additional Notes:

- For all put parties callbacks `FSPIOP-Destination` header is considered to be mandatory.
- For all put parties callbacks `FSPIOP-Destination` header is considered to be mandatory.
88 changes: 78 additions & 10 deletions audit-resolve.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,89 @@
{
"decisions": {
"1594|@mojaloop/central-services-health>@mojaloop/central-services-shared>axios": {
"1589|@mojaloop/central-services-database>knex>liftoff>findup-sync>resolve-dir>global-modules>global-prefix>ini": {
"decision": "fix",
"madeAt": 1607695361783
},
"1589|knex>liftoff>findup-sync>resolve-dir>global-modules>global-prefix>ini": {
"decision": "fix",
"madeAt": 1607695361783
},
"1589|@mojaloop/central-services-health>@mojaloop/central-services-logger>rc>ini": {
"decision": "fix",
"madeAt": 1607695361783
},
"1589|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/central-services-logger>rc>ini": {
"decision": "fix",
"madeAt": 1607695361783
},
"1589|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>@mojaloop/central-services-logger>rc>ini": {
"decision": "fix",
"madeAt": 1607695361783
},
"1589|@mojaloop/central-services-shared>@mojaloop/event-sdk>@mojaloop/central-services-logger>rc>ini": {
"decision": "fix",
"madeAt": 1607695361783
},
"1589|@mojaloop/event-sdk>@mojaloop/central-services-logger>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/central-services-logger>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/central-services-shared>@mojaloop/central-services-logger>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/event-sdk>grpc>node-pre-gyp>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/central-services-shared>@mojaloop/event-sdk>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/event-sdk>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|@mojaloop/central-services-shared>rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1589|rc>ini": {
"decision": "fix",
"madeAt": 1607695361784
},
"1500|@mojaloop/central-services-shared>widdershins>yargs>yargs-parser": {
"decision": "ignore",
"madeAt": 1611591504202,
"expiresAt": 1614183500617
"madeAt": 1612933382784,
"expiresAt": 1615525374032
},
"1594|@mojaloop/central-services-shared>axios": {
"1594|@mojaloop/central-services-health>@mojaloop/central-services-shared>axios": {
"decision": "ignore",
"madeAt": 1611591505344,
"expiresAt": 1614183500617
"madeAt": 1612933195636,
"expiresAt": 1615525180175
},
"1500|@mojaloop/central-services-shared>widdershins>yargs>yargs-parser": {
"1500|@mojaloop/central-services-health>@mojaloop/central-services-shared>widdershins>yargs>yargs-parser": {
"decision": "ignore",
"madeAt": 1611669398757,
"expiresAt": 1614261394229
"madeAt": 1612933382784,
"expiresAt": 1615525374032
}
},
"rules": {},
"version": 1
}
}
3 changes: 2 additions & 1 deletion config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@
"FSPIOP_SOURCE_TO_SIGN": "switch",
"JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
}
}
},
"API_DOC_ENDPOINTS_ENABLED": true
}
3 changes: 2 additions & 1 deletion docker/account-lookup-service/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,6 @@
"FSPIOP_SOURCE_TO_SIGN": "switch",
"JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
}
}
},
"API_DOC_ENDPOINTS_ENABLED": true
}
Loading