Merge branch 'deploy/prod' into deploy/stg

Author: akirasosa

.travis.yml

@@ -25,13 +25,11 @@ before_deploy:
   - aws --version
   # Parse branch name and determine an environment to deploy
   - export ENV=$(echo "${TRAVIS_BRANCH}" | perl -ne "print $& if /(?<=deploy\/).*/")
-  # account number to mask
-  - account_number=$(aws sts get-caller-identity --output text --query 'Account')
   # prune to reduce package size
   - npm prune --production
 deploy:
   - provider: script
-    script: ./scripts/deploy.sh ${ENV} | sed -e "s/${account_number}/SECRET/g"
+    script: ./scripts/deploy.sh ${ENV}
     skip_cleanup: true
     on:
       branch: deploy/*

scripts/deploy.sh

@@ -5,15 +5,10 @@ set -u
 ENV=$1
 
 if [ "${ENV}" = "prod" ]; then
-  # reset current role if exists
-  test ! -v AWS_SESSION_TOKEN && direnv reload
-  # switch to production role
   source scripts/switch-production-role.sh
 fi
 
-sls deploy -v --stage ${ENV}
+# account number to mask
+account_number=$(aws sts get-caller-identity --output text --query 'Account')
 
-if [ "${ENV}" = "prod" ]; then
-  # reset current role if exists
-  test ! -v AWS_SESSION_TOKEN && direnv reload
-fi
+sls deploy -v --stage ${ENV} | sed -e "s/${account_number}/SECRET/g"