fix(mojaloop/#2811): sdk-scheme-adapter sending incorrect transferState on a PUT transfers Callback

.dockerignore

@@ -1,2 +1,18 @@
-*node_modules*
-*junit.xml*
+deploy/
+coverage/
+node_modules/
+.dockerignore
+.editorconfig
+.git/
+.gitignore
+.istanbul.yml
+circle.yml
+docker-compose.circle.yml
+docker-compose.dev.yml
+docker-compose.functional.yml
+docker-compose.yml
+Dockerfile
+LICENSE
+README.md
+sonar-project.properties
+.devspace/

Dockerfile

@@ -4,15 +4,20 @@ RUN apk add --no-cache git python3 build-base
 
 EXPOSE 3000
 
-WORKDIR /src
+WORKDIR /opt/app
 
 # This is super-ugly, but it means we don't have to re-run npm install every time any of the source
 # files change- only when any dependencies change- which is a superior developer experience when
 # relying on docker-compose.
 COPY ./package.json .
 COPY ./package-lock.json .
 RUN npm ci --only=production
+
+COPY src /opt/app/src
+
 FROM node:16.15.0-alpine
+WORKDIR /opt/app
+
 
 ARG BUILD_DATE
 ARG VCS_URL
@@ -28,8 +33,10 @@ LABEL org.label-schema.vcs-ref=$VCS_REF
 LABEL org.label-schema.url="https://mojaloop.io/"
 LABEL org.label-schema.version=$VERSION
 
-COPY --from=builder /src/ /src
-COPY ./src ./src
-COPY ./secrets /
+# Create a non-root user: ml-user
+RUN adduser -D ml-user 
+USER ml-user
+
+COPY --chown=ml-user --from=builder /opt/app .
 
-CMD ["node", "src/index.js"]
+CMD ["npm", "run", "start"]

audit-resolve.json

@@ -2,99 +2,58 @@
   "decisions": {
     "1075703|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs": {
       "decision": "ignore",
-      "madeAt": 1656678986448
+      "madeAt": 1657188195403,
+      "expiresAt": 1659780190646
     },
     "1075704|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs": {
       "decision": "ignore",
-      "madeAt": 1656678989848
+      "madeAt": 1657188196343,
+      "expiresAt": 1659780190646
     },
-    "1070412|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs": {
+    "1080944|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment": {
       "decision": "ignore",
-      "madeAt": 1656679958470
+      "madeAt": 1657188197274,
+      "expiresAt": 1659780190646
     },
-    "1070412|ejs": {
-      "decision": "ignore",
-      "madeAt": 1656679958471
-    },
-    "1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it": {
+    "1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it": {
       "decision": "ignore",
-      "madeAt": 1656679961621
+      "madeAt": 1657188198190,
+      "expiresAt": 1659780190646
     },
     "1070030|widdershins>markdown-it": {
       "decision": "ignore",
-      "madeAt": 1656681873020
+      "madeAt": 1657188198190,
+      "expiresAt": 1659780190646
     },
-    "1068155|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html": {
+    "1068155|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it>sanitize-html": {
       "decision": "ignore",
-      "madeAt": 1656679964361
+      "madeAt": 1657188199040,
+      "expiresAt": 1659780190646
     },
-    "1070260|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html": {
+    "1070260|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it>sanitize-html": {
       "decision": "ignore",
-      "madeAt": 1656679966871
+      "madeAt": 1657188199954,
+      "expiresAt": 1659780190646
     },
-    "1067553|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html>widdershins>swagger2openapi>better-ajv-errors>jsonpointer": {
+    "1070412|ejs": {
       "decision": "ignore",
-      "madeAt": 1656679000803
+      "madeAt": 1657188200902,
+      "expiresAt": 1659780190646
     },
     "1067553|swagger2openapi>better-ajv-errors>jsonpointer": {
       "decision": "ignore",
-      "madeAt": 1656679000803
-    },
-    "1067553|widdershins>markdown-it>swagger2openapi>better-ajv-errors>jsonpointer": {
-      "decision": "ignore",
-      "madeAt": 1656679000804
-    },
-    "1067946|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html>widdershins>swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv": {
-      "decision": "ignore",
-      "madeAt": 1656679005322
+      "madeAt": 1657188201786,
+      "expiresAt": 1659780190646
     },
     "1067946|swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv": {
       "decision": "ignore",
-      "madeAt": 1656679005322
-    },
-    "1067946|widdershins>markdown-it>swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv": {
-      "decision": "ignore",
-      "madeAt": 1656679005322
-    },
-    "1068310|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html>widdershins>swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv>yargs>yargs-parser": {
-      "decision": "ignore",
-      "madeAt": 1656679007475
-    },
-    "1068310|widdershins>markdown-it>swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv>yargs>yargs-parser": {
-      "decision": "ignore",
-      "madeAt": 1656679007475
-    },
-    "1070412|shins>ejs": {
-      "decision": "ignore",
-      "madeAt": 1656679958471
-    },
-    "1070030|shins>ejs>markdown-it": {
-      "decision": "ignore",
-      "madeAt": 1656679961621
-    },
-    "1068155|shins>ejs>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656679964361
-    },
-    "1070260|shins>ejs>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656679966871
-    },
-    "1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it": {
-      "decision": "ignore",
-      "madeAt": 1656681873020
-    },
-    "1068155|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656681876693
-    },
-    "1070260|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656681880214
+      "madeAt": 1657188202661,
+      "expiresAt": 1659780190646
     },
     "1068310|widdershins>markdown-it>yargs>yargs-parser": {
       "decision": "ignore",
-      "madeAt": 1656681883038
+      "madeAt": 1657188203603,
+      "expiresAt": 1659780190646
     }
   },
   "rules": {},

docker-compose.yml

@@ -22,9 +22,11 @@ services:
       - "4002:4002"
     depends_on:
       - redis
-    command: sh -c "/wait4/wait4.js sdk-scheme-adapter; node src/index.js"
+    command: sh -c "/tmp/wait4/wait4.js sdk-scheme-adapter && npm run start"
+    # command: sh -c "/tmp/wait4/wait4.js sdk-scheme-adapter && sleep 999999"
     volumes:
-      - ./docker/wait4:/wait4
+      - ./docker/wait4:/tmp/wait4
+      - ./secrets:/opt/app/secrets
 
   ml-testing-toolkit:
     networks: