Skip to content

Commit 87a6438

Browse files
justinkambicjustinkambic
committed
Merge branch 'backport/8.19/pr-216377' of github.com:justinkambic/kibana into backport/8.19/pr-216377
2 parents dfcdb99 + 9813ae8 commit 87a6438

225 files changed

Lines changed: 4124 additions & 2521 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/pipeline-resource-definitions/scripts/fix-location-collection.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ async function main() {
3838

3939
const preamble = locationFileLines.slice(0, 1);
4040

41-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
4241
const locationObj = jsYaml.load(
4342
locationFileLines.slice(1).join('\n')
4443
) as BackstageLocationResource;
4544
locationObj.spec.targets = pipelines.map(
4645
(fileName) => `${resourceDefinitionsBaseUrl}/${fileName}`
4746
);
4847

49-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
5048
const locationYaml = jsYaml.dump(locationObj, { lineWidth: 400 });
5149

5250
fs.writeFileSync(locationFile, `${preamble.join('\n')}\n${locationYaml}`);

‎.buildkite/pipeline-utils/agent_images.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1110
import { dump } from 'js-yaml';
1211
import { BuildkiteClient, BuildkiteAgentTargetingRule } from './buildkite';
1312

‎.buildkite/pipeline-utils/buildkite/client.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import axios, { AxiosInstance } from 'axios';
1111
import { execSync, ExecSyncOptions } from 'child_process';
1212

13-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1413
import { dump } from 'js-yaml';
1514

1615
import { parseLinkHeader } from './parse_link_header';

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import * as Fs from 'fs';
1212
import * as globby from 'globby';
1313
import minimatch from 'minimatch';
1414

15-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1615
import { load as loadYaml } from 'js-yaml';
1716

1817
import { BuildkiteClient, BuildkiteStep } from '../buildkite';

‎.buildkite/pipelines/esql_grammar_sync.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
steps:
2-
- command: .buildkite/scripts/steps/esql_grammar_sync.sh
3-
label: Grammar Sync
4-
timeout_in_minutes: 10
5-
agents:
6-
image: family/kibana-ubuntu-2004
7-
imageProject: elastic-images-prod
8-
provider: gcp
9-
machineType: n2-standard-2
10-
preemptible: true
2+
# - command: .buildkite/scripts/steps/esql_grammar_sync.sh
3+
# label: Grammar Sync
4+
# timeout_in_minutes: 10
5+
# agents:
6+
# image: family/kibana-ubuntu-2004
7+
# imageProject: elastic-images-prod
8+
# provider: gcp
9+
# machineType: n2-standard-2
10+
# preemptible: true
1111
- command: .buildkite/scripts/steps/esql_generate_function_metadata.sh
1212
label: Generate Function Metadata
1313
timeout_in_minutes: 15

‎.buildkite/scripts/steps/esql_generate_function_metadata.sh‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ main () {
1616

1717
rm -rf elasticsearch
1818
git clone https://github.com/elastic/elasticsearch --depth 1
19+
cd "$PARENT_DIR/elasticsearch"
20+
21+
echo "FETCHING 8.19 branch"
22+
git fetch origin 8.19
23+
24+
echo "CHECKING OUT 8.19 branch"
25+
git checkout FETCH_HEAD -b 8.19
1926

2027
report_main_step "Bootstrapping Kibana"
2128

@@ -56,18 +63,18 @@ main () {
5663
git config --global user.name "$KIBANA_MACHINE_USERNAME"
5764
git config --global user.email '42973632+kibanamachine@users.noreply.github.com'
5865

59-
PR_TITLE='[ES|QL] Update function metadata'
66+
PR_TITLE='[ES|QL] Update function metadata for 8.19'
6067
PR_BODY='This PR updates the function definitions and inline docs based on the latest metadata from Elasticsearch.'
6168

62-
# Check if a PR already exists
63-
pr_search_result=$(gh pr list --search "$PR_TITLE" --state open --author "$KIBANA_MACHINE_USERNAME" --limit 1 --json title -q ".[].title")
69+
# # Check if a PR already exists
70+
# pr_search_result=$(gh pr list --search "$PR_TITLE" --state open --author "$KIBANA_MACHINE_USERNAME" --limit 1 --json title -q ".[].title")
6471

65-
if [ "$pr_search_result" == "$PR_TITLE" ]; then
66-
echo "PR already exists. Exiting."
67-
exit
68-
fi
72+
# if [ "$pr_search_result" == "$PR_TITLE" ]; then
73+
# echo "PR already exists. Exiting."
74+
# exit
75+
# fi
6976

70-
echo "No existing PR found. Committing changes."
77+
# echo "No existing PR found. Committing changes."
7178

7279
# Make a commit
7380
BRANCH_NAME="esql_generate_function_metadata_$(date +%s)"
@@ -82,7 +89,7 @@ main () {
8289
git push origin "$BRANCH_NAME"
8390

8491
# Create a PR
85-
gh pr create --title "$PR_TITLE" --body "$PR_BODY" --base main --head "${BRANCH_NAME}" --label 'release_note:skip' --label 'Team:ESQL'
92+
gh pr create --title "$PR_TITLE" --body "$PR_BODY" --base 8.19 --head "${BRANCH_NAME}" --label 'release_note:skip' --label 'Team:ESQL' --label 'backport:skip'
8693
}
8794

8895
main

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@
11771177
"jquery": "^3.7.1",
11781178
"js-search": "^1.4.3",
11791179
"js-sha256": "^0.11.0",
1180-
"js-yaml": "^3.14.1",
1180+
"js-yaml": "^4.1.0",
11811181
"json-schema-to-ts": "^2.9.1",
11821182
"json-stable-stringify": "^1.0.1",
11831183
"json-stringify-pretty-compact": "1.2.0",
@@ -1634,7 +1634,7 @@
16341634
"@types/jest": "^29.5.3",
16351635
"@types/jquery": "^3.5.32",
16361636
"@types/js-search": "^1.4.0",
1637-
"@types/js-yaml": "^3.11.1",
1637+
"@types/js-yaml": "^4.0.9",
16381638
"@types/jsdom": "^20.0.1",
16391639
"@types/json-schema": "^7.0.15",
16401640
"@types/json-stable-stringify": "^1.0.32",

‎packages/kbn-docs-utils/src/mdx/get_all_doc_file_ids.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export async function getAllDocFileIds(outputDir: string) {
3838

3939
let fm;
4040
try {
41-
fm = Yaml.safeLoad(fmYaml.slice(0, fmEnd.index));
41+
fm = Yaml.load(fmYaml.slice(0, fmEnd.index));
4242
if (typeof fm !== 'object' || fm === null) {
4343
throw new Error('expected yaml to produce an object');
4444
}

‎packages/kbn-docs-utils/tsconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
},
1010
"include": [
1111
"**/*.ts",
12+
"../../typings/**/*"
1213
],
1314
"exclude": [
1415
"**/__fixtures__/**",

‎packages/kbn-eslint-config/.eslintrc.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ module.exports = {
323323
'@kbn/eslint/no_constructor_args_in_property_initializers': 'error',
324324
'@kbn/eslint/no_this_in_property_initializers': 'error',
325325
'@kbn/eslint/no_unsafe_console': 'error',
326-
'@kbn/eslint/no_unsafe_js_yaml': 'error',
327326
'@kbn/imports/no_unresolvable_imports': 'error',
328327
'@kbn/imports/uniform_imports': 'error',
329328
'@kbn/imports/no_unused_imports': 'error',

0 commit comments

Comments
 (0)