diff --git a/lib/modules/platform/bitbucket/index.ts b/lib/modules/platform/bitbucket/index.ts index 165a09d446c9d859b4e394b8c68d84a8b16aed1a..e0a3118588cbcb25b992ea9458fba05b366a08ce 100644 --- a/lib/modules/platform/bitbucket/index.ts +++ b/lib/modules/platform/bitbucket/index.ts @@ -8,8 +8,9 @@ import * as git from '../../../util/git'; import * as hostRules from '../../../util/host-rules'; import { BitbucketHttp, setBaseUrl } from '../../../util/http/bitbucket'; import type { HttpOptions } from '../../../util/http/types'; -import { isUUID, regEx } from '../../../util/regex'; +import { regEx } from '../../../util/regex'; import { sanitize } from '../../../util/sanitize'; +import { isUUID } from '../../../util/string'; import type { BranchStatusConfig, CreatePRConfig, diff --git a/lib/util/regex.spec.ts b/lib/util/regex.spec.ts index c2b0265e282cc2b8c0a9eccdbf8e45aa601123b2..923e5769fdf108d7cceedaa4d695eaa791585014 100644 --- a/lib/util/regex.spec.ts +++ b/lib/util/regex.spec.ts @@ -1,6 +1,6 @@ import RE2 from 're2'; import { CONFIG_VALIDATION } from '../constants/error-messages'; -import { configRegexPredicate, isUUID, regEx } from './regex'; +import { configRegexPredicate, regEx } from './regex'; describe('util/regex', () => { beforeEach(() => { @@ -38,14 +38,6 @@ describe('util/regex', () => { expect(regex.regEx('foo')).toBeInstanceOf(RegExp); }); - describe('isUUID', () => { - it('proper checks valid and invalid UUID strings', () => { - expect(isUUID('{90b6646d-1724-4a64-9fd9-539515fe94e9}')).toBe(true); - expect(isUUID('{90B6646D-1724-4A64-9FD9-539515FE94E9}')).toBe(true); - expect(isUUID('not-a-uuid')).toBe(false); - }); - }); - describe('configRegexPredicate', () => { it('allows valid regex pattern', () => { expect(configRegexPredicate('/hello/')).not.toBeNull(); diff --git a/lib/util/regex.ts b/lib/util/regex.ts index 138915e008a0698dba81eb667d4f014b638a5fcf..719dfce054359885d7fd0ea20dda6acd59be012e 100644 --- a/lib/util/regex.ts +++ b/lib/util/regex.ts @@ -111,11 +111,3 @@ export function configRegexPredicate( } return null; } - -const UUIDRegex = regEx( - /^\{[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\}$/i, -); - -export function isUUID(input: string): boolean { - return UUIDRegex.test(input); -} diff --git a/lib/util/string.spec.ts b/lib/util/string.spec.ts index 9df3c52ac209371c740da67975e60760c9f56251..3afa60e9f214337160ad9d37bde0555c397a0cd7 100644 --- a/lib/util/string.spec.ts +++ b/lib/util/string.spec.ts @@ -1,4 +1,4 @@ -import { coerceString, looseEquals, replaceAt } from './string'; +import { coerceString, isUUID, looseEquals, replaceAt } from './string'; describe('util/string', () => { describe('replaceAt', () => { @@ -40,4 +40,12 @@ describe('util/string', () => { expect(coerceString(null)).toBe(''); expect(coerceString(null, 'foo')).toBe('foo'); }); + + describe('isUUID', () => { + it('proper checks valid and invalid UUID strings', () => { + expect(isUUID('{90b6646d-1724-4a64-9fd9-539515fe94e9}')).toBe(true); + expect(isUUID('{90B6646D-1724-4A64-9FD9-539515FE94E9}')).toBe(true); + expect(isUUID('not-a-uuid')).toBe(false); + }); + }); }); diff --git a/lib/util/string.ts b/lib/util/string.ts index f5fdf6086fe05d27f7a13cca48694695581fa270..3944412038c1dbd85b1a7f0ef9649b8010b652e0 100644 --- a/lib/util/string.ts +++ b/lib/util/string.ts @@ -117,3 +117,11 @@ export function anyMatchRegexOrMinimatch( ): boolean | null { return patterns.some((pattern) => matchRegexOrMinimatch(input, pattern)); } + +const UUIDRegex = regEx( + /^\{[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\}$/i, +); + +export function isUUID(input: string): boolean { + return UUIDRegex.test(input); +}