@backstage/integration 1.2.2 → 1.3.0

package/dist/index.cjs.js

@@ -8,7 +8,6 @@ var fetch = require('cross-fetch');
 var authApp = require('@octokit/auth-app');
 var rest = require('@octokit/rest');
 var luxon = require('luxon');
-var errors = require('@backstage/errors');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -57,7 +56,10 @@ function defaultScmResolveUrl(options) {
   if (url.startsWith("/")) {
     const { filepath } = parseGitUrl__default["default"](base);
     updated = new URL(base);
-    const repoRootPath = lodash.trimEnd(updated.pathname.substring(0, updated.pathname.length - filepath.length), "/");
+    const repoRootPath = lodash.trimEnd(
+      updated.pathname.substring(0, updated.pathname.length - filepath.length),
+      "/"
+    );
     updated.pathname = `${repoRootPath}${url}`;
   } else {
     updated = new URL(url, base);
@@ -82,10 +84,14 @@ function readAwsS3IntegrationConfig(config) {
       host = url.host;
       pathname = url.pathname;
     } catch {
-      throw new Error(`invalid awsS3 integration config, endpoint '${endpoint}' is not a valid URL`);
+      throw new Error(
+        `invalid awsS3 integration config, endpoint '${endpoint}' is not a valid URL`
+      );
     }
     if (pathname !== "/") {
-      throw new Error(`invalid awsS3 integration config, endpoints cannot contain path, got '${endpoint}'`);
+      throw new Error(
+        `invalid awsS3 integration config, endpoints cannot contain path, got '${endpoint}'`
+      );
     }
   } else {
     host = AMAZON_AWS_HOST;
@@ -138,8 +144,13 @@ const _AwsS3Integration = class {
 let AwsS3Integration = _AwsS3Integration;
 AwsS3Integration.factory = ({ config }) => {
   var _a;
-  const configs = readAwsS3IntegrationConfigs((_a = config.getOptionalConfigArray("integrations.awsS3")) != null ? _a : []);
-  return basicIntegrations(configs.map((c) => new _AwsS3Integration(c)), (i) => i.config.host);
+  const configs = readAwsS3IntegrationConfigs(
+    (_a = config.getOptionalConfigArray("integrations.awsS3")) != null ? _a : []
+  );
+  return basicIntegrations(
+    configs.map((c) => new _AwsS3Integration(c)),
+    (i) => i.config.host
+  );
 };
 
 var __accessCheck = (obj, member, msg) => {
@@ -233,7 +244,9 @@ const _AzureUrl = class {
   }
   toFileUrl() {
     if (!__privateGet(this, _path)) {
-      throw new Error("Azure URL must point to a specific path to be able to download a file");
+      throw new Error(
+        "Azure URL must point to a specific path to be able to download a file"
+      );
     }
     const url = __privateGet(this, _baseUrl).call(this, __privateGet(this, _owner), __privateGet(this, _project), "_apis", "git", "repositories", __privateGet(this, _repo), "items");
     url.searchParams.set("api-version", "6.0");
@@ -295,7 +308,9 @@ function readAzureIntegrationConfig(config) {
   const host = (_a = config.getOptionalString("host")) != null ? _a : AZURE_HOST;
   const token = config.getOptionalString("token");
   if (!isValidHost(host)) {
-    throw new Error(`Invalid Azure integration config, '${host}' is not a valid host`);
+    throw new Error(
+      `Invalid Azure integration config, '${host}' is not a valid host`
+    );
   }
   return { host, token };
 }
@@ -350,8 +365,13 @@ const _AzureIntegration = class {
 let AzureIntegration = _AzureIntegration;
 AzureIntegration.factory = ({ config }) => {
   var _a;
-  const configs = readAzureIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.azure")) != null ? _a : []);
-  return basicIntegrations(configs.map((c) => new _AzureIntegration(c)), (i) => i.config.host);
+  const configs = readAzureIntegrationConfigs(
+    (_a = config.getOptionalConfigArray("integrations.azure")) != null ? _a : []
+  );
+  return basicIntegrations(
+    configs.map((c) => new _AzureIntegration(c)),
+    (i) => i.config.host
+  );
 };
 
 function getAzureFileFetchUrl(url) {
@@ -382,7 +402,9 @@ function readBitbucketIntegrationConfig(config) {
   const username = config.getOptionalString("username");
   const appPassword = config.getOptionalString("appPassword");
   if (!isValidHost(host)) {
-    throw new Error(`Invalid Bitbucket integration config, '${host}' is not a valid host`);
+    throw new Error(
+      `Invalid Bitbucket integration config, '${host}' is not a valid host`
+    );
   }
   if (apiBaseUrl) {
     apiBaseUrl = lodash.trimEnd(apiBaseUrl, "/");
@@ -450,11 +472,16 @@ BitbucketIntegration.factory = ({
   config
 }) => {
   var _a, _b, _c;
-  const configs = readBitbucketIntegrationConfigs((_c = config.getOptionalConfigArray("integrations.bitbucket")) != null ? _c : [
-    ...(_a = config.getOptionalConfigArray("integrations.bitbucketCloud")) != null ? _a : [],
-    ...(_b = config.getOptionalConfigArray("integrations.bitbucketServer")) != null ? _b : []
-  ]);
-  return basicIntegrations(configs.map((c) => new _BitbucketIntegration(c)), (i) => i.config.host);
+  const configs = readBitbucketIntegrationConfigs(
+    (_c = config.getOptionalConfigArray("integrations.bitbucket")) != null ? _c : [
+      ...(_a = config.getOptionalConfigArray("integrations.bitbucketCloud")) != null ? _a : [],
+      ...(_b = config.getOptionalConfigArray("integrations.bitbucketServer")) != null ? _b : []
+    ]
+  );
+  return basicIntegrations(
+    configs.map((c) => new _BitbucketIntegration(c)),
+    (i) => i.config.host
+  );
 };
 
 async function getBitbucketDefaultBranch(url, config) {
@@ -479,7 +506,9 @@ async function getBitbucketDefaultBranch(url, config) {
     defaultBranch = displayId;
   }
   if (!defaultBranch) {
-    throw new Error(`Failed to read default branch from ${branchUrl}. Response ${response.status} ${response.json()}`);
+    throw new Error(
+      `Failed to read default branch from ${branchUrl}. Response ${response.status} ${response.json()}`
+    );
   }
   return defaultBranch;
 }
@@ -497,7 +526,7 @@ async function getBitbucketDownloadUrl(url, config) {
   if (!branch) {
     branch = await getBitbucketDefaultBranch(url, config);
   }
-  const path = filepath ? `&path=${encodeURIComponent(filepath)}` : "";
+  const path = filepath ? `&path=${encodeURIComponent(decodeURIComponent(filepath))}` : "";
   const archiveUrl = isHosted ? `${protocol}://${resource}/${project}/${repoName}/get/${branch}.tar.gz` : `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/archive?format=tgz&at=${branch}&prefix=${project}-${repoName}${path}`;
   return archiveUrl;
 }
@@ -524,7 +553,10 @@ function getBitbucketRequestOptions(config) {
   if (config.token) {
     headers.Authorization = `Bearer ${config.token}`;
   } else if (config.username && config.appPassword) {
-    const buffer = Buffer.from(`${config.username}:${config.appPassword}`, "utf8");
+    const buffer = Buffer.from(
+      `${config.username}:${config.appPassword}`,
+      "utf8"
+    );
     headers.Authorization = `Basic ${buffer.toString("base64")}`;
   }
   return {
@@ -592,14 +624,22 @@ BitbucketCloudIntegration.factory = ({
   config
 }) => {
   var _a;
-  const configs = readBitbucketCloudIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.bitbucketCloud")) != null ? _a : []);
-  return basicIntegrations(configs.map((c) => new _BitbucketCloudIntegration(c)), (i) => i.config.host);
+  const configs = readBitbucketCloudIntegrationConfigs(
+    (_a = config.getOptionalConfigArray("integrations.bitbucketCloud")) != null ? _a : []
+  );
+  return basicIntegrations(
+    configs.map((c) => new _BitbucketCloudIntegration(c)),
+    (i) => i.config.host
+  );
 };
 
 async function getBitbucketCloudDefaultBranch(url, config) {
   const { name: repoName, owner: project } = parseGitUrl__default["default"](url);
   const branchUrl = `${config.apiBaseUrl}/repositories/${project}/${repoName}`;
-  const response = await fetch__default["default"](branchUrl, getBitbucketCloudRequestOptions(config));
+  const response = await fetch__default["default"](
+    branchUrl,
+    getBitbucketCloudRequestOptions(config)
+  );
   if (!response.ok) {
     const message = `Failed to retrieve default branch from ${branchUrl}, ${response.status} ${response.statusText}`;
     throw new Error(message);
@@ -607,7 +647,9 @@ async function getBitbucketCloudDefaultBranch(url, config) {
   const repoInfo = await response.json();
   const defaultBranch = repoInfo.mainbranch.name;
   if (!defaultBranch) {
-    throw new Error(`Failed to read default branch from ${branchUrl}. Response ${response.status} ${response.json()}`);
+    throw new Error(
+      `Failed to read default branch from ${branchUrl}. Response ${response.status} ${response.json()}`
+    );
   }
   return defaultBranch;
 }
@@ -643,7 +685,10 @@ function getBitbucketCloudFileFetchUrl(url, config) {
 function getBitbucketCloudRequestOptions(config) {
   const headers = {};
   if (config.username && config.appPassword) {
-    const buffer = Buffer.from(`${config.username}:${config.appPassword}`, "utf8");
+    const buffer = Buffer.from(
+      `${config.username}:${config.appPassword}`,
+      "utf8"
+    );
     headers.Authorization = `Basic ${buffer.toString("base64")}`;
   }
   return {
@@ -655,8 +700,12 @@ function readBitbucketServerIntegrationConfig(config) {
   const host = config.getString("host");
   let apiBaseUrl = config.getOptionalString("apiBaseUrl");
   const token = config.getOptionalString("token");
+  const username = config.getOptionalString("username");
+  const password = config.getOptionalString("password");
   if (!isValidHost(host)) {
-    throw new Error(`Invalid Bitbucket Server integration config, '${host}' is not a valid host`);
+    throw new Error(
+      `Invalid Bitbucket Server integration config, '${host}' is not a valid host`
+    );
   }
   if (apiBaseUrl) {
     apiBaseUrl = lodash.trimEnd(apiBaseUrl, "/");
@@ -666,7 +715,9 @@ function readBitbucketServerIntegrationConfig(config) {
   return {
     host,
     apiBaseUrl,
-    token
+    token,
+    username,
+    password
   };
 }
 function readBitbucketServerIntegrationConfigs(configs) {
@@ -690,19 +741,16 @@ const _BitbucketServerIntegration = class {
     const resolved = defaultScmResolveUrl(options);
     if (options.lineNumber) {
       const url = new URL(resolved);
-      const filename = url.pathname.split("/").slice(-1)[0];
-      url.hash = `${filename}-${options.lineNumber}`;
+      url.hash = options.lineNumber.toString();
       return url.toString();
     }
     return resolved;
   }
   resolveEditUrl(url) {
-    const urlData = parseGitUrl__default["default"](url);
-    const editUrl = new URL(url);
-    editUrl.searchParams.set("mode", "edit");
-    editUrl.searchParams.set("spa", "0");
-    editUrl.searchParams.set("at", urlData.ref);
-    return editUrl.toString();
+    if (url.includes("?")) {
+      return url.substring(0, url.indexOf("?"));
+    }
+    return url;
   }
 };
 let BitbucketServerIntegration = _BitbucketServerIntegration;
@@ -710,14 +758,22 @@ BitbucketServerIntegration.factory = ({
   config
 }) => {
   var _a;
-  const configs = readBitbucketServerIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.bitbucketServer")) != null ? _a : []);
-  return basicIntegrations(configs.map((c) => new _BitbucketServerIntegration(c)), (i) => i.config.host);
+  const configs = readBitbucketServerIntegrationConfigs(
+    (_a = config.getOptionalConfigArray("integrations.bitbucketServer")) != null ? _a : []
+  );
+  return basicIntegrations(
+    configs.map((c) => new _BitbucketServerIntegration(c)),
+    (i) => i.config.host
+  );
 };
 
 async function getBitbucketServerDefaultBranch(url, config) {
   const { name: repoName, owner: project } = parseGitUrl__default["default"](url);
   let branchUrl = `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/default-branch`;
-  let response = await fetch__default["default"](branchUrl, getBitbucketServerRequestOptions(config));
+  let response = await fetch__default["default"](
+    branchUrl,
+    getBitbucketServerRequestOptions(config)
+  );
   if (response.status === 404) {
     branchUrl = `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/branches/default`;
     response = await fetch__default["default"](branchUrl, getBitbucketServerRequestOptions(config));
@@ -729,7 +785,9 @@ async function getBitbucketServerDefaultBranch(url, config) {
   const { displayId } = await response.json();
   const defaultBranch = displayId;
   if (!defaultBranch) {
-    throw new Error(`Failed to read default branch from ${branchUrl}. Response ${response.status} ${response.json()}`);
+    throw new Error(
+      `Failed to read default branch from ${branchUrl}. Response ${response.status} ${response.json()}`
+    );
   }
   return defaultBranch;
 }
@@ -759,6 +817,10 @@ function getBitbucketServerRequestOptions(config) {
   if (config.token) {
     headers.Authorization = `Bearer ${config.token}`;
   }
+  if (config.username && config.password) {
+    const buffer = Buffer.from(`${config.username}:${config.password}`, "utf8");
+    headers.Authorization = `Basic ${buffer.toString("base64")}`;
+  }
   return {
     headers
   };
@@ -772,13 +834,21 @@ function readGerritIntegrationConfig(config) {
   const username = config.getOptionalString("username");
   const password = config.getOptionalString("password");
   if (!isValidHost(host)) {
-    throw new Error(`Invalid Gerrit integration config, '${host}' is not a valid host`);
+    throw new Error(
+      `Invalid Gerrit integration config, '${host}' is not a valid host`
+    );
   } else if (baseUrl && !isValidUrl(baseUrl)) {
-    throw new Error(`Invalid Gerrit integration config, '${baseUrl}' is not a valid baseUrl`);
+    throw new Error(
+      `Invalid Gerrit integration config, '${baseUrl}' is not a valid baseUrl`
+    );
   } else if (cloneUrl && !isValidUrl(cloneUrl)) {
-    throw new Error(`Invalid Gerrit integration config, '${cloneUrl}' is not a valid cloneUrl`);
+    throw new Error(
+      `Invalid Gerrit integration config, '${cloneUrl}' is not a valid cloneUrl`
+    );
   } else if (gitilesBaseUrl && !isValidUrl(gitilesBaseUrl)) {
-    throw new Error(`Invalid Gerrit integration config, '${gitilesBaseUrl}' is not a valid gitilesBaseUrl`);
+    throw new Error(
+      `Invalid Gerrit integration config, '${gitilesBaseUrl}' is not a valid gitilesBaseUrl`
+    );
   }
   if (baseUrl) {
     baseUrl = lodash.trimEnd(baseUrl, "/");
@@ -837,7 +907,9 @@ function getAuthenticationPrefix(config) {
 }
 function getGerritBranchApiUrl(config, url) {
   const { branch, project } = parseGerritGitilesUrl(config, url);
-  return `${config.baseUrl}${getAuthenticationPrefix(config)}projects/${encodeURIComponent(project)}/branches/${branch}`;
+  return `${config.baseUrl}${getAuthenticationPrefix(
+    config
+  )}projects/${encodeURIComponent(project)}/branches/${branch}`;
 }
 function getGerritCloneRepoUrl(config, url) {
   const { project } = parseGerritGitilesUrl(config, url);
@@ -845,7 +917,11 @@ function getGerritCloneRepoUrl(config, url) {
 }
 function getGerritFileContentsApiUrl(config, url) {
   const { branch, filePath, project } = parseGerritGitilesUrl(config, url);
-  return `${config.baseUrl}${getAuthenticationPrefix(config)}projects/${encodeURIComponent(project)}/branches/${branch}/files/${encodeURIComponent(filePath)}/content`;
+  return `${config.baseUrl}${getAuthenticationPrefix(
+    config
+  )}projects/${encodeURIComponent(
+    project
+  )}/branches/${branch}/files/${encodeURIComponent(filePath)}/content`;
 }
 function getGerritProjectsApiUrl(config) {
   return `${config.baseUrl}${getAuthenticationPrefix(config)}projects/`;
@@ -867,10 +943,14 @@ async function parseGerritJsonResponse(response) {
     try {
       return JSON.parse(responseBody.slice(GERRIT_BODY_PREFIX.length));
     } catch (ex) {
-      throw new Error(`Invalid response from Gerrit: ${responseBody.slice(0, 10)} - ${ex}`);
+      throw new Error(
+        `Invalid response from Gerrit: ${responseBody.slice(0, 10)} - ${ex}`
+      );
     }
   }
-  throw new Error(`Gerrit JSON body prefix missing. Found: ${responseBody.slice(0, 10)}`);
+  throw new Error(
+    `Gerrit JSON body prefix missing. Found: ${responseBody.slice(0, 10)}`
+  );
 }
 
 const _GerritIntegration = class {
@@ -910,8 +990,13 @@ const _GerritIntegration = class {
 let GerritIntegration = _GerritIntegration;
 GerritIntegration.factory = ({ config }) => {
   var _a;
-  const configs = readGerritIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.gerrit")) != null ? _a : []);
-  return basicIntegrations(configs.map((c) => new _GerritIntegration(c)), (i) => i.config.host);
+  const configs = readGerritIntegrationConfigs(
+    (_a = config.getOptionalConfigArray("integrations.gerrit")) != null ? _a : []
+  );
+  return basicIntegrations(
+    configs.map((c) => new _GerritIntegration(c)),
+    (i) => i.config.host
+  );
 };
 
 const GITHUB_HOST = "github.com";
@@ -929,10 +1014,14 @@ function readGitHubIntegrationConfig(config) {
     clientSecret: c.getString("clientSecret"),
     webhookSecret: c.getString("webhookSecret"),
     privateKey: c.getString("privateKey"),
-    allowedInstallationOwners: c.getOptionalStringArray("allowedInstallationOwners")
+    allowedInstallationOwners: c.getOptionalStringArray(
+      "allowedInstallationOwners"
+    )
   }));
   if (!isValidHost(host)) {
-    throw new Error(`Invalid GitHub integration config, '${host}' is not a valid host`);
+    throw new Error(
+      `Invalid GitHub integration config, '${host}' is not a valid host`
+    );
   }
   if (apiBaseUrl) {
     apiBaseUrl = lodash.trimEnd(apiBaseUrl, "/");
@@ -1037,6 +1126,7 @@ class GithubAppManager {
     }
     const cacheKey = repo ? `${owner}/${repo}` : owner;
     return this.cache.getOrCreateToken(cacheKey, async () => {
+      var _a2;
       const result = await this.appClient.apps.createInstallationAccessToken({
         installation_id: installationId,
         headers: HEADERS
@@ -1046,12 +1136,17 @@ class GithubAppManager {
           baseUrl: this.baseUrl,
           auth: result.data.token
         });
-        const repos = await installationClient.paginate(installationClient.apps.listReposAccessibleToInstallation);
-        const hasRepo = repos.repositories.some((repository) => {
+        const repos = await installationClient.paginate(
+          installationClient.apps.listReposAccessibleToInstallation
+        );
+        const repositories = (_a2 = repos.repositories) != null ? _a2 : repos;
+        const hasRepo = repositories.some((repository) => {
           return repository.name === repo;
         });
         if (!hasRepo) {
-          throw new Error(`The Backstage GitHub application used in the ${owner} organization does not have access to a repository with the name ${repo}`);
+          throw new Error(
+            `The Backstage GitHub application used in the ${owner} organization does not have access to a repository with the name ${repo}`
+          );
         }
       }
       return {
@@ -1065,17 +1160,21 @@ class GithubAppManager {
   }
   async getInstallationData(owner) {
     const allInstallations = await this.getInstallations();
-    const installation = allInstallations.find((inst) => {
-      var _a, _b;
-      return ((_b = (_a = inst.account) == null ? void 0 : _a.login) == null ? void 0 : _b.toLocaleLowerCase("en-US")) === owner.toLocaleLowerCase("en-US");
-    });
+    const installation = allInstallations.find(
+      (inst) => {
+        var _a, _b;
+        return ((_b = (_a = inst.account) == null ? void 0 : _a.login) == null ? void 0 : _b.toLocaleLowerCase("en-US")) === owner.toLocaleLowerCase("en-US");
+      }
+    );
     if (installation) {
       return {
         installationId: installation.id,
         suspended: Boolean(installation.suspended_by)
       };
     }
-    const notFoundError = new Error(`No app installation found for ${owner} in ${this.baseAuthConfig.appId}`);
+    const notFoundError = new Error(
+      `No app installation found for ${owner} in ${this.baseAuthConfig.appId}`
+    );
     notFoundError.name = "NotFoundError";
     throw notFoundError;
   }
@@ -1089,14 +1188,23 @@ class GithubAppCredentialsMux {
     if (!this.apps.length) {
       return [];
     }
-    const installs = await Promise.all(this.apps.map((app) => app.getInstallations()));
+    const installs = await Promise.all(
+      this.apps.map((app) => app.getInstallations())
+    );
     return installs.flat();
   }
   async getAppToken(owner, repo) {
     if (this.apps.length === 0) {
       return void 0;
     }
-    const results = await Promise.all(this.apps.map((app) => app.getInstallationCredentials(owner, repo).then((credentials) => ({ credentials, error: void 0 }), (error) => ({ credentials: void 0, error }))));
+    const results = await Promise.all(
+      this.apps.map(
+        (app) => app.getInstallationCredentials(owner, repo).then(
+          (credentials) => ({ credentials, error: void 0 }),
+          (error) => ({ credentials: void 0, error })
+        )
+      )
+    );
     const result = results.find((resultItem) => resultItem.credentials);
     if (result) {
       return result.credentials.accessToken;
@@ -1133,7 +1241,10 @@ const _SingleInstanceGithubCredentialsProvider = class {
 };
 let SingleInstanceGithubCredentialsProvider = _SingleInstanceGithubCredentialsProvider;
 SingleInstanceGithubCredentialsProvider.create = (config) => {
-  return new _SingleInstanceGithubCredentialsProvider(new GithubAppCredentialsMux(config), config.token);
+  return new _SingleInstanceGithubCredentialsProvider(
+    new GithubAppCredentialsMux(config),
+    config.token
+  );
 };
 
 class DefaultGithubCredentialsProvider {
@@ -1152,7 +1263,9 @@ class DefaultGithubCredentialsProvider {
     const parsed = new URL(opts.url);
     const provider = this.providers.get(parsed.host);
     if (!provider) {
-      throw new Error(`There is no GitHub integration that matches ${opts.url}. Please add a configuration for an integration.`);
+      throw new Error(
+        `There is no GitHub integration that matches ${opts.url}. Please add a configuration for an integration.`
+      );
     }
     return provider.getCredentials(opts);
   }
@@ -1181,13 +1294,21 @@ const _GitHubIntegration = class {
 let GitHubIntegration = _GitHubIntegration;
 GitHubIntegration.factory = ({ config }) => {
   var _a;
-  const configs = readGitHubIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.github")) != null ? _a : []);
-  return basicIntegrations(configs.map((c) => new _GitHubIntegration(c)), (i) => i.config.host);
+  const configs = readGitHubIntegrationConfigs(
+    (_a = config.getOptionalConfigArray("integrations.github")) != null ? _a : []
+  );
+  return basicIntegrations(
+    configs.map((c) => new _GitHubIntegration(c)),
+    (i) => i.config.host
+  );
 };
 function replaceGitHubUrlType(url, type) {
-  return url.replace(/\/\/([^/]+)\/([^/]+)\/([^/]+)\/(blob|tree|edit)\//, (_, host, owner, repo) => {
-    return `//${host}/${owner}/${repo}/${type}/`;
-  });
+  return url.replace(
+    /\/\/([^/]+)\/([^/]+)\/([^/]+)\/(blob|tree|edit)\//,
+    (_, host, owner, repo) => {
+      return `//${host}/${owner}/${repo}/${type}/`;
+    }
+  );
 }
 
 const GITLAB_HOST = "gitlab.com";
@@ -1208,11 +1329,17 @@ function readGitLabIntegrationConfig(config) {
     baseUrl = `https://${host}`;
   }
   if (!isValidHost(host)) {
-    throw new Error(`Invalid GitLab integration config, '${host}' is not a valid host`);
+    throw new Error(
+      `Invalid GitLab integration config, '${host}' is not a valid host`
+    );
   } else if (!apiBaseUrl || !isValidUrl(apiBaseUrl)) {
-    throw new Error(`Invalid GitLab integration config, '${apiBaseUrl}' is not a valid apiBaseUrl`);
+    throw new Error(
+      `Invalid GitLab integration config, '${apiBaseUrl}' is not a valid apiBaseUrl`
+    );
   } else if (!isValidUrl(baseUrl)) {
-    throw new Error(`Invalid GitLab integration config, '${baseUrl}' is not a valid baseUrl`);
+    throw new Error(
+      `Invalid GitLab integration config, '${baseUrl}' is not a valid baseUrl`
+    );
   }
   return { host, token, apiBaseUrl, baseUrl };
 }
@@ -1236,11 +1363,8 @@ function getGitLabIntegrationRelativePath(config) {
 }
 
 async function getGitLabFileFetchUrl(url, config) {
-  if (url.includes("/-/blob/")) {
-    const projectID = await getProjectId(url, config);
-    return buildProjectUrl(url, projectID, config).toString();
-  }
-  return buildRawUrl(url).toString();
+  const projectID = await getProjectId(url, config);
+  return buildProjectUrl(url, projectID, config).toString();
 }
 function getGitLabRequestOptions(config) {
   const { token = "" } = config;
@@ -1250,29 +1374,10 @@ function getGitLabRequestOptions(config) {
     }
   };
 }
-function buildRawUrl(target) {
-  try {
-    const url = new URL(target);
-    const splitPath = url.pathname.split("/").filter(Boolean);
-    const blobIndex = splitPath.indexOf("blob", 2);
-    if (blobIndex < 2 || blobIndex === splitPath.length - 1) {
-      throw new errors.InputError("Wrong GitLab URL");
-    }
-    const repoPath = splitPath.slice(0, blobIndex);
-    const restOfPath = splitPath.slice(blobIndex + 1);
-    if (!restOfPath.join("/").match(/\.(yaml|yml)$/)) {
-      throw new errors.InputError("Wrong GitLab URL");
-    }
-    url.pathname = [...repoPath, "raw", ...restOfPath].join("/");
-    return url;
-  } catch (e) {
-    throw new errors.InputError(`Incorrect url: ${target}, ${e}`);
-  }
-}
 function buildProjectUrl(target, projectID, config) {
   try {
     const url = new URL(target);
-    const branchAndFilePath = url.pathname.split("/-/blob/")[1];
+    const branchAndFilePath = url.pathname.split("/blob/").slice(1).join("/blob/");
     const [branch, ...filePath] = branchAndFilePath.split("/");
     const relativePath = getGitLabIntegrationRelativePath(config);
     url.pathname = [
@@ -1291,20 +1396,29 @@ function buildProjectUrl(target, projectID, config) {
 }
 async function getProjectId(target, config) {
   const url = new URL(target);
-  if (!url.pathname.includes("/-/blob/")) {
+  if (!url.pathname.includes("/blob/")) {
     throw new Error("Please provide full path to yaml file from GitLab");
   }
   try {
-    let repo = url.pathname.split("/-/blob/")[0];
+    let repo = url.pathname.split("/-/blob/")[0].split("/blob/")[0];
     const relativePath = getGitLabIntegrationRelativePath(config);
     if (relativePath) {
       repo = repo.replace(relativePath, "");
     }
-    const repoIDLookup = new URL(`${url.origin}${relativePath}/api/v4/projects/${encodeURIComponent(repo.replace(/^\//, ""))}`);
-    const response = await fetch__default["default"](repoIDLookup.toString(), getGitLabRequestOptions(config));
+    const repoIDLookup = new URL(
+      `${url.origin}${relativePath}/api/v4/projects/${encodeURIComponent(
+        repo.replace(/^\//, "")
+      )}`
+    );
+    const response = await fetch__default["default"](
+      repoIDLookup.toString(),
+      getGitLabRequestOptions(config)
+    );
     const data = await response.json();
     if (!response.ok) {
-      throw new Error(`GitLab Error '${data.error}', ${data.error_description}`);
+      throw new Error(
+        `GitLab Error '${data.error}', ${data.error_description}`
+      );
     }
     return Number(data.id);
   } catch (e) {
@@ -1335,8 +1449,13 @@ const _GitLabIntegration = class {
 let GitLabIntegration = _GitLabIntegration;
 GitLabIntegration.factory = ({ config }) => {
   var _a;
-  const configs = readGitLabIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.gitlab")) != null ? _a : []);
-  return basicIntegrations(configs.map((c) => new _GitLabIntegration(c)), (i) => i.config.host);
+  const configs = readGitLabIntegrationConfigs(
+    (_a = config.getOptionalConfigArray("integrations.gitlab")) != null ? _a : []
+  );
+  return basicIntegrations(
+    configs.map((c) => new _GitLabIntegration(c)),
+    (i) => i.config.host
+  );
 };
 function replaceGitLabUrlType(url, type) {
   return url.replace(/\/\-\/(blob|tree|edit)\//, `/-/${type}/`);
@@ -1395,10 +1514,21 @@ class ScmIntegrations {
     return this.byType.gitlab;
   }
   list() {
-    return Object.values(this.byType).flatMap((i) => i.list());
+    return Object.values(this.byType).flatMap(
+      (i) => i.list()
+    );
   }
   byUrl(url) {
-    return Object.values(this.byType).map((i) => i.byUrl(url)).find(Boolean);
+    let candidates = Object.values(this.byType).map((i) => i.byUrl(url)).filter(Boolean);
+    if (candidates.length > 1) {
+      const filteredCandidates = candidates.filter(
+        (x) => !(x instanceof BitbucketIntegration)
+      );
+      if (filteredCandidates.length !== 0) {
+        candidates = filteredCandidates;
+      }
+    }
+    return candidates[0];
   }
   byHost(host) {
     return Object.values(this.byType).map((i) => i.byHost(host)).find(Boolean);