From e6dd5ba5a84dacdb2104f5dc2b7dcc666b650546 Mon Sep 17 00:00:00 2001
From: Adam Nowotny <adam.nowotny@protonmail.com>
Date: Sun, 11 Aug 2024 22:56:28 +0200
Subject: [PATCH] buildkite: return response body from all request methods for
 consistency

---
 src/services/buildkite/buildkite.ts | 31 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/services/buildkite/buildkite.ts b/src/services/buildkite/buildkite.ts
index 84455cb8..18f7da01 100644
--- a/src/services/buildkite/buildkite.ts
+++ b/src/services/buildkite/buildkite.ts
@@ -8,11 +8,13 @@ import type {
     CIServiceSettings,
 } from 'services/service-types';
 
-const requestOrganizations = (settings: CIServiceSettings) =>
-    request.get({
+const requestOrganizations = async (settings: CIServiceSettings) => {
+    const response = await request.get({
         url: 'https://api.buildkite.com/v2/organizations',
         query: { access_token: settings.token ?? '' },
     });
+    return response.body;
+};
 
 const requestPipelines = async (url: string, settings: CIServiceSettings) => {
     const response = await request.get({
@@ -26,8 +28,8 @@ const requestPipelines = async (url: string, settings: CIServiceSettings) => {
     return response.body;
 };
 
-const requestLatestBuild = (org, pipeline, settings) =>
-    request.get({
+const requestLatestBuild = async (org, pipeline, settings) => {
+    const response = await request.get({
         url: `https://api.buildkite.com/v2/organizations/${org}/pipelines/${pipeline}/builds`,
         query: {
             access_token: settings.token,
@@ -35,9 +37,12 @@ const requestLatestBuild = (org, pipeline, settings) =>
             branch: settings.branch || 'main',
         },
     });
+    const [build] = response.body;
+    return build;
+};
 
-const requestLatestFinishedBuild = (org, pipeline, settings) =>
-    request.get({
+const requestLatestFinishedBuild = async (org, pipeline, settings) => {
+    const response = await request.get({
         url: `https://api.buildkite.com/v2/organizations/${org}/pipelines/${pipeline}/builds`,
         query: {
             access_token: settings.token,
@@ -46,11 +51,13 @@ const requestLatestFinishedBuild = (org, pipeline, settings) =>
             'state[]': ['failed', 'passed'],
         },
     });
+    const [build] = response.body;
+    return build;
+};
 
 const getPipelines = async (settings: CIServiceSettings): Promise<CIPipeline[]> => {
     logger.log('buildkite.getPipelines', settings);
-    const response = await requestOrganizations(settings);
-    const orgs = response.body;
+    const orgs = await requestOrganizations(settings);
     const pipelineRequests = orgs.map(async org => {
         const pipelinesResponse = await requestPipelines(org.pipelines_url, settings);
         return pipelinesResponse.map(pipeline => parsePipeline(org, pipeline));
@@ -72,12 +79,7 @@ const getLatestBuilds = async (settings: CIServiceSettings): Promise<CIBuild[]>
         settings.pipelines.map(async id => {
             const key = createKey(id);
             try {
-                const response = await requestLatestBuild(
-                    key.org,
-                    key.pipeline,
-                    settings,
-                );
-                const [build] = response.body;
+                const build = await requestLatestBuild(key.org, key.pipeline, settings);
                 let finishedBuild;
                 if (
                     ['running', 'scheduled', 'canceled', 'canceling'].includes(
@@ -89,7 +91,6 @@ const getLatestBuilds = async (settings: CIServiceSettings): Promise<CIBuild[]>
                         key.pipeline,
                         settings,
                     );
-                    finishedBuild = finishedBuild.body[0];
                 }
                 return parseBuild(build, key, finishedBuild);
             } catch (ex: any) {