From c994eb8e13f9edf8514907de65abee0da16181e7 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 11:32:45 +0100
Subject: [PATCH] build: log got error response bodies (#40977)

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 script/prepare-appveyor.js         |  9 ++++++++-
 script/release/ci-release-build.js | 18 ++++++++++++++++--
 script/release/get-url-hash.js     |  9 ++++++++-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/script/prepare-appveyor.js b/script/prepare-appveyor.js
index 56e39a5f66..996b6543fa 100644
--- a/script/prepare-appveyor.js
+++ b/script/prepare-appveyor.js
@@ -70,7 +70,14 @@ async function checkAppVeyorImage (options) {
     const { cloudSettings } = settings;
     return cloudSettings.images.find(image => image.name === `${options.imageVersion}`) || null;
   } catch (err) {
-    console.log('Could not call AppVeyor: ', err);
+    if (err.response?.body) {
+      console.error('Could not call AppVeyor: ', {
+        statusCode: err.response.statusCode,
+        body: JSON.parse(err.response.body)
+      });
+    } else {
+      console.error('Error calling AppVeyor:', err);
+    }
   }
 }
 
diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
index 4d874201d6..6b5c31ec8b 100644
--- a/script/release/ci-release-build.js
+++ b/script/release/ci-release-build.js
@@ -183,7 +183,14 @@ async function circleCIRequest (url, method, requestBody) {
   }
 
   return makeRequest(requestOpts, true).catch(err => {
-    console.log('Error calling CircleCI:', err);
+    if (err.response?.body) {
+      console.error('Could not call CircleCI: ', {
+        statusCode: err.response.statusCode,
+        body: JSON.parse(err.response.body)
+      });
+    } else {
+      console.error('Error calling CircleCI:', err);
+    }
   });
 }
 
@@ -234,7 +241,14 @@ async function callAppVeyor (targetBranch, job, options) {
     const buildUrl = `https://ci.appveyor.com/project/electron-bot/${appVeyorJobs[job]}/build/${version}`;
     console.log(`AppVeyor release build request for ${job} successful.  Check build status at ${buildUrl}`);
   } catch (err) {
-    console.log('Could not call AppVeyor: ', err);
+    if (err.response?.body) {
+      console.error('Could not call AppVeyor: ', {
+        statusCode: err.response.statusCode,
+        body: JSON.parse(err.response.body)
+      });
+    } else {
+      console.error('Error calling AppVeyor:', err);
+    }
   }
 }
 
diff --git a/script/release/get-url-hash.js b/script/release/get-url-hash.js
index a4c0966559..113ee292f8 100644
--- a/script/release/get-url-hash.js
+++ b/script/release/get-url-hash.js
@@ -22,7 +22,14 @@ module.exports = async function getUrlHash (targetUrl, algorithm = 'sha256', att
     return resp.body.trim();
   } catch (err) {
     if (attempts > 1) {
-      console.error('Failed to get URL hash for', targetUrl, 'we will retry', err);
+      if (err.response?.body) {
+        console.error(`Failed to get URL hash for ${targetUrl} - we will retry`, {
+          statusCode: err.response.statusCode,
+          body: JSON.parse(err.response.body)
+        });
+      } else {
+        console.error(`Failed to get URL hash for ${targetUrl} - we will retry`, err);
+      }
       return getUrlHash(targetUrl, algorithm, attempts - 1);
     }
     throw err;