tracking PR pisp/master

.circleci/config.yml

@@ -25,14 +25,14 @@ defaults_Dependencies: &defaults_Dependencies |
     npm install -g node-gyp
 
 defaults_awsCliDependencies: &defaults_awsCliDependencies |
-    apk --no-cache add \
-            python \
-            py-pip \
-            groff \
-            less \
-            mailcap
-    pip install --upgrade awscli==1.14.5 s3cmd==2.0.1 python-magic
-    apk -v --purge del py-pip
+  apk upgrade --no-cache
+  apk --no-cache add \
+          python3 \
+          py3-pip \
+          groff \
+          less \
+          mailcap
+  pip3 install --upgrade pip awscli==1.14.5 s3cmd==2.0.1 python-magic
 
 defaults_license_scanner: &defaults_license_scanner
   name: Install and set up license-scanner
@@ -140,33 +140,33 @@ jobs:
             else
                 echo "Not a release (env CIRCLE_BRANCH != 'master'), skipping sending lcov.info to SonarQube."
             fi
-  
+
   vulnerability-check:
     executor: default-docker
     steps:
-      - checkout
       - run:
           name: Install general dependencies
           command: *defaults_Dependencies
+      - checkout
       - restore_cache:
           key: dependency-cache-{{ checksum "package.json" }}
       - run:
           name: Create dir for test results
           command: mkdir -p ./audit/results
       - run:
           name: Check for new npm vulnerabilities
-          command: npm run audit:check --silent -- --json > ./audit/results/auditResults.json 
+          command: npm run audit:check --silent -- --json > ./audit/results/auditResults.json
       - store_artifacts:
           path: ./audit/results
           prefix: audit
-          
+
   audit-licenses:
     executor: default-docker
     steps:
-      - checkout
       - run:
           name: Install general dependencies
           command: *defaults_Dependencies
+      - checkout
       - run:
           <<: *defaults_license_scanner
       - restore_cache:
@@ -216,10 +216,24 @@ jobs:
     executor: anchore/anchore_engine
     steps:
       - setup_remote_docker
-      - checkout
+      - run:
+          name: Install docker dependencies for anchore
+          command: |
+            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: |
+            apk --no-cache add git
+            apk --no-cache add ca-certificates
+            apk --no-cache add curl
+            apk --no-cache add openssh-client
+            apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake
+            npm config set unsafe-perm true
+            npm install -g node-gyp
       - run:
           name: Install AWS CLI dependencies
           command: *defaults_awsCliDependencies
+      - checkout
       - attach_workspace:
           at: /tmp
       - run:
@@ -283,8 +297,17 @@ jobs:
           command: |
             echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG"
             docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG
-            echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG"
-            docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_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
       - run:
           name: Slack announcement for tag releases
           command: |
@@ -301,7 +324,7 @@ jobs:
       - deploy-kube/setup_and_run:
           helm_set_values: |
             --set transaction-requests-service.image.repository=$DOCKER_ORG/$CIRCLE_PROJECT_REPONAME \
-            --set transaction-requests-service.image.tag=$CIRCLE_TAG 
+            --set transaction-requests-service.image.tag=$CIRCLE_TAG
 
 ##
 # Workflows
@@ -375,7 +398,7 @@ workflows:
             - audit-licenses
           filters:
             tags:
-              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?/
+              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(-pisp)?/
             branches:
               ignore:
                 - /.*/
@@ -385,7 +408,7 @@ workflows:
             - build
           filters:
             tags:
-              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?/
+              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(-pisp)?/
             branches:
               ignore:
                 - /.*/
@@ -395,7 +418,7 @@ workflows:
             - build
           filters:
             tags:
-              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?/
+              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(-pisp)?/
             branches:
               ignore:
                 - /.*/
@@ -406,7 +429,7 @@ workflows:
             - image-scan
           filters:
             tags:
-              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?/
+              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(-pisp)?/
             branches:
               ignore:
                 - /.*/
@@ -416,7 +439,7 @@ workflows:
             - publish
           filters:
             tags:
-              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?/
+              only: /v[0-9]+(\.[0-9]+)*(\-snapshot)?(\-hotfix(\.[0-9]+))?(-pisp)?/
             branches:
               ignore:
                 - /.*/

.eslintrc

@@ -11,19 +11,20 @@
       "off"
     ],
     "indent": [
+      "error",
       2,
-      2
+      { "SwitchCase": 1 }
     ],
     "quotes": [
-      2,
+      "error",
       "single"
     ],
     "linebreak-style": [
-      2,
+      "error",
       "unix"
     ],
     "semi": [
-      2,
+      "error",
       "never"
     ]
   },

.gitignore

@@ -68,3 +68,6 @@ typings/
 
 # VSCode directory
 .vscode
+
+# Mac
+.DS_Store

.ncurc.yml

@@ -1,9 +1,3 @@
 {
-  "reject": [
-    "@hapi/hapi",
-    "@hapi/inert",
-    "@hapi/vision",
-    "hapi-swagger",
-    "hapi-openapi"
-  ]
+  "reject": []
 }

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).

README.md

@@ -5,4 +5,5 @@
 [![CircleCI](https://circleci.com/gh/mojaloop/transaction-requests-service.svg?style=svg)](https://circleci.com/gh/mojaloop/transaction-requests-service)
 
 
-Swagger api [location](src/interface/swagger.json)
+## Interface Specifications
+- OpenAPI v3 Interface Specification: [src/interface/openapi.yaml](src/interface/openapi.yaml)