From 6800da78d9237da704105d9d49797c51b31be4c6 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Thu, 21 Jan 2021 22:26:34 +0100
Subject: [PATCH] integration: Fix default branch API url for hosted bitbucket
 server

---
 .changeset/eleven-lamps-hide.md                 | 5 +++++
 packages/integration/src/bitbucket/core.test.ts | 6 +++---
 packages/integration/src/bitbucket/core.ts      | 8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/eleven-lamps-hide.md

diff --git a/.changeset/eleven-lamps-hide.md b/.changeset/eleven-lamps-hide.md
new file mode 100644
index 0000000000..809de25c82
--- /dev/null
+++ b/.changeset/eleven-lamps-hide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Fix default branch API url for custom hosted Bitbucket server
diff --git a/packages/integration/src/bitbucket/core.test.ts b/packages/integration/src/bitbucket/core.test.ts
index 39707976fe..1287ab4d66 100644
--- a/packages/integration/src/bitbucket/core.test.ts
+++ b/packages/integration/src/bitbucket/core.test.ts
@@ -116,7 +116,7 @@ describe('bitbucket core', () => {
       };
       worker.use(
         rest.get(
-          'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/branches/default',
+          'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/default-branch',
           (_, res, ctx) =>
             res(
               ctx.status(200),
@@ -144,7 +144,7 @@ describe('bitbucket core', () => {
       };
       worker.use(
         rest.get(
-          'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/branches/default',
+          'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/default-branch',
           (_, res, ctx) =>
             res(
               ctx.status(200),
@@ -231,7 +231,7 @@ describe('bitbucket core', () => {
       };
       worker.use(
         rest.get(
-          'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/branches/default',
+          'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/default-branch',
           (_, res, ctx) =>
             res(
               ctx.status(200),
diff --git a/packages/integration/src/bitbucket/core.ts b/packages/integration/src/bitbucket/core.ts
index ae61df497d..f5235d8189 100644
--- a/packages/integration/src/bitbucket/core.ts
+++ b/packages/integration/src/bitbucket/core.ts
@@ -31,9 +31,10 @@ export async function getBitbucketDefaultBranch(
   const { name: repoName, owner: project, resource } = parseGitUrl(url);
 
   const isHosted = resource === 'bitbucket.org';
+  // Bitbucket Server https://docs.atlassian.com/bitbucket-server/rest/7.9.0/bitbucket-rest.html#idp184
   const branchUrl = isHosted
     ? `${config.apiBaseUrl}/repositories/${project}/${repoName}`
-    : `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/branches/default`;
+    : `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/default-branch`;
 
   const response = await fetch(branchUrl, getBitbucketRequestOptions(config));
   if (!response.ok) {
@@ -50,7 +51,10 @@ export async function getBitbucketDefaultBranch(
     defaultBranch = displayId;
   }
   if (!defaultBranch) {
-    throw new Error(`Failed to read default branch from ${branchUrl}`);
+    throw new Error(
+      `Failed to read default branch from ${branchUrl}. ` +
+        `Response ${response.status} ${response.json()}`,
+    );
   }
   return defaultBranch;
 }