chore: sync pisp/master with master (#398)

* Updated versions for error-handler, etc... (#342) * Bugfix/send request span finishing before function completed (#352) * Initial Commit. * Upload domain/participant test. * Upload domain/participant test. * fixes for getParticipantsByTypeId test failing. now functioning properly removed validator file as it isn't used may be required in MSISDN oracle as it validated mobile number formats * Checking in testing code. * removal of vscode config * updated gitignore * fixes for stubbing issues * fix for bug mojaloop/project#797 Fixes for sonarQube code sanity i.e removing function names that aren't needed, changing let to const, reordering functions in file Changed unique constraint on oracleEndpoint which is now working correctly * fix for only retrieving default entries return undefined for currency when it is not available * fix for returning null for valid oracle lookup * correct database port * removal of isOracle for header validation * fix for incorrect endpoint being requested for callback response * updated with pre-commit to manage dependencies * Updated versions of ALS dependencies and updated standard changes * incorrect port for database being set * Fix for bug: mojaloop/project#1412 Updated dependencies * revert port change * fixes for incorrect span used and fspiop error not set. Fixes removed await for participants requests Co-authored-by: Henk Kodde <henk.kodde@modusbox.com> * Updated api_swagger.json as per version 1.1 of the FSPIOP spec and re… (#348) * Updated api_swagger.json as per version 1.1 of the FSPIOP spec and removed unused type definitions * Updated audit decisions * Updated audit decisions * Update src/interface/api_swagger.json Co-authored-by: Sam <elnyry@users.noreply.github.com> * Fixed references to type definitions in api_swagger * Bumped version number to 10.4.0 Co-authored-by: Neal Donnan <neal.donnan@modusbox.com> Co-authored-by: Sam <elnyry@users.noreply.github.com> * Feature/validation for name place accents (#353) * updated ALS to use new openapi-backend framework updated dependencies fix tests * refactored to cater as per @lewisdaly suggestions * Made changes to have completely different flows for API and Admin initialisation as per @lewisdaly * fix audit issues from central-services-health * Updated python in Circle CI (#357) * Initial Commit. * Upload domain/participant test. * Upload domain/participant test. * fixes for getParticipantsByTypeId test failing. now functioning properly removed validator file as it isn't used may be required in MSISDN oracle as it validated mobile number formats * Checking in testing code. * removal of vscode config * updated gitignore * fixes for stubbing issues * fix for bug mojaloop/project#797 Fixes for sonarQube code sanity i.e removing function names that aren't needed, changing let to const, reordering functions in file Changed unique constraint on oracleEndpoint which is now working correctly * fix for only retrieving default entries return undefined for currency when it is not available * fix for returning null for valid oracle lookup * correct database port * removal of isOracle for header validation * fix for incorrect endpoint being requested for callback response * updated with pre-commit to manage dependencies * Updated versions of ALS dependencies and updated standard changes * incorrect port for database being set * updated ALS to use new openapi-backend framework updated dependencies fix tests * refactored to cater as per @lewisdaly suggestions * Made changes to have completely different flows for API and Admin initialisation as per @lewisdaly * fix audit issues from central-services-health * Changes: Updated python in circle CI Co-authored-by: Henk Kodde <henk.kodde@modusbox.com> * Updated dependencies for issue: mojaloop/project#1378 (#359) * #1484: Update FSPIOP API version (#367) * Update FSPIOP API version * Resolve audit issues * Update src/interface/admin_swagger.json Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com> * Feature/updated shared library to cater for delete (#368) * updated dependencies, added the delete payyload fix * Feature/updated openapi backend version (#369) updated version of central-services-shared to cater for the fix in openapi-backend library * updated shared lib version to allow configurable resource versions (#370) * updated shared lib version to allow configurable resource versions * added example .env for resource versions Co-authored-by: Valentin <valentin.genev@modusbox.com> * updated shared lib version (#371) Co-authored-by: Valentin <valentin.genev@modusbox.com> * Updating dependencies for new helm release (#373) * Initial Commit. * Upload domain/participant test. * Upload domain/participant test. * fixes for getParticipantsByTypeId test failing. now functioning properly removed validator file as it isn't used may be required in MSISDN oracle as it validated mobile number formats * Checking in testing code. * removal of vscode config * updated gitignore * fixes for stubbing issues * fix for bug mojaloop/project#797 Fixes for sonarQube code sanity i.e removing function names that aren't needed, changing let to const, reordering functions in file Changed unique constraint on oracleEndpoint which is now working correctly * fix for only retrieving default entries return undefined for currency when it is not available * fix for returning null for valid oracle lookup * correct database port * removal of isOracle for header validation * fix for incorrect endpoint being requested for callback response * updated with pre-commit to manage dependencies * Updated versions of ALS dependencies and updated standard changes * incorrect port for database being set * updated dependencies and version for new helm release Co-authored-by: Henk Kodde <henk.kodde@modusbox.com> * feat(security): November security review (#374) * chore(deps): update dependencies to latest versions * chore(package): bump package to `11.1.3 * Fix /documentation and /swagger.json endpoints (#375) * Replace wildcard routes with explicit routes and fix API documentation endpoints (#376) * #1885: Update API documenation (#379) * Update API documenattion * Restore default configs * Fix integration test. * Fix audit * Fix integration test config * [Security] Bump node-notifier from 8.0.0 to 8.0.1 (#381) Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 8.0.0 to 8.0.1. **This update includes a security fix.** - [Release notes](https://github.com/mikaelbr/node-notifier/releases) - [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md) - [Commits](mikaelbr/node-notifier@v8.0.0...v8.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * chore: update license file (#377) Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com> * fix: package.json & package-lock.json to reduce vulnerabilities (#386) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AXIOS-1038255 - https://snyk.io/vuln/SNYK-JS-LODASH-590103 * chore: fix broken links in readme (#387) * Revert "fix: package.json & package-lock.json to reduce vulnerabilities (#386)" (#388) This reverts commit 9eccdf5. * Add codeowners for the core repo (#390) * feat(ci/cd): add pr title check (#395) * feat: allow multiple fsps per msisdn, instead of sending request for first party (#385) * MultipleDfspPerMsisdn: Instead of sending request for first party only, iterate partyList and send request for each party on the list. Also update dep and devDep versions minus central-service-health which breaks the unit tests * feature/multipledfspspermsisdn: Bump versions to latest except central-services-health that if bumped to next version 11.0.0 breaks unit tests per mojaloop issue 1987 Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com> * fix: proper status code for health check (#396) * fix: Core handler services that have a dependency on central-services-database are not loading all tables on startup #816 fix for mojaloop/project#1888. Fix issue by changing all `Db.<table>.*` syntax function operations to `Db.from('<table>').*`. The issue was caused by the central-services-database Database class on Db.connect() loading all tables via an SQL request, and creating a Class property (`Db.<table>`) to reference the Table object. The issue here being that the query to fetch all the tables from the database does not return all tables (to be investigated in future). `Db.from('<table>').*` ensures that the table object is created properly. * chore: fix circleci Co-authored-by: Adrian Enns <ennsak@gmail.com> Co-authored-by: Rajiv Mothilal <rajivmothilal@gmail.com> Co-authored-by: Henk Kodde <henk.kodde@modusbox.com> Co-authored-by: ndonnan <neal.donnan@gmail.com> Co-authored-by: Neal Donnan <neal.donnan@modusbox.com> Co-authored-by: Sam <elnyry@users.noreply.github.com> Co-authored-by: Steven Oderayi <oderayi@gmail.com> Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com> Co-authored-by: Valentin Genev <vgenev@gmail.com> Co-authored-by: Valentin <valentin.genev@modusbox.com> Co-authored-by: Lewis Daly <lewis@vesselstech.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Snyk bot <github+bot@snyk.io> Co-authored-by: Juan Correa <gibaros@users.noreply.github.com> Co-authored-by: shashi165 <33355509+shashi165@users.noreply.github.com> Co-authored-by: vijayg10 <33152110+vijayg10@users.noreply.github.com>
mojaloop · Feb 22, 2021 · d62389c · d62389c
1 parent 777a3b3
commit d62389c
Show file tree

Hide file tree

Showing 35 changed files with 2,307 additions and 3,226 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,6 +10,7 @@ orbs:
   anchore: anchore/anchore-engine@1.6.0
   deploy-kube: mojaloop/deployment@0.1.6
   slack: circleci/slack@3.4.2
+  pr-tools: mojaloop/pr-tools@0.1.8
 
 ##
 # defaults
@@ -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: |
@@ -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}"'
@@ -357,6 +347,8 @@ workflows:
   version: 2
   build_and_test:
     jobs:
+      - pr-tools/pr-title-check:
+          context: org-global
       - setup:
           context: org-global
           filters:
@@ -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*/
@@ -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:
                 - /.*/
@@ -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:
                 - /.*/
@@ -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:
                 - /.*/
@@ -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:
                 - /.*/

diff --git a/.eslintignore b/.eslintignore
@@ -2,3 +2,4 @@ coverage
 templates
 docs
 **/node_modules
+test
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -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 docs@example.com
+
+# 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/*  docs@example.com
+
+## 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
diff --git a/LICENSE.md b/LICENSE.md
@@ -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).
diff --git a/README.md b/README.md
@@ -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
 
@@ -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. 
diff --git a/audit-resolve.json b/audit-resolve.json
@@ -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
-}
+}
diff --git a/config/default.json b/config/default.json
@@ -49,5 +49,6 @@
       "FSPIOP_SOURCE_TO_SIGN": "switch",
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
-  }
+  },
+  "API_DOC_ENDPOINTS_ENABLED": true
 }
diff --git a/docker/account-lookup-service/default.json b/docker/account-lookup-service/default.json
@@ -46,5 +46,6 @@
       "FSPIOP_SOURCE_TO_SIGN": "switch",
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
-  }
+  },
+  "API_DOC_ENDPOINTS_ENABLED": true
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ coverage @@
     templates
     docs
     **/node_modules
+    test