[9.2](backport #5997) Replace secrets in fleet section of policies#6492
Merged
michel-laterman merged 2 commits into9.2from Mar 5, 2026
Merged
[9.2](backport #5997) Replace secrets in fleet section of policies#6492michel-laterman merged 2 commits into9.2from
fleet section of policies#6492michel-laterman merged 2 commits into9.2from
Conversation
* Turn fleet property into map[string]interface{}
* Add smap.Get and smap.Set methods
* Use smap.Get and smap.Set methods in inline replacement
* Replace secrets in `fleet` section
* Update unit test
* Adding CHANGELOG fragment
* Update integration test
* Error handling
* Run mage check:headers
* Fix potential integer overflow
* Removing vestigial checks
* Update assertion
* Fix secret ID
* Use strconv.ParseInt
(cherry picked from commit 8ea3537)
# Conflicts:
# internal/pkg/policy/parsed_policy.go
# internal/pkg/policy/parsed_policy_test.go
# internal/pkg/secret/secret.go
# internal/pkg/server/fleet_secrets_integration_test.go
Contributor
Author
|
Cherry-pick of 8ea3537 has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
Contributor
Author
|
This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏 |
Contributor
|
@copilot please rebase the commit |
Contributor
|
@michel-laterman I've opened a new pull request, #6511, to work on those changes. Once the pull request is ready, I'll request review from you. |
7 tasks
Contributor
|
@Mergifyio rebase |
Contributor
Author
☑️ Nothing to do, the required conditions are not metDetails
|
michel-laterman
approved these changes
Mar 5, 2026
This file contains hidden or 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
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.
What is the problem this PR solves?
The
fleetsection of a policy is now allowed to contain secrets. This PR ensures that Fleet Server correctly replaces such secrets with their values before the policy is sent to the Agent.How does this PR solve the problem?
This PR builds upon the work done in #5852, evaluating the
fleetsection of the policy received from Elasticsearch and replacing any secrets within it.Design Checklist
I have or intend to scale test my changes, ensuring it will work reliably with 100K+ agents connected.I have included fail safe mechanisms to limit the load on fleet-server: rate limiting, circuit breakers, caching, load shedding, etc.Checklist
I have made corresponding changes to the documentationI have made corresponding change to the default configuration files./changelog/fragmentsusing the changelog toolRelated issues
Closes #4470
This is an automatic backport of pull request #5997 done by Mergify.