Skip to content

Commit 5409631

Browse files
authored
Sustainable Kibana Architecture: Fix after-relocation issues (#205613)
After merging #202748, #204959, and #201653, all of the properties in some telemetry schemas were moved completely, but `node scripts/telemetry_check --fix` didn't update the `properties` object correctly. Also, in #202748 and #201653, the relocation script changed some paths, confusing them with `@kbn/security-plugin` and `@kbn/cloud-plugin`.
1 parent d00a73c commit 5409631

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.buildkite/scripts/pipelines/pull_request/pipeline.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
236236
if (
237237
(await doAnyChangesMatch([
238238
/^packages\/kbn-securitysolution-.*/,
239-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
239+
/^x-pack\/solutions\/security\/plugins\/security_solution/,
240240
/^x-pack\/test\/defend_workflows_cypress/,
241241
/^x-pack\/test\/security_solution_cypress/,
242242
/^fleet_packages\.json/,
@@ -256,9 +256,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
256256
/^x-pack\/platform\/plugins\/shared\/data_views\/common/,
257257
/^x-pack\/solutions\/security\/plugins\/lists/,
258258
/^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
259-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
260-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_ess/,
261-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_serverless/,
259+
/^x-pack\/solutions\/security\/plugins\/security_solution/,
260+
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
261+
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
262262
/^x-pack\/platform\/plugins\/shared\/task_manager/,
263263
/^x-pack\/solutions\/security\/plugins\/timelines/,
264264
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
@@ -341,9 +341,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
341341
/^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
342342
/^x-pack\/solutions\/security\/plugins\/lists/,
343343
/^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
344-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
345-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_ess/,
346-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_serverless/,
344+
/^x-pack\/solutions\/security\/plugins\/security_solution/,
345+
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
346+
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
347347
/^x-pack\/platform\/plugins\/shared\/task_manager/,
348348
/^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
349349
/^x-pack\/solutions\/security\/plugins\/timelines/,
@@ -363,7 +363,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
363363
((await doAnyChangesMatch([
364364
/^x-pack\/platform\/plugins\/shared\/osquery/,
365365
/^x-pack\/test\/osquery_cypress/,
366-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
366+
/^x-pack\/solutions\/security\/plugins\/security_solution/,
367367
])) ||
368368
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')) &&
369369
!GITHUB_PR_LABELS.includes('ci:skip-cypress-osquery')
@@ -376,8 +376,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
376376
if (
377377
(await doAnyChangesMatch([
378378
/^x-pack\/packages\/kbn-cloud-security-posture/,
379-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/cloud_security_posture/,
380-
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
379+
/^x-pack\/solutions\/security\/plugins\/cloud_security_posture/,
380+
/^x-pack\/solutions\/security\/plugins\/security_solution/,
381381
/^x-pack\/test\/security_solution_cypress/,
382382
])) ||
383383
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')

packages/kbn-telemetry-tools/src/tools/tasks/generate_schemas_task.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { generateMapping } from '../manage_schema';
1313
export function generateSchemasTask({ roots }: TaskContext) {
1414
return roots.map((root) => ({
1515
task: () => {
16-
if (!root.parsedCollections || !root.parsedCollections.length) {
16+
if (!root.parsedCollections) {
1717
return;
1818
}
1919
const mapping = generateMapping(root.parsedCollections);

0 commit comments

Comments
 (0)