integrations: trim secrets read from config

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

packages/integration/src/awsS3/AwsS3Integration.test.ts

@@ -26,7 +26,7 @@ describe('AwsS3Integration', () => {
             {
               endpoint: 'https://a.com',
               accessKeyId: 'access key',
-              secretAccessKey: 'secret key',
+              secretAccessKey: ' secret key ',
             },
           ],
         },

packages/integration/src/awsS3/config.ts

@@ -101,7 +101,7 @@ export function readAwsS3IntegrationConfig(
   }
 
   const accessKeyId = config.getOptionalString('accessKeyId');
-  const secretAccessKey = config.getOptionalString('secretAccessKey');
+  const secretAccessKey = config.getOptionalString('secretAccessKey')?.trim();
   const roleArn = config.getOptionalString('roleArn');
   const externalId = config.getOptionalString('externalId');
 

packages/integration/src/azure/config.test.ts

@@ -70,7 +70,7 @@ describe('readAzureIntegrationConfig', () => {
         credentials: [
           {
             organizations: ['org1'],
-            personalAccessToken: 't',
+            personalAccessToken: 't      ',
           },
         ],
       }),
@@ -119,7 +119,7 @@ describe('readAzureIntegrationConfig', () => {
           {
             organizations: ['org1', 'org2'],
             clientId: 'id',
-            clientSecret: 'secret',
+            clientSecret: 'secret\n\n\n',
             tenantId: 'tenant',
           },
         ],

packages/integration/src/azure/config.ts

@@ -205,18 +205,18 @@ export function readAzureIntegrationConfig(
     ?.map(credential => {
       const result: Partial<AzureDevOpsCredentialLike> = {
         organizations: credential.getOptionalStringArray('organizations'),
-        personalAccessToken: credential.getOptionalString(
-          'personalAccessToken',
-        ),
+        personalAccessToken: credential
+          .getOptionalString('personalAccessToken')
+          ?.trim(),
         tenantId: credential.getOptionalString('tenantId'),
         clientId: credential.getOptionalString('clientId'),
-        clientSecret: credential.getOptionalString('clientSecret'),
+        clientSecret: credential.getOptionalString('clientSecret')?.trim(),
       };
 
       return result;
     });
 
-  const token = config.getOptionalString('token');
+  const token = config.getOptionalString('token')?.trim();
 
   if (
     config.getOptional('credential') !== undefined &&
@@ -247,10 +247,12 @@ export function readAzureIntegrationConfig(
         organizations: config.getOptionalStringArray(
           'credential.organizations',
         ),
-        token: config.getOptionalString('credential.token'),
+        token: config.getOptionalString('credential.token')?.trim(),
         tenantId: config.getOptionalString('credential.tenantId'),
         clientId: config.getOptionalString('credential.clientId'),
-        clientSecret: config.getOptionalString('credential.clientSecret'),
+        clientSecret: config
+          .getOptionalString('credential.clientSecret')
+          ?.trim(),
       },
     ];
     credentialConfigs = credentialConfigs?.concat(mapped) ?? mapped;

packages/integration/src/bitbucket/config.test.ts

@@ -58,9 +58,9 @@ describe('readBitbucketIntegrationConfig', () => {
       buildConfig({
         host: 'a.com',
         apiBaseUrl: 'https://a.com/api',
-        token: 't',
+        token: 't\n\n\n',
         username: 'u',
-        appPassword: 'p',
+        appPassword: '\n\n\np',
       }),
     );
     expect(output).toEqual({

packages/integration/src/bitbucket/config.ts

@@ -76,9 +76,9 @@ export function readBitbucketIntegrationConfig(
 ): BitbucketIntegrationConfig {
   const host = config.getOptionalString('host') ?? BITBUCKET_HOST;
   let apiBaseUrl = config.getOptionalString('apiBaseUrl');
-  const token = config.getOptionalString('token');
+  const token = config.getOptionalString('token')?.trim();
   const username = config.getOptionalString('username');
-  const appPassword = config.getOptionalString('appPassword');
+  const appPassword = config.getOptionalString('appPassword')?.trim();
 
   if (!isValidHost(host)) {
     throw new Error(

packages/integration/src/bitbucketCloud/config.test.ts

@@ -55,7 +55,7 @@ describe('readBitbucketCloudIntegrationConfig', () => {
     const output = readBitbucketCloudIntegrationConfig(
       buildConfig({
         username: 'u',
-        appPassword: 'p',
+        appPassword: '\n\n\np',
       }),
     );
     expect(output).toEqual({

packages/integration/src/bitbucketCloud/config.ts

@@ -62,7 +62,7 @@ export function readBitbucketCloudIntegrationConfig(
   // If config is provided, we assume authenticated access is desired
   // (as the anonymous one is provided by default).
   const username = config.getString('username');
-  const appPassword = config.getString('appPassword');
+  const appPassword = config.getString('appPassword')?.trim();
 
   return {
     host,

packages/integration/src/bitbucketServer/config.test.ts

@@ -60,7 +60,7 @@ describe('readBitbucketServerIntegrationConfig', () => {
       buildConfig({
         host: 'a.com',
         apiBaseUrl: 'https://a.com/api',
-        token: 't',
+        token: '\tt\t',
       }),
     );
     expect(output).toEqual({

packages/integration/src/bitbucketServer/config.ts

@@ -77,7 +77,7 @@ export function readBitbucketServerIntegrationConfig(
 ): BitbucketServerIntegrationConfig {
   const host = config.getString('host');
   let apiBaseUrl = config.getOptionalString('apiBaseUrl');
-  const token = config.getOptionalString('token');
+  const token = config.getOptionalString('token')?.trim();
   const username = config.getOptionalString('username');
   const password = config.getOptionalString('password');
 

packages/integration/src/gerrit/config.test.ts

@@ -59,7 +59,7 @@ describe('readGerritIntegrationConfig', () => {
         cloneUrl: 'https:a.com/clone',
         gitilesBaseUrl: 'https://a.com/git',
         username: 'u',
-        password: 'p',
+        password: '     p      ',
       }),
     );
     expect(output).toEqual({

packages/integration/src/gerrit/config.ts

@@ -78,7 +78,7 @@ export function readGerritIntegrationConfig(
   let cloneUrl = config.getOptionalString('cloneUrl');
   let gitilesBaseUrl = config.getOptionalString('gitilesBaseUrl');
   const username = config.getOptionalString('username');
-  const password = config.getOptionalString('password');
+  const password = config.getOptionalString('password')?.trim();
 
   if (!isValidHost(host)) {
     throw new Error(

packages/integration/src/gitea/config.test.ts

@@ -53,7 +53,7 @@ describe('readGiteaConfig', () => {
         host: 'a.com',
         baseUrl: 'https://a.com/route/api',
         username: 'u',
-        password: 'p',
+        password: 'p        ',
       }),
     );
     expect(output).toEqual({

packages/integration/src/gitea/config.ts

@@ -56,7 +56,7 @@ export function readGiteaConfig(config: Config): GiteaIntegrationConfig {
   const host = config.getString('host');
   let baseUrl = config.getOptionalString('baseUrl');
   const username = config.getOptionalString('username');
-  const password = config.getOptionalString('password');
+  const password = config.getOptionalString('password')?.trim();
 
   if (!isValidHost(host)) {
     throw new Error(

packages/integration/src/github/config.test.ts

@@ -57,7 +57,7 @@ describe('readGithubIntegrationConfig', () => {
         host: 'a.com',
         apiBaseUrl: 'https://a.com/api',
         rawBaseUrl: 'https://a.com/raw',
-        token: 't',
+        token: '\nt\t',
       }),
     );
     expect(output).toEqual({

packages/integration/src/github/config.ts

@@ -123,7 +123,7 @@ export function readGithubIntegrationConfig(
   const host = config.getOptionalString('host') ?? GITHUB_HOST;
   let apiBaseUrl = config.getOptionalString('apiBaseUrl');
   let rawBaseUrl = config.getOptionalString('rawBaseUrl');
-  const token = config.getOptionalString('token');
+  const token = config.getOptionalString('token')?.trim();
   const apps = config.getOptionalConfigArray('apps')?.map(c => ({
     appId: c.getNumber('appId'),
     clientId: c.getString('clientId'),

packages/integration/src/gitlab/config.test.ts

@@ -55,7 +55,7 @@ describe('readGitLabIntegrationConfig', () => {
     const output = readGitLabIntegrationConfig(
       buildConfig({
         host: 'a.com',
-        token: 't',
+        token: ' t\n',
         apiBaseUrl: 'https://a.com',
         baseUrl: 'https://baseurl.for.me/gitlab',
       }),

packages/integration/src/gitlab/config.ts

@@ -67,7 +67,7 @@ export function readGitLabIntegrationConfig(
 ): GitLabIntegrationConfig {
   const host = config.getString('host');
   let apiBaseUrl = config.getOptionalString('apiBaseUrl');
-  const token = config.getOptionalString('token');
+  const token = config.getOptionalString('token')?.trim();
   let baseUrl = config.getOptionalString('baseUrl');
   if (apiBaseUrl) {
     apiBaseUrl = trimEnd(apiBaseUrl, '/');