From 877df261085b2047a5211cfab86bcc59756b6ffa Mon Sep 17 00:00:00 2001
From: Sebastian Paredero <sebaparedero14@gmail.com>
Date: Thu, 4 May 2023 10:59:17 -0300
Subject: [PATCH] feat(plugins/azure-devops): support for multiple
 builds-definitions

Signed-off-by: Sebastian Paredero <sebaparedero14@gmail.com>
---
 .changeset/quiet-stingrays-fly.md              |  5 +++++
 plugins/azure-devops/README.md                 |  2 +-
 .../azure-devops/src/api/AzureDevOpsClient.ts  | 18 +++++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/quiet-stingrays-fly.md

diff --git a/.changeset/quiet-stingrays-fly.md b/.changeset/quiet-stingrays-fly.md
new file mode 100644
index 0000000000..536ee18a6f
--- /dev/null
+++ b/.changeset/quiet-stingrays-fly.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-azure-devops': minor
+---
+
+The getBuildRuns function now checks contains multiple comma-separated builds and splits them to send multiple requests for each and concatenates the results.
diff --git a/plugins/azure-devops/README.md b/plugins/azure-devops/README.md
index 5079fa4f16..7eeae09813 100644
--- a/plugins/azure-devops/README.md
+++ b/plugins/azure-devops/README.md
@@ -70,7 +70,7 @@ dev.azure.com/project: <project-name>
 dev.azure.com/build-definition: <build-definition-name>
 ```
 
-In this case `<project-name>` will be the name of your Team Project and `<build-definition-name>` will be the name of the Build Definition you would like to see Builds for. If the Build Definition name has spaces in it make sure to put quotes around it
+In this case `<project-name>` will be the name of your Team Project and `<build-definition-name>` will be the name of the Build Definition you would like to see Builds for, and it's possible to add more Builds separated by a comma. If the Build Definition name has spaces in it make sure to put quotes around it.
 
 ### Azure Pipelines Component
 
diff --git a/plugins/azure-devops/src/api/AzureDevOpsClient.ts b/plugins/azure-devops/src/api/AzureDevOpsClient.ts
index 68d8896538..a202008798 100644
--- a/plugins/azure-devops/src/api/AzureDevOpsClient.ts
+++ b/plugins/azure-devops/src/api/AzureDevOpsClient.ts
@@ -120,7 +120,23 @@ export class AzureDevOpsClient implements AzureDevOpsApi {
       queryString.append('repoName', repoName);
     }
     if (definitionName) {
-      queryString.append('definitionName', definitionName);
+      const definitionNames = definitionName.split(',');
+      if (definitionNames.length > 1) {
+        const buildRuns: BuildRun[] = [];
+        for (const name of definitionNames) {
+          queryString.set('definitionName', name.trim());
+          if (options?.top) {
+            queryString.set('top', options.top.toString());
+          }
+          const urlSegment = `builds/${encodeURIComponent(
+            projectName,
+          )}?${queryString}`;
+          const items = await this.get<BuildRun[]>(urlSegment);
+          buildRuns.push(...items);
+        }
+        return { items: buildRuns };
+      }
+      queryString.append('definitionName', definitionName.trim());
     }
     if (options?.top) {
       queryString.append('top', options.top.toString());