From 64744d042d281d282bf54ba83f5324b7f5eaf29e Mon Sep 17 00:00:00 2001 From: x032205 Date: Mon, 7 Jul 2025 19:23:26 -0400 Subject: [PATCH] Rename GitHubRepositoryRegex --- .../bitbucket/bitbucket-secret-scanning-factory.ts | 6 +++--- .../bitbucket/bitbucket-secret-scanning-schemas.ts | 4 ++-- .../github/github-secret-scanning-factory.ts | 4 ++-- .../github/github-secret-scanning-schemas.ts | 4 ++-- backend/src/lib/regex/index.ts | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-factory.ts b/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-factory.ts index 80dcddae5..e624c7d5d 100644 --- a/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-factory.ts +++ b/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-factory.ts @@ -23,8 +23,9 @@ import { import { getConfig } from "@app/lib/config/env"; import { request } from "@app/lib/config/request"; import { titleCaseToCamelCase } from "@app/lib/fn"; +import { logger } from "@app/lib/logger"; import { alphaNumericNanoId } from "@app/lib/nanoid"; -import { GitHubRepositoryRegex } from "@app/lib/regex"; +import { BasicRepositoryRegex } from "@app/lib/regex"; import { getBitbucketUser, listBitbucketRepositories, @@ -38,7 +39,6 @@ import { TBitbucketDataSourceWithConnection, TQueueBitbucketResourceDiffScan } from "./bitbucket-secret-scanning-types"; -import { logger } from "@app/lib/logger"; export const BitbucketSecretScanningFactory = () => { const initialize: TSecretScanningFactoryInitialize< @@ -169,7 +169,7 @@ export const BitbucketSecretScanningFactory = () => { const repoPath = join(tempFolder, "repo.git"); - if (!GitHubRepositoryRegex.test(resourceName)) { + if (!BasicRepositoryRegex.test(resourceName)) { throw new Error("Invalid Bitbucket repository name"); } diff --git a/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-schemas.ts b/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-schemas.ts index 676abf026..36d036f15 100644 --- a/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-schemas.ts +++ b/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-schemas.ts @@ -12,7 +12,7 @@ import { GitRepositoryScanFindingDetailsSchema } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-schemas"; import { SecretScanningDataSources } from "@app/lib/api-docs"; -import { GitHubRepositoryRegex } from "@app/lib/regex"; +import { BasicRepositoryRegex } from "@app/lib/regex"; import { AppConnection } from "@app/services/app-connection/app-connection-enums"; export const BitbucketDataSourceConfigSchema = z.object({ @@ -27,7 +27,7 @@ export const BitbucketDataSourceConfigSchema = z.object({ .string() .min(1) .max(256) - .refine((value) => value === "*" || GitHubRepositoryRegex.test(value), "Invalid repository name format") + .refine((value) => value === "*" || BasicRepositoryRegex.test(value), "Invalid repository name format") ) .nonempty("One or more repositories required") .max(100, "Cannot configure more than 100 repositories") diff --git a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts index 8d86c755a..e09b8f88b 100644 --- a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts +++ b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts @@ -25,7 +25,7 @@ import { import { getConfig } from "@app/lib/config/env"; import { BadRequestError } from "@app/lib/errors"; import { titleCaseToCamelCase } from "@app/lib/fn"; -import { GitHubRepositoryRegex } from "@app/lib/regex"; +import { BasicRepositoryRegex } from "@app/lib/regex"; import { listGitHubRadarRepositories, TGitHubRadarConnection } from "@app/services/app-connection/github-radar"; import { @@ -119,7 +119,7 @@ export const GitHubSecretScanningFactory = () => { const repoPath = join(tempFolder, "repo.git"); - if (!GitHubRepositoryRegex.test(resourceName)) { + if (!BasicRepositoryRegex.test(resourceName)) { throw new Error("Invalid GitHub repository name"); } diff --git a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts index f1eec125c..e39830f22 100644 --- a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts +++ b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts @@ -12,7 +12,7 @@ import { GitRepositoryScanFindingDetailsSchema } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-schemas"; import { SecretScanningDataSources } from "@app/lib/api-docs"; -import { GitHubRepositoryRegex } from "@app/lib/regex"; +import { BasicRepositoryRegex } from "@app/lib/regex"; import { AppConnection } from "@app/services/app-connection/app-connection-enums"; export const GitHubDataSourceConfigSchema = z.object({ @@ -22,7 +22,7 @@ export const GitHubDataSourceConfigSchema = z.object({ .string() .min(1) .max(256) - .refine((value) => value === "*" || GitHubRepositoryRegex.test(value), "Invalid repository name format") + .refine((value) => value === "*" || BasicRepositoryRegex.test(value), "Invalid repository name format") ) .nonempty("One or more repositories required") .max(100, "Cannot configure more than 100 repositories") diff --git a/backend/src/lib/regex/index.ts b/backend/src/lib/regex/index.ts index c472f8d5d..a57705526 100644 --- a/backend/src/lib/regex/index.ts +++ b/backend/src/lib/regex/index.ts @@ -10,4 +10,4 @@ export const UserPrincipalNameRegex = new RE2(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9._-] export const LdapUrlRegex = new RE2(/^ldaps?:\/\//); -export const GitHubRepositoryRegex = new RE2(/^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/); +export const BasicRepositoryRegex = new RE2(/^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/);