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

[Fleet] Fix secrets with dot.separated variable names #173115

Merged

Conversation

kpollich
Copy link
Member

@kpollich kpollich commented Dec 11, 2023

Summary

Closes #173048

Move away from dot-separated secret paths in favor of array-based paths to fix the above bug around dot-separated variable names.

To test

Create an integration policy for the Universal Profiling Agent on v8.12.0 and observe that no errors occur during policy creation.

@apmmachine
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • /oblt-deploy-serverless : Deploy a serverless Kibana instance using the Observability test environments.
  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@kpollich kpollich self-assigned this Dec 12, 2023
@kpollich kpollich added release_note:fix Team:Fleet Team label for Observability Data Collection Fleet team backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Dec 12, 2023
@kpollich
Copy link
Member Author

@elasticmachine merge upstream

@kpollich kpollich marked this pull request as ready for review December 12, 2023 14:16
@kpollich kpollich requested a review from a team as a code owner December 12, 2023 14:16
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@kpollich
Copy link
Member Author

/ci

@kpollich
Copy link
Member Author

@elasticmachine merge upstream

@kpollich
Copy link
Member Author

@elasticmachine merge upstream

@kpollich
Copy link
Member Author

Log explorer changes seem totally unrelated, but odd that they failed twice so far.

Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@kpollich kpollich enabled auto-merge (squash) December 12, 2023 19:35
@kpollich
Copy link
Member Author

@elasticmachine merge upstream

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #13 / Serverless Common UI - Grok debugger Grok Debugger "after all" hook for "Accept and parse input with built-in grok pattern"

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @kpollich

@kpollich kpollich merged commit f861857 into elastic:main Dec 12, 2023
39 checks passed
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Dec 12, 2023
## Summary

Closes elastic#173048

Move away from dot-separated secret paths in favor of array-based paths
to fix the above bug around dot-separated variable names.

## To test

Create an integration policy for the Universal Profiling Agent on
v8.12.0 and observe that no errors occur during policy creation.

---------

Co-authored-by: Kibana Machine <[email protected]>
(cherry picked from commit f861857)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.12

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 Dec 12, 2023
#173234)

# Backport

This will backport the following commits from `main` to `8.12`:
- [[Fleet] Fix secrets with dot.separated variable names
(#173115)](#173115)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Kyle
Pollich","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-12-12T22:23:59Z","message":"[Fleet]
Fix secrets with dot.separated variable names (#173115)\n\n##
Summary\r\n\r\nCloses
https://github.com/elastic/kibana/issues/173048\r\n\r\nMove away from
dot-separated secret paths in favor of array-based paths\r\nto fix the
above bug around dot-separated variable names.\r\n\r\n## To
test\r\n\r\nCreate an integration policy for the Universal Profiling
Agent on\r\nv8.12.0 and observe that no errors occur during policy
creation.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<[email protected]>","sha":"f861857672c2611a0702e659815af03816e9638d","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.13.0"],"number":173115,"url":"https://github.com/elastic/kibana/pull/173115","mergeCommit":{"message":"[Fleet]
Fix secrets with dot.separated variable names (#173115)\n\n##
Summary\r\n\r\nCloses
https://github.com/elastic/kibana/issues/173048\r\n\r\nMove away from
dot-separated secret paths in favor of array-based paths\r\nto fix the
above bug around dot-separated variable names.\r\n\r\n## To
test\r\n\r\nCreate an integration policy for the Universal Profiling
Agent on\r\nv8.12.0 and observe that no errors occur during policy
creation.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<[email protected]>","sha":"f861857672c2611a0702e659815af03816e9638d"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/173115","number":173115,"mergeCommit":{"message":"[Fleet]
Fix secrets with dot.separated variable names (#173115)\n\n##
Summary\r\n\r\nCloses
https://github.com/elastic/kibana/issues/173048\r\n\r\nMove away from
dot-separated secret paths in favor of array-based paths\r\nto fix the
above bug around dot-separated variable names.\r\n\r\n## To
test\r\n\r\nCreate an integration policy for the Universal Profiling
Agent on\r\nv8.12.0 and observe that no errors occur during policy
creation.\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<[email protected]>","sha":"f861857672c2611a0702e659815af03816e9638d"}}]}]
BACKPORT-->

Co-authored-by: Kyle Pollich <[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) release_note:fix Team:Fleet Team label for Observability Data Collection Fleet team v8.12.0 v8.13.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Fleet] Integration policy with secret fails on creation
6 participants