[Auto Import] Make sure the committed schema is generated #195302
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ilyannn
added
release_note:skip
|
Pinging @elastic/security-scalability (Team:Security-Scalability) |
ilyannn
added
backport:prev-major
bhapas
approved these changes
Oct 7, 2024
|
Starting backport for target branches: 8.15, 8.x |
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]Async chunks
History
cc @ilyannn |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 7, 2024
…5302) ## Summary Previously our schema and `.gen` files were not in sync, in the sense that ``` git checkout main && yarn kbn bootstrap && node scripts/generate_openapi --rootDir ./x-pack/plugins/integration_assistant && git diff ``` returned a non-trivial diff, despite the implementation in elastic#193243. In this PR we - add missing additionalProperties to the schema; - generate and commit exactly the generated files. There don't seem to be any effects from the change from `passthrough` to `catchall`. Tested with Teleport (see GitHub). (cherry picked from commit 1599e4f)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 7, 2024
…5302) ## Summary Previously our schema and `.gen` files were not in sync, in the sense that ``` git checkout main && yarn kbn bootstrap && node scripts/generate_openapi --rootDir ./x-pack/plugins/integration_assistant && git diff ``` returned a non-trivial diff, despite the implementation in elastic#193243. In this PR we - add missing additionalProperties to the schema; - generate and commit exactly the generated files. There don't seem to be any effects from the change from `passthrough` to `catchall`. Tested with Teleport (see GitHub). (cherry picked from commit 1599e4f)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Oct 7, 2024
…5302) (#195314) # Backport This will backport the following commits from `main` to `8.15`: - [[Auto Import] Make sure the committed schema is generated (#195302)](#195302) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Ilya Nikokoshev","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-07T19:47:43Z","message":"[Auto Import] Make sure the committed schema is generated (#195302)\n\n## Summary\r\n\r\nPreviously our schema and `.gen` files were not in sync, in the sense that\r\n\r\n```\r\ngit checkout main && yarn kbn bootstrap && node scripts/generate_openapi --rootDir ./x-pack/plugins/integration_assistant && git diff\r\n```\r\n\r\nreturned a non-trivial diff, despite the implementation in https://github.com/elastic/kibana/issues/193243.\r\n\r\nIn this PR we\r\n\r\n- add missing additionalProperties to the schema;\r\n- generate and commit exactly the generated files.\r\n\r\nThere don't seem to be any effects from the change from `passthrough` to\r\n`catchall`.\r\n\r\nTested with Teleport (see GitHub).","sha":"1599e4f61b3e5caf60730be5a2def73f6d603148","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-major","Team:Security-Scalability","Feature:AutomaticImport"],"title":"[Auto Import] Make sure the committed schema is generated","number":195302,"url":"https://github.com/elastic/kibana/pull/195302","mergeCommit":{"message":"[Auto Import] Make sure the committed schema is generated (#195302)\n\n## Summary\r\n\r\nPreviously our schema and `.gen` files were not in sync, in the sense that\r\n\r\n```\r\ngit checkout main && yarn kbn bootstrap && node scripts/generate_openapi --rootDir ./x-pack/plugins/integration_assistant && git diff\r\n```\r\n\r\nreturned a non-trivial diff, despite the implementation in https://github.com/elastic/kibana/issues/193243.\r\n\r\nIn this PR we\r\n\r\n- add missing additionalProperties to the schema;\r\n- generate and commit exactly the generated files.\r\n\r\nThere don't seem to be any effects from the change from `passthrough` to\r\n`catchall`.\r\n\r\nTested with Teleport (see GitHub).","sha":"1599e4f61b3e5caf60730be5a2def73f6d603148"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195302","number":195302,"mergeCommit":{"message":"[Auto Import] Make sure the committed schema is generated (#195302)\n\n## Summary\r\n\r\nPreviously our schema and `.gen` files were not in sync, in the sense that\r\n\r\n```\r\ngit checkout main && yarn kbn bootstrap && node scripts/generate_openapi --rootDir ./x-pack/plugins/integration_assistant && git diff\r\n```\r\n\r\nreturned a non-trivial diff, despite the implementation in https://github.com/elastic/kibana/issues/193243.\r\n\r\nIn this PR we\r\n\r\n- add missing additionalProperties to the schema;\r\n- generate and commit exactly the generated files.\r\n\r\nThere don't seem to be any effects from the change from `passthrough` to\r\n`catchall`.\r\n\r\nTested with Teleport (see GitHub).","sha":"1599e4f61b3e5caf60730be5a2def73f6d603148"}}]}] BACKPORT--> Co-authored-by: Ilya Nikokoshev <[email protected]>
kibanamachine
added a commit
that referenced
this pull request
Oct 7, 2024
) (#195315) # Backport This will backport the following commits from `main` to `8.x`: - [[Auto Import] Make sure the committed schema is generated (#195302)](#195302) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Ilya Nikokoshev","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-07T19:47:43Z","message":"[Auto Import] Make sure the committed schema is generated (#195302)\n\n## Summary\r\n\r\nPreviously our schema and `.gen` files were not in sync, in the sense that\r\n\r\n```\r\ngit checkout main && yarn kbn bootstrap && node scripts/generate_openapi --rootDir ./x-pack/plugins/integration_assistant && git diff\r\n```\r\n\r\nreturned a non-trivial diff, despite the implementation in https://github.com/elastic/kibana/issues/193243.\r\n\r\nIn this PR we\r\n\r\n- add missing additionalProperties to the schema;\r\n- generate and commit exactly the generated files.\r\n\r\nThere don't seem to be any effects from the change from `passthrough` to\r\n`catchall`.\r\n\r\nTested with Teleport (see GitHub).","sha":"1599e4f61b3e5caf60730be5a2def73f6d603148","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-major","Team:Security-Scalability","Feature:AutomaticImport"],"title":"[Auto Import] Make sure the committed schema is generated","number":195302,"url":"https://github.com/elastic/kibana/pull/195302","mergeCommit":{"message":"[Auto Import] Make sure the committed schema is generated (#195302)\n\n## Summary\r\n\r\nPreviously our schema and `.gen` files were not in sync, in the sense that\r\n\r\n```\r\ngit checkout main && yarn kbn bootstrap && node scripts/generate_openapi --rootDir ./x-pack/plugins/integration_assistant && git diff\r\n```\r\n\r\nreturned a non-trivial diff, despite the implementation in https://github.com/elastic/kibana/issues/193243.\r\n\r\nIn this PR we\r\n\r\n- add missing additionalProperties to the schema;\r\n- generate and commit exactly the generated files.\r\n\r\nThere don't seem to be any effects from the change from `passthrough` to\r\n`catchall`.\r\n\r\nTested with Teleport (see GitHub).","sha":"1599e4f61b3e5caf60730be5a2def73f6d603148"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195302","number":195302,"mergeCommit":{"message":"[Auto Import] Make sure the committed schema is generated (#195302)\n\n## Summary\r\n\r\nPreviously our schema and `.gen` files were not in sync, in the sense that\r\n\r\n```\r\ngit checkout main && yarn kbn bootstrap && node scripts/generate_openapi --rootDir ./x-pack/plugins/integration_assistant && git diff\r\n```\r\n\r\nreturned a non-trivial diff, despite the implementation in https://github.com/elastic/kibana/issues/193243.\r\n\r\nIn this PR we\r\n\r\n- add missing additionalProperties to the schema;\r\n- generate and commit exactly the generated files.\r\n\r\nThere don't seem to be any effects from the change from `passthrough` to\r\n`catchall`.\r\n\r\nTested with Teleport (see GitHub).","sha":"1599e4f61b3e5caf60730be5a2def73f6d603148"}}]}] BACKPORT--> Co-authored-by: Ilya Nikokoshev <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Previously our schema and
.genfiles were not in sync, in the sense thatreturned a non-trivial diff, despite the implementation in #193243:
In this PR we
There don't seem to be any effects from the change from
passthroughtocatchall.Tested: ai_teleport_202410072045-1.0.0.zip