From c59b110b8f03e3337db5447101d5967632ab8607 Mon Sep 17 00:00:00 2001
From: Henry Mollman <henry@runnable.com>
Date: Thu, 25 May 2017 16:22:22 -0700
Subject: [PATCH] Added trap

---
 lib/aws.sh   | 2 +-
 lib/vault.sh | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/aws.sh b/lib/aws.sh
index 5a84224..a08684d 100644
--- a/lib/aws.sh
+++ b/lib/aws.sh
@@ -95,7 +95,7 @@ aws::fetch_poppa_id() {
   log::info "Setting Poppa ID"
 
   # Generate the org-tag fetching script
-  rollbar::fatal_trap \
+  rollbar::warning_trap \
     "Dock-Init: Failed to Render Org Script" \
     "Consule-Template was unable to realize the given template."
 
diff --git a/lib/vault.sh b/lib/vault.sh
index 79cc341..f301cab 100644
--- a/lib/vault.sh
+++ b/lib/vault.sh
@@ -56,6 +56,10 @@ vault::set_s3_keys() {
 
 # creates a token for a the organizations-readonly policy
 vault::store_private_registry_token() {
+  rollbar::fatal_trap \
+    "Dock-Init: Cannot store private registry token" \
+    "The user vault token was not generated"
+
   log::info "Storing vault token for private registry key"
   local NODE_ENV=$(consul::get node/env)
   local token_path="${DOCK_INIT_BASE}/consul-resources/vault/${NODE_ENV}"
@@ -72,4 +76,5 @@ vault::store_private_registry_token() {
   vault token-create -policy=dock-${POPPA_ID} | awk '/token/ { print $2 }' | awk 'NR==1  { print $1 }' > /opt/runnable/dock-init/user-private-registry-token
   VAULT_TOKEN=$(cat "${token_path}"/auth-token)
   export VAULT_TOKEN
+  rollbar::clear_trap
 }