@backstage/integration 1.0.0 → 1.1.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @backstage/integration
 
+## 1.1.0-next.2
+
+### Patch Changes
+
+- d26e1b0146: Exported `replaceGitLabUrlType` from package
+
+## 1.1.0-next.1
+
+### Minor Changes
+
+- b7436743cb: Gerrit integration: Added an optional configuration to set the Gitiles base url.
+
+### Patch Changes
+
+- 1691c6c5c2: Clarify that config locations that emit User and Group kinds now need to declare so in the `catalog.locations.[].rules`
+
+## 1.0.1-next.0
+
+### Patch Changes
+
+- 3ef123bbf0: Support external ID when assuming roles in S3 integration
+
+  In order to assume a role created by a 3rd party as external
+  ID is needed. This change adds an optional field to the s3
+  integration configuration and consumes that in the AwsS3UrlReader.
+
 ## 1.0.0
 
 ### Major Changes
@@ -227,6 +253,8 @@
     locations:
       - type: github-multi-org
         target: https://github.myorg.com
+        rules:
+          - allow: [User, Group]
 
     processors:
       githubMultiOrg:

package/config.d.ts

@@ -225,6 +225,12 @@ export interface Config {
        * @visibility backend
        */
       roleArn?: string;
+
+      /**
+       * External ID to use when assuming role
+       * @visibility backend
+       */
+      externalId?: string;
     }>;
   };
 }

package/dist/index.cjs.js

@@ -454,21 +454,30 @@ function getBitbucketRequestOptions(config) {
 function readGerritIntegrationConfig(config) {
   const host = config.getString("host");
   let baseUrl = config.getOptionalString("baseUrl");
+  let gitilesBaseUrl = config.getOptionalString("gitilesBaseUrl");
   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`);
   } else if (baseUrl && !isValidUrl(baseUrl)) {
     throw new Error(`Invalid Gerrit integration config, '${baseUrl}' is not a valid baseUrl`);
+  } else if (gitilesBaseUrl && !isValidUrl(gitilesBaseUrl)) {
+    throw new Error(`Invalid Gerrit integration config, '${gitilesBaseUrl}' is not a valid gitilesBaseUrl`);
   }
   if (baseUrl) {
     baseUrl = lodash.trimEnd(baseUrl, "/");
   } else {
     baseUrl = `https://${host}`;
   }
+  if (gitilesBaseUrl) {
+    gitilesBaseUrl = lodash.trimEnd(gitilesBaseUrl, "/");
+  } else {
+    gitilesBaseUrl = `https://${host}`;
+  }
   return {
     host,
     baseUrl,
+    gitilesBaseUrl,
     username,
     password
   };
@@ -514,6 +523,57 @@ GerritIntegration.factory = ({ config }) => {
   return basicIntegrations(configs.map((c) => new _GerritIntegration(c)), (i) => i.config.host);
 };
 
+const GERRIT_BODY_PREFIX = ")]}'";
+function parseGitilesUrl(config, url) {
+  const urlPath = url.replace(config.gitilesBaseUrl, "");
+  const parts = urlPath.split("/").filter((p) => !!p);
+  const projectEndIndex = parts.indexOf("+");
+  if (projectEndIndex <= 0) {
+    throw new Error(`Unable to parse project from url: ${url}`);
+  }
+  const project = lodash.trimStart(parts.slice(0, projectEndIndex).join("/"), "/");
+  const branchIndex = parts.indexOf("heads");
+  if (branchIndex <= 0) {
+    throw new Error(`Unable to parse branch from url: ${url}`);
+  }
+  const branch = parts[branchIndex + 1];
+  const filePath = parts.slice(branchIndex + 2).join("/");
+  return {
+    branch,
+    filePath: filePath === "" ? "/" : filePath,
+    project
+  };
+}
+function getAuthenticationPrefix(config) {
+  return config.password ? "/a/" : "/";
+}
+function getGerritFileContentsApiUrl(config, url) {
+  const { branch, filePath, project } = parseGitilesUrl(config, url);
+  return `${config.baseUrl}${getAuthenticationPrefix(config)}projects/${encodeURIComponent(project)}/branches/${branch}/files/${encodeURIComponent(filePath)}/content`;
+}
+function getGerritRequestOptions(config) {
+  const headers = {};
+  if (!config.password) {
+    return headers;
+  }
+  const buffer = Buffer.from(`${config.username}:${config.password}`, "utf8");
+  headers.Authorization = `Basic ${buffer.toString("base64")}`;
+  return {
+    headers
+  };
+}
+async function parseGerritJsonResponse(response) {
+  const responseBody = await response.text();
+  if (responseBody.startsWith(GERRIT_BODY_PREFIX)) {
+    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(`Gerrit JSON body prefix missing. Found: ${responseBody.slice(0, 10)}`);
+}
+
 const GITHUB_HOST = "github.com";
 const GITHUB_API_BASE_URL = "https://api.github.com";
 const GITHUB_RAW_BASE_URL = "https://raw.githubusercontent.com";
@@ -910,7 +970,7 @@ const _GitLabIntegration = class {
     return defaultScmResolveUrl(options);
   }
   resolveEditUrl(url) {
-    return replaceUrlType(url, "edit");
+    return replaceGitLabUrlType(url, "edit");
   }
 };
 let GitLabIntegration = _GitLabIntegration;
@@ -919,7 +979,7 @@ GitLabIntegration.factory = ({ config }) => {
   const configs = readGitLabIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.gitlab")) != null ? _a : []);
   return basicIntegrations(configs.map((c) => new _GitLabIntegration(c)), (i) => i.config.host);
 };
-function replaceUrlType(url, type) {
+function replaceGitLabUrlType(url, type) {
   return url.replace(/\/\-\/(blob|tree|edit)\//, `/-/${type}/`);
 }
 
@@ -959,13 +1019,15 @@ function readAwsS3IntegrationConfig(config) {
   const accessKeyId = config.getOptionalString("accessKeyId");
   const secretAccessKey = config.getOptionalString("secretAccessKey");
   const roleArn = config.getOptionalString("roleArn");
+  const externalId = config.getOptionalString("externalId");
   return {
     host,
     endpoint,
     s3ForcePathStyle,
     accessKeyId,
     secretAccessKey,
-    roleArn
+    roleArn,
+    externalId
   };
 }
 function readAwsS3IntegrationConfigs(configs) {
@@ -1082,10 +1144,13 @@ exports.getBitbucketDefaultBranch = getBitbucketDefaultBranch;
 exports.getBitbucketDownloadUrl = getBitbucketDownloadUrl;
 exports.getBitbucketFileFetchUrl = getBitbucketFileFetchUrl;
 exports.getBitbucketRequestOptions = getBitbucketRequestOptions;
+exports.getGerritFileContentsApiUrl = getGerritFileContentsApiUrl;
+exports.getGerritRequestOptions = getGerritRequestOptions;
 exports.getGitHubFileFetchUrl = getGitHubFileFetchUrl;
 exports.getGitHubRequestOptions = getGitHubRequestOptions;
 exports.getGitLabFileFetchUrl = getGitLabFileFetchUrl;
 exports.getGitLabRequestOptions = getGitLabRequestOptions;
+exports.parseGerritJsonResponse = parseGerritJsonResponse;
 exports.readAwsS3IntegrationConfig = readAwsS3IntegrationConfig;
 exports.readAwsS3IntegrationConfigs = readAwsS3IntegrationConfigs;
 exports.readAzureIntegrationConfig = readAzureIntegrationConfig;
@@ -1100,4 +1165,5 @@ exports.readGitLabIntegrationConfig = readGitLabIntegrationConfig;
 exports.readGitLabIntegrationConfigs = readGitLabIntegrationConfigs;
 exports.readGoogleGcsIntegrationConfig = readGoogleGcsIntegrationConfig;
 exports.replaceGitHubUrlType = replaceGitHubUrlType;
+exports.replaceGitLabUrlType = replaceGitLabUrlType;
 //# sourceMappingURL=index.cjs.js.map