Added some error handling to the access token script, in case environ…

…ment variables aren't set properly, so error messages are more helpful. [deploy]

.circleci/config.yml

@@ -187,7 +187,7 @@ jobs:
       - run:
           name: "Check if branch is deployable (contains [deploy] in commit msg on $DEPLOY_BRANCH"
           command: |
-            export CI_DEPLOY=`git log --format=oneline -n 1 | grep '\[deploy\]'` && echo $CI_DEPLOY
+            export CI_DEPLOY=`git log --format=oneline -n 1 | grep '\[deploy\]'` && echo "$CI_DEPLOY"
             if [ -z "$CI_DEPLOY" ] || [ "$CIRCLE_BRANCH" != "$DEPLOY_BRANCH" ]; then
               echo "Cancelling run. Pass [deploy] in commit message on $DEPLOY_BRANCH to deploy"
               circleci-agent step halt

get-access-token.py

@@ -10,6 +10,14 @@
 private_key = os.environ.get('GITHUB_APP_PEM')
 private_key = private_key.replace("\\n", "\n")
 
+standard_error_msg = 'Seleniarm GitHub App installation environment variables are not set. '
+if github_app_id == '':
+  raise Exception(standard_error_msg + 'Valid GITHUB_APP_ID is required to obtain an access token.')
+if github_installation_id == '':
+  raise Exception(standard_error_msg + 'Valid GITHUB_INSTALLATION_ID is required to obtain an access token.')
+if private_key == '':
+  raise Exception(standard_error_msg + 'Valid GITHUB_APP_PEM token is required to obtain an access token.')
+
 
 time_since_epoch_in_seconds = int(time.time())
 

get-access-token.sh

@@ -11,8 +11,8 @@ pip3 install cryptography
 pip3 install requests
 pip3 install PyJWT
 
-export GITHUB_APP_ID=$SELENIARM_GITHUB_APP_ID
-export GITHUB_INSTALLATION_ID=$SELENIARM_GITHUB_INSTALLATION_ID 
+export GITHUB_APP_ID="$SELENIARM_GITHUB_APP_ID"
+export GITHUB_INSTALLATION_ID="$SELENIARM_GITHUB_INSTALLATION_ID"
 export GITHUB_APP_PEM="$SELENIARM_GITHUB_APP_PEM" 
 
 python3 get-access-token.py