@backstage/integration 1.9.1-next.2 → 1.10.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @backstage/integration
 
+## 1.10.0-next.0
+
+### Minor Changes
+
+- 7b11422: Add AWS CodeCommit URL Reader/Integration
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## 1.9.1
+
+### Patch Changes
+
+- 0386fa7: Fixed an issue with resolution of SCM URLs against a base URL with a trailing slash.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 1.9.1-next.2
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var parseGitUrl = require('git-url-parse');
 var lodash = require('lodash');
 var identity = require('@azure/identity');
@@ -10,10 +8,10 @@ var authApp = require('@octokit/auth-app');
 var rest = require('@octokit/rest');
 var luxon = require('luxon');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
-var parseGitUrl__default = /*#__PURE__*/_interopDefaultLegacy(parseGitUrl);
-var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
+var parseGitUrl__default = /*#__PURE__*/_interopDefaultCompat(parseGitUrl);
+var fetch__default = /*#__PURE__*/_interopDefaultCompat(fetch);
 
 function isValidHost(host) {
   const check = new URL("http://example.com");
@@ -55,7 +53,7 @@ function defaultScmResolveUrl(options) {
   }
   let updated;
   if (url.startsWith("/")) {
-    const { href, filepath } = parseGitUrl__default["default"](base);
+    const { href, filepath } = parseGitUrl__default.default(base);
     updated = new URL(href);
     const repoRootPath = lodash.trimEnd(
       updated.pathname.substring(0, updated.pathname.length - filepath.length),
@@ -121,10 +119,10 @@ function readAwsS3IntegrationConfigs(configs) {
   return result;
 }
 
-var __defProp$d = Object.defineProperty;
-var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$d = (obj, key, value) => {
-  __defNormalProp$d(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$e = Object.defineProperty;
+var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$e = (obj, key, value) => {
+  __defNormalProp$e(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 const _AwsS3Integration = class _AwsS3Integration {
@@ -148,7 +146,7 @@ const _AwsS3Integration = class _AwsS3Integration {
     return url;
   }
 };
-__publicField$d(_AwsS3Integration, "factory", ({ config }) => {
+__publicField$e(_AwsS3Integration, "factory", ({ config }) => {
   var _a;
   const configs = readAwsS3IntegrationConfigs(
     (_a = config.getOptionalConfigArray("integrations.awsS3")) != null ? _a : []
@@ -160,6 +158,90 @@ __publicField$d(_AwsS3Integration, "factory", ({ config }) => {
 });
 let AwsS3Integration = _AwsS3Integration;
 
+const AMAZON_AWS_CODECOMMIT_HOST = "console.aws.amazon.com";
+function readAwsCodeCommitIntegrationConfig(config) {
+  var _a;
+  const accessKeyId = config.getOptionalString("accessKeyId");
+  const secretAccessKey = (_a = config.getOptionalString("secretAccessKey")) == null ? void 0 : _a.trim();
+  const roleArn = config.getOptionalString("roleArn");
+  const externalId = config.getOptionalString("externalId");
+  const host = AMAZON_AWS_CODECOMMIT_HOST;
+  return {
+    host,
+    accessKeyId,
+    secretAccessKey,
+    roleArn,
+    externalId
+  };
+}
+function readAwsCodeCommitIntegrationConfigs(configs) {
+  const result = configs.map(readAwsCodeCommitIntegrationConfig);
+  if (!result.some((c) => c.host === AMAZON_AWS_CODECOMMIT_HOST)) {
+    result.push({
+      host: AMAZON_AWS_CODECOMMIT_HOST
+    });
+  }
+  return result;
+}
+
+var __defProp$d = Object.defineProperty;
+var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$d = (obj, key, value) => {
+  __defNormalProp$d(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+const _AwsCodeCommitIntegration = class _AwsCodeCommitIntegration {
+  constructor(integrationConfig) {
+    this.integrationConfig = integrationConfig;
+  }
+  get type() {
+    return "awsCodeCommit";
+  }
+  get config() {
+    return this.integrationConfig;
+  }
+  get title() {
+    return this.integrationConfig.host;
+  }
+  resolveUrl(options) {
+    const resolved = defaultScmResolveUrl(options);
+    return resolved;
+  }
+  resolveEditUrl(url) {
+    const parsedUrl = new URL(url);
+    const pathMatch = parsedUrl.pathname.match(
+      /^\/codesuite\/codecommit\/repositories\/([^\/]+)\//
+    );
+    if (!pathMatch) {
+      throw new Error(``);
+    }
+    const [, repositoryName] = pathMatch;
+    return replaceCodeCommitUrlType(url, repositoryName, "edit");
+  }
+};
+__publicField$d(_AwsCodeCommitIntegration, "factory", ({
+  config
+}) => {
+  var _a;
+  const configs = readAwsCodeCommitIntegrationConfigs(
+    (_a = config.getOptionalConfigArray("integrations.awsCodeCommit")) != null ? _a : []
+  );
+  return basicIntegrations(
+    configs.map((c) => new _AwsCodeCommitIntegration(c)),
+    (i) => i.config.host
+  );
+});
+let AwsCodeCommitIntegration = _AwsCodeCommitIntegration;
+function replaceCodeCommitUrlType(url, repositoryName, type) {
+  const newString = type === "edit" ? `files/edit` : type;
+  return url.replace(
+    new RegExp(
+      `/codesuite/codecommit/repositories/${repositoryName}/(browse|files/edit)/`
+    ),
+    `/codesuite/codecommit/repositories/${repositoryName}/${newString}/`
+  );
+}
+
 var __accessCheck = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
@@ -812,7 +894,7 @@ const _BitbucketIntegration = class _BitbucketIntegration {
     return url.toString();
   }
   resolveEditUrl(url) {
-    const urlData = parseGitUrl__default["default"](url);
+    const urlData = parseGitUrl__default.default(url);
     const editUrl = new URL(url);
     editUrl.searchParams.set("mode", "edit");
     editUrl.searchParams.set("spa", "0");
@@ -841,13 +923,13 @@ __publicField$a(_BitbucketIntegration, "factory", ({
 let BitbucketIntegration = _BitbucketIntegration;
 
 async function getBitbucketDefaultBranch(url, config) {
-  const { name: repoName, owner: project, resource } = parseGitUrl__default["default"](url);
+  const { name: repoName, owner: project, resource } = parseGitUrl__default.default(url);
   const isHosted = resource === "bitbucket.org";
   let branchUrl = isHosted ? `${config.apiBaseUrl}/repositories/${project}/${repoName}` : `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/default-branch`;
-  let response = await fetch__default["default"](branchUrl, getBitbucketRequestOptions(config));
+  let response = await fetch__default.default(branchUrl, getBitbucketRequestOptions(config));
   if (response.status === 404 && !isHosted) {
     branchUrl = `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/branches/default`;
-    response = await fetch__default["default"](branchUrl, getBitbucketRequestOptions(config));
+    response = await fetch__default.default(branchUrl, getBitbucketRequestOptions(config));
   }
   if (!response.ok) {
     const message = `Failed to retrieve default branch from ${branchUrl}, ${response.status} ${response.statusText}`;
@@ -876,7 +958,7 @@ async function getBitbucketDownloadUrl(url, config) {
     protocol,
     resource,
     filepath
-  } = parseGitUrl__default["default"](url);
+  } = parseGitUrl__default.default(url);
   const isHosted = resource === "bitbucket.org";
   let branch = ref;
   if (!branch) {
@@ -888,7 +970,7 @@ async function getBitbucketDownloadUrl(url, config) {
 }
 function getBitbucketFileFetchUrl(url, config) {
   try {
-    const { owner, name, ref, filepathtype, filepath } = parseGitUrl__default["default"](url);
+    const { owner, name, ref, filepathtype, filepath } = parseGitUrl__default.default(url);
     if (!owner || !name || filepathtype !== "browse" && filepathtype !== "raw" && filepathtype !== "src") {
       throw new Error("Invalid Bitbucket URL or file path");
     }
@@ -975,7 +1057,7 @@ const _BitbucketCloudIntegration = class _BitbucketCloudIntegration {
     return resolved;
   }
   resolveEditUrl(url) {
-    const urlData = parseGitUrl__default["default"](url);
+    const urlData = parseGitUrl__default.default(url);
     const editUrl = new URL(url);
     editUrl.searchParams.set("mode", "edit");
     editUrl.searchParams.set("at", urlData.ref);
@@ -997,9 +1079,9 @@ __publicField$9(_BitbucketCloudIntegration, "factory", ({
 let BitbucketCloudIntegration = _BitbucketCloudIntegration;
 
 async function getBitbucketCloudDefaultBranch(url, config) {
-  const { name: repoName, owner: project } = parseGitUrl__default["default"](url);
+  const { name: repoName, owner: project } = parseGitUrl__default.default(url);
   const branchUrl = `${config.apiBaseUrl}/repositories/${project}/${repoName}`;
-  const response = await fetch__default["default"](
+  const response = await fetch__default.default(
     branchUrl,
     getBitbucketCloudRequestOptions(config)
   );
@@ -1023,7 +1105,7 @@ async function getBitbucketCloudDownloadUrl(url, config) {
     ref,
     protocol,
     resource
-  } = parseGitUrl__default["default"](url);
+  } = parseGitUrl__default.default(url);
   let branch = ref;
   if (!branch) {
     branch = await getBitbucketCloudDefaultBranch(url, config);
@@ -1032,7 +1114,7 @@ async function getBitbucketCloudDownloadUrl(url, config) {
 }
 function getBitbucketCloudFileFetchUrl(url, config) {
   try {
-    const { owner, name, ref, filepathtype, filepath } = parseGitUrl__default["default"](url);
+    const { owner, name, ref, filepathtype, filepath } = parseGitUrl__default.default(url);
     if (!owner || !name || filepathtype !== "src" && filepathtype !== "raw") {
       throw new Error("Invalid Bitbucket Cloud URL or file path");
     }
@@ -1138,15 +1220,15 @@ __publicField$8(_BitbucketServerIntegration, "factory", ({
 let BitbucketServerIntegration = _BitbucketServerIntegration;
 
 async function getBitbucketServerDefaultBranch(url, config) {
-  const { name: repoName, owner: project } = parseGitUrl__default["default"](url);
+  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"](
+  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));
+    response = await fetch__default.default(branchUrl, getBitbucketServerRequestOptions(config));
   }
   if (!response.ok) {
     const message = `Failed to retrieve default branch from ${branchUrl}, ${response.status} ${response.statusText}`;
@@ -1162,7 +1244,7 @@ async function getBitbucketServerDefaultBranch(url, config) {
   return defaultBranch;
 }
 async function getBitbucketServerDownloadUrl(url, config) {
-  const { name: repoName, owner: project, ref, filepath } = parseGitUrl__default["default"](url);
+  const { name: repoName, owner: project, ref, filepath } = parseGitUrl__default.default(url);
   let branch = ref;
   if (!branch) {
     branch = await getBitbucketServerDefaultBranch(url, config);
@@ -1172,7 +1254,7 @@ async function getBitbucketServerDownloadUrl(url, config) {
 }
 function getBitbucketServerFileFetchUrl(url, config) {
   try {
-    const { owner, name, ref, filepathtype, filepath } = parseGitUrl__default["default"](url);
+    const { owner, name, ref, filepathtype, filepath } = parseGitUrl__default.default(url);
     if (!owner || !name || filepathtype !== "browse" && filepathtype !== "raw" && filepathtype !== "src") {
       throw new Error("Invalid Bitbucket Server URL or file path");
     }
@@ -1565,7 +1647,7 @@ function readGithubIntegrationConfigs(configs) {
 
 function getGithubFileFetchUrl(url, config, credentials) {
   try {
-    const { owner, name, ref, filepathtype, filepath } = parseGitUrl__default["default"](url);
+    const { owner, name, ref, filepathtype, filepath } = parseGitUrl__default.default(url);
     if (!owner || !name || !ref || // GitHub is automatically redirecting tree urls to blob urls so it's
     // fine to pass a tree url.
     filepathtype !== "blob" && filepathtype !== "raw" && filepathtype !== "tree") {
@@ -1788,7 +1870,7 @@ const _SingleInstanceGithubCredentialsProvider = class _SingleInstanceGithubCred
    * @returns A promise of {@link GithubCredentials}.
    */
   async getCredentials(opts) {
-    const parsed = parseGitUrl__default["default"](opts.url);
+    const parsed = parseGitUrl__default.default(opts.url);
     const owner = parsed.owner || parsed.name;
     const repo = parsed.owner ? parsed.name : void 0;
     let type = "app";
@@ -2031,7 +2113,7 @@ async function getProjectId(target, config) {
         repo.replace(/^\//, "")
       )}`
     );
-    const response = await fetch__default["default"](
+    const response = await fetch__default.default(
       repoIDLookup.toString(),
       getGitLabRequestOptions(config)
     );
@@ -2165,6 +2247,7 @@ class ScmIntegrations {
   static fromConfig(config) {
     return new ScmIntegrations({
       awsS3: AwsS3Integration.factory({ config }),
+      awsCodeCommit: AwsCodeCommitIntegration.factory({ config }),
       azure: AzureIntegration.factory({ config }),
       bitbucket: BitbucketIntegration.factory({ config }),
       bitbucketCloud: BitbucketCloudIntegration.factory({ config }),
@@ -2178,6 +2261,9 @@ class ScmIntegrations {
   get awsS3() {
     return this.byType.awsS3;
   }
+  get awsCodeCommit() {
+    return this.byType.awsCodeCommit;
+  }
   get azure() {
     return this.byType.azure;
   }
@@ -2241,6 +2327,7 @@ class ScmIntegrations {
   }
 }
 
+exports.AwsCodeCommitIntegration = AwsCodeCommitIntegration;
 exports.AwsS3Integration = AwsS3Integration;
 exports.AzureIntegration = AzureIntegration;
 exports.BitbucketCloudIntegration = BitbucketCloudIntegration;
@@ -2294,6 +2381,8 @@ exports.getGithubFileFetchUrl = getGithubFileFetchUrl;
 exports.parseGerritGitilesUrl = parseGerritGitilesUrl;
 exports.parseGerritJsonResponse = parseGerritJsonResponse;
 exports.parseGiteaUrl = parseGiteaUrl;
+exports.readAwsCodeCommitIntegrationConfig = readAwsCodeCommitIntegrationConfig;
+exports.readAwsCodeCommitIntegrationConfigs = readAwsCodeCommitIntegrationConfigs;
 exports.readAwsS3IntegrationConfig = readAwsS3IntegrationConfig;
 exports.readAwsS3IntegrationConfigs = readAwsS3IntegrationConfigs;
 exports.readAzureIntegrationConfig = readAzureIntegrationConfig;