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

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @backstage/integration
 
+## 1.12.0-next.1
+
+### Minor Changes
+
+- be1014d: **BREAKING** Removed deprecated code from when casing was changed from `GitHub` to `Github` nearly two years ago. The following items have been removed:
+
+  - `getGitHubFileFetchUrl` (use `getGithubFileFetchUrl` instead)
+  - `GitHubIntegrationConfig` (use `GithubIntegrationConfig` instead)
+  - `GitHubIntegration` (use `GithubIntegration` instead)
+  - `readGitHubIntegrationConfig` (use `readGithubIntegrationConfig` instead)
+  - `readGitHubIntegrationConfigs` (use `readGithubIntegrationConfigs` instead)
+  - `replaceGitHubUrlType` (use `replaceGithubUrlType` instead)
+
+### Patch Changes
+
+- 23ee9ab: Fix AWS CodeCommit integration by allowing to change the host
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 1.12.0-next.0
 
 ### Minor Changes

package/dist/awsCodeCommit/config.esm.js

@@ -4,23 +4,19 @@ function readAwsCodeCommitIntegrationConfig(config) {
   const secretAccessKey = config.getOptionalString("secretAccessKey")?.trim();
   const roleArn = config.getOptionalString("roleArn");
   const externalId = config.getOptionalString("externalId");
-  const host = AMAZON_AWS_CODECOMMIT_HOST;
+  const region = config.getString("region");
+  const host = config.getOptionalString("host") || `${region}.${AMAZON_AWS_CODECOMMIT_HOST}`;
   return {
     host,
     accessKeyId,
     secretAccessKey,
     roleArn,
-    externalId
+    externalId,
+    region
   };
 }
 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;
+  return configs.map(readAwsCodeCommitIntegrationConfig);
 }
 
 export { readAwsCodeCommitIntegrationConfig, readAwsCodeCommitIntegrationConfigs };

package/dist/awsCodeCommit/config.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.esm.js","sources":["../../src/awsCodeCommit/config.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { Config } from '@backstage/config';\n\nconst AMAZON_AWS_CODECOMMIT_HOST = 'console.aws.amazon.com';\n\n/**\n * The configuration parameters for a single AWS CodeCommit provider.\n *\n * @public\n */\nexport type AwsCodeCommitIntegrationConfig = {\n  /**\n   * Host, git host derived from region\n   */\n  host: string;\n\n  /**\n   * (Optional) User access key id\n   */\n  accessKeyId?: string;\n\n  /**\n   * (Optional) User secret access key\n   */\n  secretAccessKey?: string;\n\n  /**\n   * (Optional) ARN of role to be assumed\n   */\n  roleArn?: string;\n\n  /**\n   * (Optional) External ID to use when assuming role\n   */\n  externalId?: string;\n};\n\n/**\n * Reads a single Aws CodeCommit integration config.\n *\n * @param config - The config object of a single integration\n * @public\n */\n\nexport function readAwsCodeCommitIntegrationConfig(\n  config: Config,\n): AwsCodeCommitIntegrationConfig {\n  const accessKeyId = config.getOptionalString('accessKeyId');\n  const secretAccessKey = config.getOptionalString('secretAccessKey')?.trim();\n  const roleArn = config.getOptionalString('roleArn');\n  const externalId = config.getOptionalString('externalId');\n  const host = AMAZON_AWS_CODECOMMIT_HOST;\n\n  return {\n    host,\n    accessKeyId,\n    secretAccessKey,\n    roleArn,\n    externalId,\n  };\n}\n\n/**\n * Reads a set of AWS CodeCommit integration configs, and inserts some defaults for\n * public Amazon AWS if not specified.\n *\n * @param configs - The config objects of the integrations\n * @public\n */\nexport function readAwsCodeCommitIntegrationConfigs(\n  configs: Config[],\n): AwsCodeCommitIntegrationConfig[] {\n  // First read all the explicit integrations\n  const result = configs.map(readAwsCodeCommitIntegrationConfig);\n\n  // If no explicit console.aws.amazon.com integration was added, put one in the list as\n  // a convenience\n  if (!result.some(c => c.host === AMAZON_AWS_CODECOMMIT_HOST)) {\n    result.push({\n      host: AMAZON_AWS_CODECOMMIT_HOST,\n    });\n  }\n\n  return result;\n}\n"],"names":[],"mappings":"AAkBA,MAAM,0BAA6B,GAAA,wBAAA,CAAA;AAyC5B,SAAS,mCACd,MACgC,EAAA;AAChC,EAAM,MAAA,WAAA,GAAc,MAAO,CAAA,iBAAA,CAAkB,aAAa,CAAA,CAAA;AAC1D,EAAA,MAAM,eAAkB,GAAA,MAAA,CAAO,iBAAkB,CAAA,iBAAiB,GAAG,IAAK,EAAA,CAAA;AAC1E,EAAM,MAAA,OAAA,GAAU,MAAO,CAAA,iBAAA,CAAkB,SAAS,CAAA,CAAA;AAClD,EAAM,MAAA,UAAA,GAAa,MAAO,CAAA,iBAAA,CAAkB,YAAY,CAAA,CAAA;AACxD,EAAA,MAAM,IAAO,GAAA,0BAAA,CAAA;AAEb,EAAO,OAAA;AAAA,IACL,IAAA;AAAA,IACA,WAAA;AAAA,IACA,eAAA;AAAA,IACA,OAAA;AAAA,IACA,UAAA;AAAA,GACF,CAAA;AACF,CAAA;AASO,SAAS,oCACd,OACkC,EAAA;AAElC,EAAM,MAAA,MAAA,GAAS,OAAQ,CAAA,GAAA,CAAI,kCAAkC,CAAA,CAAA;AAI7D,EAAA,IAAI,CAAC,MAAO,CAAA,IAAA,CAAK,OAAK,CAAE,CAAA,IAAA,KAAS,0BAA0B,CAAG,EAAA;AAC5D,IAAA,MAAA,CAAO,IAAK,CAAA;AAAA,MACV,IAAM,EAAA,0BAAA;AAAA,KACP,CAAA,CAAA;AAAA,GACH;AAEA,EAAO,OAAA,MAAA,CAAA;AACT;;;;"}
+{"version":3,"file":"config.esm.js","sources":["../../src/awsCodeCommit/config.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { Config } from '@backstage/config';\n\nconst AMAZON_AWS_CODECOMMIT_HOST = 'console.aws.amazon.com';\n\n/**\n * The configuration parameters for a single AWS CodeCommit provider.\n *\n * @public\n */\nexport type AwsCodeCommitIntegrationConfig = {\n  /**\n   * Host, git host derived from region\n   */\n  host: string;\n\n  /**\n   * (Optional) User access key id\n   */\n  accessKeyId?: string;\n\n  /**\n   * (Optional) User secret access key\n   */\n  secretAccessKey?: string;\n\n  /**\n   * (Optional) ARN of role to be assumed\n   */\n  roleArn?: string;\n\n  /**\n   * (Optional) External ID to use when assuming role\n   */\n  externalId?: string;\n\n  /**\n   * region to use for AWS (default: us-east-1)\n   */\n  region: string;\n};\n\n/**\n * Reads a single Aws CodeCommit integration config.\n *\n * @param config - The config object of a single integration\n * @public\n */\n\nexport function readAwsCodeCommitIntegrationConfig(\n  config: Config,\n): AwsCodeCommitIntegrationConfig {\n  const accessKeyId = config.getOptionalString('accessKeyId');\n  const secretAccessKey = config.getOptionalString('secretAccessKey')?.trim();\n  const roleArn = config.getOptionalString('roleArn');\n  const externalId = config.getOptionalString('externalId');\n  const region = config.getString('region');\n  const host =\n    config.getOptionalString('host') ||\n    `${region}.${AMAZON_AWS_CODECOMMIT_HOST}`;\n\n  return {\n    host,\n    accessKeyId,\n    secretAccessKey,\n    roleArn,\n    externalId,\n    region,\n  };\n}\n\n/**\n * Reads a set of AWS CodeCommit integration configs, and inserts some defaults for\n * public Amazon AWS if not specified.\n *\n * @param configs - The config objects of the integrations\n * @public\n */\nexport function readAwsCodeCommitIntegrationConfigs(\n  configs: Config[],\n): AwsCodeCommitIntegrationConfig[] {\n  return configs.map(readAwsCodeCommitIntegrationConfig);\n}\n"],"names":[],"mappings":"AAkBA,MAAM,0BAA6B,GAAA,wBAAA,CAAA;AA8C5B,SAAS,mCACd,MACgC,EAAA;AAChC,EAAM,MAAA,WAAA,GAAc,MAAO,CAAA,iBAAA,CAAkB,aAAa,CAAA,CAAA;AAC1D,EAAA,MAAM,eAAkB,GAAA,MAAA,CAAO,iBAAkB,CAAA,iBAAiB,GAAG,IAAK,EAAA,CAAA;AAC1E,EAAM,MAAA,OAAA,GAAU,MAAO,CAAA,iBAAA,CAAkB,SAAS,CAAA,CAAA;AAClD,EAAM,MAAA,UAAA,GAAa,MAAO,CAAA,iBAAA,CAAkB,YAAY,CAAA,CAAA;AACxD,EAAM,MAAA,MAAA,GAAS,MAAO,CAAA,SAAA,CAAU,QAAQ,CAAA,CAAA;AACxC,EAAM,MAAA,IAAA,GACJ,OAAO,iBAAkB,CAAA,MAAM,KAC/B,CAAG,EAAA,MAAM,IAAI,0BAA0B,CAAA,CAAA,CAAA;AAEzC,EAAO,OAAA;AAAA,IACL,IAAA;AAAA,IACA,WAAA;AAAA,IACA,eAAA;AAAA,IACA,OAAA;AAAA,IACA,UAAA;AAAA,IACA,MAAA;AAAA,GACF,CAAA;AACF,CAAA;AASO,SAAS,oCACd,OACkC,EAAA;AAClC,EAAO,OAAA,OAAA,CAAQ,IAAI,kCAAkC,CAAA,CAAA;AACvD;;;;"}

package/dist/index.cjs.js

@@ -155,23 +155,19 @@ function readAwsCodeCommitIntegrationConfig(config) {
   const secretAccessKey = config.getOptionalString("secretAccessKey")?.trim();
   const roleArn = config.getOptionalString("roleArn");
   const externalId = config.getOptionalString("externalId");
-  const host = AMAZON_AWS_CODECOMMIT_HOST;
+  const region = config.getString("region");
+  const host = config.getOptionalString("host") || `${region}.${AMAZON_AWS_CODECOMMIT_HOST}`;
   return {
     host,
     accessKeyId,
     secretAccessKey,
     roleArn,
-    externalId
+    externalId,
+    region
   };
 }
 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;
+  return configs.map(readAwsCodeCommitIntegrationConfig);
 }
 
 class AwsCodeCommitIntegration {
@@ -1876,20 +1872,6 @@ function replaceGithubUrlType(url, type) {
   );
 }
 
-const getGitHubFileFetchUrl = getGithubFileFetchUrl;
-class GitHubIntegration extends GithubIntegration {
-  static factory = GithubIntegration.factory;
-  constructor(integrationConfig) {
-    super(integrationConfig);
-  }
-  get config() {
-    return super.config;
-  }
-}
-const readGitHubIntegrationConfig = readGithubIntegrationConfig;
-const readGitHubIntegrationConfigs = readGithubIntegrationConfigs;
-const replaceGitHubUrlType = replaceGithubUrlType;
-
 const GITLAB_HOST = "gitlab.com";
 const GITLAB_API_BASE_URL = "https://gitlab.com/api/v4";
 function readGitLabIntegrationConfig(config) {
@@ -2311,7 +2293,6 @@ exports.DefaultAzureDevOpsCredentialsProvider = DefaultAzureDevOpsCredentialsPro
 exports.DefaultGithubCredentialsProvider = DefaultGithubCredentialsProvider;
 exports.DefaultGitlabCredentialsProvider = DefaultGitlabCredentialsProvider;
 exports.GerritIntegration = GerritIntegration;
-exports.GitHubIntegration = GitHubIntegration;
 exports.GitLabIntegration = GitLabIntegration;
 exports.GiteaIntegration = GiteaIntegration;
 exports.GithubAppCredentialsMux = GithubAppCredentialsMux;
@@ -2342,7 +2323,6 @@ exports.getGerritCloneRepoUrl = getGerritCloneRepoUrl;
 exports.getGerritFileContentsApiUrl = getGerritFileContentsApiUrl;
 exports.getGerritProjectsApiUrl = getGerritProjectsApiUrl;
 exports.getGerritRequestOptions = getGerritRequestOptions;
-exports.getGitHubFileFetchUrl = getGitHubFileFetchUrl;
 exports.getGitHubRequestOptions = getGitHubRequestOptions;
 exports.getGitLabFileFetchUrl = getGitLabFileFetchUrl;
 exports.getGitLabIntegrationRelativePath = getGitLabIntegrationRelativePath;
@@ -2375,8 +2355,6 @@ exports.readBitbucketServerIntegrationConfig = readBitbucketServerIntegrationCon
 exports.readBitbucketServerIntegrationConfigs = readBitbucketServerIntegrationConfigs;
 exports.readGerritIntegrationConfig = readGerritIntegrationConfig;
 exports.readGerritIntegrationConfigs = readGerritIntegrationConfigs;
-exports.readGitHubIntegrationConfig = readGitHubIntegrationConfig;
-exports.readGitHubIntegrationConfigs = readGitHubIntegrationConfigs;
 exports.readGitLabIntegrationConfig = readGitLabIntegrationConfig;
 exports.readGitLabIntegrationConfigs = readGitLabIntegrationConfigs;
 exports.readGiteaConfig = readGiteaConfig;
@@ -2384,7 +2362,6 @@ exports.readGithubIntegrationConfig = readGithubIntegrationConfig;
 exports.readGithubIntegrationConfigs = readGithubIntegrationConfigs;
 exports.readGoogleGcsIntegrationConfig = readGoogleGcsIntegrationConfig;
 exports.readHarnessConfig = readHarnessConfig;
-exports.replaceGitHubUrlType = replaceGitHubUrlType;
 exports.replaceGitLabUrlType = replaceGitLabUrlType;
 exports.replaceGithubUrlType = replaceGithubUrlType;
 //# sourceMappingURL=index.cjs.js.map