Log the response data when a PATCH request fails

src/util/submit-addon.js

@@ -244,8 +244,20 @@ export default class Client {
       }
 
       const response = await this.fetch(patchUrl, 'PATCH', formData);
+      if (response.status < 200 || response.status >= 500) {
+        throw new Error(
+          `Patch request failed: ${response.statusText || response.status}.`,
+        );
+      }
+
       if (!response.ok) {
-        throw new Error(`response status was ${response.status}`);
+        const responseData = await response.json();
+        throw new Error(
+          [
+            `Patch request failed: ${response.statusText || response.status}:\n`,
+            JSON.stringify(responseData, null, 2),
+          ].join('\n'),
+        );
       }
     } catch (error) {
       log.warn(`Upload of ${Object.keys(data)} failed: ${error}.`);

tests/unit/test-util/test.submit-addon.js

@@ -23,6 +23,7 @@ import Client, {
   signAddon,
 } from '../../../src/util/submit-addon.js';
 import { withTempDir } from '../../../src/util/temp-dir.js';
+import { consoleStream } from '../../../src/util/logger.js';
 
 class JSONResponse extends Response {
   constructor(data, status) {
@@ -907,6 +908,70 @@ describe('util.submit-addon', () => {
           `Uploading ${dataField1}${dataField2} failed`,
         );
       });
+
+      it('logs the response json for non ok responses', async () => {
+        const client = new Client(clientDefaults);
+        const errorData = { detail: 'some error detail' };
+        sinon.stub(client, 'fetch').resolves(new JSONResponse(errorData, 400));
+
+        consoleStream.stopCapturing();
+        consoleStream.flushCapturedLogs();
+        consoleStream.startCapturing();
+
+        await assert.isRejected(
+          client.doFormDataPatch(data, addonId, versionId),
+          `Uploading ${Object.keys(data)} failed`,
+        );
+
+        const { capturedMessages } = consoleStream;
+        consoleStream.stopCapturing();
+
+        assert.ok(
+          capturedMessages.some((message) =>
+            message.includes(JSON.stringify(errorData, null, 2)),
+          ),
+        );
+      });
+
+      it('throws without parsing the body for server errors', async () => {
+        const client = new Client(clientDefaults);
+        const response = new Response('not json', { status: 500 });
+        const jsonSpy = sinon.spy(response, 'json');
+        sinon.stub(client, 'fetch').resolves(response);
+
+        consoleStream.stopCapturing();
+        consoleStream.flushCapturedLogs();
+        consoleStream.startCapturing();
+
+        await assert.isRejected(
+          client.doFormDataPatch(data, addonId, versionId),
+          `Uploading ${Object.keys(data)} failed`,
+        );
+
+        const { capturedMessages } = consoleStream;
+        consoleStream.stopCapturing();
+
+        sinon.assert.notCalled(jsonSpy);
+        assert.ok(
+          capturedMessages.some((message) =>
+            message.includes('Patch request failed'),
+          ),
+        );
+      });
+
+      it('throws without parsing the body for statuses below 200', async () => {
+        const client = new Client(clientDefaults);
+        const response = new BadResponse('not json', 100);
+        const jsonSpy = sinon.spy(response, 'json');
+        sinon.stub(client, 'fetch').resolves(response);
+
+        await assert.isRejected(
+          client.doFormDataPatch(data, addonId, versionId),
+          `Uploading ${Object.keys(data)} failed`,
+        );
+
+        sinon.assert.notCalled(jsonSpy);
+      });
     });
 
     describe('waitForApproval', () => {