Merge pull request #281 from bcgov/develop

Develop
bcgov · Feb 12, 2020 · a30ad7a · a30ad7a
2 parents 0e547f0 + 38c75d5
commit a30ad7a
Show file tree

Hide file tree

Showing 78 changed files with 2,361 additions and 899 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
+os: linux
 dist: trusty
-sudo: required
 language: python
 services:
 - docker
@@ -8,13 +8,12 @@ addons:
     organization: ajc_bcgov
     token:
       secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs=
-matrix:
+jobs:
   include:
   - name: Forum Api
     stage: APIs
     language: node_js
-    node_js:
-    - lts/*
+    node_js: lts/*
     cache: npm
     addons:
       apt:
@@ -72,8 +71,7 @@ matrix:
   - name: Project Api
     stage: APIs
     language: node_js
-    node_js:
-    - lts/*
+    node_js: lts/*
     cache: npm
     addons:
       apt:
@@ -131,8 +129,7 @@ matrix:
   - name: Request Api
     stage: APIs
     language: node_js
-    node_js:
-    - lts/*
+    node_js: lts/*
     cache: npm
     addons:
       apt:
@@ -141,6 +138,7 @@ matrix:
         packages:
         - g++-4.8
         - python3-pip
+        - python3.5
     before_script:
     - |-
       wget -q ${HELM_URL}/${HELM_TGZ}
@@ -192,19 +190,21 @@ matrix:
       export MINIO_SECRET_KEY="secretkey"
       ./minio server /tmp &
     - |-
+      alias python3=python3.5
       cd /home/travis/build/bcgov/OCWA/microservices/validateApi
       sudo pip3 install -U setuptools
       sudo pip3 install -r requirements.txt
       cp config/default.json.template config/default.json
       sudo pip3 install -e .
-      python3 wsgi.py &
+      python3.5 wsgi.py &
     - |-
+      alias python3=python3.5
       cd /home/travis/build/bcgov/OCWA/microservices/policyApi
       sudo pip3 install -U setuptools
       sudo pip3 install -r requirements.txt
       cp config/default.json.template config/default.json
       sudo pip3 install -e .
-      python3 wsgi.py &
+      python3.5 wsgi.py &
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/requestApi
       NODE_ENV=test npm start &
@@ -229,8 +229,7 @@ matrix:
   - name: Policy Api
     stage: APIs
     language: python
-    python:
-    - '3.6'
+    python: '3.6'
     cache: pip
     addons:
       apt:
@@ -281,8 +280,7 @@ matrix:
   - name: Validation Api
     stage: APIs
     language: python
-    python:
-    - '3.6'
+    python: '3.6'
     cache: pip
     addons:
       apt:
@@ -339,8 +337,7 @@ matrix:
   - name: Front End
     stage: Frontend
     language: node_js
-    node_js:
-    - lts/*
+    node_js: lts/*
     cache: npm
     addons:
       apt:
@@ -449,13 +446,21 @@ matrix:
       if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
         xvfb-run --auto-servernum --server-args='-screen 0, 1440x900x24' ./katalon -noSplash -runMode=console -projectPath='/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj' -retry=0 -testSuitePath='Test Suites/FullFeatureSuite' -executionProfile='Travis' -browserType='Chrome (headless)' && xvfb-run --auto-servernum --server-args='-screen 0, 1440x900x24' ./katalon -noSplash -runMode=console -projectPath='/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj' -retry=0 -testSuitePath='Test Suites/AccessSuite' -executionProfile='Travis' -browserType='Chrome (headless)'
       fi
+      if [ "$TRAVIS_TEST_RESULT" = "1" ]; then
+        docker ps -a;
+        docker logs ocwa_forum_api
+        docker logs ocwa_validate_api
+        docker logs ocwa_policy_api
+        docker logs ocwa_project_api
+        docker logs ocwa_request_api
+        docker logs ocwa_frontend
+      fi
 
 
   - name: OCWA Master Helm Chart
     stage: Tests
     language: python
-    python:
-    - '3.6'
+    python: '3.6'
     cache: pip
     install:
     - |-

diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -2,6 +2,7 @@ config/*.json
 # Logs
 logs
 *.log
+server/logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

diff --git a/frontend/config/default.json.example b/frontend/config/default.json.example
@@ -1,6 +1,8 @@
 {
   "port": 8000,
   "wsPort": 3001,
+  "logLevel": "info",
+  "morganLogLevel": "dev",
   "cookieSecret": "COOKIE_SECRET_HERE",
   "jwtSecret": "JWT_SECRET_HERE",
   "helpURL": "EXTERNAL DOCUMENTATION URL (optional)",

diff --git a/frontend/config/test.json.example b/frontend/config/test.json.example
@@ -1,6 +1,8 @@
 {
   "port": 8000,
   "wsPort": 3001,
+  "logLevel": "error",
+  "morganLogLevel": "dev",
   "cookieSecret": "COOKIE_SECRET_HERE",
   "jwtSecret": "JWT_SECRET_HERE",
   "helpURL": "EXTERNAL DOCUMENTATION URL (optional)",

diff --git a/frontend/entrypoint.sh b/frontend/entrypoint.sh
@@ -5,6 +5,8 @@ printf "{\n" > ./config/default.json
 printf "\"port\": \"${PORT}\",\n" >> ./config/default.json
 printf "\"host\": \"${HOST}\",\n" >> ./config/default.json
 printf "\"helpURL\": \"${HELP_URL}\",\n" >> ./config/default.json
+printf "\"logLevel\": \"${LOG_LEVEL}\",\n" >> ./config/default.json
+printf "\"morganLogLevel\": \"dev\",\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

diff --git a/frontend/helm/ocwa-frontend/templates/deployment.yaml b/frontend/helm/ocwa-frontend/templates/deployment.yaml
@@ -28,6 +28,8 @@ spec:
               value: "{{ .Values.port }}"
             - name: HOST
               value: {{ .Values.host }}
+            - name: LOG_LEVEL
+              value: {{ .Values.logLevel }}
             - name: HELP_URL
               value: "{{ .Values.helpURL }}"
             - name: FORUM_API_HOST

diff --git a/frontend/helm/ocwa-frontend/templates/downloadDeployment.yaml b/frontend/helm/ocwa-frontend/templates/downloadDeployment.yaml
@@ -28,6 +28,8 @@ spec:
               value: "{{ .Values.port }}"
             - name: HOST
               value: {{ .Values.downloadHost }}
+            - name: LOG_LEVEL
+              value: {{ .Values.logLevel }}
             - name: HELP_URL
               value: "{{ .Values.helpURL }}"
             - name: FORUM_API_HOST