@backstage/integration 1.3.0-next.0 → 1.3.0-next.1

package/dist/index.d.ts

@@ -1183,7 +1183,7 @@ declare class SingleInstanceGithubCredentialsProvider implements GithubCredentia
  *
  * Converts
  * from: https://gitlab.example.com/a/b/blob/master/c.yaml
- * to:   https://gitlab.example.com/a/b/raw/master/c.yaml
+ * to:   https://gitlab.com/api/v4/projects/projectId/repository/c.yaml?ref=master
  * -or-
  * from: https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/filepath
  * to:   https://gitlab.com/api/v4/projects/projectId/repository/files/filepath?ref=branch

package/dist/index.esm.js

@@ -4,7 +4,6 @@ import fetch from 'cross-fetch';
 import { createAppAuth } from '@octokit/auth-app';
 import { Octokit } from '@octokit/rest';
 import { DateTime } from 'luxon';
-import { InputError } from '@backstage/errors';
 
 function isValidHost(host) {
   const check = new URL("http://example.com");
@@ -733,19 +732,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(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;
@@ -1358,11 +1354,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;
@@ -1372,29 +1365,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 InputError("Wrong GitLab URL");
-    }
-    const repoPath = splitPath.slice(0, blobIndex);
-    const restOfPath = splitPath.slice(blobIndex + 1);
-    if (!restOfPath.join("/").match(/\.(yaml|yml)$/)) {
-      throw new InputError("Wrong GitLab URL");
-    }
-    url.pathname = [...repoPath, "raw", ...restOfPath].join("/");
-    return url;
-  } catch (e) {
-    throw new 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 = [
@@ -1413,11 +1387,11 @@ 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, "");
@@ -1536,7 +1510,16 @@ class ScmIntegrations {
     );
   }
   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);