Develop

.gitignore

@@ -115,7 +115,7 @@ __pycache__/
 build/
 develop-eggs/
 dist/
-downloads/
+# downloads/
 eggs/
 .eggs/
 #lib/

.travis.yml

@@ -64,10 +64,10 @@ matrix:
 
       deploy:
         provider: script
-        script: bash docker_push
+        script: bash docker_push || travis_terminate 1
         on:
           all_branches: true
-          condition: $TRAVIS_BRANCH =~ ^master|develop$
+          condition: $TRAVIS_BRANCH =~ ^master|develop$ || -n $TRAVIS_TAG
 
     - name: "Request Api"
       stage: "APIs"
@@ -142,10 +142,10 @@ matrix:
 
       deploy:
         provider: script
-        script: bash docker_push
+        script: bash docker_push || travis_terminate 1
         on:
           all_branches: true
-          condition: $TRAVIS_BRANCH =~ ^master|develop$
+          condition: $TRAVIS_BRANCH =~ ^master|develop$ || -n $TRAVIS_TAG
 
     - name: "Policy Api"
       stage: "APIs"
@@ -196,10 +196,10 @@ matrix:
 
       deploy:
         provider: script
-        script: bash docker_push
+        script: bash docker_push || travis_terminate 1
         on:
           all_branches: true
-          condition: $TRAVIS_BRANCH =~ ^master|develop$
+          condition: $TRAVIS_BRANCH =~ ^master|develop$ || -n $TRAVIS_TAG
 
     - name: "Validation Api"
       stage: "APIs"
@@ -256,10 +256,10 @@ matrix:
 
       deploy:
         provider: script
-        script: bash docker_push
+        script: bash docker_push || travis_terminate 1
         on:
           all_branches: true
-          condition: $TRAVIS_BRANCH =~ ^master|develop$ 
+          condition: $TRAVIS_BRANCH =~ ^master|develop$ || -n $TRAVIS_TAG
 
     - name: "Front End"
       stage: "Frontend"
@@ -307,96 +307,89 @@ matrix:
 
       deploy:
         provider: script
-        script: bash docker_push
+        script: bash docker_push || travis_terminate 1
         on:
           all_branches: true
-          condition: $TRAVIS_BRANCH =~ ^master|develop$
+          condition: $TRAVIS_BRANCH =~ ^master|develop$ || -n $TRAVIS_TAG
 
     - name: "Integration Tests"
       stage: "Tests"
-      language: node_js
-      node_js:
-        - "node"
+      language: java
       addons:
         chrome: stable
         hosts:
           - auth.example.demo
-          - ocwa.example.demo        
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - python3-pip
-          packages:
-            - g++-4.8
-            - python3-pip 
+          - ocwa.example.demo
+      jdk: openjdk8
 
-      script:
+      before_install:
         - cd /usr/local/bin
-        - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip
-        - sudo unzip -o terraform_0.11.8_linux_amd64.zip
-        - sudo rm -rf terraform_0.11.8_linux_amd64.zip
+        - sudo curl -L -O https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+        - sudo unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+        - sudo rm -rf terraform_${TERRAFORM_VERSION}_linux_amd64.zip
         - sudo chmod +x terraform 
 
+      install:
         - cd /home/travis/build/bcgov/OCWA/terraform
         - mkdir _tmp
         - cp terraform.tfvars.example terraform.tfvars
         - terraform init
-        - terraform plan -var hostRootPath=`pwd`/_tmp
         - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve
-        - sleep 30
-        - docker ps
-
-        #Katalon requires OpenJDK 8 installed separately
-        - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk
 
-        #Install Katalon Studios   
+      before_script:
         - cd /usr/local/bin
-        - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz
+        - sudo wget -q https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz
         - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz
         - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon
         - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION}
+        # Check that the install lifecycle worked
+        - docker ps
 
-        #RUN Integration
-        - cd Katalon_Studio_Linux_64-${KATALON_VERSION}
-        - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash  -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)"
+      script:
+        - cd /usr/local/bin/Katalon_Studio_Linux_64-${KATALON_VERSION}
+        - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)"
 
     - name: "OCWA Master Helm Chart"
       stage: "Tests"
-      language: node_js
-      node_js:
-        - "node"
-      cache: npm
-      script:
+      language: python
+      python:
+        - "3.6"
+      cache: pip
+
+      install:
         - cd /home/travis/build/bcgov/OCWA
         - wget -q ${HELM_URL}/${HELM_TGZ}
         - tar xzfv ${HELM_TGZ}
         - PATH=`pwd`/linux-amd64/:$PATH
         - helm init --client-only
-        # Installig pip deps
+        # Installing pip deps
         - sudo pip install yamllint=="${YAMLLINT_VERSION}"
+
+      script:
         - cd /home/travis/build/bcgov/OCWA
         - helm lint helm/ocwa
 
 env:
   global:
-  - HELM_URL=https://storage.googleapis.com/kubernetes-helm
+  - CXX=g++-4.8
   - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz
-  - TARGET_BR=gh-pages
-  - REPO_DIR=/home/travis/build/kubenow/helm-charts
+  - HELM_URL=https://storage.googleapis.com/kubernetes-helm
   - GH_URL=https://kubenow.github.io/helm-charts
-  - YAMLLINT_VERSION=1.8.1
-  - CXX=g++-4.8
-  - MONGODB=4.1.1
   - KATALON_VERSION=5.10.1
-  - TUSD_VERSION=0.11.0
-  - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/
+  - MONGODB=4.1.1
+  - REPO_DIR=/home/travis/build/kubenow/helm-charts
   - SONAR_APP=sonar-scanner
+  - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/
   - SONAR_VERSION=3.2.0.1227-linux
+  - TARGET_BR=gh-pages
+  - TERRAFORM_VERSION=0.11.11
+  - TUSD_VERSION=0.11.0
+  - YAMLLINT_VERSION=1.8.1
   - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4=
   - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk=
-  #SONAR_TOKEN
+  # SONAR_TOKEN
   - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY=
-  #QUAYIO_USERNAME
+  # QUAYIO_USERNAME
   - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A=
-  #QUAYIO_PASSWORD
+  # QUAYIO_PASSWORD
   - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0=

frontend/.eslintrc

@@ -10,7 +10,10 @@
     "FILES_API_HOST": true,
     "SOCKET_HOST": true,
     "VERSION": true,
-    "COMMIT": true
+    "COMMIT": true,
+    "EXPORTER_GROUP": true,
+    "OC_GROUP": true,
+    "EXPORTER_MODE": true
   },
   "parser": "babel-eslint",
   "rules": {

frontend/README.md

@@ -25,6 +25,13 @@ Make sure instead of `Roles` you assign `Groups`, e.g.
   ]
 }
 ```
+### Groups and Modes
+There are 2 default groups a user can belong to; Exporter(/exporter by default)
+or Output Checker (/oc by default). In addition the app has 2 modes it can run in,
+export or download. Note that the `export` value works for both the OC or Exporter
+and can be really any value or nil, but if it is set to `download` it'll open an
+exporter-only download interface.
+
 
 ## Installation
 
@@ -45,6 +52,9 @@ Create a `config/default.json` from the `config/default.json.example` file and f
 yarn install
 yarn start
 ```
+$ 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_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 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>
 
 Note that if you want to use a test user, ensure the `default.json` config has the following fields:
 

frontend/config/default.json.example

@@ -8,6 +8,9 @@
   "forumSocket": "localhost:3001",
   "requestApiHost": "localhost:3002",
   "filesApiHost": "localhost:1080",
+  "exporterGroup": "/exporter",
+  "ocGroup": "/oc",
+  "exporterMode": "download",
   "auth": {
     "authorizationEndpoint": "URL_REQUIRED",
     "callbackURL": "http://localhost:8000/auth",

frontend/config/test.json.example

@@ -8,6 +8,9 @@
   "forumSocket": "localhost:3001",
   "requestApiHost": "localhost:3002",
   "filesApiHost": "localhost:1080",
+  "exporterGroup": "/exporter",
+  "ocGroup": "/oc",
+  "exporterMode": "export",
   "auth": {
     "authorizationEndpoint": "URL_REQUIRED",
     "callbackURL": "http://localhost:8000/auth",

frontend/docker_push

@@ -21,4 +21,12 @@ if [ $TRAVIS_BRANCH == "develop" ]; then
     echo "dockerfile built pushing now";
     docker push bcgovimages/ocwa_frontend:edge;
     echo "edge (develop) pushed successfully";
+fi
+
+if [ "$TRAVIS_BRANCH" == "$TRAVIS_TAG" ]; then
+    #Tag build
+    docker build -t bcgovimages/ocwa_frontend:$TRAVIS_TAG .;
+    echo "dockerfile built pushing now";
+    docker push bcgovimages/ocwa_frontend:$TRAVIS_TAG;
+    echo "$TRAVIS_TAG pushed successfully";
 fi

frontend/entrypoint.sh

@@ -8,6 +8,9 @@ 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 "\"filesApiHost\": \"${FILES_API_HOST}\",\n" >> ./config/default.json
+printf "\"exporterGroup\": \"${EXPORTER_GROUP}\",\n" >> ./config/default.json
+printf "\"ocGroup\": \"${OC_GROUP}\",\n" >> ./config/default.json
+printf "\"exporterMode\": \"${EXPORTER_MODE}\",\n" >> ./config/default.json
 printf "\"cookieSecret\": \"${COOKIE_SECRET}\",\n" >> ./config/default.json
 printf "\"jwtSecret\": \"${JWT_SECRET}\",\n" >> ./config/default.json
 printf "\"auth\": {\n" >> ./config/default.json

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

@@ -36,6 +36,12 @@ spec:
               value: "{{ .Values.requestApiHost }}"
             - name: FILES_API_HOST
               value: "{{ .Values.filesApiHost }}"
+            - name: EXPORTER_GROUP
+              value: "{{ .Values.exporterGroup }}"
+            - name: OC_GROUP
+              value: "{{ .Values.ocGroup }}"
+            - name: EXPORTER_MODE
+              value: "export"
             - name: COOKIE_SECRET
               valueFrom:
                 secretKeyRef: