From 21d86597cf18bec75410e9b010a4bb99913b04f2 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Mon, 3 Apr 2017 15:30:15 -0400
Subject: [PATCH] Display full error information for build errors in superuser
 view

Allows for easier debugging of build failures

Fixes https://www.pivotaltracker.com/story/show/142883625
---
 static/directives/build-log-error.html     |  8 ++++++++
 static/directives/build-logs-view.html     |  2 +-
 static/js/directives/ui/build-log-error.js | 21 +++++++++++++++++----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/static/directives/build-log-error.html b/static/directives/build-log-error.html
index 24c3c1d84..60dce3a1f 100644
--- a/static/directives/build-log-error.html
+++ b/static/directives/build-log-error.html
@@ -17,5 +17,13 @@
     <!-- Other issue -->
     <span bo-if="!isPullError(error) || !localPullInfo.isLocal"
           class="error-message" bo-text="error.message"></span>
+
+    <!-- Extended error information -->
+    <div bo-if="getBaseError(error) && isSuperuser">
+      Base Error Information: <pre>{{ getBaseError(entries) }}</pre>
+    </div>
+    <div bo-if="getInternalError(entries) && isSuperuser">
+      Internal Error Information: <pre>{{ getInternalError(entries) }}</pre>
+    </div>
   </span>
 </div>
diff --git a/static/directives/build-logs-view.html b/static/directives/build-logs-view.html
index 00a5fbbf8..f1574a602 100644
--- a/static/directives/build-logs-view.html
+++ b/static/directives/build-logs-view.html
@@ -49,7 +49,7 @@
           <span class="container-content build-log-phase" phase="container"></span>
         </div>
         <div ng-switch-when="error">
-          <span class="container-content build-log-error" error="container" entries="logEntries"></span>
+          <span class="container-content build-log-error" error="container" is-superuser="isSuperuser" entries="logEntries"></span>
         </div>
         <div ng-switch-when="command">
           <span class="container-content build-log-command" command="container"></span>
diff --git a/static/js/directives/ui/build-log-error.js b/static/js/directives/ui/build-log-error.js
index a18d4b52f..2ee6c5082 100644
--- a/static/js/directives/ui/build-log-error.js
+++ b/static/js/directives/ui/build-log-error.js
@@ -10,7 +10,8 @@ angular.module('quay').directive('buildLogError', function () {
     restrict: 'C',
     scope: {
       'error': '=error',
-      'entries': '=entries'
+      'entries': '=entries',
+      'isSuperuser': '<isSuperuser'
     },
     controller: function($scope, $element, Config) {
       $scope.localPullInfo = null;
@@ -40,9 +41,21 @@ angular.module('quay').directive('buildLogError', function () {
 
       calculateLocalPullInfo($scope.entries);
 
-      $scope.isInternalError = function() {
-        var entry = $scope.entries[$scope.entries.length - 1];
-        return entry && entry.data && entry.data['internal_error'];
+      $scope.getInternalError = function(entries) {
+        var entry = entries[entries.length - 1];
+        if (entry && entry.data && entry.data['internal_error']) {
+          return entry.data['internal_error'];
+        }
+
+        return null;
+      };
+
+      $scope.getBaseError = function(error) {
+        if (!error || !error.data || !error.data.base_error) {
+          return false;
+        }
+
+        return error.data.base_error;
       };
 
       $scope.isPullError = function(error) {