From 7b78dd17e66f2e4fa8b6e8a0f14de02e21c7a472 Mon Sep 17 00:00:00 2001 From: Johan Haals Date: Wed, 6 Oct 2021 16:15:20 +0200 Subject: [PATCH] catalog-backend/chore: replace regexp with trimEnd Signed-off-by: Johan Haals --- .changeset/unlucky-guests-relax.md | 5 +++++ .../src/ingestion/processors/github/config.ts | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .changeset/unlucky-guests-relax.md diff --git a/.changeset/unlucky-guests-relax.md b/.changeset/unlucky-guests-relax.md new file mode 100644 index 0000000000..5574346cee --- /dev/null +++ b/.changeset/unlucky-guests-relax.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +Replace slash stripping regexp with trimEnd to remove CodeQL warning diff --git a/plugins/catalog-backend/src/ingestion/processors/github/config.ts b/plugins/catalog-backend/src/ingestion/processors/github/config.ts index df9e19ff10..27bec6eb0d 100644 --- a/plugins/catalog-backend/src/ingestion/processors/github/config.ts +++ b/plugins/catalog-backend/src/ingestion/processors/github/config.ts @@ -15,6 +15,7 @@ */ import { Config } from '@backstage/config'; +import { trimEnd } from 'lodash'; /** * The configuration parameters for a single GitHub API provider. @@ -52,12 +53,12 @@ export function readGithubConfig(config: Config): ProviderConfig[] { // First read all the explicit providers for (const providerConfig of providerConfigs) { - const target = providerConfig.getString('target').replace(/\/+$/, ''); + const target = trimEnd(providerConfig.getString('target'), '/'); let apiBaseUrl = providerConfig.getOptionalString('apiBaseUrl'); const token = providerConfig.getOptionalString('token'); if (apiBaseUrl) { - apiBaseUrl = apiBaseUrl.replace(/\/+$/, ''); + apiBaseUrl = trimEnd(apiBaseUrl, '/'); } else if (target === 'https://github.com') { apiBaseUrl = 'https://api.github.com'; }