Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from elastic:main #849

Merged
merged 1 commit into from
Jan 5, 2025
+747 −404
Merged

[pull] main from elastic:main #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 11 additions & 11 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const getPipeline = (filename: string, removeSteps = true) => {

pipeline.push(getPipeline('.buildkite/pipelines/pull_request/base.yml', false));

if (await doAnyChangesMatch([/^packages\/kbn-handlebars/])) {
if (await doAnyChangesMatch([/^src\/platform\/packages\/private\/kbn-handlebars/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/kbn_handlebars.yml'));
}

Expand Down Expand Up @@ -236,7 +236,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^packages\/kbn-securitysolution-.*/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/test\/defend_workflows_cypress/,
/^x-pack\/test\/security_solution_cypress/,
/^fleet_packages\.json/,
Expand All @@ -256,9 +256,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/platform\/plugins\/shared\/data_views\/common/,
/^x-pack\/solutions\/security\/plugins\/lists/,
/^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_ess/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_serverless/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
Expand Down Expand Up @@ -306,7 +306,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^src\/platform\/packages\/shared\/kbn-resizable-layout/,
/^src\/platform\/packages\/shared\/kbn-rison/,
/^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
/^packages\/kbn-safer-lodash-set/,
/^src\/platform\/packages\/shared\/kbn-safer-lodash-set/,
/^src\/platform\/packages\/shared\/kbn-search-types/,
/^packages\/kbn-securitysolution-.*/,
/^src\/platform\/packages\/shared\/kbn-securitysolution-ecs/,
Expand Down Expand Up @@ -341,9 +341,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
/^x-pack\/solutions\/security\/plugins\/lists/,
/^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_ess/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_serverless/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
Expand All @@ -363,7 +363,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
((await doAnyChangesMatch([
/^x-pack\/platform\/plugins\/shared\/osquery/,
/^x-pack\/test\/osquery_cypress/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')) &&
!GITHUB_PR_LABELS.includes('ci:skip-cypress-osquery')
Expand All @@ -377,7 +377,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
(await doAnyChangesMatch([
/^x-pack\/packages\/kbn-cloud-security-posture/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/cloud_security_posture/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/test\/security_solution_cypress/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/test/kbn_handlebars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ set -euo pipefail
source .buildkite/scripts/common/util.sh

echo '--- Checking for @kbn/handlebars upstream updates'
packages/kbn-handlebars/scripts/check_for_upstream_updates.sh
src/platform/packages/private/kbn-handlebars/scripts/check_for_upstream_updates.sh
34 changes: 17 additions & 17 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const ELV2_LICENSE_HEADER = `
const SAFER_LODASH_SET_HEADER = `
/*
* Elasticsearch B.V licenses this file to you under the MIT License.
* See \`packages/kbn-safer-lodash-set/LICENSE\` for more information.
* See \`src/platform/packages/shared/kbn-safer-lodash-set/LICENSE\` for more information.
*/
`;

Expand All @@ -93,7 +93,7 @@ const SAFER_LODASH_SET_LODASH_HEADER = `
* This file is forked from the lodash project (https://lodash.com/),
* and may include modifications made by Elasticsearch B.V.
* Elasticsearch B.V. licenses this file to you under the MIT License.
* See \`packages/kbn-safer-lodash-set/LICENSE\` for more information.
* See \`src/platform/packages/shared/kbn-safer-lodash-set/LICENSE\` for more information.
*/
`;

Expand All @@ -102,14 +102,14 @@ const SAFER_LODASH_SET_DEFINITELYTYPED_HEADER = `
* This file is forked from the DefinitelyTyped project (https://github.com/DefinitelyTyped/DefinitelyTyped),
* and may include modifications made by Elasticsearch B.V.
* Elasticsearch B.V. licenses this file to you under the MIT License.
* See \`packages/kbn-safer-lodash-set/LICENSE\` for more information.
* See \`src/platform/packages/shared/kbn-safer-lodash-set/LICENSE\` for more information.
*/
`;

const KBN_HANDLEBARS_HEADER = `
/*
* Elasticsearch B.V licenses this file to you under the MIT License.
* See \`packages/kbn-handlebars/LICENSE\` for more information.
* See \`src/platform/packages/private/kbn-handlebars/LICENSE\` for more information.
*/
`;

Expand All @@ -118,7 +118,7 @@ const KBN_HANDLEBARS_HANDLEBARS_HEADER = `
* This file is forked from the handlebars project (https://github.com/handlebars-lang/handlebars.js),
* and may include modifications made by Elasticsearch B.V.
* Elasticsearch B.V. licenses this file to you under the MIT License.
* See \`packages/kbn-handlebars/LICENSE\` for more information.
* See \`src/platform/packages/private/kbn-handlebars/LICENSE\` for more information.
*/
`;

Expand Down Expand Up @@ -441,7 +441,7 @@ module.exports = {
* safer-lodash-set package requires special license headers
*/
{
files: ['packages/kbn-safer-lodash-set/**/*.{js,mjs,ts,tsx}'],
files: ['src/platform/packages/shared/kbn-safer-lodash-set/**/*.{js,mjs,ts,tsx}'],
rules: {
'@kbn/eslint/require-license-header': [
'error',
Expand Down Expand Up @@ -471,7 +471,7 @@ module.exports = {
},

{
files: ['packages/kbn-safer-lodash-set/test/*.{js,mjs,ts,tsx}'],
files: ['src/platform/packages/shared/kbn-safer-lodash-set/test/*.{js,mjs,ts,tsx}'],
rules: {
'@kbn/eslint/require-license-header': [
'error',
Expand Down Expand Up @@ -500,7 +500,7 @@ module.exports = {
},
},
{
files: ['packages/kbn-safer-lodash-set/**/*.d.ts'],
files: ['src/platform/packages/shared/kbn-safer-lodash-set/**/*.d.ts'],
rules: {
'@kbn/eslint/require-license-header': [
'error',
Expand Down Expand Up @@ -533,7 +533,7 @@ module.exports = {
* @kbn/handlebars package requires special license headers
*/
{
files: ['packages/kbn-handlebars/**/*.{js,mjs,ts,tsx}'],
files: ['src/platform/packages/private/kbn-handlebars/**/*.{js,mjs,ts,tsx}'],
rules: {
'@kbn/eslint/require-license-header': [
'error',
Expand Down Expand Up @@ -562,7 +562,7 @@ module.exports = {
},
},
{
files: ['packages/kbn-handlebars/src/spec/**/*.{js,mjs,ts,tsx}'],
files: ['src/platform/packages/private/kbn-handlebars/src/spec/**/*.{js,mjs,ts,tsx}'],
rules: {
'@kbn/eslint/require-license-header': [
'error',
Expand Down Expand Up @@ -778,7 +778,7 @@ module.exports = {
* Harden specific rules
*/
{
files: ['test/harden/*.js', 'packages/kbn-safer-lodash-set/test/*.js'],
files: ['test/harden/*.js', 'src/platform/packages/shared/kbn-safer-lodash-set/test/*.js'],
rules: {
'mocha/handle-done-callback': 'off',
},
Expand Down Expand Up @@ -1854,24 +1854,24 @@ module.exports = {
*/
{
files: [
'src/plugins/interactive_setup/**/*.{js,mjs,ts,tsx}',
'src/platform/plugins/private/interactive_setup/**/*.{js,mjs,ts,tsx}',
'test/interactive_setup_api_integration/**/*.{js,mjs,ts,tsx}',
'test/interactive_setup_functional/**/*.{js,mjs,ts,tsx}',

'packages/kbn-mock-idp-plugin/**/*.{js,mjs,ts,tsx}',
'packages/kbn-mock-idp-utils/**/*.{js,mjs,ts,tsx}',
'packages/kbn-security-hardening/**/*.{js,mjs,ts,tsx}',
'packages/kbn-user-profile-components/**/*.{js,mjs,ts,tsx}',
'src/platform/packages/shared/kbn-security-hardening/**/*.{js,mjs,ts,tsx}',
'src/platform/packages/shared/kbn-user-profile-components/**/*.{js,mjs,ts,tsx}',

'x-pack/plugins/encrypted_saved_objects/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/encrypted_saved_objects/**/*.{js,mjs,ts,tsx}',
'x-pack/test/encrypted_saved_objects_api_integration/**/*.{js,mjs,ts,tsx}',

'x-pack/plugins/security/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/security/**/*.{js,mjs,ts,tsx}',
'x-pack/packages/security/**/*.{js,mjs,ts,tsx}',
'x-pack/test/security_api_integration/**/*.{js,mjs,ts,tsx}',
'x-pack/test/security_functional/**/*.{js,mjs,ts,tsx}',

'x-pack/plugins/spaces/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/spaces/**/*.{js,mjs,ts,tsx}',
'x-pack/test/spaces_api_integration/**/*.{js,mjs,ts,tsx}',
],
rules: {
Expand Down
Loading
Loading