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

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @backstage/integration
 
+## 1.9.0-next.1
+
+### Patch Changes
+
+- 6d898f7: All single-line secrets read from config will now have both leading and trailing whitespace trimmed. This is done to ensure that the secrets are always valid HTTP header values, since many fetch implementations will include the header value itself when an error is thrown due to invalid header values.
+- 1cae748: Updated dependency `git-url-parse` to `^14.0.0`.
+- Updated dependencies
+  - @backstage/config@1.1.1
+  - @backstage/errors@1.2.3
+
 ## 1.9.0-next.0
 
 ### Minor Changes

package/dist/index.cjs.js

@@ -74,7 +74,7 @@ function defaultScmResolveUrl(options) {
 
 const AMAZON_AWS_HOST = "amazonaws.com";
 function readAwsS3IntegrationConfig(config) {
-  var _a;
+  var _a, _b;
   const endpoint = config.getOptionalString("endpoint");
   const s3ForcePathStyle = (_a = config.getOptionalBoolean("s3ForcePathStyle")) != null ? _a : false;
   let host;
@@ -98,7 +98,7 @@ function readAwsS3IntegrationConfig(config) {
     host = AMAZON_AWS_HOST;
   }
   const accessKeyId = config.getOptionalString("accessKeyId");
-  const secretAccessKey = config.getOptionalString("secretAccessKey");
+  const secretAccessKey = (_b = config.getOptionalString("secretAccessKey")) == null ? void 0 : _b.trim();
   const roleArn = config.getOptionalString("roleArn");
   const externalId = config.getOptionalString("externalId");
   return {
@@ -381,21 +381,20 @@ function asAzureDevOpsCredential(credential) {
   throw new Error("is not a valid credential");
 }
 function readAzureIntegrationConfig(config) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   const host = (_a = config.getOptionalString("host")) != null ? _a : AZURE_HOST;
   let credentialConfigs = (_b = config.getOptionalConfigArray("credentials")) == null ? void 0 : _b.map((credential) => {
+    var _a2, _b2;
     const result = {
       organizations: credential.getOptionalStringArray("organizations"),
-      personalAccessToken: credential.getOptionalString(
-        "personalAccessToken"
-      ),
+      personalAccessToken: (_a2 = credential.getOptionalString("personalAccessToken")) == null ? void 0 : _a2.trim(),
       tenantId: credential.getOptionalString("tenantId"),
       clientId: credential.getOptionalString("clientId"),
-      clientSecret: credential.getOptionalString("clientSecret")
+      clientSecret: (_b2 = credential.getOptionalString("clientSecret")) == null ? void 0 : _b2.trim()
     };
     return result;
   });
-  const token = config.getOptionalString("token");
+  const token = (_c = config.getOptionalString("token")) == null ? void 0 : _c.trim();
   if (config.getOptional("credential") !== void 0 && config.getOptional("credentials") !== void 0) {
     throw new Error(
       `Invalid Azure integration config, 'credential' and 'credentials' cannot be used together. Use 'credentials' instead.`
@@ -408,7 +407,7 @@ function readAzureIntegrationConfig(config) {
   }
   if (token !== void 0) {
     const mapped = [{ personalAccessToken: token }];
-    credentialConfigs = (_c = credentialConfigs == null ? void 0 : credentialConfigs.concat(mapped)) != null ? _c : mapped;
+    credentialConfigs = (_d = credentialConfigs == null ? void 0 : credentialConfigs.concat(mapped)) != null ? _d : mapped;
   }
   if (config.getOptional("credential") !== void 0) {
     const mapped = [
@@ -416,13 +415,13 @@ function readAzureIntegrationConfig(config) {
         organizations: config.getOptionalStringArray(
           "credential.organizations"
         ),
-        token: config.getOptionalString("credential.token"),
+        token: (_e = config.getOptionalString("credential.token")) == null ? void 0 : _e.trim(),
         tenantId: config.getOptionalString("credential.tenantId"),
         clientId: config.getOptionalString("credential.clientId"),
-        clientSecret: config.getOptionalString("credential.clientSecret")
+        clientSecret: (_f = config.getOptionalString("credential.clientSecret")) == null ? void 0 : _f.trim()
       }
     ];
-    credentialConfigs = (_d = credentialConfigs == null ? void 0 : credentialConfigs.concat(mapped)) != null ? _d : mapped;
+    credentialConfigs = (_g = credentialConfigs == null ? void 0 : credentialConfigs.concat(mapped)) != null ? _g : mapped;
   }
   if (!isValidHost(host)) {
     throw new Error(
@@ -743,12 +742,12 @@ async function getAzureRequestOptions(config, additionalHeaders) {
 const BITBUCKET_HOST = "bitbucket.org";
 const BITBUCKET_API_BASE_URL = "https://api.bitbucket.org/2.0";
 function readBitbucketIntegrationConfig(config) {
-  var _a;
+  var _a, _b, _c;
   const host = (_a = config.getOptionalString("host")) != null ? _a : BITBUCKET_HOST;
   let apiBaseUrl = config.getOptionalString("apiBaseUrl");
-  const token = config.getOptionalString("token");
+  const token = (_b = config.getOptionalString("token")) == null ? void 0 : _b.trim();
   const username = config.getOptionalString("username");
-  const appPassword = config.getOptionalString("appPassword");
+  const appPassword = (_c = config.getOptionalString("appPassword")) == null ? void 0 : _c.trim();
   if (!isValidHost(host)) {
     throw new Error(
       `Invalid Bitbucket integration config, '${host}' is not a valid host`
@@ -924,10 +923,11 @@ function getBitbucketRequestOptions(config) {
 const BITBUCKET_CLOUD_HOST = "bitbucket.org";
 const BITBUCKET_CLOUD_API_BASE_URL = "https://api.bitbucket.org/2.0";
 function readBitbucketCloudIntegrationConfig(config) {
+  var _a;
   const host = BITBUCKET_CLOUD_HOST;
   const apiBaseUrl = BITBUCKET_CLOUD_API_BASE_URL;
   const username = config.getString("username");
-  const appPassword = config.getString("appPassword");
+  const appPassword = (_a = config.getString("appPassword")) == null ? void 0 : _a.trim();
   return {
     host,
     apiBaseUrl,
@@ -1060,9 +1060,10 @@ function getBitbucketCloudRequestOptions(config) {
 }
 
 function readBitbucketServerIntegrationConfig(config) {
+  var _a;
   const host = config.getString("host");
   let apiBaseUrl = config.getOptionalString("apiBaseUrl");
-  const token = config.getOptionalString("token");
+  const token = (_a = config.getOptionalString("token")) == null ? void 0 : _a.trim();
   const username = config.getOptionalString("username");
   const password = config.getOptionalString("password");
   if (!isValidHost(host)) {
@@ -1195,12 +1196,13 @@ function getBitbucketServerRequestOptions(config) {
 }
 
 function readGerritIntegrationConfig(config) {
+  var _a;
   const host = config.getString("host");
   let baseUrl = config.getOptionalString("baseUrl");
   let cloneUrl = config.getOptionalString("cloneUrl");
   let gitilesBaseUrl = config.getOptionalString("gitilesBaseUrl");
   const username = config.getOptionalString("username");
-  const password = config.getOptionalString("password");
+  const password = (_a = config.getOptionalString("password")) == null ? void 0 : _a.trim();
   if (!isValidHost(host)) {
     throw new Error(
       `Invalid Gerrit integration config, '${host}' is not a valid host`
@@ -1401,10 +1403,11 @@ __publicField$7(_GerritIntegration, "factory", ({ config }) => {
 let GerritIntegration = _GerritIntegration;
 
 function readGiteaConfig(config) {
+  var _a;
   const host = config.getString("host");
   let baseUrl = config.getOptionalString("baseUrl");
   const username = config.getOptionalString("username");
-  const password = config.getOptionalString("password");
+  const password = (_a = config.getOptionalString("password")) == null ? void 0 : _a.trim();
   if (!isValidHost(host)) {
     throw new Error(
       `Invalid Gitea integration config, '${host}' is not a valid host`
@@ -1512,12 +1515,12 @@ const GITHUB_HOST = "github.com";
 const GITHUB_API_BASE_URL = "https://api.github.com";
 const GITHUB_RAW_BASE_URL = "https://raw.githubusercontent.com";
 function readGithubIntegrationConfig(config) {
-  var _a, _b;
+  var _a, _b, _c;
   const host = (_a = config.getOptionalString("host")) != null ? _a : GITHUB_HOST;
   let apiBaseUrl = config.getOptionalString("apiBaseUrl");
   let rawBaseUrl = config.getOptionalString("rawBaseUrl");
-  const token = config.getOptionalString("token");
-  const apps = (_b = config.getOptionalConfigArray("apps")) == null ? void 0 : _b.map((c) => ({
+  const token = (_b = config.getOptionalString("token")) == null ? void 0 : _b.trim();
+  const apps = (_c = config.getOptionalConfigArray("apps")) == null ? void 0 : _c.map((c) => ({
     appId: c.getNumber("appId"),
     clientId: c.getString("clientId"),
     clientSecret: c.getString("clientSecret"),
@@ -1927,9 +1930,10 @@ const replaceGitHubUrlType = replaceGithubUrlType;
 const GITLAB_HOST = "gitlab.com";
 const GITLAB_API_BASE_URL = "https://gitlab.com/api/v4";
 function readGitLabIntegrationConfig(config) {
+  var _a;
   const host = config.getString("host");
   let apiBaseUrl = config.getOptionalString("apiBaseUrl");
-  const token = config.getOptionalString("token");
+  const token = (_a = config.getOptionalString("token")) == null ? void 0 : _a.trim();
   let baseUrl = config.getOptionalString("baseUrl");
   if (apiBaseUrl) {
     apiBaseUrl = lodash.trimEnd(apiBaseUrl, "/");