Merge pull request #7478 from backstage/jhaals/trimtrim

Replace slash stripping regexp with trimEnd

plugins/catalog-backend-module-ldap/src/ldap/config.ts

@@ -18,6 +18,7 @@ import { Config, JsonValue } from '@backstage/config';
 import { SearchOptions } from 'ldapjs';
 import mergeWith from 'lodash/mergeWith';
 import { RecursivePartial } from '@backstage/plugin-catalog-backend';
+import { trimEnd } from 'lodash';
 
 /**
  * The configuration parameters for a single LDAP provider.
@@ -286,7 +287,7 @@ export function readLdapConfig(config: Config): LdapProviderConfig[] {
   const providerConfigs = config.getOptionalConfigArray('providers') ?? [];
   return providerConfigs.map(c => {
     const newConfig = {
-      target: c.getString('target').replace(/\/+$/, ''),
+      target: trimEnd(c.getString('target'), '/'),
       bind: readBindConfig(c.getOptionalConfig('bind')),
       users: readUserConfig(c.getConfig('users')),
       groups: readGroupConfig(c.getConfig('groups')),

plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts

@@ -15,6 +15,7 @@
  */
 
 import { Config } from '@backstage/config';
+import { trimEnd } from 'lodash';
 
 /**
  * The configuration parameters for a single Microsoft Graph provider.
@@ -72,10 +73,11 @@ export function readMicrosoftGraphConfig(
   const providerConfigs = config.getOptionalConfigArray('providers') ?? [];
 
   for (const providerConfig of providerConfigs) {
-    const target = providerConfig.getString('target').replace(/\/+$/, '');
-    const authority =
-      providerConfig.getOptionalString('authority')?.replace(/\/+$/, '') ||
-      'https://login.microsoftonline.com';
+    const target = trimEnd(providerConfig.getString('target'), '/');
+
+    const authority = providerConfig.getOptionalString('authority')
+      ? trimEnd(providerConfig.getOptionalString('authority'), '/')
+      : 'https://login.microsoftonline.com';
     const tenantId = providerConfig.getString('tenantId');
     const clientId = providerConfig.getString('clientId');
     const clientSecret = providerConfig.getString('clientSecret');

plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.tsx

@@ -19,6 +19,7 @@ import { Card, CardContent, CardHeader } from '@material-ui/core';
 import React from 'react';
 import YAML from 'yaml';
 import { CodeSnippet } from '@backstage/core-components';
+import { trimEnd } from 'lodash';
 
 type Props = {
   repositoryUrl: string;
@@ -35,10 +36,7 @@ export const PreviewCatalogInfoComponent = ({
     <Card variant="outlined" className={classes?.card}>
       <CardHeader
         title={
-          <code>{`${repositoryUrl.replace(
-            /[\/]*$/,
-            '',
-          )}/catalog-info.yaml`}</code>
+          <code>{`${trimEnd(repositoryUrl, '/')}/catalog-info.yaml`}</code>
         }
       />