Merge pull request #4347 from kaparwan/feature/bitbucket-own-hosted-fixes-debug

#4322  bitbucket own hosted v5.11.1 branchUrl fix and enabled error tracing…

packages/integration/src/bitbucket/core.test.ts

@@ -125,6 +125,7 @@ describe('bitbucket core', () => {
             ),
         ),
       );
+
       const config: BitbucketIntegrationConfig = {
         host: 'bitbucket.mycompany.net',
         apiBaseUrl: 'https://api.bitbucket.mycompany.net/rest/api/1.0',
@@ -250,5 +251,40 @@ describe('bitbucket core', () => {
       );
       expect(defaultBranch).toEqual('main');
     });
+
+    it('return default branch for Bitbucket Server for bitbucket version 5.11', async () => {
+      const defaultBranchResponse = {
+        displayId: 'main',
+      };
+      worker.use(
+        rest.get(
+          'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/default-branch',
+          (_, res, ctx) =>
+            res(
+              ctx.status(404),
+              ctx.set('Content-Type', 'application/json'),
+              ctx.json(defaultBranchResponse),
+            ),
+        ),
+        rest.get(
+          'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/branches/default',
+          (_, res, ctx) =>
+            res(
+              ctx.status(200),
+              ctx.set('Content-Type', 'application/json'),
+              ctx.json(defaultBranchResponse),
+            ),
+        ),
+      );
+      const config: BitbucketIntegrationConfig = {
+        host: 'bitbucket.mycompany.net',
+        apiBaseUrl: 'https://api.bitbucket.mycompany.net/rest/api/1.0',
+      };
+      const defaultBranch = await getBitbucketDefaultBranch(
+        'https://bitbucket.mycompany.net/projects/backstage/repos/mock/browse/README.md',
+        config,
+      );
+      expect(defaultBranch).toEqual('main');
+    });
   });
 });

packages/integration/src/bitbucket/core.ts

@@ -32,11 +32,19 @@ export async function getBitbucketDefaultBranch(
 
   const isHosted = resource === 'bitbucket.org';
   // Bitbucket Server https://docs.atlassian.com/bitbucket-server/rest/7.9.0/bitbucket-rest.html#idp184
-  const branchUrl = isHosted
+  let branchUrl = isHosted
     ? `${config.apiBaseUrl}/repositories/${project}/${repoName}`
     : `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/default-branch`;
 
-  const response = await fetch(branchUrl, getBitbucketRequestOptions(config));
+  let response = await fetch(branchUrl, getBitbucketRequestOptions(config));
+
+  if (response.status === 404 && !isHosted) {
+    // First try the new format, and then if it gets specifically a 404 it should try the old format
+    // (to support old  Atlassian Bitbucket v5.11.1 format )
+    branchUrl = `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/branches/default`;
+    response = await fetch(branchUrl, getBitbucketRequestOptions(config));
+  }
+
   if (!response.ok) {
     const message = `Failed to retrieve default branch from ${branchUrl}, ${response.status} ${response.statusText}`;
     throw new Error(message);