WIP - Merge unee t ins improvements - Phase 1

.env.sample

@@ -5,7 +5,7 @@ UNIT_CREATE_LAMBDA_URL=<run the "unit" project on a separate port and place the
 PDFGEN_LAMBDA_URL=<point to a real lambda URL running this, for instance https://pdfgen.dev.unee-t.com>
 PDFCONVERT_LAMBDA_URL=<point to a real lambda URL running this, for instance https://prince.dev.unee-t.com>
 MAIL_URL=<SMPT provider URL>
-CLOUDINARY_URL=<retrieve by registering for a free account on Cloudinary (should end with /image/upload)>
+CLOUDINARY_API_ENDPOINT=<retrieve by registering for a free account on Cloudinary (should end with /image/upload)>
 CLOUDINARY_PRESET=<generate in your Cloudinary account (look into 'Unsigned Uploading')>
 API_ACCESS_TOKEN=<set any value that will be used to authenticate API requests to this server by the "accessToken" query param>
 FROM_EMAIL="Local Unee-T Case <[email protected]>"

.travis.yml

@@ -1,12 +1,44 @@
-sudo: required
+# Variables needed for this script are:
+
+# Case 1: Stored on Travis Settings
+  # For all environments:
+    # - DOCKER_CI_REPO_NAME
+    # - DOCKER_USERNAME
+    # - DOCKER_PASSWORD
+
+  #For dev environment:
+    # - AWS_ACCOUNT_USER_ID_DEV
+    # - AWS_ACCOUNT_SECRET_DEV
+    # - AWS_PROFILE_DEV
+
+  #For Prod environment:
+    # - AWS_ACCOUNT_USER_ID_PROD
+    # - AWS_ACCOUNT_SECRET_PROD
+    # - AWS_PROFILE_PROD
+
+  #For Demo environment:
+    # - AWS_ACCOUNT_USER_ID_DEMO
+    # - AWS_ACCOUNT_SECRET_DEMO
+    # - AWS_PROFILE_DEMO
+
+# Case 2: Created when Travis CI runs
+    # - IMAGE_TAG
 
 language: node_js
+
 node_js:
   - lts/*
 
+services:
+  - docker
+
+env:
+  global:
+    - COMMIT=${TRAVIS_COMMIT::7}
+    #Add IMAGE_TAG variable to build docker image
+    - IMAGE_TAG=${COMMIT}
+
 before_install:
-  # Removed command as pyenv is no longer found during deploy
-  #- pyenv global 2.7.14  # For removing SNIMissingWarning warnings
   - curl https://install.meteor.com | /bin/sh
   - export PATH="$HOME/.meteor:$PATH"
   - pip install --user awscli
@@ -23,28 +55,68 @@ install:
   - meteor npm install
 
 script:
+  # Use native implementation of bcrypt for better performances
+  - meteor npm install -global --save bcrypt
+  # Test that all is working as intended
   - npm t
 
+#Adding script deploy docker image to docker repository
+
+after_success:
+  # If we have passed the Travis CI Test, we need to build the latest version of the Docker image
+  # This latest version is the version that will be used when we will deploy in our environments (DEV, DEMO, PROD)
+  # TODO: See https://github.com/unee-t/frontend/issues/893
+  - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
+  - echo START - We are building the latest version of the Docker image we need for deployment
+  - docker build -t $DOCKER_CI_REPO_NAME:latest .
+  - docker tag $DOCKER_CI_REPO_NAME:latest $DOCKER_CI_REPO_NAME:$IMAGE_TAG
+  - echo We are pushing the latest Docker image as latest version in Dockerhub
+  - docker push $DOCKER_CI_REPO_NAME:latest
+  - echo we are pushing the latest Docker image as $IMAGE_TAG version in DockerHub
+  - docker push $DOCKER_CI_REPO_NAME:$IMAGE_TAG
+  - echo END - We are building the latest version of the Docker image we need for deployment
+
 matrix:
   include:
-    - env: DEPLOY=none
+    - env: DEPLOY=dev
+      # if: branch = master
+      # deploy:
+      #   provider: script
+      #   script: TRAVIS_DOCKER_REPO_NAME=$DOCKER_CI_REPO_NAME
+      #           TRAVIS_PROFILE=$AWS_PROFILE_DEV
+      #           TRAVIS_AWS_ACCESS_KEY_ID=$AWS_ACCOUNT_USER_ID_DEV
+      #           TRAVIS_AWS_SECRET_ACCESS_KEY=$AWS_ACCOUNT_SECRET_DEV
+      #           TRAVIS_AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION
+      #           ./deploy.sh
+      #   on:
+      #     branch: master
+    # For DEV, we are using AWS Codebuild for the deployment (NOT TRAVIS)
+    # We comment out the DEV option
+    # This will need to be evaluated going forward (shall we revert back to TRAVIS for deployment?)
+#    - env: DEPLOY=dev
+#      if: branch = master
+#      deploy:
+#        provider: script
+#        script: TRAVIS_DOCKER_REPO_NAME=$DOCKER_CI_REPO_NAME TRAVIS_PROFILE=$AWS_PROFILE_DEV TRAVIS_AWS_ACCESS_KEY_ID=$AWS_ACCOUNT_USER_ID_DEV TRAVIS_AWS_SECRET_ACCESS_KEY=$AWS_ACCOUNT_SECRET_DEV TRAVIS_AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION ./deploy.sh -d
+#        on:
+#          branch: master
     - env: DEPLOY=demo
       if: tag IS present
       deploy:
         provider: script
-        skip_cleanup: true
-        script: AWS_ACCESS_KEY_ID=$AWS_915001051872_ID AWS_SECRET_ACCESS_KEY=$AWS_915001051872_SECRET ./deploy.sh -d
+        script: TRAVIS_PROFILE=$AWS_PROFILE_DEMO AWS_ACCESS_KEY_ID=$AWS_ACCOUNT_USER_ID_DEMO AWS_SECRET_ACCESS_KEY=$AWS_ACCOUNT_SECRET_DEMO AWS_REGION=$AWS_DEFAULT_REGION ./deploy.sh -d
         on:
+          branch: master
           tags: true
     - env: DEPLOY=prod
       if: tag IS present
       deploy:
         provider: script
-        skip_cleanup: true
-        script: AWS_ACCESS_KEY_ID=$AWS_192458993663_ID AWS_SECRET_ACCESS_KEY=$AWS_192458993663_SECRET ./deploy.sh -p && AWS_ACCESS_KEY_ID=$AWS_192458993663_ID AWS_SECRET_ACCESS_KEY=$AWS_192458993663_SECRET aws cloudfront create-invalidation --distribution-id E173XT6X8V4A18 --paths '/*'
+        # TODO - Distribution-id uses a hardcoded value 
+        # This will ONLY work for the main Unee-T installation but no other Unee-T Installation
+        # This is a problem we need to fix
+        script: TRAVIS_PROFILE=$AWS_PROFILE_PROD AWS_ACCESS_KEY_ID=$AWS_ACCOUNT_USER_ID_PROD AWS_SECRET_ACCESS_KEY=$AWS_ACCOUNT_SECRET_PROD AWS_REGION=$AWS_DEFAULT_REGION ./deploy.sh -p && AWS_ACCESS_KEY_ID=$AWS_ACCOUNT_USER_ID_PROD AWS_SECRET_ACCESS_KEY=$AWS_ACCOUNT_SECRET_PROD aws cloudfront create-invalidation --distribution-id E173XT6X8V4A18 --paths '/*'
+        # END - TODO - Distribution-id uses a hardcoded value 
         on:
-          tags: true
-
-env:
-  global:
-    - COMMIT=${TRAVIS_COMMIT::7}
+          branch: master
+          tags: true

AWS-docker-compose.yml

@@ -1,7 +1,37 @@
+#Variable for this script are set in:
+# - Travis CI:
+#   - DOCKER_CI_REPO_NAME
+#   - AWS_DEFAULT_REGION
+# - AWS Parameter Store:
+#   - DOMAIN
+#   - STAGE
+#   - BUGZILLA_ADMIN_KEY
+#   - MONGO_MASTER_USERNAME
+#   - MONGO_MASTER_PASSWORD
+#   - MONGO_CONNECT
+#   - API_ACCESS_TOKEN
+#   - FROM_EMAIL
+#   - MAIL_URL
+# - The file `aws-env.[STAGE]`
+#   - ROOT_URL
+#   - BUGZILLA_URL
+#   - CLOUDINARY_API_ENDPOINT
+#   - INVITE_LAMBDA_URL
+#   - APIENROLL_LAMBDA_URL
+#   - UNIT_CREATE_LAMBDA_URL
+#   - PDFGEN_LAMBDA_URL
+#   - PDFCONVERT_LAMBDA_URL
+# - The File `.travis.yml`
+#   - TRAVIS_DOCKER_REPO_NAME
+#   - TRAVIS_AWS_DEFAULT_REGION
+
 version: '2'
 services:
     meteor:
+        # INS change commented out - revert to previous version of the master
         image: uneet/frontend:$COMMIT
+        # image: ${TRAVIS_DOCKER_REPO_NAME}:latest
+        # END INS change commented out - revert
         mem_reservation: 1g
         mem_limit: 2g
         ports:
@@ -10,10 +40,15 @@ services:
             - ROOT_URL=${ROOT_URL}
             - BUGZILLA_URL=${BUGZILLA_URL}
             - BUGZILLA_ADMIN_KEY=${BUGZILLA_ADMIN_KEY}
+             # INS change commented out - revert to previous version of the master
             - MONGO_URL=mongodb://root:${MONGO_PASSWORD}@${MONGO_CONNECT}
-            - CLOUDINARY_URL=${CLOUDINARY_URL}
+            #- MONGO_URL=mongodb+srv://${MONGO_MASTER_USERNAME}:${MONGO_MASTER_PASSWORD}@${MONGO_CONNECT}
+            # END INS change commented out - revert
+            - CLOUDINARY_API_ENDPOINT=${CLOUDINARY_API_ENDPOINT}
             - CLOUDINARY_PRESET=${CLOUDINARY_PRESET}
+            # This was deleted - revert to previous version of the master
             - COMMIT=${COMMIT}
+            # END This was deleted - revert to previous version of the master
             - API_ACCESS_TOKEN=${API_ACCESS_TOKEN}
             - FROM_EMAIL=${FROM_EMAIL}
             - MAIL_URL=${MAIL_URL}
@@ -27,6 +62,6 @@ services:
         logging:
             driver: awslogs
             options:
-                awslogs-region: ap-southeast-1
+                awslogs-region: ${TRAVIS_AWS_DEFAULT_REGION}
                 awslogs-group: meteor
                 awslogs-stream-prefix: ecs

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8 AS builder
+FROM node:12 AS builder
 
 RUN curl -sL https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh
 RUN mkdir /src /bundle
@@ -10,10 +10,12 @@ WORKDIR /src
 COPY --chown=node:node . .
 
 RUN meteor npm install
+# Use native implementation of bcrypt for better performances
+# RUN meteor npm install --save bcrypt
 RUN meteor build --architecture os.linux.x86_64 --directory /bundle
 RUN cd /bundle/bundle/programs/server && npm install
 
-FROM node:8-slim
+FROM node:12-slim
 
 USER node:node
 

README.md

@@ -3,7 +3,7 @@
 <img src="https://media.dev.unee-t.com/2018-12-10/Unee-T_high_level_architecture.png" alt="Overview">
 
 * [How to test with Bugzilla in a local environment](https://unee-t-media.s3-accelerate.amazonaws.com/frontend/MEFE.mp4)
-* [ECS deploy](https://unee-t-media.s3-accelerate.amazonaws.com/2017/ecs-deploy.mp4) with `./deploy.sh`
+* [ECS deploy](https://unee-t-media.s3-accelerate.amazonaws.com/2017/ecs-deploy.mp4) with `./deploy.sh`.
 
 # Demo - How to see how it works:
 

app.json

@@ -22,7 +22,7 @@
     "CLOUDINARY_PRESET": {
       "required": true
     },
-    "CLOUDINARY_URL": {
+    "CLOUDINARY_API_ENDPOINT": {
       "required": true
     },
     "FROM_EMAIL": {

aws-env.demo

@@ -1,18 +1,50 @@
-export ROOT_URL=https://case.demo.unee-t.com
-export BUGZILLA_ADMIN_KEY=$(aws --profile uneet-demo ssm get-parameters --names BUGZILLA_ADMIN_KEY --with-decryption --query Parameters[0].Value --output text)
-export BUGZILLA_URL=https://dashboard.demo.unee-t.com
-export INVITE_LAMBDA_URL=https://invite.demo.unee-t.com
-export UNIT_CREATE_LAMBDA_URL=https://unit.demo.unee-t.com/create
-export APIENROLL_LAMBDA_URL=https://apienroll.demo.unee-t.com
-export PDFGEN_LAMBDA_URL=https://pdfgen.demo.unee-t.com
-export PDFCONVERT_LAMBDA_URL=https://prince.demo.unee-t.com
-export MONGO_PASSWORD=$(aws --profile uneet-demo ssm get-parameters --names MONGO_PASSWORD --with-decryption --query Parameters[0].Value --output text)
-export MONGO_CONNECT=$(aws --profile uneet-demo ssm get-parameters --names MONGO_CONNECT --query Parameters[0].Value --output text)
-# [email protected]
-export CLOUDINARY_PRESET=$(aws --profile uneet-demo ssm get-parameters --names CLOUDINARY_PRESET --with-decryption --query Parameters[0].Value --output text)
-export CLOUDINARY_URL=$(aws --profile uneet-demo ssm get-parameters --names CLOUDINARY_URL --with-decryption --query Parameters[0].Value --output text)
-export API_ACCESS_TOKEN=$(aws --profile uneet-demo ssm get-parameters --names API_ACCESS_TOKEN --with-decryption --query Parameters[0].Value --output text)
-export FROM_EMAIL="DEMO Unee-T Case <[email protected]>"
-export MAIL_URL=$(aws --profile uneet-demo ssm get-parameters --names MAIL_URL --with-decryption --query Parameters[0].Value --output text)
-export STAGE=demo
-export DOMAIN=unee-t.com
+#!/bin/bash
+### This file stores all environment variables for the DEV environment for this repo
+
+# This script is called as part of the Travis CI deployment routine
+# We can use the default aws profile configured in Travis CI settings to get the variables we need
+
+# We create a procedure to retrieve the variables from the AWS parameter store
+# Make sure to 
+#   - configure your AWS CLI accordingly
+#   - update the profile you need to use to access these variables if needed
+#	- PROFILE is set when .travis.yml run 
+
+	getparam () {
+		aws --profile ${TRAVIS_PROFILE} ssm get-parameters --names "$1" --with-decryption --query Parameters[0].Value --output text
+	}
+
+# Variables that are maintained in the AWS parameter store for the environment:
+
+	export DOMAIN=$(getparam DOMAIN) 
+	export BUGZILLA_ADMIN_KEY=$(getparam BUGZILLA_ADMIN_KEY)
+	export STAGE=$(getparam STAGE)
+
+	export MONGO_MASTER_USERNAME=$(getparam MONGO_MASTER_USERNAME)
+	export MONGO_MASTER_PASSWORD=$(getparam MONGO_MASTER_PASSWORD)
+	export MONGO_CONNECT=$(getparam MONGO_CONNECT)
+
+	export CLOUDINARY_CLOUD_NAME=$(getparam CLOUDINARY_CLOUD_NAME)
+	export CLOUDINARY_PRESET=$(getparam CLOUDINARY_PRESET)
+
+	export API_ACCESS_TOKEN=$(getparam API_ACCESS_TOKEN)
+
+	export FROM_EMAIL=$(getparam FROM_EMAIL)
+	export MAIL_URL=$(getparam MAIL_URL)
+	export MEFE_TARGET_ARN=$(getparam MEFE_TARGET_ARN)
+
+# Variables that are built from other variables:
+
+	export ROOT_URL=https://case.$STAGE.$DOMAIN
+	export BUGZILLA_URL=https://dashboard.$STAGE.$DOMAIN
+
+	export CLOUDINARY_API_ENDPOINT=https://api.cloudinary.com/v1_1/$CLOUDINARY_CLOUD_NAME/auto/upload
+	# Temporary fix until issue https://github.com/Unee-T-INS/frontend/issues/15 is closed
+	export CLOUDINARY_URL=$CLOUDINARY_API_ENDPOINT
+	# END Temporary fix
+
+	export INVITE_LAMBDA_URL=https://invite.$STAGE.$DOMAIN
+	export UNIT_CREATE_LAMBDA_URL=https://unit.$STAGE.$DOMAIN/create
+	export APIENROLL_LAMBDA_URL=https://apienroll.$STAGE.$DOMAIN
+	export PDFGEN_LAMBDA_URL=https://pdfgen.$STAGE.$DOMAIN
+	export PDFCONVERT_LAMBDA_URL=https://prince.$STAGE.$DOMAIN

aws-env.dev

@@ -1,17 +1,57 @@
-export ROOT_URL=https://case.dev.unee-t.com
-export BUGZILLA_ADMIN_KEY=$(aws --profile uneet-dev ssm get-parameters --names BUGZILLA_ADMIN_KEY --with-decryption --query Parameters[0].Value --output text)
-export BUGZILLA_URL=https://dashboard.dev.unee-t.com
-export INVITE_LAMBDA_URL=https://invite.dev.unee-t.com
-export UNIT_CREATE_LAMBDA_URL=https://unit.dev.unee-t.com/create
-export APIENROLL_LAMBDA_URL=https://apienroll.dev.unee-t.com
-export PDFGEN_LAMBDA_URL=https://pdfgen.dev.unee-t.com
-export PDFCONVERT_LAMBDA_URL=https://prince.dev.unee-t.com
-export MONGO_PASSWORD=$(aws --profile uneet-dev ssm get-parameters --names MONGO_PASSWORD --with-decryption --query Parameters[0].Value --output text)
-export MONGO_CONNECT=$(aws --profile uneet-dev ssm get-parameters --names MONGO_CONNECT --query Parameters[0].Value --output text)
-export CLOUDINARY_PRESET=$(aws --profile uneet-dev ssm get-parameters --names CLOUDINARY_PRESET --with-decryption --query Parameters[0].Value --output text)
-export CLOUDINARY_URL=$(aws --profile uneet-dev ssm get-parameters --names CLOUDINARY_URL --with-decryption --query Parameters[0].Value --output text)
-export API_ACCESS_TOKEN=$(aws --profile uneet-dev ssm get-parameters --names API_ACCESS_TOKEN --with-decryption --query Parameters[0].Value --output text)
-export FROM_EMAIL=$(aws --profile uneet-dev ssm get-parameters --names FROM_EMAIL --query Parameters[0].Value --output text)
-export MAIL_URL=$(aws --profile uneet-dev ssm get-parameters --names MAIL_URL --with-decryption --query Parameters[0].Value --output text)
-export STAGE=dev
-export DOMAIN=unee-t.com
+#!/bin/bash
+### This file stores all environment variables for the DEV environment for this repo
+
+# This script is called as part of the Travis CI deployment routine
+# We can use the default aws profile configured in Travis CI settings to get the variables we need
+
+# We create a procedure to retrieve the variables from the AWS parameter store
+# Make sure to 
+#   - configure your AWS CLI accordingly
+#   - update the profile you need to use to access these variables if needed
+#	- PROFILE is set when .travis.yml run 
+
+	getparam () {
+		aws --profile ${TRAVIS_PROFILE} ssm get-parameters --names "$1" --with-decryption --query Parameters[0].Value --output text
+	}
+
+# Variables that are maintained in the AWS parameter store for the environment:
+
+	export DOMAIN=$(getparam DOMAIN) 
+	export BUGZILLA_ADMIN_KEY=$(getparam BUGZILLA_ADMIN_KEY)
+	export STAGE=$(getparam STAGE)
+
+	export MONGO_MASTER_USERNAME=$(getparam MONGO_MASTER_USERNAME)
+	# REVIEW - In previous version this was named `MONGO_PASSWORD`
+	# We need the old version so we can still connect to Mongo
+	export MONGO_PASSWORD=$(getparam MONGO_PASSWORD)
+	export MONGO_MASTER_PASSWORD=$(getparam MONGO_MASTER_PASSWORD)
+	# END - REVIEW
+	export MONGO_CONNECT=$(getparam MONGO_CONNECT)
+
+	# REVIEW - In previous version this was named `CLOUDINARY_URL`
+	export CLOUDINARY_CLOUD_NAME=$(getparam CLOUDINARY_CLOUD_NAME)
+	# END - REVIEW
+	export CLOUDINARY_PRESET=$(getparam CLOUDINARY_PRESET)
+
+	export API_ACCESS_TOKEN=$(getparam API_ACCESS_TOKEN)
+
+	export FROM_EMAIL=$(getparam FROM_EMAIL)
+	export MAIL_URL=$(getparam MAIL_URL)
+	export MEFE_TARGET_ARN=$(getparam MEFE_TARGET_ARN)
+
+# Variables that are built from other variables:
+
+	export ROOT_URL=https://case.$STAGE.$DOMAIN
+	export BUGZILLA_URL=https://dashboard.$STAGE.$DOMAIN
+
+	export CLOUDINARY_API_ENDPOINT=https://api.cloudinary.com/v1_1/$CLOUDINARY_CLOUD_NAME/auto/upload
+	# Temporary fix until issue https://github.com/Unee-T-INS/frontend/issues/15 is closed
+	export CLOUDINARY_URL=$CLOUDINARY_API_ENDPOINT
+	# END Temporary fix
+
+	export INVITE_LAMBDA_URL=https://invite.$STAGE.$DOMAIN
+	export UNIT_CREATE_LAMBDA_URL=https://unit.$STAGE.$DOMAIN/create
+	export APIENROLL_LAMBDA_URL=https://apienroll.$STAGE.$DOMAIN
+	export PDFGEN_LAMBDA_URL=https://pdfgen.$STAGE.$DOMAIN
+	export PDFCONVERT_LAMBDA_URL=https://prince.$STAGE.$DOMAIN
+