github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.14] [ML] Removing use of re2 library (#186104) (#188371)

Browse source 
# Backport

This will backport the following commits from `main` to `8.14`:
- [[ML] Removing use of re2 library
(#186104)](https://github.com/elastic/kibana/pull/186104)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"James
Gowdy","email":"jgowdy@elastic.co"},"sourceCommit":{"committedDate":"2024-06-13T05:43:40Z","message":"[ML]
Removing use of re2 library (#186104)\n\nWe no longer need to use `re2`
over the standard regex
library.","sha":"ed70d4c6ffb77324f9c6e74e26ed559303ae6c3f","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix",":ml","backport:skip","v8.15.0"],"number":186104,"url":"https://github.com/elastic/kibana/pull/186104","mergeCommit":{"message":"[ML]
Removing use of re2 library (#186104)\n\nWe no longer need to use `re2`
over the standard regex
library.","sha":"ed70d4c6ffb77324f9c6e74e26ed559303ae6c3f"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.15.0","labelRegex":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/186104","number":186104,"mergeCommit":{"message":"[ML]
Removing use of re2 library (#186104)\n\nWe no longer need to use `re2`
over the standard regex
library.","sha":"ed70d4c6ffb77324f9c6e74e26ed559303ae6c3f"}}]}]
BACKPORT-->

Co-authored-by: James Gowdy <jgowdy@elastic.co>
This commit is contained in:
Tiago Costa 2024-07-16 07:14:13 +01:00 • committed by GitHub
parent 56250500c7
commit a1c89de64f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts
View file

@ -6,7 +6,6 @@
*/
import type { IScopedClusterClient } from '@kbn/core/server';
import RE2 from 're2';
import { mlLog } from '../../../lib/log';
const GROUP = 'logs-ui';
@ -42,7 +41,7 @@ export async function logJobsSpaces({
}
function findLogJobSpaceFactory() {
const reg = new RE2(`${MODULE_PREFIX}-(.+)-(${SOURCES.join('|')})-(${JOB_IDS.join('|')})`);
const reg = new RegExp(`${MODULE_PREFIX}-(.+)-(${SOURCES.join('|')})-(${JOB_IDS.join('|')})`);
return (jobId: string) => {
const result = reg.exec(jobId);

3
x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts
View file

@ -6,7 +6,6 @@
*/
import type { IScopedClusterClient } from '@kbn/core/server';
import RE2 from 're2';
import { mlLog } from '../../../lib/log';
const GROUP = 'metrics';
@ -49,7 +48,7 @@ export async function metricsJobsSpaces({
}
function findMetricsJobSpaceFactory() {
const reg = new RE2(`${MODULE_PREFIX}-(.+)-(${SOURCES.join('|')})-(${JOB_IDS.join('|')})`);
const reg = new RegExp(`${MODULE_PREFIX}-(.+)-(${SOURCES.join('|')})-(${JOB_IDS.join('|')})`);
return (jobId: string) => {
const result = reg.exec(jobId);

5
x-pack/plugins/ml/server/saved_objects/service.ts
View file

@ -5,7 +5,6 @@
* 2.0.
*/
import RE2 from 're2';
import { memoize } from 'lodash';
import type {
KibanaRequest,
@ -329,7 +328,7 @@ export function mlSavedObjectServiceFactory(
if (id.match('\\*') === null) {
return jobIds.includes(id);
}
const regex = new RE2(id.replace('*', '.*'));
const regex = new RegExp(id.replace('*', '.*'));
return jobIds.some((jId) => typeof jId === 'string' && regex.exec(jId));
});
}
@ -641,7 +640,7 @@ export function mlSavedObjectServiceFactory(
if (id.match('\\*') === null) {
return modelIds.includes(id);
}
const regex = new RE2(id.replace('*', '.*'));
const regex = new RegExp(id.replace('*', '.*'));
return modelIds.some((jId) => typeof jId === 'string' && regex.exec(jId));
});
}