From 91ab2eb9b703b121e82de6b7ce037ac517b3e1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 4 Nov 2025 10:58:32 +0100
Subject: [PATCH] fix gitlab search with multiple globs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/eleven-carpets-win.md                     |  5 +++++
 .../urlReader/lib/GitlabUrlReader.test.ts            | 11 +++++++++++
 .../src/entrypoints/urlReader/lib/GitlabUrlReader.ts | 12 ++++--------
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/eleven-carpets-win.md

diff --git a/.changeset/eleven-carpets-win.md b/.changeset/eleven-carpets-win.md
new file mode 100644
index 0000000000..69d677786a
--- /dev/null
+++ b/.changeset/eleven-carpets-win.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Fix a bug in the Gitlab URL reader where `search` did not handle multiple globs
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.test.ts
index 65cd275574..c5ce323c54 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.test.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.test.ts
@@ -670,6 +670,17 @@ describe('GitlabUrlReader', () => {
       );
     });
 
+    it('works when there are multiple globs', async () => {
+      const result = await gitlabProcessor.search(
+        'https://gitlab.com/backstage/mock/tree/main/**/docs/**/index.*',
+      );
+      expect(result.etag).toBe('sha123abc');
+      expect(result.files.length).toBe(1);
+      expect(result.files[0].url).toBe(
+        'https://gitlab.com/backstage/mock/tree/main/docs/index.md',
+      );
+    });
+
     it('works for the naive case', async () => {
       const result = await gitlabProcessor.search(
         'https://gitlab.com/backstage/mock/tree/main/**/index.*',
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
index 19f1846dda..ee290e31e6 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
@@ -319,14 +319,10 @@ export class GitlabUrlReader implements UrlReaderService {
    */
   private getStaticPart(globPattern: string) {
     const segments = globPattern.split('/');
-    let i = segments.length;
-    while (
-      i > 0 &&
-      new Minimatch(segments.slice(0, i).join('/')).match(globPattern)
-    ) {
-      i--;
-    }
-    return segments.slice(0, i).join('/');
+    const globIndex = segments.findIndex(segment => segment.match(/[*?]/));
+    return globIndex === -1
+      ? globPattern
+      : segments.slice(0, globIndex).join('/');
   }
 
   toString() {