Merge pull request #261 from bcgov/develop

Version 2.1.0

.gitignore

@@ -210,4 +210,8 @@ venv.bak/
 #Katalon
 config/.metadata
 
-minioTmp**
+minioTmp**
+.config
+.ash_history
+LOCAL.md
+_tmp

.travis.yml

@@ -178,8 +178,8 @@ matrix:
     - |-
       wget -q https://dl.minio.io/server/minio/release/linux-amd64/minio
       chmod +x minio
-      export MINIO_ACCESS_KEY="myKey"
-      export MINIO_SECRET_KEY="mySecret"
+      export MINIO_ACCESS_KEY="accesskey"
+      export MINIO_SECRET_KEY="secretkey"
       ./minio server /tmp &
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/validateApi
@@ -197,6 +197,7 @@ matrix:
       python3 wsgi.py &
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/requestApi
+      NODE_ENV=test npm start &
       sleep 15
       npm test
     - helm lint helm/request-api

frontend/.eslintrc

@@ -15,6 +15,7 @@
     "__DEV__": true,
     "FILES_API_HOST": true,
     "SOCKET_HOST": true,
+    "REQUEST_SOCKET_HOST": true,
     "VERSION": true,
     "COMMIT": true,
     "ID_FIELD": true,
@@ -29,6 +30,10 @@
   },
   "parser": "babel-eslint",
   "rules": {
+    "no-param-reassign": [
+      "error",
+      { "props": true, "ignorePropertyModificationsFor": ["socket"] }
+    ],
     "import/no-extraneous-dependencies": 0,
     "no-underscore-dangle": ["error", { "allow": ["_id", "_e"] }],
     "react/jsx-one-expression-per-line": 0

frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10-alpine
+FROM node:11-alpine
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

frontend/README.md

@@ -51,6 +51,12 @@ Defaults to `ws://localhost:3001`
 See [Request service config](../microservices/requestApi/config/default.json.example) for reference.  
 Defaults to `http://localhost:3002`
 
+#### `requestSocket: url` `required`
+
+See [Request service config](../microservices/requestApi/config/default.json.example) for reference.  
+Defaults to `ws://localhost:2998`
+
+
 #### `filesApiHost: url` `required`
 
 See [Storage service README](../microservices/storageApi/README.md) for reference.  
@@ -199,7 +205,7 @@ You will need Docker installed. Build the container by running `$ docker build .
 ```sh
 hostip=$(ifconfig en0 | awk '$1 == "inet" {print $2}')
 port=8000
-docker run -e TOKEN_ENDPOINT=<oidc token endpoint> -e USER_INFO_ENDPOINT=<oidc user info endpoint> -e AUTH_ENDPOINT=<authendpoint> -e AUTH_CALLBACK_URL=<host/auth> -e AUTH_CLIENT=<oidc client> -e AUTH_ISSUER=<oidc issuer> -e AUTH_LOGOUT_URL=<oidc logout url> -e AUTH_SCOPES="openid offline_access" -e CLIENT_SECRET=<YOUR_CLIENT_SECRET> -e JWT_SECRET=<YOUR_API_SECRET> -e COOKIE_SECRET=<COOKIE_SECRET> -e HOST=docker -e FORUM_API_HOST=$hostip:3000 -e EXPORTER_GROUP="/exporter" -e OC_GROUP="/oc" -e REPORTS_GROUP="/reports" -e EXPORTER_MODE="export" -e FORUM_SOCKET_HOST=$hostip:3001 -e REQUEST_API_HOST=$hostip:3002 -e FILES_API_HOST=$hostip:1080 -e USER_ID_FIELD=email -e PORT=$port --add-host=docker:$hostip -p $port:$port <DOCKER_IMAGE>
+docker run -e TOKEN_ENDPOINT=<oidc token endpoint> -e USER_INFO_ENDPOINT=<oidc user info endpoint> -e AUTH_ENDPOINT=<authendpoint> -e AUTH_CALLBACK_URL=<host/auth> -e AUTH_CLIENT=<oidc client> -e AUTH_ISSUER=<oidc issuer> -e AUTH_LOGOUT_URL=<oidc logout url> -e AUTH_SCOPES="openid offline_access" -e CLIENT_SECRET=<YOUR_CLIENT_SECRET> -e JWT_SECRET=<YOUR_API_SECRET> -e COOKIE_SECRET=<COOKIE_SECRET> -e HOST=docker -e FORUM_API_HOST=$hostip:3000 -e EXPORTER_GROUP="/exporter" -e OC_GROUP="/oc" -e REPORTS_GROUP="/reports" -e EXPORTER_MODE="export" -e FORUM_SOCKET_HOST=$hostip:3001 -e REQUEST_API_HOST=$hostip:3002 -e REQUEST_SOCKET_HOST=$hostip:2998 -e FILES_API_HOST=$hostip:1080 -e USER_ID_FIELD=email -e PORT=$port --add-host=docker:$hostip -p $port:$port <DOCKER_IMAGE>
 ```
 
 #### 3.3 Helm

frontend/config/test.json.example

@@ -8,6 +8,7 @@
   "forumApiHost": "localhost:3000",
   "forumSocket": "localhost:3001",
   "requestApiHost": "localhost:3002",
+  "requestSocket": "ws://localhost:2998",
   "filesApiHost": "localhost:1080",
   "exporterGroup": "/exporter",
   "ocGroup": "/oc",

frontend/entrypoint.sh

@@ -8,6 +8,7 @@ printf "\"helpURL\": \"${HELP_URL}\",\n" >> ./config/default.json
 printf "\"forumApiHost\": \"${FORUM_API_HOST}\",\n" >> ./config/default.json
 printf "\"forumSocket\": \"${FORUM_SOCKET_HOST}\",\n" >> ./config/default.json
 printf "\"requestApiHost\": \"${REQUEST_API_HOST}\",\n" >> ./config/default.json
+printf "\"requestSocket\": \"${REQUEST_SOCKET_HOST}\",\n" >> ./config/default.json
 printf "\"filesApiHost\": \"${FILES_API_HOST}\",\n" >> ./config/default.json
 printf "\"exporterGroup\": \"${EXPORTER_GROUP}\",\n" >> ./config/default.json
 printf "\"ocGroup\": \"${OC_GROUP}\",\n" >> ./config/default.json

frontend/helm/ocwa-frontend/templates/deployment.yaml

@@ -36,6 +36,8 @@ spec:
               value: "{{ .Values.forumSocket }}"
             - name: REQUEST_API_HOST
               value: "{{ .Values.requestApiHost }}"
+            - name: REQUEST_SOCKET_HOST
+              value: "{{ .Values.requestSocket }}"
             - name: FILES_API_HOST
               value: "{{ .Values.filesApiHost }}"
             - name: EXPORTER_GROUP

frontend/helm/ocwa-frontend/values.yaml

@@ -47,6 +47,7 @@ helpURL: "ocwaHelpURL"
 forumApiHost: "ocwa-forum-api.ocwa"
 forumSocket: "ocwa-forum-api.ocwa:3001"
 requestApiHost: "ocwa-requests-api.ocwa"
+requestSocket: "ocwa-request-api.ocwa:2998"
 filesApiHost: "ocwa-storage-api-mongo.ocwa"
 exporterGroup: "/exporter"
 ocGroup: "/oc"