@backstage/integration 1.2.0-next.1 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @backstage/integration
 
+## 1.2.0
+
+### Minor Changes
+
+- e295ce87de: added the possibility to handle raw Gitlab URLs with nested namespaces
+- 6673babab9: Gerrit UrlReader: Implemented `readTree`
+- 1b4e1e2306: Split `bitbucket` integration into `bitbucketCloud` and `bitbucketServer`
+  (backwards compatible).
+
+  In order to migrate to the new integration configs,
+  move your configs from `integrations.bitbucket`
+  to `integrations.bitbucketCloud` or `integrations.bitbucketServer`.
+
+  Migration example:
+
+  **Before:**
+
+  ```yaml
+  integrations:
+    bitbucket:
+      - host: bitbucket.org
+        username: bitbucket_user
+        appPassword: app-password
+      - host: bitbucket-server.company.com
+        token: my-token
+  ```
+
+  **After:**
+
+  ```yaml
+  integrations:
+    bitbucketCloud:
+      - username: bitbucket_user
+        appPassword: app-password
+    bitbucketServer:
+      - host: bitbucket-server.company.com
+        token: my-token
+  ```
+
+- 566407bf8a: Gerrit Integration: Added the `getGerritProjectsApiUrl` function
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.1
+
 ## 1.2.0-next.1
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -8,6 +8,7 @@ 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 }; }
 
@@ -1234,14 +1235,20 @@ function getGitLabRequestOptions(config) {
 function buildRawUrl(target) {
   try {
     const url = new URL(target);
-    const [empty, userOrOrg, repoName, blobKeyword, ...restOfPath] = url.pathname.split("/");
-    if (empty !== "" || userOrOrg === "" || repoName === "" || blobKeyword !== "blob" || !restOfPath.join("/").match(/\.(yaml|yml)$/)) {
-      throw new Error("Wrong GitLab URL");
+    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");
     }
-    url.pathname = [empty, userOrOrg, repoName, "raw", ...restOfPath].join("/");
+    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 Error(`Incorrect url: ${target}, ${e}`);
+    throw new errors.InputError(`Incorrect url: ${target}, ${e}`);
   }
 }
 function buildProjectUrl(target, projectID) {