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.

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

[Automatic Import] Cel template fixes #196945

Merged
merged 1 commit into from
Oct 19, 2024
Merged

Conversation

kgeller
Copy link
Contributor

@kgeller kgeller commented Oct 18, 2024

Summary

This PR corrects the CEL template so that it can successfully complete package policy installation. The fixes are 1) adding a template path, and 2) removing the common template values from the cel templates.

Tested and verified with and without the CEL generation FF enabled.

@kgeller kgeller added release_note:skip Skip the PR/issue when compiling release notes v9.0.0 v8.16.0 Team:Security-Scalability Team label for Security Integrations Scalability Team backport:version Backport to applied version labels labels Oct 18, 2024
@kgeller kgeller self-assigned this Oct 18, 2024
@kgeller kgeller marked this pull request as ready for review October 18, 2024 20:18
@kgeller kgeller requested a review from a team as a code owner October 18, 2024 20:18
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-scalability (Team:Security-Scalability)

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

cc @kgeller

@kgeller kgeller merged commit 15390e4 into elastic:main Oct 19, 2024
32 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.16

https://github.com/elastic/kibana/actions/runs/11418122443

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 19, 2024
## Summary

This PR corrects the CEL template so that it can successfully complete
package policy installation. The fixes are 1) adding a template path,
and 2) removing the common template values from the cel templates.

Tested and verified with and without the CEL generation FF enabled.

(cherry picked from commit 15390e4)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.16

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 21, 2024
# Backport

This will backport the following commits from `main` to `8.16`:
- [[Automatic Import] Cel template fixes
(#196945)](#196945)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Kylie
Meli","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-19T13:56:55Z","message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","v8.16.0","Team:Security-Scalability","backport:version"],"title":"[Automatic
Import] Cel template
fixes","number":196945,"url":"https://github.com/elastic/kibana/pull/196945","mergeCommit":{"message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08"}},"sourceBranch":"main","suggestedTargetBranches":["8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/196945","number":196945,"mergeCommit":{"message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Kylie Meli <[email protected]>
@kgeller kgeller deleted the cel-template-fixes branch October 21, 2024 15:31
@jbudz
Copy link
Member

jbudz commented Oct 22, 2024

@kgeller there's a version gap with this backport. Can you check if this should also be backported to 8.x/8.17?

@kgeller
Copy link
Contributor Author

kgeller commented Oct 22, 2024

@jbudz It should be, thanks for catching that. I added a label for 8.17 and will make sure it gets backported

@kgeller kgeller added the backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) label Oct 22, 2024
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.16, 8.x

https://github.com/elastic/kibana/actions/runs/11466718000

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 22, 2024
## Summary

This PR corrects the CEL template so that it can successfully complete
package policy installation. The fixes are 1) adding a template path,
and 2) removing the common template values from the cel templates.

Tested and verified with and without the CEL generation FF enabled.

(cherry picked from commit 15390e4)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
8.16 Cherrypick failed because the selected commit (15390e4) is empty. It looks like the commit was already backported in #196978
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 196945

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Oct 23, 2024
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Automatic Import] Cel template fixes
(#196945)](#196945)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Kylie
Meli","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-19T13:56:55Z","message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-minor","v8.16.0","Team:Security-Scalability","backport:version","v8.17.0"],"title":"[Automatic
Import] Cel template
fixes","number":196945,"url":"https://github.com/elastic/kibana/pull/196945","mergeCommit":{"message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/196945","number":196945,"mergeCommit":{"message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/196978","number":196978,"state":"MERGED","mergeCommit":{"sha":"b2c151a12f4db817e7aeb2ed7f76fe2217f82c2c","message":"[8.16]
[Automatic Import] Cel template fixes (#196945) (#196978)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.16`:\n- [[Automatic Import] Cel template
fixes\n(#196945)](https://github.com/elastic/kibana/pull/196945)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Kylie\nMeli\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-10-19T13:56:55Z\",\"message\":\"[Automatic\nImport]
Cel template fixes (#196945)\\n\\n## Summary\\r\\n\\r\\nThis
PR\ncorrects the CEL template so that it can
successfully\ncomplete\\r\\npackage policy installation. The fixes are
1) adding a\ntemplate path,\\r\\nand 2) removing the common template
values from the\ncel templates.\\r\\n\\r\\nTested and verified with and
without the CEL\ngeneration
FF\nenabled.\",\"sha\":\"15390e4cdb9aecca5ba5782b0081cb244dbd1a08\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.17.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"v9.0.0\",\"v8.16.0\",\"Team:Security-Scalability\",\"backport:version\"],\"title\":\"[Automatic\nImport]
Cel
template\nfixes\",\"number\":196945,\"url\":\"https://github.com/elastic/kibana/pull/196945\",\"mergeCommit\":{\"message\":\"[Automatic\nImport]
Cel template fixes (#196945)\\n\\n## Summary\\r\\n\\r\\nThis
PR\ncorrects the CEL template so that it can
successfully\ncomplete\\r\\npackage policy installation. The fixes are
1) adding a\ntemplate path,\\r\\nand 2) removing the common template
values from the\ncel templates.\\r\\n\\r\\nTested and verified with and
without the CEL\ngeneration
FF\nenabled.\",\"sha\":\"15390e4cdb9aecca5ba5782b0081cb244dbd1a08\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[\"8.16\"],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/196945\",\"number\":196945,\"mergeCommit\":{\"message\":\"[Automatic\nImport]
Cel template fixes (#196945)\\n\\n## Summary\\r\\n\\r\\nThis
PR\ncorrects the CEL template so that it can
successfully\ncomplete\\r\\npackage policy installation. The fixes are
1) adding a\ntemplate path,\\r\\nand 2) removing the common template
values from the\ncel templates.\\r\\n\\r\\nTested and verified with and
without the CEL\ngeneration
FF\nenabled.\",\"sha\":\"15390e4cdb9aecca5ba5782b0081cb244dbd1a08\"}},{\"branch\":\"8.16\",\"label\":\"v8.16.0\",\"branchLabelMappingKey\":\"^v(\\\\d+).(\\\\d+).\\\\d+$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"}]}]\nBACKPORT-->\n\nCo-authored-by:
Kylie Meli
<[email protected]>"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Kylie Meli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) backport:version Backport to applied version labels release_note:skip Skip the PR/issue when compiling release notes Team:Security-Scalability Team label for Security Integrations Scalability Team v8.16.0 v8.17.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants